aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2010-06-25 17:23:54 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2010-06-25 17:23:54 +0000
commit6252c2bfaeacd7977958c6b0c7376db7b21cdcb2 (patch)
tree35bce47fa18c3c1c537ad08350afe6de142aa9c0
parentredo to redo-action (diff)
downloadgpg4usb-6252c2bfaeacd7977958c6b0c7376db7b21cdcb2.tar.gz
gpg4usb-6252c2bfaeacd7977958c6b0c7376db7b21cdcb2.zip
added warning, if file exists in file encryption
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@362 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--TODO9
-rwxr-xr-xfileencryptiondialog.cpp14
-rw-r--r--release/ts/gpg4usb_de.ts192
-rw-r--r--release/ts/gpg4usb_pt_BR.ts168
-rw-r--r--release/ts/gpg4usb_ru.ts166
5 files changed, 298 insertions, 251 deletions
diff --git a/TODO b/TODO
index 8c9d4fc..c805117 100644
--- a/TODO
+++ b/TODO
@@ -1,15 +1,8 @@
TODO:
-----
-
-Release 0.2.4
-- Open File from command Line [DONE]
-- possibility to save which private keys are checked on closing (partially solving "encrypt to self") [DONE]
-- add translation for spanish [DONE]
-- link to online tutorial in help menu [DONE]
-
Release 0.2.5
- minimal MIME support (understand and decode "Content-Encoding" header, e.g. "quoted printable")
-- File-Encryption: Warning if file overwritten
+- File-Encryption: Warning if file overwritten [DONE]
- more doku on building gpg4usb (especially on windows)
- doku for translating gpg4usb
- add translation for french
diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index d1f02ef..25db7f0 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -38,7 +38,6 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::Context *ctx, QString iconPath
: QDialog(parent)
{
-
mCtx = ctx;
setWindowTitle(tr("Encrypt / Decrypt File"));
resize(500, 200);
@@ -136,8 +135,9 @@ void FileEncryptionDialog::selectOutputFile()
path = QFileInfo(outputFileEdit->text()).absolutePath();
}
- QString outfileName = QFileDialog::getSaveFileName(this, tr("Save File"), path);
+ QString outfileName = QFileDialog::getSaveFileName(this, tr("Save File"),path, NULL ,NULL ,QFileDialog::DontConfirmOverwrite);
outputFileEdit->setText(outfileName);
+
}
void FileEncryptionDialog::executeAction()
@@ -173,8 +173,14 @@ void FileEncryptionDialog::executeAction()
QDataStream out(&outfile);
out.writeRawData(outBuffer->data(), outBuffer->length());
- accept();
- QMessageBox::information(0, "Done", "Output saved to " + outputFileEdit->text());
+ QMessageBox::StandardButton ret;
+ ret = QMessageBox::warning(this, tr("File"),
+ tr("File exists! Do you want to overwrite it?"),
+ QMessageBox::Ok|QMessageBox::Cancel);
+ if (ret == QMessageBox::Ok){
+ accept();
+ QMessageBox::information(0, "Done", "Output saved to " + outputFileEdit->text());
+ }
}
void FileEncryptionDialog::showKeyList()
diff --git a/release/ts/gpg4usb_de.ts b/release/ts/gpg4usb_de.ts
index 84d3139..f665d31 100644
--- a/release/ts/gpg4usb_de.ts
+++ b/release/ts/gpg4usb_de.ts
@@ -71,52 +71,58 @@
<context>
<name>FileEncryptionDialog</name>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="43"/>
+ <location filename="../../fileencryptiondialog.cpp" line="42"/>
<source>Encrypt / Decrypt File</source>
<translation>Datei Ver/Entschlüsseln</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="51"/>
+ <location filename="../../fileencryptiondialog.cpp" line="50"/>
<location filename="../../fileencryptiondialog.cpp" line="166"/>
+ <location filename="../../fileencryptiondialog.cpp" line="177"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="52"/>
+ <location filename="../../fileencryptiondialog.cpp" line="51"/>
<source>Action</source>
<translation>Aktion</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="62"/>
+ <location filename="../../fileencryptiondialog.cpp" line="61"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="58"/>
+ <location filename="../../fileencryptiondialog.cpp" line="57"/>
<source>Input</source>
<translation>Eingabedatei</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="64"/>
+ <location filename="../../fileencryptiondialog.cpp" line="63"/>
<source>Output</source>
<translation>Ausgabedatei</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="82"/>
+ <location filename="../../fileencryptiondialog.cpp" line="81"/>
<source>&amp;Encrypt</source>
<translation>&amp;Verschlüsseln</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="84"/>
+ <location filename="../../fileencryptiondialog.cpp" line="83"/>
<source>&amp;Decrypt</source>
<translation>&amp;Entschlüsseln</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="113"/>
+ <location filename="../../fileencryptiondialog.cpp" line="112"/>
<source>Open File</source>
<translation>Datei Öffnen</translation>
</message>
<message>
+ <location filename="../../fileencryptiondialog.cpp" line="178"/>
+ <source>File exists! Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Files</source>
<translation type="obsolete">Dateien</translation>
</message>
@@ -125,7 +131,7 @@
<translation type="obsolete">Alle Dateien (*) </translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="139"/>
+ <location filename="../../fileencryptiondialog.cpp" line="138"/>
<source>Save File</source>
<translation>Datei Speichern</translation>
</message>
@@ -144,7 +150,7 @@
<context>
<name>GpgWin</name>
<message>
- <location filename="../../gpgwin.cpp" line="105"/>
+ <location filename="../../gpgwin.cpp" line="125"/>
<source>&amp;Open...</source>
<translation>Ö&amp;ffnen...</translation>
</message>
@@ -153,12 +159,12 @@
<translation type="obsolete">Strg+O</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="108"/>
+ <location filename="../../gpgwin.cpp" line="128"/>
<source>Open an existing file</source>
<translation>Öffen Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="111"/>
+ <location filename="../../gpgwin.cpp" line="131"/>
<source>&amp;Save</source>
<translation>&amp;Speichern</translation>
</message>
@@ -167,12 +173,12 @@
<translation type="obsolete">Strg+S</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="114"/>
+ <location filename="../../gpgwin.cpp" line="134"/>
<source>Save the current File</source>
<translation>Speichere Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="117"/>
+ <location filename="../../gpgwin.cpp" line="137"/>
<source>Save &amp;As</source>
<translation>Speichern &amp;unter</translation>
</message>
@@ -181,12 +187,12 @@
<translation type="obsolete">Strg+A</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="120"/>
+ <location filename="../../gpgwin.cpp" line="140"/>
<source>Save the current File as...</source>
<translation>Speichere aktuelle Datei als....</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="123"/>
+ <location filename="../../gpgwin.cpp" line="143"/>
<source>&amp;Print</source>
<translation>&amp;Drucken</translation>
</message>
@@ -195,12 +201,12 @@
<translation type="obsolete">Strg+P</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="126"/>
+ <location filename="../../gpgwin.cpp" line="146"/>
<source>Print Document</source>
<translation>Drucken</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="129"/>
+ <location filename="../../gpgwin.cpp" line="149"/>
<source>&amp;Quit</source>
<translation>&amp;Beenden</translation>
</message>
@@ -209,12 +215,12 @@
<translation type="obsolete">Strg+Q</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="132"/>
+ <location filename="../../gpgwin.cpp" line="152"/>
<source>Quit Program</source>
<translation>Beende das Programm</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="142"/>
+ <location filename="../../gpgwin.cpp" line="167"/>
<source>&amp;Paste</source>
<translation>E&amp;infügen</translation>
</message>
@@ -223,12 +229,12 @@
<translation type="obsolete">Strg+V</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="145"/>
+ <location filename="../../gpgwin.cpp" line="170"/>
<source>Paste Text From Clipboard</source>
<translation>Füge Text aus der Zwischenablage ein</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="148"/>
+ <location filename="../../gpgwin.cpp" line="173"/>
<source>Cu&amp;t</source>
<translation>&amp;Ausschneiden</translation>
</message>
@@ -237,12 +243,12 @@
<translation type="obsolete">Strg+X</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="151"/>
+ <location filename="../../gpgwin.cpp" line="176"/>
<source>Cut the current selection&apos;s contents to the clipboard</source>
<translation>aktuelle Auswahl ausschneiden und in Zwischenablage einfügen</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="155"/>
+ <location filename="../../gpgwin.cpp" line="180"/>
<source>&amp;Copy</source>
<translation>&amp;Kopieren</translation>
</message>
@@ -251,27 +257,27 @@
<translation type="obsolete">Strg+C</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="158"/>
+ <location filename="../../gpgwin.cpp" line="183"/>
<source>Copy the current selection&apos;s contents to the clipboard</source>
<translation>aktuelle Auswahl in Zwischenablage kopieren</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="162"/>
+ <location filename="../../gpgwin.cpp" line="187"/>
<source>Select &amp;All</source>
<translation>Alles &amp;markieren</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="165"/>
+ <location filename="../../gpgwin.cpp" line="190"/>
<source>Select the whole text</source>
<translation>Den ganzen Text markieren</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="169"/>
+ <location filename="../../gpgwin.cpp" line="194"/>
<source>Open settings dialog</source>
<translation>Öffne den Einstellungsdialog</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="175"/>
+ <location filename="../../gpgwin.cpp" line="200"/>
<source>&amp;Encrypt</source>
<translation>&amp;Verschlüsseln</translation>
</message>
@@ -280,12 +286,12 @@
<translation type="obsolete">Ctrl+E</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="178"/>
+ <location filename="../../gpgwin.cpp" line="203"/>
<source>Encrypt Message</source>
<translation>Verschlüssele den Text</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="181"/>
+ <location filename="../../gpgwin.cpp" line="206"/>
<source>&amp;Decrypt</source>
<translation>&amp;Entschlüsseln</translation>
</message>
@@ -294,200 +300,210 @@
<translation type="obsolete">Ctrl+D</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="184"/>
+ <location filename="../../gpgwin.cpp" line="209"/>
<source>Decrypt Message</source>
<translation>Entschlüssele den Text</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="196"/>
+ <location filename="../../gpgwin.cpp" line="221"/>
<source>Import New Key From File</source>
<translation>Importiere einen neuen Schlüssel aus Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="201"/>
+ <location filename="../../gpgwin.cpp" line="226"/>
<source>Import New Key From Editor</source>
<translation>Importiere einen neuen Schlüssel aus dem Textfeld</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="221"/>
+ <location filename="../../gpgwin.cpp" line="246"/>
<source>&amp;About</source>
<translation>&amp;Info</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="223"/>
+ <location filename="../../gpgwin.cpp" line="248"/>
<source>Show the application&apos;s About box</source>
<translation>Zeige die Information über die Anwendung</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="194"/>
- <location filename="../../gpgwin.cpp" line="240"/>
- <location filename="../../gpgwin.cpp" line="632"/>
+ <location filename="../../gpgwin.cpp" line="219"/>
+ <location filename="../../gpgwin.cpp" line="265"/>
+ <location filename="../../gpgwin.cpp" line="638"/>
<source>&amp;File</source>
<translation>&amp;Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="248"/>
+ <location filename="../../gpgwin.cpp" line="273"/>
<source>&amp;Edit</source>
<translation>&amp;Bearbeiten</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="272"/>
+ <location filename="../../gpgwin.cpp" line="300"/>
<source>&amp;Help</source>
<translation>&amp;Hilfe</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="446"/>
+ <location filename="../../gpgwin.cpp" line="452"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="290"/>
+ <location filename="../../gpgwin.cpp" line="318"/>
<source>Edit</source>
<translation>Bearbeiten</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="137"/>
+ <location filename="../../gpgwin.cpp" line="157"/>
<source>&amp;Undo</source>
<translation>&amp;Rückgängig</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="139"/>
+ <location filename="../../gpgwin.cpp" line="159"/>
<source>Undo Last Edit Action</source>
<translation>Mache die letzte Aktion rückgängig</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="168"/>
+ <location filename="../../gpgwin.cpp" line="162"/>
+ <source>&amp;Redo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="164"/>
+ <source>Redo Last Edit Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="193"/>
<source>Se&amp;ttings</source>
<translation>Ei&amp;nstellungen</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="187"/>
+ <location filename="../../gpgwin.cpp" line="212"/>
<source>&amp;File Encryption</source>
<translatorcomment>Datei Verschlüsselung</translatorcomment>
<translation>&amp;Datei Verschlüsselung</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="189"/>
+ <location filename="../../gpgwin.cpp" line="214"/>
<source>Encrypt/Decrypt File</source>
<translation>Ver-/Entschlüssele Datei</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="209"/>
+ <location filename="../../gpgwin.cpp" line="234"/>
<source>Key Management</source>
<translation>Schlüsselverwaltung</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="211"/>
+ <location filename="../../gpgwin.cpp" line="236"/>
<source>Open Keymanagement</source>
<translation>Öffne die Schlüsselverwaltung</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="216"/>
+ <location filename="../../gpgwin.cpp" line="241"/>
<source>Open Import New Key Dialog</source>
<translation>Öffne den Schlüsselimport Dialog</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="226"/>
+ <location filename="../../gpgwin.cpp" line="251"/>
<source>Online &amp;Tutorial</source>
<translation>Online &amp;Dokumentation</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="228"/>
+ <location filename="../../gpgwin.cpp" line="253"/>
<source>Open Online Tutorial</source>
<translation>Öffne die Online Dokumentation</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="233"/>
+ <location filename="../../gpgwin.cpp" line="258"/>
<source>Append Selected Key(s) To Text</source>
<translation>Hänge die ausgewählten Schlüssel an den Text an</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="234"/>
+ <location filename="../../gpgwin.cpp" line="259"/>
<source>Append The Selected Keys To Text in Editor</source>
<translation>Hänge den gewählten Schhlüssel an den Text im Editor an</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="262"/>
+ <location filename="../../gpgwin.cpp" line="290"/>
<source>&amp;Keys</source>
<translation>Sch&amp;lüssel</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="263"/>
+ <location filename="../../gpgwin.cpp" line="291"/>
<source>&amp;Import Key From...</source>
<translation>&amp;Importiere Schlüssel aus...</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="270"/>
+ <location filename="../../gpgwin.cpp" line="298"/>
<source>&amp;View</source>
<translation>&amp;Ansicht</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="285"/>
+ <location filename="../../gpgwin.cpp" line="313"/>
<source>Key</source>
<translation>Schlüssel</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="299"/>
- <location filename="../../gpgwin.cpp" line="472"/>
+ <location filename="../../gpgwin.cpp" line="327"/>
+ <location filename="../../gpgwin.cpp" line="478"/>
<source>Ready</source>
<translation>Fertig</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="306"/>
+ <location filename="../../gpgwin.cpp" line="334"/>
<source>Encrypt for:</source>
<translation>Verschlüssele für:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="314"/>
+ <location filename="../../gpgwin.cpp" line="342"/>
<source>Attached files:</source>
<translation>Angehängte Dateien:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="391"/>
- <location filename="../../gpgwin.cpp" line="431"/>
+ <location filename="../../gpgwin.cpp" line="397"/>
+ <location filename="../../gpgwin.cpp" line="437"/>
<source>Application</source>
<translation>Anwendung</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="392"/>
+ <location filename="../../gpgwin.cpp" line="398"/>
<source>Cannot read file %1:
%2.</source>
<translation>Kann Datei nicht lesen %1: %2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="404"/>
+ <location filename="../../gpgwin.cpp" line="410"/>
<source>File loaded</source>
<translation>Datei geladen</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="419"/>
+ <location filename="../../gpgwin.cpp" line="425"/>
<source>%1[*] - %2</source>
<translation></translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="432"/>
+ <location filename="../../gpgwin.cpp" line="438"/>
<source>The document has been modified.
Do you want to save your changes?</source>
<translation>Die Datei würde verändert. Möchten Sie die Änderung speichern?</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="447"/>
+ <location filename="../../gpgwin.cpp" line="453"/>
<source>Cannot write file %1:
%2.</source>
<translation>Kann Datei nicht lesen %1: %2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="456"/>
+ <location filename="../../gpgwin.cpp" line="462"/>
<source>Saved &apos;%1&apos;</source>
<translation>%1 gespeichert</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="481"/>
+ <location filename="../../gpgwin.cpp" line="487"/>
<source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
<translation>&lt;center&gt;Diese Anwendung ermöglicht einfaches&lt;br&gt;Ver- und Entschlüsseln von Texten und Dateien.&lt;br&gt;Sie steht unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;Falls Sie irgendwelche Fragen und/oder &lt;br&gt;Vorschläge haben, kontaktieren Sie uns über&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns einfach in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Open Key</source>
<translation>Öffne Datei</translation>
</message>
@@ -496,45 +512,45 @@ Do you want to save your changes?</source>
<translation type="obsolete">&lt;center&gt;Diese Anwendung erlaubt das einfache&lt;br&gt; Ver-und Entschlüsseln von Texten und Dateien.&lt;br&gt;Die Anwendung ist lizensiert unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Kirill (ru), Alessandro (pt)&lt;br&gt;&lt;br&gt;Falls sie Fragen oder Anregungen haben,&lt;br&gt; kontaktieren sie uns unter gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="599"/>
+ <location filename="../../gpgwin.cpp" line="605"/>
<source>couldn&apos;t open file: </source>
<translation>Konnte Datei nicht öffnen:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="199"/>
- <location filename="../../gpgwin.cpp" line="633"/>
+ <location filename="../../gpgwin.cpp" line="224"/>
+ <location filename="../../gpgwin.cpp" line="639"/>
<source>&amp;Editor</source>
<translation>&amp;Editor</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="204"/>
- <location filename="../../gpgwin.cpp" line="634"/>
+ <location filename="../../gpgwin.cpp" line="229"/>
+ <location filename="../../gpgwin.cpp" line="640"/>
<source>&amp;Clipboard</source>
<translation>&amp;Zwischenablage</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="206"/>
+ <location filename="../../gpgwin.cpp" line="231"/>
<source>Import New Key From Clipboard</source>
<translation>Importiere neuen Schlüssel aus der Zwischenablage</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="214"/>
- <location filename="../../gpgwin.cpp" line="623"/>
+ <location filename="../../gpgwin.cpp" line="239"/>
+ <location filename="../../gpgwin.cpp" line="629"/>
<source>Import Key</source>
<translation>Schlüsselimport</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="256"/>
+ <location filename="../../gpgwin.cpp" line="284"/>
<source>&amp;Crypt</source>
<translation>&amp;Crypt</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="279"/>
+ <location filename="../../gpgwin.cpp" line="307"/>
<source>Crypt</source>
<translation>Crypt</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="478"/>
+ <location filename="../../gpgwin.cpp" line="484"/>
<source>About </source>
<translation>Über</translation>
</message>
@@ -543,17 +559,17 @@ Do you want to save your changes?</source>
<translation type="obsolete">&lt;center&gt;Diese Anwendung ermöglicht einfaches&lt;br&gt;Ver- und Entschlüsseln von Texten und Dateien.&lt;br&gt;Sie steht unter der GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Entwickler:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Übersetzung:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;Falls Sie irgendwelche Fragen und/oder &lt;br&gt;Vorschläge haben, kontaktieren Sie uns über&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;oder treffen sie uns einfach in unserem XMPP-Channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Key Files</source>
<translation>Schlüssel Dateien</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>All Files</source>
<translation>Alle Dateien</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="631"/>
+ <location filename="../../gpgwin.cpp" line="637"/>
<source>Import Key From...</source>
<translation>Impoertiere neuen Schlüssel aus...</translation>
</message>
diff --git a/release/ts/gpg4usb_pt_BR.ts b/release/ts/gpg4usb_pt_BR.ts
index f3a8b9e..999e80d 100644
--- a/release/ts/gpg4usb_pt_BR.ts
+++ b/release/ts/gpg4usb_pt_BR.ts
@@ -43,52 +43,58 @@
<context>
<name>FileEncryptionDialog</name>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="43"/>
+ <location filename="../../fileencryptiondialog.cpp" line="42"/>
<source>Encrypt / Decrypt File</source>
<translation>Encriptar / Decriptar Arquivo</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="51"/>
+ <location filename="../../fileencryptiondialog.cpp" line="50"/>
<location filename="../../fileencryptiondialog.cpp" line="166"/>
+ <location filename="../../fileencryptiondialog.cpp" line="177"/>
<source>File</source>
<translation>Arquivo</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="52"/>
+ <location filename="../../fileencryptiondialog.cpp" line="51"/>
<source>Action</source>
<translation>Ação</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="62"/>
+ <location filename="../../fileencryptiondialog.cpp" line="61"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="58"/>
+ <location filename="../../fileencryptiondialog.cpp" line="57"/>
<source>Input</source>
<translation>Entrada</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="64"/>
+ <location filename="../../fileencryptiondialog.cpp" line="63"/>
<source>Output</source>
<translation>Saída</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="82"/>
+ <location filename="../../fileencryptiondialog.cpp" line="81"/>
<source>&amp;Encrypt</source>
<translation>&amp;Encriptar</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="84"/>
+ <location filename="../../fileencryptiondialog.cpp" line="83"/>
<source>&amp;Decrypt</source>
<translation>&amp;Decriptar</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="113"/>
+ <location filename="../../fileencryptiondialog.cpp" line="112"/>
<source>Open File</source>
<translation>Abrir Arquivo</translation>
</message>
<message>
+ <location filename="../../fileencryptiondialog.cpp" line="178"/>
+ <source>File exists! Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Files</source>
<translation type="obsolete">Arquivos</translation>
</message>
@@ -97,7 +103,7 @@
<translation type="obsolete">Todos os Arquivos (*)</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="139"/>
+ <location filename="../../fileencryptiondialog.cpp" line="138"/>
<source>Save File</source>
<translation>Salvar Arquivo</translation>
</message>
@@ -187,7 +193,7 @@
<translation>Sair</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="162"/>
+ <location filename="../../gpgwin.cpp" line="167"/>
<source>&amp;Paste</source>
<translatorcomment>i used this without accelerator &amp; to avoid confusion with windows native paste (ctrl+v)</translatorcomment>
<translation>&amp;Colar</translation>
@@ -197,12 +203,12 @@
<translation type="obsolete">Ctrl+V</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="165"/>
+ <location filename="../../gpgwin.cpp" line="170"/>
<source>Paste Text From Clipboard</source>
<translation>Colar Texto da Área de Transferência</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="168"/>
+ <location filename="../../gpgwin.cpp" line="173"/>
<source>Cu&amp;t</source>
<translatorcomment>i used this without accelerator &amp; to avoid confusion with native windows cut ctrl+x</translatorcomment>
<translation>&amp;Recortar</translation>
@@ -212,12 +218,12 @@
<translation type="obsolete">Ctrl+X</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="171"/>
+ <location filename="../../gpgwin.cpp" line="176"/>
<source>Cut the current selection&apos;s contents to the clipboard</source>
<translation>Recortar a seleção atual para a Área de Transferência</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="175"/>
+ <location filename="../../gpgwin.cpp" line="180"/>
<source>&amp;Copy</source>
<translation>&amp;Copiar</translation>
</message>
@@ -226,32 +232,32 @@
<translation type="obsolete">Ctrl+C</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="178"/>
+ <location filename="../../gpgwin.cpp" line="183"/>
<source>Copy the current selection&apos;s contents to the clipboard</source>
<translation>Copiar a seleção para a área de transferência</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="182"/>
+ <location filename="../../gpgwin.cpp" line="187"/>
<source>Select &amp;All</source>
<translation>Selecionar &amp;Tudo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="185"/>
+ <location filename="../../gpgwin.cpp" line="190"/>
<source>Select the whole text</source>
<translation>Selecionar o texto completo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="188"/>
+ <location filename="../../gpgwin.cpp" line="193"/>
<source>Se&amp;ttings</source>
<translation>Con&amp;figurações</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="189"/>
+ <location filename="../../gpgwin.cpp" line="194"/>
<source>Open settings dialog</source>
<translation>Abrir janela de configurações</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="195"/>
+ <location filename="../../gpgwin.cpp" line="200"/>
<source>&amp;Encrypt</source>
<translation>&amp;Encriptar</translation>
</message>
@@ -260,12 +266,12 @@
<translation type="obsolete">Ctrl+E</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="198"/>
+ <location filename="../../gpgwin.cpp" line="203"/>
<source>Encrypt Message</source>
<translation>Encriptar Mensagem</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="201"/>
+ <location filename="../../gpgwin.cpp" line="206"/>
<source>&amp;Decrypt</source>
<translation>&amp;Decriptar</translation>
</message>
@@ -274,52 +280,52 @@
<translation type="obsolete">Ctrl+D</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="204"/>
+ <location filename="../../gpgwin.cpp" line="209"/>
<source>Decrypt Message</source>
<translation>Decriptar Mensagem</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="207"/>
+ <location filename="../../gpgwin.cpp" line="212"/>
<source>&amp;File Encryption</source>
<translation>Encriptar &amp;Arquivo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="209"/>
+ <location filename="../../gpgwin.cpp" line="214"/>
<source>Encrypt/Decrypt File</source>
<translation>Encriptar/Decriptar Arquivo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="216"/>
+ <location filename="../../gpgwin.cpp" line="221"/>
<source>Import New Key From File</source>
<translation>Importar Nova Chave do Arquivo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="221"/>
+ <location filename="../../gpgwin.cpp" line="226"/>
<source>Import New Key From Editor</source>
<translation>Importar Nova Chave do Editor</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="229"/>
+ <location filename="../../gpgwin.cpp" line="234"/>
<source>Key Management</source>
<translation>Gerenciador de Chaves</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="231"/>
+ <location filename="../../gpgwin.cpp" line="236"/>
<source>Open Keymanagement</source>
<translation>Abrir Gerenciador de Chaves</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="236"/>
+ <location filename="../../gpgwin.cpp" line="241"/>
<source>Open Import New Key Dialog</source>
<translation>Abrir Diálogo de Importação de Nova Chave</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="241"/>
+ <location filename="../../gpgwin.cpp" line="246"/>
<source>&amp;About</source>
<translation>&amp;Sobre</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="243"/>
+ <location filename="../../gpgwin.cpp" line="248"/>
<source>Show the application&apos;s About box</source>
<translation>Exibe a janela &apos;sobre&apos;</translation>
</message>
@@ -328,29 +334,29 @@
<translation type="obsolete">&lt;center&gt;Esse programa serve para encriptar e&lt;br&gt;decriptar mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob a licença GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões,&lt;br&gt;envie uma mensagem para&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou nos encontre no nosso canal xmpp:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="214"/>
- <location filename="../../gpgwin.cpp" line="260"/>
- <location filename="../../gpgwin.cpp" line="632"/>
+ <location filename="../../gpgwin.cpp" line="219"/>
+ <location filename="../../gpgwin.cpp" line="265"/>
+ <location filename="../../gpgwin.cpp" line="638"/>
<source>&amp;File</source>
<translation>&amp;Arquivo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="268"/>
+ <location filename="../../gpgwin.cpp" line="273"/>
<source>&amp;Edit</source>
<translation>E&amp;ditar</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="294"/>
+ <location filename="../../gpgwin.cpp" line="300"/>
<source>&amp;Help</source>
<translation>A&amp;juda</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="446"/>
+ <location filename="../../gpgwin.cpp" line="452"/>
<source>File</source>
<translation>Arquivo</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="312"/>
+ <location filename="../../gpgwin.cpp" line="318"/>
<source>Edit</source>
<translation>Editar</translation>
</message>
@@ -365,100 +371,110 @@
<translation>Desfazer Última Edição</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="246"/>
+ <location filename="../../gpgwin.cpp" line="162"/>
+ <source>&amp;Redo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="164"/>
+ <source>Redo Last Edit Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="251"/>
<source>Online &amp;Tutorial</source>
<translation>&amp;Tutorial Online</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="248"/>
+ <location filename="../../gpgwin.cpp" line="253"/>
<source>Open Online Tutorial</source>
<translation>Abrir Tutorial Online</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="253"/>
+ <location filename="../../gpgwin.cpp" line="258"/>
<source>Append Selected Key(s) To Text</source>
<translation>Anexar Chaves Marcadas no Texto</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="254"/>
+ <location filename="../../gpgwin.cpp" line="259"/>
<source>Append The Selected Keys To Text in Editor</source>
<translation>Anexar Chaves Marcadas no Texto do Editor</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="284"/>
+ <location filename="../../gpgwin.cpp" line="290"/>
<source>&amp;Keys</source>
<translation>&amp;Chaves</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="285"/>
+ <location filename="../../gpgwin.cpp" line="291"/>
<source>&amp;Import Key From...</source>
<translation>&amp;Importar Chave de...</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="292"/>
+ <location filename="../../gpgwin.cpp" line="298"/>
<source>&amp;View</source>
<translation>E&amp;xibir</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="307"/>
+ <location filename="../../gpgwin.cpp" line="313"/>
<source>Key</source>
<translation>Chave</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="321"/>
- <location filename="../../gpgwin.cpp" line="472"/>
+ <location filename="../../gpgwin.cpp" line="327"/>
+ <location filename="../../gpgwin.cpp" line="478"/>
<source>Ready</source>
<translation>Pronto</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="328"/>
+ <location filename="../../gpgwin.cpp" line="334"/>
<source>Encrypt for:</source>
<translation>Encriptar para:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="336"/>
+ <location filename="../../gpgwin.cpp" line="342"/>
<source>Attached files:</source>
<translation>Arquivos anexos:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="391"/>
- <location filename="../../gpgwin.cpp" line="431"/>
+ <location filename="../../gpgwin.cpp" line="397"/>
+ <location filename="../../gpgwin.cpp" line="437"/>
<source>Application</source>
<translation>Aplicação</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="392"/>
+ <location filename="../../gpgwin.cpp" line="398"/>
<source>Cannot read file %1:
%2.</source>
<translation>Não leu o arquivo %1:
%2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="404"/>
+ <location filename="../../gpgwin.cpp" line="410"/>
<source>File loaded</source>
<translation>Arquivo carregado</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="419"/>
+ <location filename="../../gpgwin.cpp" line="425"/>
<source>%1[*] - %2</source>
<translation>%1[*] - %2</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="432"/>
+ <location filename="../../gpgwin.cpp" line="438"/>
<source>The document has been modified.
Do you want to save your changes?</source>
<translation>O documento foi alterado.
Deseja salvar as alterações?</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="447"/>
+ <location filename="../../gpgwin.cpp" line="453"/>
<source>Cannot write file %1:
%2.</source>
<translation>Não escreveu o arquivo %1:
%2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="456"/>
+ <location filename="../../gpgwin.cpp" line="462"/>
<source>Saved &apos;%1&apos;</source>
<translatorcomment>i used inverse order because its more natural speak in this way</translatorcomment>
<translation>&apos;%1&apos; salvo</translation>
@@ -468,70 +484,70 @@ Deseja salvar as alterações?</translation>
<translation type="obsolete">&lt;center&gt; Este aplicativo permite a encriptação/decriptação&lt;br&gt;simplificada das suas mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob licença GPL-V2.0&lt;br&gt;&lt;br&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Krill(ru)&lt;br&gt;Alessandro Benevenuto (pt-br)&lt;br&gt;&lt;br&gt;Caso tenha dúvidas e/ou sugestões, entre em&lt;br&gt;contatoatravés de gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou no canal xmpp&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Open Key</source>
<translation>Abrir a Chave</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Key Files</source>
<translation>Arquivos de Chaves</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>All Files</source>
<translation>Todos os Arquivos</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="599"/>
+ <location filename="../../gpgwin.cpp" line="605"/>
<source>couldn&apos;t open file: </source>
<translation>Não pode abrir o arquivo: </translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="219"/>
- <location filename="../../gpgwin.cpp" line="633"/>
+ <location filename="../../gpgwin.cpp" line="224"/>
+ <location filename="../../gpgwin.cpp" line="639"/>
<source>&amp;Editor</source>
<translation>&amp;Editor</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="224"/>
- <location filename="../../gpgwin.cpp" line="634"/>
+ <location filename="../../gpgwin.cpp" line="229"/>
+ <location filename="../../gpgwin.cpp" line="640"/>
<source>&amp;Clipboard</source>
<translation>Área de &amp;Transferência</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="226"/>
+ <location filename="../../gpgwin.cpp" line="231"/>
<source>Import New Key From Clipboard</source>
<translation>Importar Nova Chave da Área de Transferência</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="234"/>
- <location filename="../../gpgwin.cpp" line="623"/>
+ <location filename="../../gpgwin.cpp" line="239"/>
+ <location filename="../../gpgwin.cpp" line="629"/>
<source>Import Key</source>
<translation>Importar Chave</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="278"/>
+ <location filename="../../gpgwin.cpp" line="284"/>
<source>&amp;Crypt</source>
<translation>&amp;Encriptar</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="301"/>
+ <location filename="../../gpgwin.cpp" line="307"/>
<source>Crypt</source>
<translation>Encriptar</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="478"/>
+ <location filename="../../gpgwin.cpp" line="484"/>
<source>About </source>
<translation>Sobre </translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="481"/>
+ <location filename="../../gpgwin.cpp" line="487"/>
<source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
<translation>&lt;center&gt;Esse programa serve para encriptar e&lt;br&gt;decriptar mensagens de texto ou arquivos.&lt;br&gt;E é liberado sob a licença GPL V2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Desenvolvedores:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Tradução:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;Caso tenha duvidas e/ou sugestões,&lt;br&gt;envie uma mensagem para&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;ou nos encontre no nosso canal xmppl:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="631"/>
+ <location filename="../../gpgwin.cpp" line="637"/>
<source>Import Key From...</source>
<translation>Importar Chave de...</translation>
</message>
diff --git a/release/ts/gpg4usb_ru.ts b/release/ts/gpg4usb_ru.ts
index 8656922..083469a 100644
--- a/release/ts/gpg4usb_ru.ts
+++ b/release/ts/gpg4usb_ru.ts
@@ -47,52 +47,58 @@
<context>
<name>FileEncryptionDialog</name>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="43"/>
+ <location filename="../../fileencryptiondialog.cpp" line="42"/>
<source>Encrypt / Decrypt File</source>
<translation>За-/Расшифровать файл</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="51"/>
+ <location filename="../../fileencryptiondialog.cpp" line="50"/>
<location filename="../../fileencryptiondialog.cpp" line="166"/>
+ <location filename="../../fileencryptiondialog.cpp" line="177"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="52"/>
+ <location filename="../../fileencryptiondialog.cpp" line="51"/>
<source>Action</source>
<translation>Действие</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="62"/>
+ <location filename="../../fileencryptiondialog.cpp" line="61"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="58"/>
+ <location filename="../../fileencryptiondialog.cpp" line="57"/>
<source>Input</source>
<translation>Файл ввода</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="64"/>
+ <location filename="../../fileencryptiondialog.cpp" line="63"/>
<source>Output</source>
<translation>Файл вывода</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="82"/>
+ <location filename="../../fileencryptiondialog.cpp" line="81"/>
<source>&amp;Encrypt</source>
<translation>З&amp;ашифровать</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="84"/>
+ <location filename="../../fileencryptiondialog.cpp" line="83"/>
<source>&amp;Decrypt</source>
<translation>Расшифро&amp;вать</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="113"/>
+ <location filename="../../fileencryptiondialog.cpp" line="112"/>
<source>Open File</source>
<translation>Открыть файл</translation>
</message>
<message>
+ <location filename="../../fileencryptiondialog.cpp" line="178"/>
+ <source>File exists! Do you want to overwrite it?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source>Files</source>
<translation type="obsolete">Файлы</translation>
</message>
@@ -101,7 +107,7 @@
<translation type="obsolete">Все файлы</translation>
</message>
<message>
- <location filename="../../fileencryptiondialog.cpp" line="139"/>
+ <location filename="../../fileencryptiondialog.cpp" line="138"/>
<source>Save File</source>
<translation>Сохранить файл</translation>
</message>
@@ -182,309 +188,319 @@
</message>
<message>
<location filename="../../gpgwin.cpp" line="162"/>
+ <source>&amp;Redo</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="164"/>
+ <source>Redo Last Edit Action</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../../gpgwin.cpp" line="167"/>
<source>&amp;Paste</source>
<translation>&amp;Вставить</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="165"/>
+ <location filename="../../gpgwin.cpp" line="170"/>
<source>Paste Text From Clipboard</source>
<translation>Вставить текст из Буфера Обмена</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="168"/>
+ <location filename="../../gpgwin.cpp" line="173"/>
<source>Cu&amp;t</source>
<translation>&amp;Вырезать</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="171"/>
+ <location filename="../../gpgwin.cpp" line="176"/>
<source>Cut the current selection&apos;s contents to the clipboard</source>
<translation>Вырезать выделенные элементы в Буфер Обмена</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="175"/>
+ <location filename="../../gpgwin.cpp" line="180"/>
<source>&amp;Copy</source>
<translation>&amp;Копировать</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="178"/>
+ <location filename="../../gpgwin.cpp" line="183"/>
<source>Copy the current selection&apos;s contents to the clipboard</source>
<translation>Копировать выделенные элементы в Буфер Обмена</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="182"/>
+ <location filename="../../gpgwin.cpp" line="187"/>
<source>Select &amp;All</source>
<translation>В&amp;ыделить всё</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="185"/>
+ <location filename="../../gpgwin.cpp" line="190"/>
<source>Select the whole text</source>
<translation>Выделить весь текст</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="189"/>
+ <location filename="../../gpgwin.cpp" line="194"/>
<source>Open settings dialog</source>
<translation>Открыть окно настроек</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="195"/>
+ <location filename="../../gpgwin.cpp" line="200"/>
<source>&amp;Encrypt</source>
<translation>З&amp;ашифровать</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="198"/>
+ <location filename="../../gpgwin.cpp" line="203"/>
<source>Encrypt Message</source>
<translation>Зашифровать текст</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="201"/>
+ <location filename="../../gpgwin.cpp" line="206"/>
<source>&amp;Decrypt</source>
<translation>Расшифро&amp;вать</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="204"/>
+ <location filename="../../gpgwin.cpp" line="209"/>
<source>Decrypt Message</source>
<translation>Расшифровать текст</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="216"/>
+ <location filename="../../gpgwin.cpp" line="221"/>
<source>Import New Key From File</source>
<translation>Импорт нового ключа из файла</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="221"/>
+ <location filename="../../gpgwin.cpp" line="226"/>
<source>Import New Key From Editor</source>
<translation>Импорт нового ключа из редактора</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="241"/>
+ <location filename="../../gpgwin.cpp" line="246"/>
<source>&amp;About</source>
<translation>&amp;О программе</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="243"/>
+ <location filename="../../gpgwin.cpp" line="248"/>
<source>Show the application&apos;s About box</source>
<translation>Показать инфо о программе</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="214"/>
- <location filename="../../gpgwin.cpp" line="260"/>
- <location filename="../../gpgwin.cpp" line="632"/>
+ <location filename="../../gpgwin.cpp" line="219"/>
+ <location filename="../../gpgwin.cpp" line="265"/>
+ <location filename="../../gpgwin.cpp" line="638"/>
<source>&amp;File</source>
<translation>Ф&amp;айл</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="268"/>
+ <location filename="../../gpgwin.cpp" line="273"/>
<source>&amp;Edit</source>
<translation>&amp;Правка</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="294"/>
+ <location filename="../../gpgwin.cpp" line="300"/>
<source>&amp;Help</source>
<translation>&amp;Справка</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="446"/>
+ <location filename="../../gpgwin.cpp" line="452"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="312"/>
+ <location filename="../../gpgwin.cpp" line="318"/>
<source>Edit</source>
<translation>Правка</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="188"/>
+ <location filename="../../gpgwin.cpp" line="193"/>
<source>Se&amp;ttings</source>
<translation>&amp;Настройки</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="207"/>
+ <location filename="../../gpgwin.cpp" line="212"/>
<source>&amp;File Encryption</source>
<translation>Шифрование &amp;файлов</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="209"/>
+ <location filename="../../gpgwin.cpp" line="214"/>
<source>Encrypt/Decrypt File</source>
<translation>За-/Расшифровать файл</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="229"/>
+ <location filename="../../gpgwin.cpp" line="234"/>
<source>Key Management</source>
<translation>Менеджер ключей</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="231"/>
+ <location filename="../../gpgwin.cpp" line="236"/>
<source>Open Keymanagement</source>
<translation>Открыть Менеджер ключей</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="236"/>
+ <location filename="../../gpgwin.cpp" line="241"/>
<source>Open Import New Key Dialog</source>
<translation>Открыть окно импорта ключей</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="246"/>
+ <location filename="../../gpgwin.cpp" line="251"/>
<source>Online &amp;Tutorial</source>
<translation>Онлайн-&amp;руководство</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="248"/>
+ <location filename="../../gpgwin.cpp" line="253"/>
<source>Open Online Tutorial</source>
<translation>Открыть онлайн-руководство</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="253"/>
+ <location filename="../../gpgwin.cpp" line="258"/>
<source>Append Selected Key(s) To Text</source>
<translation>Добавить выбранн. ключ(и) к тексту</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="254"/>
+ <location filename="../../gpgwin.cpp" line="259"/>
<source>Append The Selected Keys To Text in Editor</source>
<translation>Добавить выбранный ключ к тексту в редакторе</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="284"/>
+ <location filename="../../gpgwin.cpp" line="290"/>
<source>&amp;Keys</source>
<translation>&amp;Ключи</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="285"/>
+ <location filename="../../gpgwin.cpp" line="291"/>
<source>&amp;Import Key From...</source>
<translation>&amp;Импорт ключа из...</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="292"/>
+ <location filename="../../gpgwin.cpp" line="298"/>
<source>&amp;View</source>
<translation>&amp;Вид</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="307"/>
+ <location filename="../../gpgwin.cpp" line="313"/>
<source>Key</source>
<translation>Ключ</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="321"/>
- <location filename="../../gpgwin.cpp" line="472"/>
+ <location filename="../../gpgwin.cpp" line="327"/>
+ <location filename="../../gpgwin.cpp" line="478"/>
<source>Ready</source>
<translation>Готово</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="328"/>
+ <location filename="../../gpgwin.cpp" line="334"/>
<source>Encrypt for:</source>
<translation> Зашифровать для:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="336"/>
+ <location filename="../../gpgwin.cpp" line="342"/>
<source>Attached files:</source>
<translation>Прикреплённые файлы:</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="391"/>
- <location filename="../../gpgwin.cpp" line="431"/>
+ <location filename="../../gpgwin.cpp" line="397"/>
+ <location filename="../../gpgwin.cpp" line="437"/>
<source>Application</source>
<translation>Приложение</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="392"/>
+ <location filename="../../gpgwin.cpp" line="398"/>
<source>Cannot read file %1:
%2.</source>
<translation>Не удалось прочесть файл %1:
%2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="404"/>
+ <location filename="../../gpgwin.cpp" line="410"/>
<source>File loaded</source>
<translation>Файл загружен</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="419"/>
+ <location filename="../../gpgwin.cpp" line="425"/>
<source>%1[*] - %2</source>
<translation></translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="432"/>
+ <location filename="../../gpgwin.cpp" line="438"/>
<source>The document has been modified.
Do you want to save your changes?</source>
<translation>Документ был редактирован.
Сохранить изменения?</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="447"/>
+ <location filename="../../gpgwin.cpp" line="453"/>
<source>Cannot write file %1:
%2.</source>
<translation>Не удалось записать файл %1:
%2.</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="456"/>
+ <location filename="../../gpgwin.cpp" line="462"/>
<source>Saved &apos;%1&apos;</source>
<translation>&quot;%1&quot; сохранён</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="481"/>
+ <location filename="../../gpgwin.cpp" line="487"/>
<source>&lt;center&gt;This Application allows you to do simple&lt;br&gt;encryption/decryption of your text-message or file.&lt;br&gt;It&apos;s licensed under the GPL v2.0&lt;br&gt;&lt;br&gt;&lt;b&gt;Developer:&lt;/b&gt;&lt;br&gt;Bene, Heimer, Juergen, Nils, Ubbo&lt;br&gt;&lt;br&gt;&lt;b&gt;Translation:&lt;/b&gt;&lt;br&gt;Alessandro (pt_br), Alex (fr), Kirill (ru), Viriato (es)&lt;br&gt;&lt;br&gt;If you have any questions and/or&lt;br&gt;suggestions, contact us at&lt;br&gt;gpg4usb at cpunk.de&lt;/a&gt;&lt;br&gt;&lt;br&gt;or feel free to meet us in our xmpp-channel:&lt;br&gt;gpg4usb at conference.jabber.ccc.de&lt;/center&gt;</source>
<translation></translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Open Key</source>
<translation>Открыть ключ</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="599"/>
+ <location filename="../../gpgwin.cpp" line="605"/>
<source>couldn&apos;t open file: </source>
<translation>Не удалось открыть файл: </translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="219"/>
- <location filename="../../gpgwin.cpp" line="633"/>
+ <location filename="../../gpgwin.cpp" line="224"/>
+ <location filename="../../gpgwin.cpp" line="639"/>
<source>&amp;Editor</source>
<translation>Окна &amp;редактора</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="224"/>
- <location filename="../../gpgwin.cpp" line="634"/>
+ <location filename="../../gpgwin.cpp" line="229"/>
+ <location filename="../../gpgwin.cpp" line="640"/>
<source>&amp;Clipboard</source>
<translation>&amp;Буфера Обмена</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="226"/>
+ <location filename="../../gpgwin.cpp" line="231"/>
<source>Import New Key From Clipboard</source>
<translation>Импорт нового ключа из Буфера Обмена</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="234"/>
- <location filename="../../gpgwin.cpp" line="623"/>
+ <location filename="../../gpgwin.cpp" line="239"/>
+ <location filename="../../gpgwin.cpp" line="629"/>
<source>Import Key</source>
<translation>Импорт ключа</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="278"/>
+ <location filename="../../gpgwin.cpp" line="284"/>
<source>&amp;Crypt</source>
<translation>&amp;Шифрование</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="301"/>
+ <location filename="../../gpgwin.cpp" line="307"/>
<source>Crypt</source>
<translation>Шифрование</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="478"/>
+ <location filename="../../gpgwin.cpp" line="484"/>
<source>About </source>
<translation>О программе </translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>Key Files</source>
<translation>Файлы ключей</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="595"/>
+ <location filename="../../gpgwin.cpp" line="601"/>
<source>All Files</source>
<translation>Все файлы</translation>
</message>
<message>
- <location filename="../../gpgwin.cpp" line="631"/>
+ <location filename="../../gpgwin.cpp" line="637"/>
<source>Import Key From...</source>
<translation>Импорт ключа из...</translation>
</message>