From 3fcfec48daaebc22d4228d919c1262ccd6cc2b58 Mon Sep 17 00:00:00 2001 From: eddyem Date: Sun, 28 Oct 2018 21:51:10 +0300 Subject: [PATCH] add ebuilds --- ebuilds/sci-astronomy/fli_control/Manifest | 1 + .../fli_control/fli_control-0.1.ebuild | 39 ++ ebuilds/sci-libs/fliusb/Manifest | 1 + ebuilds/sci-libs/fliusb/fliusb-1.3.ebuild | 39 ++ ebuilds/sci-libs/libfli/Manifest | 1 + ebuilds/sci-libs/libfli/libfli-1.104.ebuild | 32 ++ extern/fliusb-1.3.tgz | Bin 8719 -> 0 bytes fli_control/CMakeLists.txt | 32 +- fli_control/FindCFITSIO.cmake | 67 ++++ .../locale/ru/LC_MESSAGES/fli_control.mo | Bin 379 -> 6636 bytes fli_control/locale/ru/messages.po | 248 +++++++----- fli_control/locale/ru/ru.po | 361 ++++++++++-------- fli_control/main.c | 2 +- 13 files changed, 569 insertions(+), 254 deletions(-) create mode 100644 ebuilds/sci-astronomy/fli_control/Manifest create mode 100644 ebuilds/sci-astronomy/fli_control/fli_control-0.1.ebuild create mode 100644 ebuilds/sci-libs/fliusb/Manifest create mode 100644 ebuilds/sci-libs/fliusb/fliusb-1.3.ebuild create mode 100644 ebuilds/sci-libs/libfli/Manifest create mode 100644 ebuilds/sci-libs/libfli/libfli-1.104.ebuild delete mode 100644 extern/fliusb-1.3.tgz create mode 100644 fli_control/FindCFITSIO.cmake diff --git a/ebuilds/sci-astronomy/fli_control/Manifest b/ebuilds/sci-astronomy/fli_control/Manifest new file mode 100644 index 0000000..874e6b1 --- /dev/null +++ b/ebuilds/sci-astronomy/fli_control/Manifest @@ -0,0 +1 @@ +EBUILD fli_control-0.1.ebuild 752 BLAKE2B 7656dc18151be4991393f37926445a402867a280e4b8d37aa3cc899d70941494bd3edbc13e6fcdfd26e259dd0b1d575f2b8af339ce076bd58f461bb8744a8344 SHA512 49cc74ee2277b37a03b210d56aa096a3b876c28c07f56c25947a6ab9f912e0c85686a387f5076f0e21a6b663ae5ed960f398f3fb25927c23abddffa45a438a42 diff --git a/ebuilds/sci-astronomy/fli_control/fli_control-0.1.ebuild b/ebuilds/sci-astronomy/fli_control/fli_control-0.1.ebuild new file mode 100644 index 0000000..db24865 --- /dev/null +++ b/ebuilds/sci-astronomy/fli_control/fli_control-0.1.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="Simple FLI CCD, focuser and filter wheel management tool" +HOMEPAGE="https://github.com/eddyem/mytakepic/tree/master/fli_control" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="png raw" + +DEPEND=" + sci-libs/fliusb + sci-libs/libfli + sci-libs/cfitsio +" +RDEPEND="${DEPEND}" +S="${WORKDIR}" + +src_unpack() { + cp -r /home/eddy/C-files/mytakepic/fli_control/* ${S} || die +} + +CMAKE_USE_DIR="${S}" +BUILD_DIR=${S} + +src_configure() { + local mycmakeargs=( + "-DCMAKE_INSTALL_PREFIX=/usr/local" + "-DUSE_PNG=$(usex png)" + "-DUSE_RAW=$(usex raw)" + ) + cmake-utils_src_configure +} diff --git a/ebuilds/sci-libs/fliusb/Manifest b/ebuilds/sci-libs/fliusb/Manifest new file mode 100644 index 0000000..948770d --- /dev/null +++ b/ebuilds/sci-libs/fliusb/Manifest @@ -0,0 +1 @@ +EBUILD fliusb-1.3.ebuild 673 BLAKE2B 29b8c004c38dfa7cba4b2827311d0837ff18c49eb1172f7b711ac2267a6401f80b751347ad5add0c9919a264cdb170afda3b7433852f362b7d4c09dde854d0d3 SHA512 3454d61b37c2d652a9d055f67b2501732be27c5deeeaaceda16a10e3fcda895b2c22133548c5d8dc7238296d6e190b1b3c27a50feab3534957e109362134d3c2 diff --git a/ebuilds/sci-libs/fliusb/fliusb-1.3.ebuild b/ebuilds/sci-libs/fliusb/fliusb-1.3.ebuild new file mode 100644 index 0000000..c2d3685 --- /dev/null +++ b/ebuilds/sci-libs/fliusb/fliusb-1.3.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit linux-info linux-mod + +DESCRIPTION="FLI USB kernel module" +HOMEPAGE="" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" +S="${WORKDIR}" + +MODULE_NAMES="fliusb(misc:fliusb:fliusb)" +BUILD_TARGETS='default' + +src_unpack() { + cd ${S} + tar -zvxf /home/eddy/C-files/mytakepic/extern/fliusb.tgz +} + +src_compile() { + cd ${S}/fliusb + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + pushd /home/eddy/C-files/mytakepic/extern + insinto /lib/udev/rules.d + doins fliusb.rules +} diff --git a/ebuilds/sci-libs/libfli/Manifest b/ebuilds/sci-libs/libfli/Manifest new file mode 100644 index 0000000..7e874d0 --- /dev/null +++ b/ebuilds/sci-libs/libfli/Manifest @@ -0,0 +1 @@ +EBUILD libfli-1.104.ebuild 561 BLAKE2B 51ea7f8fc11c6e4222b79405daba01642886cc5d47085a5dea09ce270029a7b989a27696c4e5da7a8c083f16581e6eb6411deab4ea418800571981c162a4b00f SHA512 d519b9d750a7d667b1d84a743a98e78bb6fa8ad8d68fc51c42a48cfa395193678bf8989eb9da517e2438b82a1e8861701ea6dc150a5794fa2307201f2a2896b9 diff --git a/ebuilds/sci-libs/libfli/libfli-1.104.ebuild b/ebuilds/sci-libs/libfli/libfli-1.104.ebuild new file mode 100644 index 0000000..52a972b --- /dev/null +++ b/ebuilds/sci-libs/libfli/libfli-1.104.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit unpacker + +DESCRIPTION="FLI CCD SDK" +HOMEPAGE="" +SRC_URI="" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +DEPEND="sci-libs/fliusb" +RDEPEND="${DEPEND}" +S="${WORKDIR}/libfli-1.104" + +src_unpack() { + tar -zxf /home/eddy/C-files/mytakepic/extern/libfli-1.104.tgz +} + +src_install() { + insinto /usr/local/lib + doins libfli.a + insinto /usr/local/include + doins libfli.h + insinto /usr/share/pkgconfig + doins fli.pc +} diff --git a/extern/fliusb-1.3.tgz b/extern/fliusb-1.3.tgz deleted file mode 100644 index 0c6b727ada7aad6ef847df98751e83558598879d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8719 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 tTwROZgUF)6W2)001RYP7?qC diff --git a/fli_control/CMakeLists.txt b/fli_control/CMakeLists.txt index c408943..b27dd11 100644 --- a/fli_control/CMakeLists.txt +++ b/fli_control/CMakeLists.txt @@ -1,14 +1,19 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.0) set(PROJ fli_control) set(MINOR_VERSION "0") set(MID_VERSION "1") set(MAJOR_VERSION "0") set(VERSION "${MAJOR_VERSION}.${MID_VERSION}.${MINOR_VERSION}") -message("VER: ${VERSION}") +project(${PROJ} VERSION ${PROJ_VERSION} LANGUAGES C CXX) # default flags -set(CFLAGS -O2 -std=gnu99) +set(CMAKE_C_FLAGS_RELEASE "") +set(CMAKE_C_FLAGS_DEBUG "") +set(CMAKE_CXX_FLAGS_RELEASE "") +set(CMAKE_CXX_FLAGS_DEBUG "") +set(CMAKE_C_FLAGS "-O2 -std=gnu99") +set(CMAKE_CXX_FLAGS "-O2") set(CMAKE_COLOR_MAKEFILE ON) @@ -18,23 +23,28 @@ aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} SOURCES) # cmake -DEBUG=1 -> debugging if(DEFINED EBUG) - set(CFLAGS ${CFLAGS} -Wextra -Wall -Werror -W) - add_definitions(-DEBUG) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wextra -Wall -Werror -W") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wextra -Wall -Werror -W") + set(CMAKE_BUILD_TYPE DEBUG) + add_definitions(-DEBUG) # -DATIK_DEBUG=1) endif() find_package(PkgConfig REQUIRED) -set(MODULES cfitsio>=3.0 fli>=1.71) +# find CFITSIO +SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}) +FIND_PACKAGE(CFITSIO REQUIRED) + +set(MODULES fli>=1.71) # additional modules on condition -if(DEFINED USEPNG) +if(DEFINED USE_PNG AND USE_PNG STREQUAL "yes") set(MODULES ${MODULES} libpng>=1.2) add_definitions(-DUSEPNG) endif() pkg_check_modules(${PROJ} REQUIRED ${MODULES}) -if(DEFINED USERAW) +if(DEFINED USE_RAW AND USE_RAW STREQUAL "yes") add_definitions(-DUSERAW) endif() -project(${PROJ}) # change wrong behaviour with install prefix if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT AND CMAKE_INSTALL_PREFIX MATCHES "/usr/local") message("Change default install path to /usr") @@ -60,8 +70,8 @@ set(RU_FILE ${LCPATH}/ru.po) # exe file add_executable(${PROJ} ${SOURCES} ${PO_FILE} ${MO_FILE}) -target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES}) -include_directories(${${PROJ}_INCLUDE_DIRS}) +target_link_libraries(${PROJ} ${${PROJ}_LIBRARIES} ${CFITSIO_LIBRARIES}) +include_directories(${${PROJ}_INCLUDE_DIRS} ${CFITSIO_INCLUDE_DIR}) link_directories(${${PROJ}_LIBRARY_DIRS} ) add_definitions(${CFLAGS} -DLOCALEDIR=\"${LOCALEDIR}\" -DPACKAGE_VERSION=\"${VERSION}\" -DGETTEXT_PACKAGE=\"${PROJ}\" diff --git a/fli_control/FindCFITSIO.cmake b/fli_control/FindCFITSIO.cmake new file mode 100644 index 0000000..01dd612 --- /dev/null +++ b/fli_control/FindCFITSIO.cmake @@ -0,0 +1,67 @@ +# - Try to find CFITSIO +# Once done this will define +# +# CFITSIO_FOUND - system has CFITSIO +# CFITSIO_INCLUDE_DIR - the CFITSIO include directory +# CFITSIO_LIBRARIES - Link these to use CFITSIO +# CFITSIO_VERSION_STRING - Human readable version number of cfitsio +# CFITSIO_VERSION_MAJOR - Major version number of cfitsio +# CFITSIO_VERSION_MINOR - Minor version number of cfitsio + +# Copyright (c) 2006, Jasem Mutlaq +# Based on FindLibfacile by Carsten Niehaus, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +if (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + + # in cache already, be quiet + set(CFITSIO_FIND_QUIETLY TRUE) + +else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + + # JM: Packages from different distributions have different suffixes + find_path(CFITSIO_INCLUDE_DIR fitsio.h + PATH_SUFFIXES libcfitsio3 libcfitsio0 cfitsio + PATHS + $ENV{CFITSIO} + ${_obIncDir} + ${GNUWIN32_DIR}/include + ) + + find_library(CFITSIO_LIBRARIES NAMES cfitsio + PATHS + $ENV{CFITSIO} + ${_obLinkDir} + ${GNUWIN32_DIR}/lib + ) + + if(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + set(CFITSIO_FOUND TRUE) + else (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + set(CFITSIO_FOUND FALSE) + endif(CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) + + + if (CFITSIO_FOUND) + + # Find the version of the cfitsio header + FILE(READ "${CFITSIO_INCLUDE_DIR}/fitsio.h" FITSIO_H) + STRING(REGEX REPLACE ".*#define CFITSIO_VERSION[^0-9]*([0-9]+)\\.([0-9]+).*" "\\1.\\2" CFITSIO_VERSION_STRING "${FITSIO_H}") + STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\1" CFITSIO_VERSION_MAJOR ${CFITSIO_VERSION_STRING}) + STRING(REGEX REPLACE "^([0-9]+)[.]([0-9]+)" "\\2" CFITSIO_VERSION_MINOR ${CFITSIO_VERSION_STRING}) + message(STATUS "found version string ${CFITSIO_VERSION_STRING}") + + if (NOT CFITSIO_FIND_QUIETLY) + message(STATUS "Found CFITSIO ${CFITSIO_VERSION_MAJOR}.${CFITSIO_VERSION_MINOR}: ${CFITSIO_LIBRARIES}") + endif (NOT CFITSIO_FIND_QUIETLY) + else (CFITSIO_FOUND) + if (CFITSIO_FIND_REQUIRED) + message(STATUS "CFITSIO not found.") + endif (CFITSIO_FIND_REQUIRED) + endif (CFITSIO_FOUND) + + mark_as_advanced(CFITSIO_INCLUDE_DIR CFITSIO_LIBRARIES) + +endif (CFITSIO_INCLUDE_DIR AND CFITSIO_LIBRARIES) diff --git a/fli_control/locale/ru/LC_MESSAGES/fli_control.mo b/fli_control/locale/ru/LC_MESSAGES/fli_control.mo index 858ad4ef4e19685719959051b9f9939cfbbcbd01..a6bd7e1dfc77c711077c50bfb1d5da9bfe03c75f 100644 GIT binary patch literal 6636 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 diff --git a/fli_control/locale/ru/messages.po b/fli_control/locale/ru/messages.po index 604a0e3..71a193c 100644 --- a/fli_control/locale/ru/messages.po +++ b/fli_control/locale/ru/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-10 12:34+0300\n" +"POT-Creation-Date: 2018-10-28 18:36+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,343 +17,405 @@ msgstr "" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:63 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:66 msgid "show this help" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:64 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:67 msgid "rewrite output file if exists" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:68 msgid "verbose level (each -v increase it)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:69 msgid "not open shutter, when exposing (\"dark frames\")" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:70 msgid "open shutter" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:71 msgid "close shutter" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:72 msgid "run exposition on LOW @ pin5 I/O port" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:73 msgid "run exposition on HIGH @ pin5 I/O port" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:74 msgid "get value of I/O port pins" msgstr "" +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:75 +msgid "move stepper motor asynchronous" +msgstr "" + #. {"fast", NO_ARGS, NULL, '8', arg_int, APTR(&G.fast), N_("run in 8-bit mode")}, #. {"", NO_ARGS, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:75 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:79 msgid "program author" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:76 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:80 msgid "object type (neon, object, flat etc)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:77 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:81 msgid "instrument name" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:78 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:82 msgid "object name" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:83 msgid "observers' names" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:84 msgid "observing program name" msgstr "" #. {"", NEED_ARG, NULL, '', arg_string, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:87 msgid "N flushes before exposing" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:88 msgid "horizontal binning to N pixels" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:85 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:89 msgid "vertical binning to N pixels" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:86 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:90 msgid "make series of N frames" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:91 msgid "make pause for N seconds between expositions" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:92 msgid "set exposure time to given value (ms)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:93 msgid "frame X0 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:94 msgid "frame Y0 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:95 msgid "frame X1 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:96 msgid "frame Y1 coordinate (-1 - all with overscan)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:97 msgid "set I/O port pins to given value (decimal number, pin1 is LSB)" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:98 msgid "" "configure I/O port pins to given value (decimal number, pin1 is LSB, 1 == " "output, 0 == input)" msgstr "" +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:99 +msgid "move focuser to absolute position" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:100 +msgid "move focuser to relative position" +msgstr "" + +#. {"wheel-get",NO_ARGS, NULL, 0, arg_none, APTR(&G.getwheel), N_("get current wheel position")}, +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:102 +msgid "set wheel position" +msgstr "" + #. {"", NEED_ARG, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:105 msgid "set CCD temperature to given value (degr C)" msgstr "" #. Версия библиотеки '%s' -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:96 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:127 #, c-format msgid "Library version '%s'" msgstr "" -#. Камера '%s' из домена %s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:106 -#, c-format -msgid "Camera '%s', domain %s" -msgstr "" - #. Модель:\t\t%s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:111 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:143 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:234 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:299 #, c-format msgid "Model:\t\t%s" msgstr "" +#: /home/eddy/C-files/mytakepic/fli_control/main.c:146 +#, c-format +msgid "Focuser '%s', domain %s" +msgstr "" + #. Апп. версия: %ld -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:115 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:149 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:237 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:303 #, c-format msgid "HW revision: %ld" msgstr "" #. Прогр. версия: %ld -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:118 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:152 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:240 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:306 #, c-format msgid "SW revision: %ld" msgstr "" +#. Нельзя одновременно указывать относительную и абсолютную позицию +#: /home/eddy/C-files/mytakepic/fli_control/main.c:168 +msgid "You can't use both relative and absolute position" +msgstr "" + +#. Ошибка определения позиции +#: /home/eddy/C-files/mytakepic/fli_control/main.c:173 +msgid "Error in position detection" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:185 +msgid "Already at position" +msgstr "" + +#. Позиция не должна выходить за пределы 0...%ld +#: /home/eddy/C-files/mytakepic/fli_control/main.c:190 +#, c-format +msgid "Position should be in 0...%ld" +msgstr "" + +#. Перемещение в нулевую позицию +#: /home/eddy/C-files/mytakepic/fli_control/main.c:195 +msgid "Moving to home position" +msgstr "" + +#. Перемещение на %ld шагов +#: /home/eddy/C-files/mytakepic/fli_control/main.c:200 +#, c-format +msgid "Moving for %ld steps" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:213 +msgid "No focusers found" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:230 +#, c-format +msgid "Wheel '%s', domain %s" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:244 +#, c-format +msgid "Wheel position should be from 0 to %ld" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:268 +msgid "Arrive to position" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:280 +msgid "No wheels found" +msgstr "" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:288 +msgid "No CCD found" +msgstr "" + +#. Камера '%s' из домена %s +#: /home/eddy/C-files/mytakepic/fli_control/main.c:294 +#, c-format +msgid "Camera '%s', domain %s" +msgstr "" + #. Размер пикселя: %g x %g -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:121 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:309 #, c-format msgid "Pixel size: %g x %g" msgstr "" #. Видимое поле: %s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:125 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:313 #, c-format msgid "Field of view: %s" msgstr "" #. Поле изображения: (%ld, %ld)(%ld, %ld) -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:130 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:318 #, c-format msgid "Array field: (%ld, %ld)(%ld, %ld)" msgstr "" #. "Установка температуры ПЗС: %g градусов Цельсия\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:144 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:332 #, c-format msgid "Set CCD temperature to %g degr.C\n" msgstr "" -#. Температура (внутр.): %f -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149 -#, c-format -msgid "Inner temperature: %f\n" -msgstr "" - -#. Температура (внешн.): %f -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152 -#, c-format -msgid "Outern temperature: %f\n" -msgstr "" - -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:172 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:358 #, c-format msgid "%s CCD shutter\n" msgstr "" #. "Попытка сконфигурировать порт I/O как %d\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:183 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:369 #, c-format msgid "Try to convfigure I/O port as %d\n" msgstr "" -#. "Данные на порту I/O: %ld\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190 -#, c-format -msgid "I/O port data: 0x%02lx\n" -msgstr "" - #. "Попытка записи %d в порт I/O\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:194 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:379 #, c-format msgid "Try to write %d to I/O port\n" msgstr "" #. Захват кадра %d\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:208 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:393 #, c-format msgid "Capture frame %d\n" msgstr "" #. дата/время -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:216 -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:279 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:401 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:464 msgid "date/time" msgstr "" #. "ожидание внешнего триггера" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:223 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:408 #, c-format msgid "wait for external trigger...\n" msgstr "" #. %.3f секунд до окончания экспозиции\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:227 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:412 #, c-format msgid "%.3f seconds till exposition ends\n" msgstr "" #. Считывание изображения: -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:233 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:418 #, c-format msgid "Read image: " msgstr "" #. Не могу сохранить файл -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:251 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:436 msgid "Can't save file" msgstr "" #. Файл записан в '%s' -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:260 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:445 #, c-format msgid "File saved as '%s'" msgstr "" #. %d секунд до окончания паузы\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:274 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:459 #, c-format msgid "%d seconds till pause ends\n" msgstr "" -#. Камеры не найдены!\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:338 -msgid "No cameras found!\n" -msgstr "" - #. Статистика по изображению:\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:511 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:696 #, c-format msgid "Image stat:\n" msgstr "" #. amount of pcount and/or scount wrong #. / "Неправильный формат строки помощи" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:56 msgid "Wrong helpstring!" msgstr "" #. / "Целое вне допустимого диапазона" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:86 msgid "Integer out of range" msgstr "" #. / "Неправильный параметр: %s" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:480 #, c-format msgid "Wrong parameter: %s" msgstr "" #. / "%s: необходим аргумент!" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:485 #, c-format msgid "%s: argument needed!" msgstr "" #. / "Неправильный аргумент \"%s\" параметра \"%s\"" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:490 #, c-format msgid "Wrong argument \"%s\" of parameter \"%s\"" msgstr "" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:173 msgid "No filename given!" msgstr "" #. / "Не могу открыть %s для чтения" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:178 #, c-format msgid "Can't open %s for reading" msgstr "" #. / "Не могу выполнить stat %s" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:183 #, c-format msgid "Can't stat %s" msgstr "" #. / "Ошибка mmap" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:190 msgid "Mmap error for input" msgstr "" #. / "Не могу закрыть mmap'нутый файл" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:195 msgid "Can't close mmap'ed file" msgstr "" #. / "Не могу munmap" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:205 msgid "Can't munmap" msgstr "" #. / "Не могу настроить консоль" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:231 msgid "Can't setup console" msgstr "" #. Get settings #. / "Не могу получить настройки" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:301 msgid "Can't get settings" msgstr "" #. / "Не могу установить настройки" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:312 msgid "Can't set settings" msgstr "" diff --git a/fli_control/locale/ru/ru.po b/fli_control/locale/ru/ru.po index d2eb94b..4b165cd 100644 --- a/fli_control/locale/ru/ru.po +++ b/fli_control/locale/ru/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2017-09-10 12:34+0300\n" + "POT-Creation-Date: 2018-10-28 18:36+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,341 +17,404 @@ msgstr "Project-Id-Version: PACKAGE VERSION\n" "Content-Transfer-Encoding: 8bit\n" #. %.3f секунд до окончания экспозиции\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:227 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:412 #, c-format msgid "%.3f seconds till exposition ends\n" -msgstr "" +msgstr "%.3f секунд до окончания экспозиции\n" #. %d секунд до окончания паузы\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:274 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:459 #, c-format msgid "%d seconds till pause ends\n" -msgstr "" +msgstr "%d секунд до окончания паузы\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:172 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:358 #, c-format msgid "%s CCD shutter\n" -msgstr "" +msgstr "%s затвор ПЗС\n" #. / "%s: необходим аргумент!" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:485 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:485 #, c-format msgid "%s: argument needed!" -msgstr "" +msgstr "%s: необходим аргумент!" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:185 +msgid "Already at position" +msgstr "Уже на позиции" #. Поле изображения: (%ld, %ld)(%ld, %ld) -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:130 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:318 #, c-format msgid "Array field: (%ld, %ld)(%ld, %ld)" -msgstr "" +msgstr "Поле изображения: (%ld, %ld)(%ld, %ld)" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:268 +msgid "Arrive to position" +msgstr "Прибыл на позицию" #. Камера '%s' из домена %s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:106 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:294 #, c-format msgid "Camera '%s', domain %s" -msgstr "" +msgstr "Камера '%s' из домена %s" #. / "Не могу закрыть mmap'нутый файл" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:195 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:195 msgid "Can't close mmap'ed file" -msgstr "" +msgstr "Не могу закрыть mmap'нутый файл" #. Get settings #. / "Не могу получить настройки" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:301 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:301 msgid "Can't get settings" -msgstr "" +msgstr "Не могу получить настройки" #. / "Не могу munmap" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:205 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:205 msgid "Can't munmap" -msgstr "" +msgstr "Не могу munmap" #. / "Не могу открыть %s для чтения" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:178 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:178 #, c-format msgid "Can't open %s for reading" -msgstr "" +msgstr "Не могу открыть %s для чтения" #. Не могу сохранить файл -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:251 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:436 msgid "Can't save file" -msgstr "" +msgstr "Не могу сохранить файл" #. / "Не могу установить настройки" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:312 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:312 msgid "Can't set settings" -msgstr "" +msgstr "Не могу установить настройки" #. / "Не могу настроить консоль" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:231 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:231 msgid "Can't setup console" -msgstr "" +msgstr "Не могу настроить консоль" #. / "Не могу выполнить stat %s" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:183 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:183 #, c-format msgid "Can't stat %s" -msgstr "" +msgstr "Не могу выполнить stat %s" #. Захват кадра %d\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:208 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:393 #, c-format msgid "Capture frame %d\n" -msgstr "" +msgstr "Захват кадра %d\n" + +#. Ошибка определения позиции +#: /home/eddy/C-files/mytakepic/fli_control/main.c:173 +msgid "Error in position detection" +msgstr "Ошибка определения позиции" #. Видимое поле: %s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:125 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:313 #, c-format msgid "Field of view: %s" -msgstr "" +msgstr "Видимое поле: %s" #. Файл записан в '%s' -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:260 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:445 #, c-format msgid "File saved as '%s'" -msgstr "" +msgstr "Файл записан в '%s'" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:146 +#, c-format +msgid "Focuser '%s', domain %s" +msgstr "Фокусер '%s', домен %s" #. Апп. версия: %ld -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:115 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:149 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:237 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:303 #, c-format msgid "HW revision: %ld" -msgstr "" - -#. "Данные на порту I/O: %ld\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:190 -#, c-format -msgid "I/O port data: 0x%02lx\n" -msgstr "" +msgstr "Апп. версия: %ld" #. Статистика по изображению:\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:511 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:696 #, c-format msgid "Image stat:\n" -msgstr "" - -#. Температура (внутр.): %f -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:149 -#, c-format -msgid "Inner temperature: %f\n" -msgstr "" +msgstr "Статистика по изображению:\n" #. / "Целое вне допустимого диапазона" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:86 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:86 msgid "Integer out of range" -msgstr "" +msgstr "Целое вне допустимого диапазона" #. Версия библиотеки '%s' -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:96 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:127 #, c-format msgid "Library version '%s'" -msgstr "" +msgstr "Версия библиотеки '%s'" #. / "Ошибка mmap" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:190 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:190 msgid "Mmap error for input" -msgstr "" +msgstr "Ошибка mmap" #. Модель:\t\t%s -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:111 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:143 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:234 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:299 #, c-format msgid "Model:\t\t%s" -msgstr "" +msgstr "Модель:\t\t%s" + +#. Перемещение на %ld шагов +#: /home/eddy/C-files/mytakepic/fli_control/main.c:200 +#, c-format +msgid "Moving for %ld steps" +msgstr "Перемещение на %ld шагов" + +#. Перемещение в нулевую позицию +#: /home/eddy/C-files/mytakepic/fli_control/main.c:195 +msgid "Moving to home position" +msgstr "Перемещение в нулевую позицию" #. {"", NEED_ARG, NULL, '', arg_string, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:83 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:87 msgid "N flushes before exposing" -msgstr "" +msgstr "N сбросов до экспозиции" -#. Камеры не найдены!\n -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:338 -msgid "No cameras found!\n" -msgstr "" +#: /home/eddy/C-files/mytakepic/fli_control/main.c:288 +msgid "No CCD found" +msgstr "ПЗС не обнаружено" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/usefull_macros.c:173 +#: /home/eddy/C-files/mytakepic/fli_control/usefull_macros.c:173 msgid "No filename given!" -msgstr "" +msgstr "Не задано имя файла!" -#. Температура (внешн.): %f -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:152 -#, c-format -msgid "Outern temperature: %f\n" -msgstr "" +#: /home/eddy/C-files/mytakepic/fli_control/main.c:213 +msgid "No focusers found" +msgstr "Не найден фокусер" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:280 +msgid "No wheels found" +msgstr "Не найдены турели" #. Размер пикселя: %g x %g -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:121 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:309 #, c-format msgid "Pixel size: %g x %g" -msgstr "" +msgstr "Размер пикселя: %g x %g" + +#. Позиция не должна выходить за пределы 0...%ld +#: /home/eddy/C-files/mytakepic/fli_control/main.c:190 +#, c-format +msgid "Position should be in 0...%ld" +msgstr "Позиция не должна выходить за пределы 0...%ld" #. Считывание изображения: -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:233 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:418 #, c-format msgid "Read image: " -msgstr "" +msgstr "Считывание изображения:" #. Прогр. версия: %ld -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:118 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:152 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:240 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:306 #, c-format msgid "SW revision: %ld" -msgstr "" +msgstr "Прогр. версия: %ld" #. "Установка температуры ПЗС: %g градусов Цельсия\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:144 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:332 #, c-format msgid "Set CCD temperature to %g degr.C\n" -msgstr "" +msgstr "Установка температуры ПЗС: %g градусов Цельсия\n" #. "Попытка сконфигурировать порт I/O как %d\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:183 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:369 #, c-format msgid "Try to convfigure I/O port as %d\n" -msgstr "" +msgstr "Попытка сконфигурировать порт I/O как %d\n" #. "Попытка записи %d в порт I/O\n" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:194 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:379 #, c-format msgid "Try to write %d to I/O port\n" -msgstr "" +msgstr "Попытка записи %d в порт I/O\n" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:230 +#, c-format +msgid "Wheel '%s', domain %s" +msgstr "Колесо '%s', домен %s" + +#: /home/eddy/C-files/mytakepic/fli_control/main.c:244 +#, c-format +msgid "Wheel position should be from 0 to %ld" +msgstr "Номер позиции колеса: от 0 до %ld" #. / "Неправильный аргумент \"%s\" параметра \"%s\"" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:490 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:490 #, c-format msgid "Wrong argument \"%s\" of parameter \"%s\"" -msgstr "" +msgstr "Неправильный аргумент \"%s\" параметра \"%s\"" #. amount of pcount and/or scount wrong #. / "Неправильный формат строки помощи" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:56 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:56 msgid "Wrong helpstring!" -msgstr "" +msgstr "Неправильный формат строки помощи!" #. / "Неправильный параметр: %s" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/parseargs.c:480 +#: /home/eddy/C-files/mytakepic/fli_control/parseargs.c:480 #, c-format msgid "Wrong parameter: %s" -msgstr "" +msgstr "Неправильный параметр: %s" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:68 +#. Нельзя одновременно указывать относительную и абсолютную позицию +#: /home/eddy/C-files/mytakepic/fli_control/main.c:168 +msgid "You can't use both relative and absolute position" +msgstr "Нельзя одновременно указывать относительную и абсолютную позицию" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:71 msgid "close shutter" -msgstr "" +msgstr "закрыть затвор" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:94 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:98 msgid "configure I/O port pins to given value (decimal number, pin1 is LSB, " "1 == output, 0 == input)" -msgstr "" +msgstr "настроить пины порта I/O (десятичное значение, пин 1 - младший, " + "1 == выход, 0 == вход)" #. дата/время -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:216 -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:279 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:401 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:464 msgid "date/time" -msgstr "" +msgstr "дата/время" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:89 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:93 msgid "frame X0 coordinate (-1 - all with overscan)" -msgstr "" +msgstr "X0 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:91 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:95 msgid "frame X1 coordinate (-1 - all with overscan)" -msgstr "" +msgstr "X1 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:90 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:94 msgid "frame Y0 coordinate (-1 - all with overscan)" -msgstr "" +msgstr "Y0 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:92 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:96 msgid "frame Y1 coordinate (-1 - all with overscan)" -msgstr "" +msgstr "Y1 координата фрейма (-1 - вместе с оверсканом)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:71 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:74 msgid "get value of I/O port pins" -msgstr "" +msgstr "получить значение пинов порта I/O" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:84 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:88 msgid "horizontal binning to N pixels" -msgstr "" +msgstr "горизонтальный биннинг на N пикселей" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:77 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:81 msgid "instrument name" -msgstr "" +msgstr "название инструмента" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:87 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:91 msgid "make pause for N seconds between expositions" -msgstr "" +msgstr "пауза на N секунд между экспозициями" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:86 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:90 msgid "make series of N frames" -msgstr "" +msgstr "последовательность N кадров" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:66 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:99 +msgid "move focuser to absolute position" +msgstr "переместить фокусер в абсолютную позицию" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:100 +msgid "move focuser to relative position" +msgstr "переместить фокусер в абсолютную позицию" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:75 +msgid "move stepper motor asynchronous" +msgstr "двигать шаговый асинхронно" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:69 msgid "not open shutter, when exposing (\"dark frames\")" -msgstr "" +msgstr "съемка темновых" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:78 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:82 msgid "object name" -msgstr "" +msgstr "название объекта" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:76 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:80 msgid "object type (neon, object, flat etc)" -msgstr "" +msgstr "тип объекта (neon, object, flat и т.п.)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:79 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:83 msgid "observers' names" -msgstr "" +msgstr "имена наблюдателей" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:80 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:84 msgid "observing program name" -msgstr "" +msgstr "название программы" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:67 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:70 msgid "open shutter" -msgstr "" +msgstr "открыть затвор" #. {"fast", NO_ARGS, NULL, '8', arg_int, APTR(&G.fast), N_("run in 8-bit mode")}, #. {"", NO_ARGS, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:75 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:79 msgid "program author" -msgstr "" +msgstr "автор программы" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:64 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:67 msgid "rewrite output file if exists" -msgstr "" +msgstr "перезаписать выходной файл" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:70 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:73 msgid "run exposition on HIGH @ pin5 I/O port" -msgstr "" +msgstr "запуск экспозиции при высоком сигнале на пине5 порта I/O" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:69 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:72 msgid "run exposition on LOW @ pin5 I/O port" -msgstr "" +msgstr "запуск экспозиции при низком сигнале на пине5 порта I/O" #. {"", NEED_ARG, NULL, '', arg_int, APTR(&G.), N_("")}, -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:98 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:105 msgid "set CCD temperature to given value (degr C)" -msgstr "" +msgstr "установить температуру ПЗС (градусы Ц)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:93 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:97 msgid "set I/O port pins to given value (decimal number, pin1 is LSB)" -msgstr "" +msgstr "установить порт I/O в заданное значение (десятичное число, пин1 - младший)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:88 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:92 msgid "set exposure time to given value (ms)" -msgstr "" +msgstr "установить время экспозиции (мс)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:63 +#. {"wheel-get",NO_ARGS, NULL, 0, arg_none, APTR(&G.getwheel), N_("get current wheel position")}, +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:102 +msgid "set wheel position" +msgstr "установить положение колеса" + +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:66 msgid "show this help" -msgstr "" +msgstr "отобразить эту справку" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:65 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:68 msgid "verbose level (each -v increase it)" -msgstr "" +msgstr "уровень сообщений (каждый -v повышает)" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/cmdlnopts.c:85 +#: /home/eddy/C-files/mytakepic/fli_control/cmdlnopts.c:89 msgid "vertical binning to N pixels" -msgstr "" +msgstr "вертикальный биннинг на N пикселей" #. "ожидание внешнего триггера" -#: /home/eddy/Docs/SAO/Cameras/FLI_camera/my/fli_control/main.c:223 +#: /home/eddy/C-files/mytakepic/fli_control/main.c:408 #, c-format msgid "wait for external trigger...\n" -msgstr "" +msgstr "ожидание внешнего триггера...\n" diff --git a/fli_control/main.c b/fli_control/main.c index 8abbba3..ede9b7f 100644 --- a/fli_control/main.c +++ b/fli_control/main.c @@ -661,7 +661,7 @@ int writepng(char *filename, int width, int height, void *data){ goto done; } png_init_io(pngptr, fp); - png_set_compression_level(pngptr, Z_BEST_COMPRESSION); + png_set_compression_level(pngptr, 6); png_set_IHDR(pngptr, infoptr, width, height, 16, PNG_COLOR_TYPE_GRAY, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);