diff options
Diffstat (limited to '')
| -rw-r--r-- | .github/workflows/debug.yml | 124 | ||||
| -rw-r--r-- | .github/workflows/release.yml (renamed from .github/workflows/cmake.yml) | 7 | ||||
| -rw-r--r-- | resource/ts/gpg_frontend_fr.ts | 60 | ||||
| -rw-r--r-- | resource/ts/gpg_frontend_ru.ts | 60 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_en_us.ts | 60 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_zh_chs.ts | 60 | ||||
| -rw-r--r-- | resource/ts/gpgfrontend_zh_cht.ts | 60 |
7 files changed, 277 insertions, 154 deletions
diff --git a/.github/workflows/debug.yml b/.github/workflows/debug.yml new file mode 100644 index 00000000..da9ab00e --- /dev/null +++ b/.github/workflows/debug.yml @@ -0,0 +1,124 @@ +name: Debug Build & Package + +on: + push: + branches: [ develop ] + paths-ignore: + - '**/README.md' + - 'resource/ts/**' + - 'docs/**' + pull_request: + branches: [ develop ] + paths-ignore: + - '**/README.md' + - 'resource/ts/**' + - 'docs/**' + +env: + # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.) + BUILD_TYPE: Debug + EXECUTABLE_OUTPUT_PATH: ./ + +jobs: + build: + strategy: + matrix: + os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ] + runs-on: ${{ matrix.os }} + steps: + + - uses: actions/checkout@v2 + + - name: Install Dependence (Linux) + run: | + sudo apt-get update + sudo apt-get -y install build-essential binutils git autoconf automake + sudo apt-get -y install gcc g++ + sudo apt-get -y install libgpgme-dev gpg + if: matrix.os == 'ubuntu-latest' + + - name: Install Dependence (macOS) + run: | + brew install cmake git autoconf automake qt@5 + if: matrix.os == 'macos-latest' + + + - name: Cache Qt + id: cache-qt + uses: actions/cache@v1 + with: + path: ../Qt + key: ${{ runner.os }}-QtCache + if: matrix.os == 'ubuntu-latest' + + - name: Install Qt + uses: jurplel/install-qt-action@v2 + with: + cached: ${{ steps.cache-qt.outputs.cache-hit }} + if: matrix.os == 'ubuntu-latest' + + - name: Set up MinGW (Windows) + uses: msys2/setup-msys2@v2 + with: + install: git msys2-devel base-devel binutils pactoys-git mercurial cvs wget p7zip perl ruby mingw-w64-x86_64-toolchain + release: false + if: matrix.os == 'windows-latest' + + - name: Set up Dependence (Windows) + shell: msys2 {0} + run: | + pacman --noconfirm -S --needed mingw-w64-x86_64-gcc mingw-w64-x86_64-make mingw-w64-x86_64-cmake autoconf automake mingw-w64-x86_64-qt-creator mingw-w64-x86_64-gpgme + if: matrix.os == 'windows-latest' + + - name: Build GpgME + run: | + cd .. + git clone https://github.com/gpg/gpgme + cd gpgme + ./autogen.sh + ./configure && make -j2 + sudo make install + cd ${{github.workspace}} + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' + + - name: Configure CMake + # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make. + # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type + run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEXECUTABLE_OUTPUT_PATH=${{env.EXECUTABLE_OUTPUT_PATH}} + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' + + - name: Build GpgFrontend + # Build your program with the given configuration + run: cmake --build ${{github.workspace}}/build --config $env.BUILD_TYPE}} -- -j 2 + if: matrix.os == 'ubuntu-latest' || matrix.os == 'macos-latest' + + - name: Configure CMake & Build Binary(Windows) + shell: msys2 {0} + run: | + cd $(echo "/${{github.workspace}}" | sed 's/\\/\//g' | sed 's/://') + mkdir build && cd build + cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DEXECUTABLE_OUTPUT_PATH=${{env.EXECUTABLE_OUTPUT_PATH}} .. + # Build your program with the given configuration + cmake --build . --config ${{env.BUILD_TYPE}} -- -j 2 + if: matrix.os == 'windows-latest' + + - name: Upload Artifact(Linux) + uses: actions/upload-artifact@master + with: + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} + path: ${{github.workspace}}/build/release/* + if: matrix.os == 'ubuntu-latest' + + - name: Upload Artifact(macOS) + uses: actions/upload-artifact@master + with: + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} + path: ${{github.workspace}}/build/release/* + if: matrix.os == 'macos-latest' + + - name: Upload Artifact(Windows) + uses: actions/upload-artifact@master + with: + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} + path: ${{github.workspace}}/build/release/* + if: matrix.os == 'windows-latest' diff --git a/.github/workflows/cmake.yml b/.github/workflows/release.yml index 77c0d643..bbfb3ade 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,6 @@ jobs: matrix: os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ] runs-on: ${{ matrix.os }} - timeout-minutes: 18 steps: - uses: actions/checkout@v2 @@ -106,20 +105,20 @@ jobs: - name: Upload Artifact(Linux) uses: actions/upload-artifact@master with: - name: gpgfrontend-linux-release-${{github.sha}} + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'ubuntu-latest' - name: Upload Artifact(macOS) uses: actions/upload-artifact@master with: - name: gpgfrontend-macos-release-${{github.sha}} + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'macos-latest' - name: Upload Artifact(Windows) uses: actions/upload-artifact@master with: - name: gpgfrontend-windows-release-${{github.sha}} + name: gpgfrontend-${{matrix.os}}-${{env.BUILD_TYPE}}-${{github.sha}} path: ${{github.workspace}}/build/release/* if: matrix.os == 'windows-latest' diff --git a/resource/ts/gpg_frontend_fr.ts b/resource/ts/gpg_frontend_fr.ts index ac8948ca..cb45fdfa 100644 --- a/resource/ts/gpg_frontend_fr.ts +++ b/resource/ts/gpg_frontend_fr.ts @@ -903,27 +903,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="418"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="422"/> <source>Uploading Public Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="448"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="455"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="451"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="458"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="454"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="461"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="457"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="464"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> @@ -1648,127 +1648,127 @@ Make sure you keep it save.Do you really want to export your private key?</sourc <context> <name>KeyServerImportDialog</name> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="35"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="37"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="42"/> <source>&Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="36"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="41"/> <source>&Import ALL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="45"/> <source>Search String:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="44"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="49"/> <source>Key Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="93"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="98"/> <source>Import Keys from Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>UID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Creation date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>KeyID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="175"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="180"/> <source><h4>Text is empty.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="206"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="211"/> <source><h4>Couldn't contact keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="213"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="218"/> <source><h4>CToo many responses from keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="220"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> <source><h4>No keys found, input may be kexId, retrying search with 0x.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="230"/> <source><h4>No keys found containing the search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="229"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="234"/> <source><h4>Insufficiently specific search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="257"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="262"/> <source>revoked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="260"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="265"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="300"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="305"/> <source><h4>%1 keys found. Double click a key to import it.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="356"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="361"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="359"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="364"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="362"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="367"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="365"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="370"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="380"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="385"/> <source><h4>Key Updated</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="382"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="387"/> <source><h4>Key Imported</h4></source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpg_frontend_ru.ts b/resource/ts/gpg_frontend_ru.ts index 157c1348..95b5494d 100644 --- a/resource/ts/gpg_frontend_ru.ts +++ b/resource/ts/gpg_frontend_ru.ts @@ -903,27 +903,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="418"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="422"/> <source>Uploading Public Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="448"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="455"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="451"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="458"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="454"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="461"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="457"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="464"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> @@ -1648,127 +1648,127 @@ Make sure you keep it save.Do you really want to export your private key?</sourc <context> <name>KeyServerImportDialog</name> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="35"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="37"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="42"/> <source>&Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="36"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="41"/> <source>&Import ALL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="45"/> <source>Search String:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="44"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="49"/> <source>Key Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="93"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="98"/> <source>Import Keys from Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>UID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Creation date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>KeyID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="175"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="180"/> <source><h4>Text is empty.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="206"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="211"/> <source><h4>Couldn't contact keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="213"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="218"/> <source><h4>CToo many responses from keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="220"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> <source><h4>No keys found, input may be kexId, retrying search with 0x.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="230"/> <source><h4>No keys found containing the search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="229"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="234"/> <source><h4>Insufficiently specific search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="257"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="262"/> <source>revoked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="260"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="265"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="300"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="305"/> <source><h4>%1 keys found. Double click a key to import it.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="356"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="361"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="359"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="364"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="362"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="367"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="365"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="370"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="380"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="385"/> <source><h4>Key Updated</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="382"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="387"/> <source><h4>Key Imported</h4></source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_en_us.ts b/resource/ts/gpgfrontend_en_us.ts index 9c9c8a95..700e382e 100644 --- a/resource/ts/gpgfrontend_en_us.ts +++ b/resource/ts/gpgfrontend_en_us.ts @@ -903,27 +903,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="418"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="422"/> <source>Uploading Public Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="448"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="455"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="451"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="458"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="454"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="461"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="457"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="464"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> @@ -1648,127 +1648,127 @@ Make sure you keep it save.Do you really want to export your private key?</sourc <context> <name>KeyServerImportDialog</name> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="35"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="37"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="42"/> <source>&Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="36"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="41"/> <source>&Import ALL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="45"/> <source>Search String:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="44"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="49"/> <source>Key Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="93"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="98"/> <source>Import Keys from Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>UID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Creation date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>KeyID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="175"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="180"/> <source><h4>Text is empty.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="206"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="211"/> <source><h4>Couldn't contact keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="213"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="218"/> <source><h4>CToo many responses from keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="220"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> <source><h4>No keys found, input may be kexId, retrying search with 0x.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="230"/> <source><h4>No keys found containing the search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="229"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="234"/> <source><h4>Insufficiently specific search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="257"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="262"/> <source>revoked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="260"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="265"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="300"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="305"/> <source><h4>%1 keys found. Double click a key to import it.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="356"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="361"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="359"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="364"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="362"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="367"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="365"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="370"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="380"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="385"/> <source><h4>Key Updated</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="382"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="387"/> <source><h4>Key Imported</h4></source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_zh_chs.ts b/resource/ts/gpgfrontend_zh_chs.ts index 29007eab..aa0a9f30 100644 --- a/resource/ts/gpgfrontend_zh_chs.ts +++ b/resource/ts/gpgfrontend_zh_chs.ts @@ -903,27 +903,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="418"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="422"/> <source>Uploading Public Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="448"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="455"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="451"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="458"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="454"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="461"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="457"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="464"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> @@ -1648,127 +1648,127 @@ Make sure you keep it save.Do you really want to export your private key?</sourc <context> <name>KeyServerImportDialog</name> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="35"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="37"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="42"/> <source>&Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="36"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="41"/> <source>&Import ALL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="45"/> <source>Search String:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="44"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="49"/> <source>Key Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="93"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="98"/> <source>Import Keys from Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>UID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Creation date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>KeyID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="175"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="180"/> <source><h4>Text is empty.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="206"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="211"/> <source><h4>Couldn't contact keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="213"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="218"/> <source><h4>CToo many responses from keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="220"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> <source><h4>No keys found, input may be kexId, retrying search with 0x.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="230"/> <source><h4>No keys found containing the search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="229"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="234"/> <source><h4>Insufficiently specific search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="257"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="262"/> <source>revoked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="260"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="265"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="300"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="305"/> <source><h4>%1 keys found. Double click a key to import it.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="356"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="361"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="359"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="364"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="362"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="367"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="365"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="370"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="380"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="385"/> <source><h4>Key Updated</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="382"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="387"/> <source><h4>Key Imported</h4></source> <translation type="unfinished"></translation> </message> diff --git a/resource/ts/gpgfrontend_zh_cht.ts b/resource/ts/gpgfrontend_zh_cht.ts index 29007eab..aa0a9f30 100644 --- a/resource/ts/gpgfrontend_zh_cht.ts +++ b/resource/ts/gpgfrontend_zh_cht.ts @@ -903,27 +903,27 @@ <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="418"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="422"/> <source>Uploading Public Key...</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="448"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="455"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="451"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="458"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="454"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="461"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/widgets/KeyList.cpp" line="457"/> + <location filename="../../src/ui/widgets/KeyList.cpp" line="464"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> @@ -1648,127 +1648,127 @@ Make sure you keep it save.Do you really want to export your private key?</sourc <context> <name>KeyServerImportDialog</name> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="35"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> <source>&Close</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="37"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="42"/> <source>&Search</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="36"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="41"/> <source>&Import ALL</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="40"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="45"/> <source>Search String:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="44"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="49"/> <source>Key Server:</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="93"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="98"/> <source>Import Keys from Keyserver</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>UID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Creation date</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>KeyID</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="154"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="159"/> <source>Tag</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="175"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="180"/> <source><h4>Text is empty.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="206"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="211"/> <source><h4>Couldn't contact keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="213"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="218"/> <source><h4>CToo many responses from keyserver!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="220"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> <source><h4>No keys found, input may be kexId, retrying search with 0x.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="225"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="230"/> <source><h4>No keys found containing the search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="229"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="234"/> <source><h4>Insufficiently specific search string!</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="257"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="262"/> <source>revoked</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="260"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="265"/> <source>disabled</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="300"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="305"/> <source><h4>%1 keys found. Double click a key to import it.</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="356"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="361"/> <source>Key Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="359"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="364"/> <source>Timeout</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="362"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="367"/> <source>Key Server Not Found</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="365"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="370"/> <source>Connection Error</source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="380"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="385"/> <source><h4>Key Updated</h4></source> <translation type="unfinished"></translation> </message> <message> - <location filename="../../src/ui/KeyServerImportDialog.cpp" line="382"/> + <location filename="../../src/ui/KeyServerImportDialog.cpp" line="387"/> <source><h4>Key Imported</h4></source> <translation type="unfinished"></translation> </message> |