diff options
157 files changed, 3060 insertions, 667 deletions
diff --git a/.build.yml b/.build.yml deleted file mode 100644 index ffe389c9..00000000 --- a/.build.yml +++ /dev/null @@ -1,185 +0,0 @@ -########################################################## -# THE FOLLOWING LINES IS USED BY docker-build -########################################################## -requires: - archlinux: - # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/caja - - autoconf-archive - - clang - - gcc - - git - - make - - exempi - - file - - gobject-introspection - - gvfs - - intltool - - libexif - - libnotify - - libsm - - mate-common - - mate-desktop - - which - - xorgproto - - debian: - # Useful URL: https://github.com/mate-desktop/debian-packages - # Useful URL: https://salsa.debian.org/debian-mate-team/caja - - autopoint - - clang - - clang-tools - - cppcheck - - git - - gobject-introspection - - gtk-doc-tools - - intltool - - libdconf-dev - - libexempi-dev - - libexif-dev - - libgail-3-dev - - libgirepository1.0-dev - - libglib2.0-dev - - libgtk-3-dev - - libgtk-layer-shell-dev - - libmate-desktop-dev - - libnotify-dev - - libpango1.0-dev - - libselinux1-dev - - libstartup-notification0-dev - - libx11-dev - - libxml2-dev - - mate-desktop - - mate-common - - python3-lxml - - quilt - - shared-mime-info - - xvfb - - fedora: - # Useful URL: https://src.fedoraproject.org/cgit/rpms/caja.git/ - - autoconf-archive - - clang-analyzer - - clang - - cppcheck-htmlreport - - git - - gcc - - gtk3-devel - - gtk-layer-shell-devel - - make - - redhat-rpm-config - - dbus-glib-devel - - desktop-file-utils - - exempi-devel - - gobject-introspection-devel - - cairo-gobject-devel - - libexif-devel - - libselinux-devel - - libSM-devel - - libxml2-devel - - mate-common - - mate-desktop-devel - - pango-devel - - python3-lxml - - startup-notification-devel - - libnotify-devel - - ubuntu: - - autopoint - - clang - - clang-tools - - git - - gobject-introspection - - gtk-doc-tools - - intltool - - libdconf-dev - - libexempi-dev - - libexif-dev - - libgail-3-dev - - libgirepository1.0-dev - - libglib2.0-dev - - libgtk-3-dev - - libgtk-layer-shell-dev - - libmate-desktop-dev - - libnotify-dev - - libpango1.0-dev - - libselinux1-dev - - libstartup-notification0-dev - - libx11-dev - - libxml2-dev - - mate-common - - python3-lxml - - quilt - - shared-mime-info - -variables: - - 'CHECKERS=" - -enable-checker deadcode.DeadStores - -enable-checker alpha.deadcode.UnreachableCode - -enable-checker alpha.core.CastSize - -enable-checker alpha.core.CastToStruct - -enable-checker alpha.core.IdenticalExpr - -enable-checker alpha.core.SizeofPtr - -enable-checker alpha.security.ArrayBoundV2 - -enable-checker alpha.security.MallocOverflow - -enable-checker alpha.security.ReturnPtrRange - -enable-checker alpha.unix.SimpleStream - -enable-checker alpha.unix.cstring.BufferOverlap - -enable-checker alpha.unix.cstring.NotNullTerminated - -enable-checker alpha.unix.cstring.OutOfBounds - -enable-checker alpha.core.FixedAddr - -enable-checker security.insecureAPI.strcpy"' - -before_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - egrep -lRZ 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_BEGIN_IGNORE_DEPRECATIONS/ /g' - - egrep -lRZ 'G_GNUC_END_IGNORE_DEPRECATIONS' . | xargs -0 -l sed -i -e 's/G_GNUC_END_IGNORE_DEPRECATIONS/ /g' - - fi - - curl -Ls -o /usr/bin/gla11y https://github.com/hypra/gla11y/raw/v0.3/gla11y - - chmod +x /usr/bin/gla11y - -build_scripts: - - if [ ${DISTRO_NAME} == "debian" ];then - - export CFLAGS+=" -Wsign-compare -Wunused-macros" - - cppcheck --enable=warning,style,performance,portability,information,missingInclude . - - fi - - - NOCONFIGURE=1 ./autogen.sh - - scan-build $CHECKERS ./configure --enable-empty-view --enable-compile-warnings=maximum - - if [ $CPU_COUNT -gt 1 ]; then - - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $(( CPU_COUNT + 1 )) - - make clean - - fi - - scan-build $CHECKERS --keep-cc -o html-report make -j $(( CPU_COUNT + 1 )) - - else - - if [ ${DISTRO_NAME} == "debian" ];then - - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make - - make clean - - fi - - scan-build $CHECKERS --keep-cc -o html-report make - - fi - -after_scripts: - - if [ ${DISTRO_NAME} == "fedora" ];then - - cppcheck --xml --output-file=cppcheck.xml --enable=warning,style,performance,portability,information,missingInclude . - - cppcheck-htmlreport --title=${REPO_NAME} --file=cppcheck.xml --report-dir=cppcheck-htmlreport - - ./gen-index -l 20 -i https://github.com/${OWNER_NAME}/mate-icon-theme/raw/master/mate/16x16/apps/system-file-manager.png - - fi - - if [ ${DISTRO_NAME} == "debian" ];then - - make install - - if xvfb-run make check; then :; else cat eel/test-suite.log; cat src/test-suite.log; false; fi - - fi - - make distcheck - -releases: - draft: false - prerelease: false - checksum: true - file_glob: true - files: caja-*.tar.xz - github_release: - tags: true - overwrite: true - base_version: 1.20.0 - notify_servers: - - https://release.mate-desktop.org/release diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..80851cd3 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,8 @@ +# Enable dependabot to keep our GHA pins automatically +# updated, so we don't fall too far behind in the future +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: weekly diff --git a/.github/workflows/archlinux.sh b/.github/workflows/archlinux.sh new file mode 100755 index 00000000..a43d05e1 --- /dev/null +++ b/.github/workflows/archlinux.sh @@ -0,0 +1,41 @@ +#!/usr/bin/bash + +# Use grouped output messages +infobegin() { + echo "::group::${1}" +} +infoend() { + echo "::endgroup::" +} + +# Required packages on Archlinux +requires=( + autoconf-archive + ccache + clang + exempi + file + gcc + gcc + git + glib2-devel + gobject-introspection + gvfs + intltool + libexif + libnotify + libsm + make + mate-common + mate-desktop + which + xorgproto +) + +infobegin "Update system" +pacman --noconfirm -Syu +infoend + +infobegin "Install dependency packages" +pacman --noconfirm -S ${requires[@]} +infoend diff --git a/.github/workflows/builds.sh b/.github/workflows/builds.sh new file mode 100755 index 00000000..c2e7b589 --- /dev/null +++ b/.github/workflows/builds.sh @@ -0,0 +1,65 @@ +#!/usr/bin/bash + +set -e +set -o pipefail + +CPUS=$(grep processor /proc/cpuinfo | wc -l) + +# Use grouped output messages +infobegin() { + echo "::group::${1}" +} +infoend() { + echo "::endgroup::" +} + +# Run meson first, then run autotools +# Because meson dist requires a clean git workspace +# Autotools will modify some files (such as po, etc.), making them dirty. +if [ -f meson.build ]; then + + infobegin "Configure (meson)" + meson setup _build --prefix=/usr + infoend + + infobegin "Build (meson)" + meson compile -C _build + infoend + + infobegin "Test (meson)" + ninja -C _build test + infoend + + infobegin "Dist (meson)" + # Git safedirectory stop ninja dist + # https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 + # https://git-scm.com/docs/git-config/2.35.2#Documentation/git-config.txt-safedirectory + git config --global --add safe.directory ${PWD} + ninja -C _build dist + infoend +fi + +if [ -f autogen.sh ]; then + infobegin "Configure (autotools)" + NOCONFIGURE=1 ./autogen.sh + ./configure --prefix=/usr --enable-compile-warnings=maximum || { + cat config.log + exit 1 + } + infoend + + infobegin "Build (autotools)" + make -j ${CPUS} + infoend + + infobegin "Check (autotools)" + make -j ${CPUS} check || { + find -name test-suite.log -exec cat {} \; + # (check-program:25212): Gtk-WARNING **: 12:05:15.567: cannot open display: + } + infoend + + infobegin "Distcheck (autotools)" + make -j ${CPUS} distcheck + infoend +fi diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml new file mode 100644 index 00000000..8a1e6ee4 --- /dev/null +++ b/.github/workflows/builds.yml @@ -0,0 +1,79 @@ +name: CI Build + +on: + push: + branches: + - master + pull_request: + branches: + - master + workflow_dispatch: + +# cancel already running builds of the same branch or pull request +concurrency: + group: ci-${{ github.workflow }}-${{ github.event.pull_request.number || github.head_ref || github.sha }} + cancel-in-progress: true + +jobs: + build: + name: Build on ${{matrix.container}} (using ${{matrix.cc}}) + runs-on: ubuntu-latest + container: + image: ${{matrix.container}} + volumes: + - /tmp/.cache + - /var/cache/apt + + strategy: + fail-fast: false # don't cancel other jobs in the matrix if one fails + matrix: + container: + [ + "debian:testing", + "fedora:latest", + "ubuntu:rolling", + "archlinux:latest", + ] + cc: ["gcc"] + cxx: ["g++"] + include: + - container: "archlinux:latest" + cc: "clang" + cxx: "clang++" + + env: + # Speed up build with ccache + CC: ccache ${{ matrix.cc }} + CXX: ccache ${{ matrix.cxx }} + CONTAINER: ${{ matrix.container }} + + steps: + - name: Setup environment variables + id: distro-name + shell: bash + run: | + split=(${CONTAINER//:/ }) + distro=${split[0]} + short_sha=${SHA:0:8} + echo "DISTRO=$distro" | tee -a $GITHUB_ENV + - name: Install git command + shell: bash + run: | + echo "::group::Install git ..." + apt-get update -qq && apt-get install --assume-yes git || true + dnf update -y && dnf install -y git || true + pacman --noconfirm -Sy git || true + echo "::endgroup::" + - name: Repository checkout + uses: actions/checkout@v6 + with: + submodules: "true" + - name: Install dependency packages + run: .github/workflows/${{ env.DISTRO }}.sh + - name: Enable ccache to speed up builds + uses: hendrikmuhs/[email protected] + with: + key: ${{ env.DISTRO }}-${{ matrix.cc }} + + - name: Build the source code + run: .github/workflows/builds.sh diff --git a/.github/workflows/debian.sh b/.github/workflows/debian.sh new file mode 100755 index 00000000..93386f70 --- /dev/null +++ b/.github/workflows/debian.sh @@ -0,0 +1,53 @@ +#!/usr/bin/bash + +# Use grouped output messages +infobegin() { + echo "::group::${1}" +} +infoend() { + echo "::endgroup::" +} + +# Required packages on Debian +requires=( + autopoint + ccache + clang + clang-tools + cppcheck + git + gobject-introspection + gtk-doc-tools + intltool + libdconf-dev + libexempi-dev + libexif-dev + libgail-3-dev + libgirepository1.0-dev + libglib2.0-dev + libgtk-3-dev + libgtk-layer-shell-dev + libmate-desktop-dev + libnotify-dev + libpango1.0-dev + libselinux1-dev + libstartup-notification0-dev + libx11-dev + libxml2-dev + mate-common + mate-desktop + python3-lxml + quilt + shared-mime-info + xvfb +) + +infobegin "Update system" +apt-get update -qq +infoend + +infobegin "Install dependency packages" +env DEBIAN_FRONTEND=noninteractive \ + apt-get install --assume-yes \ + ${requires[@]} +infoend diff --git a/.github/workflows/fedora.sh b/.github/workflows/fedora.sh new file mode 100755 index 00000000..eb8bc3f5 --- /dev/null +++ b/.github/workflows/fedora.sh @@ -0,0 +1,47 @@ +#!/usr/bin/bash + +# Use grouped output messages +infobegin() { + echo "::group::${1}" +} +infoend() { + echo "::endgroup::" +} + +# Required packages on Fedora +requires=( + autoconf-archive + cairo-gobject-devel + ccache + clang + clang-analyzer + cppcheck-htmlreport + dbus-glib-devel + desktop-file-utils + exempi-devel + gcc + git + gobject-introspection-devel + gtk-layer-shell-devel + gtk3-devel + libSM-devel + libexif-devel + libnotify-devel + libselinux-devel + libxml2-devel + make + mate-common + mate-desktop-devel + pango-devel + python3-lxml + redhat-rpm-config + startup-notification-devel +) + +infobegin "Update system" +dnf update -y +infoend + +infobegin "Install dependency packages" +dnf install -y ${requires[@]} +infoend diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 00000000..b3363261 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,36 @@ +name: Release Version +on: + push: + tags: + - "v*.*.*" + +env: + MATE_DESKTOP_VERSION: 1.28.2 + CACHE_PATH: /tmp/.cache + +jobs: + release: + name: Release New Version + runs-on: ubuntu-latest + steps: + - name: Repository checkout + uses: actions/checkout@v6 + with: + submodules: "true" + + - name: Install dependency packages + run: sudo .github/workflows/ubuntu.sh + + - name: Build the source code + run: .github/workflows/builds.sh + + - name: Install GH CLI + uses: dev-hanz-ops/[email protected] + with: + gh-cli-version: 2.39.1 + + - name: Create github release + run: | + gh release create ${{ github.ref_name }} --title ${{ github.ref_name }} --generate-notes caja-*.tar.xz + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/ubuntu.sh b/.github/workflows/ubuntu.sh new file mode 100755 index 00000000..93c079f7 --- /dev/null +++ b/.github/workflows/ubuntu.sh @@ -0,0 +1,50 @@ +#!/usr/bin/bash + +# Use grouped output messages +infobegin() { + echo "::group::${1}" +} +infoend() { + echo "::endgroup::" +} + +# Required packages on Ubuntu +requires=( + autopoint + ccache + clang + clang-tools + git + gobject-introspection + gtk-doc-tools + intltool + libdconf-dev + libexempi-dev + libexif-dev + libgail-3-dev + libgirepository1.0-dev + libglib2.0-dev + libgtk-3-dev + libgtk-layer-shell-dev + libmate-desktop-dev + libnotify-dev + libpango1.0-dev + libselinux1-dev + libstartup-notification0-dev + libx11-dev + libxml2-dev + mate-common + python3-lxml + quilt + shared-mime-info +) + +infobegin "Update system" +apt-get update -y +infoend + +infobegin "Install dependency packages" +env DEBIAN_FRONTEND=noninteractive \ + apt-get install --assume-yes \ + ${requires[@]} +infoend diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 63a13ccd..00000000 --- a/.travis.yml +++ /dev/null @@ -1,84 +0,0 @@ -# vim: set ts=2 sts=2 sw=2 expandtab : -dist: jammy -language: shell -os: linux -services: - - docker - -addons: - apt: - packages: - - python3-pip - - python3-setuptools - -branches: - except: - - gh-pages - -before_install: - - curl -Ls -o docker-build https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/docker-build - - curl -Ls -o gen-index https://github.com/mate-desktop/mate-dev-scripts/raw/master/travis/gen-index.sh - - chmod +x docker-build gen-index - -install: - - pip3 install PyGithub - - ./docker-build --name ${DISTRO} --config .build.yml --install - -script: - - ./docker-build --name ${DISTRO} --verbose --config .build.yml --build scripts - -notifications: - irc: - if: (tag OR branch = master) AND - repo = mate-desktop/caja - channels: - - "irc.libera.chat#mate-dev" - template: - - "[%{repository_name}] %{author}: %{commit_subject}" - - "[%{branch}] %{commit} %{message} %{build_url}" - on_success: never - on_failure: always - -before_deploy: - - yes | gem update --system --force - - gem install bundler - - gem install uri - - gem install logger - -deploy: - - provider: pages - edge: - branch: v2.0.5 - token: $GITHUB_TOKEN - keep_history: false - committer_from_gh: true - target_branch: gh-pages - local_dir: html-report - strategy: git - on: - all_branches: true - condition: ${DISTRO} =~ ^fedora.*$ - - provider: script - edge: - branch: v2.0.5 - script: ./docker-build --verbose --config .build.yml --release github - on: - tags: true - condition: "${TRAVIS_TAG} =~ ^v.*$ && ${DISTRO} =~ ^fedora.*$" - -after_success: - - 'if [[ "$TRAVIS_SECURE_ENV_VARS" == "true" && "$TRAVIS_PULL_REQUEST" != "false" && ${DISTRO} =~ ^fedora.*$ ]]; then - REPO_SLUG_ARRAY=(${TRAVIS_REPO_SLUG//\// }); - REPO_NAME=${REPO_SLUG_ARRAY[1]}; - URL="https://${REPO_NAME}.mate-desktop.dev"; - COMMENT="Code analysis completed"; - curl -H "Authorization: token $GITHUB_TOKEN" -X POST - -d "{\"state\": \"success\", \"description\": \"$COMMENT\", \"context\":\"scan-build\", \"target_url\": \"$URL\"}" - https://api.github.com/repos/${TRAVIS_REPO_SLUG}/statuses/${TRAVIS_PULL_REQUEST_SHA}; - fi' - -env: -# - DISTRO="archlinux:latest" - - DISTRO="debian:testing" - - DISTRO="fedora:latest" -# - DISTRO="ubuntu:rolling" @@ -1,4 +1,4 @@ -[](https://travis-ci.org/mate-desktop/caja) +[](https://github.com/mate-desktop/caja/actions/workflows/builds.yml) [](https://github.com/mate-desktop/caja/releases) [](https://webchat.freenode.net/?channels=mate) @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: caja 1.27.2\n" +"Project-Id-Version: caja 1.29.0\n" "Report-Msgid-Bugs-To: https://github.com/mate-desktop/caja/issues\n" -"POT-Creation-Date: 2023-08-31 17:54+0200\n" +"POT-Creation-Date: 2025-07-05 02:05+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -288,7 +288,7 @@ msgstr "" #: data/caja.appdata.xml.in.in:7 data/caja-browser.desktop.in.in:3 #: data/caja.desktop.in.in:3 data/caja-folder-handler.desktop.in.in:3 -#: src/caja-spatial-window.c:403 src/caja-window.c:167 +#: src/caja-spatial-window.c:414 src/caja-window.c:167 #: src/caja-window-menus.c:574 msgid "Caja" msgstr "" @@ -324,7 +324,7 @@ msgstr "" #: src/caja-emblem-sidebar.c:555 src/caja-location-dialog.c:192 #: src/caja-property-browser.c:387 src/caja-window-menus.c:854 #: src/file-manager/fm-directory-view.c:1206 -#: src/file-manager/fm-properties-window.c:5237 +#: src/file-manager/fm-properties-window.c:5269 msgid "_Help" msgstr "" @@ -341,7 +341,7 @@ msgstr "" #: data/caja-bookmarks-window.ui:95 data/caja-file-management-properties.ui:325 #: src/caja-property-browser.c:395 src/caja-window-menus.c:857 #: src/file-manager/fm-list-view.c:2551 -#: src/file-manager/fm-properties-window.c:5242 +#: src/file-manager/fm-properties-window.c:5274 msgid "_Close" msgstr "" @@ -402,12 +402,16 @@ msgstr "" msgid "file;manager;change;properties;behaviour;appearance;windows;MATE;" msgstr "" +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "" + #. Translators: this is used in the view selection dropdown #. * of navigation windows and in the preferences dialog #: data/caja-file-management-properties.ui:44 #: data/caja-file-management-properties.ui:642 #: src/file-manager/fm-icon-container.c:620 -#: src/file-manager/fm-icon-view.c:3478 +#: src/file-manager/fm-icon-view.c:3484 msgid "Icon View" msgstr "" @@ -423,7 +427,7 @@ msgstr "" #. * of navigation windows and in the preferences dialog #: data/caja-file-management-properties.ui:50 #: data/caja-file-management-properties.ui:725 -#: src/file-manager/fm-icon-view.c:3493 +#: src/file-manager/fm-icon-view.c:3499 msgid "Compact View" msgstr "" @@ -614,6 +618,10 @@ msgstr "" msgid "_Text beside icons" msgstr "" +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "" + #: data/caja-file-management-properties.ui:664 msgid "_Default zoom level:" msgstr "" @@ -981,7 +989,7 @@ msgstr "" #: eel/eel-stock-dialogs.c:448 eel/eel-stock-dialogs.c:647 #: libcaja-private/caja-autorun.c:1156 #: libcaja-private/caja-file-conflict-dialog.c:644 -#: libcaja-private/caja-file-operations.c:183 +#: libcaja-private/caja-file-operations.c:185 #: libcaja-private/caja-mime-actions.c:820 #: libcaja-private/caja-mime-actions.c:1741 #: libcaja-private/caja-open-with-dialog.c:964 @@ -1251,7 +1259,7 @@ msgid "The group of the file." msgstr "" #: libcaja-private/caja-column-utilities.c:116 -#: src/file-manager/fm-properties-window.c:4794 +#: src/file-manager/fm-properties-window.c:4826 msgid "Permissions" msgstr "" @@ -1363,8 +1371,8 @@ msgid "Set as _Background" msgstr "" #: libcaja-private/caja-dnd.c:841 libcaja-private/caja-dnd.c:894 -#: libcaja-private/caja-progress-info.c:848 -#: libcaja-private/caja-progress-info.c:849 +#: libcaja-private/caja-progress-info.c:850 +#: libcaja-private/caja-progress-info.c:851 msgid "Cancel" msgstr "" @@ -1632,7 +1640,7 @@ msgid "unknown MIME type" msgstr "" #: libcaja-private/caja-file.c:6721 -#: src/file-manager/fm-properties-window.c:1294 +#: src/file-manager/fm-properties-window.c:1316 msgid "unknown" msgstr "" @@ -1644,7 +1652,7 @@ msgstr "" msgid "link" msgstr "" -#: libcaja-private/caja-file.c:6799 libcaja-private/caja-file-operations.c:403 +#: libcaja-private/caja-file.c:6799 libcaja-private/caja-file-operations.c:405 #: src/file-manager/fm-directory-view.c:10711 #, c-format msgid "Link to %s" @@ -1733,14 +1741,14 @@ msgstr "" #: libcaja-private/caja-file-conflict-dialog.c:266 #: libcaja-private/caja-file-conflict-dialog.c:305 -#: src/file-manager/fm-properties-window.c:3305 +#: src/file-manager/fm-properties-window.c:3327 msgid "Size:" msgstr "" #: libcaja-private/caja-file-conflict-dialog.c:271 #: libcaja-private/caja-file-conflict-dialog.c:310 #: src/caja-connect-server-dialog.c:933 -#: src/file-manager/fm-properties-window.c:3287 +#: src/file-manager/fm-properties-window.c:3309 msgid "Type:" msgstr "" @@ -1775,7 +1783,7 @@ msgid "Apply this action to all files and folders" msgstr "" #: libcaja-private/caja-file-conflict-dialog.c:649 -#: libcaja-private/caja-file-operations.c:184 +#: libcaja-private/caja-file-operations.c:186 msgid "_Skip" msgstr "" @@ -1800,15 +1808,15 @@ msgstr "" msgid "File conflict" msgstr "" -#: libcaja-private/caja-file-operations.c:185 +#: libcaja-private/caja-file-operations.c:187 msgid "S_kip All" msgstr "" -#: libcaja-private/caja-file-operations.c:186 +#: libcaja-private/caja-file-operations.c:188 msgid "_Retry" msgstr "" -#: libcaja-private/caja-file-operations.c:187 src/caja-emblem-sidebar.c:376 +#: libcaja-private/caja-file-operations.c:189 src/caja-emblem-sidebar.c:376 #: src/file-manager/fm-directory-view.c:7481 #: src/file-manager/fm-directory-view.c:7613 #: src/file-manager/fm-directory-view.c:9114 @@ -1816,52 +1824,52 @@ msgstr "" msgid "_Delete" msgstr "" -#: libcaja-private/caja-file-operations.c:188 +#: libcaja-private/caja-file-operations.c:190 msgid "Delete _All" msgstr "" -#: libcaja-private/caja-file-operations.c:189 +#: libcaja-private/caja-file-operations.c:191 msgid "Replace _All" msgstr "" -#: libcaja-private/caja-file-operations.c:190 +#: libcaja-private/caja-file-operations.c:192 msgid "Merge _All" msgstr "" -#: libcaja-private/caja-file-operations.c:191 -msgid "Copy _Anyway" +#: libcaja-private/caja-file-operations.c:193 +msgid "Continue _Anyway" msgstr "" -#: libcaja-private/caja-file-operations.c:303 +#: libcaja-private/caja-file-operations.c:305 #, c-format msgid "%'d second" msgid_plural "%'d seconds" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:308 -#: libcaja-private/caja-file-operations.c:320 +#: libcaja-private/caja-file-operations.c:310 +#: libcaja-private/caja-file-operations.c:322 #, c-format msgid "%'d minute" msgid_plural "%'d minutes" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:319 +#: libcaja-private/caja-file-operations.c:321 #, c-format msgid "%'d hour" msgid_plural "%'d hours" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:327 +#: libcaja-private/caja-file-operations.c:329 #, c-format msgid "approximately %'d hour" msgid_plural "approximately %'d hours" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:407 +#: libcaja-private/caja-file-operations.c:409 #, c-format msgid "Another link to %s" msgstr "" @@ -1870,22 +1878,22 @@ msgstr "" #. * if there's no way to do that nicely for a #. * particular language. #. -#: libcaja-private/caja-file-operations.c:423 +#: libcaja-private/caja-file-operations.c:425 #, c-format msgid "%'dst link to %s" msgstr "" -#: libcaja-private/caja-file-operations.c:427 +#: libcaja-private/caja-file-operations.c:429 #, c-format msgid "%'dnd link to %s" msgstr "" -#: libcaja-private/caja-file-operations.c:431 +#: libcaja-private/caja-file-operations.c:433 #, c-format msgid "%'drd link to %s" msgstr "" -#: libcaja-private/caja-file-operations.c:435 +#: libcaja-private/caja-file-operations.c:437 #, c-format msgid "%'dth link to %s" msgstr "" @@ -1895,12 +1903,12 @@ msgstr "" #. * make some or all of them match. #. #. Translators: tag used to detect the first copy of a file -#: libcaja-private/caja-file-operations.c:473 +#: libcaja-private/caja-file-operations.c:475 msgid " (copy)" msgstr "" #. Translators: tag used to detect the second copy of a file -#: libcaja-private/caja-file-operations.c:475 +#: libcaja-private/caja-file-operations.c:477 msgid " (another copy)" msgstr "" @@ -1908,36 +1916,36 @@ msgstr "" #. Translators: tag used to detect the x12th copy of a file #. Translators: tag used to detect the x13th copy of a file #. Translators: tag used to detect the xxth copy of a file -#: libcaja-private/caja-file-operations.c:478 #: libcaja-private/caja-file-operations.c:480 #: libcaja-private/caja-file-operations.c:482 -#: libcaja-private/caja-file-operations.c:492 +#: libcaja-private/caja-file-operations.c:484 +#: libcaja-private/caja-file-operations.c:494 msgid "th copy)" msgstr "" #. Translators: tag used to detect the x1st copy of a file -#: libcaja-private/caja-file-operations.c:485 +#: libcaja-private/caja-file-operations.c:487 msgid "st copy)" msgstr "" #. Translators: tag used to detect the x2nd copy of a file -#: libcaja-private/caja-file-operations.c:487 +#: libcaja-private/caja-file-operations.c:489 msgid "nd copy)" msgstr "" #. Translators: tag used to detect the x3rd copy of a file -#: libcaja-private/caja-file-operations.c:489 +#: libcaja-private/caja-file-operations.c:491 msgid "rd copy)" msgstr "" #. Translators: appended to first file copy -#: libcaja-private/caja-file-operations.c:506 +#: libcaja-private/caja-file-operations.c:508 #, c-format msgid "%s (copy)%s" msgstr "" #. Translators: appended to second file copy -#: libcaja-private/caja-file-operations.c:508 +#: libcaja-private/caja-file-operations.c:510 #, c-format msgid "%s (another copy)%s" msgstr "" @@ -1946,10 +1954,10 @@ msgstr "" #. Translators: appended to x12th file copy #. Translators: appended to x13th file copy #. Translators: appended to xxth file copy -#: libcaja-private/caja-file-operations.c:511 #: libcaja-private/caja-file-operations.c:513 #: libcaja-private/caja-file-operations.c:515 -#: libcaja-private/caja-file-operations.c:529 +#: libcaja-private/caja-file-operations.c:517 +#: libcaja-private/caja-file-operations.c:531 #, c-format msgid "%s (%'dth copy)%s" msgstr "" @@ -1959,39 +1967,39 @@ msgstr "" #. * strings look like "%s (copy %'d)%s". #. #. Translators: appended to x1st file copy -#: libcaja-private/caja-file-operations.c:523 +#: libcaja-private/caja-file-operations.c:525 #, c-format msgid "%s (%'dst copy)%s" msgstr "" #. Translators: appended to x2nd file copy -#: libcaja-private/caja-file-operations.c:525 +#: libcaja-private/caja-file-operations.c:527 #, c-format msgid "%s (%'dnd copy)%s" msgstr "" #. Translators: appended to x3rd file copy -#: libcaja-private/caja-file-operations.c:527 +#: libcaja-private/caja-file-operations.c:529 #, c-format msgid "%s (%'drd copy)%s" msgstr "" #. Translators: opening parentheses to match the "th copy)" string -#: libcaja-private/caja-file-operations.c:625 +#: libcaja-private/caja-file-operations.c:627 msgid " (" msgstr "" #. Translators: opening parentheses of the "th copy)" string -#: libcaja-private/caja-file-operations.c:633 +#: libcaja-private/caja-file-operations.c:635 #, c-format msgid " (%'d" msgstr "" -#: libcaja-private/caja-file-operations.c:1362 +#: libcaja-private/caja-file-operations.c:1364 msgid "Are you sure you want to permanently delete \"%B\" from the trash?" msgstr "" -#: libcaja-private/caja-file-operations.c:1365 +#: libcaja-private/caja-file-operations.c:1367 #, c-format msgid "" "Are you sure you want to permanently delete the %'d selected item from the " @@ -2002,30 +2010,30 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1375 -#: libcaja-private/caja-file-operations.c:1441 +#: libcaja-private/caja-file-operations.c:1377 +#: libcaja-private/caja-file-operations.c:1443 msgid "If you delete an item, it will be permanently lost." msgstr "" -#: libcaja-private/caja-file-operations.c:1395 +#: libcaja-private/caja-file-operations.c:1397 msgid "Empty all items from Trash?" msgstr "" -#: libcaja-private/caja-file-operations.c:1399 +#: libcaja-private/caja-file-operations.c:1401 msgid "All items in the Trash will be permanently deleted." msgstr "" -#: libcaja-private/caja-file-operations.c:1402 -#: libcaja-private/caja-file-operations.c:2334 src/caja-places-sidebar.c:2826 +#: libcaja-private/caja-file-operations.c:1404 +#: libcaja-private/caja-file-operations.c:2340 src/caja-places-sidebar.c:2826 #: src/caja-trash-bar.c:192 msgid "Empty _Trash" msgstr "" -#: libcaja-private/caja-file-operations.c:1429 +#: libcaja-private/caja-file-operations.c:1431 msgid "Are you sure you want to permanently delete \"%B\"?" msgstr "" -#: libcaja-private/caja-file-operations.c:1432 +#: libcaja-private/caja-file-operations.c:1434 #, c-format msgid "Are you sure you want to permanently delete the %'d selected item?" msgid_plural "" @@ -2033,297 +2041,306 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1471 +#: libcaja-private/caja-file-operations.c:1473 msgid "Are you sure you want to trash \"%B\"?" msgstr "" -#: libcaja-private/caja-file-operations.c:1474 +#: libcaja-private/caja-file-operations.c:1476 #, c-format msgid "Are you sure you want to trash the %'d selected item?" msgid_plural "Are you sure you want to trash the %'d selected items?" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1483 +#: libcaja-private/caja-file-operations.c:1485 msgid "Items moved to the trash may be recovered until the trash is emptied." msgstr "" -#: libcaja-private/caja-file-operations.c:1486 +#: libcaja-private/caja-file-operations.c:1488 msgid "Move to _Trash" msgstr "" -#: libcaja-private/caja-file-operations.c:1516 +#: libcaja-private/caja-file-operations.c:1518 #, c-format msgid "%'d file left to delete" msgid_plural "%'d files left to delete" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1522 +#: libcaja-private/caja-file-operations.c:1524 msgid "Deleting files" msgstr "" #. Translators: %T will expand to a time like "2 minutes". #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). #. -#: libcaja-private/caja-file-operations.c:1539 +#: libcaja-private/caja-file-operations.c:1545 msgid "%T left" msgid_plural "%T left" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1606 -#: libcaja-private/caja-file-operations.c:1640 -#: libcaja-private/caja-file-operations.c:1679 -#: libcaja-private/caja-file-operations.c:1756 -#: libcaja-private/caja-file-operations.c:2579 +#: libcaja-private/caja-file-operations.c:1612 +#: libcaja-private/caja-file-operations.c:1646 +#: libcaja-private/caja-file-operations.c:1685 +#: libcaja-private/caja-file-operations.c:1762 +#: libcaja-private/caja-file-operations.c:2592 msgid "Error while deleting." msgstr "" -#: libcaja-private/caja-file-operations.c:1610 +#: libcaja-private/caja-file-operations.c:1616 msgid "" "Files in the folder \"%B\" cannot be deleted because you do not have " "permissions to see them." msgstr "" -#: libcaja-private/caja-file-operations.c:1613 -#: libcaja-private/caja-file-operations.c:2639 -#: libcaja-private/caja-file-operations.c:3634 +#: libcaja-private/caja-file-operations.c:1619 +#: libcaja-private/caja-file-operations.c:2652 +#: libcaja-private/caja-file-operations.c:3668 msgid "" "There was an error getting information about the files in the folder \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:1622 -#: libcaja-private/caja-file-operations.c:3643 +#: libcaja-private/caja-file-operations.c:1628 +#: libcaja-private/caja-file-operations.c:3677 msgid "_Skip files" msgstr "" -#: libcaja-private/caja-file-operations.c:1643 +#: libcaja-private/caja-file-operations.c:1649 msgid "" "The folder \"%B\" cannot be deleted because you do not have permissions to " "read it." msgstr "" -#: libcaja-private/caja-file-operations.c:1646 -#: libcaja-private/caja-file-operations.c:2678 -#: libcaja-private/caja-file-operations.c:3679 +#: libcaja-private/caja-file-operations.c:1652 +#: libcaja-private/caja-file-operations.c:2691 +#: libcaja-private/caja-file-operations.c:3713 msgid "There was an error reading the folder \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:1680 +#: libcaja-private/caja-file-operations.c:1686 msgid "Could not remove the folder %B." msgstr "" -#: libcaja-private/caja-file-operations.c:1757 +#: libcaja-private/caja-file-operations.c:1763 msgid "There was an error deleting %B." msgstr "" -#: libcaja-private/caja-file-operations.c:1837 +#: libcaja-private/caja-file-operations.c:1843 msgid "Moving files to trash" msgstr "" -#: libcaja-private/caja-file-operations.c:1839 +#: libcaja-private/caja-file-operations.c:1845 #, c-format msgid "%'d file left to trash" msgid_plural "%'d files left to trash" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:1895 +#: libcaja-private/caja-file-operations.c:1901 msgid "Cannot move file to trash, do you want to delete immediately?" msgstr "" -#: libcaja-private/caja-file-operations.c:1896 +#: libcaja-private/caja-file-operations.c:1902 msgid "The file \"%B\" cannot be moved to the trash." msgstr "" -#: libcaja-private/caja-file-operations.c:2081 +#: libcaja-private/caja-file-operations.c:2087 msgid "Trashing Files" msgstr "" -#: libcaja-private/caja-file-operations.c:2083 +#: libcaja-private/caja-file-operations.c:2089 msgid "Deleting Files" msgstr "" -#: libcaja-private/caja-file-operations.c:2146 src/caja-places-sidebar.c:2274 +#: libcaja-private/caja-file-operations.c:2152 src/caja-places-sidebar.c:2274 #: src/caja-places-sidebar.c:2310 msgid "It is now safe to remove the drive" msgstr "" -#: libcaja-private/caja-file-operations.c:2159 +#: libcaja-private/caja-file-operations.c:2165 msgid "Unable to eject %V" msgstr "" -#: libcaja-private/caja-file-operations.c:2161 +#: libcaja-private/caja-file-operations.c:2167 msgid "Unable to unmount %V" msgstr "" -#: libcaja-private/caja-file-operations.c:2197 src/caja-places-sidebar.c:2344 +#: libcaja-private/caja-file-operations.c:2203 src/caja-places-sidebar.c:2344 msgid "Writing data to the drive -- do not unplug" msgstr "" -#: libcaja-private/caja-file-operations.c:2319 +#: libcaja-private/caja-file-operations.c:2325 msgid "Do you want to empty the trash before you unmount?" msgstr "" -#: libcaja-private/caja-file-operations.c:2321 +#: libcaja-private/caja-file-operations.c:2327 msgid "" "In order to regain the free space on this volume the trash must be emptied. " "All trashed items on the volume will be permanently lost." msgstr "" -#: libcaja-private/caja-file-operations.c:2328 +#: libcaja-private/caja-file-operations.c:2334 msgid "Do _not Empty Trash" msgstr "" -#: libcaja-private/caja-file-operations.c:2449 +#: libcaja-private/caja-file-operations.c:2455 #, c-format msgid "Unable to mount %s" msgstr "" -#: libcaja-private/caja-file-operations.c:2526 +#: libcaja-private/caja-file-operations.c:2536 #, c-format msgid "Preparing to copy %'d file (%S)" msgid_plural "Preparing to copy %'d files (%S)" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:2532 +#: libcaja-private/caja-file-operations.c:2542 #, c-format msgid "Preparing to move %'d file (%S)" msgid_plural "Preparing to move %'d files (%S)" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:2538 +#: libcaja-private/caja-file-operations.c:2548 #, c-format msgid "Preparing to delete %'d file (%S)" msgid_plural "Preparing to delete %'d files (%S)" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:2544 +#: libcaja-private/caja-file-operations.c:2554 #, c-format msgid "Preparing to trash %'d file" msgid_plural "Preparing to trash %'d files" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:2575 -#: libcaja-private/caja-file-operations.c:3486 -#: libcaja-private/caja-file-operations.c:3626 -#: libcaja-private/caja-file-operations.c:3671 +#: libcaja-private/caja-file-operations.c:2588 +#: libcaja-private/caja-file-operations.c:3520 +#: libcaja-private/caja-file-operations.c:3660 +#: libcaja-private/caja-file-operations.c:3705 msgid "Error while copying." msgstr "" -#: libcaja-private/caja-file-operations.c:2577 -#: libcaja-private/caja-file-operations.c:3624 -#: libcaja-private/caja-file-operations.c:3669 +#: libcaja-private/caja-file-operations.c:2590 +#: libcaja-private/caja-file-operations.c:3658 +#: libcaja-private/caja-file-operations.c:3703 msgid "Error while moving." msgstr "" -#: libcaja-private/caja-file-operations.c:2581 +#: libcaja-private/caja-file-operations.c:2594 msgid "Error while moving files to trash." msgstr "" -#: libcaja-private/caja-file-operations.c:2636 +#: libcaja-private/caja-file-operations.c:2649 msgid "" "Files in the folder \"%B\" cannot be handled because you do not have " "permissions to see them." msgstr "" -#: libcaja-private/caja-file-operations.c:2675 +#: libcaja-private/caja-file-operations.c:2688 msgid "" "The folder \"%B\" cannot be handled because you do not have permissions to " "read it." msgstr "" -#: libcaja-private/caja-file-operations.c:2753 +#: libcaja-private/caja-file-operations.c:2766 msgid "" "The file \"%B\" cannot be handled because you do not have permissions to " "read it." msgstr "" -#: libcaja-private/caja-file-operations.c:2756 +#: libcaja-private/caja-file-operations.c:2769 msgid "There was an error getting information about \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:2856 -#: libcaja-private/caja-file-operations.c:2898 -#: libcaja-private/caja-file-operations.c:2931 -#: libcaja-private/caja-file-operations.c:2961 +#: libcaja-private/caja-file-operations.c:2846 +msgid "Error while creating file/directory in \"%B\"." +msgstr "" + +#: libcaja-private/caja-file-operations.c:2848 +msgid "Error while creating link in \"%B\"." +msgstr "" + +#: libcaja-private/caja-file-operations.c:2850 msgid "Error while copying to \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:2860 +#: libcaja-private/caja-file-operations.c:2852 +msgid "Error while moving to \"%B\"." +msgstr "" + +#: libcaja-private/caja-file-operations.c:2894 msgid "You do not have permissions to access the destination folder." msgstr "" -#: libcaja-private/caja-file-operations.c:2862 +#: libcaja-private/caja-file-operations.c:2896 msgid "There was an error getting information about the destination." msgstr "" -#: libcaja-private/caja-file-operations.c:2899 +#: libcaja-private/caja-file-operations.c:2933 msgid "The destination is not a folder." msgstr "" -#: libcaja-private/caja-file-operations.c:2932 +#: libcaja-private/caja-file-operations.c:2966 msgid "" "There is not enough space on the destination. Try to remove files to make " "space." msgstr "" -#: libcaja-private/caja-file-operations.c:2934 +#: libcaja-private/caja-file-operations.c:2968 msgid "There is %" msgstr "" -#: libcaja-private/caja-file-operations.c:2962 +#: libcaja-private/caja-file-operations.c:2996 msgid "The destination is read-only." msgstr "" -#: libcaja-private/caja-file-operations.c:3020 +#: libcaja-private/caja-file-operations.c:3054 msgid "Moving \"%B\" to \"%B\"" msgstr "" -#: libcaja-private/caja-file-operations.c:3021 +#: libcaja-private/caja-file-operations.c:3055 msgid "Copying \"%B\" to \"%B\"" msgstr "" -#: libcaja-private/caja-file-operations.c:3026 +#: libcaja-private/caja-file-operations.c:3060 msgid "Duplicating \"%B\"" msgstr "" -#: libcaja-private/caja-file-operations.c:3034 +#: libcaja-private/caja-file-operations.c:3068 msgid "Moving %'d file (in \"%B\") to \"%B\"" msgid_plural "Moving %'d files (in \"%B\") to \"%B\"" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3038 +#: libcaja-private/caja-file-operations.c:3072 msgid "Copying %'d file (in \"%B\") to \"%B\"" msgid_plural "Copying %'d files (in \"%B\") to \"%B\"" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3046 +#: libcaja-private/caja-file-operations.c:3080 msgid "Duplicating %'d file (in \"%B\")" msgid_plural "Duplicating %'d files (in \"%B\")" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3056 +#: libcaja-private/caja-file-operations.c:3090 msgid "Moving %'d file to \"%B\"" msgid_plural "Moving %'d files to \"%B\"" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3060 +#: libcaja-private/caja-file-operations.c:3094 msgid "Copying %'d file to \"%B\"" msgid_plural "Copying %'d files to \"%B\"" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3066 +#: libcaja-private/caja-file-operations.c:3100 #, c-format msgid "Duplicating %'d file" msgid_plural "Duplicating %'d files" @@ -2331,7 +2348,7 @@ msgstr[0] "" msgstr[1] "" #. Translators: %S will expand to a size like "2 bytes" or "3 MB", so something like "4 kb of 4 MB" -#: libcaja-private/caja-file-operations.c:3086 +#: libcaja-private/caja-file-operations.c:3120 #, c-format msgid "%S of %S" msgstr "" @@ -2341,185 +2358,185 @@ msgstr "" #. * #. * The singular/plural form will be used depending on the remaining time (i.e. the %T argument). #. -#: libcaja-private/caja-file-operations.c:3099 +#: libcaja-private/caja-file-operations.c:3133 msgid "%S of %S — %T left (%S/sec)" msgid_plural "%S of %S — %T left (%S/sec)" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:3490 +#: libcaja-private/caja-file-operations.c:3524 msgid "" "The folder \"%B\" cannot be copied because you do not have permissions to " "create it in the destination." msgstr "" -#: libcaja-private/caja-file-operations.c:3493 +#: libcaja-private/caja-file-operations.c:3527 msgid "There was an error creating the folder \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:3631 +#: libcaja-private/caja-file-operations.c:3665 msgid "" "Files in the folder \"%B\" cannot be copied because you do not have " "permissions to see them." msgstr "" -#: libcaja-private/caja-file-operations.c:3676 +#: libcaja-private/caja-file-operations.c:3710 msgid "" "The folder \"%B\" cannot be copied because you do not have permissions to " "read it." msgstr "" -#: libcaja-private/caja-file-operations.c:3721 -#: libcaja-private/caja-file-operations.c:4420 -#: libcaja-private/caja-file-operations.c:5011 +#: libcaja-private/caja-file-operations.c:3755 +#: libcaja-private/caja-file-operations.c:4454 +#: libcaja-private/caja-file-operations.c:5046 msgid "Error while moving \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:3722 +#: libcaja-private/caja-file-operations.c:3756 msgid "Could not remove the source folder." msgstr "" -#: libcaja-private/caja-file-operations.c:3807 -#: libcaja-private/caja-file-operations.c:3848 -#: libcaja-private/caja-file-operations.c:4422 -#: libcaja-private/caja-file-operations.c:4494 +#: libcaja-private/caja-file-operations.c:3841 +#: libcaja-private/caja-file-operations.c:3882 +#: libcaja-private/caja-file-operations.c:4456 +#: libcaja-private/caja-file-operations.c:4528 msgid "Error while copying \"%B\"." msgstr "" -#: libcaja-private/caja-file-operations.c:3808 +#: libcaja-private/caja-file-operations.c:3842 #, c-format msgid "Could not remove files from the already existing folder %F." msgstr "" -#: libcaja-private/caja-file-operations.c:3849 +#: libcaja-private/caja-file-operations.c:3883 #, c-format msgid "Could not remove the already existing file %F." msgstr "" -#: libcaja-private/caja-file-operations.c:4167 -#: libcaja-private/caja-file-operations.c:4857 +#: libcaja-private/caja-file-operations.c:4201 +#: libcaja-private/caja-file-operations.c:4892 msgid "You cannot move a folder into itself." msgstr "" -#: libcaja-private/caja-file-operations.c:4168 -#: libcaja-private/caja-file-operations.c:4858 +#: libcaja-private/caja-file-operations.c:4202 +#: libcaja-private/caja-file-operations.c:4893 msgid "You cannot copy a folder into itself." msgstr "" -#: libcaja-private/caja-file-operations.c:4169 -#: libcaja-private/caja-file-operations.c:4859 +#: libcaja-private/caja-file-operations.c:4203 +#: libcaja-private/caja-file-operations.c:4894 msgid "The destination folder is inside the source folder." msgstr "" -#: libcaja-private/caja-file-operations.c:4200 +#: libcaja-private/caja-file-operations.c:4234 msgid "You cannot move a file over itself." msgstr "" -#: libcaja-private/caja-file-operations.c:4201 +#: libcaja-private/caja-file-operations.c:4235 msgid "You cannot copy a file over itself." msgstr "" -#: libcaja-private/caja-file-operations.c:4202 +#: libcaja-private/caja-file-operations.c:4236 msgid "The source file would be overwritten by the destination." msgstr "" -#: libcaja-private/caja-file-operations.c:4424 +#: libcaja-private/caja-file-operations.c:4458 #, c-format msgid "Could not remove the already existing file with the same name in %F." msgstr "" -#: libcaja-private/caja-file-operations.c:4495 +#: libcaja-private/caja-file-operations.c:4529 #, c-format msgid "There was an error copying the file into %F." msgstr "" -#: libcaja-private/caja-file-operations.c:4741 +#: libcaja-private/caja-file-operations.c:4776 msgid "Copying Files" msgstr "" -#: libcaja-private/caja-file-operations.c:4768 +#: libcaja-private/caja-file-operations.c:4803 msgid "Preparing to Move to \"%B\"" msgstr "" -#: libcaja-private/caja-file-operations.c:4772 +#: libcaja-private/caja-file-operations.c:4807 #, c-format msgid "Preparing to move %'d file" msgid_plural "Preparing to move %'d files" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:5012 +#: libcaja-private/caja-file-operations.c:5047 #, c-format msgid "There was an error moving the file into %F." msgstr "" -#: libcaja-private/caja-file-operations.c:5280 +#: libcaja-private/caja-file-operations.c:5319 msgid "Moving Files" msgstr "" -#: libcaja-private/caja-file-operations.c:5311 +#: libcaja-private/caja-file-operations.c:5350 msgid "Creating links in \"%B\"" msgstr "" -#: libcaja-private/caja-file-operations.c:5315 +#: libcaja-private/caja-file-operations.c:5354 #, c-format msgid "Making link to %'d file" msgid_plural "Making links to %'d files" msgstr[0] "" msgstr[1] "" -#: libcaja-private/caja-file-operations.c:5446 +#: libcaja-private/caja-file-operations.c:5485 msgid "Error while creating link to %B." msgstr "" -#: libcaja-private/caja-file-operations.c:5448 +#: libcaja-private/caja-file-operations.c:5487 msgid "Symbolic links only supported for local files" msgstr "" -#: libcaja-private/caja-file-operations.c:5451 +#: libcaja-private/caja-file-operations.c:5490 msgid "The target doesn't support symbolic links." msgstr "" -#: libcaja-private/caja-file-operations.c:5454 +#: libcaja-private/caja-file-operations.c:5493 #, c-format msgid "There was an error creating the symlink in %F." msgstr "" -#: libcaja-private/caja-file-operations.c:5767 +#: libcaja-private/caja-file-operations.c:5807 msgid "Setting permissions" msgstr "" #. Translators: the initial name of a new folder -#: libcaja-private/caja-file-operations.c:6026 +#: libcaja-private/caja-file-operations.c:6067 msgid "untitled folder" msgstr "" #. Translators: the initial name of a new empty file -#: libcaja-private/caja-file-operations.c:6034 +#: libcaja-private/caja-file-operations.c:6075 msgid "new file" msgstr "" -#: libcaja-private/caja-file-operations.c:6208 +#: libcaja-private/caja-file-operations.c:6249 msgid "Error while creating directory %B." msgstr "" -#: libcaja-private/caja-file-operations.c:6210 +#: libcaja-private/caja-file-operations.c:6251 msgid "Error while creating file %B." msgstr "" -#: libcaja-private/caja-file-operations.c:6212 +#: libcaja-private/caja-file-operations.c:6253 #, c-format msgid "There was an error creating the directory in %F." msgstr "" -#: libcaja-private/caja-file-operations.c:6489 +#: libcaja-private/caja-file-operations.c:6530 msgid "Emptying Trash" msgstr "" -#: libcaja-private/caja-file-operations.c:6538 -#: libcaja-private/caja-file-operations.c:6578 -#: libcaja-private/caja-file-operations.c:6613 -#: libcaja-private/caja-file-operations.c:6647 +#: libcaja-private/caja-file-operations.c:6579 +#: libcaja-private/caja-file-operations.c:6619 +#: libcaja-private/caja-file-operations.c:6654 +#: libcaja-private/caja-file-operations.c:6688 msgid "Unable to mark launcher trusted (executable)" msgstr "" @@ -2766,7 +2783,7 @@ msgid "Select an Application" msgstr "" #: libcaja-private/caja-open-with-dialog.c:863 -#: src/file-manager/fm-properties-window.c:5128 +#: src/file-manager/fm-properties-window.c:5160 msgid "Open With" msgstr "" @@ -2938,13 +2955,13 @@ msgstr[1] "" msgid "Process completed" msgstr "" -#: libcaja-private/caja-progress-info.c:806 -#: libcaja-private/caja-progress-info.c:807 +#: libcaja-private/caja-progress-info.c:808 +#: libcaja-private/caja-progress-info.c:809 msgid "Queue" msgstr "" -#: libcaja-private/caja-progress-info.c:1006 -#: libcaja-private/caja-progress-info.c:1027 +#: libcaja-private/caja-progress-info.c:1008 +#: libcaja-private/caja-progress-info.c:1029 msgid "Preparing" msgstr "" @@ -3782,6 +3799,14 @@ msgstr "" msgid "Put labels beside icons" msgstr "" +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "" + #: libcaja-private/org.mate.caja.gschema.xml:319 msgid "" "If true, labels will be placed beside icons rather than underneath them." @@ -4125,162 +4150,162 @@ msgid "" "media matching these types." msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:169 +#: mate-submodules/libegg/eggdesktopfile.c:168 msgid "File is not a valid .desktop file" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:194 +#: mate-submodules/libegg/eggdesktopfile.c:193 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:984 +#: mate-submodules/libegg/eggdesktopfile.c:975 #, c-format msgid "Starting %s" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:1126 +#: mate-submodules/libegg/eggdesktopfile.c:1117 msgid "Application does not accept documents on command line" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:1194 +#: mate-submodules/libegg/eggdesktopfile.c:1185 #, c-format msgid "Unrecognized launch option: %d" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:1410 +#: mate-submodules/libegg/eggdesktopfile.c:1401 msgid "Can't pass document URIs to a 'Type=Link' desktop entry" msgstr "" -#: mate-submodules/libegg/eggdesktopfile.c:1431 +#: mate-submodules/libegg/eggdesktopfile.c:1422 msgid "Not a launchable item" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:234 +#: mate-submodules/libegg/eggsmclient.c:233 msgid "Disable connection to session manager" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:239 +#: mate-submodules/libegg/eggsmclient.c:238 msgid "Specify file containing saved configuration" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:239 +#: mate-submodules/libegg/eggsmclient.c:238 msgid "FILE" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:244 +#: mate-submodules/libegg/eggsmclient.c:243 msgid "Specify session management ID" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:244 +#: mate-submodules/libegg/eggsmclient.c:243 msgid "ID" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:270 +#: mate-submodules/libegg/eggsmclient.c:269 msgid "Session management options:" msgstr "" -#: mate-submodules/libegg/eggsmclient.c:271 +#: mate-submodules/libegg/eggsmclient.c:270 msgid "Show session management options" msgstr "" -#: src/caja-application.c:556 +#: src/caja-application.c:557 #, c-format msgid "Caja could not create the required folder \"%s\"." msgstr "" -#: src/caja-application.c:558 +#: src/caja-application.c:559 msgid "" "Before running Caja, please create the following folder, or set permissions " "such that Caja can create it." msgstr "" -#: src/caja-application.c:563 +#: src/caja-application.c:564 #, c-format msgid "Caja could not create the following required folders: %s." msgstr "" -#: src/caja-application.c:565 +#: src/caja-application.c:566 msgid "" "Before running Caja, please create these folders, or set permissions such " "that Caja can create them." msgstr "" -#: src/caja-application.c:1174 src/caja-places-sidebar.c:2231 +#: src/caja-application.c:1175 src/caja-places-sidebar.c:2231 #: src/caja-places-sidebar.c:2263 src/caja-places-sidebar.c:2299 #, c-format msgid "Unable to eject %s" msgstr "" -#: src/caja-application.c:1803 +#: src/caja-application.c:1804 msgid "--check cannot be used with other options." msgstr "" -#: src/caja-application.c:1809 +#: src/caja-application.c:1810 msgid "--quit cannot be used with URIs." msgstr "" -#: src/caja-application.c:1816 +#: src/caja-application.c:1817 msgid "--geometry cannot be used with more than one URI." msgstr "" -#: src/caja-application.c:1822 +#: src/caja-application.c:1823 msgid "--select must be used with at least an URI." msgstr "" -#: src/caja-application.c:1936 +#: src/caja-application.c:1937 msgid "Perform a quick set of self-check tests." msgstr "" -#: src/caja-application.c:1939 +#: src/caja-application.c:1940 msgid "Show the version of the program." msgstr "" -#: src/caja-application.c:1941 +#: src/caja-application.c:1942 msgid "Create the initial window with the given geometry." msgstr "" -#: src/caja-application.c:1941 +#: src/caja-application.c:1942 msgid "GEOMETRY" msgstr "" -#: src/caja-application.c:1943 +#: src/caja-application.c:1944 msgid "Only create windows for explicitly specified URIs." msgstr "" -#: src/caja-application.c:1945 +#: src/caja-application.c:1946 msgid "" "Do not manage the desktop (ignore the preference set in the preferences " "dialog)." msgstr "" -#: src/caja-application.c:1947 +#: src/caja-application.c:1948 msgid "" "Manage the desktop regardless of set preferences or environment (on new " "startup only)" msgstr "" -#: src/caja-application.c:1949 +#: src/caja-application.c:1950 msgid "Open URIs in tabs." msgstr "" -#: src/caja-application.c:1951 +#: src/caja-application.c:1952 msgid "Open a browser window." msgstr "" -#: src/caja-application.c:1953 +#: src/caja-application.c:1954 msgid "Quit Caja." msgstr "" -#: src/caja-application.c:1955 +#: src/caja-application.c:1956 msgid "Select specified URI in parent folder." msgstr "" -#: src/caja-application.c:1956 +#: src/caja-application.c:1957 msgid "[URI...]" msgstr "" -#: src/caja-application.c:1966 +#: src/caja-application.c:1967 msgid "" "\n" "\n" @@ -4397,7 +4422,7 @@ msgstr "" #: src/caja-connect-server-dialog.c:723 src/caja-location-dialog.c:105 #: src/file-manager/fm-directory-view.c:1180 -#: src/file-manager/fm-properties-window.c:5476 +#: src/file-manager/fm-properties-window.c:5508 msgid "There was an error displaying help." msgstr "" @@ -4466,7 +4491,7 @@ msgid "" "Add connect to server mount" msgstr "" -#: src/caja-desktop-window.c:131 src/caja-desktop-window.c:277 +#: src/caja-desktop-window.c:132 src/caja-desktop-window.c:278 #: src/caja-pathbar.c:1445 src/caja-places-sidebar.c:541 msgid "Desktop" msgstr "" @@ -4540,7 +4565,7 @@ msgstr "" msgid "The emblem cannot be added." msgstr "" -#: src/caja-emblem-sidebar.c:1094 src/file-manager/fm-properties-window.c:3473 +#: src/caja-emblem-sidebar.c:1094 src/file-manager/fm-properties-window.c:3495 msgid "Emblems" msgstr "" @@ -4553,8 +4578,8 @@ msgstr "" #. * the user has in a directory. #. #: src/caja-file-management-properties.c:318 -#: src/file-manager/fm-properties-window.c:4247 -#: src/file-manager/fm-properties-window.c:4258 +#: src/file-manager/fm-properties-window.c:4279 +#: src/file-manager/fm-properties-window.c:4290 msgid "None" msgstr "" @@ -4691,20 +4716,20 @@ msgstr "" msgid "You cannot assign more than one custom icon at a time." msgstr "" -#: src/caja-information-panel.c:525 src/file-manager/fm-properties-window.c:507 +#: src/caja-information-panel.c:525 src/file-manager/fm-properties-window.c:528 msgid "Please drag just one image to set a custom icon." msgstr "" -#: src/caja-information-panel.c:552 src/file-manager/fm-properties-window.c:518 +#: src/caja-information-panel.c:552 src/file-manager/fm-properties-window.c:539 msgid "The file that you dropped is not local." msgstr "" -#: src/caja-information-panel.c:553 src/file-manager/fm-properties-window.c:519 -#: src/file-manager/fm-properties-window.c:525 +#: src/caja-information-panel.c:553 src/file-manager/fm-properties-window.c:540 +#: src/file-manager/fm-properties-window.c:546 msgid "You can only use local images as custom icons." msgstr "" -#: src/caja-information-panel.c:560 src/file-manager/fm-properties-window.c:524 +#: src/caja-information-panel.c:560 src/file-manager/fm-properties-window.c:545 msgid "The file that you dropped is not an image." msgstr "" @@ -4717,7 +4742,7 @@ msgstr "" msgid "Open With %s" msgstr "" -#: src/caja-location-bar.c:60 src/file-manager/fm-properties-window.c:3318 +#: src/caja-location-bar.c:60 src/file-manager/fm-properties-window.c:3340 msgid "Location:" msgstr "" @@ -4806,7 +4831,7 @@ msgstr "" msgid "_Location..." msgstr "" -#: src/caja-navigation-window-menus.c:849 src/caja-spatial-window.c:929 +#: src/caja-navigation-window-menus.c:849 src/caja-spatial-window.c:940 msgid "Specify a location to open" msgstr "" @@ -4834,19 +4859,19 @@ msgstr "" msgid "Go to the same location as in the extra pane" msgstr "" -#: src/caja-navigation-window-menus.c:864 src/caja-spatial-window.c:942 +#: src/caja-navigation-window-menus.c:864 src/caja-spatial-window.c:953 msgid "_Add Bookmark" msgstr "" -#: src/caja-navigation-window-menus.c:865 src/caja-spatial-window.c:943 +#: src/caja-navigation-window-menus.c:865 src/caja-spatial-window.c:954 msgid "Add a bookmark for the current location to this menu" msgstr "" -#: src/caja-navigation-window-menus.c:868 src/caja-spatial-window.c:946 +#: src/caja-navigation-window-menus.c:868 src/caja-spatial-window.c:957 msgid "_Edit Bookmarks..." msgstr "" -#: src/caja-navigation-window-menus.c:869 src/caja-spatial-window.c:947 +#: src/caja-navigation-window-menus.c:869 src/caja-spatial-window.c:958 msgid "Display a window that allows editing the bookmarks in this menu" msgstr "" @@ -4922,7 +4947,7 @@ msgstr "" msgid "Change the visibility of this window's statusbar" msgstr "" -#: src/caja-navigation-window-menus.c:926 src/caja-spatial-window.c:950 +#: src/caja-navigation-window-menus.c:926 src/caja-spatial-window.c:961 msgid "_Search for Files..." msgstr "" @@ -5519,35 +5544,35 @@ msgstr "" msgid "Close the side pane" msgstr "" -#: src/caja-spatial-window.c:924 +#: src/caja-spatial-window.c:935 msgid "_Places" msgstr "" -#: src/caja-spatial-window.c:928 +#: src/caja-spatial-window.c:939 msgid "Open _Location..." msgstr "" -#: src/caja-spatial-window.c:933 +#: src/caja-spatial-window.c:944 msgid "Close P_arent Folders" msgstr "" -#: src/caja-spatial-window.c:934 +#: src/caja-spatial-window.c:945 msgid "Close this folder's parents" msgstr "" -#: src/caja-spatial-window.c:938 +#: src/caja-spatial-window.c:949 msgid "Clos_e All Folders" msgstr "" -#: src/caja-spatial-window.c:939 +#: src/caja-spatial-window.c:950 msgid "Close all folder windows" msgstr "" -#: src/caja-spatial-window.c:951 +#: src/caja-spatial-window.c:962 msgid "Locate documents and folders on this computer by name or content" msgstr "" -#: src/caja-trash-bar.c:199 src/file-manager/fm-desktop-icon-view.c:831 +#: src/caja-trash-bar.c:199 src/file-manager/fm-desktop-icon-view.c:856 #: src/file-manager/fm-directory-view.c:7424 msgid "Delete all items in the Trash" msgstr "" @@ -5915,58 +5940,58 @@ msgstr "" msgid "Set the zoom level of the current view" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:712 +#: src/file-manager/fm-desktop-icon-view.c:736 msgid "Background" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:795 +#: src/file-manager/fm-desktop-icon-view.c:820 #: src/file-manager/fm-directory-view.c:7423 #: src/file-manager/fm-directory-view.c:9163 msgid "E_mpty Trash" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:811 +#: src/file-manager/fm-desktop-icon-view.c:836 #: src/file-manager/fm-directory-view.c:7387 msgid "Create L_auncher..." msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:813 +#: src/file-manager/fm-desktop-icon-view.c:838 #: src/file-manager/fm-directory-view.c:7388 msgid "Create a new launcher" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:820 +#: src/file-manager/fm-desktop-icon-view.c:845 msgid "Change Desktop _Background" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:822 +#: src/file-manager/fm-desktop-icon-view.c:847 msgid "" "Show a window that lets you set your desktop background's pattern or color" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:829 +#: src/file-manager/fm-desktop-icon-view.c:854 msgid "Empty Trash" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:933 +#: src/file-manager/fm-desktop-icon-view.c:958 msgid "Desktop View" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:934 +#: src/file-manager/fm-desktop-icon-view.c:959 #: src/file-manager/fm-directory-view.c:7669 #: src/file-manager/fm-directory-view.c:7673 msgid "_Desktop" msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:935 +#: src/file-manager/fm-desktop-icon-view.c:960 msgid "The desktop view encountered an error." msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:936 +#: src/file-manager/fm-desktop-icon-view.c:961 msgid "The desktop view encountered an error while starting up." msgstr "" -#: src/file-manager/fm-desktop-icon-view.c:937 +#: src/file-manager/fm-desktop-icon-view.c:962 msgid "Display this location with the desktop view." msgstr "" @@ -7026,186 +7051,186 @@ msgstr "" msgid "_Organize Desktop by Name" msgstr "" -#: src/file-manager/fm-icon-view.c:1757 +#: src/file-manager/fm-icon-view.c:1763 msgid "Arran_ge Items" msgstr "" -#: src/file-manager/fm-icon-view.c:1760 +#: src/file-manager/fm-icon-view.c:1766 msgid "Resize Icon..." msgstr "" -#: src/file-manager/fm-icon-view.c:1761 +#: src/file-manager/fm-icon-view.c:1767 msgid "Make the selected icon resizable" msgstr "" -#: src/file-manager/fm-icon-view.c:1764 src/file-manager/fm-icon-view.c:1995 +#: src/file-manager/fm-icon-view.c:1770 src/file-manager/fm-icon-view.c:2001 msgid "Restore Icons' Original Si_zes" msgstr "" -#: src/file-manager/fm-icon-view.c:1765 +#: src/file-manager/fm-icon-view.c:1771 msgid "Restore each selected icon to its original size" msgstr "" -#: src/file-manager/fm-icon-view.c:1768 +#: src/file-manager/fm-icon-view.c:1774 msgid "_Organize by Name" msgstr "" -#: src/file-manager/fm-icon-view.c:1769 +#: src/file-manager/fm-icon-view.c:1775 msgid "Reposition icons to better fit in the window and avoid overlapping" msgstr "" -#: src/file-manager/fm-icon-view.c:1776 +#: src/file-manager/fm-icon-view.c:1782 msgid "Compact _Layout" msgstr "" -#: src/file-manager/fm-icon-view.c:1777 +#: src/file-manager/fm-icon-view.c:1783 msgid "Toggle using a tighter layout scheme" msgstr "" -#: src/file-manager/fm-icon-view.c:1782 +#: src/file-manager/fm-icon-view.c:1788 msgid "Re_versed Order" msgstr "" -#: src/file-manager/fm-icon-view.c:1783 +#: src/file-manager/fm-icon-view.c:1789 msgid "Display icons in the opposite order" msgstr "" -#: src/file-manager/fm-icon-view.c:1788 +#: src/file-manager/fm-icon-view.c:1794 msgid "_Keep Aligned" msgstr "" -#: src/file-manager/fm-icon-view.c:1789 +#: src/file-manager/fm-icon-view.c:1795 msgid "Keep icons lined up on a grid" msgstr "" -#: src/file-manager/fm-icon-view.c:1794 +#: src/file-manager/fm-icon-view.c:1800 msgid "_Lock Icons Position" msgstr "" -#: src/file-manager/fm-icon-view.c:1795 +#: src/file-manager/fm-icon-view.c:1801 msgid "Prevent repositioning icons" msgstr "" -#: src/file-manager/fm-icon-view.c:1805 +#: src/file-manager/fm-icon-view.c:1811 msgid "_Manually" msgstr "" -#: src/file-manager/fm-icon-view.c:1806 +#: src/file-manager/fm-icon-view.c:1812 msgid "Leave icons wherever they are dropped" msgstr "" -#: src/file-manager/fm-icon-view.c:1811 +#: src/file-manager/fm-icon-view.c:1817 msgid "By _Name" msgstr "" -#: src/file-manager/fm-icon-view.c:1812 +#: src/file-manager/fm-icon-view.c:1818 msgid "Keep icons sorted by name in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1817 +#: src/file-manager/fm-icon-view.c:1823 msgid "By _Size" msgstr "" -#: src/file-manager/fm-icon-view.c:1818 +#: src/file-manager/fm-icon-view.c:1824 msgid "Keep icons sorted by size in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1823 +#: src/file-manager/fm-icon-view.c:1829 msgid "By S_ize on Disk" msgstr "" -#: src/file-manager/fm-icon-view.c:1824 +#: src/file-manager/fm-icon-view.c:1830 msgid "Keep icons sorted by disk usage in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1829 +#: src/file-manager/fm-icon-view.c:1835 msgid "By _Type" msgstr "" -#: src/file-manager/fm-icon-view.c:1830 +#: src/file-manager/fm-icon-view.c:1836 msgid "Keep icons sorted by type in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1835 +#: src/file-manager/fm-icon-view.c:1841 msgid "By Modification _Date" msgstr "" -#: src/file-manager/fm-icon-view.c:1836 +#: src/file-manager/fm-icon-view.c:1842 msgid "Keep icons sorted by modification date in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1841 +#: src/file-manager/fm-icon-view.c:1847 msgid "By _Creation Date" msgstr "" -#: src/file-manager/fm-icon-view.c:1842 +#: src/file-manager/fm-icon-view.c:1848 msgid "Keep icons sorted by creation date in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1847 +#: src/file-manager/fm-icon-view.c:1853 msgid "By _Emblems" msgstr "" -#: src/file-manager/fm-icon-view.c:1848 +#: src/file-manager/fm-icon-view.c:1854 msgid "Keep icons sorted by emblems in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1853 +#: src/file-manager/fm-icon-view.c:1859 msgid "By T_rash Time" msgstr "" -#: src/file-manager/fm-icon-view.c:1854 +#: src/file-manager/fm-icon-view.c:1860 msgid "Keep icons sorted by trash time in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1859 +#: src/file-manager/fm-icon-view.c:1865 msgid "By E_xtension" msgstr "" -#: src/file-manager/fm-icon-view.c:1860 +#: src/file-manager/fm-icon-view.c:1866 msgid "Keep icons sorted by reverse extension segments in rows" msgstr "" -#: src/file-manager/fm-icon-view.c:1996 +#: src/file-manager/fm-icon-view.c:2002 msgid "Restore Icon's Original Si_ze" msgstr "" -#: src/file-manager/fm-icon-view.c:2467 +#: src/file-manager/fm-icon-view.c:2473 #, c-format msgid "pointing at \"%s\"" msgstr "" #. Translators: this is used in the view menu -#: src/file-manager/fm-icon-view.c:3480 +#: src/file-manager/fm-icon-view.c:3486 msgid "_Icons" msgstr "" -#: src/file-manager/fm-icon-view.c:3481 +#: src/file-manager/fm-icon-view.c:3487 msgid "The icon view encountered an error." msgstr "" -#: src/file-manager/fm-icon-view.c:3482 +#: src/file-manager/fm-icon-view.c:3488 msgid "The icon view encountered an error while starting up." msgstr "" -#: src/file-manager/fm-icon-view.c:3483 +#: src/file-manager/fm-icon-view.c:3489 msgid "Display this location with the icon view." msgstr "" #. Translators: this is used in the view menu -#: src/file-manager/fm-icon-view.c:3495 +#: src/file-manager/fm-icon-view.c:3501 msgid "_Compact" msgstr "" -#: src/file-manager/fm-icon-view.c:3496 +#: src/file-manager/fm-icon-view.c:3502 msgid "The compact view encountered an error." msgstr "" -#: src/file-manager/fm-icon-view.c:3497 +#: src/file-manager/fm-icon-view.c:3503 msgid "The compact view encountered an error while starting up." msgstr "" -#: src/file-manager/fm-icon-view.c:3498 +#: src/file-manager/fm-icon-view.c:3504 msgid "Display this location with the compact view." msgstr "" @@ -7247,281 +7272,333 @@ msgstr "" msgid "Display this location with the list view." msgstr "" -#: src/file-manager/fm-properties-window.c:506 +#: src/file-manager/fm-properties-window.c:397 +msgid "Multiple files" +msgstr "" + +#: src/file-manager/fm-properties-window.c:416 +msgid "No files" +msgstr "" + +#: src/file-manager/fm-properties-window.c:419 +msgid "User-defined icon" +msgstr "" + +#: src/file-manager/fm-properties-window.c:527 msgid "You cannot assign more than one custom icon at a time!" msgstr "" -#: src/file-manager/fm-properties-window.c:640 +#: src/file-manager/fm-properties-window.c:571 +msgid "Change associated icon" +msgstr "" + +#: src/file-manager/fm-properties-window.c:662 msgid "_Name:" msgid_plural "_Names:" msgstr[0] "" msgstr[1] "" -#: src/file-manager/fm-properties-window.c:996 +#: src/file-manager/fm-properties-window.c:1018 msgid "Properties" msgstr "" -#: src/file-manager/fm-properties-window.c:1008 +#: src/file-manager/fm-properties-window.c:1030 #, c-format msgid "%s Properties" msgstr "" -#: src/file-manager/fm-properties-window.c:1337 +#: src/file-manager/fm-properties-window.c:1359 #, c-format msgctxt "MIME type description (MIME type)" msgid "%s (%s)" msgstr "" -#: src/file-manager/fm-properties-window.c:1545 +#: src/file-manager/fm-properties-window.c:1567 msgid "Cancel Group Change?" msgstr "" -#: src/file-manager/fm-properties-window.c:1959 +#: src/file-manager/fm-properties-window.c:1981 msgid "Cancel Owner Change?" msgstr "" -#: src/file-manager/fm-properties-window.c:2286 +#: src/file-manager/fm-properties-window.c:2308 msgid "nothing" msgstr "" -#: src/file-manager/fm-properties-window.c:2288 +#: src/file-manager/fm-properties-window.c:2310 msgid "unreadable" msgstr "" -#: src/file-manager/fm-properties-window.c:2307 +#: src/file-manager/fm-properties-window.c:2329 #, c-format msgid "%'d item, with size %s (%s on disk)" msgid_plural "%'d items, totalling %s (%s on disk)" msgstr[0] "" msgstr[1] "" -#: src/file-manager/fm-properties-window.c:2317 +#: src/file-manager/fm-properties-window.c:2339 msgid "(some contents unreadable)" msgstr "" -#: src/file-manager/fm-properties-window.c:2334 +#: src/file-manager/fm-properties-window.c:2356 msgid "Contents:" msgstr "" #. Translators: "used" refers to the capacity of the filesystem -#: src/file-manager/fm-properties-window.c:3119 +#: src/file-manager/fm-properties-window.c:3141 msgid "used" msgstr "" #. Translators: "free" refers to the capacity of the filesystem -#: src/file-manager/fm-properties-window.c:3130 +#: src/file-manager/fm-properties-window.c:3152 msgid "free" msgstr "" -#: src/file-manager/fm-properties-window.c:3134 +#: src/file-manager/fm-properties-window.c:3156 msgid "Total capacity:" msgstr "" -#: src/file-manager/fm-properties-window.c:3148 +#: src/file-manager/fm-properties-window.c:3170 msgid "Filesystem type:" msgstr "" -#: src/file-manager/fm-properties-window.c:3233 +#: src/file-manager/fm-properties-window.c:3255 msgid "Basic" msgstr "" -#: src/file-manager/fm-properties-window.c:3295 +#: src/file-manager/fm-properties-window.c:3317 msgid "Link target:" msgstr "" -#: src/file-manager/fm-properties-window.c:3309 +#: src/file-manager/fm-properties-window.c:3331 msgid "Size on Disk:" msgstr "" -#: src/file-manager/fm-properties-window.c:3324 +#: src/file-manager/fm-properties-window.c:3346 msgid "Volume:" msgstr "" -#: src/file-manager/fm-properties-window.c:3338 +#: src/file-manager/fm-properties-window.c:3360 msgid "Accessed:" msgstr "" -#: src/file-manager/fm-properties-window.c:3346 +#: src/file-manager/fm-properties-window.c:3368 msgid "Modified:" msgstr "" -#: src/file-manager/fm-properties-window.c:3350 +#: src/file-manager/fm-properties-window.c:3372 msgid "Created:" msgstr "" -#: src/file-manager/fm-properties-window.c:3359 +#: src/file-manager/fm-properties-window.c:3381 msgid "Free space:" msgstr "" -#: src/file-manager/fm-properties-window.c:3884 +#: src/file-manager/fm-properties-window.c:3906 msgid "_Read" msgstr "" -#: src/file-manager/fm-properties-window.c:3886 +#: src/file-manager/fm-properties-window.c:3908 msgid "_Write" msgstr "" -#: src/file-manager/fm-properties-window.c:3888 +#: src/file-manager/fm-properties-window.c:3910 msgid "E_xecute" msgstr "" #. Translators: this gets concatenated to "no read", #. * "no access", etc. (see following strings) #. -#: src/file-manager/fm-properties-window.c:4155 -#: src/file-manager/fm-properties-window.c:4166 -#: src/file-manager/fm-properties-window.c:4178 +#: src/file-manager/fm-properties-window.c:4177 +#: src/file-manager/fm-properties-window.c:4188 +#: src/file-manager/fm-properties-window.c:4200 msgid "no " msgstr "" -#: src/file-manager/fm-properties-window.c:4158 +#: src/file-manager/fm-properties-window.c:4180 msgid "list" msgstr "" -#: src/file-manager/fm-properties-window.c:4160 +#: src/file-manager/fm-properties-window.c:4182 msgid "read" msgstr "" -#: src/file-manager/fm-properties-window.c:4169 +#: src/file-manager/fm-properties-window.c:4191 msgid "create/delete" msgstr "" -#: src/file-manager/fm-properties-window.c:4171 +#: src/file-manager/fm-properties-window.c:4193 msgid "write" msgstr "" -#: src/file-manager/fm-properties-window.c:4180 +#: src/file-manager/fm-properties-window.c:4202 msgid "access" msgstr "" -#: src/file-manager/fm-properties-window.c:4228 +#: src/file-manager/fm-properties-window.c:4250 msgid "Access:" msgstr "" -#: src/file-manager/fm-properties-window.c:4230 +#: src/file-manager/fm-properties-window.c:4250 msgid "Folder access:" msgstr "" -#: src/file-manager/fm-properties-window.c:4232 +#: src/file-manager/fm-properties-window.c:4250 msgid "File access:" msgstr "" -#: src/file-manager/fm-properties-window.c:4250 -msgid "List files only" +#: src/file-manager/fm-properties-window.c:4252 +msgid "User access:" msgstr "" #: src/file-manager/fm-properties-window.c:4252 -msgid "Access files" +msgid "User folder access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4252 +msgid "User file access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4253 +msgid "Group access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4253 +msgid "Group folder access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4253 +msgid "Group file access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4254 +msgid "Others access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4254 +msgid "Others folder access:" msgstr "" #: src/file-manager/fm-properties-window.c:4254 +msgid "Others file access:" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4282 +msgid "List files only" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4284 +msgid "Access files" +msgstr "" + +#: src/file-manager/fm-properties-window.c:4286 msgid "Create and delete files" msgstr "" -#: src/file-manager/fm-properties-window.c:4261 +#: src/file-manager/fm-properties-window.c:4293 msgid "Read-only" msgstr "" -#: src/file-manager/fm-properties-window.c:4263 +#: src/file-manager/fm-properties-window.c:4295 msgid "Read and write" msgstr "" -#: src/file-manager/fm-properties-window.c:4327 +#: src/file-manager/fm-properties-window.c:4359 msgid "Special flags:" msgstr "" -#: src/file-manager/fm-properties-window.c:4329 +#: src/file-manager/fm-properties-window.c:4361 msgid "Set _user ID" msgstr "" -#: src/file-manager/fm-properties-window.c:4330 +#: src/file-manager/fm-properties-window.c:4362 msgid "Set gro_up ID" msgstr "" -#: src/file-manager/fm-properties-window.c:4331 +#: src/file-manager/fm-properties-window.c:4363 msgid "_Sticky" msgstr "" -#: src/file-manager/fm-properties-window.c:4406 -#: src/file-manager/fm-properties-window.c:4598 +#: src/file-manager/fm-properties-window.c:4438 +#: src/file-manager/fm-properties-window.c:4630 msgid "_Owner:" msgstr "" -#: src/file-manager/fm-properties-window.c:4414 -#: src/file-manager/fm-properties-window.c:4504 -#: src/file-manager/fm-properties-window.c:4607 +#: src/file-manager/fm-properties-window.c:4446 +#: src/file-manager/fm-properties-window.c:4536 +#: src/file-manager/fm-properties-window.c:4639 msgid "Owner:" msgstr "" -#: src/file-manager/fm-properties-window.c:4438 -#: src/file-manager/fm-properties-window.c:4622 +#: src/file-manager/fm-properties-window.c:4470 +#: src/file-manager/fm-properties-window.c:4654 msgid "_Group:" msgstr "" -#: src/file-manager/fm-properties-window.c:4446 -#: src/file-manager/fm-properties-window.c:4505 -#: src/file-manager/fm-properties-window.c:4630 +#: src/file-manager/fm-properties-window.c:4478 +#: src/file-manager/fm-properties-window.c:4537 +#: src/file-manager/fm-properties-window.c:4662 msgid "Group:" msgstr "" -#: src/file-manager/fm-properties-window.c:4470 +#: src/file-manager/fm-properties-window.c:4502 msgid "Others" msgstr "" -#: src/file-manager/fm-properties-window.c:4485 +#: src/file-manager/fm-properties-window.c:4517 msgid "Execute:" msgstr "" -#: src/file-manager/fm-properties-window.c:4488 +#: src/file-manager/fm-properties-window.c:4520 msgid "Allow _executing file as program" msgstr "" -#: src/file-manager/fm-properties-window.c:4506 +#: src/file-manager/fm-properties-window.c:4538 msgid "Others:" msgstr "" -#: src/file-manager/fm-properties-window.c:4646 +#: src/file-manager/fm-properties-window.c:4678 msgid "Folder Permissions:" msgstr "" -#: src/file-manager/fm-properties-window.c:4653 +#: src/file-manager/fm-properties-window.c:4685 msgid "File Permissions:" msgstr "" -#: src/file-manager/fm-properties-window.c:4662 +#: src/file-manager/fm-properties-window.c:4694 msgid "Text view:" msgstr "" -#: src/file-manager/fm-properties-window.c:4809 +#: src/file-manager/fm-properties-window.c:4841 msgid "You are not the owner, so you cannot change these permissions." msgstr "" -#: src/file-manager/fm-properties-window.c:4829 +#: src/file-manager/fm-properties-window.c:4861 msgid "SELinux context:" msgstr "" -#: src/file-manager/fm-properties-window.c:4834 +#: src/file-manager/fm-properties-window.c:4866 msgid "Last changed:" msgstr "" -#: src/file-manager/fm-properties-window.c:4847 +#: src/file-manager/fm-properties-window.c:4879 msgid "Apply Permissions to Enclosed Files" msgstr "" -#: src/file-manager/fm-properties-window.c:4861 +#: src/file-manager/fm-properties-window.c:4893 #, c-format msgid "The permissions of \"%s\" could not be determined." msgstr "" -#: src/file-manager/fm-properties-window.c:4864 +#: src/file-manager/fm-properties-window.c:4896 msgid "The permissions of the selected file could not be determined." msgstr "" -#: src/file-manager/fm-properties-window.c:5450 +#: src/file-manager/fm-properties-window.c:5482 msgid "Creating Properties window." msgstr "" -#: src/file-manager/fm-properties-window.c:5748 +#: src/file-manager/fm-properties-window.c:5780 msgid "Select Custom Icon" msgstr "" diff --git a/data/caja-file-management-properties.ui b/data/caja-file-management-properties.ui index 3207c800..669f2c77 100644 --- a/data/caja-file-management-properties.ui +++ b/data/caja-file-management-properties.ui @@ -633,6 +633,22 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkCheckButton" id="display_git_branch_checkbutton"> + <property name="label" translatable="yes">_Display git branch</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">start</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> </object> </child> <child type="tab"> diff --git a/libcaja-private/caja-file.c b/libcaja-private/caja-file.c index faa7bb50..2fc9c030 100644 --- a/libcaja-private/caja-file.c +++ b/libcaja-private/caja-file.c @@ -149,7 +149,8 @@ static GQuark attribute_name_q, attribute_where_q, attribute_link_target_q, attribute_volume_q, - attribute_free_space_q; + attribute_free_space_q, + attribute_location_q; static void caja_file_info_iface_init (CajaFileInfoIface *iface); static char * caja_file_get_owner_as_string (CajaFile *file, @@ -2460,6 +2461,9 @@ update_info_internal (CajaFile *file, } mime_type = g_file_info_get_content_type (info); + if (mime_type == NULL) { + mime_type = g_file_info_get_attribute_string (info, G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE); + } if (eel_strcmp (file->details->mime_type, mime_type) != 0) { changed = TRUE; g_clear_pointer (&file->details->mime_type, g_ref_string_release); @@ -6501,7 +6505,7 @@ caja_file_get_deep_directory_count_as_string (CajaFile *file) * set includes "name", "type", "mime_type", "size", "size_on_disk", "deep_size", "deep_size_on_disk", * "deep_directory_count", "deep_file_count", "deep_total_count", "date_modified", "date_changed", * "date_accessed", "date_permissions", "owner", "group", "permissions", "octal_permissions", "uri", "where", - * "link_target", "volume", "free_space", "selinux_context", "trashed_on", "trashed_orig_path" + * "link_target", "location", "volume", "free_space", "selinux_context", "trashed_on", "trashed_orig_path" * * Returns: Newly allocated string ready to display to the user, or NULL * if the value is unknown or @attribute_name is not supported. @@ -6602,6 +6606,9 @@ caja_file_get_string_attribute_q (CajaFile *file, GQuark attribute_q) if (attribute_q == attribute_link_target_q) { return caja_file_get_symbolic_link_target_path (file); } + if (attribute_q == attribute_location_q) { + return caja_file_get_parent_uri_for_display (file); + } if (attribute_q == attribute_volume_q) { return caja_file_get_volume_name (file); } @@ -8621,6 +8628,7 @@ caja_file_class_init (CajaFileClass *class) attribute_link_target_q = g_quark_from_static_string ("link_target"); attribute_volume_q = g_quark_from_static_string ("volume"); attribute_free_space_q = g_quark_from_static_string ("free_space"); + attribute_location_q = g_quark_from_static_string ("location"); G_OBJECT_CLASS (class)->finalize = finalize; G_OBJECT_CLASS (class)->constructor = caja_file_constructor; diff --git a/libcaja-private/caja-global-preferences.h b/libcaja-private/caja-global-preferences.h index ed888db7..27059ca7 100644 --- a/libcaja-private/caja-global-preferences.h +++ b/libcaja-private/caja-global-preferences.h @@ -141,6 +141,7 @@ typedef enum #define CAJA_PREFERENCES_ICON_VIEW_DEFAULT_ZOOM_LEVEL "default-zoom-level" #define CAJA_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS "labels-beside-icons" +#define CAJA_PREFERENCES_ICON_VIEW_DISPLAY_GIT_BRANCH "display-git-branch" /* Which text attributes appear beneath icon names */ #define CAJA_PREFERENCES_ICON_VIEW_CAPTIONS "captions" diff --git a/libcaja-private/caja-icon-container.c b/libcaja-private/caja-icon-container.c index d30add27..dd8e7547 100644 --- a/libcaja-private/caja-icon-container.c +++ b/libcaja-private/caja-icon-container.c @@ -8823,6 +8823,23 @@ caja_icon_container_set_label_position (CajaIconContainer *container, } } +void +caja_display_git_branch_enable (CajaIconContainer *container, + CajaDisplayGitBranch enable) +{ + g_return_if_fail (CAJA_IS_ICON_CONTAINER (container)); + + if (container->details->display_git_branch != enable) + { + container->details->display_git_branch = enable; + + invalidate_labels (container); + caja_icon_container_request_update_all (container); + + schedule_redo_layout (container); + } +} + /* Switch from automatic to manual layout, freezing all the icons in their * current positions instead of restoring icon positions from the last manual * layout as set_auto_layout does. diff --git a/libcaja-private/caja-icon-container.h b/libcaja-private/caja-icon-container.h index 749c3b4e..0874a07c 100644 --- a/libcaja-private/caja-icon-container.h +++ b/libcaja-private/caja-icon-container.h @@ -71,6 +71,12 @@ typedef enum CAJA_ICON_LABEL_POSITION_BESIDE } CajaIconLabelPosition; +typedef enum +{ + CAJA_DISPLAY_GIT_BRANCH_DISABLED, + CAJA_DISPLAY_GIT_BRANCH_ENABLED +} CajaDisplayGitBranch; + #define CAJA_ICON_CONTAINER_TYPESELECT_FLUSH_DELAY 1000000 typedef struct CajaIconContainerDetails CajaIconContainerDetails; @@ -286,6 +292,8 @@ void caja_icon_container_set_layout_mode (CajaIconCon CajaIconLayoutMode mode); void caja_icon_container_set_label_position (CajaIconContainer *container, CajaIconLabelPosition pos); +void caja_display_git_branch_enable (CajaIconContainer *container, + CajaDisplayGitBranch enabled); void caja_icon_container_sort (CajaIconContainer *container); void caja_icon_container_freeze_icon_positions (CajaIconContainer *container); diff --git a/libcaja-private/caja-icon-private.h b/libcaja-private/caja-icon-private.h index e975d6ec..3b3110d8 100644 --- a/libcaja-private/caja-icon-private.h +++ b/libcaja-private/caja-icon-private.h @@ -231,6 +231,9 @@ struct CajaIconContainerDetails /* Label position */ CajaIconLabelPosition label_position; + /* Display git branch enable/disable */ + CajaDisplayGitBranch display_git_branch; + /* Forced icon size, iff greater than 0 */ int forced_icon_size; diff --git a/libcaja-private/caja-search-directory.c b/libcaja-private/caja-search-directory.c index da2e133b..fbd3f17e 100644 --- a/libcaja-private/caja-search-directory.c +++ b/libcaja-private/caja-search-directory.c @@ -846,6 +846,12 @@ caja_search_directory_get_query (CajaSearchDirectory *search) return NULL; } +CajaSearchEngine * +caja_search_directory_get_engine (CajaSearchDirectory *search) +{ + return search->details->engine; +} + CajaSearchDirectory * caja_search_directory_new_from_saved_search (const char *uri) { diff --git a/libcaja-private/caja-search-directory.h b/libcaja-private/caja-search-directory.h index 4214f097..95c7d07a 100644 --- a/libcaja-private/caja-search-directory.h +++ b/libcaja-private/caja-search-directory.h @@ -27,6 +27,7 @@ #include "caja-directory.h" #include "caja-query.h" +#include "caja-search-engine.h" #define CAJA_TYPE_SEARCH_DIRECTORY caja_search_directory_get_type() #define CAJA_SEARCH_DIRECTORY(obj) \ @@ -70,4 +71,6 @@ CajaQuery *caja_search_directory_get_query (CajaSearchDirectory *search); void caja_search_directory_set_query (CajaSearchDirectory *search, CajaQuery *query); +CajaSearchEngine *caja_search_directory_get_engine (CajaSearchDirectory *search); + #endif /* CAJA_SEARCH_DIRECTORY_H */ diff --git a/libcaja-private/caja-search-engine-simple.c b/libcaja-private/caja-search-engine-simple.c index aae74d23..dd87b56c 100644 --- a/libcaja-private/caja-search-engine-simple.c +++ b/libcaja-private/caja-search-engine-simple.c @@ -24,12 +24,14 @@ #include <config.h> #include <string.h> #include <glib.h> +#include <fnmatch.h> #include <gio/gio.h> #include <eel/eel-gtk-macros.h> #include "caja-search-engine-simple.h" +#include "caja-global-preferences.h" #define BATCH_SIZE 500 @@ -42,6 +44,7 @@ typedef struct GList *mime_types; GList *tags; char **words; + gboolean use_globs; GQueue *directories; /* GFiles */ @@ -51,6 +54,7 @@ typedef struct GList *uri_hits; gint64 timestamp; gint64 size; + gboolean search_hidden_files; } SearchThreadData; struct CajaSearchEngineSimpleDetails @@ -60,6 +64,7 @@ struct CajaSearchEngineSimpleDetails SearchThreadData *active_search; gboolean query_finished; + gboolean show_hidden_files; }; G_DEFINE_TYPE (CajaSearchEngineSimple, @@ -68,6 +73,18 @@ G_DEFINE_TYPE (CajaSearchEngineSimple, static CajaSearchEngineClass *parent_class = NULL; +static gboolean +text_has_glob (const char *text) +{ + if (!text) + return FALSE; + + return (strchr (text, '*') != NULL || + strchr (text, '?') != NULL || + strchr (text, '[') != NULL || + strchr (text, ']') != NULL); +} + static void finalize (GObject *object) { @@ -113,12 +130,23 @@ search_thread_data_new (CajaSearchEngineSimple *engine, g_queue_push_tail (data->directories, location); text = caja_query_get_text (query); - normalized = g_utf8_normalize (text, -1, G_NORMALIZE_NFD); - lower = g_utf8_strdown (normalized, -1); - data->words = g_strsplit (lower, " ", -1); + data->use_globs = text && text_has_glob (text); + + if (data->use_globs) + { + /* For globs, keep original case and don't normalize */ + data->words = g_strsplit (text, " ", -1); + } + else + { + /* For substring matching, normalize and lowercase */ + normalized = g_utf8_normalize (text, -1, G_NORMALIZE_NFD); + lower = g_utf8_strdown (normalized, -1); + data->words = g_strsplit (lower, " ", -1); + g_free (lower); + g_free (normalized); + } g_free (text); - g_free (lower); - g_free (normalized); data->tags = caja_query_get_tags (query); data->mime_types = caja_query_get_mime_types (query); @@ -126,6 +154,8 @@ search_thread_data_new (CajaSearchEngineSimple *engine, data->size = caja_query_get_size (query); data->contained_text = caja_query_get_contained_text (query); + data->search_hidden_files = engine->details->show_hidden_files; + data->cancellable = g_cancellable_new (); return data; @@ -483,7 +513,7 @@ visit_directory (GFile *dir, SearchThreadData *data) while ((info = g_file_enumerator_next_file (enumerator, data->cancellable, NULL)) != NULL) { - if (g_file_info_get_is_hidden (info)) + if (g_file_info_get_is_hidden (info) && !data->search_hidden_files) { goto next; } @@ -499,12 +529,31 @@ visit_directory (GFile *dir, SearchThreadData *data) g_free (normalized); hit = TRUE; - for (i = 0; data->words[i] != NULL; i++) + if (data->use_globs) { - if (strstr (lower_name, data->words[i]) == NULL) + /* Use glob pattern matching with case-insensitive comparison */ + for (i = 0; data->words[i] != NULL; i++) { - hit = FALSE; - break; + char *lower_pattern = g_utf8_strdown (data->words[i], -1); + if (fnmatch (lower_pattern, lower_name, 0) != 0) + { + hit = FALSE; + g_free (lower_pattern); + break; + } + g_free (lower_pattern); + } + } + else + { + /* Use substring matching */ + for (i = 0; data->words[i] != NULL; i++) + { + if (strstr (lower_name, data->words[i]) == NULL) + { + hit = FALSE; + break; + } } } g_free (lower_name); @@ -721,6 +770,15 @@ caja_search_engine_simple_set_query (CajaSearchEngine *engine, CajaQuery *query) } static void +caja_search_engine_simple_set_show_hidden_files (CajaSearchEngine *engine, gboolean show_hidden_files) +{ + CajaSearchEngineSimple *simple; + + simple = CAJA_SEARCH_ENGINE_SIMPLE (engine); + simple->details->show_hidden_files = show_hidden_files; +} + +static void caja_search_engine_simple_class_init (CajaSearchEngineSimpleClass *class) { GObjectClass *gobject_class; @@ -733,6 +791,7 @@ caja_search_engine_simple_class_init (CajaSearchEngineSimpleClass *class) engine_class = CAJA_SEARCH_ENGINE_CLASS (class); engine_class->set_query = caja_search_engine_simple_set_query; + engine_class->set_show_hidden_files = caja_search_engine_simple_set_show_hidden_files; engine_class->start = caja_search_engine_simple_start; engine_class->stop = caja_search_engine_simple_stop; engine_class->is_indexed = caja_search_engine_simple_is_indexed; @@ -742,6 +801,7 @@ static void caja_search_engine_simple_init (CajaSearchEngineSimple *engine) { engine->details = g_new0 (CajaSearchEngineSimpleDetails, 1); + engine->details->show_hidden_files = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_HIDDEN_FILES); } CajaSearchEngine * diff --git a/libcaja-private/caja-search-engine.c b/libcaja-private/caja-search-engine.c index d8d9d9a8..9dd6ab2e 100644 --- a/libcaja-private/caja-search-engine.c +++ b/libcaja-private/caja-search-engine.c @@ -125,6 +125,16 @@ caja_search_engine_set_query (CajaSearchEngine *engine, CajaQuery *query) } void +caja_search_engine_set_show_hidden_files (CajaSearchEngine *engine, gboolean show_hidden_files) +{ + g_return_if_fail (CAJA_IS_SEARCH_ENGINE (engine)); + + if (CAJA_SEARCH_ENGINE_GET_CLASS (engine)->set_show_hidden_files != NULL) { + CAJA_SEARCH_ENGINE_GET_CLASS (engine)->set_show_hidden_files (engine, show_hidden_files); + } +} + +void caja_search_engine_start (CajaSearchEngine *engine) { g_return_if_fail (CAJA_IS_SEARCH_ENGINE (engine)); diff --git a/libcaja-private/caja-search-engine.h b/libcaja-private/caja-search-engine.h index 90bd6593..773901a1 100644 --- a/libcaja-private/caja-search-engine.h +++ b/libcaja-private/caja-search-engine.h @@ -46,6 +46,7 @@ typedef struct /* VTable */ void (*set_query) (CajaSearchEngine *engine, CajaQuery *query); + void (*set_show_hidden_files) (CajaSearchEngine *engine, gboolean show_hidden_files); void (*start) (CajaSearchEngine *engine); void (*stop) (CajaSearchEngine *engine); gboolean (*is_indexed) (CajaSearchEngine *engine); @@ -63,6 +64,7 @@ gboolean caja_search_engine_enabled (void); CajaSearchEngine* caja_search_engine_new (void); void caja_search_engine_set_query (CajaSearchEngine *engine, CajaQuery *query); +void caja_search_engine_set_show_hidden_files (CajaSearchEngine *engine, gboolean show_hidden_files); void caja_search_engine_start (CajaSearchEngine *engine); void caja_search_engine_stop (CajaSearchEngine *engine); gboolean caja_search_engine_is_indexed (CajaSearchEngine *engine); diff --git a/libcaja-private/org.mate.caja.gschema.xml b/libcaja-private/org.mate.caja.gschema.xml index 0f3bc015..7e9b150e 100644 --- a/libcaja-private/org.mate.caja.gschema.xml +++ b/libcaja-private/org.mate.caja.gschema.xml @@ -318,6 +318,11 @@ <summary>Put labels beside icons</summary> <description>If true, labels will be placed beside icons rather than underneath them.</description> </key> + <key name="display-git-branch" type="b"> + <default>false</default> + <summary>Display the git branch with directory name</summary> + <description>If true, git branch name will be displayed.</description> + </key> <key name="default-zoom-level" enum="org.mate.caja.ZoomLevel"> <default>'standard'</default> <summary>Default icon zoom level</summary> @@ -7691,3 +7691,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Wys git-tak" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Wys die git-tak met gidsnaam" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "As waar, sal die git-taknaam gewys word." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "losgemaak: %.7s" @@ -7623,3 +7623,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "ጂት ቅርንጫፍ አሳይ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ከዳሰሳ ስም ጋር የጂት ቅርንጫፍ አሳይ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "እስካሁን እውነት ከሆነ፣ የጂት ቅርንጫፍ ስም ይታያል።" @@ -8108,3 +8108,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "عرض فرع جيت" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "عرض فرع جيت مع اسم الدليل" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "إذا كانت القيمة صحيحة، فسيتم عرض اسم فرع جيت." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "منفصل: %.7s" @@ -7773,3 +7773,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "গিট শাখা প্ৰদৰ্শন কৰক" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ডিৰেক্টৰি নামৰ সৈতে গিট শাখা প্ৰদৰ্শন কৰক" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "সঁচা হ’লে, গিট শাখাৰ নাম প্ৰদৰ্শন কৰা হ’ব।" @@ -7808,3 +7808,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Amosar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Amosar la rama de git con el nome del direutoriu" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si ye verdá, va amosase'l nome de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "separáu: %.7s" @@ -7636,3 +7636,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git budağını göstər" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Qovluq adı ilə git budağını göstər" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Əgər doğrudursa, git budağının adı göstəriləcək." @@ -7896,3 +7896,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Паказаць галіну git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Паказаць галіна git з назвай каталога" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Калі ўключана, будзе адлюстроўвацца назва галіны git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "адлучаны: %.7s" @@ -7898,3 +7898,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Показване на git клон" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Показване на git клон с име на директория" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ако е вярно, името на git клона ще бъде показано." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "отделен: %.7s" @@ -7855,3 +7855,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "গিট শাখা প্রদর্শন করুন" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ডিরেক্টরি নাম সহ গিট শাখা প্রদর্শন করুন" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "যদি সত্য হয়, গিট শাখার নাম প্রদর্শিত হবে।" diff --git a/po/bn_IN.po b/po/bn_IN.po index 9e9677c4..1e2f8c50 100644 --- a/po/bn_IN.po +++ b/po/bn_IN.po @@ -7860,3 +7860,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "গিট শাখা প্রদর্শন করুন" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ডিরেক্টরি নাম সহ গিট শাখা প্রদর্শন করুন" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "যদি সত্য হয়, গিট শাখার নাম প্রদর্শিত হবে।" @@ -8154,3 +8154,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Diskouez skourr git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Diskouez skourr git gant anv ar renkell" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ma'z eo gwir, e vo diskouezet anv skourr git." @@ -7721,3 +7721,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Prikaži git granu" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Prikaži git granu sa imenom direktorija" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ako je tačno, ime git grane će biti prikazano." @@ -7957,3 +7957,19 @@ msgstr "S'ha produït un error en la vista d'estri mentre s'estava iniciant." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Mostra aquesta ubicació amb la vista d'estri." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostra la branca de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostra la branca de git amb el nom del directori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si és cert, es mostrarà el nom de la branca de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "separat: %.7s" diff --git a/po/[email protected] b/po/[email protected] index c12e2fe6..a3215dc2 100644 --- a/po/[email protected] +++ b/po/[email protected] @@ -7941,3 +7941,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostra la branca de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostra la branca de git amb el nom del directori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si és cert, es mostrarà el nom de la branca de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "separat: %.7s" @@ -7549,3 +7549,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "显示 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "显示带有目录名称的 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "如果为真，将显示 git 分支名称。" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "分离: %.7s" @@ -7790,3 +7790,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git şubesini göster" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git şubesini dizin adıyla göster" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Doğru bolsa, git şube ismi gösterilecek." @@ -8044,3 +8044,19 @@ msgstr "V Zobrazení elementů došlo k chybě během startu." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Prohlížet toto umístění pomocí Zobrazení elementů." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Zobrazit větev git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Zobrazit větev git s názvem adresáře" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Pokud je pravda, bude zobrazen název větve git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odpojený: %.7s" @@ -7721,3 +7721,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Dangos cangen git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Dangos cangen git gyda'r enw cyfeiriadur" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Os yw’n wir, bydd enw’r gangen git yn cael ei ddangos." @@ -7888,3 +7888,19 @@ msgstr "Kontrolvisningen stødte på en fejl under opstarten." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Vis dette sted med kontrolvisningen." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Vis git-gren" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Vis git-grenen med mappenavn" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Hvis sandt, vises navnet på git-grenen." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "afkoblet: %.7s" @@ -8039,3 +8039,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git-Branch anzeigen" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git-Zweig mit Verzeichnisnamen anzeigen" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Wenn wahr, wird der Name des Git-Zweigs angezeigt." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "getrennt: %.7s" @@ -7697,3 +7697,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "གིཊ་ཡན་ལག་སྟོན།" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "གིཏ་འབྲེལ་བའི་འབྲེལ་ལམ་དང་སྣེ་མིང་མཉམ་དུ་སྟོན།" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "བདེན་པའི་རྒྱུ་མཚན་ཡོད་པར་ git གི་ཡིག་རྟགས་མིང་སྟོན་བཞིན་ཡོད།" @@ -7992,3 +7992,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Εμφάνιση κλάδου git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Εμφάνιση του κλάδου git με το όνομα καταλόγου" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Αν είναι αληθές, θα εμφανιστεί το όνομα του κλάδου git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "αποσυνδεδεμένο: %.7s" diff --git a/po/en_AU.po b/po/en_AU.po index 104b3860..a21a3acd 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -7815,3 +7815,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Display git branch" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Display the git branch with directory name" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "If true, git branch name will be displayed." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "detached: %.7s" diff --git a/po/en_CA.po b/po/en_CA.po index f61a94fc..cc12cf6c 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -7661,3 +7661,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Display git branch" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Display the git branch with directory name" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "If true, git branch name will be displayed." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "detached: %.7s" diff --git a/po/en_GB.po b/po/en_GB.po index 797d8ae9..e5df9c81 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7902,3 +7902,19 @@ msgstr "The widget view encountered an error while starting up." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Display this location with the widget view." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Display git branch" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Display the git branch with directory name" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "If true, git branch name will be displayed." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "detached: %.7s" @@ -7754,3 +7754,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Montri git-branĉon" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Montri la git-branĉon kun dosieruja nomo" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se vera, la nomo de la git-branĉo estos montrata." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "detachita: %.7s" @@ -8102,3 +8102,19 @@ msgstr "Se ha producido un error al iniciarse la vista de componentes." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Mostrar esta ubicación con la vista de componentes." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_AR.po b/po/es_AR.po index 77d1e741..83c43f82 100644 --- a/po/es_AR.po +++ b/po/es_AR.po @@ -7645,3 +7645,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_CL.po b/po/es_CL.po index 10d4452d..85cb77b9 100644 --- a/po/es_CL.po +++ b/po/es_CL.po @@ -7638,3 +7638,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_CO.po b/po/es_CO.po index 3ae7bb36..d64ec4e2 100644 --- a/po/es_CO.po +++ b/po/es_CO.po @@ -8006,3 +8006,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_ES.po b/po/es_ES.po index bc3265c4..e2e47323 100644 --- a/po/es_ES.po +++ b/po/es_ES.po @@ -7673,3 +7673,19 @@ msgstr "" #: ../src/caja-zoom-control.c:856 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_MX.po b/po/es_MX.po index 15b47c42..543d12c5 100644 --- a/po/es_MX.po +++ b/po/es_MX.po @@ -7677,3 +7677,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" diff --git a/po/es_PR.po b/po/es_PR.po index 93c1c1fc..884b2a5f 100644 --- a/po/es_PR.po +++ b/po/es_PR.po @@ -7672,3 +7672,19 @@ msgstr "" #: ../src/caja-zoom-control.c:856 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostrar la rama de git con el nombre del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si es verdadero, se mostrará el nombre de la rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desvinculado: %.7s" @@ -7851,3 +7851,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Kuva git haru" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Kuva git haru koos kataloogi nimega" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Tõese korral kuvatakse git haru nimi." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "eraldatud: %.7s" @@ -7907,3 +7907,15 @@ msgstr "Widget ikuspegiak errore bat aurkitu du abiatzean." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Bistaratu helbidea widget ikuspegiarekin." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Erakutsi git adarra" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Erakutsi git adarra direktorio izenarekin" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Egia bada, git adarraren izena bistaratuko da." @@ -7668,3 +7668,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "نمایش شاخه گیت" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "نمایش شاخه گیت با نام دایرکتوری" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "اگر درست باشد، نام شاخه گیت نمایش داده میشود." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "جدا شده: %.7s" @@ -7788,3 +7788,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Näytä git-haara" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Näytä git-haara hakemiston nimellä" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Jos tosi, git-haaran nimi näytetään." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "irtautunut: %.7s" @@ -8141,3 +8141,19 @@ msgstr "L'affichage du widget a rencontré une erreur lors du démarrage." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Afficher cet emplacement avec la vue du widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Afficher la branche git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Afficher la branche git avec le nom du répertoire" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si vrai, le nom de la branche git sera affiché." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "détaché: %.7s" diff --git a/po/fr_CA.po b/po/fr_CA.po index ebab7a7c..69c53d14 100644 --- a/po/fr_CA.po +++ b/po/fr_CA.po @@ -7542,3 +7542,19 @@ msgstr "" #: ../src/caja-zoom-control.c:945 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Afficher la branche git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Afficher la branche git avec le nom du répertoire" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si vrai, le nom de la branche git sera affiché." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "détaché: %.7s" @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Afichar la branca git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Afficher la branche git avec le nom du répertoire" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se vêr, lo nom de la branca git s'aficharê." @@ -7583,3 +7583,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostre la ram git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostre la branche git cun il non dal repertori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se vertât, al non de la branche git al sarà mostrât." @@ -7557,3 +7557,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git-tak toane" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Lit de git-tûke sjen mei mapnamme" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "As wier, sil de git-tûkenamme werjûn wurde." @@ -7837,3 +7837,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Taispeáin brainse git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Taispeáin an brainse git leis an ainm eolaire" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Más fíor é, taispeánfar ainm an bhrainse git." @@ -7751,3 +7751,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Seall meuran git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Seall an geug git leis an ainm eòlaire" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ma tha fìor, thèid ainm a’ gheuga git a shealltainn." @@ -7939,3 +7939,19 @@ msgstr "A vista de trebello lista atopou un erro ao iniciarse." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Amosa esta localización coa vista de trebello." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Amosar rama de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Amosar a rama de git co nome do directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se é certo, mostrarase o nome da rama de git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "deseñado: %.7s" @@ -7799,3 +7799,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "ગિટ શાખા દર્શાવો" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ડિરેક્ટરી નામ સાથે git શાખા દર્શાવો" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "સાચું હોય તો, git શાખાનું નામ દર્શાવવામાં આવશે." @@ -7672,3 +7672,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Nuna reshe git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Nuna reshen git tare da sunan kundin adireshi" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Idan gaskiya ne, za a nuna sunan reshen git." @@ -7968,3 +7968,19 @@ msgstr "תצוגת הווידג׳ט נתקלה בשגיאה בעת הפעלתה. #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "להציג את המיקום הזה בתצוגת וידג׳ט." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "הצג ענף git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "הצג את ענף הגיט עם שם הספרייה" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "אם נכון, שם סניף הגיט יוצג." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "מנותק: %.7s" @@ -7779,3 +7779,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "गिट शाखा प्रदर्शित करें" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "डायरेक्टरी नाम के साथ गिट शाखा प्रदर्शित करें" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "यदि सत्य है, तो गिट शाखा का नाम प्रदर्शित होगा।" @@ -7937,3 +7937,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Prikaži git granu" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Prikaži git granu s imenom direktorija" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ako je točno, ime git grane će biti prikazano." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odvojen: %.7s" @@ -7903,3 +7903,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git ág megjelenítése" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Jelenítse meg a git ágat a könyvtár nevével" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ha igaz, megjelenik a git ág neve." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "leválasztva: %.7s" @@ -7877,3 +7877,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Ցուցադրել git ճյուղը" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Ցուցադրել git ճյուղը թղթապանակի անվան հետ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Եթե ճիշտ է, կցուցադրվի git ճյուղի անունը:" @@ -7556,3 +7556,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Monstrar ramo de git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Monstrar le ramo git con le nomine del directorio" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si ver, le nomine del ramo git essera monstrate." @@ -7857,3 +7857,19 @@ msgstr "Tampilan widget menemui kesalahan saat memulai." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Tampilkan lokasi ini dengan tampilan widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Tampilkan cabang git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Tampilkan cabang git dengan nama direktori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Jika benar, nama cabang git akan ditampilkan." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "terpisah: %.7s" @@ -7638,3 +7638,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Monstrar git-branca" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Monstrar li branche git con li nómine del directori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si ver, li nómine del branche git va esser monstrat." @@ -7561,3 +7561,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Gosipụta ngalaba git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Gosi git nkọwa na aha ndekọ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ọ bụrụ na ọ bụ eziokwu, a ga-egosi aha git nkọwa." @@ -7783,3 +7783,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Sýna git-grein" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Sýna git grein með möppunafni" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ef satt er, verður nafn git-greinar sýnt." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "aftengdur: %.7s" @@ -8142,3 +8142,19 @@ msgstr "La visualizzazione widget ha riscontrato un errore nell'avvio." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Mostra questa posizione con la visualizzazione widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostra ramo git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mostra il ramo git con il nome della directory" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se vero, verrà visualizzato il nome del ramo git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "scollegato: %.7s" @@ -7647,3 +7647,19 @@ msgstr "起動時にウィジェット・ビューでエラーが発生しまし #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "この場所をウィジェット表示で示します。" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "gitブランチを表示" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ディレクトリ名付きでgitブランチを表示" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "真であれば、git ブランチ名が表示されます。" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "分離: %.7s" @@ -7707,3 +7707,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "გამოაჩინე git ფილიალი" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "გამოაჩინე git ფილიალი დირექტორიის სახელით" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "თუ მართალია, გამოჩნდება git ფილიალის სახელი." @@ -7582,3 +7582,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Sken git-ig" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Sken aɣbalu git s yisem n ukaram" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ma yella-d d tidet, yebban yisem n tigejgit git." @@ -7703,3 +7703,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git тармағын көрсету" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Гит тармағын каталог атауымен көрсету" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Егер шын болса, git тармағының атауы көрсетіледі." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "бөлінген: %.7s" @@ -7458,3 +7458,15 @@ msgstr "" #: ../src/caja-zoom-control.c:945 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "បង្ហាញសាខា git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "បង្ហាញសាខា git ជាមួយឈ្មោះថត" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "បើពិត នឹងបង្ហាញឈ្មោះសាខា git។" @@ -7811,3 +7811,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git ಶಾಖೆ ಪ್ರದರ್ಶಿಸಿ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ಡೈರೆಕ್ಟರಿ ಹೆಸರಿನೊಂದಿಗೆ git ಶಾಖೆಯನ್ನು ಪ್ರದರ್ಶಿಸಿ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "ನಿಜವಾದರೆ, git ಶಾಖೆಯ ಹೆಸರನ್ನು ತೋರಿಸಲಾಗುತ್ತದೆ." @@ -7594,3 +7594,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git 브랜치 표시" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "디렉토리 이름과 함께 git 브랜치를 표시" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "참이면 git 브랜치 이름이 표시됩니다." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "분리됨: %.7s" @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git शाखा दर्शाव" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ڈائریکٹری نام کے ساتھ git برانچ دکھائیں" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "اگر درست ہو، git برانچ کا نام دکھایا جائے گا۔" @@ -7612,3 +7612,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Şaxa git nîşan bide" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git şaxê bi navê pelê nîşan bide" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Eger rast be, navê şaxa git dê xuya bibe." diff --git a/po/ku_IQ.po b/po/ku_IQ.po index 6fa799e2..09fb0ca0 100644 --- a/po/ku_IQ.po +++ b/po/ku_IQ.po @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Şaxa git nîşan bide" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git şaxê bi navê pelê nîşan bide" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Eger rast be, navê şaxa git dê xuya bibe." @@ -7475,3 +7475,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git бутагын көрсөтүү" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git бутагын каталог аты менен көрсөтүү" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Эгер чын болсо, git бутак аты көрсөтүлөт." @@ -7672,3 +7672,15 @@ msgstr "" #: ../src/caja-zoom-control.c:856 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Ostende ramum git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Ostende ramum git cum nomine directorii" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si verum est, nomen ramus git ostendetur." @@ -7608,3 +7608,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Toon git-tak" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Toon de git-tak met mapnaam" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "As ’t waer is, wurt de naam van de git-tak getoond." @@ -8030,3 +8030,19 @@ msgstr "Paleidžiant valdiklio rodinį įvyko klaida." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Rodyti šią vietą valdiklio rodinyje." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Rodyti git šaką" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Rodyti git šaką su katalogo pavadinimu" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Jei tiesa, bus rodomas git šakos pavadinimas." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "atjungtas: %.7s" @@ -7906,3 +7906,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Rādīt git zaru" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Parādīt git zaru ar direktorijas nosaukumu" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ja taisnība, tiks parādīts git zara nosaukums." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "atvienots: %.7s" @@ -7662,3 +7662,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "गिट शाखा देखाउ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "डायरेक्टरी नाम के साथ गिट शाखा प्रदर्शित करें" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "यदि सत्य हो, त git शाखा नाम प्रदर्शित कएल जायत।" @@ -7708,3 +7708,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Asehoy ny sampana git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Asehoy ny sampana git miaraka amin'ny anaran'ny lahatahiry" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Raha marina, dia haseho ny anaran’ny sampana git." @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Whakaatu peka git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Whakaatu i te peka git me te ingoa kōpaki" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Mēnā he pono, ka whakaatuhia te ingoa o te manga git." @@ -7785,3 +7785,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Прикажи git гранка" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Прикажи git гранка со име на директориум" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ако е вистинито, ќе се прикаже името на git гранката." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "одвоено: %.7s" @@ -7917,3 +7917,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git ശാഖ പ്രദർശിപ്പിക്കുക" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ഡയറക്ടറി പേരോടെ git ശാഖ കാണിക്കുക" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "സത്യമായാല് git ശാഖയുടെ പേര് കാണിക്കും." @@ -7646,3 +7646,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git салбарыг харуулах" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Гит салбарыг сангийн нэртэй хамт харуулах" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Үнэн бол git салбарын нэрийг харуулна." @@ -7814,3 +7814,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git शाखा दर्शवा" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "डायरेक्टरी नावासह git शाखा दर्शवा" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "खरे असल्यास, git शाखेचे नाव दर्शविले जाईल." @@ -7805,3 +7805,15 @@ msgstr "Pandangan widget mengalami satu ralat ketika permulaan." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Papar lokasi ini dengan pandangan widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Paparkan cawangan git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Paparkan cawangan git dengan nama direktori" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Jika benar, nama cawangan git akan dipaparkan." @@ -7913,3 +7913,19 @@ msgstr "Skjermelementvisningen ble utsatt for en feil under oppstart." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Skjermelementvisning for denne plasseringen." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Vis git-gren" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Vis git-grenen med katalognavn" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Hvis sant, vises navnet på git-grenen." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "avkoblet: %.7s" @@ -7637,3 +7637,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git-Grenz wiesen" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Toon de git-tak met mapnaam" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Wenn wohr, warrt de Naam vun de git-Twig wiest." @@ -7700,3 +7700,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git शाखा देखाउनुहोस्" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "डाइरेक्टरी नाम सहित git शाखा प्रदर्शन गर्नुहोस्" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "साँचो भएमा, git शाखाको नाम देखाइनेछ।" @@ -7981,3 +7981,19 @@ msgstr "De elementenweergave ondervond een fout tijdens het opstarten." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Toon deze locatie met de elementenweergave." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Toon git-branch" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Toon de git-branch met mapnaam" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Als waar, wordt de naam van de git-branch weergegeven." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "losgekoppeld: %.7s" @@ -7763,3 +7763,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Vis git-grein" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Vis git-greina med katalognamn" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Viss sant, vert git-greina sitt namn vist." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "avkopla: %.7s" @@ -7714,3 +7714,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Bontsha lekala la git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Bontsha lekala la git ka leina la directory" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ge e le nnete, leina la lekala la git le tla bontšhwa." @@ -7994,3 +7994,15 @@ msgstr "I a aguda una error amb lo widget al lançament." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Visualizar aqueste emplaçament amb la vista widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Afichar la branca git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Afichar la branca git amb lo nom del repertòri" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se verai, lo nom de la branca git s'aficharà." @@ -7849,3 +7849,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git ଶାଖା ପ୍ରଦର୍ଶନ କରନ୍ତୁ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ଡିରେକ୍ଟୋରୀ ନାମ ସହିତ git ଶାଖା ପ୍ରଦର୍ଶନ କରନ୍ତୁ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "ସତ୍ୟ ହେଲେ, git ଶାଖା ନାମ ପ୍ରଦର୍ଶିତ ହେବ।" @@ -7758,3 +7758,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git ਸ਼ਾਖਾ ਵੇਖਾਓ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ਡਾਇਰੈਕਟਰੀ ਨਾਂ ਨਾਲ git ਸ਼ਾਖਾ ਦਿਖਾਓ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "ਜੇਕਰ ਸੱਚ ਹੈ, ਤਾਂ git ਸ਼ਾਖਾ ਦਾ ਨਾਂ ਦਿਖਾਇਆ ਜਾਵੇਗਾ।" @@ -8154,3 +8154,19 @@ msgstr "Wystąpił błąd podczas uruchamiania widoku widżetu." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Wyświetla położenie za pomocą widoku widżetu." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Wyświetl gałąź git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Pokaż gałąź git z nazwą katalogu" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Jeśli prawda, nazwa gałęzi git zostanie wyświetlona." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odłączony: %.7s" @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostra la branca git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mustra la branca git con ël nòm dël directorì" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "S'a l'é ver, a sarà mostrà ël nòm dla branca git." @@ -7555,3 +7555,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "د git څانګه وښایئ" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "د ګیټ څانګه د ډایرکټري نوم سره وښایاست" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "که ریښتیا وي، د ګیټ څانګې نوم به ښکاره شي." @@ -8012,3 +8012,19 @@ msgstr "Ocorreu um erro ao iniciar a vista de ferramenta." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Mostrar esta localização com a vista de ferramenta." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar ramo git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Exibir o ramo do git com o nome do diretório" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se for verdadeiro, o nome da ramificação git será exibido." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "desanexado: %.7s" diff --git a/po/pt_BR.po b/po/pt_BR.po index e414ed7c..2f09b6a2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -8100,3 +8100,19 @@ msgstr "A visualização do widget encontrou um erro durante a inicialização." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Exiba este local com a visualização do widget." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrar ramo git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Exibir o ramo do git com o nome do diretório" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Se for verdadeiro, o nome da ramificação git será exibido." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "destacado: %.7s" @@ -7995,3 +7995,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Afișează ramura git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Afișează ramura git cu numele directorului" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Dacă este adevărat, numele ramurii git va fi afișat." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "detașat: %.7s" @@ -8180,3 +8180,19 @@ msgstr "При запуске представления виджетов про #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Показать это расположение в представлении виджетов." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Показать ветку git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Показать ветку git с именем каталога" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Если истина, будет показано имя ветки git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "отсоединён: %.7s" @@ -7553,3 +7553,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Erekana ishami rya git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Erekana ishami rya git hamwe n'izina rya dosiye" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Niba ari ukuri, izina rya git branch rizerekanwa." @@ -7562,3 +7562,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Ammustra sa branca git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Mustra sa branca git cun su nòmine de su directòriu" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Si est beru, s’amostrat su nòmine de sa branca git." @@ -7570,3 +7570,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git ශාඛාව පෙන්වන්න" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ඩිරෙක්ටරි නාමය සමඟ git ශාඛාව පෙන්වන්න" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "සැබැදි නම්, git ශාඛාවේ නාමය පෙන්වනු ඇත." @@ -8029,3 +8029,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Zobraziť vetvu git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Zobraziť vetvu git s názvom adresára" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ak je to pravda, zobrazí sa názov vetvy git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odpojený: %.7s" @@ -8027,3 +8027,19 @@ msgstr "Pogled gradnikov je med zagonom naletel na napako." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Pokaži to mesto v pogled gradnikov" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Prikaži vejo git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Prikaži git vejo z imenom imenika" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Če je res, bo prikazano ime git veje." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odklopljen: %.7s" @@ -7815,3 +7815,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Shfaq degën git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Shfaq degën e git me emrin e direktorisë" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Nëse është e vërtetë, do të shfaqet emri i degës git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "i shkëputur: %.7s" @@ -7997,3 +7997,19 @@ msgstr "Преглед елемента је наишао на грешку пр #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Прикажите ову путању у прегледу елемента." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Прикажи git грану" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Прикажи git грану са именом директоријума" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ако је тачно, приказаће се име git гране." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "одвојено: %.7s" diff --git a/po/[email protected] b/po/[email protected] index bdbe89e1..e5cf0b99 100644 --- a/po/[email protected] +++ b/po/[email protected] @@ -7866,3 +7866,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Prikaži git granu" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Prikaži git granu sa imenom direktorijuma" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ako je tačno, prikazaće se ime git grane." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "odvojeno: %.7s" @@ -7898,3 +7898,19 @@ msgstr "Widget-vyn råka ut för ett fel vid uppstart." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Visa denna plats med widget-vyn" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Visa git-gren" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Visa git-grenen med katalognamn" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Om sant, visas namnet på git-grenen." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "frånkopplad: %.7s" @@ -7779,3 +7779,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git கிளையை காட்டு" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "கிட் கிளையை அடைவு பெயருடன் காட்டு" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "உண்மையாக இருந்தால், கிட் கிளையின் பெயர் காட்டப்படும்." @@ -7760,3 +7760,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git శాఖను ప్రదర్శించండి" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "డైరెక్టరీ పేరుతో git శాఖను ప్రదర్శించండి" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "నిజం అయితే, git శాఖ పేరు ప్రదర్శించబడుతుంది." @@ -7682,3 +7682,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "แสดงสาขา git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "แสดงสาขา git พร้อมชื่อไดเรกทอรี" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "หากเป็นจริง จะแสดงชื่อสาขา git" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "แยกออก: %.7s" @@ -7601,3 +7601,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git şahasyny görkez" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git şahasy katalog ady bilen görkez" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Eger dogry bolsa, git şahasy görkeziler." @@ -7895,3 +7895,19 @@ msgstr "Gereç görünümü başlatılırken hata ile karşılaştı." #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Bu konumu gereç görünümüyle göster." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git dalını göster" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Dizin adıyla birlikte git dalını göster" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Doğruysa, git dalı adı gösterilecektir." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "ayrılmış: %.7s" @@ -7586,3 +7586,15 @@ msgstr "" #: ../src/caja-zoom-control.c:856 msgid "Set the zoom level of the current view" msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git тармагын күрсәтү" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git тармагын каталог исеме белән күрсәтү" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Әгәр дөрес булса, git тармагын исеме күрсәтеләчәк." @@ -7795,3 +7795,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git تارمىقىنى كۆرسەت" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "گىت تارمىقىنى مۇندەرىجە نامى بىلەن كۆرسىتىڭ" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "ھەقىقىي بولسا، git تارماق ئىسمى كۆرسىتىلىدۇ." @@ -8053,3 +8053,19 @@ msgstr "Під час запуску у вікні віджета сталася #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "Показати це місце за допомогою віджета." + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Показати гілку git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Показати гілку git з назвою каталогу" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Якщо правда, буде показано назву гілки git." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "від’єднано: %.7s" @@ -7824,3 +7824,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "git شاخہ دکھائیں" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ڈائریکٹری نام کے ساتھ git برانچ دکھائیں" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "اگر درست ہو، تو git برانچ کا نام دکھایا جائے گا۔" @@ -7587,3 +7587,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Git tarmog'ini ko'rsatish" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Git tarmog'ini katalog nomi bilan ko'rsatish" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Agar to'g'ri bo'lsa, git tarmog'i nomi ko'rsatiladi." @@ -7732,3 +7732,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Hiển thị nhánh git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Hiển thị nhánh git với tên thư mục" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Nếu đúng, tên nhánh git sẽ được hiển thị." + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "tách biệt: %.7s" @@ -7565,3 +7565,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Mostrer li branche git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Moster l'branche git avou l'nom do ridant" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "S'c'est vrai, l'nom del branche git s'mostrera." @@ -7700,3 +7700,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Bonisa igatya le-git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Bonisa igatsha le-git kunye negama lefolda" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Ukuba kuyinyaniso, igama legatsha le-git liya kuboniswa." @@ -7554,3 +7554,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "ווייַזן git צווייג" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "ווייַזן די גיט שפּריץ מיט טעקע נאָמען" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "אויב אמת, וועט דער נאָמען פונעם גיט-שפּריץ ווערן געוויזן." @@ -7627,3 +7627,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Ṣafihan ẹka git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Fihan ẹka git pẹlu orukọ itọsọna" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Tí ó bá jẹ́ òótọ́, orúkọ ẹka git yóò hàn." diff --git a/po/zh_CN.po b/po/zh_CN.po index d0194226..61527cc6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -7575,3 +7575,19 @@ msgstr "部件视图在启动时遇到了错误。" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "用部件视图来展示该位置。" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "显示 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "显示带有目录名称的 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "如果为真，将显示 git 分支名称。" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "分离: %.7s" diff --git a/po/zh_HK.po b/po/zh_HK.po index 6a20a170..75bd90ad 100644 --- a/po/zh_HK.po +++ b/po/zh_HK.po @@ -7546,3 +7546,19 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "顯示 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "顯示帶有目錄名稱的 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "如果為真，將顯示 git 分支名稱。" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "分離: %.7s" diff --git a/po/zh_TW.po b/po/zh_TW.po index e2a0564b..96bda340 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7581,3 +7581,19 @@ msgstr "在啟動小工具檢視時遇到錯誤。" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "使用小工具檢視顯示此位置。" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "顯示 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "顯示帶有目錄名稱的 git 分支" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "如果為真，將顯示 git 分支名稱。" + +#: src/file-manager/fm-icon-container.c:354 +msgid "detached: %.7s" +msgstr "分離: %.7s" @@ -7645,3 +7645,15 @@ msgstr "" #: src/file-manager/fm-widget-view.c:446 msgid "Display this location with the widget view." msgstr "" + +#: data/caja-file-management-properties.ui:638 +msgid "_Display git branch" +msgstr "Bonisa igatsha le-git" + +#: libcaja-private/org.mate.caja.gschema.xml:323 +msgid "Display the git branch with directory name" +msgstr "Bonisa igatsha le-git ngegama lefolda" + +#: libcaja-private/org.mate.caja.gschema.xml:324 +msgid "If true, git branch name will be displayed." +msgstr "Uma kuyiqiniso, igama legatsha le-git lizokhonjiswa." diff --git a/src/caja-desktop-window.c b/src/caja-desktop-window.c index 662c2472..72a2bcab 100644 --- a/src/caja-desktop-window.c +++ b/src/caja-desktop-window.c @@ -116,6 +116,7 @@ caja_desktop_window_init (CajaDesktopWindow *window) gtk_widget_hide (CAJA_WINDOW (window)->details->statusbar); gtk_widget_hide (CAJA_WINDOW (window)->details->menubar); + gtk_window_set_decorated (GTK_WINDOW (window), FALSE); /* Don't allow close action on desktop */ G_GNUC_BEGIN_IGNORE_DEPRECATIONS; @@ -238,7 +239,7 @@ caja_desktop_window_new (CajaApplication *application, gtk_layer_init_for_window (gtkwin); /* Order below normal windows */ - gtk_layer_set_layer (gtkwin, GTK_LAYER_SHELL_LAYER_BOTTOM); + gtk_layer_set_layer (gtkwin, GTK_LAYER_SHELL_LAYER_BACKGROUND); gtk_layer_set_namespace (gtkwin, "desktop"); diff --git a/src/caja-file-management-properties.c b/src/caja-file-management-properties.c index ba76ebda..6606c834 100644 --- a/src/caja-file-management-properties.c +++ b/src/caja-file-management-properties.c @@ -61,6 +61,7 @@ #define CAJA_FILE_MANAGEMENT_PROPERTIES_FOLDERS_FIRST_WIDGET "sort_folders_first_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_COMPACT_LAYOUT_WIDGET "compact_layout_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET "labels_beside_icons_checkbutton" +#define CAJA_FILE_MANAGEMENT_PROPERTIES_DISPLAY_GIT_BRANCH_WIDGET "display_git_branch_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH "all_columns_same_width_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_ALWAYS_USE_BROWSER_WIDGET "always_use_browser_checkbutton" #define CAJA_FILE_MANAGEMENT_PROPERTIES_TRASH_CONFIRM_WIDGET "trash_confirm_checkbutton" @@ -1106,6 +1107,9 @@ caja_file_management_properties_dialog_setup (GtkBuilder *builder, GtkWindow *wi bind_builder_bool (builder, caja_icon_view_preferences, CAJA_FILE_MANAGEMENT_PROPERTIES_LABELS_BESIDE_ICONS_WIDGET, CAJA_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS); + bind_builder_bool (builder, caja_icon_view_preferences, + CAJA_FILE_MANAGEMENT_PROPERTIES_DISPLAY_GIT_BRANCH_WIDGET, + CAJA_PREFERENCES_ICON_VIEW_DISPLAY_GIT_BRANCH); bind_builder_bool (builder, caja_compact_view_preferences, CAJA_FILE_MANAGEMENT_PROPERTIES_ALL_COLUMNS_SAME_WIDTH, CAJA_PREFERENCES_COMPACT_VIEW_ALL_COLUMNS_SAME_WIDTH); diff --git a/src/caja-navigation-window-pane.c b/src/caja-navigation-window-pane.c index 19669411..5e870d45 100644 --- a/src/caja-navigation-window-pane.c +++ b/src/caja-navigation-window-pane.c @@ -26,6 +26,7 @@ #include <libcaja-private/caja-global-preferences.h> #include <libcaja-private/caja-window-slot-info.h> +#include <libcaja-private/caja-window-info.h> #include <libcaja-private/caja-view-factory.h> #include <libcaja-private/caja-entry.h> @@ -139,6 +140,31 @@ search_bar_activate_callback (CajaSearchBar *bar, caja_query_set_location (query, current_uri); g_free (current_uri); } + + /* Set hidden files visibility based on current window setting */ + { + CajaWindow *window; + CajaWindowShowHiddenFilesMode mode; + gboolean show_hidden_files = FALSE; + + window = slot->pane->window; + mode = caja_window_info_get_hidden_files_mode (CAJA_WINDOW_INFO (window)); + + if (mode == CAJA_WINDOW_SHOW_HIDDEN_FILES_ENABLE) + { + show_hidden_files = TRUE; + } + else if (mode == CAJA_WINDOW_SHOW_HIDDEN_FILES_DEFAULT) + { + show_hidden_files = g_settings_get_boolean (caja_preferences, CAJA_PREFERENCES_SHOW_HIDDEN_FILES); + } + + CajaSearchEngine *engine = caja_search_directory_get_engine (search_directory); + if (engine) { + caja_search_engine_set_show_hidden_files (engine, show_hidden_files); + } + } + caja_search_directory_set_query (search_directory, query); g_object_unref (query); } diff --git a/src/file-manager/fm-desktop-icon-view.c b/src/file-manager/fm-desktop-icon-view.c index 954c26de..1e08b7cf 100644 --- a/src/file-manager/fm-desktop-icon-view.c +++ b/src/file-manager/fm-desktop-icon-view.c @@ -89,6 +89,7 @@ static gboolean real_supports_auto_layout (FMIconView static gboolean real_supports_scaling (FMIconView *view); static gboolean real_supports_keep_aligned (FMIconView *view); static gboolean real_supports_labels_beside_icons (FMIconView *view); +static gboolean real_supports_display_git_branch (FMIconView *view); static void real_merge_menus (FMDirectoryView *view); static void real_update_menus (FMDirectoryView *view); static gboolean real_supports_zooming (FMDirectoryView *view); @@ -336,6 +337,7 @@ fm_desktop_icon_view_class_init (FMDesktopIconViewClass *class) FM_ICON_VIEW_CLASS (class)->supports_scaling = real_supports_scaling; FM_ICON_VIEW_CLASS (class)->supports_keep_aligned = real_supports_keep_aligned; FM_ICON_VIEW_CLASS (class)->supports_labels_beside_icons = real_supports_labels_beside_icons; + FM_ICON_VIEW_CLASS (class)->supports_display_git_branch = real_supports_display_git_branch; } /*This code is only reached when running on x11*/ @@ -920,6 +922,12 @@ real_supports_labels_beside_icons (FMIconView *view) } static gboolean +real_supports_display_git_branch (FMIconView *view) +{ + return FALSE; +} + +static gboolean real_supports_zooming (FMDirectoryView *view) { /* Can't zoom on the desktop, because doing so would cause all diff --git a/src/file-manager/fm-icon-container.c b/src/file-manager/fm-icon-container.c index c83cf783..8054c2da 100644 --- a/src/file-manager/fm-icon-container.c +++ b/src/file-manager/fm-icon-container.c @@ -34,6 +34,7 @@ #include <libcaja-private/caja-thumbnails.h> #include <libcaja-private/caja-desktop-icon-file.h> +#include <libcaja-private/caja-icon-private.h> #include "fm-icon-container.h" G_DEFINE_TYPE (FMIconContainer, fm_icon_container, CAJA_TYPE_ICON_CONTAINER); @@ -295,6 +296,67 @@ fm_icon_container_get_icon_text_attribute_names (CajaIconContainer *container, return attributes; } +/** + * Parse a .git directory/file to determine repository branch name + **/ +static char * +get_git_branch (const char *git_path) { + gchar *head_content = NULL; + gchar *branch_name = NULL; + gchar *head_path = NULL; + + if (g_file_test (git_path, G_FILE_TEST_IS_REGULAR)) + { + /* It's a file, thus we are probably dealing with a submodule, so read it to resolve the real git dir */ + gchar *contents = NULL; + if (g_file_get_contents (git_path, &contents, NULL, NULL) && contents) + { + const char *git_dir_prefix = "gitdir: "; + if (g_str_has_prefix (contents, git_dir_prefix)) + { + size_t git_dir_prefix_len = strlen (git_dir_prefix); + gchar *relative = g_strstrip (contents + git_dir_prefix_len); + gchar *base = g_path_get_dirname (git_path); + g_free (git_path); + git_path = g_build_filename (base, relative, NULL); + g_free (base); + } + g_free (contents); + } + } + + /* Extract the current git branch name of the repository from file HEAD within .git directory */ + if (g_file_test (git_path, G_FILE_TEST_IS_DIR)) + { + head_path = g_build_filename (git_path, "HEAD", NULL); + if (g_file_get_contents (head_path, &head_content, NULL, NULL)) + { + g_strstrip (head_content); + if (g_str_has_prefix (head_content, "ref: ")) + { + gchar **parts = g_strsplit (head_content, "/", -1); + if (parts != NULL) + { + branch_name = g_strdup (parts[g_strv_length(parts) - 1]); + g_strchomp (branch_name); + g_strfreev (parts); + } + } + else + { + /* Repository is in a detached HEAD state */ + branch_name = g_strdup_printf (_("detached: %.7s"), head_content); + } + } + } + + g_free (head_content); + g_free (head_path); + + /* branch_name is a newly allocated string, so the caller is responsible for freeing it */ + return branch_name; +} + /* This callback returns the text, both the editable part, and the * part below that is not editable. */ @@ -398,6 +460,32 @@ fm_icon_container_get_icon_text (CajaIconContainer *container, if (j == 0) { *additional_text = NULL; + if (container->details->display_git_branch == CAJA_DISPLAY_GIT_BRANCH_ENABLED) + { + /* If we have a directory, check if it's a git repository or submodule */ + GFileType file_type = caja_file_get_file_type (file); + if (file_type == G_FILE_TYPE_DIRECTORY) + { + GFile *location = caja_file_get_location (file); + char *path = g_file_get_path (location); + if (path != NULL) + { + char *git_path = g_build_path (G_DIR_SEPARATOR_S, path, ".git", NULL); + if (git_path != NULL && G_UNLIKELY(g_file_test (git_path, G_FILE_TEST_EXISTS))) + { + char *branch = get_git_branch (git_path); + if (branch != NULL) + { + *additional_text = g_strdup_printf ("[%s]", branch); + g_free (branch); + } + } + g_free (git_path); + g_free (path); + } + g_object_unref (location); + } + } } else if (j == 1) { diff --git a/src/file-manager/fm-icon-view.c b/src/file-manager/fm-icon-view.c index 83517273..c17bedf6 100644 --- a/src/file-manager/fm-icon-view.c +++ b/src/file-manager/fm-icon-view.c @@ -38,6 +38,7 @@ #include <sys/wait.h> #include <eel/eel-background.h> +#include <eel/eel-canvas.h> #include <eel/eel-glib-extensions.h> #include <eel/eel-gtk-extensions.h> #include <eel/eel-gtk-macros.h> @@ -48,11 +49,14 @@ #include <libcaja-private/caja-clipboard-monitor.h> #include <libcaja-private/caja-directory-background.h> #include <libcaja-private/caja-directory.h> +#include <libcaja-private/caja-search-directory.h> #include <libcaja-private/caja-dnd.h> #include <libcaja-private/caja-file-utilities.h> #include <libcaja-private/caja-ui-utilities.h> #include <libcaja-private/caja-global-preferences.h> +#include <libcaja-private/caja-icon-canvas-item.h> #include <libcaja-private/caja-icon-container.h> +#include <libcaja-private/caja-icon-private.h> #include <libcaja-private/caja-icon-dnd.h> #include <libcaja-private/caja-link.h> #include <libcaja-private/caja-metadata.h> @@ -201,6 +205,7 @@ static void default_sort_in_reverse_order_changed_callback (gpointer callback_da static void default_use_tighter_layout_changed_callback (gpointer callback_data); static void default_zoom_level_changed_callback (gpointer callback_data); static void labels_beside_icons_changed_callback (gpointer callback_data); +static void display_git_branch_changed_callback (gpointer callback_data); static void all_columns_same_width_changed_callback (gpointer callback_data); static void fm_icon_view_iface_init (CajaViewIface *iface); @@ -265,6 +270,9 @@ fm_icon_view_finalize (GObject *object) g_signal_handlers_disconnect_by_func (caja_icon_view_preferences, labels_beside_icons_changed_callback, icon_view); + g_signal_handlers_disconnect_by_func (caja_icon_view_preferences, + display_git_branch_changed_callback, + icon_view); g_signal_handlers_disconnect_by_func (caja_compact_view_preferences, default_zoom_level_changed_callback, icon_view); @@ -706,6 +714,16 @@ fm_icon_view_supports_labels_beside_icons (FMIconView *view) } static gboolean +fm_icon_view_supports_display_git_branch (FMIconView *view) +{ + g_return_val_if_fail (FM_IS_ICON_VIEW (view), FALSE); + + return EEL_CALL_METHOD_WITH_RETURN_VALUE + (FM_ICON_VIEW_CLASS, view, + supports_display_git_branch, (view)); +} + +static gboolean fm_icon_view_supports_tighter_layout (FMIconView *view) { return !fm_icon_view_is_compact (view); @@ -1184,6 +1202,14 @@ real_supports_labels_beside_icons (FMIconView *view) } static gboolean +real_supports_display_git_branch (FMIconView *view) +{ + g_return_val_if_fail (FM_IS_ICON_VIEW (view), TRUE); + + return TRUE; +} + +static gboolean set_sort_reversed (FMIconView *icon_view, gboolean new_value) { if (icon_view->details->sort_reversed == new_value) @@ -1283,6 +1309,31 @@ set_labels_beside_icons (FMIconView *icon_view) } static void +set_display_git_branch (FMIconView *icon_view) +{ + gboolean git_branch; + + if (fm_icon_view_supports_display_git_branch (icon_view)) + { + git_branch = fm_icon_view_is_compact (icon_view) || + g_settings_get_boolean (caja_icon_view_preferences, CAJA_PREFERENCES_ICON_VIEW_DISPLAY_GIT_BRANCH); + + if (git_branch) + { + caja_display_git_branch_enable + (get_icon_container (icon_view), + CAJA_DISPLAY_GIT_BRANCH_ENABLED); + } + else + { + caja_display_git_branch_enable + (get_icon_container (icon_view), + CAJA_DISPLAY_GIT_BRANCH_DISABLED); + } + } +} + +static void set_columns_same_width (FMIconView *icon_view) { gboolean all_columns_same_width; @@ -1383,6 +1434,7 @@ fm_icon_view_begin_loading (FMDirectoryView *view) fm_icon_view_get_directory_tighter_layout (icon_view, file)); set_labels_beside_icons (icon_view); + set_display_git_branch (icon_view); set_columns_same_width (icon_view); /* We must set auto-layout last, because it invokes the layout_changed @@ -2903,6 +2955,18 @@ labels_beside_icons_changed_callback (gpointer callback_data) } static void +display_git_branch_changed_callback (gpointer callback_data) +{ + FMIconView *icon_view; + + g_return_if_fail (FM_IS_ICON_VIEW (callback_data)); + + icon_view = FM_ICON_VIEW (callback_data); + + set_display_git_branch (icon_view); +} + +static void all_columns_same_width_changed_callback (gpointer callback_data) { FMIconView *icon_view; @@ -3054,6 +3118,58 @@ focus_in_event_callback (GtkWidget *widget, GdkEventFocus *event, gpointer user_ return FALSE; } +static gboolean +icon_container_query_tooltip_callback (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_tip, + GtkTooltip *tooltip, + FMIconView *icon_view) +{ + CajaIconContainer *icon_container; + EelCanvasItem *item; + CajaFile *file; + char *location_text; + + /* Only show tooltips in search directories */ + if (!CAJA_IS_SEARCH_DIRECTORY (fm_directory_view_get_model (FM_DIRECTORY_VIEW (icon_view)))) + { + return FALSE; + } + + icon_container = CAJA_ICON_CONTAINER (widget); + + /* Get the canvas item at the cursor position */ + item = eel_canvas_get_item_at (EEL_CANVAS (icon_container), x, y); + if (item == NULL || !CAJA_IS_ICON_CANVAS_ITEM (item)) + { + return FALSE; + } + + /* Get the file from the canvas item's user_data */ + CajaIcon *icon = CAJA_ICON_CANVAS_ITEM (item)->user_data; + file = CAJA_FILE (icon->data); + if (file == NULL) + { + return FALSE; + } + + /* Get the location attribute */ + location_text = caja_file_get_string_attribute_with_default (file, "location"); + if (location_text == NULL || location_text[0] == '\0') + { + g_free (location_text); + return FALSE; + } + + /* Set tooltip text with file location */ + gtk_tooltip_set_text (tooltip, location_text); + + g_free (location_text); + + return TRUE; +} + static CajaIconContainer * create_icon_container (FMIconView *icon_view) { @@ -3062,9 +3178,12 @@ create_icon_container (FMIconView *icon_view) icon_container = fm_icon_container_new (icon_view); gtk_widget_set_can_focus (GTK_WIDGET (icon_container), TRUE); + gtk_widget_set_has_tooltip (GTK_WIDGET (icon_container), TRUE); g_signal_connect_object (icon_container, "focus_in_event", G_CALLBACK (focus_in_event_callback), icon_view, 0); + g_signal_connect_object (icon_container, "query-tooltip", + G_CALLBACK (icon_container_query_tooltip_callback), icon_view, 0); g_signal_connect_object (icon_container, "activate", G_CALLBACK (icon_container_activate_callback), icon_view, 0); g_signal_connect_object (icon_container, "activate_alternate", @@ -3293,6 +3412,7 @@ fm_icon_view_class_init (FMIconViewClass *klass) klass->supports_manual_layout = real_supports_manual_layout; klass->supports_keep_aligned = real_supports_keep_aligned; klass->supports_labels_beside_icons = real_supports_labels_beside_icons; + klass->supports_display_git_branch = real_supports_display_git_branch; klass->get_directory_auto_layout = fm_icon_view_real_get_directory_auto_layout; klass->get_directory_sort_by = fm_icon_view_real_get_directory_sort_by; klass->get_directory_sort_reversed = fm_icon_view_real_get_directory_sort_reversed; @@ -3389,7 +3509,10 @@ fm_icon_view_init (FMIconView *icon_view) "changed::" CAJA_PREFERENCES_ICON_VIEW_LABELS_BESIDE_ICONS, G_CALLBACK (labels_beside_icons_changed_callback), icon_view); - + g_signal_connect_swapped (caja_icon_view_preferences, + "changed::" CAJA_PREFERENCES_ICON_VIEW_DISPLAY_GIT_BRANCH, + G_CALLBACK (display_git_branch_changed_callback), + icon_view); g_signal_connect_swapped (caja_compact_view_preferences, "changed::" CAJA_PREFERENCES_COMPACT_VIEW_DEFAULT_ZOOM_LEVEL, G_CALLBACK (default_zoom_level_changed_callback), diff --git a/src/file-manager/fm-icon-view.h b/src/file-manager/fm-icon-view.h index dfd2a171..c8c8c2f7 100644 --- a/src/file-manager/fm-icon-view.h +++ b/src/file-manager/fm-icon-view.h @@ -108,17 +108,17 @@ struct FMIconViewClass */ gboolean (* supports_scaling) (FMIconView *view); - /* supports_auto_layout is a function pointer that subclasses may - * override to control whether snap-to-grid mode - * should be enabled. The default implementation returns FALSE. + /* */ gboolean (* supports_keep_aligned) (FMIconView *view); - /* supports_auto_layout is a function pointer that subclasses may - * override to control whether snap-to-grid mode - * should be enabled. The default implementation returns FALSE. + /* */ gboolean (* supports_labels_beside_icons) (FMIconView *view); + + /* + */ + gboolean (* supports_display_git_branch) (FMIconView *view); }; /* GObject support */ diff --git a/src/file-manager/fm-list-view.c b/src/file-manager/fm-list-view.c index b5a61459..57b5862c 100644 --- a/src/file-manager/fm-list-view.c +++ b/src/file-manager/fm-list-view.c @@ -48,6 +48,7 @@ #include <libcaja-private/caja-column-utilities.h> #include <libcaja-private/caja-debug-log.h> #include <libcaja-private/caja-directory-background.h> +#include <libcaja-private/caja-search-directory.h> #include <libcaja-private/caja-dnd.h> #include <libcaja-private/caja-file-dnd.h> #include <libcaja-private/caja-file-utilities.h> @@ -1640,6 +1641,70 @@ focus_in_event_callback (GtkWidget *widget, GdkEventFocus *event, gpointer user_ return FALSE; } +static gboolean +tree_view_query_tooltip_callback (GtkWidget *widget, + gint x, + gint y, + gboolean keyboard_tip, + GtkTooltip *tooltip, + FMListView *list_view) +{ + GtkTreeView *tree_view; + GtkTreePath *path; + GtkTreeModel *model; + GtkTreeIter iter; + CajaFile *file; + char *location_text; + + /* Only show tooltips in search directories */ + if (!CAJA_IS_SEARCH_DIRECTORY (fm_directory_view_get_model (FM_DIRECTORY_VIEW (list_view)))) + { + return FALSE; + } + + tree_view = GTK_TREE_VIEW (widget); + + /* Get the tree path at the cursor position */ + if (!gtk_tree_view_get_path_at_pos (tree_view, x, y, &path, NULL, NULL, NULL)) + { + return FALSE; + } + + model = gtk_tree_view_get_model (tree_view); + if (!gtk_tree_model_get_iter (model, &iter, path)) + { + gtk_tree_path_free (path); + return FALSE; + } + + /* Get the file from the model */ + gtk_tree_model_get (model, &iter, FM_LIST_MODEL_FILE_COLUMN, &file, -1); + if (file == NULL) + { + gtk_tree_path_free (path); + return FALSE; + } + + /* Get the location attribute */ + location_text = caja_file_get_string_attribute_with_default (file, "location"); + if (location_text == NULL || location_text[0] == '\0') + { + g_free (location_text); + caja_file_unref (file); + gtk_tree_path_free (path); + return FALSE; + } + + /* Set tooltip text with file location */ + gtk_tooltip_set_text (tooltip, location_text); + + g_free (location_text); + caja_file_unref (file); + gtk_tree_path_free (path); + + return TRUE; +} + static gint get_icon_scale_callback (FMListModel *model, FMListView *view) @@ -1664,6 +1729,8 @@ create_and_set_up_tree_view (FMListView *view) NULL); gtk_tree_view_set_enable_search (view->details->tree_view, TRUE); + gtk_widget_set_has_tooltip (GTK_WIDGET (view->details->tree_view), TRUE); + /* Don't handle backspace key. It's used to open the parent folder. */ binding_set = gtk_binding_set_by_class (GTK_WIDGET_GET_CLASS (view->details->tree_view)); gtk_binding_entry_remove (binding_set, GDK_KEY_BackSpace, 0); @@ -1723,6 +1790,8 @@ create_and_set_up_tree_view (FMListView *view) g_signal_connect_object (view->details->tree_view, "focus_in_event", G_CALLBACK(focus_in_event_callback), view, 0); + g_signal_connect_object (view->details->tree_view, "query-tooltip", + G_CALLBACK (tree_view_query_tooltip_callback), view, 0); view->details->model = g_object_new (FM_TYPE_LIST_MODEL, NULL); gtk_tree_view_set_model (view->details->tree_view, GTK_TREE_MODEL (view->details->model)); |