Skip to content

Commit

Permalink
Fix typos
Browse files Browse the repository at this point in the history
  • Loading branch information
deining authored and jaromil committed Dec 30, 2024
1 parent e378da4 commit b6f1288
Show file tree
Hide file tree
Showing 23 changed files with 83 additions and 83 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ install:
install -Dm755 ${PROG} ${DESTDIR}${PREFIX}/bin/${PROG}
install -Dm644 doc/${PROG}.1 ${DESTDIR}${MANDIR}/man1/${PROG}.1
@echo
@echo "Tomb is installed succesfully. To install language translations, make sure"
@echo "Tomb is installed successfully. To install language translations, make sure"
@echo "gettext is also installed, then 'cd extras/translations' and 'make install' there."
@echo
@echo "Look around the extras/ directory, it contains other interesting modules."
Expand Down
10 changes: 5 additions & 5 deletions extras/android/tomb
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,7 @@ usage() {
_print " -q run quietly without printing informations"
_print " -D print debugging information at runtime"
_print "\000"
_print "For more informations on Tomb read the manual: man tomb"
_print "For more information on Tomb read the manual: man tomb"
_print "Please report bugs on <http://github.com/dyne/tomb/issues>."
}
Expand Down Expand Up @@ -1087,7 +1087,7 @@ gen_key() {
header=""
[[ $KDF == 1 ]] && {
{ option_is_set --kdf } && {
# KDF is a new key strenghtening technique against brute forcing
# KDF is a new key strengthening technique against brute forcing
# see: https://github.com/dyne/Tomb/issues/82
itertime="`option_value --kdf`"
# removing support of floating points because they can't be type checked well
Expand Down Expand Up @@ -1194,7 +1194,7 @@ bury_key() {
_warning "Encoding error: steghide reports problems."
res=1
else
_success "Tomb key encoded succesfully into image ::1 image file::" $imagefile
_success "Tomb key encoded successfully into image ::1 image file::" $imagefile
res=0
fi
Expand Down Expand Up @@ -1270,7 +1270,7 @@ exhume_key() {
# Report to the user
[[ "$destkey" = "-" ]] && destkey="stdout"
[[ $r == 0 ]] && {
_success "Key succesfully exhumed to ::1 key::." $destkey
_success "Key successfully exhumed to ::1 key::." $destkey
} || {
_warning "Nothing found in ::1 image file::" $imagefile
}
Expand Down Expand Up @@ -2607,7 +2607,7 @@ main() {
# DEPRECATION notice (leave here as 'create' is still present in old docs)
create)
_warning "The create command is deprecated, please use dig, forge and lock instead."
_warning "For more informations see Tomb's manual page (man tomb)."
_warning "For more information see Tomb's manual page (man tomb)."
_failure "Operation aborted."
;;
Expand Down
2 changes: 1 addition & 1 deletion extras/dismissed/debian/watch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 3

# Package mantained by upstream developer
# Package maintained by upstream developer
# wishing there would be a way to watch git repos?
# however our ftp is on ftp://ftp.dyne.org/tomb/releases
6 changes: 3 additions & 3 deletions extras/dismissed/tomb-open
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ if [ $1 ]; then # is it a file?
unset usbkey_mount
fi

if [ $success = 0 ]; then # mount was succesfull (with password and all)
if [ $success = 0 ]; then # mount was successful (with password and all)
launch_status ${tombname}
exit 0
else
Expand Down Expand Up @@ -266,7 +266,7 @@ cat <<EOF
it makes use of strong encryption and helps you keep the keys on a
separate USB storage for safer transports.
Inside a Tomb you can store private informations without fear that
Inside a Tomb you can store private information without fear that
other people possessing it will discover your secrets, unless they
have your USB key and your password.
Expand Down Expand Up @@ -351,7 +351,7 @@ if [ $? = 0 ]; then
sudo cp -v ${tombfile}.key ${usbkey_mount}/.tomb/
sudo chmod -R go-rwx ${usbkey_mount}/.tomb

yes "${tombname}.key succesfully saved on your USB"
yes "${tombname}.key successfully saved on your USB"
act "now we'll proceed opening your brand new tomb"

"${TOMBEXEC}" open -k ${tombfile}.key ${tombfile}
Expand Down
2 changes: 1 addition & 1 deletion extras/dismissed/undertaker
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function undertaker_scheme() {
obexftp -b $obexdev -g $obexpath
if [[ $? != 0 ]]; then
rmdir ${keytmp}
die "a problem occurred retreiving the key via bluetooth."
die "a problem occurred retrieving the key via bluetooth."
fi
# print out the key on stdout
if option_is_set --path; then
Expand Down
10 changes: 5 additions & 5 deletions extras/docker/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,15 @@ Once you understand the concept of docker bind mounts you will be able to run to

First launch an interactive bash prompt in a temporary instance of the container, and bind-mount a working directory from the host machine where we can output the new tomb volume.

This will mount the `/tmp/tomb-gen` directy on the host to the location of `/tomb-gen` inside the docker container instance. **Note**: The `/tmp/tomb-gen` directory must already exist on the host.
This will mount the `/tmp/tomb-gen` directory on the host to the location of `/tomb-gen` inside the docker container instance. **Note**: The `/tmp/tomb-gen` directory must already exist on the host.

```bash
docker run -it --rm --privileged \
--mount type=bind,source=/tmp/tomb-gen,target=/tomb-gen \
tomb /bin/bash
```

Now from the interative prompt inside the docker continer instance creating a new tomb volume is textbook. **Note**: If you get an error about swap partitions during the `forge` command, this is a host issue and not a container issue. You need to disable swapping on the host if you want to fix it, or use `-f` to forge ahead anyways.
Now from the interactive prompt inside the docker container instance creating a new tomb volume is textbook. **Note**: If you get an error about swap partitions during the `forge` command, this is a host issue and not a container issue. You need to disable swapping on the host if you want to fix it, or use `-f` to forge ahead anyways.

```bash
cd /tomb-gen
Expand All @@ -84,7 +84,7 @@ docker run -it --rm --privileged \
tomb /bin/bash
```

Now from the interative prompt inside the docker continer instance we can open the tomb volume as usual, referencing the tomb volume, key, and mount destinations bind-mounted to the host:
Now from the interactive prompt inside the docker container instance we can open the tomb volume as usual, referencing the tomb volume, key, and mount destinations bind-mounted to the host:

```bash
tomb open /tomb-gen/secret.tomb /tomb-mount -k /tomb-gen/secret.tomb.key
Expand All @@ -98,9 +98,9 @@ tomb close

### Unpack and Repack a Tomb Volume

This workflow was created as a workaround for the MacOS lack of support for bind propagation which prevents us from directly mounting a tomb volume back to the host OS. The workaround is to use an additional bash script layer to copy and synchronize the tomb volume contents between a bind mounted host directory and the mounted tomb volume accesible only from inside the docker container.
This workflow was created as a workaround for the MacOS lack of support for bind propagation which prevents us from directly mounting a tomb volume back to the host OS. The workaround is to use an additional bash script layer to copy and synchronize the tomb volume contents between a bind mounted host directory and the mounted tomb volume accessible only from inside the docker container.

The `tomb.sh` script is desinged to run from the host and requires the following ENV VARS to be available to it:
The `tomb.sh` script is designed to run from the host and requires the following ENV VARS to be available to it:

* `TOMB_DOCKER_IMAGE`: The name of the docker image on the host. In the examples we named it `tomb`.
* `TOMB_VOLUME`: The full path of the tomb volume file on the host. In the example it is `/tmp/tomb-gen/secret.tomb`.
Expand Down
2 changes: 1 addition & 1 deletion extras/gtomb/gtomb
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ function _setkey {
tombname=`_fsel "Choose a tomb to change its keyfile"`
[[ $? = 0 ]] || exec _main

keyfile=`_fsel "Chosse your tomb's old keyfile"`
keyfile=`_fsel "Choose your tomb's old keyfile"`
[[ $? = 0 ]] || exec _main

newkey=`_fsel "Choose your tomb's new keyfile"`
Expand Down
2 changes: 1 addition & 1 deletion extras/portable/test/bats/lib/bats-core/tracing.bash
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ bats_trim_filename() {
}

# normalize a windows path from e.g. C:/directory to /c/directory
# The path must point to an existing/accessable directory, not a file!
# The path must point to an existing/accessible directory, not a file!
bats_normalize_windows_dir_path() { # <output-var> <path>
local output_var="$1" path="$2"
if [[ "$output_var" != NORMALIZED_INPUT ]]; then
Expand Down
2 changes: 1 addition & 1 deletion extras/portable/test/bats_setup
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ freebsd_close() {
>&2 echo "mnt: $mnt"
lkl=`pgrep -f "lklfuse.*$md" | awk '{print $1}'`
>&3 echo "kill $lkl (lklfuse on $md)"
# trying to deail with lklfuse bug
# trying to deal with lklfuse bug
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239831
renice -20 $lkl
kill $lkl
Expand Down
2 changes: 1 addition & 1 deletion extras/portable/tomb
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ freebsd_close() {
_verbose "mnt: $mnt"
lkl=`pgrep -f "lklfuse.*$md" | awk '{print $1}'`
_verbose "kill $lkl (lklfuse on $md)"
# trying to deail with lklfuse bug
# trying to deal with lklfuse bug
# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=239831
renice -20 $lkl
kill $lkl
Expand Down
2 changes: 1 addition & 1 deletion extras/test/runtests
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ test-set-key() {
tt open -k /tmp/test.tomb.new.key --unsafe --tomb-pwd ${dummypass} /tmp/test.tomb

[[ $? = 0 ]] && {
notice "Setkey succesfully swapped tomb key"
notice "Setkey successfully swapped tomb key"
results+=(setkey SUCCESS)
notice "Dump of clear key contents to examine them:"
print ${dummypass} \
Expand Down
6 changes: 3 additions & 3 deletions extras/test/sharness
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export SHARNESS_VERSION
: ${SHARNESS_TEST_EXTENSION:=t}
export SHARNESS_TEST_EXTENSION

# Reset TERM to original terminal if found, otherwise save orignal TERM
# Reset TERM to original terminal if found, otherwise save original TERM
[ "x" = "x$SHARNESS_ORIG_TERM" ] &&
SHARNESS_ORIG_TERM="$TERM" ||
TERM="$SHARNESS_ORIG_TERM"
Expand Down Expand Up @@ -177,7 +177,7 @@ trap 'die' EXIT
# implicitly by specifying the prerequisite name in calls to test_expect_success
# or test_expect_failure.
#
# $1 - Name of prerequiste (a simple word, in all capital letters by convention)
# $1 - Name of prerequisite (a simple word, in all capital letters by convention)
#
# Examples
#
Expand Down Expand Up @@ -570,7 +570,7 @@ test_expect_code() {

# Public: Compare two files to see if expected output matches actual output.
#
# The TEST_CMP variable defines the command used for the comparision; it
# The TEST_CMP variable defines the command used for the comparison; it
# defaults to "diff -u". Only when the test script was started with --verbose,
# will the command's output, the diff, be printed to the standard output.
#
Expand Down
10 changes: 5 additions & 5 deletions extras/translations/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ msgid "Encoding error: steghide reports problems."
msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."

#: tomb:Key operations:bury_key:1740
msgid "Tomb key encoded succesfully into image ::1 image file::"
msgid "Tomb key encoded successfully into image ::1 image file::"
msgstr "Grabschlüssel erfolgreich im Bild ::1 image file:: enkodiert"

#: tomb:Key operations:exhume_key:1752
Expand Down Expand Up @@ -691,7 +691,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
msgstr "Versuche Schlüssel aus Bild ::1 image file:: zu exhumieren"

#: tomb:Key operations:exhume_key:1819
msgid "Key succesfully exhumed to ::1 key::."
msgid "Key successfully exhumed to ::1 key::."
msgstr "Schlüssel erfolgreich exhumiert in ::1 key::."

#: tomb:Key operations:exhume_key:1821
Expand Down Expand Up @@ -720,7 +720,7 @@ msgstr "Fehler beim Verschlüsseln: steghide meldet Fehler."

#: tomb:Key operations:cloakify_key:1867
#, fuzzy
msgid "Tomb key encoded succesfully"
msgid "Tomb key encoded successfully"
msgstr "Grabschlüssel erfolgreich im Bild ::1 image file:: enkodiert"

#: tomb:Key operations:decloakify_key:1879
Expand Down Expand Up @@ -750,7 +750,7 @@ msgstr "gebe exhumierten Schlüssel auf der Standardausgabe aus"

#: tomb:Key operations:decloakify_key:1923
#, fuzzy
msgid "Key succesfully uncloaked to ::1 key::."
msgid "Key successfully uncloaked to ::1 key::."
msgstr "Schlüssel erfolgreich exhumiert in ::1 key::."

#: tomb:Key operations:decloakify_key:1925
Expand Down Expand Up @@ -1513,7 +1513,7 @@ msgstr ""
"lock."

#: tomb:Main routine:main:3448
msgid "For more informations see Tomb's manual page (man tomb)."
msgid "For more information see Tomb's manual page (man tomb)."
msgstr "Für mehr Informationen siehe Benutzerhandbuch (man tomb)."

#: tomb:Main routine:main:3489
Expand Down
10 changes: 5 additions & 5 deletions extras/translations/es.po
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ msgid "Encoding error: steghide reports problems."
msgstr "Error en la codficación: steghide reporta problemas."

#: tomb:Key operations:bury_key:1740
msgid "Tomb key encoded succesfully into image ::1 image file::"
msgid "Tomb key encoded successfully into image ::1 image file::"
msgstr "Llave codificada con éxito en la imagen ::1 fichero::"

#: tomb:Key operations:exhume_key:1752
Expand Down Expand Up @@ -671,7 +671,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
msgstr "Intentando exhumar una llave de la imagen ::1 fichero::"

#: tomb:Key operations:exhume_key:1819
msgid "Key succesfully exhumed to ::1 key::."
msgid "Key successfully exhumed to ::1 key::."
msgstr "Llave exhumada con éxito en ::1 llave::."

#: tomb:Key operations:exhume_key:1821
Expand Down Expand Up @@ -700,7 +700,7 @@ msgstr "Error en la codficación: steghide reporta problemas."

#: tomb:Key operations:cloakify_key:1867
#, fuzzy
msgid "Tomb key encoded succesfully"
msgid "Tomb key encoded successfully"
msgstr "Llave codificada con éxito en la imagen ::1 fichero::"

#: tomb:Key operations:decloakify_key:1879
Expand Down Expand Up @@ -730,7 +730,7 @@ msgstr "mostrando llave exhumada en stdout"

#: tomb:Key operations:decloakify_key:1923
#, fuzzy
msgid "Key succesfully uncloaked to ::1 key::."
msgid "Key successfully uncloaked to ::1 key::."
msgstr "Llave exhumada con éxito en ::1 llave::."

#: tomb:Key operations:decloakify_key:1925
Expand Down Expand Up @@ -1476,7 +1476,7 @@ msgstr ""
"lugar."

#: tomb:Main routine:main:3448
msgid "For more informations see Tomb's manual page (man tomb)."
msgid "For more information see Tomb's manual page (man tomb)."
msgstr "Para más información mira el manual de Tomb (man tomb)."

#: tomb:Main routine:main:3489
Expand Down
10 changes: 5 additions & 5 deletions extras/translations/fi.po
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ msgid "Encoding error: steghide reports problems."
msgstr "Koodausvirhe: steghide ilmoittaa ongelmista."

#: tomb:Key operations:bury_key:1740
msgid "Tomb key encoded succesfully into image ::1 image file::"
msgid "Tomb key encoded successfully into image ::1 image file::"
msgstr "Tomb-avain koodattu onnistuneesti kuvaksi ::1 image file::"

#: tomb:Key operations:exhume_key:1752
Expand Down Expand Up @@ -649,7 +649,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
msgstr "Yritetään kaivaa avainta pois kuvasta ::1 image file::"

#: tomb:Key operations:exhume_key:1819
msgid "Key succesfully exhumed to ::1 key::."
msgid "Key successfully exhumed to ::1 key::."
msgstr "Avain kaivettiin onnistuneesti ::1 key:: :lle."

#: tomb:Key operations:exhume_key:1821
Expand All @@ -673,7 +673,7 @@ msgid "Encoding error: cloakify reports problems."
msgstr "Koodausvirhe: cloakify raportoi ongelmista."

#: tomb:Key operations:cloakify_key:1867
msgid "Tomb key encoded succesfully"
msgid "Tomb key encoded successfully"
msgstr "Tomb-avain koodattu onnistuneesti"

#: tomb:Key operations:decloakify_key:1879
Expand All @@ -700,7 +700,7 @@ msgid "printing uncloaked key on stdout"
msgstr "peittämättömän avaimen tulostaminen stdoutiin"

#: tomb:Key operations:decloakify_key:1923
msgid "Key succesfully uncloaked to ::1 key::."
msgid "Key successfully uncloaked to ::1 key::."
msgstr "Onnistuneen avaimen peitteen poisto ::1 key:: :lle."

#: tomb:Key operations:decloakify_key:1925
Expand Down Expand Up @@ -1414,7 +1414,7 @@ msgstr ""
"komentoa."

#: tomb:Main routine:main:3448
msgid "For more informations see Tomb's manual page (man tomb)."
msgid "For more information see Tomb's manual page (man tomb)."
msgstr "Katso lisätietoja Tombin käsikirjan sivulta ('man tomb')."

#: tomb:Main routine:main:3489
Expand Down
10 changes: 5 additions & 5 deletions extras/translations/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -676,7 +676,7 @@ msgid "Encoding error: steghide reports problems."
msgstr "Erreur à l'encodage : steghide rapporte des problèmes."

#: tomb:Key operations:bury_key:1740
msgid "Tomb key encoded succesfully into image ::1 image file::"
msgid "Tomb key encoded successfully into image ::1 image file::"
msgstr "La clé Tomb a été encodée dans l'image ::1 image file::"

#: tomb:Key operations:exhume_key:1752
Expand Down Expand Up @@ -720,7 +720,7 @@ msgid "Trying to exhume a key out of image ::1 image file::"
msgstr "Tentative d'exhumer une clé de l'image ::1 image file::"

#: tomb:Key operations:exhume_key:1819
msgid "Key succesfully exhumed to ::1 key::."
msgid "Key successfully exhumed to ::1 key::."
msgstr "La clé a été correctement exhumé vers ::1 key::."

#: tomb:Key operations:exhume_key:1821
Expand Down Expand Up @@ -749,7 +749,7 @@ msgstr "Erreur à l'encodage : steghide rapporte des problèmes."

#: tomb:Key operations:cloakify_key:1867
#, fuzzy
msgid "Tomb key encoded succesfully"
msgid "Tomb key encoded successfully"
msgstr "La clé Tomb a été encodée dans l'image ::1 image file::"

#: tomb:Key operations:decloakify_key:1879
Expand Down Expand Up @@ -779,7 +779,7 @@ msgstr "Impression de la clé exhumée sur la sortie standard"

#: tomb:Key operations:decloakify_key:1923
#, fuzzy
msgid "Key succesfully uncloaked to ::1 key::."
msgid "Key successfully uncloaked to ::1 key::."
msgstr "La clé a été correctement exhumé vers ::1 key::."

#: tomb:Key operations:decloakify_key:1925
Expand Down Expand Up @@ -1547,7 +1547,7 @@ msgstr ""
"\"dig\", \"forge\", et \"lock\"."

#: tomb:Main routine:main:3448
msgid "For more informations see Tomb's manual page (man tomb)."
msgid "For more information see Tomb's manual page (man tomb)."
msgstr ""
"Pour de plus amples informations, se référer au manuel de Tomb (man tomb)."

Expand Down
Loading

0 comments on commit b6f1288

Please sign in to comment.