From a4ac91d0b97c385d5136f565953bb760b6c7ee22 Mon Sep 17 00:00:00 2001 From: Andy Alt Date: Thu, 6 May 2021 13:55:25 -0500 Subject: [PATCH] Release/v0.7.09 (#311) Co-authored-by: @Jammyjamjamman --- ChangeLog | 4 + README.md | 2 +- ReleaseNotes | 4 +- configure | 20 +- configure.ac | 2 +- man/rmw.1 | 2 +- packaging/Slackbuild/rmw/README.Slackware | 2 +- packaging/Slackbuild/rmw/rmw.SlackBuild | 2 +- packaging/Slackbuild/rmw/rmw.info | 6 +- packaging/debian/changelog | 4 +- packaging/debian/rules | 2 +- packaging/file_id.diz | 2 +- packaging/release-checklist.txt | 10 +- po/de.po | 132 ++++---- po/hi.po | 115 +++---- po/nl.po | 363 +++++++++++----------- po/rmw.pot | 100 +++--- 17 files changed, 391 insertions(+), 381 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94556d76..fa9b0daf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ === rmw ChangeLog === +2021-05-06 + + * rmw v0.7.09 released + 2021-05-05 * bugfix: filenames now display correctly when using '-vvg' (#308) diff --git a/README.md b/README.md index dd385933..6ec31fa4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# rmw-0.7.09-dev +# rmw-0.7.09 ## Description diff --git a/ReleaseNotes b/ReleaseNotes index b123d1da..4f4c0a09 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -1,5 +1,5 @@ === RMW Release Notes === -v0.7.08 +v0.7.09 - * bugfix: fixes test failing on osx using xcode 11.5 and above (#283) + * bugfix: filenames now display correctly when using '-vvg' (#308) diff --git a/configure b/configure index 97871867..277040c5 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for rmw 0.7.09-dev. +# Generated by GNU Autoconf 2.69 for rmw 0.7.09. # # Report bugs to . # @@ -581,8 +581,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rmw' PACKAGE_TARNAME='rmw' -PACKAGE_VERSION='0.7.09-dev' -PACKAGE_STRING='rmw 0.7.09-dev' +PACKAGE_VERSION='0.7.09' +PACKAGE_STRING='rmw 0.7.09' PACKAGE_BUGREPORT='https://github.com/theimpossibleastronaut/rmw/issues' PACKAGE_URL='https://remove-to-waste.info/' @@ -1324,7 +1324,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rmw 0.7.09-dev to adapt to many kinds of systems. +\`configure' configures rmw 0.7.09 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1395,7 +1395,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rmw 0.7.09-dev:";; + short | recursive ) echo "Configuration of rmw 0.7.09:";; esac cat <<\_ACEOF @@ -1513,7 +1513,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rmw configure 0.7.09-dev +rmw configure 0.7.09 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1869,7 +1869,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rmw $as_me 0.7.09-dev, which was +It was created by rmw $as_me 0.7.09, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2733,7 +2733,7 @@ fi # Define the identity of the package. PACKAGE='rmw' - VERSION='0.7.09-dev' + VERSION='0.7.09' cat >>confdefs.h <<_ACEOF @@ -9485,7 +9485,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rmw $as_me 0.7.09-dev, which was +This file was extended by rmw $as_me 0.7.09, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -9552,7 +9552,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rmw config.status 0.7.09-dev +rmw config.status 0.7.09 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 8e16703b..859dc019 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.69) -AC_INIT([rmw], [0.7.09-dev], [https://github.com/theimpossibleastronaut/rmw/issues],,[https://remove-to-waste.info/]) +AC_INIT([rmw], [0.7.09], [https://github.com/theimpossibleastronaut/rmw/issues],,[https://remove-to-waste.info/]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([-Wall subdir-objects foreign no-dependencies]) AM_SILENT_RULES([yes]) diff --git a/man/rmw.1 b/man/rmw.1 index eb5d6c45..b34de6ca 100644 --- a/man/rmw.1 +++ b/man/rmw.1 @@ -1,4 +1,4 @@ -.TH RMW "1" "April 2021" +.TH RMW "1" "May 2021" .SH NAME rmw - remove files, safely .SH SYNOPSIS diff --git a/packaging/Slackbuild/rmw/README.Slackware b/packaging/Slackbuild/rmw/README.Slackware index 14919e80..6ec31fa4 100644 --- a/packaging/Slackbuild/rmw/README.Slackware +++ b/packaging/Slackbuild/rmw/README.Slackware @@ -1,4 +1,4 @@ -# rmw-0.7.07 +# rmw-0.7.09 ## Description diff --git a/packaging/Slackbuild/rmw/rmw.SlackBuild b/packaging/Slackbuild/rmw/rmw.SlackBuild index 1811bf32..a950f12a 100755 --- a/packaging/Slackbuild/rmw/rmw.SlackBuild +++ b/packaging/Slackbuild/rmw/rmw.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rmw -VERSION=${VERSION:-0.7.08} +VERSION=${VERSION:-0.7.09} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/packaging/Slackbuild/rmw/rmw.info b/packaging/Slackbuild/rmw/rmw.info index 9a49a850..519465e7 100644 --- a/packaging/Slackbuild/rmw/rmw.info +++ b/packaging/Slackbuild/rmw/rmw.info @@ -1,8 +1,8 @@ PRGNAM="rmw" -VERSION="0.7.08" +VERSION="0.7.09" HOMEPAGE="https://remove-to-waste.info/" -DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.08/rmw-0.7.08.tar.gz" -MD5SUM="3cc21974aacc17f3635738b5a28f88cc" +DOWNLOAD="https://github.com/theimpossibleastronaut/rmw/releases/download/v0.7.09/rmw-0.7.09.tar.gz" +MD5SUM="706afc9ededc60a0e235d05ceced08b1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 4345906b..55b6a90a 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,5 +1,5 @@ -rmw (0.7.08) stable; urgency=medium +rmw (0.7.09) stable; urgency=medium * New upstream release - -- Andy Alt Thu, 29 Apr 2021 11:27:58 -0500 + -- Andy Alt Wed, 05 May 2021 22:31:23 -0500 diff --git a/packaging/debian/rules b/packaging/debian/rules index c1e39fb9..b8b1ea0e 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -1,6 +1,6 @@ #!/usr/bin/make -f -export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow +export DEB_BUILD_MAINT_OPTIONS=hardening=+all %: dh $@ diff --git a/packaging/file_id.diz b/packaging/file_id.diz index df0119ed..d83427b0 100644 --- a/packaging/file_id.diz +++ b/packaging/file_id.diz @@ -1,4 +1,4 @@ -rmw v0.7.08 +rmw v0.7.09 ReMove to Waste is a safe-remove utility for the command line. Its goal is to conform to the FreeDesktop.org Trash diff --git a/packaging/release-checklist.txt b/packaging/release-checklist.txt index ebcc683f..31329875 100644 --- a/packaging/release-checklist.txt +++ b/packaging/release-checklist.txt @@ -4,7 +4,7 @@ Change version number configure.ac (AC_INIT) README.md packaging/Slackbuild/rmw/rmw.info (also change version numbers in download link) - packaging/Slackbuild/rmwrmw.Slackbuild + packaging/Slackbuild/rmw/rmw.Slackbuild packaging/file_id.diz (filegate.net) cd packaging and run 'dch -r' (updates the changelog timestamp in debian/ @@ -12,6 +12,11 @@ cp README.md packaging/Slackbuild/rmw/README.Slackware run autoreconf +Setup build (if not already done) + mkdir _build + cd _build + ../configure + update po and pot files (from the build directory) cd po && make update-po @@ -26,8 +31,9 @@ Ex: * rmw v0.7.07 released -Change Month and Year in man/man.1 +Change Month and Year in man/rmw.1 +cd .. make distcheck make dist diff --git a/po/de.po b/po/de.po index 5c1379a1..2660433f 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: rmw 0.4.05-dev\n" "Report-Msgid-Bugs-To: andy400-dev@yahoo.com\n" -"POT-Creation-Date: 2021-04-28 14:03-0500\n" +"POT-Creation-Date: 2021-05-05 23:12+0100\n" "PO-Revision-Date: 2019-07-07 00:18+0200\n" "Last-Translator: Eric Haberstroh \n" "Language-Team: German\n" @@ -122,7 +122,7 @@ msgstr "" "# '-f' verwenden wollen, kommentieren sie die folgende Zeile aus:\n" "#\n" -#: src/config_rmw.c:283 +#: src/config_rmw.c:282 #, c-format msgid "Invalid WASTE option: '%s'\n" msgstr "Unbekannte oder ungültige Option: '%s'\n" @@ -142,12 +142,12 @@ msgstr "Erzeuge standard Konfigurationsdatei" msgid "Unable to read or write a configuration file.\n" msgstr "Die Konfigurationsdatei kann nicht gelesen oder geschrieben werden\n" -#: src/config_rmw.c:568 +#: src/config_rmw.c:567 #, c-format msgid "Unknown or invalid option: '%s'\n" msgstr "Unbekannte oder ungültige Option: '%s'\n" -#: src/config_rmw.c:581 +#: src/config_rmw.c:580 #, c-format msgid "" "no usable WASTE folder could be found\n" @@ -160,17 +160,17 @@ msgstr "" "Wenn du weitere Hilfe brauchst oder einen Fehler melden willst,\n" "besuche die rmw-Webseite unter\n" -#: src/config_rmw.c:632 +#: src/config_rmw.c:638 #, c-format msgid "removable, " msgstr "löschbar." #. TRANSLATORS: context - "a mounted device or filesystem is presently attached or mounted" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "attached" msgstr "angeschlossen" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "detached" msgstr "entfernt" @@ -178,7 +178,7 @@ msgstr "entfernt" msgid "Skipping --undo-last because --most-recent-list was requested" msgstr "" -#: src/main.c:162 +#: src/main.c:158 msgid "while getting the path to your home directory\n" msgstr "beim Ermitteln des Pfades zu deinem Home-Verzeichnis.\n" @@ -217,7 +217,7 @@ msgid "The Easter Bunny says, \"Hello, world.\"" msgstr "" #. TRANSLATORS: "%s" refers to a file or directory -#: src/main.c:385 src/restore_rmw.c:179 +#: src/main.c:385 src/restore_rmw.c:193 #, c-format msgid "File not found: '%s'\n" msgstr "Datei nicht gefunden: '%s'\n" @@ -227,12 +227,12 @@ msgstr "Datei nicht gefunden: '%s'\n" msgid "%s resides within a waste folder and has been ignored\n" msgstr "" -#: src/main.c:481 +#: src/main.c:480 #, c-format msgid "No suitable filesystem found for \"%s\"\n" msgstr " Kein passendes Dateisystem für \"%s\" gefunden\n" -#: src/main.c:491 +#: src/main.c:490 #, c-format msgid "%d file was removed to the waste folder" msgid_plural "%d files were removed to the waste folder" @@ -319,11 +319,22 @@ msgstr "" " %s -> %s -- %s:L%d\n" #. TRANSLATORS: "removing" refers to a file or folder -#: src/messages_rmw.c:233 +#: src/messages_rmw.c:234 #, c-format msgid "while removing %s\n" msgstr "beim Löschen von %s\n" +#: src/messages_rmw.c:244 +#, fuzzy, c-format +#| msgid "while creating %s\n" +msgid "while creating %s (%s)\n" +msgstr "beim Anlegen von %s\n" + +#: src/messages_rmw.c:250 +#, c-format +msgid "Created directory %s\n" +msgstr "Verzeichnis %s angelegt\n" + #: src/parse_cli_options.c:44 #, c-format msgid "" @@ -562,75 +573,67 @@ msgid "Purging files based on number of days in the waste folders (%u) ...\n" msgstr "" "Lösche Dateien auf Grundlage der Verweildauer in den Papierkörben (%u) ...\n" -#: src/purging_rmw.c:400 +#: src/purging_rmw.c:403 #, c-format msgid "Directory not purged - still contains files\n" msgstr "" " :Warnung: Verzeichnis wurde nicht gelöscht - es enthält noch Dateien\n" -#: src/purging_rmw.c:402 +#: src/purging_rmw.c:405 #, c-format msgid "(check owner/write permissions)\n" msgstr "(überprüfe Eigentümer/Schreibberechtigung)\n" #. TRANSLATORS: "depth" refers to the recursion depth in a #. * directory -#: src/purging_rmw.c:410 +#: src/purging_rmw.c:413 #, c-format msgid "Maximum depth of %u reached, skipping\n" msgstr " :Warnung: Maximale Tiefe von %u erreicht, überspringe ...\n" -#: src/purging_rmw.c:473 +#: src/purging_rmw.c:474 #, c-format msgid "'%s' will be purged in %.2lf days\n" msgstr "" -#: src/purging_rmw.c:486 +#: src/purging_rmw.c:487 #, c-format msgid "%d directories skipped (RMDIR_MAX_DEPTH reached)\n" msgstr "%d Verzeichnisse übersprungen (RMDIR_MAX_DEPTH erreicht)\n" -#: src/purging_rmw.c:490 +#: src/purging_rmw.c:491 #, c-format msgid "%d directories skipped (contains read-only files)\n" msgstr "%d Verzeichnisse übersprungen (enthalten schreibgeschützte Dateien)\n" -#: src/purging_rmw.c:493 +#: src/purging_rmw.c:494 #, c-format msgid "%d file purged" msgid_plural "%d files purged" msgstr[0] "%d Datei gelöscht" msgstr[1] "%d Dateien gelöscht" -#: src/purging_rmw.c:497 +#: src/purging_rmw.c:498 #, c-format msgid "(%d file deleted)" msgid_plural "(%d files deleted)" msgstr[0] "(%d Datei gelöscht)" msgstr[1] "(%d Dateien gelöscht)" -#: src/purging_rmw.c:501 +#: src/purging_rmw.c:502 #, c-format msgid "(%d directory deleted)" msgid_plural "(%d directories deleted)" msgstr[0] "(%d Verzeichnis gelöscht)" msgstr[1] "(%d Verzeichnisse gelöscht)" -#. TRANSLATORS: context: "Number of bytes freed" -#: src/purging_rmw.c:505 -#, c-format -msgid "%s freed" -msgid_plural "%s freed" -msgstr[0] "%s freigegeben" -msgstr[1] "%s freigegeben" - #. TRANSLATORS: "created" refers to a file #: src/purging_rmw.c:566 #, c-format msgid "Created %s\n" msgstr "%s angelegt\n" -#: src/purging_rmw.c:572 src/utils_rmw.c:86 +#: src/purging_rmw.c:572 #, c-format msgid "while creating %s\n" msgstr "beim Anlegen von %s\n" @@ -640,22 +643,22 @@ msgstr "beim Anlegen von %s\n" msgid "Duplicate filename at destination - appending time string...\n" msgstr "Doppelter Dateiname im Zielverzeichnis, füge Zeitstempel an...\n" -#: src/restore_rmw.c:161 +#: src/restore_rmw.c:175 #, c-format msgid "while removing .trashinfo file: '%s'\n" msgstr "beim Löschen der .trashinfo-Datei '%s' \n" -#: src/restore_rmw.c:220 +#: src/restore_rmw.c:234 #, c-format msgid "Reading %s...\n" msgstr "Lese %s...\n" -#: src/restore_rmw.c:266 +#: src/restore_rmw.c:281 #, c-format msgid "Your terminal only has %d lines. A minimum of %d lines is required.\n" msgstr "" -#: src/restore_rmw.c:288 +#: src/restore_rmw.c:303 #, c-format msgid "== contains %d file ==" msgid_plural "== contains %d files ==" @@ -664,11 +667,11 @@ msgstr[1] "== enthält %d Dateien ==" #. TRANSLATORS: I believe the words between the < and > can be translated #. -#: src/restore_rmw.c:292 +#: src/restore_rmw.c:307 msgid " - switch waste folders" msgstr " - zwischen Papierkörben wechseln" -#: src/restore_rmw.c:293 +#: src/restore_rmw.c:308 msgid "" " - select or unselect an item. / - restore selected items" msgstr "" @@ -678,49 +681,30 @@ msgstr "" #. TRANSLATORS: the 'q' can not be translated. rmw can only accept a 'q' #. * for input in this case. #. -#: src/restore_rmw.c:299 +#: src/restore_rmw.c:314 msgid "'q' - quit" msgstr "'q' - beenden" -#: src/restore_rmw.c:401 +#: src/restore_rmw.c:416 #, c-format msgid "failed to remove %s\n" msgstr "Konnte %s nicht entfernen\n" -#: src/strings_rmw.c:117 -#, c-format -msgid "" -" <--> Displaying part of the string that caused the error <-->\n" -"\n" -msgstr "" -" <--> Zeige einen Teil der Zeichenkette, die den Fehler verursacht hat <-->\n" -"\n" - -#: src/strings_rmw.c:279 +#: src/strings_rmw.c:220 #, c-format msgid "realpath() returned an error.\n" msgstr "realpath() hat einen Fehler zurückgeliefert.\n" -#: src/utils_rmw.c:81 -#, c-format -msgid "Created directory %s\n" -msgstr "Verzeichnis %s angelegt\n" - -#: src/utils_rmw.c:160 +#: src/utils_rmw.c:194 msgid "Continue? (y/n): " msgstr "Weitermachen (y/n):" -#: src/utils_rmw.c:236 src/utils_rmw.c:247 src/utils_rmw.c:299 -#: src/utils_rmw.c:314 +#: src/utils_rmw.c:270 src/utils_rmw.c:281 src/utils_rmw.c:328 +#: src/utils_rmw.c:343 #, c-format msgid "rmw: %s(): buffer too small (got %d, needed a minimum of %d)\n" msgstr "rmw: %s(): Puffer zu klein (habe %d erhalten, brauche mindestens %d)\n" -#~ msgid " -g, --purge run purge even if it's been run today\n" -#~ msgstr "" -#~ " -g, --purge Papierkörbe leeren, selbst wenn dies heute " -#~ "schon erledigt wurde\n" - #~ msgid "" #~ "\n" #~ "# If attempting to rmw files under this directory, they will not be " @@ -804,6 +788,14 @@ msgstr "rmw: %s(): Puffer zu klein (habe %d erhalten, brauche mindestens %d)\n" #~ "andy5995/rmw/wiki\n" #~ "\n" +#~ msgid " -g, --purge run purge even if it's been run today\n" +#~ msgstr "" +#~ " -g, --purge Papierkörbe leeren, selbst wenn dies heute " +#~ "schon erledigt wurde\n" + +#~ msgid " -h, --help\n" +#~ msgstr " -h, --help\n" + #, fuzzy #~| msgid "" #~| "Usage: rmw [OPTION]... FILE...\n" @@ -946,6 +938,21 @@ msgstr "rmw: %s(): Puffer zu klein (habe %d erhalten, brauche mindestens %d)\n" #~ msgid " :warning: Maximum number of waste folders reached: %d\n" #~ msgstr " :Warnung: Maximale Anzahl von Papierkörben erreicht: %d\n" +#, c-format +#~ msgid "" +#~ " <--> Displaying part of the string that caused the error <-->\n" +#~ "\n" +#~ msgstr "" +#~ " <--> Zeige einen Teil der Zeichenkette, die den Fehler verursacht hat <--" +#~ ">\n" +#~ "\n" + +#, c-format +#~ msgid "%s freed" +#~ msgid_plural "%s freed" +#~ msgstr[0] "%s freigegeben" +#~ msgstr[1] "%s freigegeben" + #~ msgid "'%s' not found\n" #~ msgstr "'%s' nicht gefunden\n" @@ -980,6 +987,3 @@ msgstr "rmw: %s(): Puffer zu klein (habe %d erhalten, brauche mindestens %d)\n" #~ msgid "search complete\n" #~ msgstr "Suche abgeschlossen\n" - -#~ msgid " -h, --help\n" -#~ msgstr " -h, --help\n" diff --git a/po/hi.po b/po/hi.po index 77ea43be..61d13d90 100644 --- a/po/hi.po +++ b/po/hi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rmw 0.7.04\n" "Report-Msgid-Bugs-To: andy400-dev@yahoo.com\n" -"POT-Creation-Date: 2021-04-28 14:03-0500\n" +"POT-Creation-Date: 2021-05-05 23:12+0100\n" "PO-Revision-Date: 2020-04-18 12:26+0530\n" "Last-Translator: \n" "Language-Team: \n" @@ -121,7 +121,7 @@ msgstr "" "# 'f' ka prayog karna hai to niche Rekha par comment karen \n" "#\n" -#: src/config_rmw.c:283 +#: src/config_rmw.c:282 #, c-format msgid "Invalid WASTE option: '%s'\n" msgstr "Galat apshist option: '%s'\n" @@ -141,12 +141,12 @@ msgstr "configuration file banate waqt:" msgid "Unable to read or write a configuration file.\n" msgstr "Nahi padha or likha jaa raha configuration file\n" -#: src/config_rmw.c:568 +#: src/config_rmw.c:567 #, c-format msgid "Unknown or invalid option: '%s'\n" msgstr "Unjana ya galat bikalp: '%s'\n" -#: src/config_rmw.c:581 +#: src/config_rmw.c:580 #, c-format msgid "" "no usable WASTE folder could be found\n" @@ -159,17 +159,17 @@ msgstr "" "agar aapko madad ki ya koi galti batani hai\n" "aap rmw web site par karen\n" -#: src/config_rmw.c:632 +#: src/config_rmw.c:638 #, c-format msgid "removable, " msgstr "hataya ja sakta hai, " #. TRANSLATORS: context - "a mounted device or filesystem is presently attached or mounted" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "attached" msgstr "jodagaya" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 #, fuzzy #| msgid "attached" msgid "detached" @@ -179,7 +179,7 @@ msgstr "jodagaya" msgid "Skipping --undo-last because --most-recent-list was requested" msgstr "" -#: src/main.c:162 +#: src/main.c:158 msgid "while getting the path to your home directory\n" msgstr "home directory ka rasta milte wakht\n" @@ -219,7 +219,7 @@ msgid "The Easter Bunny says, \"Hello, world.\"" msgstr "Easter Bunny bola, \"Hello, Duniya.\"" #. TRANSLATORS: "%s" refers to a file or directory -#: src/main.c:385 src/restore_rmw.c:179 +#: src/main.c:385 src/restore_rmw.c:193 #, c-format msgid "File not found: '%s'\n" msgstr "File nahi mili: '%s'\n" @@ -229,12 +229,12 @@ msgstr "File nahi mili: '%s'\n" msgid "%s resides within a waste folder and has been ignored\n" msgstr "" -#: src/main.c:481 +#: src/main.c:480 #, c-format msgid "No suitable filesystem found for \"%s\"\n" msgstr "koi sahi filesystem nahi mile \"%s\"\n" -#: src/main.c:491 +#: src/main.c:490 #, c-format msgid "%d file was removed to the waste folder" msgid_plural "%d files were removed to the waste folder" @@ -318,11 +318,22 @@ msgstr "" "\n" #. TRANSLATORS: "removing" refers to a file or folder -#: src/messages_rmw.c:233 +#: src/messages_rmw.c:234 #, c-format msgid "while removing %s\n" msgstr "hatate wakht %s\n" +#: src/messages_rmw.c:244 +#, fuzzy, c-format +#| msgid "while creating %s\n" +msgid "while creating %s (%s)\n" +msgstr "banate wakht %s\n" + +#: src/messages_rmw.c:250 +#, c-format +msgid "Created directory %s\n" +msgstr "Yeh directory banayi gayi %s\n" + #: src/parse_cli_options.c:44 #, c-format msgid "" @@ -520,76 +531,68 @@ msgstr "sari failen ki sudhikaran kiya jayega apshist folders …\n" msgid "Purging files based on number of days in the waste folders (%u) ...\n" msgstr "sudhikaran files din ginke ke baad apshist folder se hogi (%u) …\n" -#: src/purging_rmw.c:400 +#: src/purging_rmw.c:403 #, c-format msgid "Directory not purged - still contains files\n" msgstr "Directory sudhikaran na ho -failen yahan hai \n" -#: src/purging_rmw.c:402 +#: src/purging_rmw.c:405 #, c-format msgid "(check owner/write permissions)\n" msgstr "(malik ki parikshya/permissions likhen)\n" #. TRANSLATORS: "depth" refers to the recursion depth in a #. * directory -#: src/purging_rmw.c:410 +#: src/purging_rmw.c:413 #, c-format msgid "Maximum depth of %u reached, skipping\n" msgstr "jyada se jyada %u hua, chod dijiye\n" -#: src/purging_rmw.c:473 +#: src/purging_rmw.c:474 #, fuzzy, c-format #| msgid "%d file purged" #| msgid_plural "%d files purged" msgid "'%s' will be purged in %.2lf days\n" msgstr "%d failen sudhikaran ki gayi hai" -#: src/purging_rmw.c:486 +#: src/purging_rmw.c:487 #, c-format msgid "%d directories skipped (RMDIR_MAX_DEPTH reached)\n" msgstr "% directories ko chodo gaya hai(RMDIR_MAX_DEPTH hogaya)\n" -#: src/purging_rmw.c:490 +#: src/purging_rmw.c:491 #, c-format msgid "%d directories skipped (contains read-only files)\n" msgstr "%d directories chodi gayi hai (sirf padhne wali files)\n" -#: src/purging_rmw.c:493 +#: src/purging_rmw.c:494 #, c-format msgid "%d file purged" msgid_plural "%d files purged" msgstr[0] "%d failen sudhikaran ki gayi hai" msgstr[1] "%d file sudhikaran ki gayi hai" -#: src/purging_rmw.c:497 +#: src/purging_rmw.c:498 #, c-format msgid "(%d file deleted)" msgid_plural "(%d files deleted)" msgstr[0] "(%d failen hatayi gayi)" msgstr[1] "(%d file hatayi gayi)" -#: src/purging_rmw.c:501 +#: src/purging_rmw.c:502 #, c-format msgid "(%d directory deleted)" msgid_plural "(%d directories deleted)" msgstr[0] "(%d directoriyan hatayi gayi)" msgstr[1] "(%d directory hatayi gayi)" -#. TRANSLATORS: context: "Number of bytes freed" -#: src/purging_rmw.c:505 -#, c-format -msgid "%s freed" -msgid_plural "%s freed" -msgstr[0] "%s mukht kiya gaya" -msgstr[1] "%s mukht kiye gaya" - #. TRANSLATORS: "created" refers to a file #: src/purging_rmw.c:566 #, c-format msgid "Created %s\n" msgstr "Banaya gaya %s\n" -#: src/purging_rmw.c:572 src/utils_rmw.c:86 +#: src/purging_rmw.c:572 #, c-format msgid "while creating %s\n" msgstr "banate wakht %s\n" @@ -599,22 +602,22 @@ msgstr "banate wakht %s\n" msgid "Duplicate filename at destination - appending time string...\n" msgstr "behrupi file ka naam hai manzil par - sanlagn wakht par string \n" -#: src/restore_rmw.c:161 +#: src/restore_rmw.c:175 #, c-format msgid "while removing .trashinfo file: '%s'\n" msgstr ".trashinfo fail hatate wakht:'%s'\n" -#: src/restore_rmw.c:220 +#: src/restore_rmw.c:234 #, c-format msgid "Reading %s...\n" msgstr "Padh raha hai %s…\n" -#: src/restore_rmw.c:266 +#: src/restore_rmw.c:281 #, c-format msgid "Your terminal only has %d lines. A minimum of %d lines is required.\n" msgstr "" -#: src/restore_rmw.c:288 +#: src/restore_rmw.c:303 #, c-format msgid "== contains %d file ==" msgid_plural "== contains %d files ==" @@ -623,11 +626,11 @@ msgstr[1] "== failen shamil %d hai ==" #. TRANSLATORS: I believe the words between the < and > can be translated #. -#: src/restore_rmw.c:292 +#: src/restore_rmw.c:307 msgid " - switch waste folders" msgstr " - svich abhisht folders" -#: src/restore_rmw.c:293 +#: src/restore_rmw.c:308 msgid "" " - select or unselect an item. / - restore selected items" msgstr "" @@ -637,40 +640,26 @@ msgstr "" #. TRANSLATORS: the 'q' can not be translated. rmw can only accept a 'q' #. * for input in this case. #. -#: src/restore_rmw.c:299 +#: src/restore_rmw.c:314 msgid "'q' - quit" msgstr "'q' -chodna" -#: src/restore_rmw.c:401 +#: src/restore_rmw.c:416 #, c-format msgid "failed to remove %s\n" msgstr "hataya nahi jaa saka %s\n" -#: src/strings_rmw.c:117 -#, c-format -msgid "" -" <--> Displaying part of the string that caused the error <-->\n" -"\n" -msgstr "" -" <---> galati ke karan bana string <--->\n" -"\n" - -#: src/strings_rmw.c:279 +#: src/strings_rmw.c:220 #, c-format msgid "realpath() returned an error.\n" msgstr "realpath() may error mila hai\n" -#: src/utils_rmw.c:81 -#, c-format -msgid "Created directory %s\n" -msgstr "Yeh directory banayi gayi %s\n" - -#: src/utils_rmw.c:160 +#: src/utils_rmw.c:194 msgid "Continue? (y/n): " msgstr "Jari rakhen? (haan/na): " -#: src/utils_rmw.c:236 src/utils_rmw.c:247 src/utils_rmw.c:299 -#: src/utils_rmw.c:314 +#: src/utils_rmw.c:270 src/utils_rmw.c:281 src/utils_rmw.c:328 +#: src/utils_rmw.c:343 #, c-format msgid "rmw: %s(): buffer too small (got %d, needed a minimum of %d)\n" msgstr "rmw: %s(): buffer bhut chota hai (mila %d, chahiye tha %d)\n" @@ -754,6 +743,20 @@ msgstr "rmw: %s(): buffer bhut chota hai (mila %d, chahiye tha %d)\n" #~ "karen\n" #~ " -u, --purbith-pichle purbit pichle ReMove\n" +#, c-format +#~ msgid "" +#~ " <--> Displaying part of the string that caused the error <-->\n" +#~ "\n" +#~ msgstr "" +#~ " <---> galati ke karan bana string <--->\n" +#~ "\n" + +#, c-format +#~ msgid "%s freed" +#~ msgid_plural "%s freed" +#~ msgstr[0] "%s mukht kiya gaya" +#~ msgstr[1] "%s mukht kiye gaya" + #~ msgid "-r / --recurse: not implemented\n" #~ msgstr "-r / --recurse: nahi kiya gaya\n" diff --git a/po/nl.po b/po/nl.po index eda2c58a..518501f1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rmw 0.4.05-dev\n" "Report-Msgid-Bugs-To: andy400-dev@yahoo.com\n" -"POT-Creation-Date: 2021-04-28 14:03-0500\n" +"POT-Creation-Date: 2021-05-05 23:12+0100\n" "PO-Revision-Date: 2019-08-04 16:21+0200\n" "Last-Translator: Martijn de Boer, 2018\n" "Language-Team: Dutch (Netherlands) (https://www.transifex.com/na-309/" @@ -125,7 +125,7 @@ msgstr "" "inschakelen\n" "#\n" -#: src/config_rmw.c:283 +#: src/config_rmw.c:282 #, c-format msgid "Invalid WASTE option: '%s'\n" msgstr "Invalide optie: '%s'\n" @@ -145,12 +145,12 @@ msgstr "Aanmaken van standaard configuratie bestand:" msgid "Unable to read or write a configuration file.\n" msgstr "Kan een configuratie bestand niet lezen of schrijven.\n" -#: src/config_rmw.c:568 +#: src/config_rmw.c:567 #, c-format msgid "Unknown or invalid option: '%s'\n" msgstr "Onbekende of invalide optie: '%s'\n" -#: src/config_rmw.c:581 +#: src/config_rmw.c:580 #, c-format msgid "" "no usable WASTE folder could be found\n" @@ -163,17 +163,17 @@ msgstr "" "Indien je meer hulp nodig hebt of je een mogelijke bug wilt\n" "rapporteren, bezoek de website van rmw op\n" -#: src/config_rmw.c:632 +#: src/config_rmw.c:638 #, c-format msgid "removable, " msgstr "verwijderbaar, " #. TRANSLATORS: context - "a mounted device or filesystem is presently attached or mounted" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "attached" msgstr "gekoppeld" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "detached" msgstr "ontkoppeld" @@ -181,7 +181,7 @@ msgstr "ontkoppeld" msgid "Skipping --undo-last because --most-recent-list was requested" msgstr "" -#: src/main.c:162 +#: src/main.c:158 msgid "while getting the path to your home directory\n" msgstr "bij het ophalen van het pad naar je thuismap\n" @@ -220,7 +220,7 @@ msgid "The Easter Bunny says, \"Hello, world.\"" msgstr "De paashaas zegt, \"Hallo, wereld.\"" #. TRANSLATORS: "%s" refers to a file or directory -#: src/main.c:385 src/restore_rmw.c:179 +#: src/main.c:385 src/restore_rmw.c:193 #, c-format msgid "File not found: '%s'\n" msgstr "Bestand niet gevonden: '%s'\n" @@ -230,12 +230,12 @@ msgstr "Bestand niet gevonden: '%s'\n" msgid "%s resides within a waste folder and has been ignored\n" msgstr "" -#: src/main.c:481 +#: src/main.c:480 #, c-format msgid "No suitable filesystem found for \"%s\"\n" msgstr "Geen geschikt bestandssysteem gevonden voor \"%s\"\n" -#: src/main.c:491 +#: src/main.c:490 #, c-format msgid "%d file was removed to the waste folder" msgid_plural "%d files were removed to the waste folder" @@ -318,11 +318,22 @@ msgstr "" " %s -> %s - %s:L%d\n" #. TRANSLATORS: "removing" refers to a file or folder -#: src/messages_rmw.c:233 +#: src/messages_rmw.c:234 #, c-format msgid "while removing %s\n" msgstr "bij het verwijderen van %s\n" +#: src/messages_rmw.c:244 +#, fuzzy, c-format +#| msgid "while creating %s\n" +msgid "while creating %s (%s)\n" +msgstr "bij het maken van %s\n" + +#: src/messages_rmw.c:250 +#, c-format +msgid "Created directory %s\n" +msgstr "Map %s aangemaakt\n" + #: src/parse_cli_options.c:44 #, c-format msgid "" @@ -541,76 +552,68 @@ msgid "Purging files based on number of days in the waste folders (%u) ...\n" msgstr "" "Purgen van bestanden gebaseerd op het aantal dagen in de afval map (%u)...\n" -#: src/purging_rmw.c:400 +#: src/purging_rmw.c:403 #, c-format msgid "Directory not purged - still contains files\n" msgstr "Directory niet gepurged - bevat nog steeds bestanden\n" -#: src/purging_rmw.c:402 +#: src/purging_rmw.c:405 #, c-format msgid "(check owner/write permissions)\n" msgstr "(controleer eigenaar/schrijf permissies)\n" #. TRANSLATORS: "depth" refers to the recursion depth in a #. * directory -#: src/purging_rmw.c:410 +#: src/purging_rmw.c:413 #, c-format msgid "Maximum depth of %u reached, skipping\n" msgstr "Maximale diepte van %u bereikt, overslaan\n" -#: src/purging_rmw.c:473 +#: src/purging_rmw.c:474 #, fuzzy, c-format #| msgid "%d file purged" #| msgid_plural "%d files purged" msgid "'%s' will be purged in %.2lf days\n" msgstr "%dbestand gepurged" -#: src/purging_rmw.c:486 +#: src/purging_rmw.c:487 #, c-format msgid "%d directories skipped (RMDIR_MAX_DEPTH reached)\n" msgstr "%d directories overgeslagen (RMDIR_MAX_DEPTH bereikt)\n" -#: src/purging_rmw.c:490 +#: src/purging_rmw.c:491 #, c-format msgid "%d directories skipped (contains read-only files)\n" msgstr "%d directories overgeslagen (bevat alleen-lezen bestanden)\n" -#: src/purging_rmw.c:493 +#: src/purging_rmw.c:494 #, c-format msgid "%d file purged" msgid_plural "%d files purged" msgstr[0] "%dbestand gepurged" msgstr[1] "%dbestanden gepurged" -#: src/purging_rmw.c:497 +#: src/purging_rmw.c:498 #, c-format msgid "(%d file deleted)" msgid_plural "(%d files deleted)" msgstr[0] "(%d bestand gepurged)" msgstr[1] "(%d bestanden gepurged)" -#: src/purging_rmw.c:501 +#: src/purging_rmw.c:502 #, c-format msgid "(%d directory deleted)" msgid_plural "(%d directories deleted)" msgstr[0] "(%d map verwijderd)" msgstr[1] "(%d mappen verwijderd)" -#. TRANSLATORS: context: "Number of bytes freed" -#: src/purging_rmw.c:505 -#, c-format -msgid "%s freed" -msgid_plural "%s freed" -msgstr[0] "%s vrij gemaakt" -msgstr[1] "%s vrij gemaakt" - #. TRANSLATORS: "created" refers to a file #: src/purging_rmw.c:566 #, c-format msgid "Created %s\n" msgstr "Aangemaakt %s\n" -#: src/purging_rmw.c:572 src/utils_rmw.c:86 +#: src/purging_rmw.c:572 #, c-format msgid "while creating %s\n" msgstr "bij het maken van %s\n" @@ -620,22 +623,22 @@ msgstr "bij het maken van %s\n" msgid "Duplicate filename at destination - appending time string...\n" msgstr "Dubbele bestandsnaam op doel - voeg tijdstempel toe\n" -#: src/restore_rmw.c:161 +#: src/restore_rmw.c:175 #, c-format msgid "while removing .trashinfo file: '%s'\n" msgstr "bij het verwijderen van .trashinfo bestand: '%s'\n" -#: src/restore_rmw.c:220 +#: src/restore_rmw.c:234 #, c-format msgid "Reading %s...\n" msgstr "Lezen %s...\n" -#: src/restore_rmw.c:266 +#: src/restore_rmw.c:281 #, c-format msgid "Your terminal only has %d lines. A minimum of %d lines is required.\n" msgstr "" -#: src/restore_rmw.c:288 +#: src/restore_rmw.c:303 #, c-format msgid "== contains %d file ==" msgid_plural "== contains %d files ==" @@ -644,11 +647,11 @@ msgstr[1] "== bevat %d bestanden ==" #. TRANSLATORS: I believe the words between the < and > can be translated #. -#: src/restore_rmw.c:292 +#: src/restore_rmw.c:307 msgid " - switch waste folders" msgstr " - wissel afval mappen" -#: src/restore_rmw.c:293 +#: src/restore_rmw.c:308 msgid "" " - select or unselect an item. / - restore selected items" msgstr "" @@ -658,153 +661,65 @@ msgstr "" #. TRANSLATORS: the 'q' can not be translated. rmw can only accept a 'q' #. * for input in this case. #. -#: src/restore_rmw.c:299 +#: src/restore_rmw.c:314 msgid "'q' - quit" msgstr "'q' - afsluiten" -#: src/restore_rmw.c:401 +#: src/restore_rmw.c:416 #, c-format msgid "failed to remove %s\n" msgstr "kon %s niet verwijderen\n" -#: src/strings_rmw.c:117 -#, c-format -msgid "" -" <--> Displaying part of the string that caused the error <-->\n" -"\n" -msgstr "" -" <--> Deel van de tekenreeks waarin de fout op trad <-->\n" -"\n" - -#: src/strings_rmw.c:279 +#: src/strings_rmw.c:220 #, c-format msgid "realpath() returned an error.\n" msgstr "realpath() gaf een fout terug.\n" -#: src/utils_rmw.c:81 -#, c-format -msgid "Created directory %s\n" -msgstr "Map %s aangemaakt\n" - -#: src/utils_rmw.c:160 +#: src/utils_rmw.c:194 msgid "Continue? (y/n): " msgstr "Doorgaan? (y/n): " -#: src/utils_rmw.c:236 src/utils_rmw.c:247 src/utils_rmw.c:299 -#: src/utils_rmw.c:314 +#: src/utils_rmw.c:270 src/utils_rmw.c:281 src/utils_rmw.c:328 +#: src/utils_rmw.c:343 #, c-format msgid "rmw: %s(): buffer too small (got %d, needed a minimum of %d)\n" msgstr "" "rmw: %s(): buffer te klein (wou %d hebben, had een minimum nodig van %d)\n" -#~ msgid "search complete\n" -#~ msgstr "zoeken voltooid\n" - -#, fuzzy -#~| msgid " :Error: number %d trying to create a .trashinfo file\n" -#~ msgid "number %d trying to create a .trashinfo file\n" -#~ msgstr " :Fout: nummer %d bij maken van een .trashinfo bestand\n" - -#~ msgid "invalid option in config\n" -#~ msgstr "onjuiste optie in configuratie\n" - -#, fuzzy -#~| msgid " :Error: buffer overrun (segmentation fault) prevented.\n" -#~ msgid "buffer overrun (segmentation fault) prevented.\n" -#~ msgstr " :Error: buffer overrun (segmentatie fout) voorkomen.\n" - -#~ msgid "Skipped: %s is in a protected directory\n" -#~ msgstr "Overgeslagen: %s is in een beveiligde map\n" - -#~ msgid "Searching using only the basename...\n" -#~ msgstr "Zoeken enkel op de basis naam\n" - -#~ msgid "" -#~ "If you think this may be a bug, please report it to the rmw developers.\n" -#~ msgstr "" -#~ "Als je denkt dat dit een fout is, rapporteer dit aan de rmw " -#~ "ontwikkelaars.\n" - -#~ msgid "-r / --recurse: not implemented\n" -#~ msgstr "-r / --recurse: nog niet beschikbaar\n" - -#~ msgid " :warning: Maximum number of waste folders reached: %d\n" -#~ msgstr " :waarschuwing: Het maximum aantal afval mappen is bereikt: %d\n" - -#~ msgid " :warning: Maximum number of protected folders reached: %d\n" -#~ msgstr "" -#~ " :waarschuwing: Het maximaal aantal beschermde mappen is bereikt: %d\n" - #~ msgid "" -#~ " :Error: unable to create config and data directory\n" -#~ "Please check your configuration file and permissions\n" #~ "\n" -#~ "If you need further help, or to report a possible bug,\n" -#~ "visit the rmw web site at\n" -#~ "\n" -#~ " https://github.com/andy5995/rmw/wiki\n" -#~ "\n" -#~ "Unable to continue. Exiting...\n" +#~ "# If attempting to rmw files under this directory, they will not be " +#~ "processed\n" +#~ "# unless -B --bypass is given as an argument.\n" +#~ "#\n" +#~ "# PROTECT = /usr/local/bin\n" +#~ "# PROTECT = $HOME/src\n" #~ msgstr "" -#~ " :Fout: kan configuratie en data map niet aanmaken\n" -#~ "Controleer je configuratie bestand en bestandspermissies\n" -#~ "\n" -#~ "Indien je meer hulp nodig hebt of je een mogelijke bug wilt\n" -#~ "rapporteren, bezoek de website van rmw op\n" -#~ "\n" -#~ " https://github.com/andy5995/rmw/wiki\n" #~ "\n" -#~ "Kan niet doorgaan. Afsluiten\n" - -#~ msgid " :Error: invalid purge_after value in configuration\n" -#~ msgstr " :Fout: onjuiste waarde voor purge_after in configuratie\n" - -#~ msgid " :Error: Restore (rename) failed: %s\n" -#~ msgstr ":Fout: Terugzetten (rename) mislukt: %s\n" +#~ "# Indien je probeert met rmw bestanden te verwijderen in deze map zullen " +#~ "ze niet\n" +#~ "# mee worden genomen tenzij -B --bypass is gegeven als argument.\n" +#~ "#\n" +#~ "# PROTECT = /usr/local/bin\n" +#~ "# PROTECT = $HOME/src\n" #~ msgid "" -#~ " :Error: Can not open configuration file\n" -#~ "%s (or)\n" -#~ "%s%s\n" #~ "\n" -#~ "A default configuration file can be found at\n" -#~ "https://github.com/andy5995/rmw/tree/master\n" -#~ "Terminating...\n" -#~ msgstr "" -#~ ":Fout: Kan het configuratiebestand\n" -#~ "%s (of)\n" -#~ "%s%s\n" -#~ "\n" -#~ "Een standaard configuratie bestand kan worden gevonden op\n" -#~ "https://github.com/andy5995/rmw/tree/master\n" -#~ "Afsluiten...\n" - -#~ msgid " :Error number %d trying to move %s :\n" -#~ msgstr " :Fout nummer %d bij verplaatsen van %s:\n" - -#, fuzzy -#~| msgid "" -#~| " \n" -#~| "\n" -#~| " \t===] Restoring [===\n" -#~| "\n" -#~| " -z, --restore \n" -#~| " -s, --select select files from list to restore\n" -#~| " -u, --undo-last undo last ReMove\n" -#~ msgid "" -#~ " -z, --restore (e.g. ~/.local/share/Waste/" -#~ "files/foo*)\n" -#~ " -s, --select select files from list to restore\n" -#~ " -u, --undo-last undo last ReMove\n" -#~ " -m, --most-recent-list list most recently rmw'ed files\n" +#~ "# purge will not run unless `--force` is used at the command line. " +#~ "Uncomment\n" +#~ "# the line below if you would like purge to check daily for files that\n" +#~ "# that exceed the days specified in purge_after\n" +#~ "#\n" +#~ "#force_not_required\n" #~ msgstr "" -#~ " \n" -#~ "\n" -#~ " \t===] Terugzetten [===\n" #~ "\n" -#~ " -z, --restore \n" -#~ " -s, --select selecteer bestand(en) uit een lijst\n" -#~ " -u, --undo-last maak laatste verwijdering ongedaan\n" +#~ "# purge zal niet starten tenzij `--force` wordt gebruikt bij het " +#~ "aanroepen. Comment\n" +#~ "# de regel hieronder uit als je dagelijks wilt controleren op bestanden " +#~ "die het aantal\n" +#~ "# dagen overschrijden opgegeven bij purge_after\n" +#~ "#\n" +#~ "#force_not_required\n" #, fuzzy #~| msgid "" @@ -861,37 +776,125 @@ msgstr "" #~ " -w, --warranty toon garantie\n" #~ " -V, --version toon versie en licentie informatie\n" +#, fuzzy +#~| msgid "" +#~| " \n" +#~| "\n" +#~| " \t===] Restoring [===\n" +#~| "\n" +#~| " -z, --restore \n" +#~| " -s, --select select files from list to restore\n" +#~| " -u, --undo-last undo last ReMove\n" #~ msgid "" +#~ " -z, --restore (e.g. ~/.local/share/Waste/" +#~ "files/foo*)\n" +#~ " -s, --select select files from list to restore\n" +#~ " -u, --undo-last undo last ReMove\n" +#~ " -m, --most-recent-list list most recently rmw'ed files\n" +#~ msgstr "" +#~ " \n" #~ "\n" -#~ "# purge will not run unless `--force` is used at the command line. " -#~ "Uncomment\n" -#~ "# the line below if you would like purge to check daily for files that\n" -#~ "# that exceed the days specified in purge_after\n" -#~ "#\n" -#~ "#force_not_required\n" +#~ " \t===] Terugzetten [===\n" +#~ "\n" +#~ " -z, --restore \n" +#~ " -s, --select selecteer bestand(en) uit een lijst\n" +#~ " -u, --undo-last maak laatste verwijdering ongedaan\n" + +#~ msgid " :Error number %d trying to move %s :\n" +#~ msgstr " :Fout nummer %d bij verplaatsen van %s:\n" + +#~ msgid "" +#~ " :Error: Can not open configuration file\n" +#~ "%s (or)\n" +#~ "%s%s\n" +#~ "\n" +#~ "A default configuration file can be found at\n" +#~ "https://github.com/andy5995/rmw/tree/master\n" +#~ "Terminating...\n" #~ msgstr "" +#~ ":Fout: Kan het configuratiebestand\n" +#~ "%s (of)\n" +#~ "%s%s\n" #~ "\n" -#~ "# purge zal niet starten tenzij `--force` wordt gebruikt bij het " -#~ "aanroepen. Comment\n" -#~ "# de regel hieronder uit als je dagelijks wilt controleren op bestanden " -#~ "die het aantal\n" -#~ "# dagen overschrijden opgegeven bij purge_after\n" -#~ "#\n" -#~ "#force_not_required\n" +#~ "Een standaard configuratie bestand kan worden gevonden op\n" +#~ "https://github.com/andy5995/rmw/tree/master\n" +#~ "Afsluiten...\n" + +#~ msgid " :Error: Restore (rename) failed: %s\n" +#~ msgstr ":Fout: Terugzetten (rename) mislukt: %s\n" + +#~ msgid " :Error: invalid purge_after value in configuration\n" +#~ msgstr " :Fout: onjuiste waarde voor purge_after in configuratie\n" #~ msgid "" +#~ " :Error: unable to create config and data directory\n" +#~ "Please check your configuration file and permissions\n" #~ "\n" -#~ "# If attempting to rmw files under this directory, they will not be " -#~ "processed\n" -#~ "# unless -B --bypass is given as an argument.\n" -#~ "#\n" -#~ "# PROTECT = /usr/local/bin\n" -#~ "# PROTECT = $HOME/src\n" +#~ "If you need further help, or to report a possible bug,\n" +#~ "visit the rmw web site at\n" +#~ "\n" +#~ " https://github.com/andy5995/rmw/wiki\n" +#~ "\n" +#~ "Unable to continue. Exiting...\n" #~ msgstr "" +#~ " :Fout: kan configuratie en data map niet aanmaken\n" +#~ "Controleer je configuratie bestand en bestandspermissies\n" #~ "\n" -#~ "# Indien je probeert met rmw bestanden te verwijderen in deze map zullen " -#~ "ze niet\n" -#~ "# mee worden genomen tenzij -B --bypass is gegeven als argument.\n" -#~ "#\n" -#~ "# PROTECT = /usr/local/bin\n" -#~ "# PROTECT = $HOME/src\n" +#~ "Indien je meer hulp nodig hebt of je een mogelijke bug wilt\n" +#~ "rapporteren, bezoek de website van rmw op\n" +#~ "\n" +#~ " https://github.com/andy5995/rmw/wiki\n" +#~ "\n" +#~ "Kan niet doorgaan. Afsluiten\n" + +#~ msgid " :warning: Maximum number of protected folders reached: %d\n" +#~ msgstr "" +#~ " :waarschuwing: Het maximaal aantal beschermde mappen is bereikt: %d\n" + +#~ msgid " :warning: Maximum number of waste folders reached: %d\n" +#~ msgstr " :waarschuwing: Het maximum aantal afval mappen is bereikt: %d\n" + +#, c-format +#~ msgid "" +#~ " <--> Displaying part of the string that caused the error <-->\n" +#~ "\n" +#~ msgstr "" +#~ " <--> Deel van de tekenreeks waarin de fout op trad <-->\n" +#~ "\n" + +#, c-format +#~ msgid "%s freed" +#~ msgid_plural "%s freed" +#~ msgstr[0] "%s vrij gemaakt" +#~ msgstr[1] "%s vrij gemaakt" + +#~ msgid "-r / --recurse: not implemented\n" +#~ msgstr "-r / --recurse: nog niet beschikbaar\n" + +#~ msgid "" +#~ "If you think this may be a bug, please report it to the rmw developers.\n" +#~ msgstr "" +#~ "Als je denkt dat dit een fout is, rapporteer dit aan de rmw " +#~ "ontwikkelaars.\n" + +#~ msgid "Searching using only the basename...\n" +#~ msgstr "Zoeken enkel op de basis naam\n" + +#~ msgid "Skipped: %s is in a protected directory\n" +#~ msgstr "Overgeslagen: %s is in een beveiligde map\n" + +#, fuzzy +#~| msgid " :Error: buffer overrun (segmentation fault) prevented.\n" +#~ msgid "buffer overrun (segmentation fault) prevented.\n" +#~ msgstr " :Error: buffer overrun (segmentatie fout) voorkomen.\n" + +#~ msgid "invalid option in config\n" +#~ msgstr "onjuiste optie in configuratie\n" + +#, fuzzy +#~| msgid " :Error: number %d trying to create a .trashinfo file\n" +#~ msgid "number %d trying to create a .trashinfo file\n" +#~ msgstr " :Fout: nummer %d bij maken van een .trashinfo bestand\n" + +#~ msgid "search complete\n" +#~ msgstr "zoeken voltooid\n" diff --git a/po/rmw.pot b/po/rmw.pot index d262978d..8f1312cc 100644 --- a/po/rmw.pot +++ b/po/rmw.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rmw 0.7.08-dev\n" +"Project-Id-Version: rmw 0.7.09\n" "Report-Msgid-Bugs-To: andy400-dev@yahoo.com\n" -"POT-Creation-Date: 2021-04-28 14:03-0500\n" +"POT-Creation-Date: 2021-05-05 23:12+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -78,7 +78,7 @@ msgid "" "#\n" msgstr "" -#: src/config_rmw.c:283 +#: src/config_rmw.c:282 #, c-format msgid "Invalid WASTE option: '%s'\n" msgstr "" @@ -98,12 +98,12 @@ msgstr "" msgid "Unable to read or write a configuration file.\n" msgstr "" -#: src/config_rmw.c:568 +#: src/config_rmw.c:567 #, c-format msgid "Unknown or invalid option: '%s'\n" msgstr "" -#: src/config_rmw.c:581 +#: src/config_rmw.c:580 #, c-format msgid "" "no usable WASTE folder could be found\n" @@ -112,17 +112,17 @@ msgid "" "visit the rmw web site at\n" msgstr "" -#: src/config_rmw.c:632 +#: src/config_rmw.c:638 #, c-format msgid "removable, " msgstr "" #. TRANSLATORS: context - "a mounted device or filesystem is presently attached or mounted" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "attached" msgstr "" -#: src/config_rmw.c:634 +#: src/config_rmw.c:640 msgid "detached" msgstr "" @@ -130,7 +130,7 @@ msgstr "" msgid "Skipping --undo-last because --most-recent-list was requested" msgstr "" -#: src/main.c:162 +#: src/main.c:158 msgid "while getting the path to your home directory\n" msgstr "" @@ -164,7 +164,7 @@ msgid "The Easter Bunny says, \"Hello, world.\"" msgstr "" #. TRANSLATORS: "%s" refers to a file or directory -#: src/main.c:385 src/restore_rmw.c:179 +#: src/main.c:385 src/restore_rmw.c:193 #, c-format msgid "File not found: '%s'\n" msgstr "" @@ -174,12 +174,12 @@ msgstr "" msgid "%s resides within a waste folder and has been ignored\n" msgstr "" -#: src/main.c:481 +#: src/main.c:480 #, c-format msgid "No suitable filesystem found for \"%s\"\n" msgstr "" -#: src/main.c:491 +#: src/main.c:490 #, c-format msgid "%d file was removed to the waste folder" msgid_plural "%d files were removed to the waste folder" @@ -258,11 +258,21 @@ msgid "" msgstr "" #. TRANSLATORS: "removing" refers to a file or folder -#: src/messages_rmw.c:233 +#: src/messages_rmw.c:234 #, c-format msgid "while removing %s\n" msgstr "" +#: src/messages_rmw.c:244 +#, c-format +msgid "while creating %s (%s)\n" +msgstr "" + +#: src/messages_rmw.c:250 +#, c-format +msgid "Created directory %s\n" +msgstr "" + #: src/parse_cli_options.c:44 #, c-format msgid "" @@ -458,74 +468,66 @@ msgstr "" msgid "Purging files based on number of days in the waste folders (%u) ...\n" msgstr "" -#: src/purging_rmw.c:400 +#: src/purging_rmw.c:403 #, c-format msgid "Directory not purged - still contains files\n" msgstr "" -#: src/purging_rmw.c:402 +#: src/purging_rmw.c:405 #, c-format msgid "(check owner/write permissions)\n" msgstr "" #. TRANSLATORS: "depth" refers to the recursion depth in a #. * directory -#: src/purging_rmw.c:410 +#: src/purging_rmw.c:413 #, c-format msgid "Maximum depth of %u reached, skipping\n" msgstr "" -#: src/purging_rmw.c:473 +#: src/purging_rmw.c:474 #, c-format msgid "'%s' will be purged in %.2lf days\n" msgstr "" -#: src/purging_rmw.c:486 +#: src/purging_rmw.c:487 #, c-format msgid "%d directories skipped (RMDIR_MAX_DEPTH reached)\n" msgstr "" -#: src/purging_rmw.c:490 +#: src/purging_rmw.c:491 #, c-format msgid "%d directories skipped (contains read-only files)\n" msgstr "" -#: src/purging_rmw.c:493 +#: src/purging_rmw.c:494 #, c-format msgid "%d file purged" msgid_plural "%d files purged" msgstr[0] "" msgstr[1] "" -#: src/purging_rmw.c:497 +#: src/purging_rmw.c:498 #, c-format msgid "(%d file deleted)" msgid_plural "(%d files deleted)" msgstr[0] "" msgstr[1] "" -#: src/purging_rmw.c:501 +#: src/purging_rmw.c:502 #, c-format msgid "(%d directory deleted)" msgid_plural "(%d directories deleted)" msgstr[0] "" msgstr[1] "" -#. TRANSLATORS: context: "Number of bytes freed" -#: src/purging_rmw.c:505 -#, c-format -msgid "%s freed" -msgid_plural "%s freed" -msgstr[0] "" -msgstr[1] "" - #. TRANSLATORS: "created" refers to a file #: src/purging_rmw.c:566 #, c-format msgid "Created %s\n" msgstr "" -#: src/purging_rmw.c:572 src/utils_rmw.c:86 +#: src/purging_rmw.c:572 #, c-format msgid "while creating %s\n" msgstr "" @@ -535,22 +537,22 @@ msgstr "" msgid "Duplicate filename at destination - appending time string...\n" msgstr "" -#: src/restore_rmw.c:161 +#: src/restore_rmw.c:175 #, c-format msgid "while removing .trashinfo file: '%s'\n" msgstr "" -#: src/restore_rmw.c:220 +#: src/restore_rmw.c:234 #, c-format msgid "Reading %s...\n" msgstr "" -#: src/restore_rmw.c:266 +#: src/restore_rmw.c:281 #, c-format msgid "Your terminal only has %d lines. A minimum of %d lines is required.\n" msgstr "" -#: src/restore_rmw.c:288 +#: src/restore_rmw.c:303 #, c-format msgid "== contains %d file ==" msgid_plural "== contains %d files ==" @@ -559,11 +561,11 @@ msgstr[1] "" #. TRANSLATORS: I believe the words between the < and > can be translated #. -#: src/restore_rmw.c:292 +#: src/restore_rmw.c:307 msgid " - switch waste folders" msgstr "" -#: src/restore_rmw.c:293 +#: src/restore_rmw.c:308 msgid "" " - select or unselect an item. / - restore selected items" msgstr "" @@ -571,38 +573,26 @@ msgstr "" #. TRANSLATORS: the 'q' can not be translated. rmw can only accept a 'q' #. * for input in this case. #. -#: src/restore_rmw.c:299 +#: src/restore_rmw.c:314 msgid "'q' - quit" msgstr "" -#: src/restore_rmw.c:401 +#: src/restore_rmw.c:416 #, c-format msgid "failed to remove %s\n" msgstr "" -#: src/strings_rmw.c:117 -#, c-format -msgid "" -" <--> Displaying part of the string that caused the error <-->\n" -"\n" -msgstr "" - -#: src/strings_rmw.c:279 +#: src/strings_rmw.c:220 #, c-format msgid "realpath() returned an error.\n" msgstr "" -#: src/utils_rmw.c:81 -#, c-format -msgid "Created directory %s\n" -msgstr "" - -#: src/utils_rmw.c:160 +#: src/utils_rmw.c:194 msgid "Continue? (y/n): " msgstr "" -#: src/utils_rmw.c:236 src/utils_rmw.c:247 src/utils_rmw.c:299 -#: src/utils_rmw.c:314 +#: src/utils_rmw.c:270 src/utils_rmw.c:281 src/utils_rmw.c:328 +#: src/utils_rmw.c:343 #, c-format msgid "rmw: %s(): buffer too small (got %d, needed a minimum of %d)\n" msgstr ""