diff options
Diffstat (limited to 'OpenPGP-Keychain/src/main/res')
177 files changed, 4848 insertions, 1401 deletions
diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png Binary files differnew file mode 100644 index 000000000..9fd81097b --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png Binary files differnew file mode 100644 index 000000000..c4b7783cc --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png Binary files differindex 571634090..f5487599b 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png b/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png Binary files differnew file mode 100644 index 000000000..75f45eb54 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png Binary files differindex 63bdba209..7cd482bff 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png Binary files differnew file mode 100644 index 000000000..359da1c12 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png Binary files differnew file mode 100644 index 000000000..61304a68c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png Binary files differindex bab8c56bb..34f1420ac 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png Binary files differnew file mode 100644 index 000000000..03eeb8d6a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png Binary files differnew file mode 100644 index 000000000..29c5f4d3b --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png Binary files differindex 79b8e27c6..32584f3ff 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png Binary files differnew file mode 100644 index 000000000..fd1bcdd45 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png Binary files differnew file mode 100644 index 000000000..744350049 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png Binary files differindex ac8190c93..b2922309f 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png Binary files differindex cdc0fc9f0..93ea6b0f5 100644 --- a/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png +++ b/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png b/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png Binary files differnew file mode 100644 index 000000000..f9ed0596f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml b/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml new file mode 100644 index 000000000..a2cacf0ad --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> + +<!-- Borderless Buttons for API < 11, see http://stackoverflow.com/a/14663170 --> +<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime"> + <item android:state_pressed="true" android:drawable="@color/emphasis" /> + <item android:drawable="@android:color/transparent" /> +</selector>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml new file mode 100644 index 000000000..c0021261e --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="horizontal" > + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" + + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <include layout="@layout/drawer_list"/> + + </android.support.v4.widget.DrawerLayout> + + <include layout="@layout/api_apps_list_content"/> + +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml new file mode 100644 index 000000000..26aed0831 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <android.support.v4.widget.DrawerLayout + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/drawer_list"/> + + </android.support.v4.widget.DrawerLayout> + + <include layout="@layout/decrypt_content"/> + +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml new file mode 100644 index 000000000..7d0d44074 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <android.support.v4.widget.DrawerLayout + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/drawer_list"/> + + </android.support.v4.widget.DrawerLayout> + + <include layout="@layout/encrypt_content"/> +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml new file mode 100644 index 000000000..2cb408441 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <android.support.v4.widget.DrawerLayout + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + + <include layout="@layout/drawer_list"/> + + </android.support.v4.widget.DrawerLayout> + + <include layout="@layout/import_keys_content"/> + +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml new file mode 100644 index 000000000..6636f12ff --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <android.support.v4.widget.DrawerLayout + android:id="@+id/drawer_layout" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <include layout="@layout/drawer_list"/> + + </android.support.v4.widget.DrawerLayout> + + <include layout="@layout/key_list_content"/> + +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml new file mode 100644 index 000000000..3557c1f00 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<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"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:orientation="vertical"> + + <fragment + android:id="@+id/api_account_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml new file mode 100644 index 000000000..32843eb29 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml @@ -0,0 +1,102 @@ +<?xml version="1.0" encoding="utf-8"?> +<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" + xmlns:custom="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + 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_account_settings_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentTop="true" + android:layout_marginRight="6dp" + android:src="@drawable/ic_action_person" /> + + <TextView + android:id="@+id/api_account_settings_acc_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_toRightOf="@+id/api_account_settings_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_account_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_account_settings_create_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginBottom="4dp" + android:layout_marginRight="4dp" + android:layout_marginTop="4dp" + android:text="@string/api_settings_create_key" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default" /> + + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + custom:foldedLabel="@string/api_settings_show_advanced" + custom:unFoldedLabel="@string/api_settings_hide_advanced" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> + + <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_account_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_account_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_account_settings_compression" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml new file mode 100644 index 000000000..d31ae52d7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml @@ -0,0 +1,27 @@ +<LinearLayout 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:singleLine="true" + android:orientation="horizontal"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:paddingRight="4dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:id="@+id/imageView" + android:src="@drawable/ic_action_person" /> + + <TextView + android:id="@+id/api_accounts_adapter_item_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:text="Account Name" + android:textAppearance="?android:attr/textAppearanceMedium" /> + +</LinearLayout>
\ 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 d83c8e87d..1377acf0e 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 @@ -6,16 +6,28 @@ <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" android:padding="16dp" android:orientation="vertical"> <fragment android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" tools:layout="@layout/api_app_settings_fragment" /> + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/api_settings_accounts" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <FrameLayout + android:id="@+id/api_accounts_list_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> + </LinearLayout> </ScrollView> 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 a8b68859b..96271d418 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 @@ -2,6 +2,7 @@ <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" + xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> @@ -35,64 +36,13 @@ android:textAppearance="?android:attr/textAppearanceMedium" /> </RelativeLayout> - <fragment - android:id="@+id/api_app_settings_select_key_fragment" - android:name="org.sufficientlysecure.keychain.ui.SelectSecretKeyLayoutFragment" + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout 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: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" /> + android:layout_height="match_parent" + custom:foldedLabel="@string/api_settings_show_info" + custom:unFoldedLabel="@string/api_settings_hide_info" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> <TextView android:layout_width="match_parent" @@ -119,5 +69,7 @@ android:layout_height="wrap_content" android:text="Base64 encoded signature" android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml index 71fbcfb12..9f95e9f3b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml @@ -4,16 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <fragment - android:id="@+id/crypto_consumers_list_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.RegisteredAppsListFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </FrameLayout> + <include layout="@layout/api_apps_list_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml new file mode 100644 index 000000000..9f9b99045 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fragment + android:id="@+id/crypto_consumers_list_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppsListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml new file mode 100644 index 000000000..3aee9094f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<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="wrap_content"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="16dp" + android:orientation="vertical"> + + <TextView + android:id="@+id/api_remote_create_account_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="3dip" + android:text="@string/api_create_account_text" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <fragment + android:id="@+id/api_account_settings_fragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AccountSettingsFragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:layout="@layout/api_app_settings_fragment" /> + + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml index 5927dbf43..48aa89d4f 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_error_message.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout 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:orientation="vertical" > diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml index aa9d59004..f85f3b8f7 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_register_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml @@ -20,7 +20,7 @@ <fragment android:id="@+id/api_app_settings_fragment" - android:name="org.sufficientlysecure.keychain.service.remote.AppSettingsFragment" + android:name="org.sufficientlysecure.keychain.remote.ui.AppSettingsFragment" android:layout_width="match_parent" android:layout_height="wrap_content" tools:layout="@layout/api_app_settings_fragment" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml index 877b4e74e..a10592607 100644 --- a/OpenPGP-Keychain/src/main/res/layout/api_app_select_pub_keys_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout 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:orientation="vertical" > diff --git a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml index ddb424ee8..6cd140739 100644 --- a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml @@ -35,6 +35,93 @@ android:layout_height="wrap_content" android:layout_marginBottom="4dp" android:layout_marginTop="14dp" + android:text="KEY TO SIGN" /> + + <TableLayout + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_weight="1" + android:shrinkColumns="1"> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <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 + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_main_user_id" /> + + <TextView + android:id="@+id/main_user_id" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:typeface="monospace" /> + + </TableRow> + + <TableRow + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <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_uids_to_sign" /> + + <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_upload_key" /> <CheckBox diff --git a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml index a2e908433..57a1b865f 100644 --- a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml +++ b/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml @@ -17,6 +17,13 @@ android:padding="4dp" android:text="@string/key_creation_el_gamal_info" /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/key_creation_weak_rsa_info" /> + <TableRow> <TextView diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml index e6c81c3fc..c4709a67e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml @@ -5,208 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true" - android:orientation="vertical"> - - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingTop="4dp" - android:paddingLeft="10dp" - android:paddingRight="10dp"> - - <RelativeLayout - android:id="@+id/signature" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:clickable="true" - android:orientation="horizontal" - android:padding="4dp" - android:paddingLeft="10dp" - android:paddingRight="10dp"> - - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:id="@+id/relativeLayout"> - - <ImageView - android:id="@+id/ic_signature" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/signed_large" /> - - <ImageView - android:id="@+id/ic_signature_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/overlay_error" /> - </RelativeLayout> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/lookup_key" - android:visibility="gone" - android:layout_width="wrap_content" - 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" - 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" - android:layout_below="@+id/mainUserId" - android:layout_toRightOf="@+id/relativeLayout" /> - </RelativeLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/sourceLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/source" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <LinearLayout - android:id="@+id/sourceMessage" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <EditText - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" - android:scrollHorizontally="true" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/sourceFile" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/filename" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="textNoSuggestions" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/deleteAfterDecryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_decryption" /> - </LinearLayout> - </LinearLayout> - </ViewFlipper> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:text="@string/section_decrypt_verify" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_decrypt" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/btn_decrypt_verify" - bootstrapbutton:bb_icon_left="fa-unlock" - bootstrapbutton:bb_type="info" /> - </LinearLayout> - </LinearLayout> - </ScrollView> - </LinearLayout> + <include layout="@layout/decrypt_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml new file mode 100644 index 000000000..a847d9e46 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml @@ -0,0 +1,205 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="4dp" + android:paddingLeft="10dp" + android:paddingRight="10dp"> + + <RelativeLayout + android:id="@+id/signature" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:clickable="true" + android:orientation="horizontal" + android:padding="4dp" + android:paddingLeft="10dp" + android:paddingRight="10dp"> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/relativeLayout"> + + <ImageView + android:id="@+id/ic_signature" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/signed_large"/> + + <ImageView + android:id="@+id/ic_signature_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/overlay_error"/> + </RelativeLayout> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/lookup_key" + android:visibility="gone" + android:layout_width="wrap_content" + 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="@string/label_main_user_id" + android:textAppearance="?android:attr/textAppearanceMedium" + 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" + android:layout_below="@+id/mainUserId" + android:layout_toRightOf="@+id/relativeLayout"/> + </RelativeLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/sourcePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous"/> + + <TextView + android:id="@+id/sourceLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <ImageView + android:id="@+id/sourceNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next"/> + </LinearLayout> + + <ViewFlipper + android:id="@+id/source" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/sourceMessage" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp"> + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:scrollHorizontally="true"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/sourceFile" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <EditText + android:id="@+id/filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="top|left" + android:inputType="textMultiLine|textUri" + android:lines="4" + android:maxLines="10" + android:minLines="2" + android:scrollbars="vertical"/> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/btn_browse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default"/> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/deleteAfterDecryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_delete_after_decryption"/> + </LinearLayout> + </LinearLayout> + </ViewFlipper> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:text="@string/section_decrypt_verify"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_decrypt" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/btn_decrypt_verify" + bootstrapbutton:bb_icon_left="fa-unlock" + bootstrapbutton:bb_type="info"/> + </LinearLayout> + </LinearLayout> +</ScrollView>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml index 18210afc5..ab00c0073 100644 --- a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml +++ b/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml @@ -9,10 +9,10 @@ --> <ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/left_drawer" - android:layout_width="240dp" + android:layout_width="@dimen/drawer_size" android:layout_height="match_parent" android:layout_gravity="start" - android:background="#fff" + android:background="@color/white" android:choiceMode="singleChoice" android:divider="@color/bg_gray" android:dividerHeight="1dp" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml index 499fd5aa9..090115d62 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml @@ -51,7 +51,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingRight="5dip" - android:text="Name" /> + android:text="@string/label_name" /> </TableRow> <TableRow> diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml index 663949d8e..a8d1dc674 100644 --- a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml @@ -49,7 +49,7 @@ android:paddingRight="5dip" android:text="@string/label_email" /> - <EditText + <AutoCompleteTextView android:id="@+id/email" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -71,7 +71,8 @@ android:id="@+id/comment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" /> + android:layout_weight="1" + android:inputType="text"/> </TableRow> </TableLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml index 27e29eddb..6484c9b7b 100644 --- a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml @@ -1,350 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="true"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <ImageView - android:id="@+id/modePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/modeLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_asymmetric" /> - - <ImageView - android:id="@+id/modeNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/mode" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <LinearLayout - android:id="@+id/modeAsymmetric" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="4dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/sign" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_sign" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp"> - - <TextView - android:id="@+id/mainUserId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="Sign User Id" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/mainUserIdRest" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" - android:singleLine="true" - android:text="Sign email" - android:textAppearance="?android:attr/textAppearanceSmall" /> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="3dip"> - - <TextView - android:id="@+id/label_selectPublicKeys" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:text="@string/label_select_public_keys" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/btn_selectEncryptKeys" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="4dp" - android:text="@string/btn_select_encrypt_keys" - bootstrapbutton:bb_icon_left="fa-user" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> - </LinearLayout> - </LinearLayout> - - <TableLayout - android:id="@+id/modeSymmetric" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:padding="4dp" - android:stretchColumns="1"> - - <TableRow> - - <TextView - android:id="@+id/label_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passphrase" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/passphrase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> - - <TableRow> - - <TextView - android:id="@+id/label_passphraseAgain" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:paddingRight="10dip" - android:text="@string/label_passphrase_again" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/passphraseAgain" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </TableRow> - </TableLayout> - </ViewFlipper> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <ImageView - android:id="@+id/sourcePrevious" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_previous" /> - - <TextView - android:id="@+id/sourceLabel" - style="@style/SectionHeader" - android:layout_width="0dip" - android:layout_height="match_parent" - android:layout_weight="1" - android:gravity="center_horizontal|center_vertical" - android:text="@string/label_message" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <ImageView - android:id="@+id/sourceNext" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_next" /> - </LinearLayout> - - <ViewFlipper - android:id="@+id/source" - android:layout_width="match_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <LinearLayout - android:id="@+id/sourceMessage" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <EditText - android:id="@+id/message" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="top" - android:inputType="text|textCapSentences|textMultiLine|textLongMessage" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/sourceFile" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="4dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <EditText - android:id="@+id/filename" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - android:inputType="textNoSuggestions" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/btn_browse" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - bootstrapbutton:bb_icon_left="fa-folder-open" - bootstrapbutton:bb_roundedCorners="true" - bootstrapbutton:bb_size="default" - bootstrapbutton:bb_type="default" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <TextView - android:id="@+id/label_fileCompression" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_weight="1" - android:paddingRight="10dip" - android:text="@string/label_file_compression" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <Spinner - android:id="@+id/fileCompression" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/deleteAfterEncryption" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_delete_after_encryption" /> - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - <CheckBox - android:id="@+id/asciiArmour" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:text="@string/label_ascii_armor" /> - </LinearLayout> - </LinearLayout> - </ViewFlipper> - - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:text="@string/section_encrypt_and_or_sign" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:padding="4dp"> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_share" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_weight="1" - android:text="@string/btn_share" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_clipboard" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:layout_weight="1" - android:text="@string/btn_clipboard" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/action_encrypt_file" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:visibility="gone" - android:text="@string/btn_encrypt_file" - bootstrapbutton:bb_icon_left="fa-lock" - bootstrapbutton:bb_type="info" /> - </LinearLayout> - </LinearLayout> - </ScrollView> + <include layout="@layout/encrypt_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml new file mode 100644 index 000000000..1dba66cfa --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml @@ -0,0 +1,318 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" + xmlns:custom="http://schemas.android.com/apk/res-auto" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fillViewport="true"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp"> + + <ImageView + android:id="@+id/modePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous"/> + + <TextView + android:id="@+id/modeLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_asymmetric"/> + + <ImageView + android:id="@+id/modeNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next"/> + </LinearLayout> + + <ViewFlipper + android:id="@+id/mode" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <LinearLayout + android:id="@+id/modeAsymmetric" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="4dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/sign" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_sign"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="4dip"> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/label_sign_user_id" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:ellipsize="end" + android:singleLine="true" + android:text="@string/label_sign_email" + android:textAppearance="?android:attr/textAppearanceSmall"/> + </LinearLayout> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:paddingBottom="3dip"> + + <TextView + android:id="@+id/label_selectPublicKeys" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:text="@string/label_select_public_keys" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/btn_selectEncryptKeys" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="4dp" + android:text="@string/btn_select_encrypt_keys" + bootstrapbutton:bb_icon_left="fa-user" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default"/> + </LinearLayout> + </LinearLayout> + + <TableLayout + android:id="@+id/modeSymmetric" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="4dp" + android:stretchColumns="1"> + + <TableRow> + + <TextView + android:id="@+id/label_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passphrase" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <EditText + android:id="@+id/passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword"/> + </TableRow> + + <TableRow> + + <TextView + android:id="@+id/label_passphraseAgain" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:paddingRight="10dip" + android:text="@string/label_passphrase_again" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <EditText + android:id="@+id/passphraseAgain" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword"/> + </TableRow> + </TableLayout> + </ViewFlipper> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp"> + + <ImageView + android:id="@+id/sourcePrevious" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_previous"/> + + <TextView + android:id="@+id/sourceLabel" + style="@style/SectionHeader" + android:layout_width="0dip" + android:layout_height="match_parent" + android:layout_weight="1" + android:gravity="center_horizontal|center_vertical" + android:text="@string/label_message" + android:textAppearance="?android:attr/textAppearanceMedium"/> + + <ImageView + android:id="@+id/sourceNext" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/ic_next"/> + </LinearLayout> + + <ViewFlipper + android:id="@+id/source" + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/sourceMessage" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp"> + + <EditText + android:id="@+id/message" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="top" + android:inputType="text|textCapSentences|textMultiLine|textLongMessage" + android:hint="@string/encrypt_content_edit_text_hint"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/sourceFile" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="4dp"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <EditText + android:id="@+id/filename" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="top|left" + android:inputType="textMultiLine|textUri" + android:lines="4" + android:maxLines="10" + android:minLines="2" + android:scrollbars="vertical"/> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/btn_browse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + bootstrapbutton:bb_icon_left="fa-folder-open" + bootstrapbutton:bb_roundedCorners="true" + bootstrapbutton:bb_size="default" + bootstrapbutton:bb_type="default"/> + </LinearLayout> + + <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + custom:foldedLabel="@string/btn_encryption_advanced_settings_show" + custom:unFoldedLabel="@string/btn_encryption_advanced_settings_hide" + custom:foldedIcon="fa-chevron-right" + custom:unFoldedIcon="fa-chevron-down"> + + <include layout="@layout/encrypt_content_adv_settings"/> + + </org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout> + + </LinearLayout> + </ViewFlipper> + + <TextView + style="@style/SectionHeader" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="4dp" + android:text="@string/section_encrypt_and_or_sign"/> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:padding="4dp"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_share" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:layout_weight="1" + android:text="@string/btn_share" + bootstrapbutton:bb_icon_left="fa-share-square" + bootstrapbutton:bb_type="info"/> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_clipboard" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:layout_weight="1" + android:text="@string/btn_clipboard" + bootstrapbutton:bb_icon_left="fa-clipboard" + bootstrapbutton:bb_type="info"/> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_encrypt_file" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:visibility="gone" + android:text="@string/btn_encrypt_file" + bootstrapbutton:bb_icon_left="fa-lock" + bootstrapbutton:bb_type="info"/> + </LinearLayout> + </LinearLayout> +</ScrollView> diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml new file mode 100644 index 000000000..2281759d1 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <TextView + android:id="@+id/label_fileCompression" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:paddingRight="10dip" + android:text="@string/label_file_compression" + android:textAppearance="?android:attr/textAppearanceSmall"/> + + <Spinner + android:id="@+id/fileCompression" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical"/> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/deleteAfterEncryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_delete_after_encryption"/> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/shareAfterEncryption" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_share_after_encryption"/> + </LinearLayout> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + <CheckBox + android:id="@+id/asciiArmour" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:text="@string/label_ascii_armor"/> + </LinearLayout> +</merge>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml index a2939f571..83d697001 100644 --- a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml +++ b/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml @@ -26,8 +26,8 @@ android:layout_weight="1" android:gravity="top|left" android:inputType="textMultiLine|textUri" - android:lines="2" - android:maxLines="6" + android:lines="4" + android:maxLines="10" android:minLines="2" android:scrollbars="vertical" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml b/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml new file mode 100644 index 000000000..2b863d52b --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:fontawesometext="http://schemas.android.com/apk/res-auto" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <LinearLayout + android:id="@+id/foldableControl" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:clickable="true"> + + <com.beardedhen.androidbootstrap.FontAwesomeText + android:id="@+id/foldableIcon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginRight="10dp" + android:textSize="12sp" + android:paddingTop="@dimen/padding_medium" + android:paddingBottom="@dimen/padding_medium" + fontawesometext:fa_icon="fa-chevron-right"/> + + <TextView + android:id="@+id/foldableText" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/none" + android:paddingTop="@dimen/padding_medium" + android:paddingBottom="@dimen/padding_medium" + android:textColor="@color/emphasis"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/foldableContainer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:visibility="gone"/> +</LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml index d7794ace3..b11f99757 100644 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml @@ -5,58 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" > - <RelativeLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" > - - <FrameLayout - android:id="@+id/import_navigation_fragment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:orientation="vertical" - android:paddingLeft="4dp" - android:paddingRight="4dp" /> - - <LinearLayout - android:id="@+id/import_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:orientation="vertical" - android:paddingLeft="10dp" - android:paddingRight="10dp" > - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/import_import" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/import_import" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="info" /> - - <!-- <com.beardedhen.androidbootstrap.BootstrapButton --> - <!-- android:id="@+id/import_sign_and_upload" --> - <!-- android:layout_width="match_parent" --> - <!-- android:layout_height="60dp" --> - <!-- android:padding="4dp" --> - <!-- android:text="@string/import_sign_and_upload" --> - <!-- bootstrapbutton:bb_type="info" /> --> - </LinearLayout> - - <FrameLayout - android:id="@+id/import_keys_list_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/import_footer" - android:layout_alignParentLeft="true" - android:layout_below="@+id/import_navigation_fragment" - android:orientation="vertical" - android:paddingLeft="4dp" - android:paddingRight="4dp" /> - </RelativeLayout> + <include layout="@layout/import_keys_content"/> <include layout="@layout/drawer_list" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml new file mode 100644 index 000000000..fae8147e5 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml @@ -0,0 +1,56 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true"> + + <FrameLayout + android:id="@+id/import_navigation_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp"/> + + <LinearLayout + android:id="@+id/import_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:orientation="vertical" + android:paddingLeft="10dp" + android:paddingRight="10dp"> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/import_import" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:text="@string/import_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="info"/> + + <!-- <com.beardedhen.androidbootstrap.BootstrapButton --> + <!-- android:id="@+id/import_sign_and_upload" --> + <!-- android:layout_width="match_parent" --> + <!-- android:layout_height="60dp" --> + <!-- android:padding="4dp" --> + <!-- android:text="@string/import_sign_and_upload" --> + <!-- bootstrapbutton:bb_type="info" /> --> + </LinearLayout> + + <FrameLayout + android:id="@+id/import_keys_list_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_above="@+id/import_footer" + android:layout_alignParentLeft="true" + android:layout_below="@+id/import_navigation_fragment" + android:orientation="vertical" + android:paddingLeft="4dp" + android:paddingRight="4dp"/> +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml index 37d1c5702..f5a39f115 100644 --- a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml +++ b/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml @@ -15,7 +15,7 @@ limitations under the License. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" android:paddingLeft="3dip" @@ -23,7 +23,7 @@ android:singleLine="true" > <LinearLayout - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" > @@ -48,17 +48,10 @@ android:id="@+id/mainUserId" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Main User ID" + android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView - android:id="@+id/fingerprint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="fingerprint" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <TextView android:id="@+id/mainUserIdRest" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -77,10 +70,11 @@ <TextView android:id="@+id/keyId" android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:text="BBBBBBBB" + android:layout_height="wrap_content" + android:text="0xBBBBBBBBBBBBBBBB" android:textAppearance="?android:attr/textAppearanceSmall" - android:typeface="monospace" /> + android:typeface="monospace" + android:layout_weight="1" /> <TextView android:id="@+id/algorithm" @@ -89,6 +83,14 @@ android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView + android:id="@+id/fingerprint" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="fingerprint" + android:typeface="monospace" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView android:id="@+id/status" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -99,10 +101,10 @@ <LinearLayout android:id="@+id/list" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginLeft="36dip" android:orientation="vertical" > </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml new file mode 100644 index 000000000..fcb376fa8 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<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" > + + <include layout="@layout/key_list_content"/> + + <include layout="@layout/drawer_list" /> + +</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml new file mode 100644 index 000000000..e58e42961 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/content_frame" + android:layout_marginLeft="@dimen/drawer_content_padding" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <fragment + android:id="@+id/key_list_fragment" + android:name="org.sufficientlysecure.keychain.ui.KeyListFragment" + android:layout_width="match_parent" + android:layout_height="match_parent"/> +</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml new file mode 100644 index 000000000..f2430f213 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml @@ -0,0 +1,109 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" + android:orientation="vertical"> + + <!--rebuild functionality of ListFragment --> + <LinearLayout + android:id="@+id/key_list_progress_container" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="visible" + android:gravity="center"> + + <ProgressBar + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="" + android:paddingTop="4dip" + android:singleLine="true" /> + + </LinearLayout> + + <FrameLayout + android:id="@+id/key_list_list_container" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <se.emilsjolander.stickylistheaders.StickyListHeadersListView + android:id="@+id/key_list_list" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:drawSelectorOnTop="true" + android:fastScrollEnabled="true" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="32dp" + android:scrollbarStyle="outsideOverlay" /> + + <LinearLayout + android:id="@+id/key_list_empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:visibility="gone"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="@string/key_list_empty_text1" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:text="" + android:textAppearance="?android:attr/textAppearanceLarge" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:gravity="center" + android:text="@string/key_list_empty_text2" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/key_list_empty_button_create" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:text="@string/key_list_empty_button_create" + bootstrapbutton:bb_icon_left="fa-plus" + bootstrapbutton:bb_type="default" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:gravity="center" + android:text="@string/key_list_empty_text3" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/key_list_empty_button_import" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:text="@string/key_list_empty_button_import" + bootstrapbutton:bb_icon_left="fa-download" + bootstrapbutton:bb_type="default" /> + </LinearLayout> + + </FrameLayout> + + +</FrameLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml new file mode 100644 index 000000000..09ac1c856 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml @@ -0,0 +1,30 @@ +<?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" > + + <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView + android:id="@+id/stickylist_header_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="start|left" + android:padding="8dp" + android:textColor="@color/emphasis" + android:textSize="17sp" + android:textStyle="bold" + android:text="header text" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="contact count" + android:id="@+id/contacts_num" + android:layout_centerVertical="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginRight="10px" + android:visibility="visible" + android:textColor="@android:color/darker_gray" /> + +</RelativeLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml new file mode 100644 index 000000000..0abae8bbb --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml @@ -0,0 +1,78 @@ +<?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="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:singleLine="true" + android:orientation="horizontal" + android:descendantFocusability="blocksDescendants" + android:focusable="false"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_weight="1" + android:focusable="true" + android:orientation="vertical" + android:paddingLeft="8dp" + android:paddingRight="4dp" + android:paddingTop="4dp" + android:paddingBottom="4dp"> + + <TextView + android:id="@+id/mainUserId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_main_user_id" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/mainUserIdRest" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:ellipsize="end" + android:text="user@example.com" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + + <View + android:id="@+id/status_divider" + android:layout_width="1dip" + android:layout_height="match_parent" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="?android:attr/listDivider" /> + + <FrameLayout + android:id="@+id/status_layout" + android:layout_width="80dp" + android:layout_height="match_parent"> + + <Button + android:background="@drawable/selector_transparent_button" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/edit" + android:focusable="false" + android:enabled="true" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/black" + android:text="@string/edit" /> + + <TextView + android:id="@+id/revoked" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="8dp" + android:singleLine="true" + android:ellipsize="end" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/revoked" + android:textColor="#e00" + android:layout_gravity="center" /> + </FrameLayout> + +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml deleted file mode 100644 index f0e843e56..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_activity.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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" > - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <fragment - android:id="@+id/key_list_public_fragment" - android:name="org.sufficientlysecure.keychain.ui.KeyListPublicFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </FrameLayout> - - <include layout="@layout/drawer_list" /> - -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml deleted file mode 100644 index f3a21e1bf..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_fragment.xml +++ /dev/null @@ -1,77 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<FrameLayout 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" - android:orientation="vertical" > - - <se.emilsjolander.stickylistheaders.StickyListHeadersListView - android:id="@+id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:drawSelectorOnTop="true" - android:fastScrollEnabled="true" - android:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="32dp" - android:scrollbarStyle="outsideOverlay" /> - - <LinearLayout - android:id="@+id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="center" - android:orientation="vertical" - android:visibility="gone" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:text="@string/key_list_empty_text1" - android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:text="" - android:textAppearance="?android:attr/textAppearanceLarge" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:gravity="center" - android:text="@string/key_list_empty_text2" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/key_list_empty_button_create" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/key_list_empty_button_create" - bootstrapbutton:bb_icon_left="fa-plus" - bootstrapbutton:bb_type="default" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:gravity="center" - android:text="@string/key_list_empty_text3" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <com.beardedhen.androidbootstrap.BootstrapButton - android:id="@+id/key_list_empty_button_import" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/key_list_empty_button_import" - bootstrapbutton:bb_icon_left="fa-download" - bootstrapbutton:bb_type="default" /> - </LinearLayout> - -</FrameLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml b/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml deleted file mode 100644 index 5768e4153..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_header.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?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" > - - <org.sufficientlysecure.keychain.ui.widget.UnderlineTextView - android:id="@+id/stickylist_header_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="start|left" - android:padding="8dp" - android:textColor="@color/emphasis" - android:textSize="17sp" - android:textStyle="bold" /> - -</RelativeLayout>
\ 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 deleted file mode 100644 index 9307ab2e5..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_public_item.xml +++ /dev/null @@ -1,45 +0,0 @@ -<?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 deleted file mode 100644 index cd208a545..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_activity.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<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"> - - <FrameLayout - android:layout_width="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:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:scrollbarStyle="outsideOverlay" /> - </FrameLayout> - - <include layout="@layout/drawer_list" /> - -</android.support.v4.widget.DrawerLayout>
\ No newline at end of file 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 deleted file mode 100644 index 1ed86f730..000000000 --- a/OpenPGP-Keychain/src/main/res/layout/key_list_secret_item.xml +++ /dev/null @@ -1,32 +0,0 @@ -<?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/key_server_editor.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml index 058a43eaf..950978a0e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml @@ -13,7 +13,7 @@ <EditText android:id="@+id/server" - android:layout_width="match_parent" + android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" android:inputType="textUri" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml index c162a6e28..6031bf7c7 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <ScrollView 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="match_parent" > diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml index 4a09e4240..eddbe3cbf 100644 --- a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml +++ b/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml @@ -14,7 +14,7 @@ android:orientation="horizontal" > <RelativeLayout - android:layout_width="wrap_content" + android:layout_width="0dip" android:layout_height="wrap_content" android:layout_marginBottom="6sp" android:layout_marginLeft="16sp" diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml index 2bdd231ee..ae523762c 100644 --- a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml +++ b/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml @@ -6,7 +6,9 @@ android:paddingRight="16dp" android:stretchColumns="1" > - <TableRow> + <TableRow + android:layout_marginBottom="5dip" + > <TextView android:id="@+id/passphrase_label_passphrase" @@ -24,7 +26,9 @@ android:padding="4dp" /> </TableRow> - <TableRow> + <TableRow + android:layout_marginBottom="10dip" + > <TextView android:id="@+id/passphrase_label_passphrase_again" diff --git a/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml b/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml index bbfe17c44..08c161ec6 100644 --- a/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml +++ b/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml @@ -25,7 +25,7 @@ android:id="@+id/mainUserId" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="Main User ID" + android:text="@string/label_main_user_id" android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView diff --git a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml index 5337433c6..a18ce46fc 100644 --- a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml +++ b/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml @@ -4,16 +4,8 @@ android:layout_height="match_parent" android:layout_centerHorizontal="true" > - <EditText - android:id="@+id/select_public_key_search" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/menu_search" - android:drawableLeft="@drawable/ic_action_search"/> - <FrameLayout android:id="@+id/select_public_key_fragment_container" - android:layout_below="@id/select_public_key_search" android:layout_width="match_parent" android:layout_height="match_parent" /> diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml index 4a3cd3d28..408c0c54e 100644 --- a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml @@ -3,7 +3,7 @@ xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:orientation="horizontal"> <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/select_secret_key_select_key_button" @@ -25,31 +25,54 @@ android:layout_marginLeft="4dp" android:layout_marginTop="4dp" android:orientation="vertical" - android:paddingLeft="16dp" > + android:paddingLeft="4dp"> <!-- Has been made focusable to display error messages with setError --> - <TextView android:id="@+id/select_secret_key_user_id" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" - android:ellipsize="end" + android:layout_gravity="left" android:focusable="true" android:focusableInTouchMode="true" android:singleLine="true" - android:text="@string/api_settings_no_key" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:ellipsize="end" + android:visibility="gone" + android:layout_marginRight="5dip" + android:text="" + android:textAppearance="?android:attr/textAppearanceSmall" /> <TextView android:id="@+id/select_secret_key_user_id_rest" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" + android:layout_gravity="left" android:ellipsize="end" android:singleLine="true" + android:layout_marginRight="5dip" android:text="" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:visibility="gone" + android:textAppearance="?android:attr/textAppearanceSmall" + android:paddingLeft="10dp" /> + + <TextView + android:id="@+id/select_secret_key_master_key_hex" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" + android:layout_marginRight="15dip" /> + + <TextView + android:id="@+id/no_key_selected" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="@string/api_settings_no_key" + android:layout_marginTop="15dp" /> + + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml new file mode 100644 index 000000000..ef31f7690 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/mainMessage" + android:layout_margin="4dp" + android:textAppearance="?android:textAppearanceMedium" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:weightSum="1" + android:id="@+id/deleteSecretKeyView"> + + <CheckBox + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="0.1" + android:layout_margin="4dp" + android:id="@+id/checkDeleteSecret" /> + + <TextView + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="4dp" + android:textAppearance="?android:textAppearanceMedium" + android:layout_weight="0.9" + android:text="@string/secret_key_delete_text" /> + + </LinearLayout> + +</LinearLayout>
\ 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 c44835bb0..aecedc39b 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 @@ -4,8 +4,7 @@ android:layout_height="wrap_content" android:orientation="horizontal" android:paddingLeft="8dip" - android:paddingRight="3dip" - android:singleLine="true" > + android:paddingRight="3dip" > <ImageView android:id="@+id/ic_masterKey" @@ -15,31 +14,54 @@ android:paddingRight="6dip" android:src="@drawable/key_small" /> - <TextView - android:id="@+id/keyId" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingRight="5dip" - android:text="Key ID" - android:textAppearance="?android:attr/textAppearanceMedium" - android:typeface="monospace" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="2dip" + android:paddingTop="2dip" > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal"> + <TextView + android:id="@+id/keyId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="2dip" + android:text="@string/label_key_id" + android:textAppearance="?android:attr/textAppearanceMedium" + android:typeface="monospace" /> - <TextView - android:id="@+id/keyDetails" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="(RSA, 1024bit)" - android:textAppearance="?android:attr/textAppearanceSmall" /> + <TextView + android:id="@+id/keyDetails" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingRight="5dip" + android:text="(RSA, 1024bit)" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> + <TextView + android:id="@+id/keyExpiry" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right" + android:text="@string/label_expiry" + android:textAppearance="?android:attr/textAppearanceSmall" /> + </LinearLayout> <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center_vertical" - android:gravity="right" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:orientation="horizontal" + android:gravity="right" android:paddingBottom="2dip" android:paddingTop="2dip" > + <ImageView android:id="@+id/ic_revokedKey" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/revoked_key_small"/> <ImageView android:id="@+id/ic_certifyKey" android:layout_width="wrap_content" @@ -59,4 +81,4 @@ android:src="@drawable/signed_small" /> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> 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 index 055687183..adbdb98dd 100644 --- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml +++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml @@ -92,7 +92,7 @@ android:layout_width="wrap_content" android:layout_height="0dp" android:layout_weight="1" - android:stretchColumns="1"> + android:shrinkColumns="1"> <TableRow> @@ -130,6 +130,25 @@ android:text="" /> </TableRow> + <TableRow + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:id="@+id/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> + <TableRow> <TextView @@ -167,10 +186,10 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical" android:paddingRight="10dip" - android:text="@string/label_fingerprint" /> + android:text="@string/label_secret_key" /> <TextView - android:id="@+id/fingerprint" + android:id="@+id/secret_key" android:layout_width="match_parent" android:layout_height="wrap_content" android:typeface="monospace" /> @@ -212,6 +231,17 @@ android:text="@string/section_actions" /> <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_edit" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:layout_marginBottom="10dp" + android:text="@string/key_view_action_edit" + bootstrapbutton:bb_icon_left="fa-key" + bootstrapbutton:bb_type="info" + android:visibility="gone" /> + + <com.beardedhen.androidbootstrap.BootstrapButton android:id="@+id/action_encrypt" android:layout_width="match_parent" android:layout_height="60dp" @@ -221,6 +251,17 @@ bootstrapbutton:bb_icon_left="fa-lock" bootstrapbutton:bb_type="info" /> + + <com.beardedhen.androidbootstrap.BootstrapButton + android:id="@+id/action_certify" + android:layout_width="match_parent" + android:layout_height="60dp" + android:padding="4dp" + android:layout_marginBottom="10dp" + 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 +</ScrollView> 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 508d080a6..2e8cfeb04 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 @@ -2,15 +2,44 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" + android:orientation="horizontal" android:paddingRight="3dip" android:singleLine="true"> + <CheckBox + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/checkBox" /> + <TextView - android:id="@+id/userId" + android:id="@+id/rank" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="User ID" - android:textAppearance="?android:attr/textAppearanceSmall" /> + android:textAppearance="?android:attr/textAppearanceSmall" + android:text="0" + android:paddingLeft="10dp" + android:paddingRight="10dp" + android:layout_gravity="center_vertical" /> + + <LinearLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/userId" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/user_id_no_name" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <TextView + android:id="@+id/address" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/label_email" + android:textAppearance="?android:attr/textAppearanceSmall" + android:paddingLeft="10dp" /> + </LinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml new file mode 100644 index 000000000..d08fc7f42 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_account_settings_delete" + android:title="@string/api_settings_delete_account" + app:showAsAction="never" /> + <item + android:id="@+id/menu_account_settings_cancel" + android:title="@string/api_settings_cancel" + app:showAsAction="never" /> + +</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenPGP-Keychain/src/main/res/menu/key_list.xml new file mode 100644 index 000000000..10223522c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/menu/key_list.xml @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <item + android:id="@+id/menu_key_list_import" + app:showAsAction="ifRoom|withText" + android:icon="@drawable/ic_action_add_person" + android:title="@string/menu_import" /> + + <item + android:id="@+id/menu_key_list_search" + android:title="@string/menu_search" + android:icon="@drawable/ic_action_search" + app:actionViewClass="android.support.v7.widget.SearchView" + app:showAsAction="collapseActionView|ifRoom" /> + + <item + android:id="@+id/menu_key_list_create" + app:showAsAction="never" + android:title="@string/menu_create_key" /> + + <item + android:id="@+id/menu_key_list_create_expert" + app:showAsAction="never" + android:title="@string/menu_create_key_expert" /> + + <item + android:id="@+id/menu_key_list_export" + app:showAsAction="never" + android:title="@string/menu_export_keys" /> + + <item + android:id="@+id/menu_key_list_secret_export" + app:showAsAction="never" + android:title="@string/menu_export_secret_keys" /> + +</menu> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml index d30ee5e8f..db709052f 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_public_multi.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml @@ -2,16 +2,20 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_key_list_public_multi_select_all" + android:id="@+id/menu_key_list_multi_select_all" android:icon="@drawable/ic_action_select_all" android:title="@string/menu_select_all" /> <item - android:id="@+id/menu_key_list_public_multi_encrypt" + android:id="@+id/menu_key_list_multi_export" + android:icon="@drawable/ic_action_import_export" + android:title="@string/menu_export_key" /> + <item + android:id="@+id/menu_key_list_multi_encrypt" android:icon="@drawable/ic_action_secure" android:title="@string/menu_encrypt_to" /> <item - android:id="@+id/menu_key_list_public_multi_delete" + android:id="@+id/menu_key_list_multi_delete" android:icon="@drawable/ic_action_discard" android:title="@string/menu_delete_key" /> -</menu>
\ No newline at end of file +</menu> diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml deleted file mode 100644 index 35a8f3926..000000000 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/menu_key_list_public_import" - app:showAsAction="always|withText" - android:icon="@drawable/ic_action_add_person" - android:title="@string/menu_import" /> - <item - android:id="@+id/menu_key_list_public_export" - app:showAsAction="never" - android:title="@string/menu_export_keys" /> - <item - android:id="@+id/menu_key_list_public_search" - android:title="@string/menu_search" - android:icon="@drawable/ic_action_search" - app:actionViewClass="android.support.v7.widget.SearchView" - app:showAsAction="ifRoom" /> -</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml deleted file mode 100644 index 18a97ed72..000000000 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_secret.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/menu_key_list_secret_create" - app:showAsAction="always|withText" - android:title="@string/menu_create_key" /> - <item - android:id="@+id/menu_key_list_secret_create_expert" - app:showAsAction="never" - android:title="@string/menu_create_key_expert" /> - <item - android:id="@+id/menu_key_list_secret_import" - app:showAsAction="never" - android:title="@string/menu_import" /> - <item - android:id="@+id/menu_key_list_secret_export" - app:showAsAction="never" - android:title="@string/menu_export_keys" /> - -</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml deleted file mode 100644 index a3375c7e8..000000000 --- a/OpenPGP-Keychain/src/main/res/menu/key_list_secret_multi.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - - <item - android:id="@+id/menu_key_list_public_multi_select_all" - android:icon="@drawable/ic_action_select_all" - android:title="@string/menu_select_all" /> - <item - android:id="@+id/menu_key_list_public_multi_delete" - android:icon="@drawable/ic_action_discard" - android:title="@string/menu_delete_key" /> - -</menu>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenPGP-Keychain/src/main/res/menu/key_view.xml index 59247221a..105368cbb 100644 --- a/OpenPGP-Keychain/src/main/res/menu/key_view.xml +++ b/OpenPGP-Keychain/src/main/res/menu/key_view.xml @@ -5,7 +5,7 @@ <item android:id="@+id/menu_key_view_share" android:icon="@drawable/ic_action_share" - app:showAsAction="always" + app:showAsAction="ifRoom" android:title="@string/menu_share"> <menu> <item @@ -52,7 +52,7 @@ android:id="@+id/menu_key_keyserver" android:icon="@drawable/ic_action_import_export" app:showAsAction="always" - android:title="@string/menu_share"> + android:title="@string/menu_key_server"> <menu> <item android:id="@+id/menu_key_view_update" diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html new file mode 100644 index 000000000..99977f75d --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<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>Licence: GPLv3+</p> + +<h2>Developers OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Hlavní vývojář)</li> +<li>Ash Hughes (crypto patches)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Developers APG 1.x</h2> +<ul> +<li>Thialfihar (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> +<li>Markus Doits</li> +</ul> +<h2>Libraries</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> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html new file mode 100644 index 000000000..1136deba6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<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>fix upload of key from signing screen</li> +</ul> +<h2>2.2</h2> +<ul> +<li>new design with navigation drawer</li> +<li>new public key list design</li> +<li>new public key view</li> +<li>bug fixes for importing of keys</li> +<li>key cross-certification (thanks to Ash Hughes)</li> +<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>first version with new languages (thanks to the contributors on Transifex)</li> +<li>sharing of keys via QR Codes fixed and improved</li> +<li>package signature verification for API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for K-9 Mail integration</li> +</ul> +<h2>2.1</h2> +<ul> +<li>lots of bug fixes</li> +<li>new API for developers</li> +<li>PRNG bug fix by Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>complete redesign</li> +<li>share public keys via qr codes, nfc beam</li> +<li>sign keys</li> +<li>upload keys to server</li> +<li>fixes import issues</li> +<li>new AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<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> +<li>bugfixes</li> +<li>optimizations</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>fixed problem with signature verification of texts with trailing newline</li> +<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>account adding crash on Froyo fixed</li> +<li>secure file deletion</li> +<li>option to delete key file after import</li> +<li>stream encryption/decryption (gallery, etc.)</li> +<li>new options (language, force v3 signatures)</li> +<li>interface changes</li> +<li>bugfixes</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>German and Italian translation</li> +<li>much smaller package, due to reduced BC sources</li> +<li>new preferences GUI</li> +<li>layout adjustment for localization</li> +<li>signature bugfix</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>fixed another crash caused by some SDK bug with query builder</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>fixed crashes during encryption/signing and possibly key export</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>filterable key lists</li> +<li>smarter pre-selection of encryption keys</li> +<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>GMail account listing was broken in 1.0.0, fixed again</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> +<li>support of more file managers (including ASTRO)</li> +<li>Slovenian translation</li> +<li>new database, much faster, less memory usage</li> +<li>defined Intents and content provider for other apps</li> +<li>bugfixes</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<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> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html new file mode 100644 index 000000000..0e60c17a7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Getting started</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Translations</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html new file mode 100644 index 000000000..083e055c7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<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>Tap the card and the content will then load on the other person’s device.</li> +</ol> +</body> +</html> 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 37d4193f7..7dc0ee7d9 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Entwickler APG 1.x</h2> <ul> -<li>'Thialfihar' (Leitender Entwickler)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QR-Code, Schlüssel signtieren, Schlüssel hochladen)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Bibliotheken</h2> @@ -38,8 +44,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Apache Lizenz v2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Bibliothek</a> (Apache Lizenz v2)</li> -<li>Icons von <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike Lizenz 3.0)</li> -<li>Icons von <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li> </ul> </body> </html> 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 1197869b5..13b210fcd 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> @@ -8,7 +29,7 @@ <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>Absturz bei leeren Nutzer IDs behoben </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>fix upload of key from signing screen</li> @@ -38,15 +59,15 @@ <h2>2.0</h2> <ul> <li>Komlett neu designd</li> -<li>share public keys via qr codes, nfc beam</li> +<li>Öffentliche Schlüssel teilen via QR Code, NFC Beam</li> <li>Schlüssel signieren</li> <li>Schlüssel auf den Server hochladen</li> -<li>fixes import issues</li> +<li>Importprobleme behoben</li> <li>new AIDL API</li> </ul> <h2>1.0.8</h2> <ul> -<li>basic keyserver support</li> +<li>Grundlegende Schlüsselserverunterstützung</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> @@ -98,8 +119,8 @@ <h2>1.0.0</h2> <ul> <li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> -<li>support of more file managers (including ASTRO)</li> -<li>Slovenian translation</li> +<li>Unterstützung von mehr Filemanagern (einschließlich ASTRO)</li> +<li>Slowenische Übersetzung</li> <li>Neue Datenbank, viel schneller, weniger Speicherbedarf</li> <li>defined Intents and content provider for other apps</li> <li>Fehlerbehebungen</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 d2735f739..7a652682e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_start.html @@ -1,15 +1,15 @@ <html> <head></head> <body> -<h2>Getting started</h2> -<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>Los gehts</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Ich habe einen Fehler in OpenKeychain gefunden!</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> +<h2>Unterstützen</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>Übersetzungen</h2> diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html new file mode 100644 index 000000000..ae7e16aae --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<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 OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Lead developer)</li> +<li>Ash Hughes (crypto patches)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Developers APG 1.x</h2> +<ul> +<li>Thialfihar (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> +<li>Markus Doits</li> +</ul> +<h2>Libraries</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> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html new file mode 100644 index 000000000..1136deba6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<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>fix upload of key from signing screen</li> +</ul> +<h2>2.2</h2> +<ul> +<li>new design with navigation drawer</li> +<li>new public key list design</li> +<li>new public key view</li> +<li>bug fixes for importing of keys</li> +<li>key cross-certification (thanks to Ash Hughes)</li> +<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>first version with new languages (thanks to the contributors on Transifex)</li> +<li>sharing of keys via QR Codes fixed and improved</li> +<li>package signature verification for API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for K-9 Mail integration</li> +</ul> +<h2>2.1</h2> +<ul> +<li>lots of bug fixes</li> +<li>new API for developers</li> +<li>PRNG bug fix by Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>complete redesign</li> +<li>share public keys via qr codes, nfc beam</li> +<li>sign keys</li> +<li>upload keys to server</li> +<li>fixes import issues</li> +<li>new AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<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> +<li>bugfixes</li> +<li>optimizations</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>fixed problem with signature verification of texts with trailing newline</li> +<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>account adding crash on Froyo fixed</li> +<li>secure file deletion</li> +<li>option to delete key file after import</li> +<li>stream encryption/decryption (gallery, etc.)</li> +<li>new options (language, force v3 signatures)</li> +<li>interface changes</li> +<li>bugfixes</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>German and Italian translation</li> +<li>much smaller package, due to reduced BC sources</li> +<li>new preferences GUI</li> +<li>layout adjustment for localization</li> +<li>signature bugfix</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>fixed another crash caused by some SDK bug with query builder</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>fixed crashes during encryption/signing and possibly key export</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>filterable key lists</li> +<li>smarter pre-selection of encryption keys</li> +<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>GMail account listing was broken in 1.0.0, fixed again</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> +<li>support of more file managers (including ASTRO)</li> +<li>Slovenian translation</li> +<li>new database, much faster, less memory usage</li> +<li>defined Intents and content provider for other apps</li> +<li>bugfixes</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<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> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_start.html b/OpenPGP-Keychain/src/main/res/raw-el/help_start.html new file mode 100644 index 000000000..0e60c17a7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-el/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Getting started</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Translations</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html new file mode 100644 index 000000000..083e055c7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<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>Tap the card and the content will then load on the other person’s device.</li> +</ol> +</body> +</html> 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 863aeee58..ae7e16aae 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 @@ -11,13 +11,19 @@ <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Libraries</h2> @@ -38,8 +44,6 @@ <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> 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 abf660ba8..1136deba6 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 @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 3a6443a2f..0e60c17a7 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 @@ -2,7 +2,7 @@ <head></head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html index 95189425d..7a4f61127 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (Parches cryptográficos)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Desarrolladores de APG 1.x</h2> <ul> -<li>'Thialfihar' (Desarrollador principal)</li> +<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> @@ -38,8 +44,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licencia Apache v2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Librería Android AppMsg</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 index dfb51dc81..b776b3534 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <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> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html index 2907bbc99..d56399ef0 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_start.html @@ -2,7 +2,7 @@ <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>Primero necesitas un par de claves personales. Crea una a través de las opciones del menú "Contactos" 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> diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_about.html b/OpenPGP-Keychain/src/main/res/raw-et/help_about.html new file mode 100644 index 000000000..ae7e16aae --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-et/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<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 OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Lead developer)</li> +<li>Ash Hughes (crypto patches)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Developers APG 1.x</h2> +<ul> +<li>Thialfihar (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> +<li>Markus Doits</li> +</ul> +<h2>Libraries</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> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html new file mode 100644 index 000000000..1136deba6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<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>fix upload of key from signing screen</li> +</ul> +<h2>2.2</h2> +<ul> +<li>new design with navigation drawer</li> +<li>new public key list design</li> +<li>new public key view</li> +<li>bug fixes for importing of keys</li> +<li>key cross-certification (thanks to Ash Hughes)</li> +<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>first version with new languages (thanks to the contributors on Transifex)</li> +<li>sharing of keys via QR Codes fixed and improved</li> +<li>package signature verification for API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for K-9 Mail integration</li> +</ul> +<h2>2.1</h2> +<ul> +<li>lots of bug fixes</li> +<li>new API for developers</li> +<li>PRNG bug fix by Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>complete redesign</li> +<li>share public keys via qr codes, nfc beam</li> +<li>sign keys</li> +<li>upload keys to server</li> +<li>fixes import issues</li> +<li>new AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<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> +<li>bugfixes</li> +<li>optimizations</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>fixed problem with signature verification of texts with trailing newline</li> +<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>account adding crash on Froyo fixed</li> +<li>secure file deletion</li> +<li>option to delete key file after import</li> +<li>stream encryption/decryption (gallery, etc.)</li> +<li>new options (language, force v3 signatures)</li> +<li>interface changes</li> +<li>bugfixes</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>German and Italian translation</li> +<li>much smaller package, due to reduced BC sources</li> +<li>new preferences GUI</li> +<li>layout adjustment for localization</li> +<li>signature bugfix</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>fixed another crash caused by some SDK bug with query builder</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>fixed crashes during encryption/signing and possibly key export</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>filterable key lists</li> +<li>smarter pre-selection of encryption keys</li> +<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>GMail account listing was broken in 1.0.0, fixed again</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> +<li>support of more file managers (including ASTRO)</li> +<li>Slovenian translation</li> +<li>new database, much faster, less memory usage</li> +<li>defined Intents and content provider for other apps</li> +<li>bugfixes</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<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> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_start.html b/OpenPGP-Keychain/src/main/res/raw-et/help_start.html new file mode 100644 index 000000000..0e60c17a7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-et/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Getting started</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Translations</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html new file mode 100644 index 000000000..083e055c7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<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>Tap the card and the content will then load on the other person’s device.</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html new file mode 100644 index 000000000..ae7e16aae --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<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 OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Lead developer)</li> +<li>Ash Hughes (crypto patches)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Developers APG 1.x</h2> +<ul> +<li>Thialfihar (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> +<li>Markus Doits</li> +</ul> +<h2>Libraries</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> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html new file mode 100644 index 000000000..1136deba6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<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>fix upload of key from signing screen</li> +</ul> +<h2>2.2</h2> +<ul> +<li>new design with navigation drawer</li> +<li>new public key list design</li> +<li>new public key view</li> +<li>bug fixes for importing of keys</li> +<li>key cross-certification (thanks to Ash Hughes)</li> +<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>first version with new languages (thanks to the contributors on Transifex)</li> +<li>sharing of keys via QR Codes fixed and improved</li> +<li>package signature verification for API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for K-9 Mail integration</li> +</ul> +<h2>2.1</h2> +<ul> +<li>lots of bug fixes</li> +<li>new API for developers</li> +<li>PRNG bug fix by Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>complete redesign</li> +<li>share public keys via qr codes, nfc beam</li> +<li>sign keys</li> +<li>upload keys to server</li> +<li>fixes import issues</li> +<li>new AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<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> +<li>bugfixes</li> +<li>optimizations</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>fixed problem with signature verification of texts with trailing newline</li> +<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>account adding crash on Froyo fixed</li> +<li>secure file deletion</li> +<li>option to delete key file after import</li> +<li>stream encryption/decryption (gallery, etc.)</li> +<li>new options (language, force v3 signatures)</li> +<li>interface changes</li> +<li>bugfixes</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>German and Italian translation</li> +<li>much smaller package, due to reduced BC sources</li> +<li>new preferences GUI</li> +<li>layout adjustment for localization</li> +<li>signature bugfix</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>fixed another crash caused by some SDK bug with query builder</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>fixed crashes during encryption/signing and possibly key export</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>filterable key lists</li> +<li>smarter pre-selection of encryption keys</li> +<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>GMail account listing was broken in 1.0.0, fixed again</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> +<li>support of more file managers (including ASTRO)</li> +<li>Slovenian translation</li> +<li>new database, much faster, less memory usage</li> +<li>defined Intents and content provider for other apps</li> +<li>bugfixes</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<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> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html new file mode 100644 index 000000000..93a305796 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>شروع کار</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>هم بخشی کردن</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>ترجمه ها</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html new file mode 100644 index 000000000..083e055c7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<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>Tap the card and the content will then load on the other person’s device.</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 3cbbce4d5..00370c77e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (correctif crypto)</li> <li>Brian C. Barnes</li> <li>Bahtiar « kalkin » Gadimov (interface utilisateur)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Les développeurs d'APG 1.x</h2> <ul> -<li>« Thialfihar (développeur principal)</li> +<li>Thialfihar (développeur principal)</li> <li>« Senecaso » (Code QR, signer/téléverser la clef)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Bibliothèques</h2> @@ -38,8 +44,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licence Apache v2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Bibliothèque Android AppMsg</a> (Licence Apache v2)</li> -<li>Icônes du <a href="http://rrze-icon-set.berlios.de/">jeu d'icônes RRZE</a> (Licence Creative Commons Paternité - Partage des Conditions Initiales à l'Identique 3.0)</li> -<li>Icônes du <a href="http://tango.freedesktop.org/">jeu d'icônes Tango</a> (domaine public)</li> </ul> </body> </html> 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 c86c4a465..56a35d70e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <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> 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 0c1610f0c..ddaac44b1 100644 --- a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>Commencer</h2> -<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> +<p>Il vous faut d'abord une paire de clefs personnelles. Créez-en une avec le menu des options dans « Contacts » 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> <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> 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 ba0676f3e..917c7cc49 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 @@ -11,13 +11,19 @@ <li>Ash Hughes (Patch crittografia)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (Interfaccia Utente)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Sviluppatori APG 1.x</h2> <ul> -<li>'Thialfihar' (Capo Sviluppatore)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, firma chiavi, caricamento chiavi)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Librerie</h2> @@ -38,8 +44,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licenza Apache v2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Licenza Apache v2)</li> -<li>Icone da <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Licenza Creative Commons Attribution Share-Alike 3.0)</li> -<li>Icone da <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Pubblico Dominio)</li> </ul> </body> </html> 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 050d2c9ef..de167f870 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 @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>rimossa esportazione non necessaria delle chiavi pubbliche quando si esportano le chiavi private (grazie a Ash Hughes)</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 4eadd82fc..7255d70bb 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 @@ -2,7 +2,7 @@ <head></head> <body> <h2>Per iniziare</h2> -<p>Per prima cosa hai bisogno di un paio di chiavi personali. Creane una tramite i menu di opzione sotto 'Mie Chiavi' o importane di esistenti attraverso "Importa Chiavi". Dopodiche' puoi scaricare le chiavi dei tuoi amici o scambiarle tramite Codici QR o NFC.</p> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Si raccomanda di installare <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> per una migliore selezione dei file e <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> per scansionare i codici QR. I collegamenti verranno aperti in Google Play Store o F-Droid per l'installazione.</p> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html index 206fc9f8d..e60add867 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (暗号関係パッチ提供)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>APG 1.xの開発者達</h2> <ul> -<li>'Thialfihar' (主任開発者)</li> +<li>Thialfihar (主任開発者)</li> <li>'Senecaso' (QRコード, 鍵署名, 鍵アップロード関係)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>ライブラリ</h2> @@ -38,8 +44,6 @@ <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> (パブリックドメイン)</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 index 4878a3b55..e60c7f63f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>秘密鍵のエクスポート時における必要でない公開鍵のエクスポートの削除 (thanks to Ash Hughes)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html index 9764e876a..0a92042b1 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>入門</h2> -<p>最初にあなたの個人用鍵ペアが必要になります。オプションメニューの"自分の鍵"で生成するか、"鍵のインポート"から既存の鍵ペアをインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>ファイルの選択を拡張するには<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> 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 863aeee58..ae7e16aae 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 @@ -11,13 +11,19 @@ <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Libraries</h2> @@ -38,8 +44,6 @@ <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> 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 abf660ba8..1136deba6 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 @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 3a6443a2f..0e60c17a7 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 @@ -2,7 +2,7 @@ <head></head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html new file mode 100644 index 000000000..a033c084a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<p><a href="http://www.openkeychain.org">http://www.openkeychain.org</a></p> +<p><a href="http://www.openkeychain.org">OpenKeychain</a> to implementacja OpenPGP na platformę Android.</p> +<p>Licencja: GPLv3+</p> + +<h2>Deweloperzy OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Wiodący developer)</li> +<li>Ash Hughes (łatki crypto)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (Interfejs Użytkownika)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Deweloperzy APG 1.x</h2> +<ul> +<li>Thialfihar (Wiodący deweloper)</li> +<li>'Senecaso' (kody QR, podpisy kluczy, wysyłanie kluczy)</li> +<li>Markus Doits</li> +</ul> +<h2>Biblioteki</h2> +<ul> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Licencja Apache v2)</li> +<li> +<a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v7 'appcompat'</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/emilsjolander/StickyListHeaders">StickyListHeaders</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/Bearded-Hen/Android-Bootstrap">Android-Bootstrap</a> (Licencja MIT)</li> +<li> +<a href="http://code.google.com/p/zxing/">ZXing</a> (Licencja Apache v2)</li> +<li> +<a href="http://rtyley.github.com/spongycastle/">SpongyCastle</a> (Licencja MIT X11)</li> +<li> +<a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (Licencja Apache v2)</li> +<li> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Licencja Apache v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html new file mode 100644 index 000000000..18ea0735e --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<h2>2.3</h2> +<ul> +<li>usunięto zbędne eksportowanie kluczy publicznych przy eksportowaniu kluczy prywatnych (podziękowania dla Ash Hughes)</li> +<li>naprawiono błąd z ustawianiem daty wygaśnięcia kluczy (podziękowania dla Ash Hugens)</li> +<li>więcej wewnętrznych poprawek przy edytowaniu kluczy (podziękowania dla Ash Hughes)</li> +<li>wysyłanie zapytań do serwera kluczy bezpośrednio z ekranu importu</li> +<li>poprawiony wygląd interfejsu i okienek na Androidzie 2.2-3.0</li> +<li>naprawiono awarię programu dla kluczy z pustym identyfikatorem użytkownika</li> +<li>naprawiono awarię aplikacji przy powrocie z ekranu podpisywania</li> +<li>Bouncy Castle (biblioteka kryptograficzna) zaktualizowana z wersji 1.47 do 1.50 i kompilowana ze źródeł</li> +<li>naprawiony błąd przy wysyłaniu klucza z ekranu podpisywania</li> +</ul> +<h2>2.2</h2> +<ul> +<li>nowy wygląd z panelem nawigacji</li> +<li>nowy wygląd listy kluczy publicznych</li> +<li>nowy widok klucza publicznego</li> +<li>naprawiono błędy związane z importowaniem kluczy</li> +<li>krzyżowa certyfikacja kluczy (podziękowania dla Ash Hughes)</li> +<li>hasła zapisane w UTF-8 są teraz prawidłowo obsługiwane (podziękowania dla Ash Hughes)</li> +<li>pierwsza wersja z nowymi językami (podziękowania dla tłumaczy-wolontariuszy z Transifex)</li> +<li>udostępnianie kluczy przez kody QR zostało poprawione i ulepszone</li> +<li>weryfikacja podpisu paczki dla API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>aktualizacje API, przygotowanie do integracji z K-9 Mail</li> +</ul> +<h2>2.1</h2> +<ul> +<li>wiele poprawek błędów</li> +<li>nowe API dla programistów</li> +<li>Naprawiono błąd generatora liczb losowych (PRNG), Google.</li> +</ul> +<h2>2.0</h2> +<ul> +<li>kompletna przebudowa</li> +<li>udostępnianie kluczy publicznych przez kody QR oraz NFC</li> +<li>możliwość podpisywania kluczem</li> +<li>wysyłanie kluczy na serwer</li> +<li>naprawiono problemy związane z importowaniem</li> +<li>nowy AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<li>podstawowa obsługa serwerów kluczy</li> +<li>app2sd</li> +<li>dodano więcej przedziałów czasowych zapamiętywania hasła: 1, 2, 4, 8 godzin</li> +<li>tłumaczenia: norweski (podziękowania dla Sander Danielsen), chiński (podziękowania dla Zhang Fredrick)</li> +<li>naprawione błędy</li> +<li>usprawnienia</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>naprawiono problem z weryfikowaniem podpisu tekstów kończących się znakiem nowej linii</li> +<li>dodano więcej przedziałów czasowych zapamiętywania hasła (20, 40, 60 minut)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>naprawiono błąd powodujący awarię aplikacji przy dodawaniu nowego konta na Androidzie 2.2 Froyo</li> +<li>dodano bezpieczne usuwanie plików</li> +<li>Dodano możliwość usuwania plików kluczy po zaimportowaniu</li> +<li>możliwość strumieniowego szyfrowania/deszyfrowania (galeria i inne)</li> +<li>nowe opcje (języki, wymuszanie podpisów v3)</li> +<li>zmiany w interfejsie</li> +<li>naprawione błędy</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>tłumaczenie na niemiecki i włoski</li> +<li>znaczne zmniejszenie rozmiaru paczki, z powodu zredukowania źródeł BC</li> +<li>nowy interfejs graficzny Właściwości</li> +<li>usprawnienia wyglądu dla lokalizacji</li> +<li>naprawa błędu z podpisami</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>naprawiono kolejny błąd powodujący awarię aplikacji, spowodowany przez jakąś usterkę w SDK przy budowaniu zapytań</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>naprawiono błąd w trakcie szyfrowania/podpisywania i prawdopodobnie eksportowania klucza</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>dodano możliwość filtrowania listy kluczy</li> +<li>sprytniejsze automatyczne wybieranie kluczy szyfrujących</li> +<li>dodano nowy sposób obsługi intencji "wyświetl" i "wyślij", umożliwia szyfrowanie/deszyfrowanie plików wprost z menadżera plików.</li> +<li>poprawki i dodatkowe funkcje (podpowiedź wyboru klucza) dla K-9 Mail, nowe wydanie beta dostępne</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>wyświetlanie kont w GMailu było zepsute w 1.0.0, naprawiono je ponownie</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>integracja z K-9 Mail, APG obsługuje wersję beta K-9 Mail</li> +<li>dodano wsparcie dla większej liczby menadżerów plików (włącznie z ASTRO)</li> +<li>tłumaczenie na słoweński</li> +<li>Wykorzystanie nowej bazy danych, która jest znacznie szybsza i mniej pamięciożerna</li> +<li>zdefiniowano intecję i dostawców treści dla pozostałych aplikacji</li> +<li>naprawione błędy</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html new file mode 100644 index 000000000..53db5e80c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>Jak odbierać klucze</h2> +<ol> +<li>Wejdź do listy kontaktów Twojego partnera i otwórz kontakt, który chcesz przesłać.</li> +<li>Przytrzymaj oba urządzenia plecami do siebie (powinny się niemal dotykać) i poczujesz wibrację.</li> +<li>Po zakończeniu wibracji zobaczysz, że zawartość urządzenia partnera zamienia się w obiekt zbliżony do wizytówki, z animacją rodem ze Star Treka w tle.</li> +<li>Dotknij wizytówkę, a jej zawartość zostanie wysłana na Twoje urządzenie.</li> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html b/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html new file mode 100644 index 000000000..e88a1ad6d --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Pierwsze kroki</h2> +<p>Po pierwsze potrzebujesz swoją osobistą parę kluczy. Stwórz ją, korzystając z odpowiedniej opcji w sekcji "Kontakty" albo zainportuj istniejącą parę korzystając z sekcji "Inportuj klucze". Następnie możesz porać klucze Twoich znajomych lub wymieniać się z nimi za pośrednictwem kodów QR lub technologii NFC.</p> + +<p>Zalecana jest instalacja menadżera plików <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> w celu zapewnienia wygodniejszego wyboru plików oraz programu <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>, który jest w stanie skanować wygenerowane kody QR. Kliknięcie na powyższe linki przekieruje Cię do sklepu Google Play / F-Droid.</p> + +<h2>Znalazłem błąd w OpenKeychain!</h2> +<p>Zgłoś błąd korzystając z <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">systemu śledzenia błędów OpenKeychain</a>.</p> + +<h2>Wkład</h2> +<p>Jeżeli chcesz pomóc nam rozwijać OpenKeychain jako programista, <a href="https://github.com/openpgp-keychain/openpgp-keychain#contribute-code">zapoznaj się z naszym małym poradnikiem na Githubie</a>.</p> + +<h2>Tłumaczenia</h2> +<p>Pomóż przetłumaczyć OpenKeychain! Każdy może wziąć udział przez stronę <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain w serwisie Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html new file mode 100644 index 000000000..f17e44079 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<body> +<ol> +<li>Upewnij się, że NFC (Near Field Communication, pol.: komunikacja bliskiego zasięgu) jest włączone. W tym celu wejdź w Ustawienia > Inne > NFC. Upewnij się również, że włączona jest funkcja Android Beam (znajduje się w tym samym miejscu).</li> +<li>Przytrzymaj oba urządzenia plecami do siebie (powinny się niemal dotykać) i poczujesz wibrację.</li> +<li>Po zakończeniu wibracji zobaczysz, że zawartość urządzenia partnera zamienia się w obiekt zbliżony do wizytówki, z animacją rodem ze Star Treka w tle.</li> +<li>Dotknij wizytówkę, a jej zawartość zostanie wysłana na urządzenie drugiej osoby.</li> +</ol> +</body> +</html> 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 863aeee58..ae7e16aae 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 @@ -11,13 +11,19 @@ <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Libraries</h2> @@ -38,8 +44,6 @@ <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> 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 abf660ba8..1136deba6 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 @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 3a6443a2f..0e60c17a7 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 @@ -2,7 +2,7 @@ <head></head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> 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 655e98758..9a8e5a413 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (патчи криптографии)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Разработчики APG 1.x</h2> <ul> -<li>'Thialfihar' (главный разработчик)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QR коды, подписание и загрузка ключей)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Компоненты</h2> @@ -38,8 +44,6 @@ <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</a> (Apache License v2)</li> -<li>Иконки <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> -<li>Иконки <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li> </ul> </body> </html> 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 2a324202f..447c04f17 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>удален не требующийся экспорт публичного ключа при экспорте секретного ключа (спасибо, Ash Hughes)</li> 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 9b2b99e96..4188f6d5f 100644 --- a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>Приступая</h2> -<p>Для начала вам понадобится своя пара ключей. Воспользуйтесь меню в разделе "Мои ключи", что бы создать новую, или добавьте ранее созданную пару в разделе "Импорт ключей". После этого вы сможете скачать ключи ваших друзей или обменяться ключами посредством QR кодов или NFC.</p> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Рекомендуется установить <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> 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 863aeee58..ae7e16aae 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 @@ -11,13 +11,19 @@ <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Libraries</h2> @@ -38,8 +44,6 @@ <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> 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 abf660ba8..1136deba6 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 @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 3a6443a2f..0e60c17a7 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 @@ -2,7 +2,7 @@ <head></head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> 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 eb262b242..7d2c24f9c 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html @@ -11,13 +11,19 @@ <li>Ash Hughes (kripto yamaları)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (Arayüz)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Geliştiriciler APG 1.x</h2> <ul> -<li>'Thialfihar' (Baş geliştirici)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QR Kodu, anahtar imzalama, anahtar yükleme)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> <h2>Kütüphaneler</h2> @@ -38,8 +44,6 @@ <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>İkonlar <a href="http://rrze-icon-set.berlios.de/">RRZE Icon Set</a> (Creative Commons Attribution Share-Alike licence 3.0)</li> -<li>İkonlar <a href="http://tango.freedesktop.org/">Tango Icon Set</a> (Public Domain)</li> </ul> </body> </html> 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 abf660ba8..1136deba6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 3a6443a2f..0e60c17a7 100644 --- a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> 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 c8a5a82c5..b839b50e1 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html @@ -11,13 +11,19 @@ <li>Аш Гюдж (латки шифрування)</li> <li>Браян С. Барнс</li> <li>Бахтіяр 'kalkin' Ґадімов (інтерфейс)</li> - +<li>Даніель Гаман</li> +<li>Даніель Габ</li> +<li>Ґреґ Вітчак</li> +<li>Міроджін Бакші</li> +<li>Nikhil Peter Raj</li> +<li>Пауль Сарбіновський</li> +<li>Sreeram Boyapati</li> +<li>Вінсент Брейтмозер</li> </ul> <h2>Розробники APG 1.x</h2> <ul> -<li>'Thialfihar' (основний розробник)</li> +<li>Thialfihar (основний розробник)</li> <li>'Senecaso' (штрих-код, підпис і завантаження ключів)</li> -<li>Олівер Ранж</li> <li>Маркус Дойтс</li> </ul> <h2>Бібліотеки</h2> @@ -38,8 +44,6 @@ <a href="https://github.com/dschuermann/html-textview">HtmlTextView</a> (ліцензія Apache в.2)</li> <li> <a href="https://github.com/johnkil/Android-AppMsg">Бібліотека Android AppMsg Library</a> (Ліцензія Apache в. 2)</li> -<li>Піктограми із <a href="http://rrze-icon-set.berlios.de/">набору піктограм RRZE</a> (ліцензія Creative Commons - Із зазначенням авторства - Розповсюдження на тих самих умовах - версія 3.0)</li> -<li>Піктограми із <a href="http://tango.freedesktop.org/">набору піктограм Tango</a> (відкритий домен)</li> </ul> </body> </html> 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 0b67fa3a9..826638e75 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>видалений непотрібний експорт публічного ключа при експорті секретного ключа (завдяки Ash Hughes)</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 3bfb40f8a..45a3edb6a 100644 --- a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html @@ -2,7 +2,7 @@ <head></head> <body> <h2>Приступаючи до роботи</h2> -<p>Спершу вам потрібна персональна в'язка ключів. Створіть одну через меню параметрів у "Мої Ключі" або імпортуйте наявні в'язки ключів через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або NFC.</p> +<p>Спершу вам потрібна персональна в'язка ключів. Створіть одну через меню параметрів у "Контактах" або імпортуйте наявні в'язки ключів через "Імпорт ключів". Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або 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> для сканування згенерованих штрих-кодів. Натискання посилань відкриє Google Play або F-Droid для встановлення.</p> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html new file mode 100644 index 000000000..ae7e16aae --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html @@ -0,0 +1,49 @@ +<html> +<head></head> +<body> +<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 OpenKeychain</h2> +<ul> +<li>Dominik Schürmann (Lead developer)</li> +<li>Ash Hughes (crypto patches)</li> +<li>Brian C. Barnes</li> +<li>Bahtiar 'kalkin' Gadimov (UI)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> +</ul> +<h2>Developers APG 1.x</h2> +<ul> +<li>Thialfihar (Lead developer)</li> +<li>'Senecaso' (QRCode, sign key, upload key)</li> +<li>Markus Doits</li> +</ul> +<h2>Libraries</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> +<a href="https://github.com/johnkil/Android-AppMsg">Android AppMsg Library</a> (Apache License v2)</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html new file mode 100644 index 000000000..1136deba6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html @@ -0,0 +1,129 @@ +<html> +<head></head> +<body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> +<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>fix upload of key from signing screen</li> +</ul> +<h2>2.2</h2> +<ul> +<li>new design with navigation drawer</li> +<li>new public key list design</li> +<li>new public key view</li> +<li>bug fixes for importing of keys</li> +<li>key cross-certification (thanks to Ash Hughes)</li> +<li>handle UTF-8 passwords properly (thanks to Ash Hughes)</li> +<li>first version with new languages (thanks to the contributors on Transifex)</li> +<li>sharing of keys via QR Codes fixed and improved</li> +<li>package signature verification for API</li> +</ul> +<h2>2.1.1</h2> +<ul> +<li>API Updates, preparation for K-9 Mail integration</li> +</ul> +<h2>2.1</h2> +<ul> +<li>lots of bug fixes</li> +<li>new API for developers</li> +<li>PRNG bug fix by Google</li> +</ul> +<h2>2.0</h2> +<ul> +<li>complete redesign</li> +<li>share public keys via qr codes, nfc beam</li> +<li>sign keys</li> +<li>upload keys to server</li> +<li>fixes import issues</li> +<li>new AIDL API</li> +</ul> +<h2>1.0.8</h2> +<ul> +<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> +<li>bugfixes</li> +<li>optimizations</li> +</ul> +<h2>1.0.7</h2> +<ul> +<li>fixed problem with signature verification of texts with trailing newline</li> +<li>more options for pass phrase cache time to live (20, 40, 60 mins)</li> +</ul> +<h2>1.0.6</h2> +<ul> +<li>account adding crash on Froyo fixed</li> +<li>secure file deletion</li> +<li>option to delete key file after import</li> +<li>stream encryption/decryption (gallery, etc.)</li> +<li>new options (language, force v3 signatures)</li> +<li>interface changes</li> +<li>bugfixes</li> +</ul> +<h2>1.0.5</h2> +<ul> +<li>German and Italian translation</li> +<li>much smaller package, due to reduced BC sources</li> +<li>new preferences GUI</li> +<li>layout adjustment for localization</li> +<li>signature bugfix</li> +</ul> +<h2>1.0.4</h2> +<ul> +<li>fixed another crash caused by some SDK bug with query builder</li> +</ul> +<h2>1.0.3</h2> +<ul> +<li>fixed crashes during encryption/signing and possibly key export</li> +</ul> +<h2>1.0.2</h2> +<ul> +<li>filterable key lists</li> +<li>smarter pre-selection of encryption keys</li> +<li>new Intent handling for VIEW and SEND, allows files to be encrypted/decrypted out of file managers</li> +<li>fixes and additional features (key preselection) for K-9 Mail, new beta build available</li> +</ul> +<h2>1.0.1</h2> +<ul> +<li>GMail account listing was broken in 1.0.0, fixed again</li> +</ul> +<h2>1.0.0</h2> +<ul> +<li>K-9 Mail integration, APG supporting beta build of K-9 Mail</li> +<li>support of more file managers (including ASTRO)</li> +<li>Slovenian translation</li> +<li>new database, much faster, less memory usage</li> +<li>defined Intents and content provider for other apps</li> +<li>bugfixes</li> +</ul> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html new file mode 100644 index 000000000..88492731c --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html @@ -0,0 +1,12 @@ +<html> +<head></head> +<body> +<h2>How to receive keys</h2> +<ol> +<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> +</ol> +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html new file mode 100644 index 000000000..0e60c17a7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html @@ -0,0 +1,19 @@ +<html> +<head></head> +<body> +<h2>Getting started</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>Translations</h2> +<p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html new file mode 100644 index 000000000..083e055c7 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html @@ -0,0 +1,11 @@ +<html> +<head></head> +<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>Tap the card and the content will then load on the other person’s device.</li> +</ol> +</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 863aeee58..813676ea2 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html @@ -3,24 +3,30 @@ <body> <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> +<p>授權：GPLv3+</p> <h2>Developers OpenKeychain</h2> <ul> <li>Dominik Schürmann (Lead developer)</li> <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> -<li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Bahtiar 'kalkin' Gadimov (介面)</li> +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> -<h2>Libraries</h2> +<h2>函式庫</h2> <ul> <li> <a href="http://developer.android.com/tools/support-library/index.html">Android Support Library v4</a> (Apache License v2)</li> @@ -38,8 +44,6 @@ <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> 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 abf660ba8..1136deba6 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html @@ -1,6 +1,27 @@ <html> <head></head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</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 88492731c..7a90a794b 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 @@ -1,12 +1,12 @@ <html> <head></head> <body> -<h2>How to receive keys</h2> +<h2>如何接收金要</h2> <ol> -<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> +<li>前往你夥伴裝置上的聯絡人清單，並點選你要分享的聯絡人。</li> +<li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li> +<li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li> +<li>輕觸卡片，內容隨即顯示在你的裝置上。</li> </ol> </body> </html> 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 3a6443a2f..22ac99882 100644 --- a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html @@ -1,18 +1,18 @@ <html> <head></head> <body> -<h2>Getting started</h2> -<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>快速上手</h2> +<p>First you need a personal key pair. Create one via the option menus in "Contacts" 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>我在OpenKeychain發現問題！</h2> +<p>請利用 <a href="https://github.com/openpgp-keychain/openpgp-keychain/issues">OpenKeychain 項目回報系統</a>回報問題。</p> -<h2>Contribute</h2> +<h2>發布</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>Translations</h2> +<h2>翻譯</h2> <p>Help translating OpenKeychain! Everybody can participate at <a href="https://www.transifex.com/projects/p/openpgp-keychain/">OpenKeychain on Transifex</a>.</p> </body> 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 083e055c7..99ffe4c12 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 @@ -2,10 +2,10 @@ <head></head> <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>Tap the card and the content will then load on the other person’s device.</li> +<li>確定在 "設定" > "更多內容…" > "NFC" 裡面已經開啟 NFC 和 Android Beam。</li> +<li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li> +<li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li> +<li>輕觸卡片，內容隨即顯示在你的裝置上。</li> </ol> </body> </html> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenPGP-Keychain/src/main/res/raw/help_about.html index 51e3f1325..847168446 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_about.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_about.html @@ -15,13 +15,20 @@ And don't add newlines before or after p tags because of transifex --> <li>Ash Hughes (crypto patches)</li> <li>Brian C. Barnes</li> <li>Bahtiar 'kalkin' Gadimov (UI)</li> - +<li>Daniel Hammann</li> +<li>Daniel Haß</li> +<li>Greg Witczak</li> +<li>Miroojin Bakshi</li> +<li>Nikhil Peter Raj</li> +<li>Paul Sarbinowski</li> +<li>Sreeram Boyapati</li> +<li>Vincent Breitmoser</li> </ul> + <h2>Developers APG 1.x</h2> <ul> -<li>'Thialfihar' (Lead developer)</li> +<li>Thialfihar (Lead developer)</li> <li>'Senecaso' (QRCode, sign key, upload key)</li> -<li>Oliver Runge</li> <li>Markus Doits</li> </ul> @@ -35,8 +42,6 @@ And don't add newlines before or after p tags because of transifex --> <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> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html index 17ad853de..595878fe7 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html @@ -5,6 +5,29 @@ And don't add newlines before or after p tags because of transifex --> <head> </head> <body> +<h2>2.4</h2> +<p>Thanks to all applicants of Google Summer of Code 2014 who made this release feature rich and bug free! +Besides several small patches, a notable number of patches are made by the following people (in alphabetical order): +Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Paul Sarbinowski, Sreeram Boyapati, Vincent Breitmoser.</p> +<ul> +<li>new unified key list</li> +<li>colorized key fingerprint</li> +<li>support for keyserver ports</li> +<li>deactivate possibility to generate weak keys</li> +<li>much more internal work on the API</li> +<li>certify user ids</li> +<li>keyserver query based on machine-readable output</li> +<li>lock navigation drawer on tablets</li> +<li>suggestions for emails on creation of keys</li> +<li>search in public key lists</li> +<li>and much more improvements and fixes…</li> +</ul> + +<h2>2.3.1</h2> +<ul> +<li>hotfix for crash when upgrading from old versions</li> +</ul> + <h2>2.3</h2> <ul> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_faq.html b/OpenPGP-Keychain/src/main/res/raw/help_faq.html new file mode 100644 index 000000000..bfd43eafd --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/raw/help_faq.html @@ -0,0 +1,13 @@ +<!-- Maintain structure with headings with h2 tags and content with p tags. +This makes it easy to translate the values with transifex! +And don't add newlines before or after p tags because of transifex --> +<html> +<head> +</head> +<body> +<h2>How can I specify connection port for Keyserver?</h2> +<p>Add a new Keyserver (or modify existing one) by going to Preferences -> General -> Keyservers. Enter the port number after the Keyserver address and preceded it by a colon. For example, "p80.pool.sks-keyservers.net:80" (without quotation marks) means that server "p80.pool.sks-keyservers.net" is working on a port 80.</p> +<p>Default connection port is 11371 and it doesn't need to be specified.</p> + +</body> +</html> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_start.html b/OpenPGP-Keychain/src/main/res/raw/help_start.html index 7afac0f08..56c02b1fd 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_start.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_start.html @@ -6,7 +6,7 @@ And don't add newlines before or after p tags because of transifex --> </head> <body> <h2>Getting started</h2> -<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>First you need a personal key pair. Create one via the option menus in "Contacts" 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> diff --git a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml b/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml new file mode 100644 index 000000000..9207318d3 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml @@ -0,0 +1,49 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_manage_public_keys">Kontakty</string> + <string name="title_manage_secret_keys">Tajné klíče</string> + <string name="title_select_recipients">Zvolit veřejný klíč</string> + <string name="title_select_secret_key">Zvolit tajný klíč</string> + <string name="title_encrypt">Zašifrovat</string> + <string name="title_decrypt">Dešifrovat</string> + <string name="title_authentication">Heslo</string> + <string name="title_create_key">Vytvořit klíč</string> + <string name="title_edit_key">Upravit klíč</string> + <string name="title_preferences">Nastavení</string> + <string name="title_api_registered_apps">Registrované aplikace</string> + <string name="title_key_server_preference">Nastavení serveru s klíči</string> + <string name="title_set_passphrase">Zadat heslo</string> + <string name="title_send_email">Poslat zprávu...</string> + <string name="title_import_keys">Importovat klíče</string> + <string name="title_export_key">Exportovat klíč</string> + <string name="title_export_keys">Exportovat klíče</string> + <string name="title_key_not_found">Klíč nenalezen</string> + <string name="title_send_key">Nahrát na server s klíči</string> + <string name="title_help">Nápověda</string> + <!--section--> + <string name="section_keys">Klíče</string> + <!--button--> + <string name="btn_sign">Podepsat</string> + <!--menu--> + <!--label--> + <string name="unknown_status"></string> + <!--choice--> + <!--sentences--> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <!--progress dialogs, usually ending in '…'--> + <!--action strings--> + <!--key bit length selections--> + <!--compression--> + <!--Help--> + <!--Import--> + <!--Intent labels--> + <!--Remote API--> + <!--Share--> + <!--Key list--> + <!--Key view--> + <!--Navigation Drawer--> + <!--hints--> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenPGP-Keychain/src/main/res/values-de/strings.xml index ea1e550e3..493b81314 100644 --- a/OpenPGP-Keychain/src/main/res/values-de/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-de/strings.xml @@ -13,9 +13,10 @@ <string name="title_preferences">Einstellungen</string> <string name="title_api_registered_apps">Registrierte Anwendungen</string> <string name="title_key_server_preference">Schlüsselserver</string> - <string name="title_change_passphrase">Passwort ändern</string> + <string name="title_change_passphrase">Passphrase ändern</string> <string name="title_set_passphrase">Passwort setzen</string> - <string name="title_send_email">E-Mail senden…</string> + <string name="title_send_email">E-Mail senden...</string> + <string name="title_send_file">Datei senden</string> <string name="title_encrypt_to_file">In eine Datei verschlüsseln</string> <string name="title_decrypt_to_file">In eine Datei entschlüsseln</string> <string name="title_import_keys">Schlüssel importieren</string> @@ -63,6 +64,8 @@ <string name="btn_clipboard">Zwischenablage</string> <string name="btn_share">Teilen mit…</string> <string name="btn_lookup_key">Schlüssel nachschlagen</string> + <string name="btn_encryption_advanced_settings_show">Erweiterte Einstellungen anzeigen</string> + <string name="btn_encryption_advanced_settings_hide">Erweiterte Einstellungen verbergen</string> <!--menu--> <string name="menu_preferences">Einstellungen</string> <string name="menu_help">Hilfe</string> @@ -71,15 +74,17 @@ <string name="menu_import">Importieren</string> <string name="menu_import_from_nfc">NFC</string> <string name="menu_export_keys">Alle Schlüssel exportieren</string> + <string name="menu_export_secret_keys">Alle geheimen Schlüssel exportieren</string> <string name="menu_export_key">In Datei exportieren</string> <string name="menu_delete_key">Schlüssel löschen</string> <string name="menu_create_key">Schlüssel erstellen</string> <string name="menu_create_key_expert">Schlüssel erstellen (Experte)</string> <string name="menu_search">Suchen</string> - <string name="menu_key_server">Schlüsselserver</string> + <string name="menu_import_from_key_server">Schlüsselserver</string> + <string name="menu_key_server">Schlüsselserver…</string> <string name="menu_update_key">Von einem Schlüsselserver aktualisieren</string> <string name="menu_export_key_to_server">Auf Schlüsselserver hochladen</string> - <string name="menu_share">Teilen</string> + <string name="menu_share">Teilen…</string> <string name="menu_share_title_fingerprint">Teile Fingerabdruck…</string> <string name="menu_share_title">Teile gesamten Schlüssel…</string> <string name="menu_share_default_fingerprint">mit…</string> @@ -92,6 +97,7 @@ <string name="menu_beam_preferences">Beam-Einstellungen</string> <string name="menu_key_edit_cancel">Abbrechen</string> <string name="menu_encrypt_to">Verschlüsseln nach…</string> + <string name="menu_select_all">Alles auswählen</string> <!--label--> <string name="label_sign">Signieren</string> <string name="label_message">Nachricht</string> @@ -104,6 +110,7 @@ <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_share_after_encryption">Nach dem Verschlüsseln teilen</string> <string name="label_encryption_algorithm">Verschlüsselungsalgorithmus</string> <string name="label_hash_algorithm">Hash-Algorithmus</string> <string name="label_asymmetric">Öffentlicher Schlüssel</string> @@ -122,9 +129,12 @@ <string name="label_name">Name</string> <string name="label_comment">Kommentar</string> <string name="label_email">E-Mail</string> + <string name="label_sign_user_id">Benutzer ID unterschreiben</string> + <string name="label_sign_email">Email unterschreiben</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> + <string name="expiry_date_dialog_title">Ablaufdatum festsetzen</string> <plurals name="select_keys_button"> <item quantity="one">%d ausgewählt</item> <item quantity="other">%d ausgewählt</item> @@ -132,11 +142,17 @@ <string name="user_id_no_name"><kein Name></string> <string name="none"><keine></string> <string name="no_key"><kein Schlüssel></string> + <string name="no_email"><Keine E-Mail></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> + <string name="user_id">Benutzer ID</string> + <plurals name="n_contacts"> + <item quantity="one">1 Kontakt</item> + <item quantity="other">%d Kontakte</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d Schlüsselserver</item> <item quantity="other">%d Schlüsselserver</item> @@ -163,7 +179,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Öffnen…</string> + <string name="filemanager_title_open">Öffnen...</string> <string name="warning">Warnung</string> <string name="error">Fehler</string> <string name="error_message">Fehler: %s</string> @@ -192,6 +208,7 @@ <string name="key_deletion_confirmation">Soll der Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden! </string> <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten Schlüssel löschen?\nDies kann nicht rückgängig gemacht werden!</string> <string name="secret_key_deletion_confirmation">Soll der PRIVATE Schlüssel \'%s\' wirklich gelöscht werden?\nDies kann nicht rückgängig gemacht werden!</string> + <string name="also_export_secret_keys">Private Schlüssel auch exportieren</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">%d Schlüssel erfolgreich hinzugefügt</item> <item quantity="other">%d Schlüssel erfolgreich hinzugefügt</item> @@ -213,6 +230,7 @@ <string name="keys_exported">%d Schlüssel erfolgreich exportiert.</string> <string name="no_keys_exported">Keine Schlüssel exportiert.</string> <string name="key_creation_el_gamal_info">Beachte: nur Unterschlüssel unterstützen ElGamal. Für ElGamal wird die am nächsten liegende Schlüssellänge von 1536, 2048, 3072, 4096 oder 8192 verwendet.</string> + <string name="key_creation_weak_rsa_info">Beachte: RSA-Schlüssel mit einer Schlüssellänge von 1024-Bits oder weniger werden als unsicher angesehen und können daher nicht für neue Schlüssel erstellt werden.</string> <string name="key_not_found">Schlüssel %08X konnte nicht gefunden werden.</string> <plurals name="keys_found"> <item quantity="one">%d Schlüssel gefunden.</item> @@ -244,6 +262,7 @@ <string name="error_master_key_must_not_be_el_gamal">Der Hauptschlüssel kann kein ElGamal Schlüssel sein</string> <string name="error_unknown_algorithm_choice">Unbekannte Auswahl für Algorithmus</string> <string name="error_user_id_needs_a_name">ein Name muss angegeben werden</string> + <string name="error_user_id_no_email">keine E-Mail gefunden</string> <string name="error_user_id_needs_an_email_address">eine E-Mail-Adresse muss angegeben werden</string> <string name="error_key_needs_a_user_id">Mindestens eine Benutzer-ID wird benötigt</string> <string name="error_main_user_id_must_not_be_empty">Hauptbenutzer-ID darf nicht leer sein</string> @@ -266,17 +285,25 @@ <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string> <string name="error_can_not_delete_contact">Sie können diesen Kontakt nicht löschen, denn es ist ihr eigener.</string> <string name="error_can_not_delete_contacts">Sie können folgende Kontakte nicht löschen, denn sie gehören Ihnen selbst:\n%s</string> + <string name="error_keyserver_insufficient_query">Unzureichende Serveranfrage</string> <string name="error_keyserver_query">Keyserveranfrage fehlgeschlagen</string> + <string name="error_keyserver_too_many_responses">Zu viele Antworten</string> + <string name="error_import_file_no_content">Datei ist leer</string> + <string name="error_generic_report_bug">Ein allgemeiner Fehler trat auf, bitte schreiben Sie einen neuen Bugreport für OpenKeychain.</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> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">Ein Teil der geladenen Datei ist ein gültiges OpenPGP Objekt aber kein OpenPGP Schlüssel</item> + <item quantity="other">Teile der geladenen Dateien sind gültige OpenPGP Objekte aber keine OpenPGP Schlüssel</item> + </plurals> <!--progress dialogs, usually ending in '…'--> - <string name="progress_done">fertig.</string> + <string name="progress_done">Erledigt</string> + <string name="progress_cancel">Abbrechen</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 bis zu 3 Minuten 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> @@ -287,6 +314,10 @@ <item quantity="one">Schlüssel wird exportiert…</item> <item quantity="other">Schlüssel werden exportiert…</item> </plurals> + <plurals name="progress_generating"> + <item quantity="one">erstelle Schlüssel, das kann bis zu 3 Minuten dauern…</item> + <item quantity="other">erstelle Schlüssel, das kann bis zu 3 Minuten dauern…</item> + </plurals> <string name="progress_extracting_signature_key">extrahiere Signaturschlüssel…</string> <string name="progress_extracting_key">extrahiere Schlüssel…</string> <string name="progress_preparing_streams">Datenstrom wird vorbereitet…</string> @@ -317,6 +348,7 @@ <string name="compression_very_slow">sehr langsam</string> <!--Help--> <string name="help_tab_start">Start</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC-Beam</string> <string name="help_tab_changelog">Changelog</string> <string name="help_tab_about">Über</string> @@ -338,6 +370,10 @@ <string name="import_nfc_help_button">Hilfe</string> <string name="import_clipboard_button">Füge den Schlüssel aus der Zwischenablage ein</string> <!--Intent labels--> + <string name="intent_decrypt_file">Datei mit OpenKeychain entschlüsseln</string> + <string name="intent_import_key">Schlüssel mit OpenKeychain importieren</string> + <string name="intent_send_encrypt">Mit OpenKeychain verschlüsseln</string> + <string name="intent_send_decrypt">Mit OpenKeychain entschlüsseln</string> <!--Remote API--> <string name="api_no_apps">Keine registrierten Anwendungen vorhanden!\n\nAnwendungen von Dritten können Zugriff auf OpenKeychain erbitten. Nachdem Zugriff gewährt wurde, werden diese hier aufgelistet.</string> <string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string> @@ -374,6 +410,7 @@ <string name="key_list_empty_button_create">deinen eigenen Schlüssel erstellst</string> <string name="key_list_empty_button_import">existierende Schlüssel importierst.</string> <!--Key view--> + <string name="key_view_action_edit">Diesen Schlüssel bearbeiten</string> <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> <string name="key_view_tab_main">Info</string> @@ -387,4 +424,12 @@ <string name="nav_apps">Registrierte Anwendungen</string> <string name="drawer_open">Menu öffnen</string> <string name="drawer_close">Menu schließen</string> + <string name="edit">Bearbeiten</string> + <string name="my_keys">Meine Schlüssel</string> + <string name="label_secret_key">Geheime Schlüssel</string> + <string name="secret_key_yes">verfügbar</string> + <string name="secret_key_no">nicht verfügbar</string> + <string name="section_uids_to_sign">Benutzer-IDs, die beglaubigt werden sollen</string> + <string name="progress_re_adding_certs">Wiederhinzufügen der Zertifikate</string> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-el/strings.xml b/OpenPGP-Keychain/src/main/res/values-el/strings.xml new file mode 100644 index 000000000..094dfe28a --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-el/strings.xml @@ -0,0 +1,54 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_select_recipients">Επιλογή Δημόσιου Κλειδιού</string> + <string name="title_select_secret_key">Επιλογή Ιδιωτικού Κλειδιού</string> + <string name="title_authentication">Κωδικός</string> + <string name="title_create_key">Δημιουργία Κλειδιού</string> + <string name="title_edit_key">Επεξεργασία Κλειδιού</string> + <string name="title_preferences">Επιλογές</string> + <!--section--> + <!--button--> + <string name="btn_sign">Υπόγραψε</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">ΟΚ</string> + <string name="btn_change_passphrase">Αλλαγή κωδικού</string> + <string name="btn_set_passphrase">Επέλεξε Κωδικό</string> + <!--menu--> + <string name="menu_delete_key">Διαγραφής κλειδιού</string> + <string name="menu_create_key">Δημιουργίας κλειδιού</string> + <!--label--> + <string name="label_sign">Υπόγραψε</string> + <string name="label_message">Μήνυμα</string> + <string name="label_file">Αρχείο</string> + <string name="label_passphrase">Κωδικός</string> + <string name="label_passphrase_again">Ξανά</string> + <string name="label_algorithm">Αλγόριθμος</string> + <string name="label_encryption_algorithm">Αλγόριθμος κρυπτογράφησης</string> + <string name="label_asymmetric">Δημόσιο κλειδί</string> + <string name="label_symmetric">Κωδικός</string> + <string name="label_key_size">Μέγεθος κλειδιού</string> + <string name="label_email">Ηλεκτρονικό ταχυδρομίο</string> + <string name="unknown_status"></string> + <!--choice--> + <!--sentences--> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <!--progress dialogs, usually ending in '…'--> + <!--action strings--> + <!--key bit length selections--> + <!--compression--> + <!--Help--> + <!--Import--> + <!--Intent labels--> + <!--Remote API--> + <!--Share--> + <!--Key list--> + <!--Key view--> + <!--Navigation Drawer--> + <!--hints--> +</resources> 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 d1f0bd75b..ce365b776 100644 --- a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml @@ -10,9 +10,8 @@ <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_change_passphrase">Cambiar contraseña</string> <string name="title_set_passphrase">Establecer contraseña</string> - <string name="title_send_email">Enviar correo electrónico…</string> + <string name="title_send_email">Enviar correo electrónico...</string> <string name="title_encrypt_to_file">Cifrar a archivo</string> <string name="title_decrypt_to_file">Descifrar a archivo</string> <string name="title_import_keys">Importar claves</string> @@ -98,4 +97,5 @@ <!--Key list--> <!--Key view--> <!--Navigation Drawer--> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenPGP-Keychain/src/main/res/values-es/strings.xml index de680337f..d7436e02d 100644 --- a/OpenPGP-Keychain/src/main/res/values-es/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-es/strings.xml @@ -13,9 +13,10 @@ <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_passphrase">Cambiar la frase de contraseña</string> + <string name="title_change_passphrase">Cambiar 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_send_email">Enviar email...</string> + <string name="title_send_file">Enviar archivo...</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> @@ -61,8 +62,10 @@ <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_share">Compartir con...</string> <string name="btn_lookup_key">Buscar clave</string> + <string name="btn_encryption_advanced_settings_show">Mostrar ajustes avanzados</string> + <string name="btn_encryption_advanced_settings_hide">Ocultar ajustes avanzados</string> <!--menu--> <string name="menu_preferences">Ajustes</string> <string name="menu_help">Ayuda</string> @@ -71,19 +74,21 @@ <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_secret_keys">Exportar todas las claves secretas</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_import_from_key_server">Servidor de claves...</string> + <string name="menu_key_server">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">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> @@ -91,7 +96,8 @@ <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> + <string name="menu_encrypt_to">Cifrar hacia...</string> + <string name="menu_select_all">Seleccionar todo</string> <!--label--> <string name="label_sign">Firmar</string> <string name="label_message">Mensaje</string> @@ -104,6 +110,7 @@ <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_share_after_encryption">Compartir después del cifrado</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> @@ -122,9 +129,12 @@ <string name="label_name">Nombre</string> <string name="label_comment">Comentario</string> <string name="label_email">Email</string> + <string name="label_sign_user_id">Firmar Id de usuario</string> + <string name="label_sign_email">Firmar correo</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> + <string name="expiry_date_dialog_title">Establer la fecha de vencimiento</string> <plurals name="select_keys_button"> <item quantity="one">%d seleccionado</item> <item quantity="other">%d seleccionados</item> @@ -132,11 +142,17 @@ <string name="user_id_no_name"><sin nombre></string> <string name="none"><ninguna></string> <string name="no_key"><sin clave></string> + <string name="no_email"><No hay un email></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> + <string name="user_id">ID de usuario</string> + <plurals name="n_contacts"> + <item quantity="one">1 contacto</item> + <item quantity="other">%d contactos</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d servidor de claves</item> <item quantity="other">%d servidores de claves</item> @@ -163,7 +179,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Abrir…</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> @@ -192,6 +208,9 @@ <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> + <string name="public_key_deletetion_confirmation">¿Quieres realmente borrar la clave PÚBLICA \'%s\'?\n¡No podrás deshacerlo!</string> + <string name="secret_key_delete_text">¿Borrar claves secretas?</string> + <string name="also_export_secret_keys">¿Exportar también las claves secretas?</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> @@ -213,6 +232,7 @@ <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_creation_weak_rsa_info">Nota: generar una clave RSA de longitud 1024-bit o menos está considerado inseguro y desactivado para generar nuevas claves.</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> @@ -244,6 +264,7 @@ <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_no_email">no se ha encontrado un email</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> @@ -269,46 +290,56 @@ <string name="error_keyserver_insufficient_query">Consulta al servidor insuficiente</string> <string name="error_keyserver_query">La consulta al servidor de claves ha fallado</string> <string name="error_keyserver_too_many_responses">Demasiadas respuestas</string> + <string name="error_import_file_no_content">El archivo está vacio</string> + <string name="error_generic_report_bug">Ha ocurrido un error genérico, por favor, informa de este bug a OpenKeychain</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> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">parte del archivo cargado es un objeto OpenPGP válido pero no una clave OpenPGP</item> + <item quantity="other">partes del archivo cargado son objetos OpenPGP válidos pero no claves OpenPGP</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> + <string name="progress_done">Hecho.</string> + <string name="progress_cancel">Cancelar</string> + <string name="progress_saving">guardando...</string> + <string name="progress_importing">importando...</string> + <string name="progress_exporting">exportando...</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> + <item quantity="one">exportando clave...</item> + <item quantity="other">exportando claves...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="one">generando clave, esto puede tardar más de 3 minutos...</item> + <item quantity="other">generando claves, esto puede tardar más de 3 minutos...</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_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> + <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> + <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> @@ -319,6 +350,7 @@ <string name="compression_very_slow">muy lento</string> <!--Help--> <string name="help_tab_start">Comenzar</string> + <string name="help_tab_faq">FAQ</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> @@ -346,6 +378,8 @@ <string name="intent_send_decrypt">Descifrar con OpenKeychain</string> <!--Remote API--> <string name="api_no_apps">¡No hay aplicaciones registradas!\n\nLas aplicaciones de terceros pueden pedir permiso de acceso a OpenKeychain. Después de obtener acceso, serán enumeradas aquí.</string> + <string name="api_settings_show_info">Mostrar información avanzada</string> + <string name="api_settings_hide_info">Ocultar información avanzada</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> @@ -355,6 +389,8 @@ <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_settings_accounts">Cuentas</string> + <string name="api_settings_accounts_empty">No hay cuentas asociadas a esta aplicación.</string> <string name="api_register_text">La aplicación mostrada solicita acceso a OpenKeychain.\n¿Permitir el acceso?\n\nAVISO: Si no sabes por qué aparece esta pantalla, ¡deniega el acceso! Puedes revocarlo después usando la pantalla \'Aplicaciones registradas\'.</string> <string name="api_register_allow">Permitir el acceso</string> <string name="api_register_disallow">Denegar el acceso</string> @@ -374,12 +410,13 @@ <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_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_edit">Editar esta clave</string> <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> @@ -393,4 +430,13 @@ <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> + <string name="edit">Editar</string> + <string name="my_keys">Mis claves</string> + <string name="label_secret_key">Claves secretas</string> + <string name="secret_key_yes">disponible</string> + <string name="secret_key_no">no disponible</string> + <string name="section_uids_to_sign">IDs de usuario para firmar</string> + <string name="progress_re_adding_certs">Nueva aplicación de certificados</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Escribe aquí el mensaje que quieras cifrar...</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-et/strings.xml b/OpenPGP-Keychain/src/main/res/values-et/strings.xml new file mode 100644 index 000000000..04570b4b6 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-et/strings.xml @@ -0,0 +1,123 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_manage_public_keys">Kontaktid</string> + <string name="title_manage_secret_keys">Salajased võtmed</string> + <string name="title_select_recipients">Vali avalik võti</string> + <string name="title_select_secret_key">Vali salajane võti</string> + <string name="title_encrypt">Krüpteeri</string> + <string name="title_decrypt">Dekrüpteeri</string> + <string name="title_authentication">Salasõne</string> + <string name="title_create_key">Loo võti</string> + <string name="title_edit_key">Muuda võtit</string> + <string name="title_preferences">Seaded</string> + <string name="title_api_registered_apps">Registreeritud rakendused</string> + <string name="title_key_server_preference">Võtmeserveri seaded</string> + <string name="title_set_passphrase">Määra salasõne</string> + <string name="title_send_email">Saada kiri...</string> + <string name="title_import_keys">Impordi võtmeid</string> + <string name="title_export_key">Ekspordi võti</string> + <string name="title_export_keys">Ekspordi võtmed</string> + <string name="title_key_not_found">Võtit ei leitud</string> + <string name="title_key_server_query">Päri võtmeserverist</string> + <string name="title_send_key">Lae võtmeserverisse</string> + <string name="title_unknown_signature_key">Võõras allkirjastamise võti</string> + <string name="title_help">Abi</string> + <!--section--> + <string name="section_user_ids">Kasutaja ID-d</string> + <string name="section_keys">Võtmed</string> + <string name="section_general">Üldine</string> + <string name="section_defaults">Vaikeseaded</string> + <!--button--> + <string name="btn_sign">Allkirjasta</string> + <string name="btn_decrypt">Dekrüpteeri</string> + <string name="btn_select_encrypt_keys">Vali saajad</string> + <string name="btn_save">Salvesta</string> + <string name="btn_do_not_save">Katkesta</string> + <string name="btn_delete">Kustuta</string> + <string name="btn_set_passphrase">Määra salasõne</string> + <string name="btn_search">Otsi</string> + <string name="btn_export_to_server">Saada võtmeserverisse</string> + <string name="btn_next">Järgmine</string> + <string name="btn_back">Tagasi</string> + <!--menu--> + <string name="menu_preferences">Seaded</string> + <string name="menu_delete_key">Kustuta võti</string> + <string name="menu_create_key">Loo võti</string> + <string name="menu_search">Otsi</string> + <string name="menu_key_server">Võtmeserver...</string> + <string name="menu_update_key">Uuenda võtmeserverist</string> + <string name="menu_export_key_to_server">Saada võtmeserverisse</string> + <string name="menu_share">Jaga...</string> + <string name="menu_sign_key">Allkirjasta võti</string> + <!--label--> + <string name="label_sign">Allkirjasta</string> + <string name="label_message">Sõnum</string> + <string name="label_file">Fail</string> + <string name="label_no_passphrase">Salasõnet pole</string> + <string name="label_passphrase">Salasõne</string> + <string name="label_passphrase_again">Uuesti</string> + <string name="label_algorithm">Algoritm</string> + <string name="label_select_public_keys">Saajad</string> + <string name="label_delete_after_encryption">Kustuta peale šifreerimist</string> + <string name="label_hash_algorithm">Räsialgoritm</string> + <string name="label_asymmetric">Avalik võti</string> + <string name="label_symmetric">Salasõne</string> + <string name="label_passphrase_cache_ttl">Salasõne puhverdus</string> + <string name="label_key_servers">Võtmeserverid</string> + <string name="label_creation">Loodud</string> + <string name="label_expiry">Aegub</string> + <string name="label_usage">Kasutusvaldkond</string> + <string name="label_key_size">Võtmepikkus</string> + <string name="label_name">Nimi</string> + <string name="label_comment">Kommentaar</string> + <string name="label_email">E-mail</string> + <string name="unknown_status"></string> + <string name="expired">aegunud</string> + <string name="fingerprint">Sõrmejälg:</string> + <string name="secret_key">Salajane võti:</string> + <!--choice--> + <string name="choice_sign_only">Ainult allkirjastamine</string> + <string name="choice_encrypt_only">Ainult krüpteerimine</string> + <string name="choice_sign_and_encrypt">Allkirjastamine ja krüpteerimine</string> + <string name="choice_15secs">15 sekundit</string> + <string name="choice_1min">1 minut</string> + <string name="choice_3mins">3 minutit</string> + <string name="choice_5mins">5 minutit</string> + <string name="choice_10mins">10 minutit</string> + <string name="choice_20mins">20 minutit</string> + <string name="choice_40mins">40 minutit</string> + <string name="choice_1hour">1 tund</string> + <string name="choice_2hours">2 tundi</string> + <string name="choice_4hours">4 tundi</string> + <string name="choice_8hours">8 tundi</string> + <string name="dsa">DSA</string> + <string name="elgamal">ElGamal</string> + <string name="rsa">RSA</string> + <string name="filemanager_title_open">Ava...</string> + <string name="warning">Hoiatus</string> + <string name="error">Viga</string> + <string name="error_message">Viga: %s</string> + <!--sentences--> + <string name="wrong_passphrase">Vale salasõne</string> + <string name="set_a_passphrase">Määra enne salasõne.</string> + <string name="passphrases_do_not_match">Salasõned ei ühti.</string> + <string name="passphrase_must_not_be_empty">Tühi salasõne pole lubatud.</string> + <string name="passphrase_for_symmetric_encryption">Sümmeetriline krüpteering</string> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <!--progress dialogs, usually ending in '…'--> + <!--action strings--> + <!--key bit length selections--> + <!--compression--> + <!--Help--> + <!--Import--> + <!--Intent labels--> + <!--Remote API--> + <!--Share--> + <!--Key list--> + <!--Key view--> + <!--Navigation Drawer--> + <!--hints--> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml b/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml new file mode 100644 index 000000000..3d00a143f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <!--section--> + <!--button--> + <!--menu--> + <!--label--> + <string name="unknown_status"></string> + <!--choice--> + <!--sentences--> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <!--progress dialogs, usually ending in '…'--> + <!--action strings--> + <!--key bit length selections--> + <!--compression--> + <!--Help--> + <!--Import--> + <!--Intent labels--> + <!--Remote API--> + <!--Share--> + <!--Key list--> + <!--Key view--> + <!--Navigation Drawer--> + <!--hints--> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml index aa9b59287..6c0d526d4 100644 --- a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-fr/strings.xml @@ -13,9 +13,10 @@ <string name="title_preferences">Préférences</string> <string name="title_api_registered_apps">Applications enregistrées</string> <string name="title_key_server_preference">Préférences du serveur de clefs</string> - <string name="title_change_passphrase">Changer la phrase de passe</string> + <string name="title_change_passphrase">Modifier 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> + <string name="title_send_email">Envoyer un courriel...</string> + <string name="title_send_file">Envoyer un fichier...</string> <string name="title_encrypt_to_file">Chiffrer vers un fichier</string> <string name="title_decrypt_to_file">Déchiffrer vers un fichier</string> <string name="title_import_keys">importer des clefs</string> @@ -61,8 +62,10 @@ <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_share">Partager avec...</string> <string name="btn_lookup_key">Rechercher la clef</string> + <string name="btn_encryption_advanced_settings_show">Afficher les paramètres avancés</string> + <string name="btn_encryption_advanced_settings_hide">Masquer les paramètres avancés</string> <!--menu--> <string name="menu_preferences">Paramètres</string> <string name="menu_help">Aide</string> @@ -71,19 +74,21 @@ <string name="menu_import">Importer</string> <string name="menu_import_from_nfc">Importer avec NFC</string> <string name="menu_export_keys">Exporter toutes les clefs</string> + <string name="menu_export_secret_keys">Exporter toutes les clefs secrètes</string> <string name="menu_export_key">Exporter vers un fichier</string> <string name="menu_delete_key">Supprimer la clef</string> <string name="menu_create_key">Créer une clef</string> <string name="menu_create_key_expert">Créer une clef (expert)</string> <string name="menu_search">Rechercher</string> - <string name="menu_key_server">Importer depuis le serveur de clefs</string> + <string name="menu_import_from_key_server">Serveur de clefs</string> + <string name="menu_key_server">Serveur de clefs...</string> <string name="menu_update_key">Mettre à jour depuis le serveur de clefs</string> <string name="menu_export_key_to_server">Téléverser vers le serveur de clefs</string> - <string name="menu_share">Partager</string> - <string name="menu_share_title_fingerprint">Partager l\'empreinte…</string> - <string name="menu_share_title">Partager la clef entière…</string> - <string name="menu_share_default_fingerprint">avec…</string> - <string name="menu_share_default">avec…</string> + <string name="menu_share">Partager...</string> + <string name="menu_share_title_fingerprint">Partager l\'empreinte...</string> + <string name="menu_share_title">Partager la clef entière...</string> + <string name="menu_share_default_fingerprint">avec...</string> + <string name="menu_share_default">avec...</string> <string name="menu_share_qr_code">par un code QR</string> <string name="menu_share_qr_code_fingerprint">par un code QR</string> <string name="menu_share_nfc">par la NFC</string> @@ -91,7 +96,8 @@ <string name="menu_sign_key">Signer la clef</string> <string name="menu_beam_preferences">Paramètres Beam</string> <string name="menu_key_edit_cancel">Annuler</string> - <string name="menu_encrypt_to">Chiffrer vers…</string> + <string name="menu_encrypt_to">Chiffrer vers...</string> + <string name="menu_select_all">Tout sélectionner</string> <!--label--> <string name="label_sign">Signer</string> <string name="label_message">Message</string> @@ -104,6 +110,7 @@ <string name="label_select_public_keys">Destinataires</string> <string name="label_delete_after_encryption">Supprimer après le chiffrement</string> <string name="label_delete_after_decryption">Supprimer après le chiffrement</string> + <string name="label_share_after_encryption">Partager après chiffrement</string> <string name="label_encryption_algorithm">Algorithme de chiffrement</string> <string name="label_hash_algorithm">Algorithme de hachage</string> <string name="label_asymmetric">Clef publique</string> @@ -122,9 +129,12 @@ <string name="label_name">Nom</string> <string name="label_comment">Commentaire</string> <string name="label_email">Courriel</string> + <string name="label_sign_user_id">Signer l\'ID utilisateur</string> + <string name="label_sign_email">Signer le courriel</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> + <string name="expiry_date_dialog_title">Définir une date d\'expiration</string> <plurals name="select_keys_button"> <item quantity="one">%d choisie</item> <item quantity="other">%d choisies</item> @@ -132,11 +142,17 @@ <string name="user_id_no_name"><aucun nom></string> <string name="none"><aucune></string> <string name="no_key"><pas de clef></string> + <string name="no_email"><aucun courriel></string> <string name="unknown_status"></string> <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> + <string name="user_id">ID utilisateur</string> + <plurals name="n_contacts"> + <item quantity="one">1 contact</item> + <item quantity="other">%d contacts</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d serveur de clefs</item> <item quantity="other">%d serveurs de clefs</item> @@ -163,7 +179,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Ouvrir…</string> + <string name="filemanager_title_open">Ouvrir...</string> <string name="warning">Avertissement</string> <string name="error">Erreur</string> <string name="error_message">Erreur : %s</string> @@ -192,6 +208,9 @@ <string name="key_deletion_confirmation">Voulez-vous vraiment supprimer la clef %s ?\nVous ne pourrez pas la restituer !</string> <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs choisies ?\nCeci est irréversible !</string> <string name="secret_key_deletion_confirmation">Voulez-vous vraiment supprimer la clef SECRÈTE %s ?\nVous ne pourrez pas la restituer !</string> + <string name="public_key_deletetion_confirmation">Voulez-vous vraiment supprimer la clef PUBLIQUE « %s » ?\nVous ne pourrez pas la restituer !</string> + <string name="secret_key_delete_text">Supprimer les clefs privées ?</string> + <string name="also_export_secret_keys">Exporter aussi les clefs secrètes?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">%d clef ajoutée avec succès</item> <item quantity="other">%d clefs ajoutées avec succès</item> @@ -213,6 +232,7 @@ <string name="keys_exported">%d clefs exportées avec succès.</string> <string name="no_keys_exported">Aucune clef exportée.</string> <string name="key_creation_el_gamal_info">Note : seules les sous-clefs prennent en charge ElGamal, et pour ElGamal la taille de clef la plus proche de 1 536, 2 048, 3 072, 4 096 ou 8 192 sera utilisée.</string> + <string name="key_creation_weak_rsa_info">Note : générer des clefs RSA d\'une longueur de 1024 bits ou moins est considéré non sécuritaire et est désactivé pour la génération de nouvelles clefs.</string> <string name="key_not_found">Clef %08X introuvable.</string> <plurals name="keys_found"> <item quantity="one">%d clef trouvée.</item> @@ -244,6 +264,7 @@ <string name="error_master_key_must_not_be_el_gamal">la clef maîtresse ne peut être une clef ElGama</string> <string name="error_unknown_algorithm_choice">choix d\'algorhitme inconnu</string> <string name="error_user_id_needs_a_name">vous devez spécifier un nom</string> + <string name="error_user_id_no_email">aucun courriel trouvé</string> <string name="error_user_id_needs_an_email_address">vous devez spécifier une adresse courriel</string> <string name="error_key_needs_a_user_id">vous avez besoin d\'au moins un ID utilisateur</string> <string name="error_main_user_id_must_not_be_empty">l\'ID utilisateur principal ne doit pas être vide</string> @@ -269,46 +290,56 @@ <string name="error_keyserver_insufficient_query">Requête serveur insuffisante</string> <string name="error_keyserver_query">Échec lors de l\'interrogation du serveur de clefs</string> <string name="error_keyserver_too_many_responses">Trop de réponses</string> + <string name="error_import_file_no_content">Le fichier n\'a pas de contenu</string> + <string name="error_generic_report_bug">Une erreur générique est survenue, veuillez créer un nouveau rapport de bogue pour OpenKeychain.</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> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">une partie du fichier chargé est un objet OpenPGP valide mais pas une clef OpenPGP</item> + <item quantity="other">certaines parties du fichier chargé sont des objets OpenPGP valides mais pas des clefs OpenPGP</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 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_done">Terminé.</string> + <string name="progress_cancel">Annuler</string> + <string name="progress_saving">sauvegarde...</string> + <string name="progress_importing">importation...</string> + <string name="progress_exporting">exportation...</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> <plurals name="progress_exporting_key"> - <item quantity="one">exportation de la clef…</item> - <item quantity="other">exportation des clefs…</item> + <item quantity="one">exportation de la clef...</item> + <item quantity="other">exportation des clefs...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="one">génération de la clef, ceci peut prendre jusqu\'à 3 min...</item> + <item quantity="other">génération des clefs, ceci peut prendre jusqu\'à 3 min...</item> </plurals> - <string name="progress_extracting_signature_key">extraction de la clef de signature…</string> - <string name="progress_extracting_key">extraction de la clef…</string> - <string name="progress_preparing_streams">préparation des flux…</string> - <string name="progress_encrypting">chiffrement des données…</string> - <string name="progress_decrypting">déchiffrement des données…</string> - <string name="progress_preparing_signature">préparation de la signature…</string> - <string name="progress_generating_signature">génération de la signature…</string> - <string name="progress_processing_signature">traitement de la signature…</string> - <string name="progress_verifying_signature">vérification de la signature…</string> - <string name="progress_signing">signature…</string> - <string name="progress_reading_data">lecture des données…</string> - <string name="progress_finding_key">recherche de la clef…</string> - <string name="progress_decompressing_data">décompression des données…</string> - <string name="progress_verifying_integrity">vérification de l\'intégrité…</string> - <string name="progress_deleting_securely">suppression sûre de « %s »…</string> - <string name="progress_querying">interrogation…</string> + <string name="progress_extracting_signature_key">extraction de la clef de signature...</string> + <string name="progress_extracting_key">extraction de la clef...</string> + <string name="progress_preparing_streams">préparation des flux...</string> + <string name="progress_encrypting">chiffrement des données...</string> + <string name="progress_decrypting">déchiffrement des données...</string> + <string name="progress_preparing_signature">préparation de la signature...</string> + <string name="progress_generating_signature">génération de la signature...</string> + <string name="progress_processing_signature">traitement de la signature...</string> + <string name="progress_verifying_signature">vérification de la signature...</string> + <string name="progress_signing">signature...</string> + <string name="progress_reading_data">lecture des données...</string> + <string name="progress_finding_key">recherche de la clef...</string> + <string name="progress_decompressing_data">décompression des données...</string> + <string name="progress_verifying_integrity">vérification de l\'intégrité...</string> + <string name="progress_deleting_securely">suppression sûre de « %s »...</string> + <string name="progress_querying">interrogation...</string> <!--action strings--> <string name="hint_public_keys">Rechercher des clefs publiques</string> <string name="hint_secret_keys">Rechercher des clefs secrètes</string> - <string name="action_share_key_with">Partager la clef avec…</string> + <string name="action_share_key_with">Partager la clef avec...</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -319,6 +350,7 @@ <string name="compression_very_slow">très lent</string> <!--Help--> <string name="help_tab_start">Commencer</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Journal des changements</string> <string name="help_tab_about">À propos de</string> @@ -346,6 +378,8 @@ <string name="intent_send_decrypt">Déchiffrer avec OpenKeychain</string> <!--Remote API--> <string name="api_no_apps">Aucune application enregistrée !\n\nLes applications tierces peuvent demander l\'accès à OpenKeychain. Après avoir autorisé l\'accès, elles seront listées ici.</string> + <string name="api_settings_show_info">Afficher les informations avancées</string> + <string name="api_settings_hide_info">Masquer les informations avancées</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> @@ -355,6 +389,8 @@ <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_settings_accounts">Comptes</string> + <string name="api_settings_accounts_empty">Aucun compte n\'est attaché à cette application.</string> <string name="api_register_text">L\'application affichée demande l\'accès à OpenKeychain.\nPermettre l\'accès ?\n\nAvertissement : si vous ne savez pas pourquoi cet écran est apparu, refusez 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> @@ -374,12 +410,13 @@ <item quantity="one">1 clef choisie</item> <item quantity="other">%d clefs choisies</item> </plurals> - <string name="key_list_empty_text1">Aucune clef encore disponible…</string> + <string name="key_list_empty_text1">Aucune clef encore disponible...</string> <string name="key_list_empty_text2">Vous pouvez commencer par</string> <string name="key_list_empty_text3">ou</string> <string name="key_list_empty_button_create">créer votre propre clef</string> <string name="key_list_empty_button_import">Importer des clefs.</string> <!--Key view--> + <string name="key_view_action_edit">Modifier cette clef</string> <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> @@ -393,4 +430,13 @@ <string name="nav_apps">Applis enregistrées</string> <string name="drawer_open">Ouvrir le tiroir de navigation</string> <string name="drawer_close">Fermer le tiroir de navigation</string> + <string name="edit">Modifier</string> + <string name="my_keys">Mes clefs</string> + <string name="label_secret_key">Clef secrète</string> + <string name="secret_key_yes">disponible</string> + <string name="secret_key_no">non disponible</string> + <string name="section_uids_to_sign">ID utilisateur pour signer</string> + <string name="progress_re_adding_certs">Nouvel application des certificats</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Écrire le message à chiffrer ici...</string> </resources> 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 825115bc9..23dd432a4 100644 --- a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml @@ -13,9 +13,10 @@ <string name="title_preferences">Preferenze</string> <string name="title_api_registered_apps">App Registrate</string> <string name="title_key_server_preference">Preferenze Server delle Chiavi</string> - <string name="title_change_passphrase">Cambia Frase di Accesso</string> + <string name="title_change_passphrase">Cambia Frase Di Accesso</string> <string name="title_set_passphrase">Imposta Frase di Accesso</string> - <string name="title_send_email">Invia Mail…</string> + <string name="title_send_email">Invia Mail...</string> + <string name="title_send_file">Invia file...</string> <string name="title_encrypt_to_file">Codifica File</string> <string name="title_decrypt_to_file">Decodifica File</string> <string name="title_import_keys">Importa Chiavi</string> @@ -61,8 +62,10 @@ <string name="btn_next">Prossimo</string> <string name="btn_back">Precedente</string> <string name="btn_clipboard">Appunti</string> - <string name="btn_share">Condividi con…</string> + <string name="btn_share">Condividi con...</string> <string name="btn_lookup_key">Chiave di ricerca</string> + <string name="btn_encryption_advanced_settings_show">Mostra impostazioni avanzate</string> + <string name="btn_encryption_advanced_settings_hide">Nascondi impostazioni avanzate</string> <!--menu--> <string name="menu_preferences">Impostazioni</string> <string name="menu_help">Aiuto</string> @@ -71,19 +74,21 @@ <string name="menu_import">Importa</string> <string name="menu_import_from_nfc">Importa tramite NFC</string> <string name="menu_export_keys">Esporta tutte le chiavi</string> + <string name="menu_export_secret_keys">Esporta tutte le chiavi segrete</string> <string name="menu_export_key">Esporta su un file</string> <string name="menu_delete_key">Cancella chiave</string> <string name="menu_create_key">Crea chiave</string> <string name="menu_create_key_expert">Crea chiave (esperto)</string> <string name="menu_search">Cerca</string> - <string name="menu_key_server">Importa dal server delle chiavi</string> + <string name="menu_import_from_key_server">Server delle Chiavi</string> + <string name="menu_key_server">Server delle Chiavi...</string> <string name="menu_update_key">Aggiorna dal server delle chiavi</string> <string name="menu_export_key_to_server">Carica chiave nel server</string> - <string name="menu_share">Condividi</string> - <string name="menu_share_title_fingerprint">Condivi impronta…</string> - <string name="menu_share_title">Condividi intera chiave…</string> + <string name="menu_share">Condividi...</string> + <string name="menu_share_title_fingerprint">Condivi impronta...</string> + <string name="menu_share_title">Condividi intera chiave...</string> <string name="menu_share_default_fingerprint">con..</string> - <string name="menu_share_default">con…</string> + <string name="menu_share_default">con...</string> <string name="menu_share_qr_code">con Codice QR</string> <string name="menu_share_qr_code_fingerprint">con Codice QR</string> <string name="menu_share_nfc">con NFC</string> @@ -91,7 +96,8 @@ <string name="menu_sign_key">Firma chiave</string> <string name="menu_beam_preferences">Impostazioni Beam</string> <string name="menu_key_edit_cancel">Annulla</string> - <string name="menu_encrypt_to">Codifica su…</string> + <string name="menu_encrypt_to">Codifica su...</string> + <string name="menu_select_all">Seleziona tutto</string> <!--label--> <string name="label_sign">Firma</string> <string name="label_message">Messaggio</string> @@ -104,6 +110,7 @@ <string name="label_select_public_keys">Destinatari</string> <string name="label_delete_after_encryption">Cancella Dopo Codifica</string> <string name="label_delete_after_decryption">Cancella Dopo Decodifica</string> + <string name="label_share_after_encryption">Condividi Dopo la Codifica</string> <string name="label_encryption_algorithm">Algoritmo di Codifica</string> <string name="label_hash_algorithm">Algoritmo di Hash</string> <string name="label_asymmetric">Chiave Pubblica</string> @@ -122,9 +129,12 @@ <string name="label_name">Nome</string> <string name="label_comment">Commento</string> <string name="label_email">Email</string> + <string name="label_sign_user_id">Firma ID Utente</string> + <string name="label_sign_email">Firma email</string> <string name="label_send_key">Carica chiave nel server delle chiavi selezionati dopo la certificazione</string> <string name="label_fingerprint">Impronta</string> <string name="select_keys_button_default">Seleziona</string> + <string name="expiry_date_dialog_title">Impostare la data di scadenza</string> <plurals name="select_keys_button"> <item quantity="one">%d selezionato</item> <item quantity="other">%d selezionati</item> @@ -132,11 +142,17 @@ <string name="user_id_no_name"><nessun nome></string> <string name="none"><nessuno></string> <string name="no_key"><nessuna chiave></string> + <string name="no_email"><Nessuna Email></string> <string name="unknown_status"></string> <string name="can_encrypt">puo\'; codificare</string> <string name="can_sign">puo\' firmare</string> <string name="expired">scaduto</string> <string name="revoked">revocato</string> + <string name="user_id">ID Utente</string> + <plurals name="n_contacts"> + <item quantity="one">1 contatto</item> + <item quantity="other">%d contatti</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d server delle chiavi</item> <item quantity="other">%d server delle chiavi</item> @@ -163,7 +179,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Apri…</string> + <string name="filemanager_title_open">Apri...</string> <string name="warning">Attenzione</string> <string name="error">Errore</string> <string name="error_message">Errore: %s</string> @@ -192,6 +208,9 @@ <string name="key_deletion_confirmation">Vuoi veramente eliminare la chiave \'%s\'?\nNon potrai annullare!</string> <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare le chiavi selezionate?\nNon potrai annullare!</string> <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?\nNon potrai annullare!</string> + <string name="public_key_deletetion_confirmation">Vuoi veramente eliminare la chiave PUBBLICA \'%s\'?\nNon potrai annullare!</string> + <string name="secret_key_delete_text">Eliminare le Chiavi Segrete?</string> + <string name="also_export_secret_keys">Esportare anche le chiavi segrete?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">%d chiave aggiunta correttamente</item> <item quantity="other">%d chiavi aggiunte correttamente</item> @@ -213,6 +232,7 @@ <string name="keys_exported">%d chiavi esportate correttamente.</string> <string name="no_keys_exported">Nessuna chiave esportata.</string> <string name="key_creation_el_gamal_info">Nota: solo le sottochiavi supportano ElGamal, e per ElGamal verra\' usata la grandezza chiave piu\' vicina a 1536, 2048, 3072, 4096 o 8192.</string> + <string name="key_creation_weak_rsa_info">Nota: la generazione di chiavi RSA con lunghezza pari a 1024 bit o inferiore è considerata non sicura ed è disabilitata per la generazione di nuove chiavi.</string> <string name="key_not_found">Impossibile trovare la chiave %08X.</string> <plurals name="keys_found"> <item quantity="one">Trovata %d chiave.</item> @@ -244,6 +264,7 @@ <string name="error_master_key_must_not_be_el_gamal">La chiave principale non puo\' essere ElGamal</string> <string name="error_unknown_algorithm_choice">opzione algoritmo sconosciuta</string> <string name="error_user_id_needs_a_name">devi specificare un nome</string> + <string name="error_user_id_no_email">Nessuna email trovata</string> <string name="error_user_id_needs_an_email_address">devi specificare un indirizzo email</string> <string name="error_key_needs_a_user_id">necessario almeno un id utente</string> <string name="error_main_user_id_must_not_be_empty">id utente principale non puo\' essere vuoto</string> @@ -269,46 +290,56 @@ <string name="error_keyserver_insufficient_query">Query di server insufficiente</string> <string name="error_keyserver_query">Interrogazione del server delle chiavi fallita</string> <string name="error_keyserver_too_many_responses">Troppi responsi</string> + <string name="error_import_file_no_content">Il File non ha contenuti</string> + <string name="error_generic_report_bug">Si è verificato un errore generico, si prega di creare una nuova segnalazione di errore per OpenKeychain.</string> <plurals name="error_can_not_delete_info"> <item quantity="one">Per favore cancellala dalla schermata \'Mie Chavi\'</item> <item quantity="other">Per favore cancellatele dalla schermata \'Mie Chavi\'</item> </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">parte del file caricato e\' un oggetto OpenPGP valido, ma non una chave OpenPGP</item> + <item quantity="other">parti del file caricato sono oggetti OpenPGP validi, ma non chavi OpenPGP</item> + </plurals> <!--progress dialogs, usually ending in '…'--> - <string name="progress_done">fatto.</string> - <string name="progress_saving">salvataggio…</string> - <string name="progress_importing">importazione…</string> - <string name="progress_exporting">esportazione…</string> - <string name="progress_generating">generazione chiave, richiede fino a 3 minuti…</string> - <string name="progress_building_key">fabbricazione chiave…</string> - <string name="progress_preparing_master_key">preparazione chiave principale…</string> - <string name="progress_certifying_master_key">certificazione chiave principale…</string> - <string name="progress_building_master_key">fabbricazione portachiavi principale…</string> - <string name="progress_adding_sub_keys">aggiunta sottochiavi…</string> - <string name="progress_saving_key_ring">salvataggio chiavi…</string> + <string name="progress_done">Fatto.</string> + <string name="progress_cancel">Annulla</string> + <string name="progress_saving">salvataggio...</string> + <string name="progress_importing">importazione...</string> + <string name="progress_exporting">esportazione...</string> + <string name="progress_building_key">fabbricazione chiave...</string> + <string name="progress_preparing_master_key">preparazione chiave principale...</string> + <string name="progress_certifying_master_key">certificazione chiave principale...</string> + <string name="progress_building_master_key">fabbricazione portachiavi principale...</string> + <string name="progress_adding_sub_keys">aggiunta sottochiavi...</string> + <string name="progress_saving_key_ring">salvataggio chiavi...</string> <plurals name="progress_exporting_key"> - <item quantity="one">esportazione chiave…</item> - <item quantity="other">esportazione chiavi…</item> + <item quantity="one">esportazione chiave...</item> + <item quantity="other">esportazione chiavi...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="one">generazione chiave, sono necessari fino a 3 minuti...</item> + <item quantity="other">generazione chiavi, sono necessari fino a 3 minuti...</item> </plurals> - <string name="progress_extracting_signature_key">estrazione chiavi di firma…</string> - <string name="progress_extracting_key">estrazione chiave…</string> - <string name="progress_preparing_streams">preparazione flussi…</string> - <string name="progress_encrypting">codifica dati…</string> - <string name="progress_decrypting">decodifica dati…</string> - <string name="progress_preparing_signature">preparazione firma…</string> - <string name="progress_generating_signature">generazione firma…</string> - <string name="progress_processing_signature">elaborazione firma…</string> - <string name="progress_verifying_signature">verifica firma…</string> - <string name="progress_signing">firma…</string> - <string name="progress_reading_data">lettura dati…</string> - <string name="progress_finding_key">ricerca chiave…</string> - <string name="progress_decompressing_data">decompressione dati…</string> - <string name="progress_verifying_integrity">verifica integrita\'…</string> - <string name="progress_deleting_securely">eliminazione sicura di \'%s\'…</string> - <string name="progress_querying">interrogazione…</string> + <string name="progress_extracting_signature_key">estrazione chiavi di firma...</string> + <string name="progress_extracting_key">estrazione chiave...</string> + <string name="progress_preparing_streams">preparazione flussi...</string> + <string name="progress_encrypting">codifica dati...</string> + <string name="progress_decrypting">decodifica dati...</string> + <string name="progress_preparing_signature">preparazione firma...</string> + <string name="progress_generating_signature">generazione firma...</string> + <string name="progress_processing_signature">elaborazione firma...</string> + <string name="progress_verifying_signature">verifica firma...</string> + <string name="progress_signing">firma...</string> + <string name="progress_reading_data">lettura dati...</string> + <string name="progress_finding_key">ricerca chiave...</string> + <string name="progress_decompressing_data">decompressione dati...</string> + <string name="progress_verifying_integrity">verifica integrita\'...</string> + <string name="progress_deleting_securely">eliminazione sicura di \'%s\'...</string> + <string name="progress_querying">interrogazione...</string> <!--action strings--> <string name="hint_public_keys">Ricerca Chiavi Pubbliche</string> <string name="hint_secret_keys">Cerca Chiave Privata</string> - <string name="action_share_key_with">Condividi chiave con…</string> + <string name="action_share_key_with">Condividi chiave con...</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -319,6 +350,7 @@ <string name="compression_very_slow">molto lento</string> <!--Help--> <string name="help_tab_start">Inizia</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Novita\'</string> <string name="help_tab_about">Info</string> @@ -374,12 +406,13 @@ <item quantity="one">1 chiave selezionata.</item> <item quantity="other">%d chiavi selezionate.</item> </plurals> - <string name="key_list_empty_text1">Nessuna chiave disponibile…</string> + <string name="key_list_empty_text1">Nessuna chiave disponibile...</string> <string name="key_list_empty_text2">Puoi iniziare da</string> <string name="key_list_empty_text3">o</string> <string name="key_list_empty_button_create">creazione della tua chiave</string> <string name="key_list_empty_button_import">importazione chiavi.</string> <!--Key view--> + <string name="key_view_action_edit">Modifica chiave</string> <string name="key_view_action_encrypt">Codifica a questo contatto</string> <string name="key_view_action_certify">Certifica la chiave di questo contatto</string> <string name="key_view_tab_main">Info</string> @@ -393,4 +426,13 @@ <string name="nav_apps">App Registrate</string> <string name="drawer_open">Apri drawer di navigazione</string> <string name="drawer_close">Chiudi drawer di navigazione</string> + <string name="edit">Modifica</string> + <string name="my_keys">Le Mie Chiavi</string> + <string name="label_secret_key">Chiave Segreta</string> + <string name="secret_key_yes">disponibile</string> + <string name="secret_key_no">non disponibile</string> + <string name="section_uids_to_sign">ID Utente da firmare</string> + <string name="progress_re_adding_certs">Riapplicazione certificati</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Scrivi qui il messaggio da codificare...</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml index 97d5a72f4..f28f73262 100644 --- a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-ja/strings.xml @@ -15,7 +15,8 @@ <string name="title_key_server_preference">鍵サーバ設定</string> <string name="title_change_passphrase">パスフレーズの変更</string> <string name="title_set_passphrase">パスフレーズの設定</string> - <string name="title_send_email">メールの送信…</string> + <string name="title_send_email">メールの送信...</string> + <string name="title_send_file">ファイルの送信...</string> <string name="title_encrypt_to_file">暗号化してファイルに</string> <string name="title_decrypt_to_file">復号化してファイルに</string> <string name="title_import_keys">鍵のインポート</string> @@ -61,8 +62,10 @@ <string name="btn_next">次</string> <string name="btn_back">戻る</string> <string name="btn_clipboard">クリップボード</string> - <string name="btn_share">共有…</string> + <string name="btn_share">...で共有</string> <string name="btn_lookup_key">鍵検出</string> + <string name="btn_encryption_advanced_settings_show">拡張設定を表示</string> + <string name="btn_encryption_advanced_settings_hide">拡張設定を隠す</string> <!--menu--> <string name="menu_preferences">設定</string> <string name="menu_help">ヘルプ</string> @@ -71,19 +74,21 @@ <string name="menu_import">インポート</string> <string name="menu_import_from_nfc">NFCからインポート</string> <string name="menu_export_keys">すべての鍵のエクスポート</string> + <string name="menu_export_secret_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_import_from_key_server">鍵サーバ</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">共有...</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> @@ -91,7 +96,8 @@ <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> + <string name="menu_encrypt_to">暗号化...</string> + <string name="menu_select_all">すべて選択</string> <!--label--> <string name="label_sign">署名</string> <string name="label_message">メッセージ</string> @@ -104,6 +110,7 @@ <string name="label_select_public_keys">受信者</string> <string name="label_delete_after_encryption">暗号化後に削除</string> <string name="label_delete_after_decryption">復号化後に削除</string> + <string name="label_share_after_encryption">暗号化して共有</string> <string name="label_encryption_algorithm">暗号化アルゴリズム</string> <string name="label_hash_algorithm">ハッシュアルゴリズム</string> <string name="label_asymmetric">公開鍵</string> @@ -122,20 +129,28 @@ <string name="label_name">名前</string> <string name="label_comment">コメント</string> <string name="label_email">Eメールアドレス</string> + <string name="label_sign_user_id">署名ユーザーID</string> + <string name="label_sign_email">メールを署名</string> <string name="label_send_key">証明後選択した鍵サーバに鍵をアップロード</string> <string name="label_fingerprint">指紋</string> <string name="select_keys_button_default">選択</string> + <string name="expiry_date_dialog_title">期限日時を設定</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="no_email"><メールなし></string> <string name="unknown_status"></string> <string name="can_encrypt">暗号化可能</string> <string name="can_sign">署名可能</string> <string name="expired">期限切れ</string> <string name="revoked">破棄</string> + <string name="user_id">ユーザーID</string> + <plurals name="n_contacts"> + <item quantity="other">%d個の連絡先</item> + </plurals> <plurals name="n_key_servers"> <item quantity="other">%d の鍵サーバ</item> </plurals> @@ -161,7 +176,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">開く…</string> + <string name="filemanager_title_open">開く...</string> <string name="warning">注意</string> <string name="error">エラー</string> <string name="error_message">エラー: %s</string> @@ -190,6 +205,9 @@ <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> + <string name="public_key_deletetion_confirmation">公開鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string> + <string name="secret_key_delete_text">秘密鍵を削除しますか?</string> + <string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string> <plurals name="keys_added_and_updated_1"> <item quantity="other">%d の鍵を追加しました</item> </plurals> @@ -207,6 +225,7 @@ <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_creation_weak_rsa_info">付記: 長さ1024bitかそれ以下で生成されたRSA鍵は安全とはみなされず、新な鍵の生成は無効にされています。</string> <string name="key_not_found">鍵 %08X は見付かりませんでした。</string> <plurals name="keys_found"> <item quantity="other">%d の鍵を発見。</item> @@ -236,6 +255,7 @@ <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_no_email">メールが見付かりません</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> @@ -261,44 +281,52 @@ <string name="error_keyserver_insufficient_query">サーバへのクエリーが不足しています</string> <string name="error_keyserver_query">鍵サーバへのクエリーが失敗</string> <string name="error_keyserver_too_many_responses">レスポンスが多すぎます</string> + <string name="error_import_file_no_content">ファイルに内容がありません</string> + <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string> <plurals name="error_can_not_delete_info"> <item quantity="other">\'自分の鍵\'画面から削除してください!</item> </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</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> + <string name="progress_cancel">キャンセル</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_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> + <item quantity="other">鍵のエクスポート...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="other">鍵の生成中、最大3分ほどかかります...</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_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> + <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> + <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> @@ -309,6 +337,7 @@ <string name="compression_very_slow">とても遅い</string> <!--Help--> <string name="help_tab_start">開始</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Changelog</string> <string name="help_tab_about">これについて</string> @@ -336,7 +365,7 @@ <!--Remote API--> <string name="api_no_apps">登録されていないアプリケーション!\n\nサードパーティアプリケーションはOpenKeychainにアクセスを要求できます。アクセスを与えた後、それらはここにリストされます。</string> <string name="api_settings_show_advanced">拡張設定を表示</string> - <string name="api_settings_hide_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> @@ -362,12 +391,13 @@ <plurals name="key_list_selected_keys"> <item quantity="other">%d の鍵を選択。</item> </plurals> - <string name="key_list_empty_text1">すでにその鍵は存在しません…</string> + <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_edit">この鍵の編集</string> <string name="key_view_action_encrypt">この連絡先を暗号化</string> <string name="key_view_action_certify">この連絡先の鍵を検証</string> <string name="key_view_tab_main">情報</string> @@ -381,4 +411,13 @@ <string name="nav_apps">登録済みのアプリ</string> <string name="drawer_open">ナビゲーションドロワーを開く</string> <string name="drawer_close">ナビゲーションドロワーを閉める</string> + <string name="edit">編集</string> + <string name="my_keys">自分の鍵</string> + <string name="label_secret_key">秘密鍵</string> + <string name="secret_key_yes">存在する</string> + <string name="secret_key_no">存在しない</string> + <string name="section_uids_to_sign">署名に使うユーザーID</string> + <string name="progress_re_adding_certs">検証を再適用する</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">ここに書いたメッセージを暗号化..</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-large/dimens.xml b/OpenPGP-Keychain/src/main/res/values-large/dimens.xml new file mode 100644 index 000000000..192a4bb99 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-large/dimens.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="drawer_content_padding">240dp</dimen> +</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 863932a80..a7f674ea0 100644 --- a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml @@ -10,9 +10,8 @@ <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_change_passphrase">Wachtwoord wijzigen</string> <string name="title_set_passphrase">Wachtwoord instellen</string> - <string name="title_send_email">E-mail verzenden…</string> + <string name="title_send_email">E-mail verzenden...</string> <string name="title_encrypt_to_file">Versleutelen naar bestand</string> <string name="title_decrypt_to_file">Ontsleutelen naar bestand</string> <string name="title_import_keys">Sleutels importeren</string> @@ -109,7 +108,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Openen…</string> + <string name="filemanager_title_open">Openen...</string> <string name="warning">Waarschuwing</string> <string name="error">Fout</string> <string name="error_message">Fout: %s</string> @@ -171,35 +170,34 @@ <string name="error_nfc_needed">Uw apparaat biedt geen ondersteuning voor NFC</string> <string name="error_nothing_import">Niets te importeren</string> <!--progress dialogs, usually ending in '…'--> - <string name="progress_done">gereed.</string> - <string name="progress_saving">opslaan…</string> - <string name="progress_importing">importeren…</string> - <string name="progress_exporting">exporteren…</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_extracting_signature_key">ondertekeningssleutel uitpakken…</string> - <string name="progress_extracting_key">sleutel uitpakken…</string> - <string name="progress_preparing_streams">streams voorbereiden…</string> - <string name="progress_encrypting">gegevens versleutelen…</string> - <string name="progress_decrypting">gegevens ontsleutelen…</string> - <string name="progress_preparing_signature">handtekening voorbereiden…</string> - <string name="progress_generating_signature">handtekening genereren…</string> - <string name="progress_processing_signature">handtekening verwerken…</string> - <string name="progress_verifying_signature">handtekening verifiëren…</string> - <string name="progress_signing">ondertekenen…</string> - <string name="progress_reading_data">gegevens lezen…</string> - <string name="progress_finding_key">sleutel opzoeken…</string> - <string name="progress_decompressing_data">gegevens decomprimeren…</string> - <string name="progress_verifying_integrity">integriteit verifiëren…</string> - <string name="progress_deleting_securely">\'%s\' veilig verwijderen…</string> - <string name="progress_querying">opvragen…</string> + <string name="progress_saving">opslaan...</string> + <string name="progress_importing">importeren...</string> + <string name="progress_exporting">exporteren...</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_extracting_signature_key">ondertekeningssleutel uitpakken...</string> + <string name="progress_extracting_key">sleutel uitpakken...</string> + <string name="progress_preparing_streams">streams voorbereiden...</string> + <string name="progress_encrypting">gegevens versleutelen...</string> + <string name="progress_decrypting">gegevens ontsleutelen...</string> + <string name="progress_preparing_signature">handtekening voorbereiden...</string> + <string name="progress_generating_signature">handtekening genereren...</string> + <string name="progress_processing_signature">handtekening verwerken...</string> + <string name="progress_verifying_signature">handtekening verifiëren...</string> + <string name="progress_signing">ondertekenen...</string> + <string name="progress_reading_data">gegevens lezen...</string> + <string name="progress_finding_key">sleutel opzoeken...</string> + <string name="progress_decompressing_data">gegevens decomprimeren...</string> + <string name="progress_verifying_integrity">integriteit verifiëren...</string> + <string name="progress_deleting_securely">\'%s\' veilig verwijderen...</string> + <string name="progress_querying">opvragen...</string> <!--action strings--> <string name="hint_public_keys">Publieke sleutels zoeken</string> <string name="hint_secret_keys">Privésleutels zoeken</string> - <string name="action_share_key_with">Sleutel delen met…</string> + <string name="action_share_key_with">Sleutel delen met...</string> <!--key bit length selections--> <string name="key_size_512">512</string> <string name="key_size_1024">1024</string> @@ -237,4 +235,5 @@ <!--Key list--> <!--Key view--> <!--Navigation Drawer--> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml b/OpenPGP-Keychain/src/main/res/values-pl/strings.xml new file mode 100644 index 000000000..e31216176 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-pl/strings.xml @@ -0,0 +1,457 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <string name="title_manage_public_keys">Kontakty</string> + <string name="title_manage_secret_keys">Klucze prywatne</string> + <string name="title_select_recipients">Wybierz Klucz Publiczny</string> + <string name="title_select_secret_key">Wybierz Klucz Prywatny</string> + <string name="title_encrypt">Zaszyfruj</string> + <string name="title_decrypt">Odszyfruj</string> + <string name="title_authentication">Hasło</string> + <string name="title_create_key">Utwórz Klucz</string> + <string name="title_edit_key">Edytuj Klucz</string> + <string name="title_preferences">Właściwości</string> + <string name="title_api_registered_apps">Zarejestrowane Aplikacje</string> + <string name="title_key_server_preference">Właściwości serwera kluczy</string> + <string name="title_change_passphrase">Zmień hasło</string> + <string name="title_set_passphrase">Ustaw hasło</string> + <string name="title_send_email">Wyślij maila...</string> + <string name="title_send_file">Wyślij plik...</string> + <string name="title_encrypt_to_file">Zaszyfruj do pliku</string> + <string name="title_decrypt_to_file">Odszyfruj do pliku</string> + <string name="title_import_keys">Importuj klucze</string> + <string name="title_export_key">Eksportuj klucz</string> + <string name="title_export_keys">Eksportuj klucze</string> + <string name="title_key_not_found">Nie znaleziono klucza</string> + <string name="title_key_server_query">Wyślij zapytanie do serwera kluczy</string> + <string name="title_send_key">Wyślij do serwera kluczy</string> + <string name="title_unknown_signature_key">Nieznany klucz podpisu</string> + <string name="title_certify_key">Certyfikuj klucz</string> + <string name="title_key_details">Szczegóły klucza</string> + <string name="title_help">Pomoc</string> + <!--section--> + <string name="section_user_ids">Identyfikator użytkownika</string> + <string name="section_keys">Klucze</string> + <string name="section_general">Ogólne</string> + <string name="section_defaults">Domyślne</string> + <string name="section_advanced">Zaawansowane</string> + <string name="section_master_key">Klucz główny</string> + <string name="section_master_user_id">Główny identyfikator użytkownika</string> + <string name="section_actions">Działania</string> + <string name="section_certification_key">Twój klucz użyty do certyfikacji</string> + <string name="section_upload_key">Wyślij klucz</string> + <string name="section_key_server">Serwer kluczy</string> + <string name="section_encrypt_and_or_sign">Zaszyfruj i/lub podpisz</string> + <string name="section_decrypt_verify">Deszyfruj i weryfikuj</string> + <!--button--> + <string name="btn_sign">Podpisz</string> + <string name="btn_certify">Certyfikuj</string> + <string name="btn_decrypt">Odszyfruj</string> + <string name="btn_decrypt_verify">Deszyfruj i weryfikuj</string> + <string name="btn_select_encrypt_keys">Wybierz odbiorców</string> + <string name="btn_encrypt_file">Zaszyfruj plik</string> + <string name="btn_save">Zapisz</string> + <string name="btn_do_not_save">Anuluj</string> + <string name="btn_delete">Usuń</string> + <string name="btn_no_date">Żaden</string> + <string name="btn_okay">Ok</string> + <string name="btn_change_passphrase">Zmień hasło</string> + <string name="btn_set_passphrase">Ustaw hasło</string> + <string name="btn_search">Wyszukaj</string> + <string name="btn_export_to_server">Wyślij do serwera kluczy</string> + <string name="btn_next">Dalej</string> + <string name="btn_back">Wstecz</string> + <string name="btn_clipboard">Schowek</string> + <string name="btn_share">Podziel się z...</string> + <string name="btn_lookup_key">Klucz wyszukiwania</string> + <string name="btn_encryption_advanced_settings_show">Pokaż zaawanowane ustawienia</string> + <string name="btn_encryption_advanced_settings_hide">Ukryj zaawansowane ustawienia</string> + <!--menu--> + <string name="menu_preferences">Ustawienia</string> + <string name="menu_help">Pomoc</string> + <string name="menu_import_from_file">Zaimportuj z pliku</string> + <string name="menu_import_from_qr_code">Zaimportuj z kodu QR</string> + <string name="menu_import">Import</string> + <string name="menu_import_from_nfc">Zaimportuj przy użyciu NFC</string> + <string name="menu_export_keys">Eksportuj wszystkie klucze</string> + <string name="menu_export_secret_keys">Eksportuj wszystkie klucze prywatne</string> + <string name="menu_export_key">Eksportuj do pliku</string> + <string name="menu_delete_key">Usuń klucz</string> + <string name="menu_create_key">Stwórz klucz</string> + <string name="menu_create_key_expert">Stwórz klucz (tryb zaawansowany)</string> + <string name="menu_search">Znajdź</string> + <string name="menu_import_from_key_server">Serwer kluczy</string> + <string name="menu_key_server">Serwer kluczy...</string> + <string name="menu_update_key">Aktualizuj z serwera kluczy</string> + <string name="menu_export_key_to_server">Wyślij do serwera kluczy</string> + <string name="menu_share">Udostepnij...</string> + <string name="menu_share_title_fingerprint">Udostepnij odcisk...</string> + <string name="menu_share_title">Udostępnij cały klucz...</string> + <string name="menu_share_default_fingerprint">z...</string> + <string name="menu_share_default">z...</string> + <string name="menu_share_qr_code">za pomocą kodu QR</string> + <string name="menu_share_qr_code_fingerprint">za pomocą kodu QR</string> + <string name="menu_share_nfc">za pomocą NFC</string> + <string name="menu_copy_to_clipboard">Kopiuj do schowka</string> + <string name="menu_sign_key">Klucz podpisu</string> + <string name="menu_beam_preferences">Ustawienia Beam</string> + <string name="menu_key_edit_cancel">Anuluj</string> + <string name="menu_encrypt_to">Zaszyfruj do...</string> + <string name="menu_select_all">Wybierz wszystko</string> + <!--label--> + <string name="label_sign">Podpis</string> + <string name="label_message">Wiadomość</string> + <string name="label_file">Plik</string> + <string name="label_no_passphrase">Brak hasła</string> + <string name="label_passphrase">Hasło</string> + <string name="label_passphrase_again">Ponów</string> + <string name="label_algorithm">Algorytm</string> + <string name="label_ascii_armor">ASCII Armor</string> + <string name="label_select_public_keys">Odbiorcy</string> + <string name="label_delete_after_encryption">Usuń po zaszyfrowaniu</string> + <string name="label_delete_after_decryption">Usuń po odszyfrowaniu</string> + <string name="label_share_after_encryption">Udostępnij po zaszyfrowaniu</string> + <string name="label_encryption_algorithm">Algorytm szyfrujący</string> + <string name="label_hash_algorithm">Algorytm funkcji skrótu</string> + <string name="label_asymmetric">Klucz publiczny</string> + <string name="label_symmetric">Hasło</string> + <string name="label_passphrase_cache_ttl">Bufor haseł</string> + <string name="label_message_compression">Kompresja wiadomości</string> + <string name="label_file_compression">Kompresja plików</string> + <string name="label_force_v3_signature">Wymuś stare podpisy OpenPGPv3</string> + <string name="label_key_servers">Serwery kluczy</string> + <string name="label_key_id">Identyfikator klucza</string> + <string name="label_creation">Utworzenia</string> + <string name="label_expiry">Wygaśnięcia</string> + <string name="label_usage">Wykorzystanie</string> + <string name="label_key_size">Rozmiar klucza</string> + <string name="label_main_user_id">Identyfikator głównego użytkownika</string> + <string name="label_name">Imię</string> + <string name="label_comment">Komentarz</string> + <string name="label_email">Adres email</string> + <string name="label_sign_user_id">Identyfikator użytkownika podpisu (sign user id)</string> + <string name="label_sign_email">Podpisz e-mail</string> + <string name="label_send_key">Wyślij klucz do serwera kluczy po certyfikacji</string> + <string name="label_fingerprint">Odcisk</string> + <string name="select_keys_button_default">Wybierz</string> + <string name="expiry_date_dialog_title">Ustaw datę wygaśnięcia</string> + <plurals name="select_keys_button"> + <item quantity="one">wybrano %d</item> + <item quantity="few">wybrano %d</item> + <item quantity="other">wybrano %d</item> + </plurals> + <string name="user_id_no_name"><bez nazwy></string> + <string name="none"><żaden></string> + <string name="no_key"><brak klucza></string> + <string name="no_email"><Brak adresu email></string> + <string name="unknown_status"></string> + <string name="can_encrypt">może szyfrować</string> + <string name="can_sign">może podpisywać</string> + <string name="expired">wygasły</string> + <string name="revoked">unieważniony</string> + <string name="user_id">Identyfikator użytkownika</string> + <plurals name="n_contacts"> + <item quantity="one">1 kontakt</item> + <item quantity="few">%d kontakty</item> + <item quantity="other">%d kontaktów</item> + </plurals> + <plurals name="n_key_servers"> + <item quantity="one">%d serwer kluczy</item> + <item quantity="few">%d serwerów kluczy</item> + <item quantity="other">%d serwerów kluczy</item> + </plurals> + <string name="fingerprint">Odcisk:</string> + <string name="secret_key">Klucz prywatny:</string> + <!--choice--> + <string name="choice_none">Żaden</string> + <string name="choice_sign_only">Tylko podpisz</string> + <string name="choice_encrypt_only">Tylko zaszyfruj</string> + <string name="choice_sign_and_encrypt">Podpisz i zaszyfruj</string> + <string name="choice_15secs">15 sekund</string> + <string name="choice_1min">1 minuta</string> + <string name="choice_3mins">3 minuty</string> + <string name="choice_5mins">5 minut</string> + <string name="choice_10mins">10 minut</string> + <string name="choice_20mins">20 minut</string> + <string name="choice_40mins">40 minut</string> + <string name="choice_1hour">1 godzina</string> + <string name="choice_2hours">2 godziny</string> + <string name="choice_4hours">4 godziny</string> + <string name="choice_8hours">8 godzin</string> + <string name="choice_forever">na zawsze</string> + <string name="dsa">DSA</string> + <string name="elgamal">ElGamal</string> + <string name="rsa">RSA</string> + <string name="filemanager_title_open">Otwórz...</string> + <string name="warning">Ostrzeżenie</string> + <string name="error">Błąd</string> + <string name="error_message">Błąd: %s</string> + <!--sentences--> + <string name="wrong_passphrase">Nieprawidłowe hasło.</string> + <string name="using_clipboard_content">Użycie zawartości schowka.</string> + <string name="set_a_passphrase">Najpierw ustaw hasło.</string> + <string name="no_filemanager_installed">Nie zainstalowano żadnego kompatybilnego menadżera plików.</string> + <string name="passphrases_do_not_match">Hasła nie pasują do siebie</string> + <string name="passphrase_must_not_be_empty">Puste hasła nie są dozwolone.</string> + <string name="passphrase_for_symmetric_encryption">Szyfrowanie symetryczne.</string> + <string name="passphrase_for">Podaj hasło dla \'%s\'</string> + <string name="file_delete_confirmation">Czy jesteś pewien że chcesz usunąć\n%s?</string> + <string name="file_delete_successful">Usunięto pomyślnie.</string> + <string name="no_file_selected">Najpierw wskaż plik.</string> + <string name="decryption_successful">Odszyfrowano pomyślnie.</string> + <string name="encryption_successful">Zaszyfrowano pomyślnie.</string> + <string name="encryption_to_clipboard_successful">Pomyślnie zaszyfrowano do schowka.</string> + <string name="enter_passphrase_twice">Podaj hasło dwukrotnie.</string> + <string name="select_encryption_key">Wybierz co najmniej jeden klucz szyfrujący.</string> + <string name="select_encryption_or_signature_key">Wybierz co najmniej jeden klucz szyfrujący lub klucz podpisujący.</string> + <string name="specify_file_to_encrypt_to">Wskaż, do którego pliku zapisać zaszyfrowane dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string> + <string name="specify_file_to_decrypt_to">Wskaż, do którego pliku zapisać odszyfrowane dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string> + <string name="specify_file_to_export_to">Wskaż, do którego pliku wyeksportować dane.\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string> + <string name="specify_file_to_export_secret_keys_to">Wskaż, do którego pliku zapisać eksportowane dane.\nOSTRZEŻENIE: Masz zamiar zapisać klucze PRYWATNE (tajne)\nOSTRZEŻENIE: Plik zostanie nadpisany, jeżeli istnieje.</string> + <string name="key_deletion_confirmation">Czy na pewno chcesz usunąć klucz \'%s\'?\nNie można cofnąć tej operacji!</string> + <string name="key_deletion_confirmation_multi">Czy na pewno chcesz usunąć wszystkie zaznaczone klucze?\nTej operacji nie można cofnąć!</string> + <string name="secret_key_deletion_confirmation">Czy na pewno chcesz usunąć klucz prywatny \'%s\'?\nNie można cofnąć tej operacji!</string> + <string name="public_key_deletetion_confirmation">Czy na pewno chcesz usunąć klucz publiczny \'%s\'?\nNie można cofnąć tej operacji!</string> + <string name="secret_key_delete_text">Usunąć klucze prywatne?</string> + <string name="also_export_secret_keys">Czy wyeksportować również klucze prywatne?</string> + <plurals name="keys_added_and_updated_1"> + <item quantity="one">Pomyślnie dodano %d klucz</item> + <item quantity="few">Pomyślnie dodano %d kluczy</item> + <item quantity="other">Pomyślnie dodano %d kluczy</item> + </plurals> + <plurals name="keys_added_and_updated_2"> + <item quantity="one">i zaktualizowano %d klucz.</item> + <item quantity="few">i zaktualizowano %d kluczy.</item> + <item quantity="other">i zaktualizowano %d kluczy.</item> + </plurals> + <plurals name="keys_added"> + <item quantity="one">Pomyślnie dodano %d klucz.</item> + <item quantity="few">Pomyślnie dodano %d kluczy.</item> + <item quantity="other">Pomyślnie dodano %d kluczy.</item> + </plurals> + <plurals name="keys_updated"> + <item quantity="one">Pomyślnie zaktualizowano %d klucz.</item> + <item quantity="few">Pomyślnie zaktualizowano %d kluczy.</item> + <item quantity="other">Pomyślnie zaktualizowano %d kluczy.</item> + </plurals> + <string name="no_keys_added_or_updated">Nie dodano ani zaktualizowano żadnych kluczy.</string> + <string name="key_exported">Pomyślnie wyeksportowano 1 klucz.</string> + <string name="keys_exported">Pomyślnie wyeksportowano %d kluczy.</string> + <string name="no_keys_exported">Nie wyeksportowano żadnych kluczy.</string> + <string name="key_creation_el_gamal_info">Uwaga: algorytm EnGamal jest obsługiwany tylko przez podklucze i użyty zostanie najbliższy rozmiar klucza z podanych: 1536, 2048, 3072, 4096, 8192.</string> + <string name="key_creation_weak_rsa_info">Uwaga: generowanie klucza RSA o długości 1024 bity i mniejszej jest uważane za niebezpieczne i wyłączone dla tworzenia nowych kluczy.</string> + <string name="key_not_found">Nie można znaleźć klucza %08X.</string> + <plurals name="keys_found"> + <item quantity="one">Znaleziono %d klucz.</item> + <item quantity="few">Znaleziono %d kluczy.</item> + <item quantity="other">Znaleziono %d kluczy.</item> + </plurals> + <string name="unknown_signature">Nieznany podpis, naciśnij przycisk, aby wyszukać brakujący klucz.</string> + <plurals name="bad_keys_encountered"> + <item quantity="one">Zignorowano %d niepoprawny klucz prywatny. Prawdopodobnie został wyeksportowany przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz go z opcją\n --export-secret-keys\nktóra jest poprawna.</item> + <item quantity="few">Zignorowano %d niepoprawnych kluczy prywatnych. Prawdopodobnie zostały wyeksportowane przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz je z opcją\n --export-secret-keys\nktóra jest poprawna.</item> + <item quantity="other">zignorowano %d niepoprawnych kluczy prywatnych. Prawdopodobnie zostały wyeksportowane przy uzyciu opcji\n --export-secret-subkeys\nUpewnij się że eksportujesz je z opcją\n --export-secret-keys\nktóra jest poprawna.</item> + </plurals> + <string name="key_send_success">Pomyślnie wysłano klucz na serwer</string> + <string name="key_sign_success">Pomyślnie podpisano klucz</string> + <string name="list_empty">Lista jest pusta!</string> + <string name="nfc_successfull">Pomyślnie wysłano klucz przez NFC!</string> + <string name="key_copied_to_clipboard">Klucz został skopiowany do schowka!</string> + <string name="key_has_already_been_signed">Klucz został już wcześniej podpisany!</string> + <string name="select_key_to_sign">Wybierz klucz, który zostanie użyty do podpisania!</string> + <string name="key_too_big_for_sharing">Klucz ma za duży rozmiar by być udostępniony w ten sposób!</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">usuwanie \'%s\' zakończone niepowodzeniem</string> + <string name="error_file_not_found">plik nie znaleziony</string> + <string name="error_no_secret_key_found">nie znaleziono pasującego klucza prywatnego</string> + <string name="error_no_known_encryption_found">napotkano nieznany rodzaj szyfrowania</string> + <string name="error_external_storage_not_ready">zewnętrzne urządzenie jest niegotowe</string> + <string name="error_invalid_email">nieprawidłowy adres email \'%s\'</string> + <string name="error_key_size_minimum512bit">klucz musi mieć rozmiar co najmniej 512 bitów</string> + <string name="error_master_key_must_not_be_el_gamal">klucz EnGamal nie może być kluczem głównym</string> + <string name="error_unknown_algorithm_choice">wybrano nieznany algorytm</string> + <string name="error_user_id_needs_a_name">musisz wskazać imię</string> + <string name="error_user_id_no_email">nie znaleziono adresu email</string> + <string name="error_user_id_needs_an_email_address">musisz wskazać adres email</string> + <string name="error_key_needs_a_user_id">potrzeba co najmniej jednego identyfikatora użytkownika</string> + <string name="error_main_user_id_must_not_be_empty">główny identyfikator użytkownika nie może być pusty</string> + <string name="error_key_needs_master_key">potrzeba co najmniej klucza głównego</string> + <string name="error_no_encryption_keys_or_passphrase">nie podano hasła ani klucza szyfrującego</string> + <string name="error_signature_failed">podpisywanie nie powiodło się</string> + <string name="error_no_signature_passphrase">nie podano hasła</string> + <string name="error_no_signature_key">nie podano klucza podpisu</string> + <string name="error_invalid_data">nieprawidłowe dane</string> + <string name="error_corrupt_data">uszkodzone dane</string> + <string name="error_integrity_check_failed">Sprawdzanie spójności zakończone niepowodzeniem! Dane były modyfikowane!</string> + <string name="error_no_symmetric_encryption_packet">nie znaleziono pakietu z szyfrowaniem symatrycznym</string> + <string name="error_wrong_passphrase">nieprawidłowe hasło</string> + <string name="error_saving_keys">błąd przy zapisywaniu kluczy</string> + <string name="error_could_not_extract_private_key">nie można wyodrębnić klucza prywatnego</string> + <string name="error_only_files_are_supported">Dane binarne pozbawione pliku nie są obsługiwane. To jest wspierane tylko dla akcji ACTION_ENCRYPT_STREAM_AND_RETURN.</string> + <string name="error_jelly_bean_needed">Potrzebujesz Androida 4.1 Jelly Bean, aby korzystać z Android NFC Beam!</string> + <string name="error_nfc_needed">NCF jest niedostępne na twoim urządzeniu</string> + <string name="error_nothing_import">Nie ma nic do zaimportowania!</string> + <string name="error_expiry_must_come_after_creation">data wygaśnięcia musi być późniejsza niż data stworzenia</string> + <string name="error_can_not_delete_contact">nie możesz usunąć tego kontaktu, ponieważ należy do ciebie.</string> + <string name="error_can_not_delete_contacts">nie możesz usunąć tych kontaktów, ponieważ należą do ciebie:\n%s</string> + <string name="error_keyserver_insufficient_query">Niewystarczające zapytanie do serwera</string> + <string name="error_keyserver_query">Odpytywanie serwera zakończone niepowodzeniem</string> + <string name="error_keyserver_too_many_responses">Za dużo odpowiedzi</string> + <string name="error_import_file_no_content">Plik jest pusty</string> + <string name="error_generic_report_bug">Wystąpił błąd ogólny, proszę zgłoś go autorom OpenKeychain.</string> + <plurals name="error_can_not_delete_info"> + <item quantity="one">Usuń go z ekranu \'Moje klucze\'!</item> + <item quantity="few">Usuń je z ekranu \'Moje klucze\'!</item> + <item quantity="other">Usuń je z ekranu \'Moje klucze\'!</item> + </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">Część wczytanego pliku jest poprawnym obiektem OpenPGP, ale nie jest kluczem OpenPGP</item> + <item quantity="few">Część wczytanego pliku to poprawne obiekty OpenPGP, ale nie są kluczami OpenPGP</item> + <item quantity="other">Część wczytanego pliku to poprawne obiekty OpenPGP, ale nie są kluczami OpenPGP</item> + </plurals> + <!--progress dialogs, usually ending in '…'--> + <string name="progress_done">Gotowe.</string> + <string name="progress_cancel">Anuluj</string> + <string name="progress_saving">zapisywanie...</string> + <string name="progress_importing">importowanie...</string> + <string name="progress_exporting">eksportowanie...</string> + <string name="progress_building_key">budowanie klucza...</string> + <string name="progress_preparing_master_key">przygotowywanie klucza glównego...</string> + <string name="progress_certifying_master_key">podpisywanie klucza głównego...</string> + <string name="progress_building_master_key">budowanie głównego zbioru kluczy...</string> + <string name="progress_adding_sub_keys">dodawanie podkluczy...</string> + <string name="progress_saving_key_ring">zapisywanie klucza...</string> + <plurals name="progress_exporting_key"> + <item quantity="one">eksportowanie klucza...</item> + <item quantity="few">eksportowanie kluczy...</item> + <item quantity="other">eksportowanie kluczy...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="one">generowanie klucza, może to potrwać do 3 minut...</item> + <item quantity="few">generowanie kluczy, może to potrwać do 3 minut...</item> + <item quantity="other">generowanie kluczy, może to potrwać do 3 minut...</item> + </plurals> + <string name="progress_extracting_signature_key">wyodrębnianie klucza podpisu...</string> + <string name="progress_extracting_key">wyodrębnianie klucza...</string> + <string name="progress_preparing_streams">przygotowywanie strumieni...</string> + <string name="progress_encrypting">szyfrowanie danych...</string> + <string name="progress_decrypting">deszyfrowywanie danych...</string> + <string name="progress_preparing_signature">przygotowywanie podpisu...</string> + <string name="progress_generating_signature">generowanie podpisu...</string> + <string name="progress_processing_signature">przetwarzanie podpisu...</string> + <string name="progress_verifying_signature">weryfikowanie podpisu...</string> + <string name="progress_signing">podpisywanie...</string> + <string name="progress_reading_data">czytanie danych...</string> + <string name="progress_finding_key">szukanie klucza...</string> + <string name="progress_decompressing_data">dekompresja danych...</string> + <string name="progress_verifying_integrity">weryfikacja spójności...</string> + <string name="progress_deleting_securely">usuwanie \'%s\' bezpiecznie…</string> + <string name="progress_querying">odpytywanie...</string> + <!--action strings--> + <string name="hint_public_keys">Wyszukaj klucze publiczne</string> + <string name="hint_secret_keys">Wyszukaj klucze prywatne</string> + <string name="action_share_key_with">Udostępnij klucz...</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">szybka</string> + <string name="compression_very_slow">bardzo wolna</string> + <!--Help--> + <string name="help_tab_start">Początek</string> + <string name="help_tab_faq">FAQ</string> + <string name="help_tab_nfc_beam">NFC Beam</string> + <string name="help_tab_changelog">Dziennik zmian</string> + <string name="help_tab_about">O programie</string> + <string name="help_about_version">Wersja:</string> + <!--Import--> + <string name="import_import">Zaimportuj wybrane klucze</string> + <string name="import_sign_and_upload">Importuj, podpisz i wyślij wybrane klucze</string> + <string name="import_from_clipboard">Importuj ze schowka</string> + <plurals name="import_qr_code_missing"> + <item quantity="one">Brakuje kodu QR o identyfikatorze %s</item> + <item quantity="few">Brakuje kodów QR o identyfikatorach %s</item> + <item quantity="other">Brakuje kodów QR o identyfikatorach %s</item> + </plurals> + <string name="import_qr_code_start_with_one">Zacznij od kodu QR o identyfikatorze 1</string> + <string name="import_qr_code_wrong">Kod QR zniekształcony! Spróbuj jeszcze raz!</string> + <string name="import_qr_code_finished">Skanowanie kodu QR zakończone!</string> + <string name="import_qr_code_too_short_fingerprint">Odcisk klucza zawarty w tym kodzie QR jest za krótki (< 16 znaków)</string> + <string name="import_qr_scan_button">Odczytaj kod QR przy pomocy \'Barcode Scanner\'</string> + <string name="import_nfc_text">Aby odbierać klucze przez NFC, urządzenie musi być odblokowane.</string> + <string name="import_nfc_help_button">Pomoc</string> + <string name="import_clipboard_button">Odczytaj klucz ze schowka</string> + <!--Intent labels--> + <string name="intent_decrypt_file">Deszyfruj plik korzystając z OpenKeychain</string> + <string name="intent_import_key">Importuj klucz korzystając z OpenKeychain</string> + <string name="intent_send_encrypt">Zaszyfruj korzystając z OpenKeychain</string> + <string name="intent_send_decrypt">Deszyfruj korzystając z OpenKeychain</string> + <!--Remote API--> + <string name="api_no_apps">Brak zarejestrowanych aplikacji!\n\nZewnętrzne aplikacje mogą żądać dostępu do OpenKeychain. Po przyznaniu dostępu, będa wyświetlone tutaj.</string> + <string name="api_settings_show_info">Pokaż zaawansowane informacje</string> + <string name="api_settings_hide_info">Ukryj zaawansowane informacje</string> + <string name="api_settings_show_advanced">Pokaż zaawanowane ustawienia</string> + <string name="api_settings_hide_advanced">Ukryj zaawansowane ustawienia</string> + <string name="api_settings_no_key">Nie wybrano klucza</string> + <string name="api_settings_select_key">Wybierz klucz</string> + <string name="api_settings_save">Zapisz</string> + <string name="api_settings_cancel">Anuluj</string> + <string name="api_settings_revoke">Odwołaj dostęp</string> + <string name="api_settings_package_name">Nazwa paczki</string> + <string name="api_settings_package_signature">Skrót SHA-256 podpisu paczki</string> + <string name="api_settings_accounts">Konta</string> + <string name="api_settings_accounts_empty">Nie przypisano żadnych kont do tej aplikacji</string> + <string name="api_register_text">Wyświetlona aplikacja prosi o dostęp do OpenKeychain.\nZezwolić?\n\nOSTRZEZENIE: Jeżeli nie wiesz, czemu wyświetlił się ten komunikat, nie zezwalaj na dostęp! Możesz to również zrobić później, korzystając z ekranu \'Zarejestrowane aplikacje\'.</string> + <string name="api_register_allow">Zezwól na dostęp</string> + <string name="api_register_disallow">Odmów dostępu</string> + <string name="api_register_error_select_key">Wybierz klucz!</string> + <string name="api_select_pub_keys_missing_text">Nie znaleziono kluczy publiczych dla tych identyfikatorów użytkownika:</string> + <string name="api_select_pub_keys_dublicates_text">Więcej niż jeden klucz publiczny istnieje dla tych identyfikatorów użytkownika:</string> + <string name="api_select_pub_keys_text">Proszę przejrzeć listę adresatów!</string> + <string name="api_error_wrong_signature">Sprawdzanie podpisu zakończone niepowodzeniem! Czy zainstalowałeś tę aplikację z innego źródła? Jeżeli jesteś pewien, że nie jest to atak, odwołaj rejestrację teg aplikacji w OpenKeychain, a następnie zarejestruj ją ponownie.</string> + <!--Share--> + <string name="share_qr_code_dialog_title">Udostępnij przez kod QR</string> + <string name="share_qr_code_dialog_start">Przejdź przez wszystkiego kody QR korzystając z przycisku \'Nastepny\' i skanuj je pojedynczo.</string> + <string name="share_qr_code_dialog_fingerprint_text">Odcisk:</string> + <string name="share_qr_code_dialog_progress">Kod QR o identyfikatorze %1$d z %2$d</string> + <string name="share_nfc_dialog">Udostępnij przez NFC</string> + <!--Key list--> + <plurals name="key_list_selected_keys"> + <item quantity="one">1 klucz wybrany.</item> + <item quantity="few">%d kluczy wybranych.</item> + <item quantity="other">%d kluczy wybranych.</item> + </plurals> + <string name="key_list_empty_text1">Żadne klucze nie są jeszcze dostępne...</string> + <string name="key_list_empty_text2">Możesz zacząć od</string> + <string name="key_list_empty_text3">lub</string> + <string name="key_list_empty_button_create">tworzenie własnego klucza</string> + <string name="key_list_empty_button_import">importowanie kluczy.</string> + <!--Key view--> + <string name="key_view_action_edit">Edytuj ten klucz</string> + <string name="key_view_action_encrypt">Zaszyfruj do tego kontaktu</string> + <string name="key_view_action_certify">Certyfikuj klucz tego kontaktu</string> + <string name="key_view_tab_main">Informacje</string> + <string name="key_view_tab_certs">Certyfikaty</string> + <!--Navigation Drawer--> + <string name="nav_contacts">Kontakty</string> + <string name="nav_encrypt">Zaszyfruj</string> + <string name="nav_decrypt">Deszyfruj</string> + <string name="nav_import">importuj klucze</string> + <string name="nav_secret_keys">Moje klucze</string> + <string name="nav_apps">Zarejestrowane aplikacje</string> + <string name="drawer_open">Otwórz panel nawigacji</string> + <string name="drawer_close">Zamknij panel nawigacji</string> + <string name="edit">Edytuj</string> + <string name="my_keys">Moje klucze</string> + <string name="label_secret_key">Klucz prywatny</string> + <string name="secret_key_yes">dostępny</string> + <string name="secret_key_no">niedostepny</string> + <string name="section_uids_to_sign">Identyfikator użytkownika do podpisu</string> + <string name="progress_re_adding_certs">Ponowne stosowanie certyfikatów</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Wpisz tutaj wiadomość do zaszyfrowania...</string> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml index 6bb115049..3d00a143f 100644 --- a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml @@ -23,4 +23,5 @@ <!--Key list--> <!--Key view--> <!--Navigation Drawer--> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml index f69cf8789..88a529b66 100644 --- a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-ru/strings.xml @@ -15,7 +15,8 @@ <string name="title_key_server_preference">Настройки сервера ключей</string> <string name="title_change_passphrase">Изменить пароль</string> <string name="title_set_passphrase">Задать пароль</string> - <string name="title_send_email">Отправить…</string> + <string name="title_send_email">Отправить...</string> + <string name="title_send_file">Отправить файл</string> <string name="title_encrypt_to_file">Зашифровать в файл</string> <string name="title_decrypt_to_file">Расшифровать в файл</string> <string name="title_import_keys">Импорт ключей</string> @@ -61,8 +62,10 @@ <string name="btn_next">Далее</string> <string name="btn_back">Назад</string> <string name="btn_clipboard">Буфер обмена</string> - <string name="btn_share">Поделиться…</string> + <string name="btn_share">Поделиться...</string> <string name="btn_lookup_key">Найти ключ</string> + <string name="btn_encryption_advanced_settings_show">Показать расширенные настройки</string> + <string name="btn_encryption_advanced_settings_hide">Скрыть расширенные настройки</string> <!--menu--> <string name="menu_preferences">Настройки</string> <string name="menu_help">Помощь</string> @@ -71,17 +74,19 @@ <string name="menu_import">Импорт</string> <string name="menu_import_from_nfc">Импорт из NFC</string> <string name="menu_export_keys">Экспорт всех ключей</string> + <string name="menu_export_secret_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_import_from_key_server">Сервер ключей</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">Отправить...</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> @@ -91,7 +96,8 @@ <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> + <string name="menu_encrypt_to">Зашифровать....</string> + <string name="menu_select_all">Выбрать все</string> <!--label--> <string name="label_sign">Подписать</string> <string name="label_message">Сообщение</string> @@ -104,6 +110,7 @@ <string name="label_select_public_keys">Получатели</string> <string name="label_delete_after_encryption">Удалить после шифрования</string> <string name="label_delete_after_decryption">Удалить после расшифровки</string> + <string name="label_share_after_encryption">Отправить после шифрования</string> <string name="label_encryption_algorithm">Алгоритм шифрования</string> <string name="label_hash_algorithm">Hash-алгоритм</string> <string name="label_asymmetric">Публичный ключ</string> @@ -115,7 +122,7 @@ <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_expiry">Годен до...</string> <string name="label_usage">Применение</string> <string name="label_key_size">Размер ключа</string> <string name="label_main_user_id">Основной ID пользователя</string> @@ -125,6 +132,7 @@ <string name="label_send_key">После сертификации загрузить ключ на сервер</string> <string name="label_fingerprint">Отпечаток</string> <string name="select_keys_button_default">Выбрать</string> + <string name="expiry_date_dialog_title">Срок годности</string> <plurals name="select_keys_button"> <item quantity="one">%d выбран</item> <item quantity="few">%d выбрано</item> @@ -133,11 +141,18 @@ <string name="user_id_no_name"><нет имени></string> <string name="none"><нет></string> <string name="no_key"><нет ключа></string> + <string name="no_email"><нет email></string> <string name="unknown_status"></string> <string name="can_encrypt">шифрование</string> <string name="can_sign">подпись</string> <string name="expired">просрочен</string> <string name="revoked">отозван</string> + <string name="user_id">ID пользователя</string> + <plurals name="n_contacts"> + <item quantity="one">1 контакт</item> + <item quantity="few">%d контактов</item> + <item quantity="other">%d контактов</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d сервер ключей</item> <item quantity="few">%d серверов ключей</item> @@ -165,7 +180,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Открыть…</string> + <string name="filemanager_title_open">Открыть...</string> <string name="warning">Внимание</string> <string name="error">Ошибка</string> <string name="error_message">Ошибка: %s</string> @@ -194,6 +209,9 @@ <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> + <string name="public_key_deletetion_confirmation">Вы правда хотите удалить ПУБЛИЧНЫЙ ключ \'%s\'?\nЭто нельзя отменить!</string> + <string name="secret_key_delete_text">Удалить секретные ключи?</string> + <string name="also_export_secret_keys">Экспортировать секретные ключи?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">Успешно добавлено %d ключ</item> <item quantity="few">Успешно добавлено %d ключей</item> @@ -219,6 +237,7 @@ <string name="keys_exported">Экспортировано %d ключей.</string> <string name="no_keys_exported">Ключи не были экспортированы.</string> <string name="key_creation_el_gamal_info">Инфо: ElGamal подходит только для дополнительных ключей. При создании ключа будет использован ближайший из размеров: 1536, 2048, 3072, 4096, или 8192.</string> + <string name="key_creation_weak_rsa_info">Внимание: создание ключей RSA длиной 1024 бита и менее признано небезопасным. Данная возможность отключена.</string> <string name="key_not_found">Не удается найти ключ %08X.</string> <plurals name="keys_found"> <item quantity="one">Найден %d ключ.</item> @@ -252,6 +271,7 @@ <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_no_email">email не найден</string> <string name="error_user_id_needs_an_email_address">необходимо указать email</string> <string name="error_key_needs_a_user_id">необходим хотя бы один id пользователя</string> <string name="error_main_user_id_must_not_be_empty">основная запись пользователя не может быть пустой</string> @@ -277,48 +297,60 @@ <string name="error_keyserver_insufficient_query">Ограничение запроса сервера</string> <string name="error_keyserver_query">Сбой запроса сервера ключей</string> <string name="error_keyserver_too_many_responses">Слишком много ответов</string> + <string name="error_import_file_no_content">Файл пуст</string> + <string name="error_generic_report_bug">Выявлена ошибка. Пожалуйста, сообщите о ней разработчику.</string> <plurals name="error_can_not_delete_info"> <item quantity="one">Пожалуйста, удалите его в разделе \'Мои ключи\'!</item> <item quantity="few">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item> <item quantity="other">Пожалуйста, удалите их в разделе \'Мои ключи\'!</item> </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">часть загруженного файла содержит данные OpenPGP, но это не ключ</item> + <item quantity="few">части загруженного файла содержат данные OpenPGP, но это не ключ</item> + <item quantity="other">части загруженного файла содержат данные OpenPGP, но это не ключ</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> + <string name="progress_done">Готово.</string> + <string name="progress_cancel">Отмена</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_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="one">экспорт ключа…</item> - <item quantity="few">экспорт ключей…</item> - <item quantity="other">экспорт ключей…</item> + <item quantity="one">экспорт ключа...</item> + <item quantity="few">экспорт ключей...</item> + <item quantity="other">экспорт ключей...</item> + </plurals> + <plurals name="progress_generating"> + <item quantity="one">создание ключа. это может занять до 3 минут...</item> + <item quantity="few">создание ключей. это может занять до 3 минут...</item> + <item quantity="other">создание ключей. это может занять до 3 минут...</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> + <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> + <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> @@ -329,6 +361,7 @@ <string name="compression_very_slow">очень медленно</string> <!--Help--> <string name="help_tab_start">Начать</string> + <string name="help_tab_faq">ЧаВо</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Изменения</string> <string name="help_tab_about">О программе</string> @@ -386,12 +419,13 @@ <item quantity="few">%d ключей выбрано.</item> <item quantity="other">%d ключей выбрано.</item> </plurals> - <string name="key_list_empty_text1">У вас пока нет ключей…</string> + <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_edit">Изменить ключ</string> <string name="key_view_action_encrypt">Зашифровать для этого получателя</string> <string name="key_view_action_certify">Сертифицировать ключ этого контакта</string> <string name="key_view_tab_main">Информация</string> @@ -405,4 +439,11 @@ <string name="nav_apps">Связанные приложения</string> <string name="drawer_open">Открыть панель навигации</string> <string name="drawer_close">Закрыть панель навигации</string> + <string name="edit">Изменить</string> + <string name="my_keys">Мои ключи</string> + <string name="label_secret_key">Секретный ключ</string> + <string name="secret_key_yes">доступен</string> + <string name="secret_key_no">не доступен</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Напишите сообщение здесь, что бы зашифровать...</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml index 6bb115049..3d00a143f 100644 --- a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml @@ -23,4 +23,5 @@ <!--Key list--> <!--Key view--> <!--Navigation Drawer--> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml index 4f1becaa1..174d8538f 100644 --- a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-tr/strings.xml @@ -76,7 +76,7 @@ <string name="dsa">DSA</string> <string name="elgamal">ElGamal</string> <string name="rsa">RSA</string> - <string name="filemanager_title_open">Aç…</string> + <string name="filemanager_title_open">Aç...</string> <string name="warning">Uyarı</string> <string name="error">Hata</string> <string name="error_message">Hata: %s</string> @@ -95,18 +95,17 @@ <string name="error_key_size_minimum512bit">anahtar uzunluğu en az 512bit olmalı</string> <string name="error_corrupt_data">bozuk veri</string> <!--progress dialogs, usually ending in '…'--> - <string name="progress_done">bitti.</string> - <string name="progress_saving">kaydediliyor…</string> - <string name="progress_importing">alıyor…</string> - <string name="progress_exporting">veriyor…</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> - <string name="progress_processing_signature">imza işleniyor…</string> - <string name="progress_verifying_signature">imza doğrulanıyor…</string> - <string name="progress_signing">imzalanıyor…</string> - <string name="progress_reading_data">veri okunuyor…</string> - <string name="progress_finding_key">anahtar bulunuyor…</string> + <string name="progress_saving">kaydediliyor...</string> + <string name="progress_importing">alıyor...</string> + <string name="progress_exporting">veriyor...</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> + <string name="progress_processing_signature">imza işleniyor...</string> + <string name="progress_verifying_signature">imza doğrulanıyor...</string> + <string name="progress_signing">imzalanıyor...</string> + <string name="progress_reading_data">veri okunuyor...</string> + <string name="progress_finding_key">anahtar bulunuyor...</string> <!--action strings--> <!--key bit length selections--> <string name="key_size_512">512</string> @@ -135,4 +134,5 @@ <!--Key list--> <!--Key view--> <!--Navigation Drawer--> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml index 8997ef5ce..00655fc53 100644 --- a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-uk/strings.xml @@ -16,6 +16,7 @@ <string name="title_change_passphrase">Змінити парольну фразу</string> <string name="title_set_passphrase">Задати парольну фразу</string> <string name="title_send_email">Надіслати листа…</string> + <string name="title_send_file">Надіслати файл…</string> <string name="title_encrypt_to_file">Зашифрувати до файлу</string> <string name="title_decrypt_to_file">Розшифрувати до файлу</string> <string name="title_import_keys">Імпортувати ключі</string> @@ -63,6 +64,8 @@ <string name="btn_clipboard">Буфер обміну</string> <string name="btn_share">Поділитися через…</string> <string name="btn_lookup_key">Шукати ключ</string> + <string name="btn_encryption_advanced_settings_show">Показати додаткові налаштування</string> + <string name="btn_encryption_advanced_settings_hide">Приховати додаткові налаштування</string> <!--menu--> <string name="menu_preferences">Параметри</string> <string name="menu_help">Довідка</string> @@ -71,15 +74,17 @@ <string name="menu_import">Імпорт</string> <string name="menu_import_from_nfc">Імпорт з NFC</string> <string name="menu_export_keys">Експортувати усі ключі</string> + <string name="menu_export_secret_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_import_from_key_server">Сервер ключів</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">Поділитися…</string> <string name="menu_share_title_fingerprint">Поділитися відбитком…</string> <string name="menu_share_title">Поділитися цілим ключем…</string> <string name="menu_share_default_fingerprint">з…</string> @@ -92,6 +97,7 @@ <string name="menu_beam_preferences">Налаштування променя</string> <string name="menu_key_edit_cancel">Скасувати</string> <string name="menu_encrypt_to">Зашифрувати…</string> + <string name="menu_select_all">Вибрати усе</string> <!--label--> <string name="label_sign">Підпис</string> <string name="label_message">Повідомлення</string> @@ -104,6 +110,7 @@ <string name="label_select_public_keys">Отримувачі</string> <string name="label_delete_after_encryption">Вилучити після шифрування</string> <string name="label_delete_after_decryption">Вилучити після розшифрування</string> + <string name="label_share_after_encryption">Поширити після шифрування</string> <string name="label_encryption_algorithm">Алгоритм шифрування</string> <string name="label_hash_algorithm">Хеш алгоритм</string> <string name="label_asymmetric">Публічний ключ</string> @@ -122,9 +129,12 @@ <string name="label_name">Назва</string> <string name="label_comment">Коментар</string> <string name="label_email">Ел. пошта</string> + <string name="label_sign_user_id">Ід підпису користувача</string> + <string name="label_sign_email">Підписати листа</string> <string name="label_send_key">Завантажити ключ до вибраного сервера ключів після сертифікації</string> <string name="label_fingerprint">Відбиток</string> <string name="select_keys_button_default">Вибрати</string> + <string name="expiry_date_dialog_title">Задати термін дії</string> <plurals name="select_keys_button"> <item quantity="one">%d вибраний</item> <item quantity="few">%d вибрані</item> @@ -133,11 +143,18 @@ <string name="user_id_no_name"><без імені></string> <string name="none"><жоден></string> <string name="no_key"><без ключа></string> + <string name="no_email"><Немає ел. пошти></string> <string name="unknown_status"></string> <string name="can_encrypt">можна зашифрувати</string> <string name="can_sign">можна підписати</string> <string name="expired">закінчився</string> <string name="revoked">скасовано</string> + <string name="user_id">ІД користувача</string> + <plurals name="n_contacts"> + <item quantity="one">1 контакт</item> + <item quantity="few">%d контакти</item> + <item quantity="other">%d контактів</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d сервер ключів</item> <item quantity="few">%d сервери ключів</item> @@ -194,6 +211,9 @@ <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> + <string name="public_key_deletetion_confirmation">Справді волієте вилучити ВІДКРИТИЙ ключ \'%s\'?\nВи е зможете відмінити цю дію!</string> + <string name="secret_key_delete_text">Видалити секретні ключі?</string> + <string name="also_export_secret_keys">Також експортувати секретні ключі?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">Успішно додано %d ключ</item> <item quantity="few">Успішно додано %d ключі</item> @@ -219,6 +239,7 @@ <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_creation_weak_rsa_info">Примітка: генерація ключа RSA з довжиною 1024 біти і менше вважається небезпечною і вона вимкнена для генерації нових ключів.</string> <string name="key_not_found">Не можливо знайти ключ %08X.</string> <plurals name="keys_found"> <item quantity="one">Знайдено %d ключ.</item> @@ -252,6 +273,7 @@ <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_no_email">жодного листа не знайдено</string> <string name="error_user_id_needs_an_email_address">вам потрібно вказати електронну адресу</string> <string name="error_key_needs_a_user_id">потрібний хоча б один ІД користувача</string> <string name="error_main_user_id_must_not_be_empty">ІД основного користувача не має бути порожнім</string> @@ -277,17 +299,24 @@ <string name="error_keyserver_insufficient_query">Запит обмеженого сервера</string> <string name="error_keyserver_query">Збій сервера ключа запиту</string> <string name="error_keyserver_too_many_responses">Забагато відповідей</string> + <string name="error_import_file_no_content">Файл не має вмісту</string> + <string name="error_generic_report_bug">Трапилася загальна помилка, будь ласка, створіть новий звіт про помилку для OpenKeychain.</string> <plurals name="error_can_not_delete_info"> <item quantity="one">Будь ласка, вилучіть його з екрану „Мої ключі“!</item> <item quantity="few">Будь ласка, вилучіть їх з екрану „Мої ключі“!</item> <item quantity="other">Будь ласка, вилучіть їх з екрану „Мої ключі“!</item> </plurals> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">частина завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item> + <item quantity="few">частини завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item> + <item quantity="other">частин завантаженого файлу є вірним об\'єктом OpenPGP, але не ключем OpenPGP</item> + </plurals> <!--progress dialogs, usually ending in '…'--> - <string name="progress_done">готово.</string> + <string name="progress_done">Готово.</string> + <string name="progress_cancel">Скасувати</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> @@ -299,6 +328,11 @@ <item quantity="few">експортуються ключі…</item> <item quantity="other">експортуються ключі…</item> </plurals> + <plurals name="progress_generating"> + <item quantity="one">генерується ключ, це може тривати до 3 хвилини</item> + <item quantity="few">генеруються ключі, це може тривати до 3 хвилини</item> + <item quantity="other">генеруються ключі, це може тривати до 3 хвилини</item> + </plurals> <string name="progress_extracting_signature_key">видобування ключа підпису…</string> <string name="progress_extracting_key">видобувається ключа…</string> <string name="progress_preparing_streams">підготовка потоків…</string> @@ -329,6 +363,7 @@ <string name="compression_very_slow">дуже повільне</string> <!--Help--> <string name="help_tab_start">Початок</string> + <string name="help_tab_faq">ЧАП</string> <string name="help_tab_nfc_beam">NFC промінь</string> <string name="help_tab_changelog">Журнал змін</string> <string name="help_tab_about">Про</string> @@ -357,6 +392,8 @@ <string name="intent_send_decrypt">Розшифрувати з OpenKeychain</string> <!--Remote API--> <string name="api_no_apps">Нема зареєстрованих програм!\n\nСтороні програми можуть вимагати доступ до OpenPGP Keychain. Після надання доступу вони будуть наведені тут.</string> + <string name="api_settings_show_info">Показати додаткову інформацію</string> + <string name="api_settings_hide_info">Приховати додаткову інформацію</string> <string name="api_settings_show_advanced">Показати додаткові налаштування</string> <string name="api_settings_hide_advanced">Приховати додаткові налаштування</string> <string name="api_settings_no_key">Не вибрано ключа</string> @@ -366,6 +403,8 @@ <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_settings_accounts">Облікові записи</string> + <string name="api_settings_accounts_empty">Немає облікового запису приєднаного до цієї програми.</string> <string name="api_register_text">Показана програма запитує доступ до OpenPGP Keychain.\nДозволити доступ?\n\nУВАГА: якщо ви не знаєте, чому цей екран появився, не дозволяйте доступ! Ви можете відкликати доступ пізніше, використовуючи екран \'Зареєстровані програми\'.</string> <string name="api_register_allow">Дозволити доступ</string> <string name="api_register_disallow">Не дозволити доступ</string> @@ -392,6 +431,7 @@ <string name="key_list_empty_button_create">створюється ваш власний ключ</string> <string name="key_list_empty_button_import">імпортуюся ключі.</string> <!--Key view--> + <string name="key_view_action_edit">Редагувати цей ключ</string> <string name="key_view_action_encrypt">Зашифрувати у цей контакт</string> <string name="key_view_action_certify">Сертифікувати ключ цього контакту</string> <string name="key_view_tab_main">Інформація</string> @@ -405,4 +445,13 @@ <string name="nav_apps">Зареєстровані програми</string> <string name="drawer_open">Відкрити панель навігації</string> <string name="drawer_close">Закрити панель навігації</string> + <string name="edit">Редагувати</string> + <string name="my_keys">Мої ключі</string> + <string name="label_secret_key">Секретний ключ</string> + <string name="secret_key_yes">доступний</string> + <string name="secret_key_no">недоступний</string> + <string name="section_uids_to_sign">ІД користувача для реєстрації</string> + <string name="progress_re_adding_certs">Перезастосування сертифікатів</string> + <!--hints--> + <string name="encrypt_content_edit_text_hint">Напишіть повідомлення для шифрування…</string> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml new file mode 100644 index 000000000..3d00a143f --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml @@ -0,0 +1,27 @@ +<?xml version='1.0' encoding='UTF-8'?> +<resources> + <!--title--> + <!--section--> + <!--button--> + <!--menu--> + <!--label--> + <string name="unknown_status"></string> + <!--choice--> + <!--sentences--> + <!--errors + no punctuation, all lowercase, + they will be put after "error_message", e.g. "Error: file not found"--> + <!--progress dialogs, usually ending in '…'--> + <!--action strings--> + <!--key bit length selections--> + <!--compression--> + <!--Help--> + <!--Import--> + <!--Intent labels--> + <!--Remote API--> + <!--Share--> + <!--Key list--> + <!--Key view--> + <!--Navigation Drawer--> + <!--hints--> +</resources> diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml index 5848fb8db..244e7e57b 100644 --- a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values-zh/strings.xml @@ -1,17 +1,48 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> <!--title--> + <string name="title_manage_public_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_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_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_key_server">密钥服务器</string> <string name="section_decrypt_verify">解密并验证</string> <!--button--> + <string name="btn_sign">签名</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_clipboard">剪贴板</string> <!--menu--> <string name="menu_help">帮助</string> @@ -20,11 +51,10 @@ <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> + <string name="menu_encrypt_to">加密到...</string> <!--label--> <string name="label_sign">签署</string> <string name="label_message">讯息</string> @@ -64,7 +94,7 @@ <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="filemanager_title_open">打开...</string> <string name="warning">警告</string> <string name="error">错误</string> <!--sentences--> @@ -105,14 +135,13 @@ <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_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_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> @@ -157,4 +186,5 @@ <string name="nav_decrypt">解密</string> <string name="nav_import">导入密钥</string> <string name="nav_secret_keys">我的密钥</string> + <!--hints--> </resources> diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenPGP-Keychain/src/main/res/values/arrays.xml index 5244de419..c84c2648d 100644 --- a/OpenPGP-Keychain/src/main/res/values/arrays.xml +++ b/OpenPGP-Keychain/src/main/res/values/arrays.xml @@ -36,7 +36,7 @@ <item>@string/key_size_4096</item> </string-array> <string-array name="import_action_list" translatable="false"> - <item>@string/menu_key_server</item> + <item>@string/menu_import_from_key_server</item> <item>@string/menu_import_from_file</item> <item>@string/menu_import_from_qr_code</item> <item>@string/import_from_clipboard</item> diff --git a/OpenPGP-Keychain/src/main/res/values/attr.xml b/OpenPGP-Keychain/src/main/res/values/attr.xml new file mode 100644 index 000000000..86622b3e0 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values/attr.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + + <declare-styleable name="FoldableLinearLayout"> + <attr name="foldedLabel" format="string" /> + <attr name="unFoldedLabel" format="string" /> + <attr name="foldedIcon" format="string" /> + <attr name="unFoldedIcon" format="string" /> + </declare-styleable> + +</resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/values/colors.xml b/OpenPGP-Keychain/src/main/res/values/colors.xml index 780137181..d1dc6c1f4 100644 --- a/OpenPGP-Keychain/src/main/res/values/colors.xml +++ b/OpenPGP-Keychain/src/main/res/values/colors.xml @@ -3,5 +3,5 @@ <color name="emphasis">#31b6e7</color> <color name="bg_gray">#cecbce</color> - + </resources>
\ No newline at end of file diff --git a/OpenPGP-Keychain/src/main/res/values/dimens.xml b/OpenPGP-Keychain/src/main/res/values/dimens.xml new file mode 100644 index 000000000..e1a7749f0 --- /dev/null +++ b/OpenPGP-Keychain/src/main/res/values/dimens.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <dimen name="drawer_size">240dp</dimen> + <dimen name="drawer_content_padding">0dp</dimen> +</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 f7b0ddc53..2e88062b7 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -17,6 +17,7 @@ <string name="title_change_passphrase">Change Passphrase</string> <string name="title_set_passphrase">Set Passphrase</string> <string name="title_send_email">"Send Mail…"</string> + <string name="title_send_file">"Send File…"</string> <string name="title_encrypt_to_file">Encrypt To File</string> <string name="title_decrypt_to_file">Decrypt To File</string> <string name="title_import_keys">Import Keys</string> @@ -66,6 +67,8 @@ <string name="btn_clipboard">Clipboard</string> <string name="btn_share">Share with…</string> <string name="btn_lookup_key">Lookup key</string> + <string name="btn_encryption_advanced_settings_show">Show advanced settings</string> + <string name="btn_encryption_advanced_settings_hide">Hide advanced settings</string> <!-- menu --> <string name="menu_preferences">Settings</string> @@ -75,15 +78,17 @@ <string name="menu_import">Import</string> <string name="menu_import_from_nfc">Import from NFC</string> <string name="menu_export_keys">Export all keys</string> + <string name="menu_export_secret_keys">Export all secret keys</string> <string name="menu_export_key">Export to file</string> <string name="menu_delete_key">Delete key</string> <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 keyserver</string> + <string name="menu_import_from_key_server">Keyserver</string> + <string name="menu_key_server">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">Share…</string> <string name="menu_share_title_fingerprint">Share fingerprint…</string> <string name="menu_share_title">Share whole key…</string> <string name="menu_share_default_fingerprint">with…</string> @@ -110,6 +115,7 @@ <string name="label_select_public_keys">Recipients</string> <string name="label_delete_after_encryption">Delete After Encryption</string> <string name="label_delete_after_decryption">Delete After Decryption</string> + <string name="label_share_after_encryption">Share After Encryption</string> <string name="label_encryption_algorithm">Encryption Algorithm</string> <string name="label_hash_algorithm">Hash Algorithm</string> <string name="label_asymmetric">Public Key</string> @@ -128,6 +134,8 @@ <string name="label_name">Name</string> <string name="label_comment">Comment</string> <string name="label_email">Email</string> + <string name="label_sign_user_id">Sign User Id</string> + <string name="label_sign_email">Sign email</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> @@ -141,11 +149,18 @@ <string name="user_id_no_name"><no name></string> <string name="none"><none></string> <string name="no_key"><no key></string> + <string name="no_email"><No Email></string> <string name="unknown_status"></string> <string name="can_encrypt">can encrypt</string> <string name="can_sign">can sign</string> <string name="expired">expired</string> <string name="revoked">revoked</string> + <string name="user_id">User ID</string> + + <plurals name="n_contacts"> + <item quantity="one">1 contact</item> + <item quantity="other">%d contacts</item> + </plurals> <plurals name="n_key_servers"> <item quantity="one">%d keyserver</item> @@ -209,6 +224,9 @@ <string name="key_deletion_confirmation_multi">Do you really want to delete all selected keys?\nYou can\'t undo this!</string> <string name="secret_key_deletion_confirmation">Do you really want to delete the SECRET key \'%s\'?\nYou can\'t undo this!</string> <string name="ask_save_changed_key">You have made changes to the keyring, would you like to save it?</string> + <string name="public_key_deletetion_confirmation">Do you really want to delete the PUBLIC key \'%s\'?\nYou can\'t undo this!</string> + <string name="secret_key_delete_text">Delete Secret Keys ?</string> + <string name="also_export_secret_keys">Also export secret keys?</string> <plurals name="keys_added_and_updated_1"> <item quantity="one">Successfully added %d key</item> @@ -232,6 +250,7 @@ <string name="keys_exported">Successfully exported %d keys.</string> <string name="no_keys_exported">No keys exported.</string> <string name="key_creation_el_gamal_info">Note: only subkeys support ElGamal, and for ElGamal the nearest keysize of 1536, 2048, 3072, 4096, or 8192 will be used.</string> + <string name="key_creation_weak_rsa_info">Note: generating RSA key with length 1024-bit and less is considered unsafe and it\'s disabled for generating new keys.</string> <string name="key_not_found">Couldn\'t find key %08X.</string> <plurals name="keys_found"> @@ -270,6 +289,7 @@ <string name="error_master_key_must_not_be_el_gamal">the master key cannot be an ElGamal key</string> <string name="error_unknown_algorithm_choice">unknown algorithm choice</string> <string name="error_user_id_needs_a_name">you need to specify a name</string> + <string name="error_user_id_no_email">no email found</string> <string name="error_user_id_needs_an_email_address">you need to specify an email address</string> <string name="error_key_needs_a_user_id">need at least one user id</string> <string name="error_main_user_id_must_not_be_empty">main user id must not be empty</string> @@ -296,18 +316,23 @@ <string name="error_keyserver_insufficient_query">Insufficient server query</string> <string name="error_keyserver_query">Querying keyserver failed</string> <string name="error_keyserver_too_many_responses">Too many responses</string> + <string name="error_import_file_no_content">File has no content</string> + <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</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> + <plurals name="error_import_non_pgp_part"> + <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item> + <item quantity="other">parts of the loaded file are valid OpenPGP objects but not OpenPGP keys</item> + </plurals> <!-- progress dialogs, usually ending in '…' --> - <string name="progress_done">done.</string> - <string name="progress_cancel">cancel</string> + <string name="progress_done">Done.</string> + <string name="progress_cancel">Cancel</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 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> @@ -320,6 +345,11 @@ <item quantity="other">exporting keys…</item> </plurals> + <plurals name="progress_generating"> + <item quantity="one">generating key, this can take up to 3 minutes…</item> + <item quantity="other">generating keys, this can take up to 3 minutes…</item> + </plurals> + <string name="progress_extracting_signature_key">extracting signature key…</string> <string name="progress_extracting_key">extracting key…</string> <string name="progress_preparing_streams">preparing streams…</string> @@ -354,6 +384,7 @@ <!-- Help --> <string name="help_tab_start">Start</string> + <string name="help_tab_faq">FAQ</string> <string name="help_tab_nfc_beam">NFC Beam</string> <string name="help_tab_changelog">Changelog</string> <string name="help_tab_about">About</string> @@ -386,15 +417,22 @@ <!-- Remote API --> <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_info">Show advanced information</string> + <string name="api_settings_hide_info">Hide advanced information</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> <string name="api_settings_select_key">Select key</string> + <string name="api_settings_create_key">Create new key for this account</string> <string name="api_settings_save">Save</string> <string name="api_settings_cancel">Cancel</string> <string name="api_settings_revoke">Revoke access</string> + <string name="api_settings_delete_account">Delete account</string> <string name="api_settings_package_name">Package Name</string> <string name="api_settings_package_signature">SHA-256 of Package Signature</string> + <string name="api_settings_accounts">Accounts</string> + <string name="api_settings_accounts_empty">No accounts attached to this application.</string> + <string name="api_create_account_text">The application requests the creation of a new account. Please select an existing private key or create a new one.\nApplications are restricted to the usage of keys you select here!</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> @@ -424,6 +462,7 @@ <string name="key_list_empty_button_import">importing keys.</string> <!-- Key view --> + <string name="key_view_action_edit">Edit this key</string> <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> @@ -438,5 +477,15 @@ <string name="nav_apps">Registered Apps</string> <string name="drawer_open">Open navigation drawer</string> <string name="drawer_close">Close navigation drawer</string> + <string name="edit">Edit</string> + <string name="my_keys">My Keys</string> + <string name="label_secret_key">Secret Key</string> + <string name="secret_key_yes">available</string> + <string name="secret_key_no">unavailable</string> + <string name="section_uids_to_sign">User IDs to sign</string> + <string name="progress_re_adding_certs">Reapplying certificates</string> + + <!-- hints --> + <string name="encrypt_content_edit_text_hint">Write message here to encrypt…</string> </resources> |
