diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
40 files changed, 404 insertions, 288 deletions
diff --git a/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml new file mode 100644 index 000000000..e052ff333 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/api_remote_select_allowed_keys.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include + android:id="@+id/toolbar_include" + layout="@layout/toolbar_standalone" /> + + <LinearLayout + android:layout_below="@id/toolbar_include" + android:padding="16dp" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_select_keys_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/api_select_keys_text" /> + + <ScrollView + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <FrameLayout + android:id="@+id/api_allowed_keys_list_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </ScrollView> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml index c7f9821eb..4e4b53118 100644 --- a/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubikey_wait_fragment.xml @@ -22,8 +22,7 @@ android:layout_marginTop="16dp" android:layout_marginLeft="8dp" android:textAppearance="?android:attr/textAppearanceMedium" - android:text="Hold Yubikey against device dawg" - /> + android:text="@string/yubikey_create" /> <ImageView android:layout_width="match_parent" diff --git a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml deleted file mode 100644 index 60673e475..000000000 --- a/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml +++ /dev/null @@ -1,99 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <View - android:id="@+id/status_divider" - android:layout_height="1dip" - android:layout_width="match_parent" - android:background="?android:attr/listDivider" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="4dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:orientation="horizontal" - - android:id="@+id/decrypt_file_browse" - android:clickable="true" - android:background="?android:selectableItemBackground"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:paddingLeft="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:text="@string/label_file_colon" - android:gravity="center_vertical" /> - - <TextView - android:id="@+id/decrypt_file_filename" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:hint="@string/filemanager_title_open" - android:drawableRight="@drawable/ic_folder_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" /> - </LinearLayout> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_marginBottom="8dp" /> - - <CheckBox - android:id="@+id/decrypt_file_delete_after_decryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_delete_after_decryption" /> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <TextView - android:id="@+id/decrypt_file_action_decrypt" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" - android:text="@string/btn_decrypt_verify_file" - android:clickable="true" - android:background="?android:selectableItemBackground" - android:drawableRight="@drawable/ic_save_grey_24dp" - android:drawablePadding="8dp" - android:gravity="center_vertical" - android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" /> - - <View - android:layout_width="match_parent" - android:layout_height="1dip" - android:background="?android:attr/listDivider" - android:layout_above="@+id/decrypt_file_action_decrypt" /> - - </RelativeLayout> - </LinearLayout> - </LinearLayout> -</ScrollView>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml index 3d214dbf6..6c8a2e859 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -5,7 +5,7 @@ <include android:id="@+id/toolbar_include" - layout="@layout/toolbar_standalone_white" /> + layout="@layout/toolbar_result_decrypt" /> <!-- fitsSystemWindows and layout_marginTop from diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml new file mode 100644 index 000000000..22ee7e09f --- /dev/null +++ b/OpenKeychain/src/main/res/layout/decrypt_files_fragment.xml @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <ScrollView + android:fillViewport="true" + android:paddingTop="8dp" + android:layout_width="match_parent" + android:scrollbars="vertical" + android:layout_height="0dp" + android:layout_weight="1"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <View + android:id="@+id/status_divider" + android:layout_height="1dip" + android:layout_width="match_parent" + android:background="?android:attr/listDivider" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:paddingTop="4dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + + android:id="@+id/decrypt_files_browse" + android:clickable="true" + android:background="?android:selectableItemBackground"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/label_file_colon" + android:gravity="center_vertical" /> + + <TextView + android:id="@+id/decrypt_files_filename" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:hint="@string/filemanager_title_open" + android:drawableRight="@drawable/ic_folder_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" /> + </LinearLayout> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_marginBottom="8dp" /> + + <CheckBox + android:id="@+id/decrypt_files_delete_after_decryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_delete_after_decryption" /> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/decrypt_files_action_decrypt" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:text="@string/btn_decrypt_verify_file" + android:clickable="true" + android:background="?android:selectableItemBackground" + android:drawableRight="@drawable/ic_save_grey_24dp" + android:drawablePadding="8dp" + android:gravity="center_vertical" + android:layout_alignParentBottom="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" + android:layout_above="@+id/decrypt_files_action_decrypt" /> + + </RelativeLayout> + </LinearLayout> + </LinearLayout> + </ScrollView> + </LinearLayout> + + <!-- TODO: Use this layout later to hide file list --> + <LinearLayout + android:visibility="gone" + android:id="@+id/decrypt_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"></LinearLayout> + + <LinearLayout + android:visibility="gone" + android:id="@+id/decrypt_error_overlay" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:orientation="vertical" + android:gravity="center_vertical"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/decrypt_invalid_text" + android:padding="16dp" + android:layout_gravity="center" + android:textColor="@color/android_red_light" /> + + <Button + android:id="@+id/decrypt_error_overlay_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/button_edgy" + android:textColor="@color/android_red_light" + android:text="@string/decrypt_invalid_button" + android:layout_gravity="center_horizontal" /> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml index 33fc78780..9167a2859 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_fragment.xml @@ -7,7 +7,7 @@ <LinearLayout android:visibility="gone" - android:id="@+id/decrypt_text_valid" + android:id="@+id/decrypt_content" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" @@ -37,7 +37,7 @@ </LinearLayout> <LinearLayout - android:id="@+id/decrypt_text_invalid" + android:id="@+id/decrypt_error_overlay" android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" @@ -54,7 +54,7 @@ android:textColor="@color/android_red_light" /> <Button - android:id="@+id/decrypt_text_invalid_button" + android:id="@+id/decrypt_error_overlay_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@drawable/button_edgy" @@ -62,4 +62,4 @@ android:text="@string/decrypt_invalid_button" android:layout_gravity="center_horizontal" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/main_activity.xml b/OpenKeychain/src/main/res/layout/main_activity.xml index 4a07053ea..45df0df71 100644 --- a/OpenKeychain/src/main/res/layout/main_activity.xml +++ b/OpenKeychain/src/main/res/layout/main_activity.xml @@ -1,19 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" android:layout_width="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" android:layout_height="match_parent"> <android.support.v7.widget.Toolbar - android:id="@+id/activity_main_toolbar" + android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" + android:layout_height="wrap_content" android:elevation="4dp" - android:background="?attr/colorPrimary"/> + android:background="?attr/colorPrimary" + android:minHeight="?attr/actionBarSize" + app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + tools:ignore="UnusedAttribute" /> <FrameLayout android:id="@+id/main_fragment_container" android:layout_gravity="center" android:layout_height="match_parent" - android:layout_width="match_parent"/> + android:layout_width="match_parent" /> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-bg/help_changelog.md b/OpenKeychain/src/main/res/raw-bg/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-bg/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-bg/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-cs/help_changelog.md b/OpenKeychain/src/main/res/raw-cs/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-cs/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-cs/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-de/help_changelog.md b/OpenKeychain/src/main/res/raw-de/help_changelog.md index cd0a47f45..171c92403 100644 --- a/OpenKeychain/src/main/res/raw-de/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-de/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material-Design * QR-Scanner-Integration (benötigt neue Berechtigungen) diff --git a/OpenKeychain/src/main/res/raw-es/help_changelog.md b/OpenKeychain/src/main/res/raw-es/help_changelog.md index 7c4367594..4306f3f08 100644 --- a/OpenKeychain/src/main/res/raw-es/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-es/help_changelog.md @@ -1,8 +1,8 @@ [//]: # (NOTA: ¡Por favor ponga cada frase en su propia línea, Transifex pone cada línea en su propio campo de traducción!) -## 3.2beta2 +## 3.2 - * Diseño estilo Material + * Material design (estilo) * Integración de QR Scanner (se requieren nuevos permisos) * Asistente de creación de clave mejorado * Repara contactos perdidos después de la sincronización diff --git a/OpenKeychain/src/main/res/raw-et/help_changelog.md b/OpenKeychain/src/main/res/raw-et/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-et/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-et/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-eu/help_changelog.md b/OpenKeychain/src/main/res/raw-eu/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-eu/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-eu/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-fi/help_changelog.md b/OpenKeychain/src/main/res/raw-fi/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-fi/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-fi/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-fr/help_changelog.md b/OpenKeychain/src/main/res/raw-fr/help_changelog.md index 9682bacae..b221eda6d 100644 --- a/OpenKeychain/src/main/res/raw-fr/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-fr/help_changelog.md @@ -1,6 +1,6 @@ [//] : # (NOTE : veuillez mettre chaque phrase sur sa propre ligne. Transifex met chaque ligne dans son propre champ de traduction !) -## 3.2beta2 +## 3.2 * Conception matérielle * Intégration du lecteur QR (nouvelles permissions exigées) diff --git a/OpenKeychain/src/main/res/raw-is/help_changelog.md b/OpenKeychain/src/main/res/raw-is/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-is/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-is/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-it/help_changelog.md b/OpenKeychain/src/main/res/raw-it/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-it/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-it/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-ja/help_certification.md b/OpenKeychain/src/main/res/raw-ja/help_certification.md index 3518adf73..8b4364c09 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_certification.md +++ b/OpenKeychain/src/main/res/raw-ja/help_certification.md @@ -1,28 +1,28 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## Key Confirmation -Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. -To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. +## 鍵の検証 +キーが本当に特定の人物に対応するか検証しないで、あなたは使うことができません。 +鍵の検証の最も単純な方法はQRコードのスキャンもしくはNFCでの交換をすることです。 +2人以上の間で鍵の検証するなら、あなたの鍵にある鍵交換メソッドで使えるものを提案します。 -## Key Status +## 鍵ステータス <img src="status_signature_verified_cutout_24dp"/> -Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +検証済み:あなたは既に鍵を検証しています、e.g.QRコードのスキャン。 <img src="status_signature_unverified_cutout_24dp"/> -Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +未検証: この鍵はまだ検証されていません。あなたはこの鍵が特定の個人と結び付くとして利用することができません。 <img src="status_signature_expired_cutout_24dp"/> -Expired: This key is no longer valid. Only the owner can extend its validity. +期限切れ: この鍵はすでに有効ではありません。鍵の主だけが鍵の有効期間を拡大することができます。 <img src="status_signature_revoked_cutout_24dp"/> -Revoked: This key is no longer valid. It has been revoked by its owner. +破棄済み: この鍵は有効ではありません。鍵の主がすでに破棄しています。 -## Advanced Information -A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard. -This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by: +## 詳細情報 +OpenKeychainでの"鍵の検証"はOpenPGP標準に準拠した証明を生成する実装がなされています。 +この証明は ["汎用証明 (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) として標準に以下として記述されています: "The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID." -Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust. -Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust. +歴史的に、証明(またより高いレベルの証明、"肯定的な証明" (0x13)) は OpenPGPによるWeb of Trustとして組織化されます。 +われわれの鍵の証明モデルはとてもシンプルなコンセプトによって関連する一般的なユーザビリティの問題を回避する概念です。 We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go". We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG. Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-ja/help_changelog.md b/OpenKeychain/src/main/res/raw-ja/help_changelog.md index c25d91a19..181544767 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ja/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * マテリアルデザイン * QRスキャナの統合 (新しいパーミッションを必要とします) @@ -47,13 +47,13 @@ ## 3.0 * Yubikeyでの署名生成と復号化のフルサポート - * Propose installable compatible apps in apps list - * New design for decryption screens - * Many fixes for key import, also fixes stripped keys - * Honor and display key authenticate flags - * User interface to generate custom keys - * Fixing user id revocation certificates - * New cloud search (searches over traditional keyservers and keybase.io) + * インストールできるAPIの互換性のあるアプリをアプリ内リストで提示します + * 復号化画面を新しいデザインに + * 鍵のインポートで沢山の修正、また鍵のストリップでも修正 + * 鍵の認証フラグの表示と設定 + * カスタムした鍵の生成のユーザーインタフェース + * ユーザーID破棄証明の修正 + * 新しいクラウド検索 (古典的な keyserverと keybase.io から検索します) * OpenKeychain内で鍵をストリップするのをサポートしました @@ -115,155 +115,155 @@ Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Catha ## 2.6 * 鍵証明 (ありがとうVincent Breitmoser) - * Support for GnuPG partial secret keys (thanks to Vincent Breitmoser) - * New design for signature verification - * Custom key length (thanks to Greg Witczak) - * Fix share-functionality from other apps + * GnuPGの部分秘密鍵のサポート (ありがとうVincent Breitmoser) + * 新しいデザインでの署名の検証 + * カスタムの鍵長 (ありがとうGreg Witczak) + * 他のアプリからの共有ファンクションの修正 ## 2.5 - * Fix decryption of symmetric OpenPGP messages/files - * Refactored key edit screen (thanks to Ash Hughes) - * New modern design for encrypt/decrypt screens - * OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup) + * 対称暗号化PGPメッセージ/ファイルの復号化を修正 + * 鍵編集画面のリファクタ (ありがとうAsh Hughes) + * 暗号化/復号化画面を新しいモダンなデザインに + * OpenPGP API バージョン 3 (複数APIアカウント, 内部修正,鍵検索) ## 2.4 -Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! -Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +このリリースにおいて適用したリッチでバグのない機能を作ってくれたGoogle Summer of Code 2014の参加者たちに感謝を! +また、以下の人達(アルファベット順)の作ってくれたいくつもの小さなパッチや相当数のパッチにも: Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser. - * New unified key list - * Colorized key fingerprint - * Support for keyserver ports - * Deactivate possibility to generate weak keys - * Much more internal work on the API - * Certify user ids - * Keyserver query based on machine-readable output - * Lock navigation drawer on tablets - * Suggestions for emails on creation of keys - * Search in public key lists - * And much more improvements and fixes… + * 新しい統合キーリスト + * 鍵指紋のカラー化 + * 鍵サーバのポート設定のサポート + * 弱い鍵の生成が可能だったのを無効化 + * さらなるAPIでの内部動作 + * ユーザーIDの証明 + * 鍵サーバへの要求をマシンリーダブル出力を基盤にした + * タブレットでのナビゲーションドロワーのロック + * 鍵の生成でのメールについての提案 + * 公開鍵リスト内での検索 + * そしてさらなる改善と修正... ## 2.3.1 - * Hotfix for crash when upgrading from old versions + * 古いバージョンからのアップデートでクラッシュすることに対するホットフィックス ## 2.3 - * Remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes) - * Fix setting expiry dates on keys (thanks to Ash Hughes) - * More internal fixes when editing keys (thanks to Ash Hughes) - * Querying keyservers directly from the import screen - * Fix layout and dialog style on Android 2.2-3.0 - * Fix crash on keys with empty user ids - * Fix crash and empty lists when coming back from signing screen - * Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source - * Fix upload of key from signing screen + * 秘密鍵のエクスポート時における必要でない公開鍵のエクスポートの削除 (ありがとうAsh Hughes) + * 鍵の期限日時設定の修正 (ありがとうAsh Hughes) + * 鍵編集時のさらなる内部修正 (ありがとうAsh Hughes) + * インポート画面から直接鍵サーバへ要求するようにした + * Android 2.2から3.0でのレイアウトとダイアログスタイルの修正 + * 空ユーザIDの鍵でのクラッシュ修正 + * 署名画面から戻ってきたときにリストが空だとクラッシュするのを修正 + * Bouncy Castle (cryptography library) を1.47 から 1.50アップデートおよびソースからのビルド + * 署名画面からの鍵のアップロード修正 ## 2.2 - * New design with navigation drawer - * New public key list design - * New public key view - * Bug fixes for importing of keys - * Key cross-certification (thanks to Ash Hughes) - * Handle UTF-8 passwords properly (thanks to Ash Hughes) - * First version with new languages (thanks to the contributors on Transifex) - * Sharing of keys via QR Codes fixed and improved - * Package signature verification for API + * ナビゲーションドロワー付きの新しいデザイン + * 新しい公開鍵リストデザイン + * 新しい公開鍵ビュー + * 鍵のインポート時のバグ修正 + * 鍵のクロス証明 (ありがとうAsh Hughes) + * 適切な UTF-8 パスワード処理 (ありがとうAsh Hughes) + * 新しい言語での最初のバージョン (ありがとうTransifexの貢献者達) + * QRコードによる鍵共有の修正と改善 + * APIでのパッケージ署名検証 ## 2.1.1 - * API Updates, preparation for K-9 Mail integration + * APIアップデート、K-9 Mail統合準備 ## 2.1 - * Lots of bug fixes - * New API for developers - * PRNG bug fix by Google + * たくさんのバグ修正 + * 開発者向け新API + * Googleによる擬似乱数生成器バグの修正 ## 2.0 - * Complete redesign - * Share public keys via QR codes, NFC beam - * Sign keys - * Upload keys to server - * Fixes import issues - * New AIDL API + * 再デザイン完了 + * QRコード、NFCビームでの公開鍵共有 + * 鍵への署名 + * 鍵サーバへアップロード + * インポート問題修正 + * 新しいAIDL API ## 1.0.8 - * Basic keyserver support - * App2sd - * More choices for passphrase cache: 1, 2, 4, 8, hours - * Translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick) - * Bugfixes - * Optimizations + * 鍵サーバの基本サポート + * App2SD + * パスフレーズのキャッシュ時間についての選択肢追加: 1,2,4,8時間 + * 翻訳: ノルウェー語 (ありがとう、Sander Danielsen)、中国語 (ありがとう、Zhang Fredrick) 追加 + * バグ修正 + * 最適化 ## 1.0.7 - * Fixed problem with signature verification of texts with trailing newline - * More options for passphrase cache time to live (20, 40, 60 mins) + * 改行を含まないテキストの署名検証問題の修正 + * パスフレーズのキャッシュ生存時間 (20,40,60分) のオプション追加 ## 1.0.6 - * Account adding crash on Froyo fixed - * Secure file deletion - * Option to delete key file after import - * Stream encryption/decryption (gallery, etc.) - * New options (language, force v3 signatures) - * Interface changes - * Bugfixes + * Froyo でのアカウント追加時クラッシュの修正 + * セキュアファイル削除 + * 鍵ファイルインポート後の削除オプション + * ストリーム暗号化/復号化 (ギャラリーなど) + * 新しいオプション (言語、強制V3署名) + * インタフェース変更 + * バグ修正 ## 1.0.5 - * German and Italian translation - * Much smaller package, due to reduced BC sources - * New preferences GUI - * Layout adjustment for localization - * Signature bugfix + * ドイツ語およびイタリア語翻訳追加 + * BCソースが重複してしまっていたことによる、より小さいパッケージ化 + * 新しい設定GUI + * ローカライズでのレイアウトを適合化 + * 署名バグ修正 ## 1.0.4 - * Fixed another crash caused by some SDK bug with query builder + * クエリービルダーによるSDKのいくつかのバグによるクラッシュの修正 ## 1.0.3 - * Fixed crashes during encryption/signing and possibly key export + * 鍵エクスポートできる時と暗号化/署名中のクラッシュ修正 ## 1.0.2 - * Filterable key lists - * Smarter pre-selection of encryption keys - * New Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers - * Fixes and additional features (key preselection) for K-9 Mail, new beta build available + * 鍵リストのフィルタ可能化 + * 暗号化鍵の事前選択のよりスマートな実装 + * VIEWおよびSENDについて新しいインテントのハンドリング、ファイルマネージャ外のファイルを暗号化/復号化するのを受け付けるようになる。 + * K-9 Mailにおける修正と追加機能 (鍵事前選択)、新しいベータビルド提供 ## 1.0.1 - * GMail account listing was broken in 1.0.0, fixed again + * 1.0.0で壊れたGmailアカウントリストアップを再度修正 ## 1.0.0 - * K-9 Mail integration, APG supporting beta build of K-9 Mail - * Support of more file managers (including ASTRO) - * Slovenian translation - * New database, much faster, less memory usage - * Defined Intents and content provider for other apps - * Bugfixes
\ No newline at end of file + * K-9 Mail 統合、K-9 MailでのAPG サポートのベータビルド + * (ASTROを含む)ファイルマネージャのさらなるサポート + * スロベニア語翻訳追加 + * より早くてメモリ使用量の少ない新しいデータベース + * 他のアプリでのインテントおよびコンテンツプロバイダの定義 + * バグ修正
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-ja/help_start.md b/OpenKeychain/src/main/res/raw-ja/help_start.md index 4cc331942..da765bb34 100644 --- a/OpenKeychain/src/main/res/raw-ja/help_start.md +++ b/OpenKeychain/src/main/res/raw-ja/help_start.md @@ -1,16 +1,16 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## How do I activate OpenKeychain in K-9 Mail? -To use OpenKeychain with K-9 Mail, you want to follow these steps: - 1. Open K-9 Mail and long-tap on the account you want to use OpenKeychain with. - 2. Select "Account settings", scroll to the very bottom and click "Cryptography". - 3. Click on "OpenPGP Provider" and select OpenKeychain from the list. +## OpenKeychain を K-9 Mailで有効にするにはどうすればよいか? +OpenKeychain を K-9 Mail と使うには, 次のステップを進めてください: + 1. K-9 Mail を開き、OpenKeychain を使いたいアカウントでロングタップしてください。 + 2. "アカウントの設定" を選択、下のほうにある"暗号化"までスクロールし、クリックしてください。 + 3. "OpenPGP プロバイダ" をクリックし、リストからOpenKeychainを選択してください。 -## I found a bug in OpenKeychain! -Please report the bug using the [issue tracker of OpenKeychain](https://github.com/openpgp-keychain/openpgp-keychain/issues). +## OpenKeychainでバグを発見したなら! +[OpenKeychainの課題トラッカ](https://github.com/openpgp-keychain/openpgp-keychain/issues)を使ってバグを報告してください。 -## Contribute -If you want to help us developing OpenKeychain by contributing code [follow our small guide on Github](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code). +## 提供 +OpenKeychain へコードを提供し、開発を助けてくださるのなら [Githubの小ガイドを参照](https://github.com/openpgp-keychain/openpgp-keychain#contribute-code)してください。 -## Translations -Help translating OpenKeychain! Everybody can participate at [OpenKeychain on Transifex](https://www.transifex.com/projects/p/open-keychain/).
\ No newline at end of file +## 翻訳 +OpenKeychain の翻訳を助けてください! [TransifexのOpenKeychain](https://www.transifex.com/projects/p/open-keychain/)にだれでも参加することができます。
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/raw-nl/help_changelog.md b/OpenKeychain/src/main/res/raw-nl/help_changelog.md index 6fd5d9872..28c008583 100644 --- a/OpenKeychain/src/main/res/raw-nl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-nl/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integratie van QR-scanner (nieuwe machtigingen vereist) diff --git a/OpenKeychain/src/main/res/raw-pl/help_changelog.md b/OpenKeychain/src/main/res/raw-pl/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-pl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-pl/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-pt/help_changelog.md b/OpenKeychain/src/main/res/raw-pt/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-pt/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-pt/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-ro/help_changelog.md b/OpenKeychain/src/main/res/raw-ro/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-ro/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ro/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-ru/help_about.md b/OpenKeychain/src/main/res/raw-ru/help_about.md index 9d635d9df..9b2e6e78a 100644 --- a/OpenKeychain/src/main/res/raw-ru/help_about.md +++ b/OpenKeychain/src/main/res/raw-ru/help_about.md @@ -2,12 +2,12 @@ [http://www.openkeychain.org](http://www.openkeychain.org) -[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android. +[OpenKeychain](http://www.openkeychain.org) это OpenPGP имплементация для ОС Android. -License: GPLv3+ +Лицензия: GPLv3+ -## Developers - * Dominik Schürmann (Maintainer) +## Разработчики + * Dominik Schürmann (Ведущий разработчик) * Art O Cathain * Ash Hughes * Brian C. Barnes @@ -28,7 +28,7 @@ License: GPLv3+ * Tim Bray * Vincent Breitmoser -## Libraries +## Используемые библиотеки * [SpongyCastle](http://rtyley.github.com/spongycastle/) (MIT X11 License) * [SafeSlinger Exchange library](https://github.com/SafeSlingerProject/exchange-android) (MIT License) * [Android Support Libraries](http://developer.android.com/tools/support-library/index.html) (Apache License v2) diff --git a/OpenKeychain/src/main/res/raw-ru/help_certification.md b/OpenKeychain/src/main/res/raw-ru/help_certification.md index 3518adf73..61dfa67a5 100644 --- a/OpenKeychain/src/main/res/raw-ru/help_certification.md +++ b/OpenKeychain/src/main/res/raw-ru/help_certification.md @@ -1,22 +1,22 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## Key Confirmation -Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. +## Подтверждение ключей +Без подтверждения Вы не можете быть уверены, что ключ принадлежит определенному человеку. +Простейший способ подтвердить - отсканировать QR код или получить ключ через NFC. To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. -## Key Status +## Статус ключей <img src="status_signature_verified_cutout_24dp"/> -Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +Подтверждён: Вы уже подтвердили этот ключ, напр. отсканировав QR код. <img src="status_signature_unverified_cutout_24dp"/> -Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +Не подтверждён: Этот ключ ещё не прошел проверку. Вы не можете быть уверены, что ключ принадлежит определенному человеку. <img src="status_signature_expired_cutout_24dp"/> -Expired: This key is no longer valid. Only the owner can extend its validity. +Просрочен: Срок годности ключа истёк. Только его владелец может продлить срок годности. <img src="status_signature_revoked_cutout_24dp"/> -Revoked: This key is no longer valid. It has been revoked by its owner. +Отозван: Этот ключ больше не действителен. Владелец ключа отозвал его. -## Advanced Information +## Подробная информация A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard. This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by: "The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID." diff --git a/OpenKeychain/src/main/res/raw-ru/help_changelog.md b/OpenKeychain/src/main/res/raw-ru/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-ru/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-ru/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-sl/help_changelog.md b/OpenKeychain/src/main/res/raw-sl/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-sl/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sl/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-sv/help_changelog.md b/OpenKeychain/src/main/res/raw-sv/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-sv/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-sv/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-tr/help_changelog.md b/OpenKeychain/src/main/res/raw-tr/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-tr/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-tr/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-uk/help_changelog.md b/OpenKeychain/src/main/res/raw-uk/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-uk/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-uk/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md index 9d635d9df..95fca0cec 100644 --- a/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md +++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.md @@ -2,9 +2,9 @@ [http://www.openkeychain.org](http://www.openkeychain.org) -[OpenKeychain](http://www.openkeychain.org) is an OpenPGP implementation for Android. +<a href="http://www.openkeychain.org">OpenKeychain</a>是一個Android的OpenPGP應用。 -License: GPLv3+ +授權: GPLv3+ ## Developers * Dominik Schürmann (Maintainer) diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md index 3518adf73..a69349fa2 100644 --- a/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md +++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_certification.md @@ -1,23 +1,23 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## Key Confirmation -Without confirmation, you cannot be sure if a key really corresponds to a specific person. -The simplest way to confirm a key is by scanning the QR Code or exchanging it via NFC. +金鑰認證 +這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。 +最簡單確認金鑰的方式就是透過掃描QR code或是經由NFC交換。 To confirm keys between more than two persons, we suggest to use the key exchange method available for your keys. -## Key Status +## 金鑰狀態 <img src="status_signature_verified_cutout_24dp"/> -Confirmed: You have already confirmed this key, e.g., by scanning the QR Code. +已認證： 你已經認證了這個金鑰，例如透過掃描QR Code。 <img src="status_signature_unverified_cutout_24dp"/> -Unconfirmed: This key has not been confirmed yet. You cannot be sure if the key really corresponds to a specific person. +未確認：這個身分識別尚未經過認證，你不能確認這個身分識別是否屬於真的某個人。 <img src="status_signature_expired_cutout_24dp"/> -Expired: This key is no longer valid. Only the owner can extend its validity. +已過期：這個金鑰因超過有效期限而失效。只有金鑰擁有者可以改變有效期限。 <img src="status_signature_revoked_cutout_24dp"/> -Revoked: This key is no longer valid. It has been revoked by its owner. +已撤銷：這個金鑰已經被擁有者撤銷而失效。 ## Advanced Information -A "key confirmation" in OpenKeychain is implemented by creating a certification according to the OpenPGP standard. +在OpenKeychain中，透過根據標準OpenPGP所建立的證書可以簡單的認證一個金鑰。 This certification is a ["generic certification (0x10)"](http://tools.ietf.org/html/rfc4880#section-5.2.1) described in the standard by: "The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID." diff --git a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw-zh/help_changelog.md b/OpenKeychain/src/main/res/raw-zh/help_changelog.md index 4a7ddb7f2..ab7fa8773 100644 --- a/OpenKeychain/src/main/res/raw-zh/help_changelog.md +++ b/OpenKeychain/src/main/res/raw-zh/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * Material design * Integration of QR Scanner (New permissions required) diff --git a/OpenKeychain/src/main/res/raw/help_changelog.md b/OpenKeychain/src/main/res/raw/help_changelog.md index 98639de71..6f499d531 100644 --- a/OpenKeychain/src/main/res/raw/help_changelog.md +++ b/OpenKeychain/src/main/res/raw/help_changelog.md @@ -1,6 +1,6 @@ [//]: # (NOTE: Please put every sentence in its own line, Transifex puts every line in its own translation field!) -## 3.2beta2 +## 3.2 * First version with full YubiKey support available from the user interface: Edit keys, bind YubiKey to keys,... * Material design diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 2dd1821ee..ce0911af5 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -130,11 +130,13 @@ <plurals name="n_keys"> <item quantity="one">1 ключ</item> <item quantity="few">%d ключей</item> + <item quantity="many">%d ключей</item> <item quantity="other">%d ключей</item> </plurals> <plurals name="n_keyservers"> <item quantity="one">%d сервер ключей</item> <item quantity="few">%d серверов ключей</item> + <item quantity="many">%d серверов ключей</item> <item quantity="other">%d серверов ключей</item> </plurals> <string name="secret_key">Секретный ключ:</string> @@ -264,6 +266,7 @@ <plurals name="progress_exporting_key"> <item quantity="one">экспорт ключа...</item> <item quantity="few">экспорт ключей...</item> + <item quantity="many">экспорт ключей...</item> <item quantity="other">экспорт ключей...</item> </plurals> <string name="progress_extracting_signature_key">извлечение подписи ключа...</string> @@ -336,6 +339,7 @@ <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Ключ успешно импортирован</item> <item quantity="few">Успешно добавлено %1$d ключей</item> + <item quantity="many">Успешно добавлено %1$d ключей</item> <item quantity="other">Успешно добавлено %1$d ключей</item> </plurals> <string name="import_error_nothing">Нет данных для импорта.</string> @@ -388,6 +392,7 @@ <plurals name="key_list_selected_keys"> <item quantity="one">1 ключ выбран.</item> <item quantity="few">%d ключей выбрано.</item> + <item quantity="many">%d ключей выбрано.</item> <item quantity="other">%d ключей выбрано.</item> </plurals> <string name="key_list_empty_text1">Ключи не найдены!</string> @@ -785,6 +790,7 @@ <plurals name="error_import_non_pgp_part"> <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item> <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item> + <item quantity="many">части загруженного файла содержат данные OpenPGP, но это не ключ</item> <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</item> </plurals> <!--Messages for Export Log operation--> diff --git a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml index ffe2d0aae..95fa8a28c 100644 --- a/OpenKeychain/src/main/res/values-zh-rTW/strings.xml +++ b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml @@ -436,6 +436,8 @@ <string name="key_view_action_edit">編輯金鑰</string> <string name="key_view_action_encrypt">加密文字</string> <string name="key_view_action_encrypt_files">檔案</string> + <string name="key_view_action_share_with">分享...</string> + <string name="key_view_action_share_nfc">以NFC分享</string> <string name="key_view_action_upload">上傳到金鑰伺服器</string> <string name="key_view_tab_main">摘要</string> <string name="key_view_tab_share">分享</string> @@ -458,24 +460,37 @@ <item>撤銷身分識別</item> </string-array> <string name="edit_key_edit_user_id_revoked">這個身分識別已被撤銷。此動作無法還原。</string> + <string name="edit_key_edit_subkey_title">選擇操作動作！</string> <string-array name="edit_key_edit_subkey"> <item>變更到期日</item> <item>撤銷子金鑰</item> <item>Strip Subkey</item> </string-array> + <string name="edit_key_new_subkey">新增子金鑰</string> <string name="edit_key_error_add_identity">新增至少一組身分識別！</string> <string name="edit_key_error_add_subkey">新增至少一組子金鑰！</string> <!--Create key--> <string name="create_key_empty">必填欄位</string> <string name="create_key_passphrases_not_equal">口令不相符</string> <string name="create_key_final_robot_text">建立金鑰可能需要一點時間，來杯咖啡吧…</string> + <string name="create_key_name_text">選擇一個名字有關這個金鑰。 這可以是全名John Doe或是暱稱Johnny。</string> + <string name="create_key_passphrase_text">選擇一個安全性較佳的口令，當手機遺失或遭竊時可以保護你的金鑰。</string> + <string name="create_key_hint_full_name">全名或暱稱</string> + <string name="create_key_add_email">新增電子郵件</string> <!--View key--> + <string name="view_key_my_key">我的金鑰：</string> <!--Navigation Drawer--> <string name="nav_keys">金鑰</string> + <string name="nav_encrypt_decrypt">加密/解密</string> <string name="nav_apps">應用程式</string> <string name="my_keys">我的金鑰</string> <!--hints--> <!--certs--> + <string name="cert_default">預設</string> + <string name="cert_none">無</string> + <string name="cert_verify_ok">OK</string> + <string name="cert_verify_failed">失敗！</string> + <string name="cert_verify_error">錯誤！</string> <!--LogType log messages. Errors should have _ERROR_ in their name and end with a !--> <!--Import Public log entries--> <!--Import Secret log entries--> @@ -540,6 +555,7 @@ <string name="error_no_encrypt_subkey">沒有可供加密的子金鑰！</string> <string name="info_no_manual_account_creation">請不要自行建立OpenKeychain帳戶。\n更多資訊請參考說明。</string> <string name="exchange_description">要發起金鑰交換，先在右邊選擇與會人數，然後點選〝開始交換〞。\n\n接下來會詢問你兩個問題，以確保會議成員與交換的指紋是正確的。</string> + <string name="btn_start_exchange">開始交換</string> <!--Passphrase wizard--> <!--TODO: rename all the things!--> <!--<string name="enter_passphrase_twice">Enter passphrase twice</string>--> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2c438370a..3de83f9d5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -42,7 +42,7 @@ <!-- section --> <string name="section_user_ids">"Identities"</string> - <string name="section_yubikey">"Yubikey"</string> + <string name="section_yubikey">"YubiKey"</string> <string name="section_linked_system_contact">"Linked System Contact"</string> <string name="section_should_you_trust">"Should you trust this key?"</string> <string name="section_proof_details">Proof verification</string> @@ -138,7 +138,8 @@ <string name="label_file_compression">"File compression"</string> <string name="label_keyservers">"Keyservers"</string> <string name="label_key_id">"Key ID"</string> - <string name="label_creation">"Key created %s"</string> + <string name="label_key_created">"Key created %s"</string> + <string name="label_creation">"Creation"</string> <string name="label_expiry">"Expiry"</string> <string name="label_usage">"Usage"</string> <string name="label_key_size">"Key Size"</string> @@ -505,7 +506,7 @@ <string name="api_settings_delete_account">"Delete account"</string> <string name="api_settings_package_name">"Package Name"</string> <string name="api_settings_package_signature">"SHA-256 of Package Signature"</string> - <string name="api_settings_accounts">"Accounts (deprecated API)"</string> + <string name="api_settings_accounts">"Accounts (old API)"</string> <string name="api_settings_advanced">"Extended Information"</string> <string name="api_settings_allowed_keys">"Allowed Keys"</string> <string name="api_settings_settings">"Settings"</string> @@ -523,6 +524,7 @@ <string name="api_select_pub_keys_text_no_user_ids">"Please select the recipients!"</string> <string name="api_error_wrong_signature">"Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again."</string> <string name="api_select_sign_key_text">"Please select one of your existing keys or create a new one."</string> + <string name="api_select_keys_text">"None of the allowed keys is able to decrypt the content. Please select the allowed keys."</string> <!-- Share --> <string name="share_qr_code_dialog_title">"Share with QR Code"</string> @@ -643,6 +645,7 @@ <string name="create_key_add_email">"Add email address"</string> <string name="create_key_add_email_text">"Additional email addresses are also associated to this key and can be used for secure communication."</string> <string name="create_key_email_already_exists_text">"Email address has already been added"</string> + <string name="create_key_email_invalid_email">"Email address format is invalid"</string> <!-- View key --> <string name="view_key_revoked">"Revoked: Key must not be used anymore!"</string> @@ -1302,13 +1305,15 @@ <string name="yubikey_serno">"Serial No: %s"</string> <string name="yubikey_key_holder">"Key holder: "</string> <string name="yubikey_key_holder_unset">"Key holder: <unset>"</string> - <string name="yubikey_status_bound">"Yubikey matches and is bound to key"</string> - <string name="yubikey_status_unbound">"Yubikey matches, can be bound to key"</string> - <string name="yubikey_status_partly">"Yubikey matches, partly bound to key"</string> + <string name="yubikey_status_bound">"YubiKey matches and is bound to key"</string> + <string name="yubikey_status_unbound">"YubiKey matches, can be bound to key"</string> + <string name="yubikey_status_partly">"YubiKey matches, partly bound to key"</string> + <string name="yubikey_create">"Hold YubiKey against the back of your device."</string> <string name="btn_import">"Import"</string> - <string name="snack_yubi_other">Different key stored on Yubikey!</string> + <string name="snack_yubi_other">Different key stored on YubiKey!</string> <string name="error_nfc">"NFC Error: %s"</string> <string name="error_pin_nodefault">Default PIN was rejected!</string> + <string name="error_bluetooth_file">Error creating temporary file. Bluetooth sharing will fail.</string> <string name="linked_create_https_1_1">"By creating a Linked Identity of this type, you can link your key to a website you control."</string> <string name="linked_create_https_1_2">"To do this, you publish a text file on this website, then create a Linked Identity which links to it."</string> diff --git a/OpenKeychain/src/main/res/values/themes.xml b/OpenKeychain/src/main/res/values/themes.xml index 96d09151d..6ac09c5d7 100644 --- a/OpenKeychain/src/main/res/values/themes.xml +++ b/OpenKeychain/src/main/res/values/themes.xml @@ -8,17 +8,12 @@ <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> + <!-- remove actionbar and title, we use toolbar! --> <item name="windowNoTitle">true</item> - <!-- remove actionbar, we use toolbar! --> <item name="windowActionBar">false</item> <!-- multi selection should overlay Toolbar! http://stackoverflow.com/a/26450875 --> <item name="windowActionModeOverlay">true</item> <item name="searchViewStyle">@style/MySearchViewStyle</item> - - <!-- dark action bar... --> - <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item> - <!-- ...but light popup menu (white background) --> - <item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item> </style> <!-- http://android-developers.blogspot.de/2014/10/appcompat-v21-material-design-for-pre.html --> |