diff --git a/Makefile b/Makefile index b03a7d3..21263cf 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 /,-,$(subst /usr,,${PREFIX})) default_target: all @@ -22,11 +21,13 @@ 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}" ]; then \ - LATEST_TAG="0.0"; \ - fi; \ + if [[ -z "$${LATEST_TAG}" ]]; \ + then \ + LATEST_TAG=$$"0.0"; \ + echo "$${LATEST_TAG} is empty"; \ + fi; \ else \ LATEST_TAG="Development"; \ fi; \ @@ -36,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; \ @@ -46,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 !"; \ @@ -75,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 \ @@ -90,64 +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}/usr/share/icons/hicolor/$${SIZE}x$${SIZE}/apps"; \ - rsvg-convert -w $${SIZE} -h $${SIZE} -f svg --keep-image-data "com.ublinux.${PKGNAME}.svg" -o "${DESTDIR}/usr/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}/usr/share/icons/hicolor/scalable/apps/" "com.ublinux.${PKGNAME}.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.checked.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-green-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-red-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-sign-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-green-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-red-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.folder-red-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.document-sign-error-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.warning-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.chain-error-symbolic.svg" - @install -Dm644 -t "${DESTDIR}/usr/share/icons/hicolor/scalable/status/" "com.ublinux.${PKGNAME}.chain-symbolic.svg" - @install -Dm755 -t "${DESTDIR}/usr/share/${PKGNAME}/csv/" "crypt-key.csv" - @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" @install -Dm755 -t "${DESTDIR}${PREFIX}/bin/" "${CMAKE_BUILD_DIR}/${PKGNAME}" - @install -Dm644 "com.ublinux.${PKGNAME}.policy" "${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy" - @sed -e '\|annotate key=|s|/usr/bin|${PREFIX}/bin|' -e '/action id=/s/\.run/${PKGIDENT}\.run/' -i ${DESTDIR}/usr/share/polkit-1/actions/com.ublinux.${PKGNAME}${PKGIDENT}.policy - @if [ -z ${DESTDIR} ]; then \ - [ -d "${DESTDIR}/usr/share/icons/hicolor/" ] && gtk-update-icon-cache -fiq "${DESTDIR}/usr/share/icons/hicolor/" &>/dev/null || true; \ + @install -Dm644 -t "${DESTDIR}${PREFIX}/share/applications/" "${PKGNAME}.desktop" + @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}/usr/share/applications" ] && touch "${DESTDIR}/usr/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"; \ @@ -159,7 +159,7 @@ help: echo "... init"; \ echo "... debug"; \ echo "... prepare"; \ - echo "... build"; \ + echo "... compile"; \ echo "... install"; \ echo "... uninstall"; \ echo "... clean" \ No newline at end of file diff --git a/com.ublinux.ubl-settings-repomanager.checked.svg b/com.ublinux.ubl-settings-repomanager.checked.svg deleted file mode 100644 index e3cab42..0000000 --- a/com.ublinux.ubl-settings-repomanager.checked.svg +++ /dev/null @@ -1,327 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/com.ublinux.ubl-settings-repomanager.warning.svg b/com.ublinux.ubl-settings-repomanager.warning.svg deleted file mode 100644 index 9a90dba..0000000 --- a/com.ublinux.ubl-settings-repomanager.warning.svg +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - image/svg+xml - - - - - - - - diff --git a/gresource.xml b/gresource.xml index 1dd3f75..9c5c8bb 100644 --- a/gresource.xml +++ b/gresource.xml @@ -12,7 +12,4 @@ ubl-settings-repomanager.css - - ubl-settings-repomanager-banner.png - \ No newline at end of file diff --git a/com.ublinux.ubl-settings-repomanager.svg b/icons/apps/com.ublinux.ubl-settings-repomanager.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.svg rename to icons/apps/com.ublinux.ubl-settings-repomanager.svg diff --git a/com.ublinux.ubl-settings-repomanager.chain-error-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.chain-error-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.chain-error-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.chain-error-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.chain-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.chain-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.chain-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.chain-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.document-green-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.document-green-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.document-green-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.document-green-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.document-red-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.document-red-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.document-red-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.document-red-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.document-sign-error-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.document-sign-error-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.document-sign-error-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.document-sign-error-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.document-sign-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.document-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.document-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.document-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.document-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.folder-green-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.folder-green-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.folder-green-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.folder-green-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.folder-red-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.folder-red-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.folder-red-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.folder-red-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.folder-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.folder-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.folder-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.folder-symbolic.svg diff --git a/com.ublinux.ubl-settings-repomanager.warning-symbolic.svg b/icons/status/com.ublinux.ubl-settings-repomanager.warning-symbolic.svg similarity index 100% rename from com.ublinux.ubl-settings-repomanager.warning-symbolic.svg rename to icons/status/com.ublinux.ubl-settings-repomanager.warning-symbolic.svg diff --git a/ubl-settings-repomanager.pot b/locale/ubl-settings-repomanager.pot similarity index 89% rename from ubl-settings-repomanager.pot rename to locale/ubl-settings-repomanager.pot index 2aa34ec..038bef2 100644 --- a/ubl-settings-repomanager.pot +++ b/locale/ubl-settings-repomanager.pot @@ -308,223 +308,239 @@ msgid "Data has been loaded" msgstr "" #: source/ubl-strings.h:89 -msgid "Packages were added successfully" +msgid "Failed to add packages" msgstr "" #: source/ubl-strings.h:90 -msgid "Packages were removed successfully" +msgid "Packages were added successfully" msgstr "" #: source/ubl-strings.h:91 -msgid "Packages were moved successfully" +msgid "Packages were removed successfully" msgstr "" #: source/ubl-strings.h:92 -msgid "Changes saved" +msgid "Packages were moved successfully" msgstr "" #: source/ubl-strings.h:93 -msgid "Key was successfully created" +msgid "Changes saved" msgstr "" #: source/ubl-strings.h:94 +msgid "Key was successfully created" +msgstr "" + +#: source/ubl-strings.h:95 msgid "Key creation failed" msgstr "" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:97 msgid "Choose" msgstr "" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:98 msgid "Cancel" msgstr "" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:100 msgid "Open or create repository" msgstr "" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:101 msgid "Open existing repository" msgstr "" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:102 msgid "Configure repository" msgstr "" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:103 msgid "Delete repository" msgstr "" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:104 msgid "" "Add/Remove repository from\n" "local package sources" msgstr "" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:105 msgid "Enable/disable repository publish" msgstr "" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:106 msgid "Check dependences" msgstr "" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:107 msgid "Sign ripository" msgstr "" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:108 msgid "Open" msgstr "" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:110 msgid "Operation done" msgstr "" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:112 msgid "Choose branch or pack in branch to add file!" msgstr "" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:113 msgid "Choose repository or branch!" msgstr "" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:114 msgid "Choose pack to delete!" msgstr "" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:115 msgid "Choose repository to delete!" msgstr "" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:116 msgid "Choose repository or package to sign" msgstr "" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:118 msgid "Name:" msgstr "" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:119 msgid "Branches:" msgstr "" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:120 msgid "< Type branch name >" msgstr "" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:121 msgid "Name must be filled!" msgstr "" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:122 msgid "Choose path for new repository" msgstr "" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:124 msgid "Choose repository folder" msgstr "" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:125 msgid "Choose repository" msgstr "" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Absent" msgstr "" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "Dependences:" msgstr "" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Digital signature" msgstr "" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "package" msgstr "" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "repository" msgstr "" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:133 msgid "Repeating packages were not added" msgstr "" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:134 msgid "This repository has already been added" msgstr "" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:136 msgid "Close" msgstr "" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:138 msgid "Are you sure want to disable?" msgstr "" -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:140 msgid "Are you sure want to remove?" msgstr "" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:142 msgid "Do not sign" msgstr "" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:144 msgid "Package name error - package has incorrect name pattern" msgstr "" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:146 msgid "Passwords do not match" msgstr "" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:148 msgid "Package search" msgstr "" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:150 msgid "Storage path" msgstr "" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:152 msgid "Repository" msgstr "" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:154 msgid "Architecture" msgstr "" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:156 msgid "Repository name" msgstr "" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:158 msgid "Signature" msgstr "" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:160 msgid "Signature status" msgstr "" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:162 msgid "Sign packages" msgstr "" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:164 msgid "Packages successfully signed" msgstr "" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:166 msgid "Folder must contain repositories" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:168 msgid "Folder must not be empty" msgstr "" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:170 msgid "Name must be 5 or more symbols" msgstr "" + +#: source/ubl-strings.h:172 +msgid "Same repository was chosen for source and target" +msgstr "" + +#: source/ubl-strings.h:174 +msgid "Signed" +msgstr "" + +#: source/ubl-strings.h:175 +msgid "Unsigned" +msgstr "" diff --git a/ubl-settings-repomanager_ru.po b/locale/ubl-settings-repomanager_ru.po similarity index 91% rename from ubl-settings-repomanager_ru.po rename to locale/ubl-settings-repomanager_ru.po index 552d851..35bc933 100644 --- a/ubl-settings-repomanager_ru.po +++ b/locale/ubl-settings-repomanager_ru.po @@ -310,54 +310,58 @@ msgid "Data has been loaded" msgstr "Данные загружены" #: source/ubl-strings.h:89 +msgid "Failed to add packages" +msgstr "Ошибка добавления пакетов" + +#: source/ubl-strings.h:90 msgid "Packages were added successfully" msgstr "Пакеты успешно добавлены" -#: source/ubl-strings.h:90 +#: source/ubl-strings.h:91 msgid "Packages were removed successfully" msgstr "Пакеты успешно удалены" -#: source/ubl-strings.h:91 +#: source/ubl-strings.h:92 msgid "Packages were moved successfully" msgstr "Пакеты успешно перемещены" -#: source/ubl-strings.h:92 +#: source/ubl-strings.h:93 msgid "Changes saved" msgstr "Изменения сохранены" -#: source/ubl-strings.h:93 +#: source/ubl-strings.h:94 msgid "Key was successfully created" msgstr "Ключ был успешно создан" -#: source/ubl-strings.h:94 +#: source/ubl-strings.h:95 msgid "Key creation failed" msgstr "Ошибка создания ключа" -#: source/ubl-strings.h:96 +#: source/ubl-strings.h:97 msgid "Choose" msgstr "Выбрать" -#: source/ubl-strings.h:97 +#: source/ubl-strings.h:98 msgid "Cancel" msgstr "Отмена" -#: source/ubl-strings.h:99 +#: source/ubl-strings.h:100 msgid "Open or create repository" msgstr "Открыть или создать репозиторий" -#: source/ubl-strings.h:100 +#: source/ubl-strings.h:101 msgid "Open existing repository" msgstr "Открыть и добавить репозиторий" -#: source/ubl-strings.h:101 +#: source/ubl-strings.h:102 msgid "Configure repository" msgstr "Редактировать репозиторий" -#: source/ubl-strings.h:102 +#: source/ubl-strings.h:103 msgid "Delete repository" msgstr "Удалить репозиторий" -#: source/ubl-strings.h:103 +#: source/ubl-strings.h:104 msgid "" "Add/Remove repository from\n" "local package sources" @@ -365,107 +369,107 @@ msgstr "" "Добавить/удалить репу из\n" " локальных источников пакетов" -#: source/ubl-strings.h:104 +#: source/ubl-strings.h:105 msgid "Enable/disable repository publish" msgstr "Включить/отключить публикацию" -#: source/ubl-strings.h:105 +#: source/ubl-strings.h:106 msgid "Check dependences" msgstr "Проверить на битые зависимости" -#: source/ubl-strings.h:106 +#: source/ubl-strings.h:107 msgid "Sign ripository" msgstr "Подпись пакетов" -#: source/ubl-strings.h:107 +#: source/ubl-strings.h:108 msgid "Open" msgstr "Открыть" -#: source/ubl-strings.h:109 +#: source/ubl-strings.h:110 msgid "Operation done" msgstr "Операция завершена" -#: source/ubl-strings.h:111 +#: source/ubl-strings.h:112 msgid "Choose branch or pack in branch to add file!" msgstr "Выберите ветку чтобы добавить пакет!" -#: source/ubl-strings.h:112 +#: source/ubl-strings.h:113 msgid "Choose repository or branch!" msgstr "Выберите репозиторий!" -#: source/ubl-strings.h:113 +#: source/ubl-strings.h:114 msgid "Choose pack to delete!" msgstr "Выберите пакет для удаления!" -#: source/ubl-strings.h:114 +#: source/ubl-strings.h:115 msgid "Choose repository to delete!" msgstr "Выберите репозиторий для удаления!" -#: source/ubl-strings.h:115 +#: source/ubl-strings.h:116 msgid "Choose repository or package to sign" msgstr "Выберите репозиторий или пакет для подписи" -#: source/ubl-strings.h:117 +#: source/ubl-strings.h:118 msgid "Name:" msgstr "Имя:" -#: source/ubl-strings.h:118 +#: source/ubl-strings.h:119 msgid "Branches:" msgstr "Ветки:" -#: source/ubl-strings.h:119 +#: source/ubl-strings.h:120 msgid "< Type branch name >" msgstr "< Введите название ветки >" -#: source/ubl-strings.h:120 +#: source/ubl-strings.h:121 msgid "Name must be filled!" msgstr "Введите название!" -#: source/ubl-strings.h:121 +#: source/ubl-strings.h:122 msgid "Choose path for new repository" msgstr "Выбрать расположение нового репозитория" -#: source/ubl-strings.h:123 +#: source/ubl-strings.h:124 msgid "Choose repository folder" msgstr "Выбрать директорию для репозитория" -#: source/ubl-strings.h:124 +#: source/ubl-strings.h:125 msgid "Choose repository" msgstr "Выбрать репозиторий" -#: source/ubl-strings.h:126 +#: source/ubl-strings.h:127 msgid "Absent" msgstr "Отсутствует" -#: source/ubl-strings.h:127 +#: source/ubl-strings.h:128 msgid "Dependences:" msgstr "Зависит от:" -#: source/ubl-strings.h:128 +#: source/ubl-strings.h:129 msgid "Digital signature" msgstr "Цифровая подпись" -#: source/ubl-strings.h:130 +#: source/ubl-strings.h:131 msgid "package" msgstr "пакет" -#: source/ubl-strings.h:131 +#: source/ubl-strings.h:132 msgid "repository" msgstr "репозиторий" -#: source/ubl-strings.h:132 +#: source/ubl-strings.h:133 msgid "Repeating packages were not added" msgstr "Дублирующиеся пакеты не были добавлены" -#: source/ubl-strings.h:133 +#: source/ubl-strings.h:134 msgid "This repository has already been added" msgstr "Этот репозиторий уже был добавлен" -#: source/ubl-strings.h:135 +#: source/ubl-strings.h:136 msgid "Close" msgstr "Закрыть" -#: source/ubl-strings.h:137 +#: source/ubl-strings.h:138 msgid "Are you sure want to disable?" msgstr "" "Внимание! Вы хотите отключить хранилище от управления менеджером " @@ -475,68 +479,80 @@ msgstr "" "Примечание: в дальнейшем Вы можете заново подключить хранилище и управлять " "им." -#: source/ubl-strings.h:139 +#: source/ubl-strings.h:140 msgid "Are you sure want to remove?" msgstr "" "Внимание! Вы ходите удалить хранилище При этом хранилище и вложенные " "репозитории будут безвозвратно удалены!" -#: source/ubl-strings.h:141 +#: source/ubl-strings.h:142 msgid "Do not sign" msgstr "Не подписывать" -#: source/ubl-strings.h:143 +#: source/ubl-strings.h:144 msgid "Package name error - package has incorrect name pattern" msgstr "Ошибка имени пакета - некорректное имя пакета" -#: source/ubl-strings.h:145 +#: source/ubl-strings.h:146 msgid "Passwords do not match" msgstr "Пароли не совпадают" -#: source/ubl-strings.h:147 +#: source/ubl-strings.h:148 msgid "Package search" msgstr "Поиск пакетов" -#: source/ubl-strings.h:149 +#: source/ubl-strings.h:150 msgid "Storage path" msgstr "Расположение хранилища" -#: source/ubl-strings.h:151 +#: source/ubl-strings.h:152 msgid "Repository" msgstr "Репозиторий" -#: source/ubl-strings.h:153 +#: source/ubl-strings.h:154 msgid "Architecture" msgstr "Архитектура" -#: source/ubl-strings.h:155 +#: source/ubl-strings.h:156 msgid "Repository name" msgstr "Имя репозитория" -#: source/ubl-strings.h:157 +#: source/ubl-strings.h:158 msgid "Signature" msgstr "Подпись" -#: source/ubl-strings.h:159 +#: source/ubl-strings.h:160 msgid "Signature status" msgstr "Статус подписи" -#: source/ubl-strings.h:161 +#: source/ubl-strings.h:162 msgid "Sign packages" msgstr "Подписать пакеты" -#: source/ubl-strings.h:163 +#: source/ubl-strings.h:164 msgid "Packages successfully signed" msgstr "Пакеты успешно подписаны" -#: source/ubl-strings.h:165 +#: source/ubl-strings.h:166 msgid "Folder must contain repositories" msgstr "Директория должна содержать репозитории" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:168 msgid "Folder must not be empty" msgstr "Директория должна быть пустой" -#: source/ubl-strings.h:167 +#: source/ubl-strings.h:170 msgid "Name must be 5 or more symbols" msgstr "Имя должно содержать больше 5 символов" + +#: source/ubl-strings.h:172 +msgid "Same repository was chosen for source and target" +msgstr "Для источника и назначения был выбран один и тот же репозиторий" + +#: source/ubl-strings.h:174 +msgid "Signed" +msgstr "Подписан" + +#: source/ubl-strings.h:175 +msgid "Unsigned" +msgstr "Не подписан" diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 0fce1b5..c690837 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -37,7 +37,6 @@ set(DEPENDFILES ../ubl-settings-repomanager-sign.glade ../ubl-settings-repomanager-repo-block.glade ../gresource.xml - ../ubl-settings-repomanager-banner.png ../ubl-settings-repomanager.css ) diff --git a/ubl-settings-repomanager-banner.png b/ubl-settings-repomanager-banner.png deleted file mode 100644 index 8eb67cb..0000000 Binary files a/ubl-settings-repomanager-banner.png and /dev/null differ