diff --git a/Makefile b/Makefile index 27656a1..9b5c65b 100644 --- a/Makefile +++ b/Makefile @@ -10,46 +10,48 @@ CMAKE_COMMAND = cmake #CMAKE_BUILD_DIR = $(MAKEFILE_PATH)compile CMAKE_SOURCE_DIR = ./source CMAKE_BUILD_DIR = ./compile +DEPENDS = /bin/cmake /bin/screenfetch PKGNAME = $(MAKEFILE_DIR) -#PKGNAME = check-hostalive +#PKGNAME = ublexec default_target: all - all: init build +.PHONY: init init: @echo "Initialize ..."; \ - version="$$(cat VERSION.md)"; \ - version=$${version:8}; \ - search="s/string version_application.*$&"; \ - echo $$search; \ - replace="string version_application = \"$${version}\";"; \ - sed -i -e "$$search/$$replace/gi" source/ubl-settings-info.c; \ + sed -r "s/(version_application = ).*/\1\"$$(grep 'VERSION' VERSION.md | cut -d" " -f2)\";/" -i source/ubl-settings-info.c; \ echo "-- Build path: ${CMAKE_BUILD_DIR}" - + +.PHONY: depend depend: - @echo "Check depends ..."; \ - if [ ! -f /bin/cmake ]; then \ - echo "-- Depend 'cmake' not found !"; \ - exit 1; \ - fi; \ + @echo "Check depends ..." + @for FILE_DEPEND in $(DEPENDS); do \ + if [ ! -f $${FILE_DEPEND} ]; then \ + echo "ERROR: Depend '$${FILE_DEPEND}' not found !"; \ + exit 1; \ + fi; \ + done echo "Check depends: OK" # $(CMAKE_COMMAND) -S$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 +.PHONY: debug debug: @echo "Debug ..." if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ - cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \ + $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="/usr"; \ fi; \ echo "Debug: OK" +.PHONY: prepare prepare: @echo "Prepare ..."; \ if [ ! -d ${CMAKE_BUILD_DIR} ]; then \ - cmake -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \ + $(CMAKE_COMMAND) -S${CMAKE_SOURCE_DIR} -B${CMAKE_BUILD_DIR} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr"; \ fi; \ echo "Prepare: OK" +.PHONY: check check: @echo "Check ..."; \ if [ -f ${CMAKE_BUILD_DIR}/${PKGNAME} ]; then \ @@ -59,68 +61,72 @@ check: exit 1; \ fi +.PHONY: build build: depend prepare @echo "Build ..."; \ make --directory=${CMAKE_BUILD_DIR}; \ echo "Build: OK" +.PHONY: uninstall 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="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + done @for SIZE in 16x16 32x32 48x48 scalable; do \ - $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/${PKGNAME}.svg"; \ - $(RM) "/usr/share/"${pkgname}"/images/${PKGNAME}.png"; \ + $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.svg"; \ + $(RM) "/usr/share/icons/hicolor/$${SIZE}/apps/ru.ublinux.${PKGNAME}.png"; \ done @for FILE_SVG in $(wildcard *.svg); do \ for SIZE in 16x16 32x32 48x48 scalable; do \ $(RM) "/usr/share/icons/hicolor/$${SIZE}/status/$${FILE_SVG%.*}".{svg,png,jpg}; \ done; \ done - @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="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ - $(RM) "/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ - done @$(RM) "/usr/bin/${PKGNAME}" @$(RM) "/usr/share/applications/${PKGNAME}.desktop" - @$(RM) "/usr/share/${PKGNAME}/images/bg_top.png" - @$(RM) "/usr/share/icons/hicolor/scalable/apps/${PKGNAME}.svg" - @$(RM) "/etc/ubconfig-main.conf" - @$(RM) "~/ubconfig-main.conf" - @$(RM) "/usr/share/ubl-util-standard/ubl-util-standard.glade" - @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null - @update-desktop-database --quiet 2>/dev/null - @touch /usr/share/applications + @$(RM) "/usr/share/${PKGNAME}/images/logo-background.png" + @$(RM) "/usr/share/icons/hicolor/scalable/apps/com.ublinux.${PKGNAME}.svg" + @$(RM) "/etc/xdg/${PKGNAME}/ubconfig-main.conf" + @$(RM) -rd "/usr/share/${PKGNAME}" + @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true + @update-desktop-database --quiet &>/dev/null || true + @touch /usr/share/applications &>/dev/null || true @echo "Uninstall: OK" +.PHONY: install install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 /usr/share/locale/$${LANG}/LC_MESSAGES; \ + install -dm755 "${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES"; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ - PATH_FILE_MO="/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_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}"; \ done @for SIZE in 16 32 48; do \ - install -dm755 /usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data ${PKGNAME}.svg -o "/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/${PKGNAME}.svg"; \ + install -dm755 "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ + rsvg-convert -w $${SIZE} -h $${SIZE} -f png --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps/com.ublinux.${PKGNAME}.png"; \ done - @install -dm755 /usr/share/icons/hicolor/scalable/apps - @install -dm755 /usr/share/icons/hicolor/scalable/status - @install -Dm755 -t /usr/bin/ ${CMAKE_BUILD_DIR}/${PKGNAME} - @install -Dm655 -t /usr/share/applications/ ${PKGNAME}.desktop - @install -Dm644 -t /usr/share/ubl-settings-info/ ubl-settings-info.glade - @install -Dm644 -t /usr/share/ubl-settings-info/ ubl-settings-info.css - @install -Dm644 -t /usr/share/icons/hicolor/scalable/apps/ ${PKGNAME}.svg - @install -Dm644 -t /usr/share/${PKGNAME}/images/ ublinux-logo.svg - @install -Dm644 -t /usr/share/${PKGNAME}/images/ bg_top.png - @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null - @update-desktop-database --quiet 2>/dev/null - @touch /usr/share/applications - @echo "Install: OK ${USER}" + @install -dm755 "${DESTDIR}/usr/share/icons/hicolor/scalable/apps" + @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" + @install -Dm755 -t "${DESTDIR}/usr/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" + @install -Dm644 -t "${DESTDIR}/usr/share/applications/" "${PKGNAME}.desktop" + @install -dm755 "${DESTDIR}/usr/share/${PKGNAME}"/{ui,css,images} + @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/ui/" "${PKGNAME}.glade" + @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/css/" "${PKGNAME}.css" + @install -Dm644 -t "${DESTDIR}/usr/share/${PKGNAME}/images/" \ + "logo-background.png" \ + "ublinux-logo.svg" + @gtk-update-icon-cache -fiq /usr/share/icons/hicolor/ &>/dev/null || true + @update-desktop-database --quiet &>/dev/null || true + @touch /usr/share/applications &>/dev/null || true + @echo "Install: OK" +.PHONY: clean clean: @echo "Clean ..." @$(RM) -rd ${CMAKE_BUILD_DIR} @@ -129,13 +135,8 @@ clean: else \ echo "Clean: OK"; \ fi - @version="$$(cat VERSION.md)"; \ - version=$${version:8}; \ - search="s/string version_application.*$&"; \ - echo $$search; \ - replace="string version_application = ;"; \ - sed -i -e "$$search/$$replace/gi" source/ubl-settings-info.c; \ +.PHONY: help help: @echo "The following are some of the valid targets for this Makefile:" @echo "... all (the default if no target is provided)" @@ -145,4 +146,4 @@ help: @echo "... compile" @echo "... install" @echo "... uninstall" - @echo "... clean" + @echo "... clean" \ No newline at end of file diff --git a/README.md b/README.md index e8aa5f9..eb35ba6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,28 @@ # ubl-settings-info +# Информация о системе +# Build +In order to build ublexec you will need: + +- CMake +- C compiler +- GTK+ 3 & dependencies + +Once you have all the necessary dependencies, you can use: +```sh +$ make +``` + +# Installation +After a successful build, just use: +```sh +$ sudo make install clean +``` + +# Uninstallation +After a successful build, just use: +```sh +$ sudo make uninstall +``` + +![alt text](screenshot/screenshot.png) diff --git a/VERSION.md b/VERSION.md index f3d572a..bd38345 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -VERSION 1.2 \ No newline at end of file +VERSION 1.3 \ No newline at end of file diff --git a/base.pot b/base.pot deleted file mode 100644 index 469fbc9..0000000 --- a/base.pot +++ /dev/null @@ -1,42 +0,0 @@ -# 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: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-03 14:25+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=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: source/ubl-settings-info.c:37 -msgid "Sum up system information" -msgstr "" - -#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 -msgid "UBLinux System Info" -msgstr "" - -#: source/ubl-settings-info.c:40 -msgid "Project Home Page" -msgstr "" - -#: source/ubl-settings-info.c:41 -msgid "About UBLinux System Info" -msgstr "" - -#: source/ubl-settings-info.c:68 -msgid "System Info" -msgstr "" - -#: source/ubl-settings-info.c:70 -msgid "About program" -msgstr "" diff --git a/ubl-settings-info.svg b/com.ublinux.ubl-settings-info.svg similarity index 100% rename from ubl-settings-info.svg rename to com.ublinux.ubl-settings-info.svg diff --git a/devel/update-version b/devel/update-version new file mode 100755 index 0000000..e86b1b4 --- /dev/null +++ b/devel/update-version @@ -0,0 +1,18 @@ +#!/bin/bash +## +## Update VERSION 1.4 +## $1 - Version +## Default - current Version value plus one (in minor section) +## + +FILE_VERSION="VERSION.md" +[[ $1 ]] && VER=$1 +if [[ -z ${VER} ]] ; then + SOURCE_FILE_VERSION=$(find ../ -maxdepth 1 -type f -iname "${FILE_VERSION}" -print -quit) + CURRENT=$(cat ${SOURCE_FILE_VERSION} | grep 'VERSION' | cut -d" " -f2) + MAJOR=$(echo ${CURRENT} | cut -d. -f1) + MINOR=$(echo ${CURRENT} | cut -d. -f2) + VER="${MAJOR}.$(echo $((${MINOR} +1)))" +fi +echo ":: Updated VERSION ${CURRENT} to ${VER}" +find ../ -maxdepth 2 -type f -iname "${FILE_VERSION}" -exec echo ":: Insert version in file: {}" \; -exec sed "s/VERSION *[[:digit:]]*.*/VERSION ${VER}/" -i {} \; \ No newline at end of file diff --git a/bg_top.png b/logo-background.png similarity index 100% rename from bg_top.png rename to logo-background.png diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index bf05211..2457623 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -3,13 +3,16 @@ project(ubl-settings-info) find_package(PkgConfig REQUIRED) -pkg_check_modules(GTK REQUIRED gtk+-3.0) +pkg_check_modules(GTK REQUIRED gtkmm-3.0) include_directories(${GTK_INCLUDE_DIRS}) link_directories(${GTK_LIBRARY_DIRS}) add_definitions(${GTK_CFLAGS_OTHER}) #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -std=c++2a -g") -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always -g") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wextra -Werror -Wmissing-declarations -fdiagnostics-color=always \ + -O2 -pipe -fno-plt -fexceptions \ + -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \ + -fstack-clash-protection -fcf-protection") set(SOURCE_FILES ubl-settings-info.c) @@ -18,7 +21,6 @@ set(LIBRARIES ${GTK_LIBRARIES} pthread) - add_executable(ubl-settings-info ${SOURCE_FILES}) target_link_libraries(ubl-settings-info ${LIBRARIES}) install(TARGETS ubl-settings-info DESTINATION bin) \ No newline at end of file diff --git a/source/ubl-settings-info.c b/source/ubl-settings-info.c index 04d8485..d2c710c 100644 --- a/source/ubl-settings-info.c +++ b/source/ubl-settings-info.c @@ -4,15 +4,15 @@ #include #include #include "ubl-util-standard.c" -#define cssPath "/usr/share/ubl-settings-info/ubl-settings-info.css" -#define gladePath "/usr/share/ubl-settings-info/ubl-settings-info.glade" -#define HeaderImagePath "/usr/share/icons/hicolor/scalable/apps/ubl-settings-info.svg" +#define cssPath "/usr/share/ubl-settings-info/css/ubl-settings-info.css" +#define gladePath "/usr/share/ubl-settings-info/ui/ubl-settings-info.glade" +#define HeaderImagePath "/usr/share/icons/hicolor/scalable/apps/com.ublinux.ubl-settings-info.svg" #define LogoImagePath "/usr/share/ubl-settings-info/images/ublinux-logo.svg" #define LocaleName "ubl-settings-info" #define LocalePath "/usr/share/locale" typedef char* string; -string version_application = ; +string version_application = "1.2"; #define _(String) gettext(String) @@ -38,11 +38,11 @@ void on_about(GtkWidget *button){ GtkWidget *About = GTK_WIDGET(gtk_builder_get_object(builder, "About")); GtkWidget *HeaderAboutTopic = GTK_WIDGET(gtk_builder_get_object(builder, "headerAboutTopic")); gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(About),version_application); - gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_("Sum up system information")); - gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_("UBLinux System Info")); + gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(About),_("Basic System Information")); + gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(About),_("System Information")); gtk_widget_show(GTK_WIDGET(gtk_builder_get_object(builder,"About"))); gtk_about_dialog_set_website_label(GTK_ABOUT_DIALOG(About),_("Project Home Page")); - gtk_label_set_text(GTK_LABEL(HeaderAboutTopic),_("About UBLinux System Info")); + gtk_label_set_text(GTK_LABEL(HeaderAboutTopic),_("About ubl-settings-info")); gtk_widget_set_visible(AboutButtons,0); } @@ -68,10 +68,10 @@ int main(int argc, char *argv[]){ GtkWidget *HeaderTopic = GTK_WIDGET(gtk_builder_get_object(builder, "headerTopic")); GtkWidget *AboutButton = GTK_WIDGET(gtk_builder_get_object(builder,"MenuItemAbout")); GtkWidget *buttonSettings = GTK_WIDGET(gtk_builder_get_object(builder,"buttonSettings")); - gtk_label_set_text(GTK_LABEL(HeaderTopic),_("UBLinux System Info")); - gtk_label_set_text(GTK_LABEL(headLabel),_("System Info")); + gtk_label_set_text(GTK_LABEL(HeaderTopic),_("System Information")); + gtk_label_set_text(GTK_LABEL(headLabel),_("System Information")); g_signal_connect(G_OBJECT(AboutButton), "activate", G_CALLBACK(on_about),NULL); - gtk_menu_item_set_label(GTK_MENU_ITEM(AboutButton),_("About program")); + gtk_menu_item_set_label(GTK_MENU_ITEM(AboutButton),_("About")); gtk_image_set_from_pixbuf(GTK_IMAGE(iconInfo),gdk_pixbuf_new_from_file_at_size(LogoImagePath,256,256,&err)); if (err){ diff --git a/ubl-settings-info.css b/ubl-settings-info.css index c332ad9..1bafb3c 100644 --- a/ubl-settings-info.css +++ b/ubl-settings-info.css @@ -1,5 +1,5 @@ .backset{ - background: url("/usr/share/ubl-settings-info/images/bg_top.png") no-repeat; + background: url("/usr/share/ubl-settings-info/images/logo-background.png") no-repeat; } .textHead{ text-shadow: 1px 1px #ffffff; diff --git a/ubl-settings-info.desktop b/ubl-settings-info.desktop index 451b852..be0e124 100644 --- a/ubl-settings-info.desktop +++ b/ubl-settings-info.desktop @@ -4,11 +4,11 @@ Name=System Info Name[ru]=Информация о системе GenericName=System Info GenericName[ru]=Информация о системе -Comment=ubl-settings-manager -Comment[ru]=Показать характеристики системы +Comment=Show system information +Comment[ru]=Показать информацию о системе Type=Application Exec=ubl-settings-info -Icon=ubl-settings-info +Icon=com.ublinux.ubl-settings-info Terminal=false X-XfcePluggable=true X-UBlPluggable=true diff --git a/ubl-settings-info.glade b/ubl-settings-info.glade index 2621da2..c91605f 100644 --- a/ubl-settings-info.glade +++ b/ubl-settings-info.glade @@ -8,18 +8,18 @@ False True center - ubl-settings-info + com.ublinux.ubl-settings-info dialog True - UBLinux Info + System info 1.1 - Copyright © 2022 - 2023 - UBSoft Software LLC + Copyright © 2022 - 2023, UBSoft LLC Sum up system information https://ublinux.ru/ Project Home Page UBGroup UBGroup - ubl-settings-info + com.ublinux.ubl-settings-info gpl-2-0 @@ -54,7 +54,7 @@ 5 5 2 - UBLinux System Info + System info @@ -113,7 +113,7 @@ 6 6 69 - ubl-settings-info + com.ublinux.ubl-settings-info False @@ -277,7 +277,7 @@ 5 5 2 - UBLinux System Info + System info @@ -294,7 +294,7 @@ 6 6 32 - ubl-settings-info + com.ublinux.ubl-settings-info diff --git a/ubl-settings-info.pot b/ubl-settings-info.pot new file mode 100644 index 0000000..fb2eda8 --- /dev/null +++ b/ubl-settings-info.pot @@ -0,0 +1,38 @@ +# Language translations for ubl-settings-info package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-info package. +# UBLinux Team , 2022 +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: ubl-settings-info 1.0\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" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: source/ubl-settings-info.c:37 +msgid "Basic System Information" +msgstr "" + +#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 source/ubl-settings-info.c:68 +msgid "System Information" +msgstr "" + +#: source/ubl-settings-info.c:40 +msgid "Project Home Page" +msgstr "" + +#: source/ubl-settings-info.c:41 +msgid "About ubl-settings-info" +msgstr "" + +#: source/ubl-settings-info.c:70 +msgid "About program" +msgstr "" diff --git a/ubl-settings-info_ru.po b/ubl-settings-info_ru.po index 56e43ee..90ec7f1 100644 --- a/ubl-settings-info_ru.po +++ b/ubl-settings-info_ru.po @@ -1,42 +1,38 @@ -# 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. +# Russian translations for ubl-settings-info package. +# Copyright (C) 2022, UBTech LLC +# This file is distributed under the same license as the ubl-settings-info package. +# UBLinux Team , 2022 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-03-03 14:25+0600\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"Project-Id-Version: ubl-settings-info 1.0\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: 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-info.c:37 -msgid "Sum up system information" -msgstr "Сводки с информацией о системе" +#: source/ubl-settings-info.c:41 +msgid "Basic System Information" +msgstr "Основная информацией о системе" -#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 -msgid "UBLinux System Info" -msgstr "Информация о системе UBLinux" +#: source/ubl-settings-info.c:38 source/ubl-settings-info.c:67 source/ubl-settings-info.c:68 +msgid "System Information" +msgstr "Информация о системе" #: source/ubl-settings-info.c:40 msgid "Project Home Page" msgstr "Домашняя страница проекта" -#: source/ubl-settings-info.c:41 -msgid "About UBLinux System Info" -msgstr "Информация о UBLinux System Info" - -#: source/ubl-settings-info.c:68 -msgid "System Info" -msgstr "Информация о системе" +#: source/ubl-settings-info.c:45 +msgid "About ubl-settings-info" +msgstr "О программе ubl-settings-info" #: source/ubl-settings-info.c:70 -msgid "About program" +msgid "About" msgstr "О программе" diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop deleted file mode 100644 index b075730..0000000 --- a/ubl-settings-manager.desktop +++ /dev/null @@ -1,15 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Name=ubl-settings-manager -Name[ru]=Настройки UBLinux -GenericName=ubl-settings-manager -GenericName[ru]=Настройки UBLinux -Comment=ubl-settings-manager -Comment[ru]=Приложение для управления настройками UBLinux -Type=Application -Exec=ubl-settings-info -Icon=ublinux-ubconfig -Terminal=false -X-XfcePluggable=false -X-UBlPluggable=false -Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;