From 279eb01dbebea62d1e02ec778920f4e25eefc372 Mon Sep 17 00:00:00 2001 From: Igor Belitskiy Date: Tue, 25 Apr 2023 15:45:43 +0600 Subject: [PATCH] fix --- source/CMakeLists.txt | 12 +- source/ubl-settings-datetime.cc | 27 +-- source/ubl-settings-datetime.h | 1 + source/ubl-settings-datetime.h.in | 1 + ubl-settings-datetime.glade | 1 + ubl-settings-datetime.pot | 362 +++++++++++++++++------------- ubl-settings-datetime_ru.po | 346 ++++++++++++++++------------ 7 files changed, 420 insertions(+), 330 deletions(-) create mode 100644 source/ubl-settings-datetime.h.in diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 8d44392..24b1c08 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -9,14 +9,19 @@ link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) find_package(ICU REQUIRED COMPONENTS uc dt in io) -option(WEBKIT_FOUND "" ON) -if(WEBKIT_FOUND) +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) + +option(WEBKIT_FOUND "No" OFF) + +find_library(WEBKIT_LIBRARIES_FOUND webkit2gtk-4.0 webkit2gtk-web-extension-4.0) +if(WEBKIT_LIBRARIES_FOUND) + option(WEBKIT_FOUND "Yes" ON) PKG_CHECK_MODULES(WEBKIT REQUIRED webkit2gtk-4.0 webkit2gtk-web-extension-4.0) include_directories(${WEBKIT_INCLUDE_DIRS}) link_directories(${WEBKIT_LIBRARY_DIRS}) add_definitions(${WEBKIT_CFLAGS_OTHER}) endif() - +configure_file(ubl-settings-datetime.h.in ubl-settings-datetime-cm.h) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ @@ -25,6 +30,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissin -fstack-clash-protection -fcf-protection") set(SOURCE_FILES + ubl-settings-datetime-cm.h ubl-util-standard.h ubl-util-standard.c main.cc diff --git a/source/ubl-settings-datetime.cc b/source/ubl-settings-datetime.cc index be97591..46359d0 100755 --- a/source/ubl-settings-datetime.cc +++ b/source/ubl-settings-datetime.cc @@ -87,13 +87,9 @@ void MainWindow::settings() { this->lacalization(); btnBoxAboutDialog->set_visible(false); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); - three = Glib::wrap(GTK_WIDGET(one)); - wndWeb->add(*three); - } + one = WEBKIT_WEB_VIEW( webkit_web_view_new() ); + three = Glib::wrap(GTK_WIDGET(one)); + wndWeb->add(*three); #endif if (geteuid() == 0) { numTimeHrs->set_range(0, 23); @@ -323,11 +319,7 @@ void MainWindow::get_builder() { builder->get_widget("overHead", overHead); builder->get_widget("imgHeadBackground", imgHeadBackground); #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - builder->get_widget("wndWeb", wndWeb); - } + builder->get_widget("wndWeb", wndWeb); #endif builder->get_widget("lblHeadeWndWeb", lblHeadeWndWeb); builder->get_widget("lblHeaderAboutTopic", lblHeaderAboutTopic); @@ -424,15 +416,8 @@ void MainWindow::synopsis_show() { void MainWindow::open_browser() { #ifdef WEBKIT_FOUND - void *handle=NULL; - handle = dlopen("libwebkit2gtk-4.0.so", RTLD_LAZY); - if (handle) { - webkit_web_view_load_uri(one, link_doc); - wndWeb->show_all(); - } - else { - this->template_open_browser(); - } + webkit_web_view_load_uri(one, link_doc); + wndWeb->show_all(); #else this->template_open_browser(); #endif diff --git a/source/ubl-settings-datetime.h b/source/ubl-settings-datetime.h index 4dccb5c..772ab85 100644 --- a/source/ubl-settings-datetime.h +++ b/source/ubl-settings-datetime.h @@ -19,6 +19,7 @@ #include #include #include "ubl-util-standard.c" +#include "ubl-settings-datetime-cm.h" #ifdef WEBKIT_FOUND #include diff --git a/source/ubl-settings-datetime.h.in b/source/ubl-settings-datetime.h.in new file mode 100644 index 0000000..17ba454 --- /dev/null +++ b/source/ubl-settings-datetime.h.in @@ -0,0 +1 @@ +#cmakedefine WEBKIT_FOUND \ No newline at end of file diff --git a/ubl-settings-datetime.glade b/ubl-settings-datetime.glade index 584ca60..8802c32 100644 --- a/ubl-settings-datetime.glade +++ b/ubl-settings-datetime.glade @@ -1604,6 +1604,7 @@ Format: DD.MM.YYYY True True com.ublinux.ubl-settings-datetime + center diff --git a/ubl-settings-datetime.pot b/ubl-settings-datetime.pot index 81c9fba..eece244 100644 --- a/ubl-settings-datetime.pot +++ b/ubl-settings-datetime.pot @@ -1,17 +1,17 @@ -# Language translations for ubl-settings-datetime package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-datetime package. -# UBLinux Team , 2022 +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ubl-settings-datetime 1.0\n" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-01-01 00:00+0600\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: UBLinux Team \n" +"POT-Creation-Date: 2023-04-25 15:44+0600\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,45 +20,47 @@ msgstr "" msgid ":" msgstr "" -#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.cc:81 -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 -#: source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 +#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 +#: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 msgid ": \"Date\"" msgstr "" -#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:71 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 -#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:60 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:73 -#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:80 -#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:85 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 +#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr "" -#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.cc:60 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:69 -#: source/ubl-settings-datetime.cc:70 source/ubl-settings-datetime.cc:74 -#: source/ubl-settings-datetime.cc:75 source/ubl-settings-datetime.cc:76 -#: source/ubl-settings-datetime.cc:77 source/ubl-settings-datetime.cc:80 -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 -#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:63 -#: source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.h:112 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:68 +#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:71 +#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 +#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 +#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.cc:58 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:68 -#: source/ubl-settings-datetime.cc:75 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.h:110 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:73 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr "" @@ -69,11 +71,12 @@ msgstr "" msgid "Abidjan" msgstr "" -#: source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "" -#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "" @@ -115,7 +118,8 @@ msgstr "" msgid "Almaty" msgstr "" -#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "" @@ -128,8 +132,9 @@ msgstr "" msgid "Amsterdam" msgstr "" -#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.cc:898 -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 +#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 +#: source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "" @@ -169,7 +174,7 @@ msgstr "" msgid "Arctic" msgstr "" -#: source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "" @@ -212,8 +217,9 @@ msgstr "" msgid "Atlantic" msgstr "" -#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.cc:157 -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "" @@ -376,7 +382,8 @@ msgstr "" msgid "Canberra" msgstr "" -#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "" @@ -488,8 +495,9 @@ msgstr "" msgid "Copenhagen" msgstr "" -#: source/ubl-settings-datetime.h:65 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "" @@ -511,16 +519,18 @@ msgstr "" msgid "Curacao" msgstr "" -#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:138 msgid "Current date and time" msgstr "" msgid "Currie" msgstr "" -#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.cc:144 -#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -542,27 +552,30 @@ msgstr "" msgid "Darwin" msgstr "" -#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "" -#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.cc:1459 -#: source/ubl-settings-datetime.cc:1477 source/ubl-settings-datetime.cc:1508 -#: source/ubl-settings-datetime.cc:1395 source/ubl-settings-datetime.cc:1414 -#: source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99 +#: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 +#: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 +#: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 msgid "Date and time are successfully synchronized" msgstr "" -#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:131 msgid "" "Date of\n" "Format: DD.MM.YYYY" msgstr "" -#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "" @@ -578,8 +591,9 @@ msgstr "" msgid "DeNoronha" msgstr "" -#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "" @@ -595,8 +609,9 @@ msgstr "" msgid "Dili" msgstr "" -#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "" @@ -663,9 +678,9 @@ msgstr "" msgid "Ensenada" msgstr "" -#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.cc:867 -#: source/ubl-settings-datetime.cc:1139 source/ubl-settings-datetime.cc:803 -#: source/ubl-settings-datetime.cc:1075 +#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 +#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 +#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 msgid "Enter a list of NTP servers" msgstr "" @@ -673,15 +688,16 @@ msgstr "" msgid "Enter a list of ntp servers" msgstr "" -#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:132 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." msgstr "" -#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.cc:903 -#: source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 +#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "" @@ -689,8 +705,9 @@ msgstr "" msgid "Error in the ntp name" msgstr "" -#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.cc:745 -#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 +#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 +#: source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "" @@ -736,7 +753,7 @@ msgstr "" msgid "GMT-3" msgstr "" -#: source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -776,23 +793,27 @@ msgstr "" msgid "Glace_Bay" msgstr "" -#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.cc:757 -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 +#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.cc:733 -#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 +#: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 +#: source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "" -#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.cc:763 -#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 +#: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.cc:741 -#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 +#: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "" @@ -844,13 +865,13 @@ msgstr "" msgid "Harbin" msgstr "" -#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.cc:856 -#: source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 +#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 msgid "Hardware clock successfully synchronized" msgstr "" -#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.cc:852 -#: source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 +#: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "" @@ -863,7 +884,7 @@ msgstr "" msgid "Hebron" msgstr "" -#: source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "" @@ -888,10 +909,10 @@ msgstr "" msgid "Hovd" msgstr "" -#: source/ubl-settings-datetime.h:98 source/ubl-settings-datetime.cc:1503 -#: source/ubl-settings-datetime.cc:1514 source/ubl-settings-datetime.cc:1440 -#: source/ubl-settings-datetime.cc:1451 source/ubl-settings-datetime.cc:1402 -#: source/ubl-settings-datetime.cc:1407 +#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98 +#: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 +#: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 +#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 msgid "Incorrect date format" msgstr "" @@ -1066,41 +1087,47 @@ msgstr "" msgid "Ljubljana" msgstr "" -#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "" -#: source/ubl-settings-datetime.h:77 +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "" -#: source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "" -#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.cc:754 -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 +#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "" -#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.cc:729 -#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 +#: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 +#: source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "" -#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.cc:760 -#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 +#: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "" -#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.cc:737 -#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 +#: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 +#: source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "" -#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.cc:161 -#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 +#: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "" @@ -1185,8 +1212,9 @@ msgstr "" msgid "Manila" msgstr "" -#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "" @@ -1311,8 +1339,8 @@ msgstr "" msgid "NTP is correct" msgstr "" -#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.cc:891 -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "" @@ -1364,11 +1392,12 @@ msgstr "" msgid "North_Dokota" msgstr "" -#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.cc:473 -#: source/ubl-settings-datetime.cc:502 source/ubl-settings-datetime.cc:533 -#: source/ubl-settings-datetime.cc:434 source/ubl-settings-datetime.cc:466 -#: source/ubl-settings-datetime.cc:497 source/ubl-settings-datetime.cc:433 -#: source/ubl-settings-datetime.cc:464 source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82 +#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502 +#: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 +#: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 msgid "Nothing to save!" msgstr "" @@ -1477,8 +1506,9 @@ msgstr "" msgid "Prague" msgstr "" -#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "" @@ -1515,7 +1545,8 @@ msgstr "" msgid "Rarotonga" msgstr "" -#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "" @@ -1525,8 +1556,9 @@ msgstr "" msgid "Regina" msgstr "" -#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "" @@ -1617,20 +1649,21 @@ msgstr "" msgid "Saskatchewan" msgstr "" -#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "" -#: source/ubl-settings-datetime.h:76 +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "" -#: source/ubl-settings-datetime.h:75 +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "" -#: source/ubl-settings-datetime.h:74 +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "" @@ -1646,8 +1679,9 @@ msgstr "" msgid "Setting date and time in global configuration" msgstr "" -#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "" @@ -1717,8 +1751,9 @@ msgstr "" msgid "Stop the synchronization service" msgstr "" -#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.cc:766 -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 +#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 +#: source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "" @@ -1728,13 +1763,15 @@ msgstr "" msgid "Sydney" msgstr "" -#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.cc:154 -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "" -#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.cc:158 -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 +#: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 +#: source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "" @@ -1743,8 +1780,9 @@ msgstr "" msgid "Synchronize hardware time:" msgstr "" -#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "" @@ -1784,8 +1822,9 @@ msgstr "" msgid "Tell_City" msgstr "" -#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.cc:122 -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 +#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 +#: source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "" @@ -1812,13 +1851,15 @@ msgstr "" msgid "Timbuktu" msgstr "" -#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.cc:151 -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "" -#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "" @@ -1861,8 +1902,9 @@ msgstr "" msgid "US" msgstr "" -#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.cc:160 -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "" @@ -1956,7 +1998,8 @@ msgstr "" msgid "Winnipeg" msgstr "" -#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 +#: source/ubl-settings-datetime.cc:168 msgid "Would you like to read documentation in the Web?" msgstr "" @@ -1984,7 +2027,8 @@ msgstr "" msgid "Yerevan" msgstr "" -#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.cc:169 +#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 +#: source/ubl-settings-datetime.cc:169 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." @@ -1999,8 +2043,9 @@ msgstr "" msgid "Zaporozhye" msgstr "" -#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "" @@ -2010,8 +2055,9 @@ msgstr "" msgid "Zurich" msgstr "" -#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "" @@ -2024,13 +2070,15 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "" -#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "" -#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.cc:1714 -#: source/ubl-settings-datetime.cc:1651 source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 +#: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651 +#: source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "" diff --git a/ubl-settings-datetime_ru.po b/ubl-settings-datetime_ru.po index 57a0951..2a6896c 100644 --- a/ubl-settings-datetime_ru.po +++ b/ubl-settings-datetime_ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: ubl-settings-datetime 1.0\n" "Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-25 15:09+0600\n" +"POT-Creation-Date: 2023-04-25 15:44+0600\n" "PO-Revision-Date: 2023-01-01 00:00+0600\n" "Last-Translator: UBLinux Team \n" "Language-Team: Russian - UBLinux Team \n" @@ -20,45 +20,47 @@ msgstr "" msgid ":" msgstr ":" -#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.cc:81 -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:83 -#: source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.h:109 +#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:82 +#: source/ubl-settings-datetime.cc:83 source/ubl-settings-datetime.cc:84 msgid ": \"Date\"" msgstr ": \"Дата\"" -#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:71 -#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 -#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:60 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:73 -#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:80 -#: source/ubl-settings-datetime.cc:81 source/ubl-settings-datetime.cc:85 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:84 +#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.h:111 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 +#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.cc:85 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:84 msgid ": \"Hardware time\"" msgstr ": \"Аппаратное время\"" -#: source/ubl-settings-datetime.h:112 source/ubl-settings-datetime.cc:60 -#: source/ubl-settings-datetime.cc:62 source/ubl-settings-datetime.cc:67 -#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:69 -#: source/ubl-settings-datetime.cc:70 source/ubl-settings-datetime.cc:74 -#: source/ubl-settings-datetime.cc:75 source/ubl-settings-datetime.cc:76 -#: source/ubl-settings-datetime.cc:77 source/ubl-settings-datetime.cc:80 -#: source/ubl-settings-datetime.cc:61 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:71 source/ubl-settings-datetime.cc:72 -#: source/ubl-settings-datetime.cc:78 source/ubl-settings-datetime.cc:79 -#: source/ubl-settings-datetime.cc:82 source/ubl-settings-datetime.cc:63 -#: source/ubl-settings-datetime.cc:81 +#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.h:112 +#: source/ubl-settings-datetime.cc:60 source/ubl-settings-datetime.cc:62 +#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:68 +#: source/ubl-settings-datetime.cc:69 source/ubl-settings-datetime.cc:70 +#: source/ubl-settings-datetime.cc:74 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:76 source/ubl-settings-datetime.cc:77 +#: source/ubl-settings-datetime.cc:80 source/ubl-settings-datetime.cc:61 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:71 +#: source/ubl-settings-datetime.cc:72 source/ubl-settings-datetime.cc:78 +#: source/ubl-settings-datetime.cc:79 source/ubl-settings-datetime.cc:82 +#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:81 msgid ": \"NTP\"" msgstr "" -#: source/ubl-settings-datetime.h:110 source/ubl-settings-datetime.cc:58 -#: source/ubl-settings-datetime.cc:63 source/ubl-settings-datetime.cc:66 -#: source/ubl-settings-datetime.cc:73 source/ubl-settings-datetime.cc:59 -#: source/ubl-settings-datetime.cc:65 source/ubl-settings-datetime.cc:68 -#: source/ubl-settings-datetime.cc:75 source/ubl-settings-datetime.cc:64 -#: source/ubl-settings-datetime.cc:67 source/ubl-settings-datetime.cc:74 +#: source/ubl-settings-datetime.h:111 source/ubl-settings-datetime.h:110 +#: source/ubl-settings-datetime.cc:58 source/ubl-settings-datetime.cc:63 +#: source/ubl-settings-datetime.cc:66 source/ubl-settings-datetime.cc:73 +#: source/ubl-settings-datetime.cc:59 source/ubl-settings-datetime.cc:65 +#: source/ubl-settings-datetime.cc:68 source/ubl-settings-datetime.cc:75 +#: source/ubl-settings-datetime.cc:64 source/ubl-settings-datetime.cc:67 +#: source/ubl-settings-datetime.cc:74 msgid ": \"Time Zone\"" msgstr ": \"Временная зона\"" @@ -69,11 +71,12 @@ msgstr "" msgid "Abidjan" msgstr "Абиджан" -#: source/ubl-settings-datetime.h:69 +#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.h:69 msgid "About" msgstr "О программе" -#: source/ubl-settings-datetime.h:70 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:71 source/ubl-settings-datetime.h:70 +#: source/ubl-settings-datetime.cc:137 msgid "About ubl-settings-datetime" msgstr "О программе Настройка даты и времени" @@ -117,7 +120,8 @@ msgstr "Алжир" msgid "Almaty" msgstr "Алматы" -#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.cc:173 +#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.h:81 +#: source/ubl-settings-datetime.cc:173 msgid "Always redirect" msgstr "Всегда перенаправлять" @@ -130,8 +134,9 @@ msgstr "Амман" msgid "Amsterdam" msgstr "Амстердам" -#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.cc:898 -#: source/ubl-settings-datetime.cc:834 source/ubl-settings-datetime.cc:817 +#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.h:102 +#: source/ubl-settings-datetime.cc:898 source/ubl-settings-datetime.cc:834 +#: source/ubl-settings-datetime.cc:817 msgid "An invalid character is entered" msgstr "Введён недопустимый символ" @@ -171,7 +176,7 @@ msgstr "Арагуайна" msgid "Arctic" msgstr "Арктика" -#: source/ubl-settings-datetime.h:107 +#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.h:107 msgid "Argument not recognized\n" msgstr "Нepacпoзнaнный аргумент\n" @@ -214,8 +219,9 @@ msgstr "Атка" msgid "Atlantic" msgstr "Атлантика" -#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.cc:157 -#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.h:121 +#: source/ubl-settings-datetime.cc:157 source/ubl-settings-datetime.cc:152 +#: source/ubl-settings-datetime.cc:147 msgid "Attention" msgstr "Внимание" @@ -378,7 +384,8 @@ msgstr "Канари" msgid "Canberra" msgstr "Канберра" -#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.cc:172 +#: source/ubl-settings-datetime.h:81 source/ubl-settings-datetime.h:80 +#: source/ubl-settings-datetime.cc:172 msgid "Cancel" msgstr "Отменить" @@ -490,8 +497,9 @@ msgstr "Континентальный" msgid "Copenhagen" msgstr "Копенгаген" -#: source/ubl-settings-datetime.h:65 source/ubl-settings-datetime.cc:130 -#: source/ubl-settings-datetime.cc:128 source/ubl-settings-datetime.cc:123 +#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.h:65 +#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.cc:123 msgid "Copyright © UBSoft LLC, 2022 - " msgstr "Авторские права © ООО \"Юбисофт\", 2022 - " @@ -513,16 +521,18 @@ msgstr "Куяба" msgid "Curacao" msgstr "Кюрасао" -#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.cc:147 -#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.h:129 +#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.cc:138 msgid "Current date and time" msgstr "Текущие дата и время" msgid "Currie" msgstr "Карри" -#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.cc:144 -#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.h:114 +#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.cc:135 msgid "DHCP" msgstr "" @@ -544,20 +554,22 @@ msgstr "Дар-эс-Салам" msgid "Darwin" msgstr "Дарвин" -#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.cc:133 -#: source/ubl-settings-datetime.cc:130 source/ubl-settings-datetime.cc:125 +#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.h:118 +#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.cc:125 msgid "Date and Time" msgstr "Дата и Время" -#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.cc:1459 -#: source/ubl-settings-datetime.cc:1477 source/ubl-settings-datetime.cc:1508 -#: source/ubl-settings-datetime.cc:1395 source/ubl-settings-datetime.cc:1414 -#: source/ubl-settings-datetime.cc:1445 +#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.h:99 +#: source/ubl-settings-datetime.cc:1459 source/ubl-settings-datetime.cc:1477 +#: source/ubl-settings-datetime.cc:1508 source/ubl-settings-datetime.cc:1395 +#: source/ubl-settings-datetime.cc:1414 source/ubl-settings-datetime.cc:1445 msgid "Date and time are successfully synchronized" msgstr "Дата и время успешно синхронизированы" -#: source/ubl-settings-datetime.h:130 source/ubl-settings-datetime.cc:140 -#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.h:130 +#: source/ubl-settings-datetime.cc:140 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.cc:131 msgid "" "Date of\n" "Format: DD.MM.YYYY" @@ -565,8 +577,9 @@ msgstr "" "Дата\n" "Формат: ДД.ММ.ГГГГ" -#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.cc:150 -#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.h:126 +#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.cc:141 msgid "Date:" msgstr "Дата:" @@ -582,8 +595,9 @@ msgstr "Доусон Крик" msgid "DeNoronha" msgstr "Фернанду-ди-Норонья" -#: source/ubl-settings-datetime.h:113 source/ubl-settings-datetime.cc:143 -#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.h:114 source/ubl-settings-datetime.h:113 +#: source/ubl-settings-datetime.cc:143 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.cc:134 msgid "Default" msgstr "По умолчанию" @@ -599,8 +613,9 @@ msgstr "Дакка" msgid "Dili" msgstr "Дили" -#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.cc:146 -#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.h:116 +#: source/ubl-settings-datetime.cc:146 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.cc:137 msgid "Disabled" msgstr "Отключено" @@ -667,9 +682,9 @@ msgstr "Эндербери" msgid "Ensenada" msgstr "Энсенада" -#: source/ubl-settings-datetime.h:100 source/ubl-settings-datetime.cc:867 -#: source/ubl-settings-datetime.cc:1139 source/ubl-settings-datetime.cc:803 -#: source/ubl-settings-datetime.cc:1075 +#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.h:100 +#: source/ubl-settings-datetime.cc:867 source/ubl-settings-datetime.cc:1139 +#: source/ubl-settings-datetime.cc:803 source/ubl-settings-datetime.cc:1075 msgid "Enter a list of NTP servers" msgstr "Введите перечень NTP серверов" @@ -678,8 +693,9 @@ msgstr "Введите перечень NTP серверов" msgid "Enter a list of ntp servers" msgstr "Введите перечень NTP серверов" -#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.cc:141 -#: source/ubl-settings-datetime.cc:137 source/ubl-settings-datetime.cc:132 +#: source/ubl-settings-datetime.h:133 source/ubl-settings-datetime.h:132 +#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:137 +#: source/ubl-settings-datetime.cc:132 msgid "" "Enter the name of the ntp-server or its ip-address.\n" "When entering multiple addresses, separate them with commas." @@ -687,8 +703,8 @@ msgstr "" "Введите имя ntp-сервера или его ip-адрес.\n" "При вводе нескольких адресов, разделяйте их запятыми." -#: source/ubl-settings-datetime.h:101 source/ubl-settings-datetime.cc:903 -#: source/ubl-settings-datetime.cc:839 +#: source/ubl-settings-datetime.h:102 source/ubl-settings-datetime.h:101 +#: source/ubl-settings-datetime.cc:903 source/ubl-settings-datetime.cc:839 msgid "Error in the NTP server name" msgstr "Ошибка в имени NTP сервера" @@ -697,8 +713,9 @@ msgstr "Ошибка в имени NTP сервера" msgid "Error in the ntp name" msgstr "Ошибка в имени NTP сервера" -#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.cc:745 -#: source/ubl-settings-datetime.cc:681 source/ubl-settings-datetime.cc:678 +#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.h:91 +#: source/ubl-settings-datetime.cc:745 source/ubl-settings-datetime.cc:681 +#: source/ubl-settings-datetime.cc:678 msgid "Error saved local and global configuration" msgstr "Ошибка сохранения локальной и глобальной конфигурации" @@ -744,7 +761,7 @@ msgstr "ГМТ-1" msgid "GMT-3" msgstr "ГМТ-3" -#: source/ubl-settings-datetime.h:85 +#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.h:85 msgid "" "GTK settings datetime for UBLinux\n" "\n" @@ -801,23 +818,27 @@ msgstr "Гибралтар" msgid "Glace_Bay" msgstr "Глейс-Бей" -#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.cc:757 -#: source/ubl-settings-datetime.cc:693 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.h:93 +#: source/ubl-settings-datetime.cc:757 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.cc:690 msgid "Global configuration downloaded successfully" msgstr "Успешно загружена глобальная конфигурация" -#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.cc:733 -#: source/ubl-settings-datetime.cc:669 source/ubl-settings-datetime.cc:666 +#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.h:88 +#: source/ubl-settings-datetime.cc:733 source/ubl-settings-datetime.cc:669 +#: source/ubl-settings-datetime.cc:666 msgid "Global configuration read error" msgstr "Ошибка чтения глобальной конфигурации" -#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.cc:763 -#: source/ubl-settings-datetime.cc:699 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.h:95 +#: source/ubl-settings-datetime.cc:763 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.cc:696 msgid "Global configuration successfully written" msgstr "Успешно записана глобальная конфигурация" -#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.cc:741 -#: source/ubl-settings-datetime.cc:677 source/ubl-settings-datetime.cc:674 +#: source/ubl-settings-datetime.h:91 source/ubl-settings-datetime.h:90 +#: source/ubl-settings-datetime.cc:741 source/ubl-settings-datetime.cc:677 +#: source/ubl-settings-datetime.cc:674 msgid "Global configuration write error" msgstr "Ошибка записи глобальной конфигурации" @@ -869,13 +890,13 @@ msgstr "Хараре" msgid "Harbin" msgstr "Харбин" -#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.cc:856 -#: source/ubl-settings-datetime.cc:792 +#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.h:104 +#: source/ubl-settings-datetime.cc:856 source/ubl-settings-datetime.cc:792 msgid "Hardware clock successfully synchronized" msgstr "Аппаратные часы успешно синхронизированы" -#: source/ubl-settings-datetime.h:105 source/ubl-settings-datetime.cc:852 -#: source/ubl-settings-datetime.cc:788 +#: source/ubl-settings-datetime.h:106 source/ubl-settings-datetime.h:105 +#: source/ubl-settings-datetime.cc:852 source/ubl-settings-datetime.cc:788 msgid "Hardware clock synchronization error" msgstr "Ошибка синхронизации аппаратных часов" @@ -888,7 +909,7 @@ msgstr "Гавайи" msgid "Hebron" msgstr "Хеврон" -#: source/ubl-settings-datetime.h:71 +#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.h:71 msgid "Help" msgstr "Справка" @@ -913,10 +934,10 @@ msgstr "Гонолулу" msgid "Hovd" msgstr "Ховд" -#: source/ubl-settings-datetime.h:98 source/ubl-settings-datetime.cc:1503 -#: source/ubl-settings-datetime.cc:1514 source/ubl-settings-datetime.cc:1440 -#: source/ubl-settings-datetime.cc:1451 source/ubl-settings-datetime.cc:1402 -#: source/ubl-settings-datetime.cc:1407 +#: source/ubl-settings-datetime.h:99 source/ubl-settings-datetime.h:98 +#: source/ubl-settings-datetime.cc:1503 source/ubl-settings-datetime.cc:1514 +#: source/ubl-settings-datetime.cc:1440 source/ubl-settings-datetime.cc:1451 +#: source/ubl-settings-datetime.cc:1402 source/ubl-settings-datetime.cc:1407 msgid "Incorrect date format" msgstr "Не верный формат даты" @@ -1091,41 +1112,47 @@ msgstr "Лиссабон" msgid "Ljubljana" msgstr "Любляна" -#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.cc:139 -#: source/ubl-settings-datetime.cc:135 source/ubl-settings-datetime.cc:130 +#: source/ubl-settings-datetime.h:74 source/ubl-settings-datetime.h:73 +#: source/ubl-settings-datetime.cc:139 source/ubl-settings-datetime.cc:135 +#: source/ubl-settings-datetime.cc:130 msgid "Load" msgstr "Загрузить" -#: source/ubl-settings-datetime.h:77 +#: source/ubl-settings-datetime.h:78 source/ubl-settings-datetime.h:77 msgid "Load global configuration" msgstr "Загрузить глобальную конфигурацию" -#: source/ubl-settings-datetime.h:78 +#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.h:78 msgid "Load local configuration" msgstr "Загрузить локальную конфигурацию" -#: source/ubl-settings-datetime.h:92 source/ubl-settings-datetime.cc:754 -#: source/ubl-settings-datetime.cc:690 source/ubl-settings-datetime.cc:687 +#: source/ubl-settings-datetime.h:93 source/ubl-settings-datetime.h:92 +#: source/ubl-settings-datetime.cc:754 source/ubl-settings-datetime.cc:690 +#: source/ubl-settings-datetime.cc:687 msgid "Local configuration downloaded successfully" msgstr "Успешно загружена локальная конфигурация" -#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.cc:729 -#: source/ubl-settings-datetime.cc:665 source/ubl-settings-datetime.cc:662 +#: source/ubl-settings-datetime.h:88 source/ubl-settings-datetime.h:87 +#: source/ubl-settings-datetime.cc:729 source/ubl-settings-datetime.cc:665 +#: source/ubl-settings-datetime.cc:662 msgid "Local configuration reading error" msgstr "Ошибка чтения локальной конфигурации" -#: source/ubl-settings-datetime.h:94 source/ubl-settings-datetime.cc:760 -#: source/ubl-settings-datetime.cc:696 source/ubl-settings-datetime.cc:693 +#: source/ubl-settings-datetime.h:95 source/ubl-settings-datetime.h:94 +#: source/ubl-settings-datetime.cc:760 source/ubl-settings-datetime.cc:696 +#: source/ubl-settings-datetime.cc:693 msgid "Local configuration successfully written" msgstr "Успешно записана локальная конфигурация" -#: source/ubl-settings-datetime.h:89 source/ubl-settings-datetime.cc:737 -#: source/ubl-settings-datetime.cc:673 source/ubl-settings-datetime.cc:670 +#: source/ubl-settings-datetime.h:90 source/ubl-settings-datetime.h:89 +#: source/ubl-settings-datetime.cc:737 source/ubl-settings-datetime.cc:673 +#: source/ubl-settings-datetime.cc:670 msgid "Local configuration write error" msgstr "Ошибка записи локальной конфигурации" -#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.cc:161 -#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.h:121 source/ubl-settings-datetime.h:120 +#: source/ubl-settings-datetime.cc:161 source/ubl-settings-datetime.cc:156 +#: source/ubl-settings-datetime.cc:151 msgid "Local time" msgstr "Локальное время" @@ -1210,8 +1237,9 @@ msgstr "Манаус" msgid "Manila" msgstr "Манила" -#: source/ubl-settings-datetime.h:115 source/ubl-settings-datetime.cc:145 -#: source/ubl-settings-datetime.cc:141 source/ubl-settings-datetime.cc:136 +#: source/ubl-settings-datetime.h:116 source/ubl-settings-datetime.h:115 +#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:141 +#: source/ubl-settings-datetime.cc:136 msgid "Manual" msgstr "Вручную" @@ -1337,8 +1365,8 @@ msgstr "Новый Южный Уэльс" msgid "NTP is correct" msgstr "Имя NTP сервера корректно" -#: source/ubl-settings-datetime.h:103 source/ubl-settings-datetime.cc:891 -#: source/ubl-settings-datetime.cc:827 +#: source/ubl-settings-datetime.h:104 source/ubl-settings-datetime.h:103 +#: source/ubl-settings-datetime.cc:891 source/ubl-settings-datetime.cc:827 msgid "NTP server name is correct" msgstr "Имя NTP сервера корректно" @@ -1390,11 +1418,12 @@ msgstr "Север" msgid "North_Dokota" msgstr "Северная Докота" -#: source/ubl-settings-datetime.h:82 source/ubl-settings-datetime.cc:473 -#: source/ubl-settings-datetime.cc:502 source/ubl-settings-datetime.cc:533 -#: source/ubl-settings-datetime.cc:434 source/ubl-settings-datetime.cc:466 -#: source/ubl-settings-datetime.cc:497 source/ubl-settings-datetime.cc:433 -#: source/ubl-settings-datetime.cc:464 source/ubl-settings-datetime.cc:494 +#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.h:82 +#: source/ubl-settings-datetime.cc:473 source/ubl-settings-datetime.cc:502 +#: source/ubl-settings-datetime.cc:533 source/ubl-settings-datetime.cc:434 +#: source/ubl-settings-datetime.cc:466 source/ubl-settings-datetime.cc:497 +#: source/ubl-settings-datetime.cc:433 source/ubl-settings-datetime.cc:464 +#: source/ubl-settings-datetime.cc:494 msgid "Nothing to save!" msgstr "Нечего сохранять!" @@ -1503,8 +1532,9 @@ msgstr "Порту-Велью" msgid "Prague" msgstr "Прага" -#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.cc:136 -#: source/ubl-settings-datetime.cc:133 source/ubl-settings-datetime.cc:128 +#: source/ubl-settings-datetime.h:69 source/ubl-settings-datetime.h:68 +#: source/ubl-settings-datetime.cc:136 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.cc:128 msgid "Project Home Page" msgstr "Домашняя страница проекта" @@ -1541,7 +1571,8 @@ msgstr "Ранкин-Инлет" msgid "Rarotonga" msgstr "Раротонга" -#: source/ubl-settings-datetime.h:79 source/ubl-settings-datetime.cc:171 +#: source/ubl-settings-datetime.h:80 source/ubl-settings-datetime.h:79 +#: source/ubl-settings-datetime.cc:171 msgid "Read online" msgstr "Прочитать онлайн" @@ -1551,8 +1582,9 @@ msgstr "Ресифи" msgid "Regina" msgstr "Реджайна" -#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.cc:152 -#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:143 +#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.h:124 +#: source/ubl-settings-datetime.cc:152 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.cc:143 msgid "Region:" msgstr "Регион:" @@ -1643,20 +1675,21 @@ msgstr "Саратов" msgid "Saskatchewan" msgstr "Саскачеван" -#: source/ubl-settings-datetime.h:72 source/ubl-settings-datetime.cc:138 -#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:129 +#: source/ubl-settings-datetime.h:73 source/ubl-settings-datetime.h:72 +#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:134 +#: source/ubl-settings-datetime.cc:129 msgid "Save" msgstr "Сохранить" -#: source/ubl-settings-datetime.h:76 +#: source/ubl-settings-datetime.h:77 source/ubl-settings-datetime.h:76 msgid "Save global configuration" msgstr "Сохранить глобальную конфигурацию" -#: source/ubl-settings-datetime.h:75 +#: source/ubl-settings-datetime.h:76 source/ubl-settings-datetime.h:75 msgid "Save local configuration" msgstr "Сохранить локальную конфигурацию" -#: source/ubl-settings-datetime.h:74 +#: source/ubl-settings-datetime.h:75 source/ubl-settings-datetime.h:74 msgid "Save to global and local configuration" msgstr "Сохранить глобальную и локальную конфигурацию" @@ -1672,8 +1705,9 @@ msgstr "Сеул" msgid "Setting date and time in global configuration" msgstr "Настройка даты и времени в глобальной конфигурации" -#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.cc:148 -#: source/ubl-settings-datetime.cc:144 source/ubl-settings-datetime.cc:139 +#: source/ubl-settings-datetime.h:129 source/ubl-settings-datetime.h:128 +#: source/ubl-settings-datetime.cc:148 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.cc:139 msgid "Setting the date and time" msgstr "Настройка даты и времени" @@ -1743,8 +1777,9 @@ msgstr "Стокгольм" msgid "Stop the synchronization service" msgstr "Остановить сервис синхронизации" -#: source/ubl-settings-datetime.h:96 source/ubl-settings-datetime.cc:766 -#: source/ubl-settings-datetime.cc:702 source/ubl-settings-datetime.cc:699 +#: source/ubl-settings-datetime.h:97 source/ubl-settings-datetime.h:96 +#: source/ubl-settings-datetime.cc:766 source/ubl-settings-datetime.cc:702 +#: source/ubl-settings-datetime.cc:699 msgid "Successfully saved local and global configuration" msgstr "Успешно сохранена локальная и глобальная конфигурация" @@ -1754,13 +1789,15 @@ msgstr "Суифт-Каррент" msgid "Sydney" msgstr "Сидней" -#: source/ubl-settings-datetime.h:122 source/ubl-settings-datetime.cc:154 -#: source/ubl-settings-datetime.cc:150 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.h:122 +#: source/ubl-settings-datetime.cc:154 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.cc:145 msgid "Sync by" msgstr "Синхронизировать" -#: source/ubl-settings-datetime.h:127 source/ubl-settings-datetime.cc:158 -#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:148 +#: source/ubl-settings-datetime.h:128 source/ubl-settings-datetime.h:127 +#: source/ubl-settings-datetime.cc:158 source/ubl-settings-datetime.cc:153 +#: source/ubl-settings-datetime.cc:148 msgid "Synchronize hardware time" msgstr "Синхронизировать аппаратное время" @@ -1769,8 +1806,9 @@ msgstr "Синхронизировать аппаратное время" msgid "Synchronize hardware time:" msgstr "Синхронизировать аппаратное время:" -#: source/ubl-settings-datetime.h:131 source/ubl-settings-datetime.cc:142 -#: source/ubl-settings-datetime.cc:138 source/ubl-settings-datetime.cc:133 +#: source/ubl-settings-datetime.h:132 source/ubl-settings-datetime.h:131 +#: source/ubl-settings-datetime.cc:142 source/ubl-settings-datetime.cc:138 +#: source/ubl-settings-datetime.cc:133 msgid "Synchronize via NTP" msgstr "Синхронизировать через NTP" @@ -1810,8 +1848,9 @@ msgstr "Тель-Авив" msgid "Tell_City" msgstr "Телл-Сити" -#: source/ubl-settings-datetime.h:108 source/ubl-settings-datetime.cc:122 -#: source/ubl-settings-datetime.cc:120 source/ubl-settings-datetime.cc:115 +#: source/ubl-settings-datetime.h:109 source/ubl-settings-datetime.h:108 +#: source/ubl-settings-datetime.cc:122 source/ubl-settings-datetime.cc:120 +#: source/ubl-settings-datetime.cc:115 msgid "The program must be run as root" msgstr "Программа должна быть запущена с правами суперпользователя!" @@ -1840,13 +1879,15 @@ msgstr "Тихуана" msgid "Timbuktu" msgstr "Тимбукту" -#: source/ubl-settings-datetime.h:125 source/ubl-settings-datetime.cc:151 -#: source/ubl-settings-datetime.cc:147 source/ubl-settings-datetime.cc:142 +#: source/ubl-settings-datetime.h:126 source/ubl-settings-datetime.h:125 +#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:147 +#: source/ubl-settings-datetime.cc:142 msgid "Time zone" msgstr "Часовой пояс" -#: source/ubl-settings-datetime.h:117 source/ubl-settings-datetime.cc:149 -#: source/ubl-settings-datetime.cc:145 source/ubl-settings-datetime.cc:140 +#: source/ubl-settings-datetime.h:118 source/ubl-settings-datetime.h:117 +#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:145 +#: source/ubl-settings-datetime.cc:140 msgid "Time:" msgstr "Время:" @@ -1889,8 +1930,9 @@ msgstr "Тунис" msgid "US" msgstr "США" -#: source/ubl-settings-datetime.h:119 source/ubl-settings-datetime.cc:160 -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:150 +#: source/ubl-settings-datetime.h:120 source/ubl-settings-datetime.h:119 +#: source/ubl-settings-datetime.cc:160 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:150 msgid "UTC time" msgstr "Время по UTC" @@ -1984,7 +2026,8 @@ msgstr "Виндхук" msgid "Winnipeg" msgstr "Виннипег" -#: source/ubl-settings-datetime.h:83 source/ubl-settings-datetime.cc:168 +#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.h:83 +#: source/ubl-settings-datetime.cc:168 msgid "Would you like to read documentation in the Web?" msgstr "Вы хотите прочитать справку в Сети?" @@ -2012,7 +2055,8 @@ msgstr "Йеллоунайф" msgid "Yerevan" msgstr "Ереван" -#: source/ubl-settings-datetime.h:84 source/ubl-settings-datetime.cc:169 +#: source/ubl-settings-datetime.h:85 source/ubl-settings-datetime.h:84 +#: source/ubl-settings-datetime.cc:169 msgid "" "You will be redirected to documentation site, where user help pages are " "translated and supported by community." @@ -2029,8 +2073,9 @@ msgstr "Загреб" msgid "Zaporozhye" msgstr "Запорожье" -#: source/ubl-settings-datetime.h:123 source/ubl-settings-datetime.cc:153 -#: source/ubl-settings-datetime.cc:149 source/ubl-settings-datetime.cc:144 +#: source/ubl-settings-datetime.h:124 source/ubl-settings-datetime.h:123 +#: source/ubl-settings-datetime.cc:153 source/ubl-settings-datetime.cc:149 +#: source/ubl-settings-datetime.cc:144 msgid "Zone:" msgstr "Зона:" @@ -2040,8 +2085,9 @@ msgstr "Зулу" msgid "Zurich" msgstr "Цюрих" -#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.cc:134 -#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:126 +#: source/ubl-settings-datetime.h:68 source/ubl-settings-datetime.h:67 +#: source/ubl-settings-datetime.cc:134 source/ubl-settings-datetime.cc:131 +#: source/ubl-settings-datetime.cc:126 msgid "https://wiki.ublinux.com" msgstr "https://wiki.ublinux.ru" @@ -2056,13 +2102,15 @@ msgstr "" msgid "ubl-settings-bootloader" msgstr "О программе Загрузка системы" -#: source/ubl-settings-datetime.h:66 source/ubl-settings-datetime.cc:131 -#: source/ubl-settings-datetime.cc:155 source/ubl-settings-datetime.cc:156 -#: source/ubl-settings-datetime.cc:151 source/ubl-settings-datetime.cc:146 +#: source/ubl-settings-datetime.h:67 source/ubl-settings-datetime.h:66 +#: source/ubl-settings-datetime.cc:131 source/ubl-settings-datetime.cc:155 +#: source/ubl-settings-datetime.cc:156 source/ubl-settings-datetime.cc:151 +#: source/ubl-settings-datetime.cc:146 msgid "ubl-settings-datetime" msgstr "Настройка даты и времени" -#: source/ubl-settings-datetime.h:86 source/ubl-settings-datetime.cc:1714 -#: source/ubl-settings-datetime.cc:1651 source/ubl-settings-datetime.cc:1606 +#: source/ubl-settings-datetime.h:87 source/ubl-settings-datetime.h:86 +#: source/ubl-settings-datetime.cc:1714 source/ubl-settings-datetime.cc:1651 +#: source/ubl-settings-datetime.cc:1606 msgid "ubl-settings-datetime version: " msgstr "ubl-settings-datetime версия: "