From 88726b5ff1994847142ac79f80b8c23d6de3adb7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 25 Nov 2025 18:16:03 +0600 Subject: [PATCH] Localisation; Documentation dialog fix; About dialog fix --- Makefile | 80 +++--- .../apps/com.ublinux.ubl-settings-manager.svg | 0 locale/ubl-settings-manager.pot | 145 +++++++++++ locale/ubl-settings-manager_ru.po | 146 +++++++++++ source/CMakeLists.txt | 1 + source/ubl-settings-manager-misc.c | 69 +++++ .../ubl-settings-manager-settings-sections.c | 8 +- source/ubl-settings-manager-theme-gnome.c | 27 ++ source/ubl-settings-manager.c | 12 +- source/ubl-settings-manager.h | 11 +- source/ubl-strings.h | 19 +- ubl-settings-manager-section-element.glade | 3 +- ubl-settings-manager-settings-sections.glade | 4 +- ubl-settings-manager-settings.glade | 5 +- ...settings-manager-theme-main-IconView.glade | 60 ----- ubl-settings-manager.conf | 22 -- ubl-settings-manager.glade | 2 +- ubl-settings-manager.pot | 164 ------------ ubl-settings-manager_ru.po | 172 ------------- ublinux-logo.svg | 241 ------------------ 20 files changed, 477 insertions(+), 714 deletions(-) rename com.ublinux.ubl-settings-manager.svg => icons/apps/com.ublinux.ubl-settings-manager.svg (100%) create mode 100644 locale/ubl-settings-manager.pot create mode 100644 locale/ubl-settings-manager_ru.po create mode 100644 source/ubl-settings-manager-misc.c delete mode 100644 ubl-settings-manager-theme-main-IconView.glade delete mode 100644 ubl-settings-manager.conf delete mode 100644 ubl-settings-manager.pot delete mode 100644 ubl-settings-manager_ru.po delete mode 100644 ublinux-logo.svg diff --git a/Makefile b/Makefile index a990f29..2e62183 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,6 @@ DEPENDS = /bin/cmake PREFIX ?= /usr/local PKGNAME = $(MAKEFILE_DIR) FILE_VER = source/${PKGNAME}.h -PKGIDENT=$(subst /,-,${PREFIX}) default_target: all @@ -22,9 +21,9 @@ all: init build init: @echo "Initialize ..."; \ - if [ -d ".git" ]; then \ + if [[ -d ".git" ]]; then \ LATEST_TAG=$$(git describe --abbrev=0 --tags | sed 's/^v//'); \ - if [ -z "$${LATEST_TAG}" ]; \ + if [[ -z "$${LATEST_TAG}" ]]; \ then \ LATEST_TAG=$$"0.0"; \ echo "$${LATEST_TAG} is empty"; \ @@ -38,7 +37,7 @@ init: depend: @echo "Check depends ..." @for FILE_DEPEND in $(DEPENDS); do \ - if [ ! -f $${FILE_DEPEND} ]; then \ + if [[ ! -f "$${FILE_DEPEND}" ]]; then \ echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \ exit 1; \ fi; \ @@ -48,21 +47,21 @@ depend: debug: @echo "Debug ..." - if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ + if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \ fi; \ echo "Debug: OK" prepare: @echo "Prepare ..."; \ - if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ + if [[ ! -d "${CMAKE_BUILD_DIR}" ]]; then \ $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${PREFIX}"; \ fi; \ echo "Prepare: OK" check: @echo "Check ..."; \ - if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \ + if [[ -f "${CMAKE_BUILD_DIR}/${PKGNAME}" ]]; then \ echo "Check: OK"; \ else \ echo "Check: ${CMAKE_BUILD_DIR}/${PKGNAME} not found !"; \ @@ -77,10 +76,9 @@ build: depend prepare uninstall: @echo "Uninstall ..." - @for FILE_PO in $(wildcard *.po); do \ - LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -92,48 +90,64 @@ uninstall: $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done + @for FILE_ICON in $(wildcard icons/*/*.svg); do \ + SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ + $(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}/$${FILE_ICON##*/}"; \ + done @$(RM) "${DESTDIR}${PREFIX}/bin/${PKGNAME}" @$(RM) "${DESTDIR}${PREFIX}/share/applications/${PKGNAME}.desktop" - @$(RM) "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" - @$(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ + @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ + $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}.policy"; \ + else \ +# $(RM) "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + $(RM) "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + fi + @if [[ -z "${DESTDIR}" ]]; then \ + [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ - [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ + [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Uninstall: OK" install: check uninstall @echo "Install ..." - @for FILE_PO in $(wildcard *.po); do \ - LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ - FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ - echo "$${FILE_PO}"; \ - msgfmt "$${FILE_PO}" -v -f -o "$${PATH_FILE_MO}"; \ + @for LANG in $$(find ./locale -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ + install -dm755 "${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES"; \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PKGNAME_PO="./locale/${PKGNAME}_$${LANG}.po"; [[ -f "$${PKGNAME_PO}" ]] || PKGNAME_PO= ; \ + msgfmt --verbose --use-fuzzy --output-file "$${PATH_FILE_MO}" - < <(msgcat --use-first --no-wrap $${PKGNAME_PO} ./locale/*_$${LANG}.po); \ done @for SIZE in 16 32 48; do \ - install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + install -dm755 "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "icons/apps/com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}${PREFIX}/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.svg"; \ + done + @for FILE_ICON in $(wildcard icons/*/*.svg); do \ + SUB_NAME=$${FILE_ICON#*/}; SUB_NAME=$${SUB_NAME%/*}; \ + install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/$${SUB_NAME}" $${FILE_ICON}; \ done - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @cp ./com.ublinux.${PKGNAME}.policy ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy - @sed -e 's+/usr/bin+${PREFIX}/bin+' -e 's+.run+${PKGIDENT}.run+g' ./compile/com.ublinux.${PKGNAME}${PKGIDENT}.policy -i @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" - @install -Dm644 -t "${DESTDIR}/usr/share/polkit-1/actions/" "${CMAKE_BUILD_DIR}/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ + @if [[ "${PREFIX}" == @("/usr"|"/usr/") ]]; then \ + install -Dm644 -t "${DESTDIR}${PREFIX}/share/polkit-1/actions/" "com.ublinux.${PKGNAME}.policy"; \ + else \ +# install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ +# sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}${PREFIX}/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + sed -e "s+/usr/bin+${PREFIX}/bin+" -e "s+\.run+$${PREFIX//\//-}\.run+g" -i "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}$${PREFIX//\//-}.policy"; \ + fi + @if [[ -z "${DESTDIR}" ]]; then \ + ldconfig -n ${DESTDIR}${PREFIX}/lib; \ + [[ -d "${DESTDIR}${PREFIX}/share/icons/hicolor/" ]] && gtk-update-icon-cache -fiq "${DESTDIR}${PREFIX}/share/icons/hicolor/" &>/dev/null || true; \ update-desktop-database --quiet &>/dev/null || true; \ - [ -d "${DESTDIR}${PREFIX}/share/applications" ] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ + [[ -d "${DESTDIR}${PREFIX}/share/applications" ]] && touch "${DESTDIR}${PREFIX}/share/applications" &>/dev/null || true; \ fi @echo "Install: OK" clean: @echo "Clean ..." @$(RM) -rd ${CMAKE_BUILD_DIR} - @if [ -d ${CMAKE_BUILD_DIR} ]; then \ + @if [[ -d "${CMAKE_BUILD_DIR}" ]]; then \ echo "Clean: error, compile directory exist ${CMAKE_BUILD_DIR}"; \ else \ echo "Clean: OK"; \ diff --git a/com.ublinux.ubl-settings-manager.svg b/icons/apps/com.ublinux.ubl-settings-manager.svg similarity index 100% rename from com.ublinux.ubl-settings-manager.svg rename to icons/apps/com.ublinux.ubl-settings-manager.svg diff --git a/locale/ubl-settings-manager.pot b/locale/ubl-settings-manager.pot new file mode 100644 index 0000000..ed32ae0 --- /dev/null +++ b/locale/ubl-settings-manager.pot @@ -0,0 +1,145 @@ +# Language translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2023-04-21 12:33+0000\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-strings.h:3 +msgid "UBLinux Settings Manager" +msgstr "" + +#: source/ubl-strings.h:4 +msgid "About UBLinux Settings Manager" +msgstr "" + +#: source/ubl-strings.h:6 +msgid "" +"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" +"manager" +msgstr "" + +#: source/ubl-strings.h:8 +msgid "Settings manager for UBLinux" +msgstr "" + +#: source/ubl-strings.h:9 +msgid "Back to settings" +msgstr "" + +#: source/ubl-strings.h:10 +msgid "Config loading failed!\n" +msgstr "" + +#: source/ubl-strings.h:11 +msgid "Double click selection" +msgstr "" + +#: source/ubl-strings.h:12 +msgid "Sections management" +msgstr "" + +#: source/ubl-strings.h:13 +msgid "Understood" +msgstr "" + +#: source/ubl-strings.h:14 +msgid "Settings" +msgstr "" + +#: source/ubl-strings.h:15 +msgid "Apply" +msgstr "" + +#: source/ubl-strings.h:16 +msgid "Close" +msgstr "" + +#: source/ubl-strings.h:17 +msgid "Cancel" +msgstr "" + +#: source/ubl-strings.h:18 +msgid "About..." +msgstr "" + +#: source/ubl-strings.h:19 +msgid "Documentation" +msgstr "" + +#: source/ubl-strings.h:20 +msgid "Window theme" +msgstr "" + +#: source/ubl-strings.h:21 +msgid "Icon size" +msgstr "" + +#: source/ubl-strings.h:22 +msgid "All settings" +msgstr "" + +#: source/ubl-strings.h:23 +msgid "Failed to load theme" +msgstr "" + +#: source/ubl-strings.h:24 +msgid "Main theme" +msgstr "" + +#: source/ubl-strings.h:25 +msgid "GNOME theme" +msgstr "" + +#: source/ubl-strings.h:26 +msgid "Default" +msgstr "" + +#: source/ubl-strings.h:27 +msgid "Section name" +msgstr "" + +#: source/ubl-strings.h:28 +msgid "Identifier" +msgstr "" + +#: source/ubl-strings.h:29 +msgid "Add section" +msgstr "" + +#: source/ubl-strings.h:30 +msgid "Clear fields" +msgstr "" + +#: source/ubl-strings.h:31 +msgid "Remove section" +msgstr "" + +#: source/ubl-strings.h:32 +msgid "Personal" +msgstr "" + +#: source/ubl-strings.h:33 +msgid "Hardware" +msgstr "" + +#: source/ubl-strings.h:34 +msgid "System" +msgstr "" + +#: source/ubl-strings.h:35 +msgid "Misc" +msgstr "" diff --git a/locale/ubl-settings-manager_ru.po b/locale/ubl-settings-manager_ru.po new file mode 100644 index 0000000..469b1f5 --- /dev/null +++ b/locale/ubl-settings-manager_ru.po @@ -0,0 +1,146 @@ +# Russian translations for ubl-settings-manager package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-manager package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-manager 1.0\n" +"Report-Msgid-Bugs-To: info@ublinux.com\n" +"POT-Creation-Date: 2023-04-21 12:33+0000\n" +"PO-Revision-Date: 2023-01-01 00:00+0600\n" +"Last-Translator: UBLinux Team \n" +"Language-Team: Russian - UBLinux Team \n" +"Language: Russian\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-strings.h:3 +msgid "UBLinux Settings Manager" +msgstr "Диспетчер настроек UBLinux" + +#: source/ubl-strings.h:4 +msgid "About UBLinux Settings Manager" +msgstr "О приложении Диспетчер настроек UBLinux" + +#: source/ubl-strings.h:6 +msgid "" +"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" +"manager" +msgstr "" +"https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-" +"manager" + +#: source/ubl-strings.h:8 +msgid "Settings manager for UBLinux" +msgstr "Диспетчер настроек UBLinux" + +#: source/ubl-strings.h:9 +msgid "Back to settings" +msgstr "Назад к настройкам" + +#: source/ubl-strings.h:10 +msgid "Config loading failed!\n" +msgstr "Ошибка загрузки конфигурации!\n" + +#: source/ubl-strings.h:11 +msgid "Double click selection" +msgstr "Открывать приложения двойным нажатием" + +#: source/ubl-strings.h:12 +msgid "Sections management" +msgstr "Настройка разделов" + +#: source/ubl-strings.h:13 +msgid "Understood" +msgstr "Понятно" + +#: source/ubl-strings.h:14 +msgid "Settings" +msgstr "Настройки" + +#: source/ubl-strings.h:15 +msgid "Apply" +msgstr "Применить" + +#: source/ubl-strings.h:16 +msgid "Close" +msgstr "Закрыть" + +#: source/ubl-strings.h:17 +msgid "Cancel" +msgstr "Отменить" + +#: source/ubl-strings.h:18 +msgid "About..." +msgstr "О программе..." + +#: source/ubl-strings.h:19 +msgid "Documentation" +msgstr "Справка" + +#: source/ubl-strings.h:20 +msgid "Window theme" +msgstr "Выбор темы" + +#: source/ubl-strings.h:21 +msgid "Icon size" +msgstr "Размер иконок" + +#: source/ubl-strings.h:22 +msgid "All settings" +msgstr "Все настройки" + +#: source/ubl-strings.h:23 +msgid "Failed to load theme" +msgstr "Ошибка загрузки темы" + +#: source/ubl-strings.h:24 +msgid "Main theme" +msgstr "Основная тема" + +#: source/ubl-strings.h:25 +msgid "GNOME theme" +msgstr "GNOME тема" + +#: source/ubl-strings.h:26 +msgid "Default" +msgstr "По умолчанию" + +#: source/ubl-strings.h:27 +msgid "Section name" +msgstr "Название раздела" + +#: source/ubl-strings.h:28 +msgid "Identifier" +msgstr "Идентификатор" + +#: source/ubl-strings.h:29 +msgid "Add section" +msgstr "Добавить раздел" + +#: source/ubl-strings.h:30 +msgid "Clear fields" +msgstr "Очистить поля" + +#: source/ubl-strings.h:31 +msgid "Remove section" +msgstr "Удалить раздел" + +#: source/ubl-strings.h:32 +msgid "Personal" +msgstr "Личные" + +#: source/ubl-strings.h:33 +msgid "Hardware" +msgstr "Оборудование" + +#: source/ubl-strings.h:34 +msgid "System" +msgstr "Система" + +#: source/ubl-strings.h:35 +msgid "Misc" +msgstr "Прочее" diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 1198fd8..dfdad2a 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -78,6 +78,7 @@ set(SOURCE_FILES ubl-settings-manager-theme-main.c ubl-settings-manager-app-sections.c ubl-settings-manager-settings-sections.c + ubl-settings-manager-misc.c ubl-settings-manager.h ubl-strings.h ) diff --git a/source/ubl-settings-manager-misc.c b/source/ubl-settings-manager-misc.c new file mode 100644 index 0000000..a16f698 --- /dev/null +++ b/source/ubl-settings-manager-misc.c @@ -0,0 +1,69 @@ +#include "ubl-settings-manager.h" + + +void yon_open_browser(GtkWidget *self, char *link){ + GtkWidget *window = yon_ubl_browser_window_open(link,template_app_information.app_title); + if (window) + gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",template_app_information.app_tech_name)); +} + +void on_open_documentation_confirmation(GtkWidget *self, char *link){ + if (main_config.always_open_documentation==0){ + GtkBuilder *builder = gtk_builder_new_from_resource(ui_glade_path_documentation); + template_documentation_confirmation_window *window = malloc(sizeof(template_documentation_confirmation_window)); + window->Window = yon_gtk_builder_get_widget(builder,"helpConfirmationWindow"); + window->AcceptButton = yon_gtk_builder_get_widget(builder,"ReadHelpButton"); + window->CloseButton = yon_gtk_builder_get_widget(builder,"CancelHelpButton"); + window->HeaderLabel = yon_gtk_builder_get_widget(builder,"webHeaderNameLabel"); + window->AlwaysOpenCheck = yon_gtk_builder_get_widget(builder,"AlwaysOpenDocumentationCheckbox"); + gtk_label_set_text(GTK_LABEL(window->HeaderLabel),TITLE_LABEL); + gtk_window_set_title(GTK_WINDOW(window->Window),TITLE_LABEL); + gtk_window_set_icon_name(GTK_WINDOW(window->Window),yon_char_append("com.ublinux.",template_app_information.app_tech_name)); + gtk_widget_show_all(window->Window); + g_signal_connect(G_OBJECT(window->CloseButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); + g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(yon_open_browser),yon_char_new(link)); + g_signal_connect(G_OBJECT(window->AcceptButton),"clicked",G_CALLBACK(on_subwindow_close),NULL); + + } else { + yon_open_browser(self,link); + } +} + +/**on_link(GtkWidget *self, char* uri, gpointer user_data) + * [EN] + * Signal for hadnling AboutDialog links. + * Connect to "activate-link" signal. + * [self] is AboutDialog window; + * [uri] is activated link; + * [user_data] is pointer for user data, hasn't used in standard handler; + * [RU] + * Функция для обработки сигнала нажатия на ссылку окна AboutDialog. + * Присоединять к сигналу "activate-link". + * [self] - окно AboutDialog; + * [uri] - ссылка, по которой совершается переход; + * [user_data] - указатель на любые другие данные, не используется в стандартном обработчике; +*/ +void on_link(GtkWidget *self, char* uri, gpointer user_data){ + gtk_widget_destroy(self); + on_open_documentation_confirmation(self,uri); +} + +void on_about(GtkWidget *self, char *version_application){ + GtkBuilder *builder=gtk_builder_new_from_resource(ui_glade_path_about); + GtkWidget *window=yon_gtk_builder_get_widget(builder,"AboutWindow"); + GtkWidget *title=yon_gtk_builder_get_widget(builder,"headerAboutTopic"); + GtkWidget *hideButtonBox=yon_gtk_builder_get_widget(builder,"buttonBoxHide"); + gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(window),version_application); + gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(window),yon_char_append("com.ublinux.",LocaleName)); + gtk_window_set_icon_name(GTK_WINDOW(window),yon_char_append("com.ublinux.",LocaleName)); + char *title_str = about_label(TITLE_LABEL); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(window),title_str); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(window),LocaleName); + gtk_label_set_text(GTK_LABEL(title),title_str); + g_signal_connect(G_OBJECT(window),"activate-link",G_CALLBACK(on_link),NULL); + gtk_widget_set_visible(hideButtonBox,0); + gtk_widget_destroy(hideButtonBox); + gtk_window_set_title(GTK_WINDOW(window),title_str); + gtk_widget_show(window); + free(title_str); +} \ No newline at end of file diff --git a/source/ubl-settings-manager-settings-sections.c b/source/ubl-settings-manager-settings-sections.c index 04c965b..764ec89 100644 --- a/source/ubl-settings-manager-settings-sections.c +++ b/source/ubl-settings-manager-settings-sections.c @@ -104,22 +104,22 @@ void yon_section_window_add_default(settings_section_window *window){ section_struct *cur_section = yon_section_new(); gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); - gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Personal"); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),_("Personal")); gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-PersonalSettings;"); cur_section = yon_section_new(); gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); - gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Hardware"); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),_("Hardware")); gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-HardwareSettings;"); cur_section = yon_section_new(); gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); - gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"System"); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),_("System")); gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),"X-UBL-SettingsManager;X-UBL-SystemSettings;"); cur_section = yon_section_new(); gtk_box_pack_start(GTK_BOX(window->SectionsBox),cur_section->SectionBox,0,0,0); - gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),"Misc"); + gtk_entry_set_text(GTK_ENTRY(cur_section->NameEntry),_("Misc")); gtk_entry_set_text(GTK_ENTRY(cur_section->CategoriesEntry),""); } diff --git a/source/ubl-settings-manager-theme-gnome.c b/source/ubl-settings-manager-theme-gnome.c index 2b194ee..2a30286 100644 --- a/source/ubl-settings-manager-theme-gnome.c +++ b/source/ubl-settings-manager-theme-gnome.c @@ -131,6 +131,31 @@ int yon_gnome_update(gnome_theme_struct *theme){ return 1; } +void yon_gnome_section_search_show(gnome_section *section, const char *string){ + GList *list = gtk_container_get_children(GTK_CONTAINER(section->AppsList)); + GList *iter; + for (iter=list;iter;iter=iter->next){ + apps *cur_app = g_object_get_data(G_OBJECT(iter->data),"apps"); + if (yon_char_is_empty(string)||yon_char_check_begins_with(cur_app->Name,(char*)string)){ + gtk_widget_show(GTK_WIDGET(iter->data)); + } else { + gtk_widget_hide(GTK_WIDGET(iter->data)); + } + } + g_list_free(list); +} + +void on_gnome_search(GtkWidget *, gnome_theme_struct *theme){ + const char *search_string = gtk_entry_get_text(GTK_ENTRY(theme->SearchEntry)); + GList *list = gtk_container_get_children(GTK_CONTAINER(theme->AppsTree)); + GList *iter; + for (iter=list;iter;iter=iter->next){ + gnome_section *cur_section = g_object_get_data(G_OBJECT(iter->data),"gnome_section"); + yon_gnome_section_search_show(cur_section,search_string); + } + g_list_free(list); +} + gnome_theme_struct *yon_gnome_theme_new(){ gnome_theme_struct *theme = malloc(sizeof(gnome_theme_struct)); @@ -139,6 +164,7 @@ gnome_theme_struct *yon_gnome_theme_new(){ theme->AppsTree = yon_gtk_builder_get_widget(builder,"AppsTree"); theme->SocketBox = yon_gtk_builder_get_widget(builder,"SocketBox"); theme->GnomePaned = yon_gtk_builder_get_widget(builder,"GnomePaned"); + theme->SearchEntry = yon_gtk_builder_get_widget(builder,"SearchEntry"); theme->GnomeInfoLogoImage = yon_gtk_builder_get_widget(builder,"GnomeInfoLogoImage"); theme->HideBox = yon_gtk_builder_get_widget(builder,"HideBox"); theme->IconCell = GTK_CELL_RENDERER(gtk_builder_get_object(builder,"IconCell")); @@ -149,6 +175,7 @@ gnome_theme_struct *yon_gnome_theme_new(){ gtk_box_pack_start(GTK_BOX(theme->SocketBox),theme->Socket,1,1,0); gtk_widget_show(theme->Socket); + g_signal_connect(G_OBJECT(theme->SearchEntry),"changed",G_CALLBACK(on_gnome_search),theme); g_signal_connect(G_OBJECT(theme->SocketBox),"add",G_CALLBACK(on_gnome_socket_add),theme); // gtk_cell_renderer_set_fixed_size(theme->IconCell,main_config.apps_icon_size,main_config.apps_icon_size); return theme; diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 9c75884..bdc8274 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -543,25 +543,25 @@ void yon_interface_update(main_window *widgets){ } else { { app_section *cur_section = yon_app_section_new(); - cur_section->name = yon_char_new("Personal"); + cur_section->name = yon_char_new(_("Personal")); cur_section->categories = yon_char_parse("X-UBL-SettingsManager;X-UBL-PersonalSettings;",&cur_section->categories_size,";"); yon_dictionary_add_or_create_if_exists_with_data(main_config.sections,cur_section->name,cur_section); } { app_section *cur_section = yon_app_section_new(); - cur_section->name = yon_char_new("Hardware"); + cur_section->name = yon_char_new(_("Hardware")); cur_section->categories = yon_char_parse("X-UBL-SettingsManager;X-UBL-HardwareSettings;",&cur_section->categories_size,";"); yon_dictionary_add_or_create_if_exists_with_data(main_config.sections,cur_section->name,cur_section); } { app_section *cur_section = yon_app_section_new(); - cur_section->name = yon_char_new("System"); + cur_section->name = yon_char_new(_("System")); cur_section->categories = yon_char_parse("X-UBL-SettingsManager;X-UBL-SystemSettings;",&cur_section->categories_size,";"); yon_dictionary_add_or_create_if_exists_with_data(main_config.sections,cur_section->name,cur_section); } { app_section *cur_section = yon_app_section_new(); - cur_section->name = yon_char_new("Misc"); + cur_section->name = yon_char_new(_("Misc")); cur_section->categories = yon_char_parsed_new(&cur_section->categories_size,"",NULL); yon_dictionary_add_or_create_if_exists_with_data(main_config.sections,cur_section->name,cur_section); } @@ -600,7 +600,9 @@ main_window *yon_main_window_setup(){ g_signal_connect(G_OBJECT(widgets->MainMenuItemSettings),"activate",G_CALLBACK(on_settings_open),widgets); g_signal_connect(G_OBJECT(widgets->BannerButton),"clicked",G_CALLBACK(on_reveal_banner),widgets); - + g_signal_connect(G_OBJECT(widgets->MainMenuItemDocumentation),"activate",G_CALLBACK(on_open_documentation_confirmation),WIKI_LINK); + g_signal_connect(G_OBJECT(widgets->MainMenuItemAbout),"activate",G_CALLBACK(on_about),version_application); + yon_window_config_setup(GTK_WINDOW(widgets->Window)); char *path = yon_char_unite(yon_ubl_user_get_home_directory(),"/.config/",LocaleName,"/",LocaleName,".conf",NULL); yon_window_config_load(path); diff --git a/source/ubl-settings-manager.h b/source/ubl-settings-manager.h index 5b7b4c2..64ea623 100644 --- a/source/ubl-settings-manager.h +++ b/source/ubl-settings-manager.h @@ -113,14 +113,13 @@ typedef struct { GtkWidget *DeleditBox; } SectionSettingSegment; -typedef struct theme_struct { +/// @brief Public fields of theme structs +typedef struct theme_struct { char *theme_name; GtkWidget *MainBox; //theme main box, which connects to window GtkWidget *SocketBox; //main socket box, where socket is being parented to GtkWidget *HideBox; //box to hide when socket has been connected int (*list_update_func)(struct theme_struct*); //function to update theme's lits of application - // GtkWidget *AppsTree; //theme application list container - // GtkWidget *Socket; } theme_struct; typedef struct gnome_theme_struct { @@ -129,6 +128,7 @@ typedef struct gnome_theme_struct { GtkWidget *SocketBox; GtkWidget *HideBox; int (*list_update_func)(struct gnome_theme_struct*); + GtkWidget *SearchEntry; GtkWidget *AppsTree; GtkWidget *Socket; GtkWidget *GnomePaned; @@ -212,6 +212,11 @@ typedef struct { int icon_size; } settings_window; +void yon_open_browser(GtkWidget *self, char *link); +void on_open_documentation_confirmation(GtkWidget *self, char *link); +void on_link(GtkWidget *self, char* uri, gpointer user_data); +void on_about(GtkWidget *self, char *version_application); + void on_settings_accept(GtkWidget *, settings_window *window); void yon_theme_init(); theme_struct *yon_theme_update(main_window *widgets); diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 3ef5e19..45dda0b 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -6,21 +6,30 @@ #define WIKI_LINK _("https://wiki.ublinux.ru/software/programs_and_utilities/all/ubl-settings-manager") #define ABOUT_PROJECT_COMMENTS_LABEL _("Settings manager for UBLinux") +#define BACK_TO_SETTINGS_LABEL _("Back to settings") #define CONFIG_LOAD_ERROR _("Config loading failed!\n") #define DOUBLE_CLICK_SELECTION_LABEL _("Double click selection") #define SECTIONS_MANAGEMENT_LABEL _("Sections management") #define UNDERSTOOD_LABEL _("Understood") #define SETTINGS_LABEL _("Settings") #define APPLY_LABEL _("Apply") -#define SAVE_AND_APPLY_LABEL _("Save and apply") #define CLOSE_LABEL _("Close") #define CANCEL_LABEL _("Cancel") -#define READ_ONLINE_LABEL _("Read online") -#define REDIRECTION_COMMENT_LABEL _("You will be redirected to documentation site, where user help pages are translated and supported by community.") -#define REDIRECTION_LABEL _("Would you like to read documentation in the Web?") +#define ABOUT__LABEL _("About...") +#define DOCUMENTATION__LABEL _("Documentation") #define WINDOW_THEME_LABEL _("Window theme") #define ICON_SIZE_LABEL _("Icon size") #define BACK_TO_ALL_SETTINGS_LABEL _("All settings") #define THEME_ERROR_LABEL _("Failed to load theme") #define MAIN_THEME_LABEL _("Main theme") -#define GNOME_THEME_LABEL _("GNOME theme") \ No newline at end of file +#define GNOME_THEME_LABEL _("GNOME theme") +#define DEFAULT_LABEL _("Default") +#define SECTION_NAME_LABEL _("Section name") +#define IDENTIFIER_LABEL _("Identifier") +#define ADD_SECTION_TOOLTIP_LABEL _("Add section") +#define CLEAR_SECTION_TOOLTIP_LABEL _("Clear fields") +#define REMOVE_SECTION_TOOLTIP_LABEL _("Remove section") +#define PERSONAL_SECTION_LABEL _("Personal") +#define HARDWARE_SECTION_LABEL _("Hardware") +#define SYSTEM_SECTION_LABEL _("System") +#define MISC_SECTION_LABEL _("Misc") \ No newline at end of file diff --git a/ubl-settings-manager-section-element.glade b/ubl-settings-manager-section-element.glade index 8cd8823..b64d256 100644 --- a/ubl-settings-manager-section-element.glade +++ b/ubl-settings-manager-section-element.glade @@ -1,5 +1,5 @@ - + @@ -45,6 +45,7 @@ True True True + Remove section center image2 - - diff --git a/ubl-settings-manager.conf b/ubl-settings-manager.conf deleted file mode 100644 index 3e8a48b..0000000 --- a/ubl-settings-manager.conf +++ /dev/null @@ -1,22 +0,0 @@ -[window] -WindowPosX=0 -WindowPosY=0 -WindowWidth=800 -WindowHeight=600 -WindowTheme=0 -MainIconSize=3 -GnomeIconSize=3 -IconSegmentSize=250 -MainLabelSize=12 -GnomeLabelSize=12 -LabelDensity=0 -User= -GnomeDoubleClick=false -MainDoubleClick=true -BannerHidden=false - -[sections] -Personal=X-UBL-SettingsManager;X-UBL-PersonalSettings; -Hardware=X-UBL-SettingsManager;X-UBL-HardwareSettings; -System=X-UBL-SettingsManager;X-UBL-SystemSettings; -Misc= diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index b907e4b..07d3236 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -244,7 +244,7 @@ - + True False Back to settings diff --git a/ubl-settings-manager.pot b/ubl-settings-manager.pot deleted file mode 100644 index 52374e8..0000000 --- a/ubl-settings-manager.pot +++ /dev/null @@ -1,164 +0,0 @@ -# Language translations for ubl-settings-manager package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-manager package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-manager 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-04-21 12:33+0000\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: source/ubl-settings-manager.h:9 -msgid "" -"\n" -"GTK settings manager for UBLinux\n" -"Usage: ubl-settings-manager [OPTIONS...]\n" -"Options:\n" -" -h, --help\t\t Show this help\n" -" -V, --version\t \t Show package version\n" -" --lock-settings Lock menu settings\n" -msgstr "" - -#: source/ubl-settings-manager.h:27 -msgid "About UBLinux Settings Manager" -msgstr "" - -#: source/ubl-settings-manager.h:34 source/ubl-settings-manager.c:1685 -msgid "About..." -msgstr "" - -#: source/ubl-settings-manager.h:37 source/ubl-settings-manager.h:36 -#: source/ubl-settings-manager.c:1683 -msgid "Always redirect" -msgstr "" - -#: source/ubl-settings-manager.h:38 source/ubl-settings-manager.h:37 -#: source/ubl-settings-manager.c:1742 -msgid "Apply" -msgstr "" - -#: source/ubl-settings-manager.h:47 source/ubl-settings-manager.h:46 -#: source/ubl-settings-manager.c:1600 -msgid "All settings" -msgstr "" - -#: source/ubl-settings-manager.h:41 source/ubl-settings-manager.h:40 -#: source/ubl-settings-manager.c:1680 -msgid "Cancel" -msgstr "" - -#: source/ubl-settings-manager.h:40 source/ubl-settings-manager.h:39 -#: source/ubl-settings-manager.c:1681 -msgid "Close" -msgstr "" - -#: source/ubl-settings-manager.h:30 -msgid "Config loading failed!\n" -msgstr "" - -#: source/ubl-settings-manager.h:35 -msgid "Documentation" -msgstr "" - -#: source/ubl-settings-manager.h:31 source/ubl-settings-manager.c:1748 -msgid "Double click selection" -msgstr "" - -#: source/ubl-settings-manager.c:1913 source/ubl-settings-manager.c:1912 -#: source/ubl-settings-manager.c:1793 -msgid "GNOME theme" -msgstr "" - -msgid "Hardware" -msgstr "" - -#: source/ubl-settings-manager.h:46 source/ubl-settings-manager.h:45 -#: source/ubl-settings-manager.c:1675 -msgid "Icon size" -msgstr "" - -msgid "Misc" -msgstr "" - -msgid "Personal" -msgstr "" - -#: source/ubl-settings-manager.h:28 source/ubl-settings-manager.c:636 -msgid "Project Home Page" -msgstr "" - -#: source/ubl-settings-manager.h:42 source/ubl-settings-manager.h:41 -#: source/ubl-settings-manager.c:1679 -msgid "Read online" -msgstr "" - -#: source/ubl-settings-manager.h:39 source/ubl-settings-manager.h:38 -#: source/ubl-settings-manager.c:1682 -msgid "Save and apply" -msgstr "" - -#: source/ubl-settings-manager.h:32 source/ubl-settings-manager.c:1687 -msgid "Sections management" -msgstr "" - -#: source/ubl-settings-manager.h:36 source/ubl-settings-manager.h:35 -#: source/ubl-settings-manager.c:1684 -msgid "Settings" -msgstr "" - -#: source/ubl-settings-manager.h:29 source/ubl-settings-manager.c:632 -msgid "Settings manager for UBLinux" -msgstr "" - -#: source/ubl-settings-manager.c:1912 source/ubl-settings-manager.c:1911 -#: source/ubl-settings-manager.c:1792 -msgid "Standard theme" -msgstr "" - -msgid "System" -msgstr "" - -#: source/ubl-settings-manager.h:26 source/ubl-settings-manager.c:633 -#: source/ubl-settings-manager.c:1601 source/ubl-settings-manager.c:1615 -#: source/ubl-settings-manager.c:1674 -msgid "UBLinux Settings Manager" -msgstr "" - -#: source/ubl-settings-manager.h:33 source/ubl-settings-manager.c:1686 -msgid "Understood" -msgstr "" - -#: source/ubl-settings-manager.h:8 -msgid "Version: " -msgstr "" - -#: source/ubl-settings-manager.h:45 source/ubl-settings-manager.h:44 -#: source/ubl-settings-manager.c:1676 -msgid "Window theme" -msgstr "" - -#: source/ubl-settings-manager.h:44 source/ubl-settings-manager.h:43 -#: source/ubl-settings-manager.c:1677 -msgid "Would you like to read documentation in the Web?" -msgstr "" - -#: source/ubl-settings-manager.h:43 source/ubl-settings-manager.h:42 -#: source/ubl-settings-manager.c:1678 -msgid "" -"You will be redirected to documentation site, where user help pages are\n" -"translated and supported by community." -msgstr "" - -#: source/ubl-settings-manager.h:9 -msgid "ubl-settings-manager version: " -msgstr "" diff --git a/ubl-settings-manager_ru.po b/ubl-settings-manager_ru.po deleted file mode 100644 index 304ac21..0000000 --- a/ubl-settings-manager_ru.po +++ /dev/null @@ -1,172 +0,0 @@ -# Russian translations for ubl-settings-manager package. -# Copyright (C) 2022, UBTech LLC -# This file is distributed under the same license as the ubl-settings-manager package. -# UBLinux Team , 2022 -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: ubl-settings-manager 1.0\n" -"Report-Msgid-Bugs-To: info@ublinux.com\n" -"POT-Creation-Date: 2023-04-21 12:33+0000\n" -"PO-Revision-Date: 2023-01-01 00:00+0600\n" -"Last-Translator: UBLinux Team \n" -"Language-Team: Russian - UBLinux Team \n" -"Language: Russian\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: source/ubl-settings-manager.h:9 -msgid "" -"\n" -"GTK settings manager for UBLinux\n" -"Usage: ubl-settings-manager [OPTIONS...]\n" -"Options:\n" -" -h, --help\t\t Show this help\n" -" -V, --version\t \t Show package version\n" -" --lock-settings Lock menu settings\n" -msgstr "" -"\n" -"GTK Менеджер настроек для UBLinux\n" -"Использование: ubl-settings-manager [АРГУМЕНТЫ...]\n" -"Аргументы:\n" -" -h, --help\t\t Показать помощь\n" -" -V, --version\t \t Показать версию пакета\n" -" --lock-settings \t Заблокировать окно настроек\n" - -#: source/ubl-settings-manager.h:27 -msgid "About UBLinux Settings Manager" -msgstr "О приложении Диспетчер настроек UBLinux" - -#: source/ubl-settings-manager.h:34 source/ubl-settings-manager.c:1685 -msgid "About..." -msgstr "О программе" - -#: source/ubl-settings-manager.h:37 source/ubl-settings-manager.h:36 -#: source/ubl-settings-manager.c:1683 -msgid "Always redirect" -msgstr "Всегда перенаправлять" - -#: source/ubl-settings-manager.h:38 source/ubl-settings-manager.h:37 -#: source/ubl-settings-manager.c:1742 -msgid "Apply" -msgstr "Применить" - -#: source/ubl-settings-manager.h:47 source/ubl-settings-manager.h:46 -#: source/ubl-settings-manager.c:1600 -msgid "All settings" -msgstr "Все настройки" - -#: source/ubl-settings-manager.h:41 source/ubl-settings-manager.h:40 -#: source/ubl-settings-manager.c:1680 -msgid "Cancel" -msgstr "Отменить" - -#: source/ubl-settings-manager.h:40 source/ubl-settings-manager.h:39 -#: source/ubl-settings-manager.c:1681 -msgid "Close" -msgstr "Закрыть" - -#: source/ubl-settings-manager.h:30 -msgid "Config loading failed!\n" -msgstr "Ошибка загрузки конфигурации!\n" - -#: source/ubl-settings-manager.h:35 -msgid "Documentation" -msgstr "Справка" - -#: source/ubl-settings-manager.h:31 source/ubl-settings-manager.c:1748 -msgid "Double click selection" -msgstr "Открывать приложения двойным нажатием" - -#: source/ubl-settings-manager.c:1913 source/ubl-settings-manager.c:1912 -#: source/ubl-settings-manager.c:1793 -msgid "GNOME theme" -msgstr "GNOME тема" - -msgid "Hardware" -msgstr "Оборудование" - -#: source/ubl-settings-manager.h:46 source/ubl-settings-manager.h:45 -#: source/ubl-settings-manager.c:1675 -msgid "Icon size" -msgstr "Размер иконок" - -msgid "Misc" -msgstr "Прочее" - -msgid "Personal" -msgstr "Личные" - -#: source/ubl-settings-manager.h:28 source/ubl-settings-manager.c:636 -msgid "Project Home Page" -msgstr "Домашняя страница проекта" - -#: source/ubl-settings-manager.h:42 source/ubl-settings-manager.h:41 -#: source/ubl-settings-manager.c:1679 -msgid "Read online" -msgstr "Прочитать онлайн" - -#: source/ubl-settings-manager.h:39 source/ubl-settings-manager.h:38 -#: source/ubl-settings-manager.c:1682 -msgid "Save and apply" -msgstr "Сохранить и применить" - -#: source/ubl-settings-manager.h:32 source/ubl-settings-manager.c:1687 -msgid "Sections management" -msgstr "Настройка разделов" - -#: source/ubl-settings-manager.h:36 source/ubl-settings-manager.h:35 -#: source/ubl-settings-manager.c:1684 -msgid "Settings" -msgstr "Настройки" - -#: source/ubl-settings-manager.h:29 source/ubl-settings-manager.c:632 -msgid "Settings manager for UBLinux" -msgstr "Диспетчер настроек UBLinux" - -#: source/ubl-settings-manager.c:1912 source/ubl-settings-manager.c:1911 -#: source/ubl-settings-manager.c:1792 -msgid "Standard theme" -msgstr "Стандартная тема" - -msgid "System" -msgstr "Система" - -#: source/ubl-settings-manager.h:26 source/ubl-settings-manager.c:633 -#: source/ubl-settings-manager.c:1601 source/ubl-settings-manager.c:1615 -#: source/ubl-settings-manager.c:1674 -msgid "UBLinux Settings Manager" -msgstr "Диспетчер настроек UBLinux" - -#: source/ubl-settings-manager.h:33 source/ubl-settings-manager.c:1686 -msgid "Understood" -msgstr "Понятно" - -#: source/ubl-settings-manager.h:8 -msgid "Version: " -msgstr "Версия: " - -#: source/ubl-settings-manager.h:45 source/ubl-settings-manager.h:44 -#: source/ubl-settings-manager.c:1676 -msgid "Window theme" -msgstr "Выбор темы" - -#: source/ubl-settings-manager.h:44 source/ubl-settings-manager.h:43 -#: source/ubl-settings-manager.c:1677 -msgid "Would you like to read documentation in the Web?" -msgstr "Вы хотите прочитать справку в Сети?" - -#: source/ubl-settings-manager.h:43 source/ubl-settings-manager.h:42 -#: source/ubl-settings-manager.c:1678 -msgid "" -"You will be redirected to documentation site, where user help pages are\n" -"translated and supported by community." -msgstr "" -"Вы будете перенаправлены на сайт с документацией где страницы помощи\n" -"переводятся и поддерживаются сообществом." - -#: source/ubl-settings-manager.h:9 -msgid "ubl-settings-manager version: " -msgstr "ubl-settings-manager версия: " diff --git a/ublinux-logo.svg b/ublinux-logo.svg deleted file mode 100644 index d44113c..0000000 --- a/ublinux-logo.svg +++ /dev/null @@ -1,241 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -