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 0c6b727..0000000 Binary files a/extern/fliusb-1.3.tgz and /dev/null differ 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 858ad4e..a6bd7e1 100644 Binary files a/fli_control/locale/ru/LC_MESSAGES/fli_control.mo and b/fli_control/locale/ru/LC_MESSAGES/fli_control.mo differ 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);