Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unmounting on close #12

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# http://www.gnu.org/software/automake

Makefile
Makefile.in

# http://www.gnu.org/software/autoconf

/autom4te.cache
/aclocal.m4
/compile
/configure
/depcomp
/install-sh
/missing
/config.*
/ABOUT-NLS
/m4
/stamp-h1

# i18n

/po/*
!/po/*.po
!/po/LINGUAS
!/POTFILES.in
!/po/Makevars

# src
/src/*
!/src/*.c
!/src/*.cpp
!/src/*.h
!/src/Makefile.am
23 changes: 23 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
2012-12-04 Eugenio M. Vigo <[email protected]>

* src/main.cpp (update_mounted): Moved code common to
sico_right_button_activated and sico_activated into a new
function.

2012-11-26 Eugenio M. Vigo <[email protected]>

* Forked from <https://github.com/tomm/cryptkeeper>

* ChangeLog: Added. This ChangeLog only keeps record of
development done in this forked version.

* src/lsof.cpp: Added missing #include<unistd.h>

* src/main.cpp (on_exit): New feature: directories are
automatically unmounted when quitting cryptkeeper.

(sico_right_button_activated): The previous code only checked
whether some mount point was or not mounted when activating the
left-click menu. Of course, this disrupted the behavior of the new
on_exit function, which is accessed from the right-click menu.

85 changes: 48 additions & 37 deletions po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,68 +7,75 @@ msgid ""
msgstr ""
"Project-Id-Version: cryptkeeper\n"
"Report-Msgid-Bugs-To: [email protected]\n"
"POT-Creation-Date: 2009-10-18 12:58+0100\n"
"POT-Creation-Date: 2013-06-07 13:22+0200\n"
"PO-Revision-Date: 2010-06-03 17:56+0100\n"
"Last-Translator: Josef Luštický <[email protected]>\n"
"Language-Team: \n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Poedit-Language: Czech\n"
"X-Poedit-Country: CZECH REPUBLIC\n"

#: src/main.cpp:110
#: src/main.cpp:111
msgid "Cryptkeeper cannot access fuse and so cannot start"
msgstr "Cryptkeeper nemá přístup k fuse a nemůže tak pokračovat"

#: src/main.cpp:111
msgid "Check that fuse is installed and that you are a member of the fuse group."
msgstr "Zkontrolujte, zda je fuse nainstalováno a zda jeste členem skupiny fuse."
#: src/main.cpp:112
msgid ""
"Check that fuse is installed and that you are a member of the fuse group."
msgstr ""
"Zkontrolujte, zda je fuse nainstalováno a zda jeste členem skupiny fuse."

#: src/main.cpp:127
#: src/main.cpp:128
msgid "Cryptkeeper cannot find EncFS"
msgstr "Cryptkeeper nemůže nalézt EncFS"

#: src/main.cpp:128
#: src/main.cpp:129
msgid "Check that EncFS is installed and try again."
msgstr "Zkontroluje, zda je EncFS nainstalováno a zkuste znovu."

#: src/main.cpp:170
#: src/main.cpp:171
msgid "Forced unmounting of the encrypted folder was not successful"
msgstr "Vynucené odpojení šifrované složky nebylo úspěšné"

#: src/main.cpp:207
#: src/main.cpp:208
#, c-format
msgid "... %d others ..."
msgstr "... %d ostatní ..."

#: src/main.cpp:212
#: src/main.cpp:213
#, c-format
msgid "%s (%d instances)\n"
msgstr "%s (%d instancí)\n"

#: src/main.cpp:223
msgid "The stash could not be unmounted because it is in use by the following applications:"
msgstr "Tato úschovna nemohla být odpojena, protože je používáná následujícími aplikacemi:"
#: src/main.cpp:224
msgid ""
"The stash could not be unmounted because it is in use by the following "
"applications:"
msgstr ""
"Tato úschovna nemohla být odpojena, protože je používáná následujícími "
"aplikacemi:"

#: src/main.cpp:227
#: src/main.cpp:228
msgid "Kill them"
msgstr "Zabít je"

#: src/main.cpp:249
#: src/main.cpp:250
msgid "The stash could not be mounted. Invalid password?"
msgstr "Úschovna nemohla být připojena. Chybné heslo?"

#: src/main.cpp:263
#: src/main.cpp:264
msgid "This encrypted folder is currently not available"
msgstr "Tato šifrovaná složka je dočasně nedostupná"

#: src/main.cpp:264
#: src/main.cpp:265
msgid "It may be located on a removable disk, or has been deleted."
msgstr "Může být na vyměnitelném disku nebo byla smazána."

#: src/main.cpp:335
#: src/main.cpp:336
#, c-format
msgid ""
"Crypt directory: %s\n"
Expand All @@ -79,32 +86,31 @@ msgstr ""
"Přípojný adresář: %s\n"
"%s"

#: src/main.cpp:369
#: src/main.cpp:370
msgid "Are you sure you want to remove the encrypted folder:"
msgstr "Jste si jisti, že chcete odstranit šifrovanou složku:"

#: src/main.cpp:384
#: src/main.cpp:385
msgid "Do you want to permanently erase the encrypted data:"
msgstr "Chcete trvale vymazat šifrovaná data:"

#: src/main.cpp:412
#: src/main.cpp:413
msgid "Information"
msgstr "Informace"

#: src/main.cpp:416
#: src/PasswordChangeDialog.cpp:95
#: src/main.cpp:417 src/PasswordChangeDialog.cpp:95
msgid "Change password"
msgstr "Změnit heslo"

#: src/main.cpp:420
#: src/main.cpp:421
msgid "Delete encrypted folder"
msgstr "Smazat šifrovanou složku"

#: src/main.cpp:448
#: src/main.cpp:449
msgid "translator-credits"
msgstr "překladatelé-zásluhy"

#: src/main.cpp:450
#: src/main.cpp:451
msgid ""
"This program is free software; you can redistribute it and/or modify it\n"
"under the terms of the GNU General Public License version 3, as published\n"
Expand All @@ -114,20 +120,19 @@ msgstr ""
"podle ustanovení Obecné veřejné licence GNU (GNU General Public Licence)\n"
"3. verze, vydávané Free Software Foundation."

#: src/main.cpp:486
#: src/main.cpp:527
msgid "<b>Encrypted folders:</b>"
msgstr "<b>Šifrované složky:</b>"

#: src/main.cpp:534
#: src/main.cpp:557
msgid "Import EncFS folder"
msgstr "Importovat složku EncFS"

#: src/main.cpp:538
#: src/main.cpp:561
msgid "New encrypted folder"
msgstr "Nová šifrovaná složka"

#: src/ConfigDialog.cpp:56
#: src/ConfigDialog.cpp:76
#: src/ConfigDialog.cpp:56 src/ConfigDialog.cpp:76
msgid "Cryptkeeper Preferences"
msgstr "Cryptkeeper nastavení"

Expand Down Expand Up @@ -217,8 +222,12 @@ msgid "An error occurred while creating the encrypted folder"
msgstr "Vyskytla se chyba při vytváření šifrované složky"

#: src/CreateStashWizard.cpp:219
msgid "Please check that the folder name you chose was not already used, and that encfs is installed correctly."
msgstr "Prosím zkontrolujte, zda vybrané jméno složky už není používáno, a zda je encfs nainstalováno korektně."
msgid ""
"Please check that the folder name you chose was not already used, and that "
"encfs is installed correctly."
msgstr ""
"Prosím zkontrolujte, zda vybrané jméno složky už není používáno, a zda je "
"encfs nainstalováno korektně."

#: src/ImportStashWizard.cpp:51
msgid "Import an Encfs encrypted folder"
Expand All @@ -229,12 +238,15 @@ msgid "Select an existing EncFS encrypted folder (eg ~/.crypt)"
msgstr "Vybrat existující složku šofrovanou EncFS (např. ~/.crypt)"

#: src/ImportStashWizard.cpp:101
msgid "Choose the name and location at which you want the EncFS folder to be mounted"
msgid ""
"Choose the name and location at which you want the EncFS folder to be mounted"
msgstr "Vyberte jméno a umístění, do kterého chcete složku EncFS připojit"

#: src/ImportStashWizard.cpp:116
msgid "The EncFS encrypted folder has been successfully imported into Cryptkeeper"
msgstr "Šifrovaná složka EncFS byla úspěšně importována do programu Cryptkeeper"
msgid ""
"The EncFS encrypted folder has been successfully imported into Cryptkeeper"
msgstr ""
"Šifrovaná složka EncFS byla úspěšně importována do programu Cryptkeeper"

#: src/ImportStashWizard.cpp:164
msgid "You must select a folder"
Expand All @@ -251,4 +263,3 @@ msgstr "Musíte vložit jméno"
#: src/PasswordEntryDialog.cpp:40
msgid "Enter your password:"
msgstr "Vložte Vaše heslo"

Loading