fix: add some missing contents and solve some conflicts

3 files changed, 49 insertions, 19 deletions

diff --git a/src/content/docs/advanced/key-package.md b/src/content/docs/advanced/key-package.md
index 28b8014..3f5868e 100644
--- a/src/content/docs/advanced/key-package.md
+++ b/src/content/docs/advanced/key-package.md
@@ -14,16 +14,43 @@ exporting, and safely transferring a KeyPackage.
 
 ## Creating a KeyPackage
 
+To create a KeyPackage, follow these steps:
 
+1. **Open the Key Management Interface**: Navigate to the main interface where
+   you manage your keys.
 
-## Exporting the KeyPackage
+2. **Export Keys**: Click on the "Export Key" button to initiate the export
+   process.
 
-After configuring the export settings:
+3. **Choose KeyPackage Export**: Select the option to export keys as a
+   KeyPackage. This will open a new dialog box for configuring the KeyPackage.
 
-1. Click on the 'OK' button to create the KeyPackage.
-2. The interface will generate two files:
-   - A `.gpgpack` file containing the packaged keys.
-   - A `.key` file which should be kept confidential and deleted after the transfer is complete.
+4. **Configure KeyPackage**:
+
+   - **KeyPackage Name**: In the first field, you will see a generated name for
+     the KeyPackage, such as `KeyPackage_41132`. You can click the button
+     labeled "Generate Key Package Name" to generate a new name if desired.
+   - **Output Path**: In the second field, click the button labeled "Select
+     Output Path" to choose where to save the KeyPackage file.
+   - **Passphrase**: In the third field, click the button labeled "Generate and
+     Save Passphrase" to generate and save a passphrase for the KeyPackage.
+     Ensure the security of this passphrase.
+
+5. **Optional Settings**:
+
+   - **Include Secret Keys**: Check the box labeled "Include secret key (Think
+     twice before acting)" if you want to include private keys in the
+     KeyPackage. This is generally not recommended unless necessary.
+   - **Exclude Keys without Private Parts**: Check the box labeled "Exclude keys
+     that do not have a private key" to exclude keys that do not have associated
+     private keys.
+
+6. **Export**: Once all settings are configured and reviewed, click the "OK"
+   button to create and export the KeyPackage.
+
+By following these steps, you can create a secure KeyPackage to transfer your
+cryptographic keys between devices. Ensure that the generated passphrase and the
+KeyPackage file are stored securely to prevent unauthorized access.
 
 ## Security Notice
 
@@ -45,8 +72,6 @@ To transfer the KeyPackage:
 
 ## After Transfer: Importing and Verifying
 
-
-
 ## Best Practices
 
 - Always ensure that you are transferring key data over a secure channel.
diff --git a/src/content/docs/advanced/sync-all-public-keys.md b/src/content/docs/advanced/sync-all-public-keys.md
index 4266fc3..687e553 100644
--- a/src/content/docs/advanced/sync-all-public-keys.md
+++ b/src/content/docs/advanced/sync-all-public-keys.md
@@ -4,7 +4,6 @@ sidebar:
   label: Sync Public Keys
 ---
 
-
 Keeping your public keys in sync with those stored on a key server is crucial
 for secure communications. This synchronization ensures that any changes to
 public keys, such as revocations or the addition of subkeys, are reflected in
@@ -30,10 +29,15 @@ GpgFrontend automates the public key synchronization process through a
 user-friendly interface. Here’s how to use it:
 
 1. Open the **Key Management** interface.
-2. Locate and click the **Sync Public Key** button. This initiates the automatic
-   synchronization.
-
-![Sync Public Key Button](https://image.cdn.bktus.com/i/2023/11/16/e2129464-6bd7-3fd4-e359-3a1f7a25bfd6.webp)
+2. In the list of public keys, you can now select specific keys to sync by
+   checking the boxes next to them.
+3. Locate and click the **Sync Public Key** button. This initiates the automatic
+   synchronization for the selected keys. If no keys are selected, all public
+   keys will be synchronized. In this case, a confirmation prompt will appear to
+   confirm full synchronization.
+
+![Sync Public Key
+Button](https://image.cdn.bktus.com/i/2023/11/16/e2129464-6bd7-3fd4-e359-3a1f7a25bfd6.webp)
 
 _Note: Replace the placeholder text with the actual link to the image showing
 the Sync Public Key button._
diff --git a/src/content/docs/appendix/translate-interface.md b/src/content/docs/appendix/translate-interface.md
index a512251..b436895 100644
--- a/src/content/docs/appendix/translate-interface.md
+++ b/src/content/docs/appendix/translate-interface.md
@@ -29,17 +29,18 @@ GpgFrontend uses the tools provided by this library.
 
 ### Before starting your work
 
-In order to facilitate coordination, please contact me via email before you
-start this work. This is very important, please contact me first so that the
-work you do can be better used by GpgFrontend.
+Before starting your work, it is no longer necessary to contact me. Please
+ensure you have a thorough understanding of Qt Linguist and its usage. You can
+directly edit the files, or use the Qt Linguist GUI Tool for editing.
 
 ### Updates to Translation Work Process
 
 - **For correcting existing translations**: You can directly modify the ts files
   and then send them to me via email.
-- **For adding a new language translation**: If you're unfamiliar with the
-  process, you can request a new ts file by emailing me. I will provide you with
-  the necessary file to start the translation for the new language.
+- **For adding a new language translation**: You can generate new ts files using
+  the Qt Linguist command line tools. If you are not technically inclined and
+  are unsure how to use these tools, you can email me, and I will provide you
+  with the appropriate ts file.
 
 ### Hand in your work