diff --git a/Makefile b/Makefile index 8fe8775..4da746e 100644 --- a/Makefile +++ b/Makefile @@ -74,7 +74,7 @@ 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}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/$${FILE_MO}"; \ $(RM) "$${PATH_FILE_MO}"; \ done @for SIZE in 16x16 32x32 48x48 scalable; do \ @@ -101,9 +101,9 @@ install: check uninstall @echo "Install ..." @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ - install -dm755 "${DESTDIR}${PREFIX}/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="${DESTDIR}${PREFIX}/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 diff --git a/source/ubl-settings-manager.c b/source/ubl-settings-manager.c index 6fbb9d0..65aaf82 100644 --- a/source/ubl-settings-manager.c +++ b/source/ubl-settings-manager.c @@ -1808,29 +1808,6 @@ dictionary *yon_theme_new(dictionary **widgetss, GtkBuilder *builder, char *them } gtk_widget_hide_on_delete(curWidgets->window); g_signal_connect(G_OBJECT(curWidgets->window), "destroy", G_CALLBACK(yon_main_quit), curWidgets); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"MainHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"sectionsHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"GnomeHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"settingsHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"webHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"warningHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(gtk_builder_get_object(builder,"LoaderHeaderNameLabel")),UBL_SETTINGS_MANAGER_TITLE); - gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelSize),ICON_SIZE_LABEL); - gtk_label_set_text(GTK_LABEL(curWidgets->settingsSubmenuLabelTheme),WINDOW_THEME_LABEL); - gtk_label_set_text(GTK_LABEL(curWidgets->helpHeader),REDIRECTION_LABEL); - gtk_label_set_text(GTK_LABEL(curWidgets->helpText),REDIRECTION_COMMENT_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->ReadHelpButton),READ_ONLINE_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->CancelHelpButton),CANCEL_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->settingsCancel),CLOSE_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->settingsAccept),SAVE_AND_APPLY_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->SectionSettingsSaveButton),APPLY_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->AlwaysOpenDocumentation),ALWAYS_REDIRECT_LABEL); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemSettings),SETTINGS_LABEL); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemDocumentation),DOCUMENTATION_LABEL); - gtk_menu_item_set_label(GTK_MENU_ITEM(curWidgets->MenuItemAboutSystem),ABOUT_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->CautionUnderstandButton),UNDERSTOOD_LABEL); - gtk_button_set_label(GTK_BUTTON(curWidgets->settingsSectionsSettingsButton),SECTIONS_MANAGEMENT_LABEL); - gtk_label_set_text(GTK_LABEL(curWidgets->settingsDoubleClickLabel),DOUBLE_CLICK_SELECTION_LABEL); return widgets; } diff --git a/ubl-settings-manager.desktop b/ubl-settings-manager.desktop index 8038835..e0d1b2e 100644 --- a/ubl-settings-manager.desktop +++ b/ubl-settings-manager.desktop @@ -1,11 +1,11 @@ [Desktop Entry] Encoding=UTF-8 Name=ubl-settings-manager -Name[ru]=Менеджер настроек UBLinux +Name[ru]=Диспетчер настроек UBLinux GenericName=ubl-settings-manager -GenericName[ru]=Менеджер настроек UBLinux +GenericName[ru]=Диспетчер настроек UBLinux Comment=ubl-settings-manager -Comment[ru]=Менеджер управления настройками UBLinux +Comment[ru]=Графический диспетчер настроек UBLinux Type=Application Exec=ubl-settings-manager Icon=com.ublinux.ubl-settings-manager diff --git a/ubl-settings-manager.glade b/ubl-settings-manager.glade index a726395..816c617 100644 --- a/ubl-settings-manager.glade +++ b/ubl-settings-manager.glade @@ -1,6 +1,6 @@ - + @@ -46,7 +46,7 @@ 25 20 20 - Changing the theme is not available due to the small screen resolution! + Changing the theme is not available due to the small screen resolution! True 0 @@ -90,7 +90,7 @@ True False - UBLinux Settings + UBLinux Settings Manager @@ -189,7 +189,7 @@ start 10 5 - Would you like to read documentation in the Web? + Would you like to read documentation in the Web? True 0 @@ -210,10 +210,9 @@ True False start - start 15 10 - You will be redirected to documentation website where documentation is translated and supported by community. + You will be redirected to documentation site, where user help pages are translated and supported by community. True 0 - True + False True 1 - Always redirect to online documentation + Always redirect True True False end - 5 - 10 True