diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
95 files changed, 2265 insertions, 807 deletions
diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml index 79daef590..c60416494 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml @@ -1,25 +1,29 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="vertical" > + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <TextView - android:id="@+id/api_register_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="3dip" - android:text="@string/api_register_text" - android:textAppearance="?android:attr/textAppearanceLarge" /> - - <fragment - android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:layout="@layout/api_app_settings_fragment" /> + android:layout_height="match_parent" + android:padding="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_register_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:text="@string/api_register_text" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <fragment + android:id="@+id/api_app_settings_fragment" + android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> -</LinearLayout>
\ No newline at end of file + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml index e60ad50e3..d4fb5103a 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml @@ -1,17 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:orientation="vertical" > + android:layout_height="match_parent"> - <fragment - android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:layout="@layout/api_app_settings_fragment" /> + android:layout_height="match_parent" + android:padding="16dp" + android:orientation="vertical"> -</LinearLayout>
\ No newline at end of file + <fragment + android:id="@+id/api_app_settings_fragment" + android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> + + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml index 0695e5922..a8b68859b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml @@ -1,129 +1,123 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="wrap_content" > + android:layout_height="wrap_content" + android:orientation="vertical"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="?android:attr/listPreferredItemHeight" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" + android:gravity="center_horizontal" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/api_app_settings_app_icon" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentBottom="true" + android:layout_alignParentTop="true" + android:layout_marginRight="6dp" + android:src="@drawable/icon" /> + + <TextView + android:id="@+id/api_app_settings_app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/api_app_settings_app_icon" + android:gravity="center_vertical" + android:orientation="vertical" + android:text="Name (set in-code)" + android:textAppearance="?android:attr/textAppearanceMedium" /> + </RelativeLayout> + + <fragment + android:id="@+id/api_app_settings_select_key_fragment" + android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/select_secret_key_layout_fragment" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/api_app_settings_advanced_button" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginBottom="4dp" + android:layout_marginTop="4dp" + android:text="@string/api_settings_show_advanced" + bootstrapbutton:bb_icon_left="fa-caret-up" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> <LinearLayout + android:id="@+id/api_app_settings_advanced" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical" + android:visibility="gone"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/label_encryption_algorithm" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/api_app_settings_encryption_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> - <RelativeLayout + <TextView android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - android:gravity="center_horizontal" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/api_app_settings_app_icon" - android:layout_width="48dp" - android:layout_height="48dp" - android:layout_alignParentBottom="true" - android:layout_alignParentTop="true" - android:layout_marginRight="6dp" - android:src="@drawable/icon" /> - - <TextView - android:id="@+id/api_app_settings_app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toRightOf="@+id/api_app_settings_app_icon" - android:gravity="center_vertical" - android:orientation="vertical" - android:text="Name (set in-code)" - android:textAppearance="?android:attr/textAppearanceMedium" /> - </RelativeLayout> - - <fragment - android:id="@+id/api_app_settings_select_key_fragment" - android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + android:layout_height="wrap_content" + android:text="@string/label_hash_algorithm" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Spinner + android:id="@+id/api_app_settings_hash_algorithm" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - tools:layout="@layout/select_secret_key_layout_fragment" /> + android:text="@string/label_message_compression" + android:textAppearance="?android:attr/textAppearanceMedium" /> - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/api_app_settings_advanced_button" + <Spinner + android:id="@+id/api_app_settings_compression" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginBottom="4dp" - android:layout_marginTop="4dp" - android:text="@string/api_settings_show_advanced" - bootstrapbutton:bb_icon_left="fa-caret-up" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> - - <LinearLayout - android:id="@+id/api_app_settings_advanced" + android:text="@string/api_settings_package_name" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/api_app_settings_package_name" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:visibility="gone" > - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_encryption_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_encryption_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_hash_algorithm" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_hash_algorithm" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/label_message_compression" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <Spinner - android:id="@+id/api_app_settings_compression" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_package_name" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/api_app_settings_package_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="com.example" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/api_settings_package_signature" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/api_app_settings_package_signature" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Base64 encoded signature" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + android:text="com.example" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_package_signature" + android:textAppearance="?android:attr/textAppearanceMedium" /> -</ScrollView>
\ No newline at end of file + <TextView + android:id="@+id/api_app_settings_package_signature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Base64 encoded signature" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml index cb20a20af..e70a79589 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml @@ -1,28 +1,26 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="?android:attr/listPreferredItemHeight" - android:gravity="left" - android:orientation="horizontal" > + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingTop="4dp" + android:paddingBottom="4dp"> <ImageView android:id="@+id/api_apps_adapter_item_icon" android:layout_width="48dp" android:layout_height="48dp" - android:layout_alignParentBottom="true" - android:layout_alignParentTop="true" android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" + android:layout_centerVertical="true" android:src="@drawable/icon" /> <TextView android:id="@+id/api_apps_adapter_item_name" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:text="Application Name" + android:textAppearance="?android:attr/textAppearanceMedium" android:layout_centerVertical="true" - android:layout_toRightOf="@+id/api_apps_adapter_item_icon" - android:gravity="center_vertical" - android:orientation="vertical" - android:text="Set in-code!" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:layout_toRightOf="@+id/api_apps_adapter_item_icon" /> </RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml index 07f63b91b..ddb424ee8 100644 --- a/OpenPGP-Keychain/src/main/res/layout/sign_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml @@ -18,7 +18,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" - android:text="@string/section_signing_key" /> + android:text="@string/section_certification_key" /> <fragment android:id="@+id/sign_key_select_key_fragment" @@ -60,7 +60,7 @@ android:layout_height="60dp" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" - android:text="@string/btn_sign" + android:text="@string/btn_certify" bootstrapbutton:bb_icon_left="fa-pencil" bootstrapbutton:bb_type="info" /> </LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index c6834d745..e6c81c3fc 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -20,10 +20,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingTop="4dp" android:paddingLeft="10dp" android:paddingRight="10dp"> - <LinearLayout + <RelativeLayout android:id="@+id/signature" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -35,7 +36,8 @@ <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + android:id="@+id/relativeLayout"> <ImageView android:id="@+id/ic_signature" @@ -50,29 +52,40 @@ android:src="@drawable/overlay_error" /> </RelativeLayout> - <LinearLayout + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:visibility="gone" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="5dip"> + android:layout_height="50dp" + android:padding="4dp" + android:text="@string/btn_lookup_key" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info" + bootstrapbutton:bb_size="small" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignTop="@+id/linearLayout" + android:layout_toRightOf="@+id/relativeLayout" /> - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:text="Main User Id Rest" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left" + android:text="Main User Id Rest" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_below="@+id/mainUserId" + android:layout_toRightOf="@+id/relativeLayout" /> + </RelativeLayout> <LinearLayout android:layout_width="match_parent" diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml index 14760e79d..72f4fec50 100644 --- a/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml @@ -1,28 +1,33 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > + android:layout_height="wrap_content"> <com.beardedhen.androidbootstrap.FontAwesomeText android:id="@+id/drawer_item_icon" - android:layout_width="32dp" - android:layout_height="32dp" - android:layout_margin="10dp" + android:layout_width="30dp" + android:layout_height="wrap_content" android:gravity="center_vertical" android:textSize="24sp" - fontawesometext:fa_icon="fa-github" /> + android:layout_marginLeft="8dp" + fontawesometext:fa_icon="fa-github" + android:layout_centerVertical="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> <TextView android:id="@+id/drawer_item_text" + android:text="Test" android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_vertical" + android:layout_marginLeft="8dp" android:paddingBottom="16dp" - android:paddingLeft="4dp" android:paddingRight="16dp" android:paddingTop="16dp" android:textAppearance="@android:style/TextAppearance.Medium" - android:textColor="#111" /> + android:textColor="#111" + android:layout_alignParentTop="true" + android:layout_toRightOf="@+id/drawer_item_icon" /> -</LinearLayout> +</RelativeLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml deleted file mode 100644 index 2571bb6e7..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?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="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" - android:orientation="vertical" - android:paddingLeft="8dp" - android:singleLine="true" > - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Main User ID" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="<user@example.com>" - android:textAppearance="?android:attr/textAppearanceSmall" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml new file mode 100644 index 000000000..9307ab2e5 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml @@ -0,0 +1,45 @@ +<?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="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:layout_marginRight="?android:attr/scrollbarSize" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:singleLine="true"> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Main User ID" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="<user@example.com>" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_below="@+id/mainUserId" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <TextView + android:id="@+id/revoked" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/revoked" + android:textColor="#e00" + android:visibility="gone" + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml index 13370f2e5..cd208a545 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml @@ -2,17 +2,21 @@ <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> <fragment android:id="@+id/key_list_secret_fragment" android:name="org.sufficientlysecure.keychain.ui.KeyListSecretFragment" android:layout_width="match_parent" - android:layout_height="match_parent" /> + android:layout_height="match_parent" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:scrollbarStyle="outsideOverlay" /> </FrameLayout> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml new file mode 100644 index 000000000..1ed86f730 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml @@ -0,0 +1,32 @@ +<?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="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:paddingLeft="8dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:singleLine="true"> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Main User ID" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="<user@example.com>" + android:textAppearance="?android:attr/textAppearanceSmall" + android:layout_below="@+id/mainUserId" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml index 73a86a725..58e4919dc 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml @@ -1,220 +1,12 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" +<?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:layout_height="match_parent" + android:orientation="vertical" > - <LinearLayout + <android.support.v4.view.ViewPager + android:id="@+id/pager" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp"> + android:layout_height="match_parent" /> - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="@string/section_master_user_id" /> - - <TableLayout - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_weight="1" - android:stretchColumns="1"> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:paddingRight="10dip" - android:text="@string/label_name" /> - - <TextView - android:id="@+id/name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:paddingRight="10dip" - android:text="@string/label_email" /> - - <TextView - android:id="@+id/email" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:paddingRight="10dip" - android:text="@string/label_comment" /> - - <TextView - android:id="@+id/comment" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="" /> - </TableRow> - </TableLayout> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="@string/section_master_key" /> - - <TableLayout - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_weight="1" - android:stretchColumns="1"> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_key_id" /> - - <TextView - android:id="@+id/key_id" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="" - android:typeface="monospace" /> - </TableRow> - - <TableRow> - - <TextView - android:id="@+id/label_algorithm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_algorithm" /> - - <TextView - android:id="@+id/algorithm" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_creation" /> - - <TextView - android:id="@+id/creation" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_expiry" /> - - <TextView - android:id="@+id/expiry" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </TableRow> - - <TableRow> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_fingerprint" /> - - <TextView - android:id="@+id/fingerprint" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:typeface="monospace" /> - </TableRow> - </TableLayout> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="@string/section_user_ids" /> - - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/user_ids" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="@string/section_keys" /> - - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginTop="14dp" - android:text="@string/section_actions" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/key_view_action_encrypt" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - </LinearLayout> - -</ScrollView>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml new file mode 100644 index 000000000..299471c66 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml @@ -0,0 +1,38 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="Display of existing certifications is a planned feature for a later release of OpenPGP Keychain. Stay tuned for updates!" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_actions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_certify" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/key_view_action_certify" + bootstrapbutton:bb_icon_left="fa-pencil" + bootstrapbutton:bb_type="info" /> + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml index b50253980..c44835bb0 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml @@ -1,8 +1,7 @@ <?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="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" + android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="8dip" android:paddingRight="3dip" diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml new file mode 100644 index 000000000..055687183 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml @@ -0,0 +1,226 @@ +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <!-- focusable and related properties to workaround http://stackoverflow.com/q/16182331--> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:focusable="true" + android:focusableInTouchMode="true" + android:descendantFocusability="beforeDescendants" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_master_user_id" /> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="1"> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:paddingRight="10dip" + android:text="@string/label_name" /> + + <TextView + android:id="@+id/name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:paddingRight="10dip" + android:text="@string/label_email" /> + + <TextView + android:id="@+id/email" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="top" + android:paddingRight="10dip" + android:text="@string/label_comment" /> + + <TextView + android:id="@+id/comment" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + </TableLayout> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_master_key" /> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:stretchColumns="1"> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_key_id" /> + + <TextView + android:id="@+id/key_id" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" + android:typeface="monospace" /> + </TableRow> + + <TableRow> + + <TextView + android:id="@+id/label_algorithm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_algorithm" /> + + <TextView + android:id="@+id/algorithm" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_creation" /> + + <TextView + android:id="@+id/creation" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_expiry" /> + + <TextView + android:id="@+id/expiry" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + </TableRow> + + <TableRow> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_fingerprint" /> + + <TextView + android:id="@+id/fingerprint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" /> + </TableRow> + </TableLayout> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_user_ids" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/user_ids" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_keys" /> + + <org.sufficientlysecure.keychain.ui.widget.FixedListView + android:id="@+id/keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:layout_marginTop="14dp" + android:text="@string/section_actions" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:layout_marginBottom="10dp" + android:text="@string/key_view_action_encrypt" + bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_type="info" /> + + </LinearLayout> + +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml index 2d022ba13..508d080a6 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml @@ -1,16 +1,15 @@ <?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="?android:attr/listPreferredItemHeight" - android:layout_marginRight="?android:attr/scrollbarSize" + android:layout_height="wrap_content" android:orientation="vertical" - android:singleLine="true" > + android:paddingRight="3dip" + android:singleLine="true"> <TextView android:id="@+id/userId" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingRight="3dip" android:text="User ID" android:textAppearance="?android:attr/textAppearanceSmall" /> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml index acf3eb099..59247221a 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml @@ -65,10 +65,6 @@ </menu> </item> <item - android:id="@+id/menu_key_view_sign" - app:showAsAction="ifRoom" - android:title="@string/menu_sign_key" /> - <item android:id="@+id/menu_key_view_export_file" app:showAsAction="never" android:title="@string/menu_export_key" /> diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html index 0ebedb1a1..89f74e9b0 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html @@ -23,7 +23,9 @@ <h2>Bibliotheken</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache Lizenz v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache Lizenz v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html index f6f6844a2..56dcf0c8b 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>Einfacher Schlüsselserversupport</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>mehr Auswahlmöglichkeiten für den Passwortcache: 1, 2, 4, 8, Stunden</li> <li>Übersetzungen: norwegisch (Danke, Sander Danielsen), chinesisch (danke, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html new file mode 100644 index 000000000..a81789cec --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html @@ -0,0 +1,43 @@ +<html> +<head></head> +<body> +<p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p> +<p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> es una implementación de OpenPGP para Android. Su desarrollo comenzó como un fork de Android Privacy Guard (APG).</p> +<p>Licencia: GPLv3+</p> + +<h2>Desarrolladores de OpenPGP Keychain</h2> +<ul> +<li>Dominik Schürmann (Desarrollador principal)</li> +<li>Ash Hughes (Parches cryptográficos)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> + +</ul> +<h2>Desarrolladores de APG 1.x</h2> +<ul> +<li>'Thialfihar' (Desarrollador principal)</li> +<li>'Senecaso' (Código QR, clave de firma, carga de clave)</li> +<li>Oliver Runge</li> +<li>Markus Doits</li> +</ul> +<h2>Librerías</h2> +<ul> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Licencia Apache v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Licencia Apache v2)</li> +<li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licencia Apache v2)</li> +<li> +<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (Licencia MIT)</li> +<li> +<a href="http://code.google.com/p/zxing/">ZXing</a> (Licencia Apache v2)</li> +<li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licencia MIT X11)</li> +<li> +<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licencia Apache v2)</li> +<li>Icons de <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Compartir-Igual licencia 3.0)</li> +<li>Iconos de <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Dominio Público)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html new file mode 100644 index 000000000..dfb51dc81 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html @@ -0,0 +1,108 @@ +<html> +<head></head> +<body> +<h2>2.3</h2> +<ul> +<li>elimina la exportación innecesaria de claves públicas cuando se exporta la clave secreta (gracias a Ash Hughes)</li> +<li>corrige la configuración de la fecha de caducidad en las claves (gracias a Ash Hughes)</li> +<li>más correcciones internas cuando se editan claves (gracias a Ash Hughes)</li> +<li>consultar los servidores de claves directamente desde la ventana de importación</li> +<li>corrige el diseño y estilo de mensajes en Android 2.2-3.0</li> +<li>corrige error en claves con IDs de usuario vacías</li> +<li>corrige fallo y listados vacíos cuando se regresa desde la pantalla de firma</li> +<li>Bouncy Castle (librería criptográfica) actualizada de 1.47 a 1.50 y compilada desde la fuente</li> +<li>corrige la carga de la clave desde la pantalla de firma</li> +</ul> +<h2>2.2</h2> +<ul> +<li>nuevo diseño con Navigation Drawer</li> +<li>nuevo diseño de la lista de clave pública</li> +<li>nueva vista de la clave pública</li> +<li>correcciones en la importación de claves</li> +<li>clave de certificación cruzada (gracias a Ash Hughes)</li> +<li>manejo correcto de las contraseñas UTF-8 (gracias a Ash Hughes)</li> +<li>primera versión con nuevos idiomas (gracias a los colaboradores en Transifex)</li> +<li>compartir claves a través de códigos QR corregido y mejorado</li> +<li>verificación por API del paquete de firma</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>Actualizaciones de la API, preparación para la integración con K-9 Mail</li> +</ul> +<h2>2.1</h2> +<ul> +<li>corrección de muchos bugs</li> +<li>nueva API para desarrolladores</li> +<li>corrección del bug PRNG por Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>completo rediseño</li> +<li>compartir claves públicas a través de códigos QR, NFC, Beam</li> +<li>claves de firma</li> +<li>cargar claves al servidor</li> +<li>corrige problemas importantes</li> +<li>nueva API AIDL</li> +</ul> +<h2>1.0.8</h2> +<ul> +<li>compatibilidad básica de los servidores de claves</li> +<li>app-a-sd</li> +<li>más opciones para la caché de la frase de contraseña: 1, 2, 4, 8 horas</li> +<li>traducciones: noruego (gracias, Sander Danielsen), chino (gracias, Zhang Fredrick)</li> +<li>correcciones de errores</li> +<li>optimizaciones</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>corregido el problema con la verificación de firma de textos que arrastran a una nueva línea</li> +<li>más opciones para el tiempo de la caché de la frase de contraseña hasta ahora (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>corregido el problema al añadir cuentas en Froyo</li> +<li>borrado seguro de archivo</li> +<li>opción para borrar el archivo de clave después de importarlo</li> +<li>flujo de cifrado/descifrado (galería, etc.)</li> +<li>nuevas opciones (idioma, forzar firmas v3)</li> +<li>cambios en la interfaz</li> +<li>correcciones de errores</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>traducciones a alemán e italiano</li> +<li>paquete de mucho menos tamaño, debido a fuentes BC reducidas</li> +<li>nuevas preferencias en la GUI</li> +<li>ajuste del diseño para localización</li> +<li>corrección de error en la firma</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>corregido otro error causado por algún bug en el SDK con el constructor de consultas</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>corregidos los errores durante el cifrado/firma y probablemente en la exportación de la clave</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>listas de claves con filtro</li> +<li>preselección de claves de cifrado más inteligente</li> +<li>nuevo intento en el manejo para VER y ENVIAR, permite que los archivos sean cifrados/descifrados fuera de los gestores de archivos</li> +<li>corrige y añade características (preselección de clave) para K-9 Mail, nueva compilación disponible</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>La enumeración de cuentas de GMail no funcionaba en 1.0.0, corregida de nuevo</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>integración con K-9 Mail, APG compatible con la compilación beta de K-9 Mail</li> +<li>compatibilidad para más gestores de archivos (incluyendo ASTRO)</li> +<li>traducción al esloveno</li> +<li>nueva base de datos, más rápida, con menos demanda de memoria</li> +<li>definidos los intentos y el proveedor de contenido para otras aplicaciones</li> +<li>correcciones de errores</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html new file mode 100644 index 000000000..4a95680b5 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>Cómo recibir las claves</h2> +<ol> +<li>Vete a los contactos de tu compañero y abre el contacto con el que quieres compartir</li> +<li>Mantén los dos dispositivos de con ambos reversos juntos (tienen que estar casi en contacto) y notarás una vibración.</li> +<li>Después de que vibre, verás el contenido en el dispositivo de tu compañero convertirse en una especie de ficha con una animación de Star Trek de fondo.</li> +<li>Toca la ficha y el contenido se cargará en tu dispositivo.</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html new file mode 100644 index 000000000..d0eee8adb --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Primeros pasos</h2> +<p>Primero necesitas un par de claves personales. Crea una a través del menú "Mis claves" o importa un par de claves ya existentes a través de "Importar claves". Después, puedes descargar las claves de tus amigos o intercambiarlas a través de códigos QR o NFC.</p> + +<p>Es recomendable que instales <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> para una mejor selección de archivos y <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> para escanear los códigos QR generados. Pulsando en los enlaces se abrirá Google Play o F-Droid.</p> + +<h2>¡He encontrado un bug en OpenPGP Keychain!</h2> +<p>Por favor, informa de errores usando el <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">seguimiento de incidencias de OpenPGP Keychain</a>.</p> + +<h2>Aportar</h2> +<p>Si quieres ayudarnos con el desarrollo de OpenPGP Keychain aportando código <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">sigue nuestra pequeña guía en Github</a>.</p> + +<h2>Traducciones</h2> +<p>¡Ayúdanos a traducir OpenPGP Keychain! Todo el mundo es bienvenido en <a href="https://www.transifex.com/projects/p/openpgp-keychain/">Transifex - OpenPGP Keychain</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html new file mode 100644 index 000000000..b6c2a2278 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<body> +<ol> +<li>Asegúrate de que NFC está encendido en Ajustes > Más > NFC, y asegúrate de que Android Beam está también activado en ese mismo apartado.</li> +<li>Mantén los dos dispositivos con ambos reversos juntos (deben estar casi en contacto) y notarás una vibración.</li> +<li>Después de la vibración verás el contenido de tu dispositivo convertirse en una especie de ficha con una animación de Star Trek de fondo.</li> +<li>Pulsa la ficha y el contenido será cargado en el dispositivo de la otra persona.</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html index 6bede7bd6..0833c35d9 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html @@ -23,7 +23,9 @@ <h2>Bibliothèques</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Licence Apache v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Bibliothèque de soutien Android v4</a> (Licence Apache v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Bibliothèque de soutien Android v7 « appcompat »</a> (Licence Apache v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licence Apache v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html index d85882a9b..c86c4a465 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>supprimer l'exportation non nécessaire des clefs publiques lors de l'exportation d'une clef secrète</li> +<li>correctif de définition de la date date de péremption des clefs (merci à Ash Hughes)</li> +<li>autres correctifs internes affectant la modifications des clefs (merci à Ash hughes)</li> +<li>interrogation des serveurs de clefs directement depuis l'écran d'importation</li> +<li>correctif de mise en page et du style des fenêtres de dialogue sur Android 2.2-3.0</li> <li>corrige un plantage pour les clefs avec des ID utilisateur vides</li> <li>corrige un plantage et des listes vides en revenant de l'écran de signature</li> <li>Bouncy Castle (bibliothèque cryptographique) mise à jour de 1.47 à 1.50 et compilée depuis la source</li> -<li>supprimer l'exportation non nécessaire des clefs publiques lors de l'exportation d'une clef secrète</li> <li>correction du téléversement d'une clef depuis l'écran de signature</li> </ul> <h2>2.2</h2> diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html index 6d6e7d693..673e5b224 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>Comment recevoir des clefs</h2> <ol> -<li>Aller à la « Gestion des clefs publiques » de votre partenaire et appuyer longuement sur la clef que vous voulez partager.</li> +<li>Allez aux contacts de votre partenaire et ouvrez le contact que vous voulez partager.</li> <li>Tenir les deux appareils dos à dos (se touchant presque) et une vibration sera ressentie.</li> <li>Après la vibration, le contenu de l'appareil de votre partenaire deviendra un objet en forme de carte avec une animation à la Star Trek en arrière-plan.</li> <li>Toquer la carte et le contenu se chargera alors sur votre appareil.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html index bec69318b..4be071ec9 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>Logiciel EXPÉRIMENTAL</h2> -<p>Ce logiciel est EXPÉRIMENTAL. À utiliser à vos propres risques !</p> - <h2>Commencer</h2> -<p>Il vous faut d'abord des clefs. Importez ou créez-les depuis le menu des options de « Mes clefs secrètes ».<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>Il est recommandé que vous installiez le Gestionnaire de fichiers OI afin de pouvoir utiliser le bouton Parcourir pour choisir des fichiers depuis le Porte-clefs OpenPGP.</p> +<p>Vous avez d'abord besoin d'une paire de clefs personelles. Créez-en une avec l'option du menu « Mes clefs » ou importez des paires de clefs existantes avec « Importer des clefs ». Ensuite vous pouvez télécharger les clefs de vos amis, ou les échanger par codes QR ou NFC.</p> -<h2>Les gros morceaux à faire</h2> -<ul> -<li>L'intégration à K-9 Mail n'est pas publiée</li> -<li>L'importation de clefs existantes sera dépouillé de certificats pour l'instant</li> -<li>PGP/MIME est manquant dans K-9 Mail</li> -</ul> -<p>Si vous voulez contribuer, bifurquer et faire une demande d'extraction sur Github : <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>Il vous est recommendé d'installer le <a href="market://details?id=org.openintents.filemanager">gestionnaire de fichiers OI</a> pour sa fonction améliorée de séléction des fichiers et le <a href="market://details?id=com.google.zxing.client.android">lecteur de codes à barres</a> pour balayer les codes QR générés. Cliquer sur les liens ouvrira Google Play Store ou F-Droid pour l'installation.</p> <h2>J'ai trouvé un bogue dans le Porte-clefs OpenPGP !</h2> -<p>Veuillez le rapporter avec le <a href="https://github.com/dschuermann/openpgp-keychain/issues">gestionnaire de bogues du Porte-clefs OpenPGP</a>.</p> +<p>Veuillez rapporter le bogue en utilisant le <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">gestionnaire de bogues du Porte-clefs OpenPGP</a>.</p> + +<h2>Contribuer</h2> +<p>Si vous voulez nous aider à développer le Porte-clefs OpenPGP en y contribuant par du code, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">veuillez suivre notre petit guide sur Github</a>.</p> + +<h2>Traductions</h2> +<p>Aidez-nous à traduire le Porte-clefs OpenPGP ! Tout le monde peut y participer sur la <a href="https://www.transifex.com/projects/p/openpgp-keychain/">page Transifex du Porte-clefs OpenPGP Keychain</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html index b2592fd8e..b63c9ac84 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html @@ -4,7 +4,7 @@ <ol> <li>Assurez-vous que la NFC est activée dans Paramètres > Paramètres supplémentaires > NFC, ainsi que Android Beam. </li> <li>Tenir les deux appareils dos à dos (se touchant presque) et une vibration sera ressentie.</li> -<li>Après la vibration, le contenu de l'appareil de votre partenaire deviendra un objet en forme de carte avec une animation à la Star Trek en arrière-plan.</li> +<li>Après la vibration, le contenu de votre appareil deviendra un objet en forme de carte avec une animation à la Star Trek en arrière-plan.</li> <li>Toquer la carte et le contenu se chargera alors sur votre appareil.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html new file mode 100644 index 000000000..51e0b8c25 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html @@ -0,0 +1,43 @@ +<html> +<head></head> +<body> +<p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p> +<p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> は AndroidにおけるOpenPGP実装の一つです。開発はAndroid Privacy Guard (APG)から分岐して始まりました。</p> +<p>ライセンス: GPLv3以降</p> + +<h2>OpenPGP Keychain開発者</h2> +<ul> +<li>Dominik Schürmann (主任開発者)</li> +<li>Ash Hughes (暗号関係パッチ提供)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> + +</ul> +<h2>APG 1.xの開発者達</h2> +<ul> +<li>'Thialfihar' (主任開発者)</li> +<li>'Senecaso' (QRコード, 鍵署名, 鍵アップロード関係)</li> +<li>Oliver Runge</li> +<li>Markus Doits</li> +</ul> +<h2>ライブラリ</h2> +<ul> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> +<li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> +<li> +<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (MIT License)</li> +<li> +<a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> +<li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> +<li> +<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> +<li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> +<li>Icons from <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (パブリックドメイン)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html new file mode 100644 index 000000000..4878a3b55 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html @@ -0,0 +1,108 @@ +<html> +<head></head> +<body> +<h2>2.3</h2> +<ul> +<li>秘密鍵のエクスポート時における必要でない公開鍵のエクスポートの削除 (thanks to Ash Hughes)</li> +<li>鍵の期限日時設定の修正 (thanks to Ash Hughes)</li> +<li>鍵編集時のさらなる内部修正 (thanks to Ash Hughes)</li> +<li>インポート画面から直接鍵サーバへ要求するようにした</li> +<li>Android 2.2から3.0でのレイアウトとダイアログスタイルの修正</li> +<li>空ユーザIDの鍵でのクラッシュ修正</li> +<li>署名画面から戻ってきたときにリストが空だとクラッシュするのを修正</li> +<li>Bouncy Castle (cryptography library) を1.47 から 1.50アップデートおよびソースからのビルド</li> +<li>署名画面からの鍵のアップロード修正</li> +</ul> +<h2>2.2</h2> +<ul> +<li>ナビゲーションドロワーの新しいデザイン</li> +<li>新しい公開鍵リストデザイン</li> +<li>新しい公開鍵ビュー</li> +<li>鍵のインポート時のバグ修正</li> +<li>鍵のクロス証明 (thanks to Ash Hughes)</li> +<li>適切な UTF-8 パスワード処理 (thanks to Ash Hughes)</li> +<li>新しい言語での最初のバージョン (thanks to the contributors on Transifex)</li> +<li>QRコードによる鍵共有の修正と改善</li> +<li>APIでのパッケージ署名検証</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>APIアップデート、K-9 Mail統合準備</li> +</ul> +<h2>2.1</h2> +<ul> +<li>たくさんのバグ修正</li> +<li>開発者向け新API</li> +<li>Googleによる擬似乱数生成器バグの修正</li> +</ul> +<h2>2.0</h2> +<ul> +<li>再デザイン完了</li> +<li>QRコード、NFCビームでの公開鍵共有</li> +<li>鍵への署名</li> +<li>鍵サーバへアップロード</li> +<li>インポート問題修正</li> +<li>新しいAIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<li>鍵サーバの基本サポート</li> +<li>App2SD</li> +<li>パスフレーズのキャッシュ時間について1,2,4,8時間の選択肢追加</li> +<li>翻訳: ノルウェー語 (thanks, Sander Danielsen), 中国語 (thanks, Zhang Fredrick) 追加</li> +<li>バグ修正</li> +<li>最適化</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>改行を含まないテキストの署名検証問題の修正</li> +<li>パスフレーズのキャッシュ時間 (20,40,60分) のオプション追加</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>Froyo でのアカウント追加時クラッシュの修正</li> +<li>セキュアファイル削除</li> +<li>鍵ファイルインポート後の削除オプション</li> +<li>ストリーム暗号化/復号化 (ギャラリーなど)</li> +<li>新しいオプション (言語、強制V3署名)</li> +<li>インタフェース変更</li> +<li>バグ修正</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>ドイツ語およびイタリア語翻訳追加</li> +<li>BCソースが重複してしまっていたことによる、より小さいパッケージ化</li> +<li>新しい設定GUI</li> +<li>ローカライズでのレイアウトを適合化</li> +<li>署名バグ修正</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>クエリービルダーによるSDKのいくつかのバグによるクラッシュの修正</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>鍵エクスポートできる時と暗号化/署名中のクラッシュ修正</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>鍵リストのフィルタ可能化</li> +<li>暗号化鍵の事前選択のよりスマートな実装</li> +<li>VIEWおよびSENDについて新しいインテントのハンドリング、ファイルマネージャ外のファイルを暗号化/復号化するのを受け付けるようになる。</li> +<li>K-9 Mailにおける修正と追加機能 (鍵事前選択)、新しいベータビルド提供</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>1.0.0で壊れたGmailアカウントリストアップを再度修正</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail 統合、K-9 MailでのAPG サポートのベータビルド</li> +<li>(ASTROを含む)ファイルマネージャのさらなるサポート</li> +<li>スロベニア語翻訳追加</li> +<li>より早くてメモリ使用量の少ない新しいデータベース</li> +<li>他のアプリでのインテントおよびコンテンツプロバイダの定義</li> +<li>バグ修正</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html new file mode 100644 index 000000000..c19280fd1 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>鍵の受信方法</h2> +<ol> +<li>パートナーの連絡先に行き、共有したい連絡先を開きます。</li> +<li>2つのデバイスを背中合せ(ほとんどすべてのタッチ方法)にしてバイブを感じるまで保持しておいてください。</li> +<li>バイブの後、相手のデバイスでスタートレック風のバックグラウンドアニメーションしているカード風のコンテンツを見ると思います。</li> +<li>カードをタップしコンテンツをあなたのデバイスにロードします。</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html new file mode 100644 index 000000000..5c78a1273 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>入門</h2> +<p>最初にあなたの個人用鍵ペアが必要になります。オプションメニューの"自分の鍵"で生成するか、"鍵のインポート"から既存の鍵ペアをインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p> + +<p>ファイルの選択を拡張するには<a href="market://details?id=org.openintents.filemanager">OI File Manager</a>、<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>を生成したQRコードのスキャンのため、それぞれのインストールを必要とします。 リンクをクリックして、Google Play Store上かF-Droidからインストールしてください。</p> + +<h2>OpenPGP Keychainにバグを発見した!</h2> +<p><a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenPGP KeychainのIssueトラッカー</a>を使ってバグレポートを送ってください。</p> + +<h2>寄贈</h2> +<p>もし、あなたが OpenPGP Keychain の開発を助け、コードを寄贈するというなら、<a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">Githubの寄贈ガイドを確認</a>して下さい。</p> + +<h2>翻訳</h2> +<p>OpenPGP Keychainの翻訳を補助してください! だれでも、<a href="https://www.transifex.com/projects/p/openpgp-keychain/">TransifexでのOpenPGP Keychainプロジェクト</a>に参加できます。</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html new file mode 100644 index 000000000..422423a5d --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<body> +<ol> +<li>設定 > その他 > NFC からNFCを有効にしてください、そしてAndroid Beamもまた選択してください。</li> +<li>2つのデバイスを背中合せ(ほとんどすべてのタッチ方法)にしてバイブを感じるまで保持しておいてください。</li> +<li>バイブの後、相手のデバイスでスタートレック風のバックグラウンドアニメーションしているカード風のコンテンツを見ると思います。</li> +<li>カードをタップしコンテンツを他のデバイスに読み込ませてください。</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html index 566029511..b11aaab35 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html @@ -23,7 +23,9 @@ <h2>Компоненты</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html index d923de570..2a324202f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li> +<li>исправлена ошибка срока годности ключей (спасибо, Ash Hughes)</li> +<li>исправления ошибок при изменении ключей (спасибо, Ash Hughes)</li> +<li>запрос ключа с сервера прямо из окна импорта ключей</li> +<li>исправление внешнего вида для Android 2.2-3.0</li> <li>исправлено падение когда ключ не содержал имя пользователя</li> <li>исправлено падение и пустой список при возвращении из окна подписания</li> <li>криптографическая библиотека Bouncy Castle обновлена до версии 1.50</li> -<li>удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li> <li>исправлена загрузка ключа из окна подписания</li> </ul> <h2>2.2</h2> diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html index d55f3296b..99e6f263d 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>ЭКСПЕРИМЕНТАЛЬНАЯ программа</h2> -<p>Это ЭКСПЕРИМЕНТАЛЬНАЯ версия. Используйте на свой страх и риск!</p> - <h2>Приступая</h2> -<p>Для начала Вам потребуются ключи. Воспользуйтесь функцией Импорт в меню раздела "Мои ключи".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>Для удобства выбора файлов рекомендуется установить OI File Manager. Он будет вызываться при нажатии кнопки выбора файла.</p> +<p>Для начала вам понадобится своя пара ключей. Воспользуйтесь меню в разделе "Мои ключи", что бы создать новую, или добавьте ранее созданную пару в разделе "Импорт ключей". После этого вы сможете скачать ключи ваших друзей или обменяться ключами посредством QR кодов или NFC.</p> -<h2>Над чем еще ведётся работа</h2> -<ul> -<li>Интеграция с почтовой программой K9 Mail.</li> -<li>При импорте сущестующих ключей теряются подписи</li> -<li>Отсутсвует поддержка PGP/MIME в K9 Mail</li> -</ul> -<p>Если вы ходите принять участие в доработке и развитии проекта, посетите страницу проекта на Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>Рекомендуется установить <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для удобного выбора файлов и <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для распознавания QR кодов. Перейдите по ссылкам на соответствующие страницы Google Play или F-Droid для дальнейшей установки.</p> <h2>Я нашел ошибку в OpenPGP Keychain!</h2> -<p>Пожалуйста, сообщите о ней в разделе '<a href="https://github.com/dschuermann/openpgp-keychain/issues">Проблемы с OpenPGP Keychain</a>'.</p> +<p>Пожалуйста, сообщайте о возникших проблемах и найденных ошибках в разделе <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">Решение проблем OpenPGP Keychain</a>.</p> + +<h2>Вклад в развитие</h2> +<p>Если Вы хотите помочь в разработке OpenPGP Keychain, обратитесь к <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">инструкции на Github</a>.</p> + +<h2>Перевод</h2> +<p>Помогите переводить OpenPGP Keychain! Каждый может принять участие в переводе <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain на Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html index 3d4549cbd..3a95c8c16 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html @@ -23,7 +23,9 @@ <h2>Kütüphaneler</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html index 7b6f22e94..c6c2e1eed 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html @@ -23,7 +23,9 @@ <h2>Бібліотеки</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (ліцензія Apache в.2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Бібліотека підтримки Android в.4</a> (Ліцензія Apache в. 2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Бібліотека підтримки Android в.7 'appcompat'</a> (Ліцензія Apache в.2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (ліцензія Apache в. 2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html index 174a2b0d4..0b67fa3a9 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>видалений непотрібний експорт публічного ключа при експорті секретного ключа (завдяки Ash Hughes)</li> +<li>виправлено налаштування дат дії ключів (завдяки Ash Hughes)</li> +<li>більше внутрішніх виправлень при редагуванні ключів (завдяки Ash Hughes)</li> +<li>сервери запитаного ключа безпосередньо з екрану імпорту</li> +<li>виправлено стиль розмітки і діалогу у Андроїд 2.2-3.0</li> <li>виправлено збої, коли ключ мав порожній ідентифікатор користувача</li> <li>виправлено збої та порожні списки при поверненні з екрану реєстрації</li> <li>Bouncy Castle (криптографічна бібліотека) оновлена з версії 1.47 до 1.50 та зібрана з коду</li> -<li>видалений непотрібний експорт публічного ключа при експорті секретного ключа (завдяки Ash Hughes)</li> <li>виправлено завантаження ключа з вікна реєстрації</li> </ul> <h2>2.2</h2> diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html index 4a91477d4..dc34048d3 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>Як обмінятися ключами</h2> <ol> -<li>Натисніть і утримуйте ключ, який ви хочете передати.</li> +<li>Перейдіть до контактних даних ваших партнерів і відкрийте контакт, який ви хочете надіслати.</li> <li>Піднесіть обидва пристрої впритул зворотними сторонами (до повного торкання). Ви відчуєте невелику вібрацію.</li> <li>Після вібрації пристроїв на екрані з'явиться картка з передаваним вмістом.</li> <li>Натисніть на картку, що б передати дані з одного пристрою на інший.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html index c2b5a8019..520224815 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>ЕКСПЕРИМЕНТАЛЬНА програма</h2> -<p>Це ЕКСПЕРИМЕНТАЛЬНА версія. Використовуйте на свій страх і ризик!</p> - <h2>Приступаючи до роботи</h2> -<p>Для початку Вам будуть потрібні ключі. Скористайтеся функцією Імпорт в меню розділу "Мої ключі".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>Для зручності вибору файлів рекомендується встановити OI File Manager. Він буде викликатися при натисканні кнопки вибору файлу.</p> +<p>Спершу вам потрібна персональна в'язка ключів. Створіть одну через меню параметрів у "Мої Ключі" або імпортуйте наявні в'язки ключів через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або NFC.</p> -<h2>Над чим ще ведеться робота</h2> -<ul> -<li>Інтеграція з поштовою програмою K9 Mail.</li> -<li>При імпорті існуючих ключів губляться підписи</li> -<li>Відсутня підтримка PGP/MIME K9 Mail</li> -</ul> -<p>Якщо ви ходите взяти участь у доопрацюванні та розвитку проекту, відвідайте сторінку проекту на Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-брелок</a></p> +<p>Рекомендуємо вам встановити <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для поліпшеного виділення файлів та <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для сканування згенерованих штрих-кодів. Натискання посилань відкриє Google Play або F-Droid для встановлення.</p> <h2>Я знайшов помилку в OpenPGP Keychain!</h2> -<p>Будь ласка, повідомте про неї в розділі '<a href="https://github.com/dschuermann/openpgp-keychain/issues">Проблеми з В'язкою ключів OpenPGP</a>'.</p> +<p>Будь ласка, повідомте про ваду за допомогою <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">відстежувача проблем OpenPGP Keychain</a>.</p> + +<h2>Внесок</h2> +<p>Якщо ви хочете допомогти нам у розробці OpenPGP Keychain через редагування коду програми <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">підпишіться на наш невеличкий посібник у Github</a>.</p> + +<h2>Переклади</h2> +<p>Допоможіть перекласти OpenPGP Keychain! Кожний може взяти участь у <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain на Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html index 7db2f83de..773d11fa7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html @@ -23,7 +23,9 @@ <h2>Libraries</h2> <ul> <li> -<a href="http://actionbarsherlock.com">ActionBarSherlock</a> (Apache License v2)</li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Apache License v2)</li> <li> <a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Apache License v2)</li> <li> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html index 32ad1a13d..abf660ba8 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html @@ -3,10 +3,14 @@ <body> <h2>2.3</h2> <ul> +<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> +<li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> +<li>more internal fixes when editing keys (thanks to Ash Hughes)</li> +<li>querying keyservers directly from the import screen</li> +<li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> <li>Bouncy Castle (cryptography library) updated from 1.47 to 1.50 and build from source</li> -<li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix upload of key from signing screen</li> </ul> <h2>2.2</h2> @@ -42,7 +46,7 @@ </ul> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html index 2e7e637e5..88492731c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html @@ -3,7 +3,7 @@ <body> <h2>How to receive keys</h2> <ol> -<li>Go to your partners 'Manage Public Keys' and long press on the key you want to share.</li> +<li>Go to your partners contacts and open the contact you want to share.</li> <li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> <li>After it vibrates you’ll see the content on your partners device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the your device.</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html index 1386e8cc1..198dfe64f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html @@ -1,22 +1,19 @@ <html> <head></head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys".<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> <h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenPGP Keychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> + +<h2>Translations</h2> +<p>Help translating OpenPGP Keychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> + </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html index 453d435e3..083e055c7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html @@ -3,8 +3,8 @@ <body> <ol> <li>Make sure that NFC is turned on in Settings > More > NFC and make sure that Android Beam is also on in the same section.</li> -<li>Hold the two devices back to back (they have to be almost touching) and you’ll feel a vibration.</li> -<li>After it vibrates you’ll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> +<li>Hold the two devices back to back (they have to be almost touching) and you'll feel a vibration.</li> +<li>After it vibrates you'll see the content on your device turn into a card-like object with Star Trek warp speed-looking animation in the background.</li> <li>Tap the card and the content will then load on the other person’s device.</li> </ol> </body> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html index 85130965c..51e3f1325 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html @@ -5,11 +5,11 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> -<p><a href="http://sufficientlysecure.org/keychain">http://sufficientlysecure.org/keychain</a></p> -<p><a href="http://sufficientlysecure.org/keychain">OpenPGP Keychain</a> is an OpenPGP implementation for Android. The development began as a fork of Android Privacy Guard (APG).</p> +<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p> +<p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p> <p>License: GPLv3+</p> -<h2>Developers OpenPGP Keychain</h2> +<h2>Developers OpenKeychain</h2> <ul> <li>Dominik Schürmann (Lead developer)</li> <li>Ash Hughes (crypto patches)</li> @@ -34,8 +34,9 @@ And don't add newlines before or after p tags because of transifex --> <li><a href="http://code.google.com/p/zxing/">ZXing</a> (Apache License v2)</li> <li><a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (MIT X11 License)</li> <li><a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache License v2)</li> +<li><a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> <li>Icons from <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> <li>Icons from <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li> </ul> </body> -</html>
\ No newline at end of file +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html index 7bb558a24..17ad853de 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html @@ -10,7 +10,7 @@ And don't add newlines before or after p tags because of transifex --> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> <li>more internal fixes when editing keys (thanks to Ash Hughes)</li> -<li>querying key servers directly from the import screen</li> +<li>querying keyservers directly from the import screen</li> <li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> @@ -55,7 +55,7 @@ And don't add newlines before or after p tags because of transifex --> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_start.html b/OpenPGP-Keychain/src/main/res/raw/help_start.html index 097e22ba8..6c8c49846 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_start.html @@ -5,23 +5,19 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> -<h2>EXPERIMENTAL software</h2> -<p>This is EXPERIMENTAL software. Use at your own risk!</p> - <h2>Getting started</h2> -<p>First you need some keys. Import or create them via the option menus in "My Secret Keys". -<!--<p>Install K-9 Mail for the best integration, it will supports OpenPGP Keychain for PGP/INLINE and lets you directly encrypt/decrypt emails.--> -<br/>It is recommended that you install OI File Manager to be able to use the browse button for file selection in OpenPGP Keychain.</p> +<p>First you need a personal key pair. Create one via the option menus in "My Keys" or import existing key pairs via "Import Keys". Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p> + +<p>It is recommended that you install <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> for enhanced file selection and <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> to scan generated QR Codes. Clicking on the links will open Google Play Store or F-Droid for installation.</p> + +<h2>I found a bug in OpenKeychain!</h2> +<p>Please report the bug using the <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">issue tracker of OpenKeychain</a>.</p> + +<h2>Contribute</h2> +<p>If you want to help us developing OpenKeychain by contributing code <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">follow our small guide on Github</a>.</p> -<h2>Big ToDos</h2> -<ul> -<li>K9 Mail integration not published</li> -<li>Importing existing keys will be stripped of certificates right now</li> -<li>PGP/MIME in K9 Mail is missing</li> -</ul> -<p>If you want to contribute, fork it and do a pull request on Github: <a href="https://github.com/dschuermann/openpgp-keychain">https://github.com/dschuermann/openpgp-keychain</a></p> +<h2>Translations</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenPGP Keychain on Transifex</a>.</p> -<h2>I found a bug in OpenPGP Keychain!</h2> -<p>Please report it in the <a href="https://github.com/dschuermann/openpgp-keychain/issues">issue tracker of OpenPGP Keychain</a>.</p> </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml index ebf303f8a..d421fd141 100644 --- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml @@ -12,7 +12,7 @@ <string name="title_edit_key">Schlüssel bearbeiten</string> <string name="title_preferences">Einstellungen</string> <string name="title_api_registered_apps">Registrierte Anwendungen</string> - <string name="title_key_server_preference">Einstellung der Schlüsselserver</string> + <string name="title_key_server_preference">Schlüsselserver</string> <string name="title_change_pass_phrase">Passwort ändern</string> <string name="title_set_passphrase">Passwort setzen</string> <string name="title_send_email">E-Mail senden...</string> @@ -22,10 +22,10 @@ <string name="title_export_key">Schlüssel exportieren</string> <string name="title_export_keys">Schlüssel exportieren</string> <string name="title_key_not_found">Schlüssel nicht gefunden</string> - <string name="title_key_server_query">Schlüssel-Server abfragen</string> + <string name="title_key_server_query">Schlüsselserver abfragen</string> <string name="title_send_key">Auf Schlüsselserver hochladen</string> <string name="title_unknown_signature_key">Unbekannter Signaturschlüssel</string> - <string name="title_sign_key">Schlüssel signieren</string> + <string name="title_certify_key">Schlüssel beglaubigen</string> <string name="title_key_details">Schlüsseldetails</string> <string name="title_help">Hilfe</string> <!--section--> @@ -37,17 +37,16 @@ <string name="section_master_key">Hauptschlüssel</string> <string name="section_master_user_id">Hauptbenutzer-ID</string> <string name="section_actions">Aktionen</string> - <string name="section_signing_key">Dein Signaturschlüssel</string> + <string name="section_certification_key">Mit diesem Schlüssel beglaubigen</string> <string name="section_upload_key">Schlüssel hochladen</string> <string name="section_key_server">Schlüsselserver</string> + <string name="section_encrypt_and_or_sign">Verschlüsseln und/oder Signieren</string> + <string name="section_decrypt_verify">Entschlüsseln und Verifizieren</string> <!--button--> - <string name="btn_sign_to_clipboard">Signieren (Zwischenablage)</string> - <string name="btn_encrypt_to_clipboard">In die Zwischenablage verschlüsseln</string> - <string name="btn_encrypt_and_send">Verschlüsseln und senden...</string> - <string name="btn_sign_and_send">Signieren und senden...</string> <string name="btn_sign">Signieren</string> + <string name="btn_certify">Beglaubigen</string> <string name="btn_decrypt">Entschlüsseln</string> - <string name="btn_verify">Signatur prüfen</string> + <string name="btn_decrypt_verify">Entschlüsseln und Verifizieren</string> <string name="btn_select_encrypt_keys">Empfänger auswählen</string> <string name="btn_encrypt_file">Datei verschlüsseln</string> <string name="btn_save">Speichern</string> @@ -61,6 +60,9 @@ <string name="btn_export_to_server">Auf Schlüsselserver hochladen</string> <string name="btn_next">Weiter</string> <string name="btn_back">Zurück</string> + <string name="btn_clipboard">Zwischenablage</string> + <string name="btn_share">Teilen mit…</string> + <string name="btn_lookup_key">Schlüssel nachschlagen</string> <!--menu--> <string name="menu_preferences">Einstellungen</string> <string name="menu_help">Hilfe</string> @@ -99,6 +101,7 @@ <string name="label_passphrase_again">Wiederholen</string> <string name="label_algorithm">Algorithmus</string> <string name="label_ascii_armor">ASCII-Armor</string> + <string name="label_select_public_keys">Empfänger</string> <string name="label_delete_after_encryption">Nach Verschlüsselung löschen</string> <string name="label_delete_after_decryption">Nach Entschlüsselung löschen</string> <string name="label_encryption_algorithm">Verschlüsselungsalgorithmus</string> @@ -108,7 +111,6 @@ <string name="label_passphrase_cache_ttl">Passwort-Cache</string> <string name="label_message_compression">Nachrichten-Komprimierung</string> <string name="label_file_compression">Datei-Komprimierung</string> - <string name="label_force_v3_signature">OpenPGPv3-Signaturen erzwingen</string> <string name="label_key_servers">Schlüsselserver</string> <string name="label_key_id">Schlüssel-ID</string> <string name="label_creation">Erstellungsdatum</string> @@ -119,19 +121,21 @@ <string name="label_name">Name</string> <string name="label_comment">Kommentar</string> <string name="label_email">E-Mail</string> - <string name="label_send_key">Lade Schlüssel nach dem Signieren auf den ausgewählten Schlüsselserver hoch</string> + <string name="label_send_key">Schlüssel nach Beglaubigung auf ausgewählten Schlüsselserver hochladen</string> <string name="label_fingerprint">Fingerabdruck</string> <string name="select_keys_button_default">Auswählen</string> <plurals name="select_keys_button"> <item quantity="one">%d ausgewählt</item> <item quantity="other">%d ausgewählt</item> </plurals> + <string name="user_id_no_name"><kein Name></string> <string name="none"><keine></string> <string name="no_key"><kein Schlüssel></string> <string name="unknown_status"></string> <string name="can_encrypt">kann verschlüsseln</string> <string name="can_sign">kann signieren</string> <string name="expired">abgelaufen</string> + <string name="revoked">zurückgezogen</string> <plurals name="n_key_servers"> <item quantity="one">%d Schlüsselserver</item> <item quantity="other">%d Schlüsselserver</item> @@ -213,9 +217,12 @@ <item quantity="one">%d Schlüssel gefunden.</item> <item quantity="other">%d Schlüssel gefunden.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Unbekannte Unterschrift, zum Suchen berühren. </string> - <string name="lookup_unknown_key">Unbekannter Schlüssel %s, soll dieser auf einem Schlüsselserver gesucht werden?</string> - <string name="key_send_success">Schlüssel erfolgreich zum Server geschickt.</string> + <string name="unknown_signature">Unbekannte Signatur. Benutze den Button um den fehlenden Schlüssel nachzuschlagen.</string> + <plurals name="bad_keys_encountered"> + <item quantity="one">%d schlechter privater Schlüssel ignoriert. Evtl. wurde er mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item> + <item quantity="other">%d schlechte private Schlüssel ignoriert. Evtl. wurden sie mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item> + </plurals> + <string name="key_send_success">Schlüssel wurde erfolgreich hochgeladen.</string> <string name="key_sign_success">Schlüssel erfolgreich signiert</string> <string name="list_empty">Diese Liste ist leer!</string> <string name="nfc_successfull">Schlüssel erfolgreich mit NFC Beam gesendet!</string> @@ -254,19 +261,22 @@ <string name="error_jelly_bean_needed">Android 4.1 alias Jelly Bean wird benötigt um Androids NFC-Beam nutzen zu können!</string> <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string> <string name="error_nothing_import">Nichts zu importieren!</string> + <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Bitte lösche ihn unter \'Meine Schlüssel\'!</item> + <item quantity="other">Bitte lösche sie unter \'Meine Schlüssel\'!</item> + </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">fertig.</string> <string name="progress_saving">speichern...</string> <string name="progress_importing">importieren...</string> <string name="progress_exporting">exportieren...</string> - <string name="progress_generating">erstelle Schlüssel, dies kann eine Weile dauern...</string> <string name="progress_building_key">erstelle Schlüssel...</string> <string name="progress_preparing_master_key">Hauptschlüssel wird vorbereitet...</string> <string name="progress_certifying_master_key">Hauptschlüssel wird beglaubigt...</string> <string name="progress_building_master_key">erstelle Hauptring...</string> <string name="progress_adding_sub_keys">füge Unterschlüssel hinzu...</string> <string name="progress_saving_key_ring">Schlüssel wird gespeichert...</string> - <string name="progress_importing_secret_keys">importiere private Schlüssel...</string> <plurals name="progress_exporting_key"> <item quantity="one">Schlüssel wird exportiert…</item> <item quantity="other">Schlüssel werden exportiert…</item> @@ -327,17 +337,15 @@ <string name="intent_send_encrypt">OpenPGP: Verschlüsseln</string> <string name="intent_send_decrypt">OpenPGP: Entschlüsseln</string> <!--Remote API--> - <string name="api_no_apps">Keine registrierten Anwendungen vorhanden!</string> <string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string> <string name="api_settings_hide_advanced">Erweiterte Einstellungen ausblenden</string> <string name="api_settings_no_key">Kein Schlüssel ausgewählt</string> <string name="api_settings_select_key">Schlüssel auswählen</string> <string name="api_settings_save">Speichern</string> <string name="api_settings_cancel">Abbrechen</string> - <string name="api_settings_revoke">Zugang widerufen</string> + <string name="api_settings_revoke">Zugriff widerufen</string> <string name="api_settings_package_name">Paketname</string> <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string> - <string name="api_register_text">Folgende Anwendung beantragt Zugriff zur API von OpenPGP Keychain.\n\nZugriff dauerhaft erlauben?</string> <string name="api_register_allow">Zugriff erlauben</string> <string name="api_register_disallow">Zugriff verbieten</string> <string name="api_register_error_select_key">Bitte einen Schlüssel auswählen!</string> @@ -363,6 +371,7 @@ <string name="key_list_empty_button_import">existierende Schlüssel importierst.</string> <!--Key view--> <string name="key_view_action_encrypt">Für diesen Kontakt verschlüsseln</string> + <string name="key_view_action_certify">Schlüssel dieses Kontakts beglaubigen</string> <!--Navigation Drawer--> <string name="nav_contacts">Kontakte</string> <string name="nav_encrypt">Verschlüsseln</string> diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml index 8f508a885..6efe9548d 100644 --- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml @@ -10,7 +10,6 @@ <string name="title_edit_key">Editar clave</string> <string name="title_preferences">Preferencias</string> <string name="title_api_registered_apps">Aplicaciones registradas</string> - <string name="title_key_server_preference">Preferencias del servidor de claves</string> <string name="title_change_pass_phrase">Cambiar contraseña</string> <string name="title_set_passphrase">Establecer contraseña</string> <string name="title_send_email">Enviar correo electrónico...</string> @@ -20,9 +19,7 @@ <string name="title_export_key">Exportar clave</string> <string name="title_export_keys">Exportar claves</string> <string name="title_key_not_found">Clave no encontrada</string> - <string name="title_key_server_query">Solicitar al servidor de claves</string> <string name="title_unknown_signature_key">Clave de firma desconocida</string> - <string name="title_sign_key">Clave de firma</string> <string name="title_help">Ayuda</string> <!--section--> <string name="section_user_ids">IDs de usuario</string> @@ -31,13 +28,8 @@ <string name="section_defaults">Por defecto</string> <string name="section_advanced">Avanzado</string> <!--button--> - <string name="btn_sign_to_clipboard">Firmar (Portapapeles)</string> - <string name="btn_encrypt_to_clipboard">Cifrar a portapapeles</string> - <string name="btn_encrypt_and_send">Cifrar y enviar</string> - <string name="btn_sign_and_send">Firmar y enviar</string> <string name="btn_sign">Firmar</string> <string name="btn_decrypt">Descifrar</string> - <string name="btn_verify">Verificar</string> <string name="btn_select_encrypt_keys">Escoger destinatarios</string> <string name="btn_encrypt_file">Cifrar archivo</string> <string name="btn_save">Guardar</string> @@ -61,7 +53,6 @@ <string name="menu_create_key">Crear clave</string> <string name="menu_create_key_expert">Crear clave (experto)</string> <string name="menu_search">Buscar</string> - <string name="menu_key_server">Importar desde servidor de claves</string> <string name="menu_sign_key">Clave de firma</string> <!--label--> <string name="label_sign">Firmar</string> @@ -80,8 +71,6 @@ <string name="label_symmetric">Contraseña</string> <string name="label_message_compression">Compresión de mensaje</string> <string name="label_file_compression">Compresión de archivo</string> - <string name="label_force_v3_signature">Forzar firmas V3</string> - <string name="label_key_servers">Servidores de claves</string> <string name="label_key_id">ID de clave</string> <string name="label_creation">Creación</string> <string name="label_expiry">Expiración</string> diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml new file mode 100644 index 000000000..d6b0f9562 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml @@ -0,0 +1,393 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_manage_public_keys">Contactos</string> + <string name="title_manage_secret_keys">Claves secretas</string> + <string name="title_select_recipients">Seleccionar la clave pública</string> + <string name="title_select_secret_key">Seleccionar la clave secreta</string> + <string name="title_encrypt">Cifrar</string> + <string name="title_decrypt">Descifrar</string> + <string name="title_authentication">Frase de contraseña</string> + <string name="title_create_key">Crear clave</string> + <string name="title_edit_key"> Editar clave</string> + <string name="title_preferences"> Preferencias</string> + <string name="title_api_registered_apps">Aplicaciones registradas</string> + <string name="title_key_server_preference">Prioridad del servidor de claves</string> + <string name="title_change_pass_phrase">Cambiar la frase de contraseña</string> + <string name="title_set_passphrase">Establecer frase de contraseña</string> + <string name="title_send_email">Enviar email...</string> + <string name="title_encrypt_to_file">Cifrar hacia archivo</string> + <string name="title_decrypt_to_file">Descifrar hacia archivo</string> + <string name="title_import_keys">Importar claves</string> + <string name="title_export_key">Exportar clave</string> + <string name="title_export_keys">Exportar claves</string> + <string name="title_key_not_found">Clave no encontrada</string> + <string name="title_key_server_query">Consultar servidor de claves</string> + <string name="title_send_key">Cargar al servidor de claves</string> + <string name="title_unknown_signature_key">Clave de firma desconocida</string> + <string name="title_certify_key">Certificar clave</string> + <string name="title_key_details">Detalles de la clave</string> + <string name="title_help">Ayuda</string> + <!--section--> + <string name="section_user_ids">IDs de usuario</string> + <string name="section_keys">Claves</string> + <string name="section_general">General</string> + <string name="section_defaults">Predeterminados</string> + <string name="section_advanced">Avanzado</string> + <string name="section_master_key">Clave maestra</string> + <string name="section_master_user_id">ID del usuario principal</string> + <string name="section_actions">Acciones</string> + <string name="section_certification_key">Tu clave usada para las certificaciones</string> + <string name="section_upload_key">Cargar clave</string> + <string name="section_key_server">Servidor de claves</string> + <string name="section_encrypt_and_or_sign">Cifrar y/o firmar</string> + <string name="section_decrypt_verify">Descifrar y verificar</string> + <!--button--> + <string name="btn_sign">Firmar</string> + <string name="btn_certify">Certificar</string> + <string name="btn_decrypt">Descifrar</string> + <string name="btn_decrypt_verify">Descifrar y verificar</string> + <string name="btn_select_encrypt_keys">Seleccionar destinatarios</string> + <string name="btn_encrypt_file">Cifrar archivo</string> + <string name="btn_save">Guardar</string> + <string name="btn_do_not_save">Cancelar</string> + <string name="btn_delete">Eliminar</string> + <string name="btn_no_date">Ninguno</string> + <string name="btn_okay">De acuerdo</string> + <string name="btn_change_passphrase">Cambiar la frase de contraseña</string> + <string name="btn_set_passphrase">Establecer frase de contraseña</string> + <string name="btn_search">Buscar</string> + <string name="btn_export_to_server">Cargar al servidor de claves</string> + <string name="btn_next">Siguiente</string> + <string name="btn_back">Volver</string> + <string name="btn_clipboard">Portapapeles</string> + <string name="btn_share">Compartir con...</string> + <string name="btn_lookup_key">Buscar clave</string> + <!--menu--> + <string name="menu_preferences">Ajustes</string> + <string name="menu_help">Ayuda</string> + <string name="menu_import_from_file">Importar desde archivo</string> + <string name="menu_import_from_qr_code">Importar desde código QR</string> + <string name="menu_import">Importar</string> + <string name="menu_import_from_nfc">Importar desde NFC</string> + <string name="menu_export_keys">Exportar todas las claves</string> + <string name="menu_export_key">Exportar hacia archivo</string> + <string name="menu_delete_key">Borrar clave</string> + <string name="menu_create_key">Crear clave</string> + <string name="menu_create_key_expert">Crear clave (experto)</string> + <string name="menu_search">Buscar</string> + <string name="menu_key_server">Importar desde servidor de claves</string> + <string name="menu_update_key">Actualizar desde servidor de claves</string> + <string name="menu_export_key_to_server">Cargar al servidor de claves</string> + <string name="menu_share">Compartir</string> + <string name="menu_share_title_fingerprint">Compartir la huella digital...</string> + <string name="menu_share_title">Compartir la clave completa...</string> + <string name="menu_share_default_fingerprint">con...</string> + <string name="menu_share_default">con...</string> + <string name="menu_share_qr_code">con código QR</string> + <string name="menu_share_qr_code_fingerprint">con código QR</string> + <string name="menu_share_nfc">con NFC</string> + <string name="menu_copy_to_clipboard">Copiar al portapapeles</string> + <string name="menu_sign_key"> Clave de firma</string> + <string name="menu_beam_preferences">Ajustes de Beam</string> + <string name="menu_key_edit_cancel">Cancelar</string> + <string name="menu_encrypt_to">Cifrar hacia...</string> + <!--label--> + <string name="label_sign">Firmar</string> + <string name="label_message">Mensaje</string> + <string name="label_file">Archivo</string> + <string name="label_no_passphrase">No hay frase de contraseña</string> + <string name="label_passphrase">Frase de contraseña</string> + <string name="label_passphrase_again">De nuevo</string> + <string name="label_algorithm">Algoritmo</string> + <string name="label_ascii_armor">Armadura ASCII</string> + <string name="label_select_public_keys">Destinatarios</string> + <string name="label_delete_after_encryption">Borrar después del cifrado</string> + <string name="label_delete_after_decryption">Borrar después del descifrado</string> + <string name="label_encryption_algorithm">Algoritmo de cifrado</string> + <string name="label_hash_algorithm">Algoritmo de Hash</string> + <string name="label_asymmetric">Clave pública</string> + <string name="label_symmetric">Frase de contraseña</string> + <string name="label_passphrase_cache_ttl">Caché de frase de contraseña</string> + <string name="label_message_compression">Compresión de mensaje</string> + <string name="label_file_compression">Compresión de archivo</string> + <string name="label_force_v3_signature">Forzar firmas OpenPGPv3 antiguas</string> + <string name="label_key_servers">Servidores de claves</string> + <string name="label_key_id">ID de clave</string> + <string name="label_creation">Creación</string> + <string name="label_expiry">Caducidad</string> + <string name="label_usage">Uso</string> + <string name="label_key_size">Tamaño de clave</string> + <string name="label_main_user_id">ID del usuario principal</string> + <string name="label_name">Nombre</string> + <string name="label_comment">Comentario</string> + <string name="label_email">Email</string> + <string name="label_send_key">Cargar clave al servidor de claves seleccionado después de la certificación</string> + <string name="label_fingerprint">Huella digital</string> + <string name="select_keys_button_default">Seleccionar</string> + <plurals name="select_keys_button"> + <item quantity="one">%d seleccionado</item> + <item quantity="other">%d seleccionados</item> + </plurals> + <string name="user_id_no_name"><sin nombre></string> + <string name="none"><ninguna></string> + <string name="no_key"><sin clave></string> + <string name="unknown_status"></string> + <string name="can_encrypt">se puede cifrar</string> + <string name="can_sign">se puede firmar</string> + <string name="expired">caducado</string> + <string name="revoked">revocado</string> + <plurals name="n_key_servers"> + <item quantity="one">%d servidor de claves</item> + <item quantity="other">%d servidores de claves</item> + </plurals> + <string name="fingerprint">Huella digital:</string> + <string name="secret_key">Clave secreta:</string> + <!--choice--> + <string name="choice_none">Ninguna</string> + <string name="choice_sign_only">Solo firmar</string> + <string name="choice_encrypt_only">Solo cifrar</string> + <string name="choice_sign_and_encrypt">Firmar y cifrar</string> + <string name="choice_15secs">15 segs</string> + <string name="choice_1min">1 min</string> + <string name="choice_3mins">3 mins</string> + <string name="choice_5mins">5 mins</string> + <string name="choice_10mins">10 mins</string> + <string name="choice_20mins">20 mins</string> + <string name="choice_40mins">40 mins</string> + <string name="choice_1hour">1 hora</string> + <string name="choice_2hours">2 horas</string> + <string name="choice_4hours">4 horas</string> + <string name="choice_8hours">8 horas</string> + <string name="choice_forever">para siempre</string> + <string name="dsa">DSA</string> + <string name="elgamal">ElGamal</string> + <string name="rsa">RSA</string> + <string name="filemanager_title_open">Abrir...</string> + <string name="warning">Advertencia</string> + <string name="error">Error</string> + <string name="error_message">Error: %s</string> + <!--sentences--> + <string name="wrong_passphrase">Frase de contraseña incorrecta.</string> + <string name="using_clipboard_content">Usando el contenido del portapapeles.</string> + <string name="set_a_passphrase">Establece una frase de contraseña antes.</string> + <string name="no_filemanager_installed">No hay un gestor de archivos compatible instalado.</string> + <string name="passphrases_do_not_match">Las frases de contraseña no coinciden.</string> + <string name="passphrase_must_not_be_empty">Las frases de contraseña no pueden estar vacías.</string> + <string name="passphrase_for_symmetric_encryption">Cifrado simétrico.</string> + <string name="passphrase_for">Introducir la frase de contraseña para \'%s\'</string> + <string name="file_delete_confirmation">¿Estás seguro de que quieres borrar\n%s?</string> + <string name="file_delete_successful">Borrado satisfactoriamente.</string> + <string name="no_file_selected">Selecciona un archivo antes.</string> + <string name="decryption_successful">Descifrado satisfactoriamente.</string> + <string name="encryption_successful">Cifrado satisfactoriamente.</string> + <string name="encryption_to_clipboard_successful">Cifrado satisfactoriamente al portapapeles.</string> + <string name="enter_passphrase_twice">Introduce la frase de contraseña dos veces.</string> + <string name="select_encryption_key">Selecciona al menos una clave de cifrado.</string> + <string name="select_encryption_or_signature_key">Selecciona al menos una clave de cifrado o de firma.</string> + <string name="specify_file_to_encrypt_to">Por favor, especifica hacia qué archivo quieres cifrar.\nADVERTENCIA: El archivo se sobreescribirá si ya existiese.</string> + <string name="specify_file_to_decrypt_to">Por favor, especifica hacia qué archivo quieres descifrar.\nADVERTENCIA: El archivo se sobreescribirá si ya existiese.</string> + <string name="specify_file_to_export_to">Por favor, especifica hacia qué archivo quieres exportar.\nADVERTENCIA: El archivo se sobreescribirá si ya existiese.</string> + <string name="specify_file_to_export_secret_keys_to">Por favor, especifica hacia qué archivo quieres exportar.\nADVERTENCIA: Estás a punto de exportar claves SECRETAS.\nADVERTENCIA: El archivo se sobreescribirá si ya existiese.</string> + <string name="key_deletion_confirmation">¿Quieres realmente borrar la clave \'%s\'?\n¡No podrás deshacerlo!</string> + <string name="key_deletion_confirmation_multi">¿Quieres realmente borrar todas las claves seleccionadas?\n¡No podrás deshacerlo!</string> + <string name="secret_key_deletion_confirmation">¿Quieres realmente borrar la clave SECRETA \'%s\'?\n¡No podrás deshacerlo!</string> + <plurals name="keys_added_and_updated_1"> + <item quantity="one">%d clave añadida satisfactoriamente</item> + <item quantity="other">%d claves añadidas satisfactoriamente</item> + </plurals> + <plurals name="keys_added_and_updated_2"> + <item quantity="one">y actualizada %d clave.</item> + <item quantity="other">y actualizadas %d claves.</item> + </plurals> + <plurals name="keys_added"> + <item quantity="one">%d clave añadida satisfactoriamente.</item> + <item quantity="other">%d claves añadidas satisfactoriamente.</item> + </plurals> + <plurals name="keys_updated"> + <item quantity="one">%d clave actualizada satisfactoriamente.</item> + <item quantity="other">%d claves actualizadas satisfactoriamente.</item> + </plurals> + <string name="no_keys_added_or_updated">No se han añadido o actualizado claves.</string> + <string name="key_exported">Se ha exportado 1 clave satisfactoriamente.</string> + <string name="keys_exported">%d claves exportadas satisfactoriamente.</string> + <string name="no_keys_exported">No se han exportado claves.</string> + <string name="key_creation_el_gamal_info">Nota: solo las subclaves son compatibles con ElGamal, y para ElGamal debe usarse el tamaño de clave más próximo de 1536, 2048, 3072, 4096, o 8192.</string> + <string name="key_not_found">No se puede encontrar la clave %08X.</string> + <plurals name="keys_found"> + <item quantity="one">Se ha encontrado %d clave.</item> + <item quantity="other">Se han encontrado %d claves.</item> + </plurals> + <string name="unknown_signature">Firma desconocida, pulsa el botón para buscar la clave extraviada.</string> + <plurals name="bad_keys_encountered"> + <item quantity="one">%d mala clave secreta ignorada. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item> + <item quantity="other">%d malas claves secretas ignoradas. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item> + </plurals> + <string name="key_send_success">Clave cargada al servidor satisfactoriamente</string> + <string name="key_sign_success">Clave firmada satisfactoriamente</string> + <string name="list_empty">¡Esta lista está vacía!</string> + <string name="nfc_successfull">¡Clave enviada satisfactoriamente con NFC Beam!</string> + <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string> + <string name="key_has_already_been_signed">¡La clave ya ha sido firmada!</string> + <string name="select_key_to_sign">¡Por favor, selecciona la clave que se usará para firmar!</string> + <string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <string name="error_file_delete_failed">ha fallado el borrado de \'%s\'</string> + <string name="error_file_not_found">archivo no encontrado</string> + <string name="error_no_secret_key_found">no se ha encontrado una clave secreta adecuada</string> + <string name="error_no_known_encryption_found">se ha encontrado un tipo de cifrado no conocido</string> + <string name="error_external_storage_not_ready">el almacenamiento externo no está preparado</string> + <string name="error_invalid_email">email incorrecto \'%s\'</string> + <string name="error_key_size_minimum512bit">el tamaño de clave debe ser de al menos 512bit</string> + <string name="error_master_key_must_not_be_el_gamal">la clave maestra no puede ser una clave ElGamal</string> + <string name="error_unknown_algorithm_choice">elegido algoritmo desconocido</string> + <string name="error_user_id_needs_a_name">necesitas determinar un nombre</string> + <string name="error_user_id_needs_an_email_address">tienes que determinar una dirección de email</string> + <string name="error_key_needs_a_user_id">necesitas al menos una ID de usuario</string> + <string name="error_main_user_id_must_not_be_empty">la ID del usuario principal no puede estar vacía</string> + <string name="error_key_needs_master_key">necesitas al menos una clave maestra</string> + <string name="error_no_encryption_keys_or_passphrase">no has proporcionado ninguna clave de cifrado o frase de contraseña</string> + <string name="error_signature_failed">la firma ha fallado</string> + <string name="error_no_signature_passphrase">no has proporcionado una frase de contraseña</string> + <string name="error_no_signature_key">no has proporcionado una clave de firma</string> + <string name="error_invalid_data">cifrado de datos no válido</string> + <string name="error_corrupt_data">datos corrompidos</string> + <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string> + <string name="error_no_symmetric_encryption_packet">no se ha podido encontrar un paquete con cifrado simétrico</string> + <string name="error_wrong_passphrase">frase de contraseña incorrecta</string> + <string name="error_saving_keys">error al guardar algunas claves</string> + <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string> + <string name="error_only_files_are_supported">Dirigir datos binarios sin un archivo real en el sistema de archivos es incompatible. Esto solo es compatible con ACTION_ENCRYPT_STREAM_AND_RETURN.</string> + <string name="error_jelly_bean_needed">!Necesitas Android 4.1 alias Jelly Bean para poder usar la característica NFC Beam!</string> + <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string> + <string name="error_nothing_import">¡Nada que importar!</string> + <string name="error_expiry_must_come_after_creation">la fecha de caducidad debe ser posterior a la fecha de creación</string> + <string name="error_can_not_delete_contact">no puedes eliminar este contacto porque eres tú mismo.</string> + <string name="error_can_not_delete_contacts">no puedes eliminar los siguientes contactos porque son tú mismo:\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Por favor, bórralo desde la pantalla \'Mis claves\'!</item> + <item quantity="other">Por favor, bórralos desde la pantalla \'Mis claves\'!</item> + </plurals> + <!--progress dialogs, usually ending in '…'--> + <string name="progress_done">hecho.</string> + <string name="progress_saving">guardando...</string> + <string name="progress_importing">importando...</string> + <string name="progress_exporting">exportando...</string> + <string name="progress_generating">generando la clave, esto puede tardar más de 3 minutos...</string> + <string name="progress_building_key">construyendo la clave...</string> + <string name="progress_preparing_master_key">preparando la clave maestra...</string> + <string name="progress_certifying_master_key">certificando la clave maestra...</string> + <string name="progress_building_master_key">construyendo el anillo maestro...</string> + <string name="progress_adding_sub_keys">añadiendo las subclaves...</string> + <string name="progress_saving_key_ring">guardando claves...</string> + <plurals name="progress_exporting_key"> + <item quantity="one">exportando clave...</item> + <item quantity="other">exportando claves...</item> + </plurals> + <string name="progress_extracting_signature_key">extrayendo la clave de firma...</string> + <string name="progress_extracting_key">extrayendo la clave...</string> + <string name="progress_preparing_streams">preparando las transmisiones...</string> + <string name="progress_encrypting">cifrando los datos...</string> + <string name="progress_decrypting">descifrando los datos...</string> + <string name="progress_preparing_signature">preparando la firma...</string> + <string name="progress_generating_signature">generando la firma...</string> + <string name="progress_processing_signature">procesando la firma...</string> + <string name="progress_verifying_signature">verificando la firma...</string> + <string name="progress_signing">firmando...</string> + <string name="progress_reading_data">leyendo los datos...</string> + <string name="progress_finding_key">localizando la clave...</string> + <string name="progress_decompressing_data">descomprimiendo los datos...</string> + <string name="progress_verifying_integrity">verificando la integridad...</string> + <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string> + <string name="progress_querying">consultando...</string> + <!--action strings--> + <string name="hint_public_keys">Buscar claves públicas</string> + <string name="hint_secret_keys">Buscar claves secretas</string> + <string name="action_share_key_with">Compartir la clave con...</string> + <!--key bit length selections--> + <string name="key_size_512">512</string> + <string name="key_size_1024">1024</string> + <string name="key_size_2048">2048</string> + <string name="key_size_4096">4096</string> + <!--compression--> + <string name="compression_fast">rápido</string> + <string name="compression_very_slow">muy lento</string> + <!--Help--> + <string name="help_tab_start">Comenzar</string> + <string name="help_tab_nfc_beam">NFC Beam</string> + <string name="help_tab_changelog">Registro de cambios</string> + <string name="help_tab_about">A cerca de</string> + <string name="help_about_version">Versión:</string> + <!--Import--> + <string name="import_import">Importar las claves seleccionadas</string> + <string name="import_sign_and_upload">Importar, firmar y cargar las claves seleccionadas</string> + <string name="import_from_clipboard">Importar desde el portapapeles</string> + <plurals name="import_qr_code_missing"> + <item quantity="one">El código QR con ID %s se ha extraviado</item> + <item quantity="other">Los códigos QR con IDs %s se han extraviado</item> + </plurals> + <string name="import_qr_code_start_with_one">Por favor, comienza con el código QR de ID 1</string> + <string name="import_qr_code_wrong">¡El código QR está deformado! ¡Por favor, prueba de nuevo!</string> + <string name="import_qr_code_finished">¡El escaneo del código QR ha finalizado!</string> + <string name="import_qr_code_too_short_fingerprint">La huella digital contenida en este código QR es demasiado corta (< 16 caracteres)</string> + <string name="import_qr_scan_button">Escanea el código QR con \'Barcode Scanner\'</string> + <string name="import_nfc_text">Para recibir las claves a través de NFC, el dispositivo tiene que estar desbloqueado.</string> + <string name="import_nfc_help_button">Ayuda</string> + <string name="import_clipboard_button">Tomar la clave desde el portapapeles</string> + <!--Intent labels--> + <string name="intent_decrypt_file">OpenPGP: Descifrar archivo</string> + <string name="intent_import_key">OpenPGP: Importar clave</string> + <string name="intent_send_encrypt">OpenPGP: Cifrar</string> + <string name="intent_send_decrypt">OpenPGP: Descifrar</string> + <!--Remote API--> + <string name="api_no_apps">¡No hay aplicaciones registradas¡\n\nLas aplicaciones de terceros pueden pedir acceso a OpenPGP Keychain. Después de recibir permiso, se mostrarán aquí.</string> + <string name="api_settings_show_advanced">Mostrar la configuración avanzada</string> + <string name="api_settings_hide_advanced">Ocultar la configuración avanzada</string> + <string name="api_settings_no_key">No se ha seleccionado ninguna clave</string> + <string name="api_settings_select_key">Seleccionar clave</string> + <string name="api_settings_save">Guardar</string> + <string name="api_settings_cancel">Cancelar</string> + <string name="api_settings_revoke">Revocar acceso</string> + <string name="api_settings_package_name">Nombre de paquete</string> + <string name="api_settings_package_signature">SHA-256 de firma de paquete</string> + <string name="api_register_text">La aplicación mostrada pide acceso a OpenPGP Keychain.\n¿Permitir acceso?\n\nAVISO: Si no sabes por qué ha aparecido esta pantalla, ¡deniega el acceso! Puedes revocar el acceso más tarde usando la ventana \'Aplicaciones Registradas\'.</string> + <string name="api_register_allow">Permitir el acceso</string> + <string name="api_register_disallow">Denegar el acceso</string> + <string name="api_register_error_select_key">¡Por favor, selecciona una clave!</string> + <string name="api_select_pub_keys_missing_text">No se han encontrado claves públicas para estas IDs de usuario:</string> + <string name="api_select_pub_keys_dublicates_text">Existe más de una clave pública para estos IDs de usuario:</string> + <string name="api_select_pub_keys_text">¡Por favor, revisa la lista de destinatarios!</string> + <string name="api_error_wrong_signature">¡La comprobación de la firma ha fallado! ¿Has instalado esta app desde una fuente distinta? Si estás seguro de que esto no es un ataque, revoca el registro de esta app en OpenPGP Keychain y regístrala de nuevo.</string> + <!--Share--> + <string name="share_qr_code_dialog_title">Compartir con código QR</string> + <string name="share_qr_code_dialog_start">Pasa por todos los códigos QR usando \'Siguiente\', y escanéalos de uno en uno.</string> + <string name="share_qr_code_dialog_fingerprint_text">Huella digital:</string> + <string name="share_qr_code_dialog_progress">Código QR con ID %1$d de %2$d</string> + <string name="share_nfc_dialog">Compartir con NFC</string> + <!--Key list--> + <plurals name="key_list_selected_keys"> + <item quantity="one">1 clave seleccionada.</item> + <item quantity="other">%d claves seleccionadas.</item> + </plurals> + <string name="key_list_empty_text1">Aún no hay claves disponibles...</string> + <string name="key_list_empty_text2">Puedes empezar por</string> + <string name="key_list_empty_text3">o</string> + <string name="key_list_empty_button_create">crear tu propia clave</string> + <string name="key_list_empty_button_import">importar claves</string> + <!--Key view--> + <string name="key_view_action_encrypt">Cifrar hacia este contacto</string> + <string name="key_view_action_certify">Certificar la clave de este contacto</string> + <string name="key_view_tab_main">Información</string> + <string name="key_view_tab_certs">Certificaciones</string> + <!--Navigation Drawer--> + <string name="nav_contacts">Contactos</string> + <string name="nav_encrypt">Cifrar</string> + <string name="nav_decrypt">Descifrar</string> + <string name="nav_import">Importar claves</string> + <string name="nav_secret_keys">Mis claves</string> + <string name="nav_apps">Aplicaciones registradas</string> + <string name="drawer_open">Abrir el Navigation Drawer</string> + <string name="drawer_close">Cerrar el Navigation Drawer</string> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml index d427403dd..016090d61 100644 --- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml @@ -12,7 +12,7 @@ <string name="title_edit_key">Modifier une clef</string> <string name="title_preferences">Préférences</string> <string name="title_api_registered_apps">Applications enregistrées</string> - <string name="title_key_server_preference">Serveurs de clefs préférés</string> + <string name="title_key_server_preference">Préférences du serveur de clefs</string> <string name="title_change_pass_phrase">Changer la phrase de passe</string> <string name="title_set_passphrase">Définir la phrase de passe</string> <string name="title_send_email">Envoyer un courriel...</string> @@ -25,7 +25,7 @@ <string name="title_key_server_query">Interroger le serveur de clefs</string> <string name="title_send_key">Téléverser vers le serveur de clefs</string> <string name="title_unknown_signature_key">Clef de signature inconnue</string> - <string name="title_sign_key">Signer la clef</string> + <string name="title_certify_key">Certifier la clef</string> <string name="title_key_details">Détails sur la clef</string> <string name="title_help">Aide</string> <!--section--> @@ -37,17 +37,16 @@ <string name="section_master_key">Clef maîtresse</string> <string name="section_master_user_id">ID utilisateur maître</string> <string name="section_actions">Actions</string> - <string name="section_signing_key">Votre clef utilisée pour la signature</string> + <string name="section_certification_key">Votre clef utilisée pour la certification</string> <string name="section_upload_key">Téléverser la clef</string> <string name="section_key_server">Serveur de clefs</string> + <string name="section_encrypt_and_or_sign">Chiffrer et/ou signer</string> + <string name="section_decrypt_verify">Déchiffrer et vérifier</string> <!--button--> - <string name="btn_sign_to_clipboard">Signer (presse-papiers)</string> - <string name="btn_encrypt_to_clipboard">Chiffrer vers le presse-papiers</string> - <string name="btn_encrypt_and_send">Chiffrer et envoyer...</string> - <string name="btn_sign_and_send">Signer et envoyer...</string> <string name="btn_sign">Signer</string> + <string name="btn_certify">Certifier</string> <string name="btn_decrypt">Déchiffrer</string> - <string name="btn_verify">Vérifier</string> + <string name="btn_decrypt_verify">Déchiffrer et vérifier</string> <string name="btn_select_encrypt_keys">Choisir les destinataires</string> <string name="btn_encrypt_file">Chiffrer le fichier</string> <string name="btn_save">Enregistrer</string> @@ -61,6 +60,9 @@ <string name="btn_export_to_server">Téléverser vers le serveur de clefs</string> <string name="btn_next">Suivant</string> <string name="btn_back">Retour</string> + <string name="btn_clipboard">Presse-papiers</string> + <string name="btn_share">Partager avec...</string> + <string name="btn_lookup_key">Rechercher la clef</string> <!--menu--> <string name="menu_preferences">Paramètres</string> <string name="menu_help">Aide</string> @@ -109,7 +111,6 @@ <string name="label_passphrase_cache_ttl">Cache de la phrase de passe</string> <string name="label_message_compression">Compression des messages</string> <string name="label_file_compression">Compression des fichiers</string> - <string name="label_force_v3_signature">Forcer les signatures V3</string> <string name="label_key_servers">Serveurs de clefs</string> <string name="label_key_id">ID de le clef</string> <string name="label_creation">Création</string> @@ -120,7 +121,7 @@ <string name="label_name">Nom</string> <string name="label_comment">Commentaire</string> <string name="label_email">Courriel</string> - <string name="label_send_key">Téléverser la clef vers le serveur de clefs choisi après signature</string> + <string name="label_send_key">Téléverser la clef vers le serveur de clefs choisi après certification</string> <string name="label_fingerprint">Empreinte</string> <string name="select_keys_button_default">Choisir</string> <plurals name="select_keys_button"> @@ -134,9 +135,10 @@ <string name="can_encrypt">peut chiffrer</string> <string name="can_sign">peut signer</string> <string name="expired">expiré</string> + <string name="revoked">révoquée</string> <plurals name="n_key_servers"> - <item quantity="one">%d serveur de clef</item> - <item quantity="other">%d serveurs de clef</item> + <item quantity="one">%d serveur de clefs</item> + <item quantity="other">%d serveurs de clefs</item> </plurals> <string name="fingerprint">Empreinte :</string> <string name="secret_key">Clef secrète :</string> @@ -215,13 +217,12 @@ <item quantity="one">%d clef trouvée.</item> <item quantity="other">%d clefs trouvées.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Signature inconnue. Toucher pour rechercher la clef.</string> + <string name="unknown_signature">Signature inconnue. Cliquer sur le bouton pour rechercher la clef manquante.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d mauvaise clef ignorée. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item> <item quantity="other">%d mauvaises clefs ignorées. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item> </plurals> - <string name="lookup_unknown_key">Clef %s inconnue, voulez-vous essayer de la trouver sur un serveur de clefs ?</string> - <string name="key_send_success">Clef envoyée vers le serveur avec succès</string> + <string name="key_send_success">Clef téléversée vers le serveur avec succès</string> <string name="key_sign_success">Clef signée avec succès</string> <string name="list_empty">Cette liste est vide !</string> <string name="nfc_successfull">Clef envoyée par NFC BEAM avec succès !</string> @@ -234,7 +235,7 @@ they will be put after "error_message", e.g. "Error: file not found"--> <string name="error_file_delete_failed">échec lors de la suppression de « %s »</string> <string name="error_file_not_found">fichier introuvable</string> - <string name="error_no_secret_key_found">aucune clé secrète adéquate n\'a été trouvée</string> + <string name="error_no_secret_key_found">aucune clefs secrète adéquate n\'a été trouvée</string> <string name="error_no_known_encryption_found">aucune sorte de chiffrement connu n\'a été trouvé</string> <string name="error_external_storage_not_ready">le stockage externe n\'est pas prêt</string> <string name="error_invalid_email">courriel « %s » invalide</string> @@ -261,19 +262,24 @@ <string name="error_nfc_needed">NFC n\'est pas disponible sur votre appareil !</string> <string name="error_nothing_import">Rien à importer !</string> <string name="error_expiry_must_come_after_creation">la date d\'expiration doit venir après la date de création</string> + <string name="error_can_not_delete_contact">vous ne pouvez pas supprimer ce contact car c\'est le vôtre.</string> + <string name="error_can_not_delete_contacts">vous ne pouvez pas supprimer les contacts suivants car c\'est les vôtres.\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Veuillez le supprimer depuis l\'écran « Mes Clefs »!</item> + <item quantity="other">Veuillez les supprimer depuis l\'écran « Mes Clefs »!</item> + </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">fait.</string> <string name="progress_saving">sauvegarde...</string> <string name="progress_importing">importation...</string> <string name="progress_exporting">exportation...</string> - <string name="progress_generating">génération de la clef, ceci peut prendre un moment...</string> + <string name="progress_generating">génération de la clef, ceci peut prendre jusqu\'à 3 minutes...</string> <string name="progress_building_key">assemblage de la clef...</string> <string name="progress_preparing_master_key">préparation de la clef maîtresse...</string> <string name="progress_certifying_master_key">certification de la clef maîtresse...</string> <string name="progress_building_master_key">assemblage du trousseau maître...</string> <string name="progress_adding_sub_keys">ajout des sous-clefs...</string> <string name="progress_saving_key_ring">sauvegarde de la clef...</string> - <string name="progress_importing_secret_keys">Importation des clefs secrètes...</string> <plurals name="progress_exporting_key"> <item quantity="one">exportation de la clef...</item> <item quantity="other">exportation des clefs...</item> @@ -334,7 +340,7 @@ <string name="intent_send_encrypt">OpenPGP : chiffrer</string> <string name="intent_send_decrypt">OpenPGP : déchiffrer</string> <!--Remote API--> - <string name="api_no_apps">Aucune application enregistrée !</string> + <string name="api_no_apps">Aucune application enregistrée !\n\nLes applications tierces peuvent demander l\'accès au Porte-clefs OpenPGP. Après avoir autoriser l\'accès, elles seront listées ici.</string> <string name="api_settings_show_advanced">Afficher les paramètres avancés</string> <string name="api_settings_hide_advanced">Masquer les paramètres avancés</string> <string name="api_settings_no_key">Aucune clef choisie</string> @@ -344,7 +350,7 @@ <string name="api_settings_revoke">Révoquer l\'accès</string> <string name="api_settings_package_name">Nom du paquet</string> <string name="api_settings_package_signature">SHA-256 de la signature du paquet</string> - <string name="api_register_text">L\'application suivante demande l\'accès à l\'API du Porte-clefs OpenPGP.\n\nPermettre l\'accès permanent ?</string> + <string name="api_register_text">L\'application affichée demande l\'accès au Porte-clefs OpenPGP.\nPermettre l\'accès ?\n\nAvertissement : si vous ne savez pas pourquoi cet écran est apparu, refusé l\'accès ! Vous pourrez révoquer l\'accès plus tard en utilisant l\'écran « Applications enregistrées ».</string> <string name="api_register_allow">Permettre l\'accès</string> <string name="api_register_disallow">Enlever l\'accès</string> <string name="api_register_error_select_key">Veuillez choisir une clef !</string> @@ -370,6 +376,9 @@ <string name="key_list_empty_button_import">Importer des clefs.</string> <!--Key view--> <string name="key_view_action_encrypt">Chiffrer vers ce contact</string> + <string name="key_view_action_certify">Certifier la clef de ce contact</string> + <string name="key_view_tab_main">Infos</string> + <string name="key_view_tab_certs">Certifications</string> <!--Navigation Drawer--> <string name="nav_contacts">Contacts</string> <string name="nav_encrypt">Chiffrer</string> diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml index 44424561b..e404addfa 100644 --- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml @@ -15,7 +15,6 @@ <string name="title_export_key">Esportare Chiave</string> <string name="title_export_keys">Esportare Chiavi</string> <string name="title_key_not_found">Chiave Non Trovata</string> - <string name="title_sign_key">Firma Chiave</string> <string name="title_help">Aiuto</string> <!--section--> <string name="section_user_ids">ID Utente</string> @@ -23,10 +22,8 @@ <string name="section_general">Generale</string> <string name="section_advanced">Avanzato</string> <!--button--> - <string name="btn_sign_and_send">Firmare ed inviare...</string> <string name="btn_sign">Firmare</string> <string name="btn_decrypt">Decifrare</string> - <string name="btn_verify">Verificare</string> <string name="btn_encrypt_file">Cifrare File</string> <string name="btn_save">Salva</string> <string name="btn_do_not_save">Cancella</string> diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml new file mode 100644 index 000000000..15043c93a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml @@ -0,0 +1,381 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_manage_public_keys">連絡先</string> + <string name="title_manage_secret_keys">秘密鍵</string> + <string name="title_select_recipients">公開鍵の選択</string> + <string name="title_select_secret_key">秘密鍵の選択</string> + <string name="title_encrypt">暗号化</string> + <string name="title_decrypt">復号化</string> + <string name="title_authentication">パスフレーズ</string> + <string name="title_create_key">鍵の生成</string> + <string name="title_edit_key">鍵の編集</string> + <string name="title_preferences">設定</string> + <string name="title_api_registered_apps">登録済みのアプリケーション</string> + <string name="title_key_server_preference">鍵サーバ設定</string> + <string name="title_change_pass_phrase">パスフレーズの変更</string> + <string name="title_set_passphrase">パスフレーズの設定</string> + <string name="title_send_email">メールの送信...</string> + <string name="title_encrypt_to_file">暗号化してファイルに</string> + <string name="title_decrypt_to_file">復号化してファイルに</string> + <string name="title_import_keys">鍵のインポート</string> + <string name="title_export_key">鍵のエクスポート</string> + <string name="title_export_keys">複数鍵のエクスポート</string> + <string name="title_key_not_found">鍵が見当りません</string> + <string name="title_key_server_query">鍵サーバへの要求</string> + <string name="title_send_key">鍵サーバへアップロード</string> + <string name="title_unknown_signature_key">不明な署名の鍵です</string> + <string name="title_certify_key">鍵検証</string> + <string name="title_key_details">鍵の概要</string> + <string name="title_help">ヘルプ</string> + <!--section--> + <string name="section_user_ids">ユーザID</string> + <string name="section_keys">鍵</string> + <string name="section_general">一般</string> + <string name="section_defaults">デフォルト</string> + <string name="section_advanced">拡張</string> + <string name="section_master_key">主鍵</string> + <string name="section_master_user_id">主ユーザID</string> + <string name="section_actions">アクション</string> + <string name="section_certification_key">あなたの鍵を証明に利用します</string> + <string name="section_upload_key">鍵のアップロード</string> + <string name="section_key_server">鍵サーバ</string> + <string name="section_encrypt_and_or_sign">暗号化と/もしくは署名</string> + <string name="section_decrypt_verify">復号化と検証</string> + <!--button--> + <string name="btn_sign">署名</string> + <string name="btn_certify">検証</string> + <string name="btn_decrypt">復号化</string> + <string name="btn_decrypt_verify">復号化と検証</string> + <string name="btn_select_encrypt_keys">受信者の選択</string> + <string name="btn_encrypt_file">ファイル暗号化</string> + <string name="btn_save">保存</string> + <string name="btn_do_not_save">キャンセル</string> + <string name="btn_delete">削除</string> + <string name="btn_no_date">無し</string> + <string name="btn_okay">OK</string> + <string name="btn_change_passphrase">パスフレーズの変更</string> + <string name="btn_set_passphrase">パスフレーズの設定</string> + <string name="btn_search">検索</string> + <string name="btn_export_to_server">鍵サーバへアップロード</string> + <string name="btn_next">次</string> + <string name="btn_back">戻る</string> + <string name="btn_clipboard">クリップボード</string> + <string name="btn_share">共有...</string> + <string name="btn_lookup_key">鍵検出</string> + <!--menu--> + <string name="menu_preferences">設定</string> + <string name="menu_help">ヘルプ</string> + <string name="menu_import_from_file">ファイルからインポート</string> + <string name="menu_import_from_qr_code">QRコードからインポート</string> + <string name="menu_import">インポート</string> + <string name="menu_import_from_nfc">NFCからインポート</string> + <string name="menu_export_keys">すべての鍵のエクスポート</string> + <string name="menu_export_key">ファイルへのエクスポート</string> + <string name="menu_delete_key">鍵の削除</string> + <string name="menu_create_key">鍵の生成</string> + <string name="menu_create_key_expert">鍵の生成(上級)</string> + <string name="menu_search">検索</string> + <string name="menu_key_server">鍵サーバからのインポート</string> + <string name="menu_update_key">鍵サーバからの更新</string> + <string name="menu_export_key_to_server">鍵サーバへのアップロード</string> + <string name="menu_share">共有</string> + <string name="menu_share_title_fingerprint">指紋の共有...</string> + <string name="menu_share_title">すべての鍵の共有...</string> + <string name="menu_share_default_fingerprint">...(指紋)</string> + <string name="menu_share_default">...(鍵)</string> + <string name="menu_share_qr_code">QRコードで共有(鍵)</string> + <string name="menu_share_qr_code_fingerprint">QRコードで共有(指紋)</string> + <string name="menu_share_nfc">NFCで共有</string> + <string name="menu_copy_to_clipboard">クリップボードへコピー</string> + <string name="menu_sign_key">鍵を署名</string> + <string name="menu_beam_preferences">Beamの設定</string> + <string name="menu_key_edit_cancel">キャンセル</string> + <string name="menu_encrypt_to">暗号化...</string> + <!--label--> + <string name="label_sign">署名</string> + <string name="label_message">メッセージ</string> + <string name="label_file">ファイル</string> + <string name="label_no_passphrase">パスフレーズなし</string> + <string name="label_passphrase">パスフレーズ</string> + <string name="label_passphrase_again">もう一度</string> + <string name="label_algorithm">アルゴリズム</string> + <string name="label_ascii_armor">アスキー形式</string> + <string name="label_select_public_keys">受信者</string> + <string name="label_delete_after_encryption">暗号化後に削除</string> + <string name="label_delete_after_decryption">復号化後に削除</string> + <string name="label_encryption_algorithm">暗号化アルゴリズム</string> + <string name="label_hash_algorithm">ハッシュアルゴリズム</string> + <string name="label_asymmetric">公開鍵</string> + <string name="label_symmetric">パスフレーズ</string> + <string name="label_passphrase_cache_ttl">パスフレーズキャッシュ</string> + <string name="label_message_compression">メッセージの圧縮</string> + <string name="label_file_compression">ファイルの圧縮</string> + <string name="label_force_v3_signature">強制的に古いOpenPGPV3形式の署名にする</string> + <string name="label_key_servers">鍵サーバ</string> + <string name="label_key_id">鍵ID</string> + <string name="label_creation">生成</string> + <string name="label_expiry">満了</string> + <string name="label_usage">使い方</string> + <string name="label_key_size">鍵サイズ</string> + <string name="label_main_user_id">主ユーザID</string> + <string name="label_name">名前</string> + <string name="label_comment">コメント</string> + <string name="label_email">Eメールアドレス</string> + <string name="label_send_key">証明後選択した鍵サーバに鍵をアップロード</string> + <string name="label_fingerprint">指紋</string> + <string name="select_keys_button_default">選択</string> + <plurals name="select_keys_button"> + <item quantity="other">%d を選択</item> + </plurals> + <string name="user_id_no_name"><名前なし></string> + <string name="none"><無し></string> + <string name="no_key"><鍵無し></string> + <string name="unknown_status"></string> + <string name="can_encrypt">暗号化可能</string> + <string name="can_sign">署名可能</string> + <string name="expired">期限切れ</string> + <string name="revoked">破棄</string> + <plurals name="n_key_servers"> + <item quantity="other">%d の鍵サーバ</item> + </plurals> + <string name="fingerprint">指紋:</string> + <string name="secret_key">秘密鍵:</string> + <!--choice--> + <string name="choice_none">無し</string> + <string name="choice_sign_only">署名のみ</string> + <string name="choice_encrypt_only">暗号化のみ</string> + <string name="choice_sign_and_encrypt">署名と暗号化</string> + <string name="choice_15secs">15秒</string> + <string name="choice_1min">1分</string> + <string name="choice_3mins">3分</string> + <string name="choice_5mins">5分</string> + <string name="choice_10mins">10分</string> + <string name="choice_20mins">20分</string> + <string name="choice_40mins">40分</string> + <string name="choice_1hour">1時間</string> + <string name="choice_2hours">2時間</string> + <string name="choice_4hours">4時間</string> + <string name="choice_8hours">8時間</string> + <string name="choice_forever">永遠</string> + <string name="dsa">DSA</string> + <string name="elgamal">ElGamal</string> + <string name="rsa">RSA</string> + <string name="filemanager_title_open">開く...</string> + <string name="warning">注意</string> + <string name="error">エラー</string> + <string name="error_message">エラー: %s</string> + <!--sentences--> + <string name="wrong_passphrase">良くないパスフレーズ</string> + <string name="using_clipboard_content">クリップボードの内容を使う。</string> + <string name="set_a_passphrase">最初にパスフレーズを設定してください。</string> + <string name="no_filemanager_installed">互換性のないファイルマネージャがインストールされています。</string> + <string name="passphrases_do_not_match">パスフレーズが一致しません。</string> + <string name="passphrase_must_not_be_empty">空のパスフレーズは受け付けません。</string> + <string name="passphrase_for_symmetric_encryption">対称暗号。</string> + <string name="passphrase_for">\'%s\' にパスフレーズを入れてください。</string> + <string name="file_delete_confirmation">%s を削除してもかまいませんか?</string> + <string name="file_delete_successful">削除に成功しました。</string> + <string name="no_file_selected">最初にファイルを選択してください。</string> + <string name="decryption_successful">復号化に成功しました。</string> + <string name="encryption_successful">暗号化に成功しました。</string> + <string name="encryption_to_clipboard_successful">クリップボードの中身の暗号化に成功しました。</string> + <string name="enter_passphrase_twice">もう一度パスフレーズを入れてください。</string> + <string name="select_encryption_key">少なくとも1つの暗号化鍵を選択して下さい。</string> + <string name="select_encryption_or_signature_key">少なくとも1つの暗号化鍵か署名鍵を選択して下さい。</string> + <string name="specify_file_to_encrypt_to">どのファイルを暗号化するか決めてください。\n注意: 既存のファイルがあると上書きされます。</string> + <string name="specify_file_to_decrypt_to">どのファイルを復号化するか決めてください。\n注意: 既存のファイルがあると上書きされます。</string> + <string name="specify_file_to_export_to">どのファイルをエクスポートするか決めてください。\n注意: 既存のファイルがあると上書きされます。</string> + <string name="specify_file_to_export_secret_keys_to">どのファイルをエクスポートするか決めてください。\n注意: 秘密鍵をエクスポートしています。\n注意: 既存のファイルがあると上書きされます。</string> + <string name="key_deletion_confirmation">鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string> + <string name="key_deletion_confirmation_multi">選択したすべての鍵を本当に削除してよいですか?\nこれは元に戻せません。</string> + <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string> + <plurals name="keys_added_and_updated_1"> + <item quantity="other">%d の鍵を追加しました</item> + </plurals> + <plurals name="keys_added_and_updated_2"> + <item quantity="other">そして %d の鍵をアップロードしました。</item> + </plurals> + <plurals name="keys_added"> + <item quantity="other">%d の鍵を追加しました。</item> + </plurals> + <plurals name="keys_updated"> + <item quantity="other">%d の鍵をアップロードしました。</item> + </plurals> + <string name="no_keys_added_or_updated">鍵の追加もしくは更新はありませんでした。</string> + <string name="key_exported">1つの鍵をエクスポートしました。</string> + <string name="keys_exported">%d の鍵をエクスポートしました。</string> + <string name="no_keys_exported">鍵をエクスポートしていません。</string> + <string name="key_creation_el_gamal_info">備考: 副鍵として ElGamalだけがサポートされ, ElGamal は鍵サイズとして1536, 2048, 3072, 4096, 8192 だけが使えます。</string> + <string name="key_not_found">鍵 %08X は見付かりませんでした。</string> + <plurals name="keys_found"> + <item quantity="other">%d の鍵を発見。</item> + </plurals> + <string name="unknown_signature">不明な署名、ボタンを押して見付からない鍵を検出してください。</string> + <plurals name="bad_keys_encountered"> + <item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item> + </plurals> + <string name="key_send_success">鍵を鍵サーバにアップロードしました</string> + <string name="key_sign_success">鍵に署名しました。</string> + <string name="list_empty">このリストは空です!</string> + <string name="nfc_successfull">NFCビームで鍵を送信しました!</string> + <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string> + <string name="key_has_already_been_signed">鍵はすでに署名されています!</string> + <string name="select_key_to_sign">署名に使う鍵を選択して下さい!</string> + <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <string name="error_file_delete_failed">\'%s\' の削除に失敗</string> + <string name="error_file_not_found">ファイルが見付かりません</string> + <string name="error_no_secret_key_found">組になっている秘密鍵が見付かりません</string> + <string name="error_no_known_encryption_found">暗号化法が既知の種類内から見付かりません</string> + <string name="error_external_storage_not_ready">外部ストレージが準備できていません</string> + <string name="error_invalid_email">\'%s\' は不正なEメールアドレスです</string> + <string name="error_key_size_minimum512bit">鍵サイズは最低でも512bit必要です</string> + <string name="error_master_key_must_not_be_el_gamal">主鍵を ElGamal にすることはできません</string> + <string name="error_unknown_algorithm_choice">未知のアルゴリズムを選択しています</string> + <string name="error_user_id_needs_a_name">名前を特定する必要があります</string> + <string name="error_user_id_needs_an_email_address">Eメールアドレスを特定する必要があります</string> + <string name="error_key_needs_a_user_id">最低でも1つのユーザIDが必要です</string> + <string name="error_main_user_id_must_not_be_empty">主ユーザIDは空にすることはできません</string> + <string name="error_key_needs_master_key">主鍵が最低でも1つ必要です</string> + <string name="error_no_encryption_keys_or_passphrase">鍵が暗号化されていないかパスフレーズが与えられていません</string> + <string name="error_signature_failed">署名に失敗</string> + <string name="error_no_signature_passphrase">パスフレーズが与えられていません</string> + <string name="error_no_signature_key">署名鍵を与えられていません</string> + <string name="error_invalid_data">暗号化データが不正です</string> + <string name="error_corrupt_data">壊れたデータ</string> + <string name="error_integrity_check_failed">完全性チェックが失敗しました! データに変更があります!</string> + <string name="error_no_symmetric_encryption_packet">対称鍵暗号のパケットが見付かりませんでした</string> + <string name="error_wrong_passphrase">正しくないパスフレーズです</string> + <string name="error_saving_keys">鍵の保存エラー</string> + <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string> + <string name="error_only_files_are_supported">ファイルシステムに存在するファイルではないバイナリデータはサポートされません。 ACTION_ENCRYPT_STREAM_AND_RETURN でのみサポートされます。</string> + <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1 (Jelly Bean) が必要です!</string> + <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string> + <string name="error_nothing_import">インポートするものがありません!</string> + <string name="error_expiry_must_come_after_creation">期限日時は生成日時より後である必要があります</string> + <string name="error_can_not_delete_contact">この連絡先はあなたなので削除できません。</string> + <string name="error_can_not_delete_contacts">この連絡先はあなたなので削除できません。:\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="other">\'自分の鍵\'画面から削除してください!</item> + </plurals> + <!--progress dialogs, usually ending in '…'--> + <string name="progress_done">完了。</string> + <string name="progress_saving">保存...</string> + <string name="progress_importing">インポート...</string> + <string name="progress_exporting">エクスポート...</string> + <string name="progress_generating">鍵の生成、3分ほどかかります...</string> + <string name="progress_building_key">鍵の構築中...</string> + <string name="progress_preparing_master_key">主鍵の準備中...</string> + <string name="progress_certifying_master_key">主鍵の検証中...</string> + <string name="progress_building_master_key">主鍵輪の構築中...</string> + <string name="progress_adding_sub_keys">副鍵の追加中...</string> + <string name="progress_saving_key_ring">鍵の保存...</string> + <plurals name="progress_exporting_key"> + <item quantity="other">鍵のエクスポート...</item> + </plurals> + <string name="progress_extracting_signature_key">署名鍵の取り出し中...</string> + <string name="progress_extracting_key">鍵の取り出し中...</string> + <string name="progress_preparing_streams">ストリームの準備中...</string> + <string name="progress_encrypting">データの暗号化中...</string> + <string name="progress_decrypting">データの復号化中...</string> + <string name="progress_preparing_signature">署名の準備中...</string> + <string name="progress_generating_signature">署名の生成中...</string> + <string name="progress_processing_signature">署名処理中...</string> + <string name="progress_verifying_signature">署名の検証中...</string> + <string name="progress_signing">署名中...</string> + <string name="progress_reading_data">データ読み込み中...</string> + <string name="progress_finding_key">鍵検索中...</string> + <string name="progress_decompressing_data">データの展開中...</string> + <string name="progress_verifying_integrity">完全性の検証中...</string> + <string name="progress_deleting_securely">\'%s\' を完全に削除中…</string> + <string name="progress_querying">要求中...</string> + <!--action strings--> + <string name="hint_public_keys">公開鍵の検索</string> + <string name="hint_secret_keys">秘密鍵の検索</string> + <string name="action_share_key_with">鍵の共有...</string> + <!--key bit length selections--> + <string name="key_size_512">512</string> + <string name="key_size_1024">1024</string> + <string name="key_size_2048">2048</string> + <string name="key_size_4096">4096</string> + <!--compression--> + <string name="compression_fast">早い</string> + <string name="compression_very_slow">とても遅い</string> + <!--Help--> + <string name="help_tab_start">開始</string> + <string name="help_tab_nfc_beam">NFC Beam</string> + <string name="help_tab_changelog">Changelog</string> + <string name="help_tab_about">これについて</string> + <string name="help_about_version">バージョン:</string> + <!--Import--> + <string name="import_import">選択した鍵のインポート</string> + <string name="import_sign_and_upload">選択した鍵のインポート、署名、そしてアップロード</string> + <string name="import_from_clipboard">クリップボードからインポート</string> + <plurals name="import_qr_code_missing"> + <item quantity="other">ID %s のQRコードがありません</item> + </plurals> + <string name="import_qr_code_start_with_one">QRコードをID 1で始めてください</string> + <string name="import_qr_code_wrong">不適QRコード! もう一度!</string> + <string name="import_qr_code_finished">QRコードの読み取り完了!</string> + <string name="import_qr_code_too_short_fingerprint">QRコードに含まれる指紋が短かすぎます (< 16 文字)</string> + <string name="import_qr_scan_button">\'バーコードスキャナー\'でQRコードをスキャンする</string> + <string name="import_nfc_text">NFCで鍵を受信しました、デバイスのロックを解除する必要があります。</string> + <string name="import_nfc_help_button">ヘルプ</string> + <string name="import_clipboard_button">クリップボードから鍵を取得</string> + <!--Intent labels--> + <string name="intent_decrypt_file">OpenPGP: ファイル復号</string> + <string name="intent_import_key">OpenPGP: 鍵のインポート</string> + <string name="intent_send_encrypt">OpenPGP: 暗号化</string> + <string name="intent_send_decrypt">OpenPGP: 復号化</string> + <!--Remote API--> + <string name="api_no_apps">登録されていないアプリケーション!\n\nサードパーティアプリケーションはOpenPGP Keychainにアクセスを要求できます。アクセスを与えた後、それらはここにリストされます。</string> + <string name="api_settings_show_advanced">拡張設定を表示</string> + <string name="api_settings_hide_advanced">拡張設定を非表示</string> + <string name="api_settings_no_key">鍵が選択されていない</string> + <string name="api_settings_select_key">鍵の選択</string> + <string name="api_settings_save">保存</string> + <string name="api_settings_cancel">キャンセル</string> + <string name="api_settings_revoke">破棄されたアクセス</string> + <string name="api_settings_package_name">パッケージ名</string> + <string name="api_settings_package_signature">パッケージの署名 SHA-256</string> + <string name="api_register_text">表示されているアプリケーションはOpenPGP Keychainへのアクセスを要求しています。\nアクセスを許可しますか?\n\n注意: もしなぜスクリーンに表れたかわからないなら、アクセスを許可しないでください! あなたは\'登録済みアプリケーション\'スクリーンを使って、以降のアクセスを破棄するこもできます。</string> + <string name="api_register_allow">許可されたアクセス</string> + <string name="api_register_disallow">許可されないアクセス</string> + <string name="api_register_error_select_key">鍵を選択してください!</string> + <string name="api_select_pub_keys_missing_text">このユーザIDについて公開鍵が見付かりません:</string> + <string name="api_select_pub_keys_dublicates_text">このユーザIDについて1つ以上の公開鍵が存在します:</string> + <string name="api_select_pub_keys_text">受信者リストを確認してください!</string> + <string name="api_error_wrong_signature">署名チェックが失敗! 違うところからこのアプリをインストールしましたか? もし攻撃されてでなくそうであるなら、OpenPGP Keychainにあるこのアプリの登録を破棄し、再度アプリを登録してください。</string> + <!--Share--> + <string name="share_qr_code_dialog_title">QRコードで共有</string> + <string name="share_qr_code_dialog_start">すべてのQRコードを見る場合、\'次\' を押して一つ一つスキャンしてください。</string> + <string name="share_qr_code_dialog_fingerprint_text">指紋:</string> + <string name="share_qr_code_dialog_progress">%2$d の ID %1$d のQRコード</string> + <string name="share_nfc_dialog">NFCで共有</string> + <!--Key list--> + <plurals name="key_list_selected_keys"> + <item quantity="other">%d の鍵を選択。</item> + </plurals> + <string name="key_list_empty_text1">すでにその鍵は存在しません...</string> + <string name="key_list_empty_text2">で始める</string> + <string name="key_list_empty_text3">もしくは</string> + <string name="key_list_empty_button_create">あなた所有の鍵を作る</string> + <string name="key_list_empty_button_import">鍵のインポート。</string> + <!--Key view--> + <string name="key_view_action_encrypt">この連絡先を暗号化</string> + <string name="key_view_action_certify">この連絡先の鍵を検証</string> + <string name="key_view_tab_main">情報</string> + <string name="key_view_tab_certs">証明</string> + <!--Navigation Drawer--> + <string name="nav_contacts">連絡先</string> + <string name="nav_encrypt">暗号化</string> + <string name="nav_decrypt">復号化</string> + <string name="nav_import">鍵のインポート</string> + <string name="nav_secret_keys">自分の鍵</string> + <string name="nav_apps">登録済みのアプリ</string> + <string name="drawer_open">ナビゲーションドロワーを開く</string> + <string name="drawer_close">ナビゲーションドロワーを閉める</string> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml index b0d792708..72a8fdea8 100644 --- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml @@ -10,7 +10,6 @@ <string name="title_edit_key">Sleutel bewerken</string> <string name="title_preferences">Instellingen</string> <string name="title_api_registered_apps">Geregistreerde apps</string> - <string name="title_key_server_preference">Instellingen sleutelserver</string> <string name="title_change_pass_phrase">Wachtwoord wijzigen</string> <string name="title_set_passphrase">Wachtwoord instellen</string> <string name="title_send_email">E-mail verzenden...</string> @@ -20,9 +19,7 @@ <string name="title_export_key">Sleutels exporteren</string> <string name="title_export_keys">Sleutels exporteren</string> <string name="title_key_not_found">Sleutel niet gevonden</string> - <string name="title_key_server_query">Sleutelserver verzoek zenden</string> <string name="title_unknown_signature_key">Onbekende handtekeningssleutel</string> - <string name="title_sign_key">Sleutel ondertekenen</string> <string name="title_help">Help</string> <!--section--> <string name="section_user_ids">Gebruikers-id\'s</string> @@ -31,13 +28,8 @@ <string name="section_defaults">Standaard</string> <string name="section_advanced">Geavanceerd</string> <!--button--> - <string name="btn_sign_to_clipboard">Ondertekenen (klembord)</string> - <string name="btn_encrypt_to_clipboard">Versleutelen naar klembord</string> - <string name="btn_encrypt_and_send">Versleutelen en verzenden...</string> - <string name="btn_sign_and_send">Ondertekenen en verzenden...</string> <string name="btn_sign">Ondertekenen</string> <string name="btn_decrypt">Ontsleutelen</string> - <string name="btn_verify">Verifiëren</string> <string name="btn_select_encrypt_keys">Ontvangers selecteren</string> <string name="btn_encrypt_file">Bestand versleutelen</string> <string name="btn_save">Opslaan</string> @@ -61,7 +53,6 @@ <string name="menu_create_key">Sleutel aanmaken</string> <string name="menu_create_key_expert">Sleutel aanmaken (expert)</string> <string name="menu_search">Zoeken</string> - <string name="menu_key_server">Importeren uit sleutelserver</string> <string name="menu_sign_key">Sleutel ondertekenen</string> <string name="menu_beam_preferences">Beam-instellingen</string> <!--label--> @@ -82,8 +73,6 @@ <string name="label_passphrase_cache_ttl">Wachtwoordcache</string> <string name="label_message_compression">Berichtcompressie</string> <string name="label_file_compression">Bestandscompressie</string> - <string name="label_force_v3_signature">V3-handtekeningen afdwingen</string> - <string name="label_key_servers">Sleutelservers</string> <string name="label_key_id">Sleutel-id</string> <string name="label_creation">Aanmaak</string> <string name="label_expiry">Verlopen</string> @@ -149,9 +138,6 @@ <string name="no_keys_exported">Geen sleutels geëxporteerd.</string> <string name="key_creation_el_gamal_info">Opmerking: alleen sub-sleutels ondersteunen ElGamal, en voor ElGamal wordt de dichtstbijzijnde sleutelgrootte van 1536, 2048, 4096 of 8192 gebruikt.</string> <string name="key_not_found">Kan de sleutel %08X niet vinden.</string> - <string name="unknown_signature_key_touch_to_look_up">Onbekende handtekening, tik om sleutel op te zoeken.</string> - <string name="lookup_unknown_key">Onbekende sleutel %s, wilt u het bij een sleutelserver opvragen?</string> - <string name="key_send_success">Sleutel succesvol verzonden naar server</string> <string name="key_sign_success">Sleutel succesvol ondertekend</string> <string name="list_empty">Lijst is leeg</string> <string name="nfc_successfull">Sleutel succesvol verzonden met Beam</string> @@ -189,13 +175,11 @@ <string name="progress_saving">opslaan...</string> <string name="progress_importing">importeren...</string> <string name="progress_exporting">exporteren...</string> - <string name="progress_generating">sleutel genereren, een ogenblik geduld...</string> <string name="progress_building_key">sleutel maken...</string> <string name="progress_preparing_master_key">hoofdsleutel voorbereiden...</string> <string name="progress_certifying_master_key">hoofdsleutel certificeren...</string> <string name="progress_building_master_key">hoofdsleutelbos maken...</string> <string name="progress_adding_sub_keys">sub-sleutels toevoegen...</string> - <string name="progress_importing_secret_keys">privésleutels importeren...</string> <string name="progress_extracting_signature_key">ondertekeningssleutel uitpakken...</string> <string name="progress_extracting_key">sleutel uitpakken...</string> <string name="progress_preparing_streams">streams voorbereiden...</string> @@ -241,13 +225,11 @@ <string name="intent_send_encrypt">OpenPGP: versleutelen</string> <string name="intent_send_decrypt">OpenPGP: ontsleutelen</string> <!--Remote API--> - <string name="api_no_apps">Geen geregistreerde apps</string> <string name="api_settings_no_key">Geen sleutel geselecteerd</string> <string name="api_settings_select_key">Sleutel selecteren</string> <string name="api_settings_save">Opslaan</string> <string name="api_settings_cancel">Annuleren</string> <string name="api_settings_revoke">Toegang herroepen</string> - <string name="api_register_text">De volgende app vraagt toegang to de KeyChain-API van OpenPGP\n\nAltijd toestaan?</string> <string name="api_register_allow">Toegang toestaan</string> <string name="api_register_disallow">Toegang weigeren</string> <string name="api_register_error_select_key">Selecteert u a.u.b. een sleutel</string> diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml index 91ec2d1af..cbc394766 100644 --- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml @@ -25,7 +25,7 @@ <string name="title_key_server_query">Запросить сервер ключей</string> <string name="title_send_key">Загрузить на сервер ключей</string> <string name="title_unknown_signature_key">Неизвестная подпись</string> - <string name="title_sign_key">Ключ для подписи</string> + <string name="title_certify_key">Сертифицировать ключ</string> <string name="title_key_details">Сведения о ключе</string> <string name="title_help">Помощь</string> <!--section--> @@ -37,17 +37,16 @@ <string name="section_master_key">Основной ключ</string> <string name="section_master_user_id">Владелец</string> <string name="section_actions">Действия</string> - <string name="section_signing_key">Ваш ключ, используемый для подписания</string> + <string name="section_certification_key">Ваш ключ для сертификации</string> <string name="section_upload_key">Загрузить ключ</string> <string name="section_key_server">Сервер ключей</string> + <string name="section_encrypt_and_or_sign">Зашифровать и/или Подписать</string> + <string name="section_decrypt_verify">Расшифровать и проверить</string> <!--button--> - <string name="btn_sign_to_clipboard">Подписать (Буфер обмена)</string> - <string name="btn_encrypt_to_clipboard">Зашифровать в Буфер обмена</string> - <string name="btn_encrypt_and_send">Зашифровать и отправить...</string> - <string name="btn_sign_and_send">Подписать и отправить...</string> <string name="btn_sign">Подписать</string> + <string name="btn_certify">Сертифицировать</string> <string name="btn_decrypt">Расшифровать</string> - <string name="btn_verify">Проверить</string> + <string name="btn_decrypt_verify">Расшифровать и проверить</string> <string name="btn_select_encrypt_keys">Выбрать получателей</string> <string name="btn_encrypt_file">Зашифровать файл</string> <string name="btn_save">Сохранить</string> @@ -61,6 +60,9 @@ <string name="btn_export_to_server">Загрузить на сервер ключей</string> <string name="btn_next">Далее</string> <string name="btn_back">Назад</string> + <string name="btn_clipboard">Буфер обмена</string> + <string name="btn_share">Поделиться...</string> + <string name="btn_lookup_key">Найти ключ</string> <!--menu--> <string name="menu_preferences">Настройки</string> <string name="menu_help">Помощь</string> @@ -109,7 +111,6 @@ <string name="label_passphrase_cache_ttl">Помнить пароль</string> <string name="label_message_compression">Сжатие сообщения</string> <string name="label_file_compression">Сжатие файла</string> - <string name="label_force_v3_signature">Использовать V3 подписи</string> <string name="label_key_servers">Серверы ключей</string> <string name="label_key_id">ID ключа</string> <string name="label_creation">Создан</string> @@ -120,7 +121,7 @@ <string name="label_name">Имя</string> <string name="label_comment">Комментарий</string> <string name="label_email">Email</string> - <string name="label_send_key">Загрузить подписанный ключ на сервер</string> + <string name="label_send_key">После сертификации загрузить ключ на сервер</string> <string name="label_fingerprint">Отпечаток</string> <string name="select_keys_button_default">Выбрать</string> <plurals name="select_keys_button"> @@ -134,7 +135,8 @@ <string name="unknown_status"></string> <string name="can_encrypt">шифрование</string> <string name="can_sign">подпись</string> - <string name="expired">годен до</string> + <string name="expired">просрочен</string> + <string name="revoked">отозван</string> <plurals name="n_key_servers"> <item quantity="one">%d сервер ключей</item> <item quantity="few">%d серверов ключей</item> @@ -222,14 +224,13 @@ <item quantity="few">Найдено %d ключей.</item> <item quantity="other">Найдено %d ключей.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Неизвестная подпись. Нажмите для выбора ключа.</string> + <string name="unknown_signature">Неизвестная подпись. Нажмите кнопку, что бы найти ключ.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d плохой секретный ключ проигнорирован. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys</item> <item quantity="few">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item> <item quantity="other">%d плохих секретных ключей проигнорировано. Возможно, вы экспортируете с параметром\n--export-secret-subkeys\nВместо этого используйте\n--export-secret-keys\n</item> </plurals> - <string name="lookup_unknown_key">Неизвестный ключ %s. Хотите искать на сервере ключей?</string> - <string name="key_send_success">Ключ успешно отправлен на сервер</string> + <string name="key_send_success">Ключ успешно загружен на сервер</string> <string name="key_sign_success">Ключ успешно подписан</string> <string name="list_empty">Список пуст!</string> <string name="nfc_successfull">Ключ успешно передан через NFC!</string> @@ -269,19 +270,25 @@ <string name="error_nfc_needed">Ваше устройство не поддерживает NFC!</string> <string name="error_nothing_import">Нет данных для импорта!</string> <string name="error_expiry_must_come_after_creation">срок годности не может быть раньше даты создания</string> + <string name="error_can_not_delete_contact">нельзя удалить свой собственный контакт. Пожалуйста, удалите его в разделе \'Мои ключи\'!</string> + <string name="error_can_not_delete_contacts">это ваши собственные контакты, их нельзя удалить:\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Пожалуйста, удалите его в разделе \'Мои ключи\'!</item> + <item quantity="few">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item> + <item quantity="other">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item> + </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">готово.</string> <string name="progress_saving">сохранение...</string> <string name="progress_importing">импорт...</string> <string name="progress_exporting">экспорт...</string> - <string name="progress_generating">создание ключа... на это нужно время...</string> + <string name="progress_generating">создание ключа. это может занять до 3 минут...</string> <string name="progress_building_key">создание ключа...</string> <string name="progress_preparing_master_key">подготовка основного ключа...</string> <string name="progress_certifying_master_key">сертификация основного ключа...</string> <string name="progress_building_master_key">создание основной связки...</string> <string name="progress_adding_sub_keys">добавление доп. ключей...</string> <string name="progress_saving_key_ring">сохранение ключа...</string> - <string name="progress_importing_secret_keys">импорт секретных ключей...</string> <plurals name="progress_exporting_key"> <item quantity="one">экспорт ключа...</item> <item quantity="few">экспорт ключей...</item> @@ -344,7 +351,7 @@ <string name="intent_send_encrypt">OpenPGP: Зашифровать</string> <string name="intent_send_decrypt">OpenPGP: Расшифровать</string> <!--Remote API--> - <string name="api_no_apps">Нет связанных приложений!</string> + <string name="api_no_apps">Нет связанных программ!\n\nСторонние программы могут запросить доступ к OpenPGP Keychain, после чего они будут отражаться здесь.</string> <string name="api_settings_show_advanced">Показать расширенные настройки</string> <string name="api_settings_hide_advanced">Скрыть расширенные настройки</string> <string name="api_settings_no_key">Ключ не выбран</string> @@ -354,7 +361,7 @@ <string name="api_settings_revoke">Отозвать доступ</string> <string name="api_settings_package_name">Наименование пакета</string> <string name="api_settings_package_signature">SHA-256 подписи пакета</string> - <string name="api_register_text">Приложение запрашивает доступ к OpenPGP Keychain API.\nРазрешить доступ?</string> + <string name="api_register_text">Данное приложение запрашивает доступ к OpenPGP Keychain.\nРазрешить доступ?\n\nВНИМАНИЕ: Если вы не знаете почему возник этот запрос, откажите в доступе!\nПозже вы можете отозвать право доступа в разделе \"Зарегистрированные программы\".</string> <string name="api_register_allow">Разрешить доступ</string> <string name="api_register_disallow">Запретить доступ</string> <string name="api_register_error_select_key">Пожалуйста, выберите ключ!</string> @@ -381,6 +388,9 @@ <string name="key_list_empty_button_import">Импортировать ключи</string> <!--Key view--> <string name="key_view_action_encrypt">Зашифровать для этого получателя</string> + <string name="key_view_action_certify">Сертифицировать ключ этого контакта</string> + <string name="key_view_tab_main">Информация</string> + <string name="key_view_tab_certs">Сертификация</string> <!--Navigation Drawer--> <string name="nav_contacts">Контакты</string> <string name="nav_encrypt">Зашифровать</string> diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml index d9fe8713e..5bb5225b5 100644 --- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml @@ -7,14 +7,11 @@ <string name="title_create_key">Anahtar oluştur</string> <string name="title_edit_key">Anahtarı düzenle</string> <string name="title_preferences">Seçenekler</string> - <string name="title_key_server_preference">Anahtar Sunucusu Seçenekleri</string> <string name="title_import_keys">Anahtarları Al</string> <string name="title_export_key">Anahtarı Ver</string> <string name="title_export_keys">Anahtarları Ver</string> <string name="title_key_not_found">Anahtar Bulunamadı</string> - <string name="title_key_server_query">Anahtar Sunucusunu Sorgula</string> <string name="title_unknown_signature_key">Bilinmeyen İmza Anahtarı</string> - <string name="title_sign_key">Anahtarı İmzala</string> <string name="title_key_details">Anahtar Detayları</string> <string name="title_help">Yardım</string> <!--section--> @@ -24,21 +21,14 @@ <string name="section_defaults">Varsayılanlar</string> <string name="section_advanced">Gelişmiş</string> <string name="section_upload_key">Anahtar Yükle</string> - <string name="section_key_server">Anahtar Sunucusu</string> <!--button--> - <string name="btn_sign_to_clipboard">İmzala (Pano)</string> - <string name="btn_encrypt_to_clipboard">Panoya Şifrele</string> - <string name="btn_encrypt_and_send">Şifrele ve gönder...</string> - <string name="btn_sign_and_send">İmzala ve gönder...</string> <string name="btn_sign">İmzala</string> - <string name="btn_verify">Doğrula</string> <string name="btn_select_encrypt_keys">Alıcıları Seç</string> <string name="btn_save">Kaydet</string> <string name="btn_do_not_save">İptal</string> <string name="btn_delete">Sil</string> <string name="btn_okay">Tamam</string> <string name="btn_search">Ara</string> - <string name="btn_export_to_server">Sunucuya Anahtar Yükle</string> <string name="btn_next">İleri</string> <string name="btn_back">Geri</string> <!--menu--> @@ -53,7 +43,6 @@ <string name="menu_create_key">Anahtar oluştur</string> <string name="menu_create_key_expert">Anahtar oluştur (uzman)</string> <string name="menu_search">Ara</string> - <string name="menu_key_server">Anahtar sunucusundan al</string> <string name="menu_copy_to_clipboard">Panoya kopyala</string> <string name="menu_sign_key">Anahtarı imzala</string> <string name="menu_key_edit_cancel">İptal</string> @@ -64,7 +53,6 @@ <string name="label_passphrase_again">Tekrar</string> <string name="label_algorithm">Algoritma</string> <string name="label_asymmetric">Açık Anahtar</string> - <string name="label_key_servers">Anahtar Sunucuları</string> <string name="label_creation">Oluşturma</string> <string name="label_usage">Kullanım</string> <string name="label_key_size">Anahtar Boyutu</string> @@ -97,7 +85,6 @@ <string name="no_file_selected">Önce bir dosya seçin.</string> <string name="encryption_successful">Başarıyla şifrelendi.</string> <string name="key_not_found">Anahtar %08X bulunamadı.</string> - <string name="key_send_success">Anahtar sunucuya başarıyla gönderildi</string> <string name="key_sign_success">Anahtar başarıyla imzalandı</string> <string name="list_empty">Liste boş!</string> <!--errors @@ -112,7 +99,6 @@ <string name="progress_saving">kaydediliyor...</string> <string name="progress_importing">alıyor...</string> <string name="progress_exporting">veriyor...</string> - <string name="progress_generating">anahtar üretiliyor, bu biraz süre alabilir...</string> <string name="progress_building_key">anahtar oluşturuluyor...</string> <string name="progress_preparing_signature">imza hazırlanıyor...</string> <string name="progress_generating_signature">imza oluşturuluyor...</string> diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml index ac40311b0..47cbb38b3 100644 --- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml @@ -22,10 +22,10 @@ <string name="title_export_key">Експортувати ключ</string> <string name="title_export_keys">Експортувати ключі</string> <string name="title_key_not_found">Ключ не знайдено</string> - <string name="title_key_server_query">Сервер запиту ключа</string> + <string name="title_key_server_query">Сервер ключа запиту</string> <string name="title_send_key">Завантажити на сервер ключів</string> <string name="title_unknown_signature_key">Невідомий підпис ключа</string> - <string name="title_sign_key">Підписати ключ</string> + <string name="title_certify_key">Сертифікувати ключ</string> <string name="title_key_details">Подробиці про ключ</string> <string name="title_help">Довідка</string> <!--section--> @@ -37,17 +37,16 @@ <string name="section_master_key">Основний ключ</string> <string name="section_master_user_id">ІД основного ключа</string> <string name="section_actions">Дії</string> - <string name="section_signing_key">Ваш ключ, використаний для підпису</string> + <string name="section_certification_key">Ваш ключ використаний для сертифікації</string> <string name="section_upload_key">Завантажити ключ</string> <string name="section_key_server">Сервер ключів</string> + <string name="section_encrypt_and_or_sign">Шифрувати і/або підписати</string> + <string name="section_decrypt_verify">Розшифрувати і Перевірити</string> <!--button--> - <string name="btn_sign_to_clipboard">Підпис (буфер обміну)</string> - <string name="btn_encrypt_to_clipboard">Зашифрувати у буфер обміну</string> - <string name="btn_encrypt_and_send">Шифрувати і надіслати…</string> - <string name="btn_sign_and_send">Підписати і надіслати…</string> <string name="btn_sign">Підписати</string> + <string name="btn_certify">Сертифікувати</string> <string name="btn_decrypt">Розшифрувати</string> - <string name="btn_verify">Перевірити</string> + <string name="btn_decrypt_verify">Розшифрувати і Перевірити</string> <string name="btn_select_encrypt_keys">Вибрати одержувачів</string> <string name="btn_encrypt_file">Шифрувати файл</string> <string name="btn_save">Зберегти</string> @@ -61,6 +60,9 @@ <string name="btn_export_to_server">Завантажити на сервер ключів</string> <string name="btn_next">Далі</string> <string name="btn_back">Назад</string> + <string name="btn_clipboard">Буфер обміну</string> + <string name="btn_share">Поділитися через…</string> + <string name="btn_lookup_key">Шукати ключ</string> <!--menu--> <string name="menu_preferences">Параметри</string> <string name="menu_help">Довідка</string> @@ -109,7 +111,7 @@ <string name="label_passphrase_cache_ttl">Кеш парольної фрази</string> <string name="label_message_compression">Стиснення повідомлення</string> <string name="label_file_compression">Стиснення файлу</string> - <string name="label_force_v3_signature">Примусові підписи V3</string> + <string name="label_force_v3_signature">Примусово старі підписи OpenPGPv3</string> <string name="label_key_servers">Сервери ключів</string> <string name="label_key_id">ІД ключа</string> <string name="label_creation">Створення</string> @@ -120,7 +122,7 @@ <string name="label_name">Назва</string> <string name="label_comment">Коментар</string> <string name="label_email">Ел. пошта</string> - <string name="label_send_key">Завантажити ключ на вибраний сервер ключів після підписування</string> + <string name="label_send_key">Завантажити ключ до вибраного сервера ключів після сертифікації</string> <string name="label_fingerprint">Відбиток</string> <string name="select_keys_button_default">Вибрати</string> <plurals name="select_keys_button"> @@ -135,6 +137,7 @@ <string name="can_encrypt">можна зашифрувати</string> <string name="can_sign">можна підписати</string> <string name="expired">закінчився</string> + <string name="revoked">скасовано</string> <plurals name="n_key_servers"> <item quantity="one">%d сервер ключів</item> <item quantity="few">%d сервери ключів</item> @@ -222,14 +225,13 @@ <item quantity="few">Знайдено %d ключі.</item> <item quantity="other">Знайдено %d ключів.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Невідомий підпис, натисніть, щоб шукати ключ.</string> + <string name="unknown_signature">Невідомий підпис, натисніть кнопку для пошуку втраченого ключа.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d поганий секретний ключ проігнорований. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item> <item quantity="few">%d погані секретні ключі проігноровані. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item> <item quantity="other">%d поганих секретних ключів проігноровано. Можливо ви експортували з параметром\n --export-secret-subkeys\nЗробіть ваш експорт з \n --export-secret-keys\nнатомість.</item> </plurals> - <string name="lookup_unknown_key">Невідомий ключ %s, ви хочете віднайти його на сервері ключів?</string> - <string name="key_send_success">Успішно надіслано ключ на сервер</string> + <string name="key_send_success">Успішно завантажено ключ на сервер</string> <string name="key_sign_success">Успішно підписаний ключ</string> <string name="list_empty">Цей список - порожній!</string> <string name="nfc_successfull">Успішно відправлений ключ з NFC променем!</string> @@ -260,6 +262,7 @@ <string name="error_no_signature_key">не подано ключ підпису</string> <string name="error_invalid_data">недійсні дані шифрування</string> <string name="error_corrupt_data">пошкодити дані</string> + <string name="error_integrity_check_failed">Невдала перевірка цілісності! Дані вже змінено!</string> <string name="error_no_symmetric_encryption_packet">не знайдено пакунок з симетричним шифруванням</string> <string name="error_wrong_passphrase">помилкова парольна фраза</string> <string name="error_saving_keys">помилка збереження деяких ключів</string> @@ -269,19 +272,25 @@ <string name="error_nfc_needed">NFC недоступний на вашому пристрої!</string> <string name="error_nothing_import">Нема що імпортувати!</string> <string name="error_expiry_must_come_after_creation">дата завершення дії має йти після дати створення</string> + <string name="error_can_not_delete_contact">ви не можете вилучити цей контакт, тому що він ваш власний.</string> + <string name="error_can_not_delete_contacts">ви не можете вилучити наступні контакти, тому що вони - ваші власні:\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Будь ласка, вилучіть його з екрану „Мої ключі“!</item> + <item quantity="few">Будь ласка, вилучіть їх з екрану „Мої ключі“!</item> + <item quantity="other">Будь ласка, вилучіть їх з екрану „Мої ключі“!</item> + </plurals> <!--progress dialogs, usually ending in '…'--> <string name="progress_done">готово.</string> <string name="progress_saving">збереження…</string> <string name="progress_importing">імпортується…</string> <string name="progress_exporting">експортується…</string> - <string name="progress_generating">генерується ключ, зачекайте…</string> + <string name="progress_generating">генерується ключ, вона може тривати до 3 хвилин…</string> <string name="progress_building_key">будується ключ…</string> <string name="progress_preparing_master_key">підготовка основного ключа…</string> <string name="progress_certifying_master_key">сертифікація основного ключа…</string> <string name="progress_building_master_key">побудова основного кільця…</string> <string name="progress_adding_sub_keys">додавання підключів…</string> <string name="progress_saving_key_ring">зберігається ключ…</string> - <string name="progress_importing_secret_keys">імпортуються секретні ключі…</string> <plurals name="progress_exporting_key"> <item quantity="one">експортується ключ…</item> <item quantity="few">експортуються ключі…</item> @@ -344,7 +353,7 @@ <string name="intent_send_encrypt">OpenPGP: зашифрувати</string> <string name="intent_send_decrypt">OpenPGP: розшифрувати</string> <!--Remote API--> - <string name="api_no_apps">Немає зареєстрованих програм!</string> + <string name="api_no_apps">Нема зареєстрованих програм!\n\nСтороні програми можуть вимагати доступ до OpenPGP Keychain. Після надання доступу вони будуть наведені тут.</string> <string name="api_settings_show_advanced">Показати додаткові налаштування</string> <string name="api_settings_hide_advanced">Приховати додаткові налаштування</string> <string name="api_settings_no_key">Не вибрано ключа</string> @@ -354,7 +363,7 @@ <string name="api_settings_revoke">Відкликати доступ</string> <string name="api_settings_package_name">Назва пакунку</string> <string name="api_settings_package_signature">SHA-256 підписку пакунку</string> - <string name="api_register_text">Наступна програм запитала доступ до OpenPGP Keychain API.\n\nДозволити постійний доступ?</string> + <string name="api_register_text">Показана програма запитує доступ до OpenPGP Keychain.\nДозволити доступ?\n\nУВАГА: якщо ви не знаєте, чому цей екран появився, не дозволяйте доступ! Ви можете відкликати доступ пізніше, використовуючи екран \'Зареєстровані програми\'.</string> <string name="api_register_allow">Дозволити доступ</string> <string name="api_register_disallow">Не дозволити доступ</string> <string name="api_register_error_select_key">Будь ласка, виберіть ключ!</string> @@ -381,6 +390,9 @@ <string name="key_list_empty_button_import">імпортуюся ключі.</string> <!--Key view--> <string name="key_view_action_encrypt">Зашифрувати у цей контакт</string> + <string name="key_view_action_certify">Сертифікувати ключ цього контакту</string> + <string name="key_view_tab_main">Інформація</string> + <string name="key_view_tab_certs">Сертифікати</string> <!--Navigation Drawer--> <string name="nav_contacts">Контакти</string> <string name="nav_encrypt">Зашифрувати</string> diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml index 6bb115049..30d6a3518 100644 --- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml @@ -1,26 +1,164 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <!--title--> + <string name="title_encrypt">加密</string> + <string name="title_decrypt">解密</string> + <string name="title_key_server_preference">密钥服务器偏好</string> + <string name="title_key_server_query">查询密钥服务器</string> + <string name="title_send_key">上传到密钥服务器</string> <!--section--> + <string name="section_master_key">主密钥</string> + <string name="section_key_server">密钥服务器</string> + <string name="section_decrypt_verify">解密并验证</string> <!--button--> + <string name="btn_decrypt_verify">解密并验证</string> + <string name="btn_clipboard">剪贴板</string> <!--menu--> + <string name="menu_help">帮助</string> + <string name="menu_import">导入</string> + <string name="menu_delete_key">删除密钥</string> + <string name="menu_create_key">创建密钥</string> + <string name="menu_create_key_expert">创建密钥(专家)</string> + <string name="menu_search">搜索</string> + <string name="menu_share">分享</string> + <string name="menu_copy_to_clipboard">复制到剪贴板</string> + <string name="menu_sign_key">签署密钥</string> + <string name="menu_key_edit_cancel">取消</string> + <string name="menu_encrypt_to">加密到...</string> <!--label--> + <string name="label_sign">签署</string> + <string name="label_message">讯息</string> + <string name="label_file">文件</string> + <string name="label_no_passphrase">没有密语</string> + <string name="label_passphrase">密语</string> + <string name="label_algorithm">算法</string> + <string name="label_select_public_keys">收件人</string> + <string name="label_delete_after_encryption">加密后删除</string> + <string name="label_delete_after_decryption">解密后删除</string> + <string name="label_encryption_algorithm">加密算法</string> + <string name="label_hash_algorithm">哈希算法</string> + <string name="label_asymmetric">公共密钥</string> + <string name="label_symmetric">密语</string> + <string name="label_passphrase_cache_ttl">密语缓存</string> + <string name="label_comment">注解</string> + <string name="label_email">电子邮件</string> + <string name="label_fingerprint">指纹</string> <string name="unknown_status"></string> + <string name="can_encrypt">可以加密</string> + <string name="can_sign">可以签署</string> + <string name="expired">过期了</string> <!--choice--> + <string name="choice_none">没有</string> + <string name="choice_sign_only">仅签署</string> + <string name="choice_encrypt_only">仅加密</string> + <string name="choice_sign_and_encrypt">签署并加密</string> + <string name="choice_15secs">15秒</string> + <string name="choice_1min">1分钟</string> + <string name="choice_3mins">3分钟</string> + <string name="choice_5mins">5分钟</string> + <string name="choice_10mins">10分钟</string> + <string name="choice_20mins">20分钟</string> + <string name="choice_40mins">40分钟</string> + <string name="choice_1hour">1小时</string> + <string name="choice_2hours">2小时</string> + <string name="choice_4hours">4小时</string> + <string name="choice_8hours">8小时</string> + <string name="choice_forever">永远</string> + <string name="filemanager_title_open">打开...</string> + <string name="warning">警告</string> + <string name="error">错误</string> <!--sentences--> + <string name="set_a_passphrase">先设置密钥</string> + <string name="no_filemanager_installed">安装了不匹配的文件管理器</string> + <string name="passphrases_do_not_match">密钥不匹配</string> + <string name="passphrase_must_not_be_empty">不允许空的密钥</string> + <string name="passphrase_for_symmetric_encryption">对称加密</string> + <string name="file_delete_successful">删除成功</string> + <string name="no_file_selected">先选择一个文件</string> + <string name="decryption_successful">解密成功</string> + <string name="encryption_successful">加密成功</string> + <string name="encryption_to_clipboard_successful">成功地加密到了剪贴板</string> + <string name="enter_passphrase_twice">输入两次密钥</string> + <string name="select_encryption_key">选择至少一个加密密钥</string> + <string name="select_encryption_or_signature_key">选择至少一个加密密钥或者签名密钥</string> + <string name="key_exported">成功地导出了1个密钥</string> + <string name="no_keys_exported">没有密钥被导出</string> + <string name="key_send_success">成功地上传了密钥到服务器</string> + <string name="list_empty">这个列表是空的！</string> <!--errors no punctuation, all lowercase, they will be put after "error_message", e.g. "Error: file not found"--> + <string name="error_file_not_found">没有找到文件</string> + <string name="error_external_storage_not_ready">外置存储没有准备好</string> + <string name="error_invalid_email">无效的email \'%s\'</string> + <string name="error_key_size_minimum512bit">密钥的大小必须至少512位</string> + <string name="error_unknown_algorithm_choice">位置的算法选择</string> + <string name="error_user_id_needs_a_name">你需要指定一个名字</string> + <string name="error_user_id_needs_an_email_address">你需要指定一个电子邮件地址</string> + <string name="error_key_needs_a_user_id">需要至少一个用户id</string> + <string name="error_main_user_id_must_not_be_empty">主用户id不能是空的</string> + <string name="error_key_needs_master_key">需要至少一个主密钥</string> + <string name="error_signature_failed">签名失败</string> + <string name="error_no_signature_passphrase">没有提供密语</string> + <string name="error_no_signature_key">没有提供密钥</string> + <string name="error_invalid_data">不是有效的加密数据</string> + <string name="error_corrupt_data">损坏的数据</string> + <string name="error_wrong_passphrase">错误的密语</string> <!--progress dialogs, usually ending in '…'--> + <string name="progress_done">完成。</string> + <string name="progress_saving">保存...</string> + <string name="progress_importing">导入中...</string> + <string name="progress_exporting">导出中...</string> + <string name="progress_building_key">建立密钥</string> + <string name="progress_preparing_master_key">正在准备主密钥</string> + <string name="progress_verifying_signature">正在验证签名...</string> + <string name="progress_signing">正在签名...</string> + <string name="progress_reading_data">正在读取数据</string> + <string name="progress_finding_key">正在查找密钥</string> + <string name="progress_querying">正在查询</string> <!--action strings--> <!--key bit length selections--> + <string name="key_size_512">512</string> + <string name="key_size_1024">1024</string> + <string name="key_size_2048">2048</string> + <string name="key_size_4096">4096</string> <!--compression--> + <string name="compression_fast">快</string> + <string name="compression_very_slow">非常慢</string> <!--Help--> + <string name="help_tab_start">开始</string> + <string name="help_tab_changelog">更新日志</string> + <string name="help_tab_about">关于</string> + <string name="help_about_version">版本:</string> <!--Import--> + <string name="import_from_clipboard">从剪贴板导入</string> + <string name="import_qr_code_finished">二维码扫描完成！</string> + <string name="import_nfc_help_button">帮助</string> <!--Intent labels--> + <string name="intent_decrypt_file">OpenPGP: 解密文件</string> + <string name="intent_import_key">OpenPGP: 导入密钥</string> + <string name="intent_send_encrypt">OpenPGP: 加密</string> + <string name="intent_send_decrypt">OpenPGP: 解密</string> <!--Remote API--> + <string name="api_settings_show_advanced">显示高级设置</string> + <string name="api_settings_hide_advanced">隐藏高级设置</string> + <string name="api_settings_select_key">选择密钥</string> + <string name="api_settings_save">保存</string> + <string name="api_settings_cancel">取消</string> + <string name="api_settings_revoke">撤销访问</string> + <string name="api_register_allow">允许访问</string> + <string name="api_register_disallow">不允许访问</string> + <string name="api_register_error_select_key">请选择一个密钥</string> + <string name="api_select_pub_keys_text">请重审收件人列表</string> <!--Share--> + <string name="share_qr_code_dialog_fingerprint_text">指纹:</string> + <string name="share_nfc_dialog">使用NFC分享</string> <!--Key list--> + <string name="key_list_empty_text3">或者</string> <!--Key view--> <!--Navigation Drawer--> + <string name="nav_encrypt">加密</string> + <string name="nav_decrypt">解密</string> + <string name="nav_import">导入密钥</string> + <string name="nav_secret_keys">我的密钥</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values/static_strings.xml b/OpenPGP-Keychain/src/main/res/values/static_strings.xml index 3c9cf6673..faf1e687a 100644 --- a/OpenPGP-Keychain/src/main/res/values/static_strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/static_strings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string name="app_name" translatable="false">OpenPGP Keychain</string> + <string name="app_name" translatable="false">OpenKeychain</string> </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 64c9be32d..861a50eaa 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -13,7 +13,7 @@ <string name="title_edit_key">Edit Key</string> <string name="title_preferences">Preferences</string> <string name="title_api_registered_apps">Registered Applications</string> - <string name="title_key_server_preference">Key Server Preference</string> + <string name="title_key_server_preference">Keyserver Preference</string> <string name="title_change_pass_phrase">Change Passphrase</string> <string name="title_set_passphrase">Set Passphrase</string> <string name="title_send_email">"Send Mail…"</string> @@ -23,10 +23,10 @@ <string name="title_export_key">Export Key</string> <string name="title_export_keys">Export Keys</string> <string name="title_key_not_found">Key Not Found</string> - <string name="title_key_server_query">Query Key Server</string> - <string name="title_send_key">Upload to Key Server</string> + <string name="title_key_server_query">Query Keyserver</string> + <string name="title_send_key">Upload to Keyserver</string> <string name="title_unknown_signature_key">Unknown Signature Key</string> - <string name="title_sign_key">Sign Key</string> + <string name="title_certify_key">Certify Key</string> <string name="title_key_details">Key Details</string> <string name="title_help">Help</string> @@ -39,14 +39,15 @@ <string name="section_master_key">Master Key</string> <string name="section_master_user_id">Master User ID</string> <string name="section_actions">Actions</string> - <string name="section_signing_key">Your Key used for Signing</string> + <string name="section_certification_key">Your Key used for certification</string> <string name="section_upload_key">Upload Key</string> - <string name="section_key_server">Key Server</string> + <string name="section_key_server">Keyserver</string> <string name="section_encrypt_and_or_sign">Encrypt and/or Sign</string> <string name="section_decrypt_verify">Decrypt and Verify</string> <!-- button --> <string name="btn_sign">Sign</string> + <string name="btn_certify">Certify</string> <string name="btn_decrypt">Decrypt</string> <string name="btn_decrypt_verify">Decrypt and Verify</string> <string name="btn_select_encrypt_keys">Select Recipients</string> @@ -59,12 +60,12 @@ <string name="btn_change_passphrase">Change New Passphrase</string> <string name="btn_set_passphrase">Set New Passphrase</string> <string name="btn_search">Search</string> - <string name="btn_export_to_server">Upload To Key Server</string> + <string name="btn_export_to_server">Upload To Keyserver</string> <string name="btn_next">Next</string> <string name="btn_back">Back</string> <string name="btn_clipboard">Clipboard</string> <string name="btn_share">Share with…</string> - + <string name="btn_lookup_key">Lookup key</string> <!-- menu --> <string name="menu_preferences">Settings</string> @@ -79,8 +80,8 @@ <string name="menu_create_key">Create key</string> <string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_search">Search</string> - <string name="menu_key_server">Import from key server</string> - <string name="menu_update_key">Update from key server</string> + <string name="menu_key_server">Import from keyserver</string> + <string name="menu_update_key">Update from keyserver</string> <string name="menu_export_key_to_server">Upload to key server</string> <string name="menu_share">Share</string> <string name="menu_share_title_fingerprint">Share fingerprint…</string> @@ -115,8 +116,8 @@ <string name="label_passphrase_cache_ttl">Passphrase Cache</string> <string name="label_message_compression">Message Compression</string> <string name="label_file_compression">File Compression</string> - <string name="label_force_v3_signature">Force V3 Signatures</string> - <string name="label_key_servers">Key Servers</string> + <string name="label_force_v3_signature">Force old OpenPGPv3 Signatures</string> + <string name="label_key_servers">Keyservers</string> <string name="label_key_id">Key ID</string> <string name="label_creation">Creation</string> <string name="label_expiry">Expiry</string> @@ -126,7 +127,7 @@ <string name="label_name">Name</string> <string name="label_comment">Comment</string> <string name="label_email">Email</string> - <string name="label_send_key">Upload key to selected key server after signing</string> + <string name="label_send_key">Upload key to selected keyserver after certification</string> <string name="label_fingerprint">Fingerprint</string> <string name="select_keys_button_default">Select</string> @@ -142,10 +143,11 @@ <string name="can_encrypt">can encrypt</string> <string name="can_sign">can sign</string> <string name="expired">expired</string> + <string name="revoked">revoked</string> <plurals name="n_key_servers"> - <item quantity="one">%d key server</item> - <item quantity="other">%d key servers</item> + <item quantity="one">%d keyserver</item> + <item quantity="other">%d keyservers</item> </plurals> <string name="fingerprint">Fingerprint:</string> @@ -235,15 +237,14 @@ <item quantity="other">Found %d keys.</item> </plurals> - <string name="unknown_signature_key_touch_to_look_up">Unknown signature, touch to look up key.</string> + <string name="unknown_signature">Unknown signature, click button to lookup the missing key.</string> <plurals name="bad_keys_encountered"> <item quantity="one">%d bad secret key ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> <item quantity="other">%d bad secret keys ignored. Perhaps you exported with the option\n --export-secret-subkeys\nMake sure you export with\n --export-secret-keys\ninstead.</item> </plurals> - <string name="lookup_unknown_key">Unknown key %s, do you want to try finding it on a keyserver?</string> - <string name="key_send_success">Successfully sent key to server</string> + <string name="key_send_success">Successfully uploaded key to server</string> <string name="key_sign_success">Successfully signed key</string> <string name="list_empty">This list is empty!</string> <string name="nfc_successfull">Successfully sent key with NFC Beam!</string> @@ -277,6 +278,7 @@ <string name="error_no_signature_key">no signature key given</string> <string name="error_invalid_data">not valid encryption data</string> <string name="error_corrupt_data">corrupt data</string> + <string name="error_integrity_check_failed">integrity check failed! Data has been modified!</string> <string name="error_no_symmetric_encryption_packet">couldn\'t find a packet with symmetric encryption</string> <string name="error_wrong_passphrase">wrong passphrase</string> <string name="error_saving_keys">error saving some keys</string> @@ -287,13 +289,19 @@ <string name="error_nothing_import">Nothing to import!</string> <string name="error_expiry_must_come_after_creation">expiry date must come after creation date</string> <string name="error_save_first">please save the keyring first</string> + <string name="error_can_not_delete_contact">you can not delete this contact because it is your own.</string> + <string name="error_can_not_delete_contacts">you can not delete the following contacts because they are your own:\n%s</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Please delete it from the \'My Keys\' screen!</item> + <item quantity="other">Please delete them from the \'My Keys\' screen!</item> + </plurals> <!-- progress dialogs, usually ending in '…' --> <string name="progress_done">done.</string> <string name="progress_saving">saving…</string> <string name="progress_importing">importing…</string> <string name="progress_exporting">exporting…</string> - <string name="progress_generating">generating key, this can take a while…</string> + <string name="progress_generating">generating key, this can take up to 3 minutes…</string> <string name="progress_building_key">building key…</string> <string name="progress_preparing_master_key">preparing master key…</string> <string name="progress_certifying_master_key">certifying master key…</string> @@ -365,13 +373,13 @@ <string name="import_clipboard_button">Get key from clipboard</string> <!-- Intent labels --> - <string name="intent_decrypt_file">OpenPGP: Decrypt File</string> - <string name="intent_import_key">OpenPGP: Import Key</string> - <string name="intent_send_encrypt">OpenPGP: Encrypt</string> - <string name="intent_send_decrypt">OpenPGP: Decrypt</string> + <string name="intent_decrypt_file">OpenKeychain: Decrypt File</string> + <string name="intent_import_key">OpenKeychain: Import Key</string> + <string name="intent_send_encrypt">OpenKeychain: Encrypt</string> + <string name="intent_send_decrypt">OpenKeychain: Decrypt</string> <!-- Remote API --> - <string name="api_no_apps">No registered applications!</string> + <string name="api_no_apps">No registered applications!\n\nThird-party applications can request access to OpenKeychain. After granting access, they will be listed here.</string> <string name="api_settings_show_advanced">Show advanced settings</string> <string name="api_settings_hide_advanced">Hide advanced settings</string> <string name="api_settings_no_key">No key selected</string> @@ -381,14 +389,14 @@ <string name="api_settings_revoke">Revoke access</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_register_text">The following application requests access to OpenPGP Keychain\'s API.\n\nAllow permanent access?</string> + <string name="api_register_text">The displayed application requests access to OpenKeychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string> <string name="api_register_allow">Allow access</string> <string name="api_register_disallow">Disallow access</string> <string name="api_register_error_select_key">Please select a key!</string> <string name="api_select_pub_keys_missing_text">No public keys were found for these user ids:</string> <string name="api_select_pub_keys_dublicates_text">More than one public key exist for these user ids:</string> <string name="api_select_pub_keys_text">Please review the list of 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 OpenPGP Keychain and then register the app again.</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> <!-- Share --> <string name="share_qr_code_dialog_title">Share with QR Code</string> @@ -411,6 +419,9 @@ <!-- Key view --> <string name="key_view_action_encrypt">Encrypt to this contact</string> + <string name="key_view_action_certify">Certify this contact\'s key</string> + <string name="key_view_tab_main">Info</string> + <string name="key_view_tab_certs">Certifications</string> <!-- Navigation Drawer --> <string name="nav_contacts">Contacts</string> |