diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | gpgfrontend.icns | bin | 0 -> 200654 bytes | |||
| -rw-r--r-- | resource/ts/gpg_frontend_fr.ts | 147 | ||||
| -rw-r--r-- | resource/ts/gpg_frontend_ru.ts | 147 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_en_us.ts | 147 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_zh_chs.ts | 147 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_zh_cht.ts | 147 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 48 |
8 files changed, 496 insertions, 293 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3b72dd40..431ddcf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -75,6 +75,8 @@ IF (MINGW) message(STATUS "Configuration For OS Platform Microsoft Windows") message(STATUS "Build Environment MINGW") + set(OS_PLATFORM "WINDOWS") + set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static") include_directories( @@ -91,6 +93,8 @@ if(APPLE) message(STATUS "Configuration For OS Platform MacOS") + set(OS_PLATFORM "MACOS") + set(ENV{Qt5_DIR} /usr/local/opt/qt5/lib/cmake) include_directories( @@ -109,7 +113,7 @@ endif() if(LINUX) message(STATUS "Configuration For OS Platform LINUX") - set(Platform LINUX) + set(OS_PLATFORM "LINUX") include_directories( include diff --git a/gpgfrontend.icns b/gpgfrontend.icns Binary files differnew file mode 100644 index 00000000..89b13163 --- /dev/null +++ b/gpgfrontend.icns diff --git a/resource/ts/gpg_frontend_fr.ts b/resource/ts/gpg_frontend_fr.ts index 94d6443e..dcdd0708 100644 --- a/resource/ts/gpg_frontend_fr.ts +++ b/resource/ts/gpg_frontend_fr.ts @@ -895,217 +895,250 @@ <context> <name>KeyMgmt</name> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="68"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> <source>KeyPairs Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="75"/> - <source>&Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="94"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="76"/> - <source>Ctrl+Q</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="102"/> + <source>Generate KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="78"/> - <source>Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="83"/> - <source>Generate KeyPair</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="89"/> + <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="86"/> - <source>Generate Subkey For Selected</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="90"/> + <source>Open Key File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="99"/> + <source>New Keypair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="100"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="105"/> + <source>New Subkey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <source>Ctrl+Shift+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> <source>Generate Subkey For Selected KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="91"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="132"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> <source>Import New Key From File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> <source>&Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="98"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="118"/> <source>Import New Key From Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="101"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> <source>&Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="103"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="123"/> <source>Import New Key From Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> <source>Export To &Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="128"/> <source>Export Selected Key(s) To Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="131"/> <source>Export To &File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="133"/> <source>Export Selected Key(s) To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> <source>Delete Selected Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="117"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="137"/> <source>Delete the Selected keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="120"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> <source>Delete Checked Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="141"/> <source>Delete the Checked keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="125"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="145"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="146"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="135"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="156"/> <source>&Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="157"/> <source>&Generate Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> - <source>&Import Key From...</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> + <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> - <source>Key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="181"/> + <source>Generate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="160"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> - <source>Generate key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="182"/> + <source>Generate A New Keypair or Subkey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="170"/> - <source>Import key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <source>Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="171"/> - <source>Import key from</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="173"/> + <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="191"/> + <source>Import key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Open Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Key Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Keyring files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="197"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="218"/> <source>Couldn't Open File: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="247"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="268"/> <source>Deleting Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="248"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="269"/> <source>Are you sure that you want to delete the following keys?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="249"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="270"/> <source>The action can not be undone.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Export Key To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="288"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="309"/> <source>key(s) exported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="323"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="330"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="344"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="351"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="324"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="345"/> <source>Please select one KeyPair before doing this operation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="331"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="352"/> <source>If a key pair does not have a private key then it will not be able to generate sub-keys.</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpg_frontend_ru.ts b/resource/ts/gpg_frontend_ru.ts index 4c8c292f..847bc328 100644 --- a/resource/ts/gpg_frontend_ru.ts +++ b/resource/ts/gpg_frontend_ru.ts @@ -895,217 +895,250 @@ <context> <name>KeyMgmt</name> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="68"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> <source>KeyPairs Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="75"/> - <source>&Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="94"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="76"/> - <source>Ctrl+Q</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="102"/> + <source>Generate KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="78"/> - <source>Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="83"/> - <source>Generate KeyPair</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="89"/> + <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="86"/> - <source>Generate Subkey For Selected</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="90"/> + <source>Open Key File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="99"/> + <source>New Keypair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="100"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="105"/> + <source>New Subkey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <source>Ctrl+Shift+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> <source>Generate Subkey For Selected KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="91"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="132"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> <source>Import New Key From File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> <source>&Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="98"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="118"/> <source>Import New Key From Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="101"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> <source>&Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="103"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="123"/> <source>Import New Key From Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> <source>Export To &Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="128"/> <source>Export Selected Key(s) To Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="131"/> <source>Export To &File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="133"/> <source>Export Selected Key(s) To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> <source>Delete Selected Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="117"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="137"/> <source>Delete the Selected keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="120"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> <source>Delete Checked Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="141"/> <source>Delete the Checked keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="125"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="145"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="146"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="135"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="156"/> <source>&Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="157"/> <source>&Generate Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> - <source>&Import Key From...</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> + <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> - <source>Key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="181"/> + <source>Generate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="160"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> - <source>Generate key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="182"/> + <source>Generate A New Keypair or Subkey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="170"/> - <source>Import key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <source>Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="171"/> - <source>Import key from</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="173"/> + <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="191"/> + <source>Import key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Open Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Key Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Keyring files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="197"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="218"/> <source>Couldn't Open File: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="247"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="268"/> <source>Deleting Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="248"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="269"/> <source>Are you sure that you want to delete the following keys?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="249"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="270"/> <source>The action can not be undone.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Export Key To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="288"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="309"/> <source>key(s) exported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="323"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="330"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="344"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="351"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="324"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="345"/> <source>Please select one KeyPair before doing this operation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="331"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="352"/> <source>If a key pair does not have a private key then it will not be able to generate sub-keys.</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_en_us.ts b/resource/ts/gpgfrontend_en_us.ts index f368fc74..28cf60d7 100644 --- a/resource/ts/gpgfrontend_en_us.ts +++ b/resource/ts/gpgfrontend_en_us.ts @@ -895,217 +895,250 @@ <context> <name>KeyMgmt</name> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="68"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> <source>KeyPairs Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="75"/> - <source>&Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="94"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="76"/> - <source>Ctrl+Q</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="102"/> + <source>Generate KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="78"/> - <source>Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="83"/> - <source>Generate KeyPair</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="89"/> + <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="86"/> - <source>Generate Subkey For Selected</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="90"/> + <source>Open Key File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="99"/> + <source>New Keypair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="100"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="105"/> + <source>New Subkey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <source>Ctrl+Shift+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> <source>Generate Subkey For Selected KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="91"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="132"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> <source>Import New Key From File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> <source>&Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="98"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="118"/> <source>Import New Key From Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="101"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> <source>&Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="103"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="123"/> <source>Import New Key From Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> <source>Export To &Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="128"/> <source>Export Selected Key(s) To Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="131"/> <source>Export To &File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="133"/> <source>Export Selected Key(s) To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> <source>Delete Selected Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="117"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="137"/> <source>Delete the Selected keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="120"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> <source>Delete Checked Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="141"/> <source>Delete the Checked keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="125"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="145"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="146"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="135"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="156"/> <source>&Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="157"/> <source>&Generate Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> - <source>&Import Key From...</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> + <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> - <source>Key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="181"/> + <source>Generate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="160"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> - <source>Generate key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="182"/> + <source>Generate A New Keypair or Subkey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="170"/> - <source>Import key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <source>Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="171"/> - <source>Import key from</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="173"/> + <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="191"/> + <source>Import key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Open Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Key Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Keyring files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="197"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="218"/> <source>Couldn't Open File: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="247"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="268"/> <source>Deleting Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="248"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="269"/> <source>Are you sure that you want to delete the following keys?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="249"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="270"/> <source>The action can not be undone.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Export Key To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="288"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="309"/> <source>key(s) exported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="323"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="330"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="344"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="351"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="324"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="345"/> <source>Please select one KeyPair before doing this operation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="331"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="352"/> <source>If a key pair does not have a private key then it will not be able to generate sub-keys.</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_zh_chs.ts b/resource/ts/gpgfrontend_zh_chs.ts index 8768d0b2..408af114 100644 --- a/resource/ts/gpgfrontend_zh_chs.ts +++ b/resource/ts/gpgfrontend_zh_chs.ts @@ -895,217 +895,250 @@ <context> <name>KeyMgmt</name> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="68"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> <source>KeyPairs Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="75"/> - <source>&Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="94"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="76"/> - <source>Ctrl+Q</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="102"/> + <source>Generate KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="78"/> - <source>Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="83"/> - <source>Generate KeyPair</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="89"/> + <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="86"/> - <source>Generate Subkey For Selected</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="90"/> + <source>Open Key File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="99"/> + <source>New Keypair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="100"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="105"/> + <source>New Subkey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <source>Ctrl+Shift+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> <source>Generate Subkey For Selected KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="91"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="132"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> <source>Import New Key From File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> <source>&Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="98"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="118"/> <source>Import New Key From Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="101"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> <source>&Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="103"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="123"/> <source>Import New Key From Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> <source>Export To &Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="128"/> <source>Export Selected Key(s) To Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="131"/> <source>Export To &File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="133"/> <source>Export Selected Key(s) To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> <source>Delete Selected Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="117"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="137"/> <source>Delete the Selected keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="120"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> <source>Delete Checked Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="141"/> <source>Delete the Checked keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="125"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="145"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="146"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="135"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="156"/> <source>&Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="157"/> <source>&Generate Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> - <source>&Import Key From...</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> + <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> - <source>Key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="181"/> + <source>Generate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="160"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> - <source>Generate key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="182"/> + <source>Generate A New Keypair or Subkey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="170"/> - <source>Import key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <source>Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="171"/> - <source>Import key from</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="173"/> + <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="191"/> + <source>Import key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Open Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Key Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Keyring files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="197"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="218"/> <source>Couldn't Open File: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="247"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="268"/> <source>Deleting Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="248"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="269"/> <source>Are you sure that you want to delete the following keys?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="249"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="270"/> <source>The action can not be undone.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Export Key To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="288"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="309"/> <source>key(s) exported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="323"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="330"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="344"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="351"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="324"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="345"/> <source>Please select one KeyPair before doing this operation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="331"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="352"/> <source>If a key pair does not have a private key then it will not be able to generate sub-keys.</source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_zh_cht.ts b/resource/ts/gpgfrontend_zh_cht.ts index 8768d0b2..408af114 100644 --- a/resource/ts/gpgfrontend_zh_cht.ts +++ b/resource/ts/gpgfrontend_zh_cht.ts @@ -895,217 +895,250 @@ <context> <name>KeyMgmt</name> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="68"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> <source>KeyPairs Management</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="75"/> - <source>&Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="94"/> + <source>Ctrl+Q</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="76"/> - <source>Ctrl+Q</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="102"/> + <source>Generate KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="78"/> - <source>Close Key Management</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <source>&Open</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="81"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="83"/> - <source>Generate KeyPair</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="89"/> + <source>Ctrl+O</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="86"/> - <source>Generate Subkey For Selected</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="90"/> + <source>Open Key File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="88"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <source>&Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <source>Close</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="99"/> + <source>New Keypair</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="100"/> + <source>Ctrl+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="105"/> + <source>New Subkey</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <source>Ctrl+Shift+N</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> <source>Generate Subkey For Selected KeyPair</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="91"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="132"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> <source>&File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="93"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> <source>Import New Key From File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="96"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> <source>&Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="98"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="118"/> <source>Import New Key From Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="101"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> <source>&Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="103"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="123"/> <source>Import New Key From Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="106"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> <source>Export To &Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="108"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="128"/> <source>Export Selected Key(s) To Clipboard</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="111"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="131"/> <source>Export To &File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="113"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="133"/> <source>Export Selected Key(s) To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="116"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> <source>Delete Selected Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="117"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="137"/> <source>Delete the Selected keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="120"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> <source>Delete Checked Key(s)</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="121"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="141"/> <source>Delete the Checked keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="125"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="145"/> <source>Show Keydetails</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="126"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="146"/> <source>Show Details for this Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="135"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="156"/> <source>&Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="136"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="157"/> <source>&Generate Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="140"/> - <source>&Import Key From...</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> + <source>&Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="152"/> - <source>Key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="181"/> + <source>Generate</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="160"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="161"/> - <source>Generate key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="182"/> + <source>Generate A New Keypair or Subkey</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="170"/> - <source>Import key</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <source>Import Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="171"/> - <source>Import key from</source> + <location filename="../../src/ui/KeyMgmt.cpp" line="173"/> + <source>Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="191"/> + <source>Import key</source> + <translation type="unfinished"></translation> + </message> + <message> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Open Key</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Key Files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="192"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="213"/> <source>Keyring files</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="197"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="218"/> <source>Couldn't Open File: </source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="247"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="268"/> <source>Deleting Keys</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="248"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="269"/> <source>Are you sure that you want to delete the following keys?</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="249"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="270"/> <source>The action can not be undone.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="278"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="299"/> <source>Export Key To File</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="288"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="309"/> <source>key(s) exported</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="323"/> - <location filename="../../src/ui/KeyMgmt.cpp" line="330"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="344"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="351"/> <source>Invalid Operation</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="324"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="345"/> <source>Please select one KeyPair before doing this operation.</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyMgmt.cpp" line="331"/> + <location filename="../../src/ui/KeyMgmt.cpp" line="352"/> <source>If a key pair does not have a private key then it will not be able to generate sub-keys.</source> <translation type="unfinished"></translation> </message> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 748f3d63..c695d58c 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -16,6 +16,14 @@ qt5_wrap_cpp(QT5_MOCS ${GPGFRONTEND_HEADER_FILES} TARGET gpgfrontend) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/release) message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") +# Set Resource Output Path +if(APPLE) + set(RESOURCE_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Resources) +else() + set(RESOURCE_OUTPUT_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +endif() +message(STATUS "RESOURCE_OUTPUT_DIRECTORY ${RESOURCE_OUTPUT_DIRECTORY}") + # Get ALL SOURCE FILES file(GLOB_RECURSE ALL_SOURCE_FILES RELACTIVE ${CMAKE_SOURCE_DIR}/src/*.cpp) @@ -23,7 +31,7 @@ file(GLOB_RECURSE ALL_SOURCE_FILES RELACTIVE ${CMAKE_SOURCE_DIR}/src/*.cpp) set(QT_TS_FILES gpgfrontend_en_us.ts gpgfrontend_zh_chs.ts gpgfrontend_zh_cht.ts gpg_frontend_fr.ts gpg_frontend_ru.ts) list(TRANSFORM QT_TS_FILES PREPEND ${CMAKE_SOURCE_DIR}/resource/ts/) message(STATUS "QT_TS_FILES ${QT_TS_FILES}") -set(QT_QM_FILES_OUTPUT_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ts) +set(QT_QM_FILES_OUTPUT_DIR ${RESOURCE_OUTPUT_DIRECTORY}/ts) set_source_files_properties(${QT_TS_FILES} PROPERTIES OUTPUT_LOCATION ${QT_QM_FILES_OUTPUT_DIR}) QT5_create_translation(QON_QM_FILES ${CMAKE_SOURCE_DIR} ${QT_TS_FILES}) message(STATUS "QON_QM_FILES ${QON_QM_FILES}") @@ -33,10 +41,15 @@ add_custom_target(translations DEPENDS ${QON_QM_FILES}) configure_file(${CMAKE_SOURCE_DIR}/include/GpgFrontend.h.in ${CMAKE_SOURCE_DIR}/include/GpgFrontend.h @ONLY) # Copy Resource Files -file(COPY ${CMAKE_SOURCE_DIR}/resource/css DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/help DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) -file(COPY ${CMAKE_SOURCE_DIR}/resource/conf DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) +file(COPY ${CMAKE_SOURCE_DIR}/resource/css DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) +file(COPY ${CMAKE_SOURCE_DIR}/resource/icons DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) +file(COPY ${CMAKE_SOURCE_DIR}/resource/conf DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) + +if(APPLE) + file(COPY ${CMAKE_SOURCE_DIR}/gpgfrontend.icns DESTINATION ${RESOURCE_OUTPUT_DIRECTORY}/ FOLLOW_SYMLINK_CHAIN) + # Refresh App Bundle + file(REMOVE ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/gpgfrontend.app) +endif() # Copy Utils Files if(MINGW) @@ -54,8 +67,29 @@ set(RESOURCE_FILES ${CMAKE_SOURCE_DIR}/gpgfrontend.qrc ${APP_ICON_RESOURCE_WINDO add_custom_target(resources ALL DEPENDS ${RESOURCE_FILES}) add_dependencies(resources translations) -if((${CMAKE_BUILD_TYPE} STREQUAL "Release") AND (MINGW)) - add_executable(gpgfrontend WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) +if(${CMAKE_BUILD_TYPE} STREQUAL "Release") + if(MINGW) + add_executable(gpgfrontend WIN32 ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) + elseif(APPLE) + add_executable(gpgfrontend MACOSX_BUNDLE ${ICON_RESOURCE} ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) + set_target_properties(gpgfrontend PROPERTIES + BUNDLE True + MACOSX_BUNDLE_GUI_IDENTIFIER org.gnupg.gpgfrontend + MACOSX_BUNDLE_BUNDLE_NAME "GpgFrontend" + MACOSX_BUNDLE_LONG_VERSION_STRING ${BUILD_VERSION} + MACOSX_BUNDLE_SHORT_VERSION_STRING ${PROJECT_VERSION} + MACOSX_BUNDLE_BUNDLE_VERSION ${BUILD_VERSION} + MACOSX_BUNDLE_ICON_FILE "gpgfrontend.icns" + ) + add_custom_command(TARGET gpgfrontend POST_BUILD + COMMAND /bin/rm -rf ./gpgfrontend.app/Contents/Resources + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + COMMENT "Copying Resource INTO App Bundle Resource") + add_custom_command(TARGET gpgfrontend POST_BUILD + COMMAND /bin/mv -n ./Resources ./gpgfrontend.app/Contents/ + WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} + COMMENT "Copying Resource INTO App Bundle Resource") + endif() else() add_executable(gpgfrontend ${BASE_SOURCE} ${RESOURCE_FILES} ${QT5_MOCS}) endif() |