Skip to content

Commit

Permalink
fix list output (closes #301)
Browse files Browse the repository at this point in the history
  • Loading branch information
andy5995 committed Apr 25, 2021
1 parent 3b871e4 commit 80714e2
Show file tree
Hide file tree
Showing 8 changed files with 339 additions and 322 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
=== rmw ChangeLog ===

2021-04-25

* bugfix: list output (rmw -lv) shows all removable devices as
attached even for those that are detached.

2021-04-23

* (for testing) Replace RMWTRASH(=fake-year) with RMW_FAKE_YEAR(=true)
Expand Down
98 changes: 49 additions & 49 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: rmw 0.4.05-dev\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2021-02-26 11:41-0600\n"
"POT-Creation-Date: 2021-04-25 14:05-0500\n"
"PO-Revision-Date: 2019-07-07 00:18+0200\n"
"Last-Translator: Eric Haberstroh <[email protected]>\n"
"Language-Team: German\n"
Expand Down Expand Up @@ -122,32 +122,32 @@ msgstr ""
"# '-f' verwenden wollen, kommentieren sie die folgende Zeile aus:\n"
"#\n"

#: src/config_rmw.c:264
#: src/config_rmw.c:283
#, c-format
msgid "Invalid WASTE option: '%s'\n"
msgstr "Unbekannte oder ungültige Option: '%s'\n"

#: src/config_rmw.c:371
#: src/config_rmw.c:419
#, c-format
msgid "config file: %s\n"
msgstr "Konfigurationsdatei. %s\n"

#: src/config_rmw.c:385
#: src/config_rmw.c:433
#, c-format
msgid "Creating default configuration file:"
msgstr "Erzeuge standard Konfigurationsdatei"

#: src/config_rmw.c:411
#: src/config_rmw.c:459
#, c-format
msgid "Unable to read or write a configuration file.\n"
msgstr "Die Konfigurationsdatei kann nicht gelesen oder geschrieben werden\n"

#: src/config_rmw.c:516
#: src/config_rmw.c:563
#, c-format
msgid "Unknown or invalid option: '%s'\n"
msgstr "Unbekannte oder ungültige Option: '%s'\n"

#: src/config_rmw.c:529
#: src/config_rmw.c:576
#, c-format
msgid ""
"no usable WASTE folder could be found\n"
Expand All @@ -160,26 +160,29 @@ msgstr ""
"Wenn du weitere Hilfe brauchst oder einen Fehler melden willst,\n"
"besuche die rmw-Webseite unter\n"

#: src/config_rmw.c:572
#: src/config_rmw.c:627
#, c-format
msgid "removable, "
msgstr "löschbar."

#. TRANSLATORS: context - "a mounted device or filesystem is presently attached or mounted"
#: src/config_rmw.c:574
#, c-format
#: src/config_rmw.c:629
msgid "attached"
msgstr "angeschlossen"

#: src/config_rmw.c:629
msgid "detached"
msgstr "entfernt"

#: src/main.c:107
msgid "Skipping --undo-last because --most-recent-list was requested"
msgstr ""

#: src/main.c:170
#: src/main.c:162
msgid "while getting the path to your home directory\n"
msgstr "beim Ermitteln des Pfades zu deinem Home-Verzeichnis.\n"

#: src/main.c:183
#: src/main.c:175
#, c-format
msgid ""
"unable to create config and data directory\n"
Expand All @@ -190,17 +193,17 @@ msgstr ""
"Bitte überprüfen sie ihre Konfigurationsdatei und ihre Berechtigungen.\n"
"\n"

#: src/main.c:188
#: src/main.c:180
#, c-format
msgid "Unable to continue. Exiting...\n"
msgstr "Es kann nicht weitergemacht werden. Abbruch...\n"

#: src/main.c:214
#: src/main.c:206
#, c-format
msgid "purge has been skipped: use -f or --force\n"
msgstr "Papierkorbleerung wurde übersprungen: verwende -f oder --force\n"

#: src/main.c:274
#: src/main.c:267
#, c-format
msgid ""
"Insufficient command line arguments given;\n"
Expand All @@ -209,27 +212,27 @@ msgstr ""
"Fehlende Kommandozeilenoptionen \n"
"Gib '%s -h' ein, um mehr Informationen zu erhalten\n"

#: src/main.c:370
#: src/main.c:363
msgid "The Easter Bunny says, \"Hello, world.\""
msgstr ""

#. TRANSLATORS: "%s" refers to a file or directory
#: src/main.c:388 src/restore_rmw.c:198
#: src/main.c:381 src/restore_rmw.c:179
#, c-format
msgid "File not found: '%s'\n"
msgstr "Datei nicht gefunden: '%s'\n"

#: src/main.c:400
#: src/main.c:393
#, c-format
msgid "%s resides within a waste folder and has been ignored\n"
msgstr ""

#: src/main.c:482
#: src/main.c:477
#, c-format
msgid "No suitable filesystem found for \"%s\"\n"
msgstr " Kein passendes Dateisystem für \"%s\" gefunden\n"

#: src/main.c:492
#: src/main.c:487
#, c-format
msgid "%d file was removed to the waste folder"
msgid_plural "%d files were removed to the waste folder"
Expand Down Expand Up @@ -559,100 +562,100 @@ 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:409
#: src/purging_rmw.c:421
#, 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:411
#: src/purging_rmw.c:423
#, 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:419
#: src/purging_rmw.c:431
#, c-format
msgid "Maximum depth of %u reached, skipping\n"
msgstr " :Warnung: Maximale Tiefe von %u erreicht, überspringe ...\n"

#: src/purging_rmw.c:488
#: src/purging_rmw.c:500
#, c-format
msgid "'%s' will be purged in %.2lf days\n"
msgstr ""

#: src/purging_rmw.c:501
#: src/purging_rmw.c:513
#, c-format
msgid "%d directories skipped (RMDIR_MAX_DEPTH reached)\n"
msgstr "%d Verzeichnisse übersprungen (RMDIR_MAX_DEPTH erreicht)\n"

#: src/purging_rmw.c:505
#: src/purging_rmw.c:517
#, c-format
msgid "%d directories skipped (contains read-only files)\n"
msgstr "%d Verzeichnisse übersprungen (enthalten schreibgeschützte Dateien)\n"

#: src/purging_rmw.c:508
#: src/purging_rmw.c:520
#, 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:512
#: src/purging_rmw.c:524
#, 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:516
#: src/purging_rmw.c:528
#, 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:520
#: src/purging_rmw.c:532
#, 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:581
#: src/purging_rmw.c:593
#, c-format
msgid "Created %s\n"
msgstr "%s angelegt\n"

#: src/purging_rmw.c:587 src/utils_rmw.c:86
#: src/purging_rmw.c:599 src/utils_rmw.c:86
#, c-format
msgid "while creating %s\n"
msgstr "beim Anlegen von %s\n"

#: src/restore_rmw.c:135
#: src/restore_rmw.c:132
#, c-format
msgid "Duplicate filename at destination - appending time string...\n"
msgstr "Doppelter Dateiname im Zielverzeichnis, füge Zeitstempel an...\n"

#: src/restore_rmw.c:164
#: src/restore_rmw.c:161
#, c-format
msgid "while removing .trashinfo file: '%s'\n"
msgstr "beim Löschen der .trashinfo-Datei '%s' \n"

#: src/restore_rmw.c:239
#: src/restore_rmw.c:220
#, c-format
msgid "Reading %s...\n"
msgstr "Lese %s...\n"

#: src/restore_rmw.c:285
#: src/restore_rmw.c:266
#, c-format
msgid "Your terminal only has %d lines. A minimum of %d lines is required.\n"
msgstr ""

#: src/restore_rmw.c:307
#: src/restore_rmw.c:288
#, c-format
msgid "== contains %d file =="
msgid_plural "== contains %d files =="
Expand All @@ -661,11 +664,11 @@ msgstr[1] "== enthält %d Dateien =="

#. TRANSLATORS: I believe the words between the < and > can be translated
#.
#: src/restore_rmw.c:311
#: src/restore_rmw.c:292
msgid "<CURSOR-RIGHT / CURSOR-LEFT> - switch waste folders"
msgstr "<PFEIL-RECHTS / PFEIL-LINKS> - zwischen Papierkörben wechseln"

#: src/restore_rmw.c:312
#: src/restore_rmw.c:293
msgid ""
"<SPACE> - select or unselect an item. / <ENTER> - restore selected items"
msgstr ""
Expand All @@ -675,16 +678,16 @@ msgstr ""
#. TRANSLATORS: the 'q' can not be translated. rmw can only accept a 'q'
#. * for input in this case.
#.
#: src/restore_rmw.c:318
#: src/restore_rmw.c:299
msgid "'q' - quit"
msgstr "'q' - beenden"

#: src/restore_rmw.c:416
#: src/restore_rmw.c:401
#, c-format
msgid "failed to remove %s\n"
msgstr "Konnte %s nicht entfernen\n"

#: src/strings_rmw.c:122
#: src/strings_rmw.c:117
#, c-format
msgid ""
" <--> Displaying part of the string that caused the error <-->\n"
Expand All @@ -693,7 +696,7 @@ msgstr ""
" <--> Zeige einen Teil der Zeichenkette, die den Fehler verursacht hat <-->\n"
"\n"

#: src/strings_rmw.c:295
#: src/strings_rmw.c:279
#, c-format
msgid "realpath() returned an error.\n"
msgstr "realpath() hat einen Fehler zurückgeliefert.\n"
Expand All @@ -703,12 +706,12 @@ msgstr "realpath() hat einen Fehler zurückgeliefert.\n"
msgid "Created directory %s\n"
msgstr "Verzeichnis %s angelegt\n"

#: src/utils_rmw.c:155
#: src/utils_rmw.c:157
msgid "Continue? (y/n): "
msgstr "Weitermachen (y/n):"

#: src/utils_rmw.c:249 src/utils_rmw.c:260 src/utils_rmw.c:312
#: src/utils_rmw.c:327
#: src/utils_rmw.c:251 src/utils_rmw.c:262 src/utils_rmw.c:314
#: src/utils_rmw.c:329
#, 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"
Expand Down Expand Up @@ -967,9 +970,6 @@ msgstr "rmw: %s(): Puffer zu klein (habe %d erhalten, brauche mindestens %d)\n"
#~ msgstr ""
#~ " :Fehler: Pufferüberlauf (Speicherzugriffsverletzung) verhindert.\n"

#~ msgid "detached"
#~ msgstr "entfernt"

#~ msgid "invalid option in config\n"
#~ msgstr "Unzulässige Option in der Konfiguration\n"

Expand Down
Loading

0 comments on commit 80714e2

Please sign in to comment.