Merge branch 'master' into yubikey

Conflicts:
	.gitmodules
	OpenKeychain/build.gradle
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
	extern/openpgp-api-lib
	settings.gradle

OpenKeychain/src/main/res/layout/add_subkey_dialog.xml

@@ -1,25 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="5dp">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:minWidth="10dp"
-        android:background="@color/android_green_light" />
+    android:layout_height="match_parent">
 
     <TableLayout
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:paddingLeft="8dp"
+        android:paddingTop="8dp"
+        android:paddingBottom="8dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp"
         android:stretchColumns="1">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_marginBottom="4dp"
+            android:text="@string/key_creation_el_gamal_info" />
+
         <TableRow>
 
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_algorithm" />
+
+            <Spinner
+                android:id="@+id/add_subkey_algorithm"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="4dp" />
+        </TableRow>
+
+        <TableRow>
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:text="@string/label_key_size" />
+
+            <Spinner
+                android:id="@+id/add_subkey_size"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:padding="4dp" />
+        </TableRow>
+
+        <TextView
+            android:id="@+id/add_subkey_custom_key_size_label"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:text="@string/key_size_custom_info"
+            android:visibility="gone" />
+
+        <EditText
+            android:id="@+id/add_subkey_custom_key_size_input"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:inputType="number"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/add_subkey_custom_key_size_info"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+
+        <TableRow
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp">
+
             <TextView
                 android:id="@+id/label_expiry"
                 android:layout_width="wrap_content"
@@ -28,16 +84,36 @@
                 android:paddingRight="10dip"
                 android:text="@string/label_expiry" />
 
-            <Button
-                android:id="@+id/expiry"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:text="@string/none"
-                android:background="@drawable/button_edgy" />
+            <CheckBox
+                android:id="@+id/add_subkey_no_expiry"
+                android:checked="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/btn_no_date" />
+
         </TableRow>
 
         <TableRow
-            android:id="@+id/row_certify">
+            android:id="@+id/add_subkey_expiry_row"
+            android:visibility="gone">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical"
+                android:paddingRight="10dip" />
+
+            <DatePicker
+                android:id="@+id/add_subkey_expiry_date_picker"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:spinnersShown="true"
+                android:calendarViewShown="false" />
+
+        </TableRow>
+
+        <TableRow>
 
             <TextView
                 android:id="@+id/label_usage"
@@ -46,134 +122,61 @@
                 android:layout_gravity="center_vertical"
                 android:paddingRight="10dip"
                 android:text="@string/label_usage" />
+
+
             <CheckBox
-                android:id="@+id/chkCertify"
-                android:enabled = "false"
+                android:id="@+id/add_subkey_flag_certify"
+                android:enabled="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/flag_certify" />
         </TableRow>
 
-        <TableRow
-            android:id="@+id/row_sign">
+        <TableRow>
 
             <TextView
-                android:id="@+id/label_usage2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:paddingRight="10dip"
-                android:text="@string/label_usage" />
+                android:paddingRight="10dip" />
+
             <CheckBox
-                android:id="@+id/chkSign"
+                android:id="@+id/add_subkey_flag_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/flag_sign" />
         </TableRow>
 
-        <TableRow
-            android:id="@+id/row_encrypt">
+        <TableRow>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="10dip" />
+
             <CheckBox
-                android:id="@+id/chkEncrypt"
+                android:id="@+id/add_subkey_flag_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/flag_encrypt" />
         </TableRow>
 
-        <TableRow
-            android:id="@+id/row_authenticate">
+        <TableRow>
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:paddingRight="10dip" />
+
             <CheckBox
-                android:id="@+id/chkAuthenticate"
+                android:id="@+id/add_subkey_flag_authenticate"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/flag_authenticate" />
         </TableRow>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:text="@string/key_creation_el_gamal_info" />
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_algorithm" />
-
-            <Spinner
-                android:id="@+id/create_key_algorithm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_key_size" />
-
-            <Spinner
-                android:id="@+id/create_key_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:padding="4dp" />
-        </TableRow>
-
-        <TextView
-            android:id="@+id/custom_key_size_label"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:text="@string/key_size_custom_info"
-            android:visibility="gone" />
-
-        <EditText
-            android:id="@+id/custom_key_size_input"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:inputType="number"
-            android:visibility="gone" />
-
-        <TextView
-            android:id="@+id/custom_key_size_info"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:padding="4dp"
-            android:visibility="gone" />
-
     </TableLayout>
 
-    <ImageButton
-        android:id="@+id/subkey_added_item_delete"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:padding="8dp"
-        android:src="@drawable/ic_action_cancel"
-        android:layout_gravity="center_vertical"
-        style="@style/SelectableItem" />
-</LinearLayout>
+</ScrollView>

OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml

@@ -53,7 +53,7 @@
         android:text="@string/api_settings_create_key"
         android:background="@drawable/button_edgy"
         android:drawableLeft="@drawable/ic_action_accounts"
-        android:textSize="14dip"/>
+        android:textSize="14sp"/>
 
     <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
         android:layout_width="match_parent"

OpenKeychain/src/main/res/layout/create_key_dialog.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <TableLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:stretchColumns="1" >
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            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
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_algorithm" />
-
-            <Spinner
-                android:id="@+id/create_key_algorithm"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="4dp" />
-        </TableRow>
-
-        <TableRow>
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/label_key_size" />
-
-            <Spinner
-                android:id="@+id/create_key_size"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="right"
-                android:padding="4dp" />
-        </TableRow>
-
-        <TextView
-                android:id="@+id/custom_key_size_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp"
-                android:text="@string/key_size_custom_info"
-                android:visibility="gone"/>
-
-        <EditText
-                android:id="@+id/custom_key_size_input"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:inputType="number"
-                android:visibility="gone"/>
-
-        <TextView
-                android:id="@+id/custom_key_size_info"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:padding="4dp" />
-
-    </TableLayout>
-
-</ScrollView>

OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml

@@ -26,32 +26,41 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                    android:layout_width="match_parent"
+                    android:layout_height="?android:attr/listPreferredItemHeight"
+                    android:orientation="horizontal"
 
-                <EditText
-                    android:id="@+id/decrypt_file_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" />
-
-                <ImageButton
                     android:id="@+id/decrypt_file_browse"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="4dp"
-                    android:src="@drawable/ic_action_collection"
-                    android:background="@drawable/button_rounded"
-                    android:layout_gravity="center_vertical"/>
+                    android:clickable="true"
+                    style="@style/SelectableItem">
+
+                <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="match_parent"
+                        android:paddingLeft="8dp"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:text="@string/label_file_colon"
+                        android:gravity="center_vertical"/>
+
+                <TextView
+                        android:id="@+id/decrypt_file_filename"
+                        android:paddingLeft="8dp"
+                        android:paddingRight="8dp"
+                        android:textAppearance="?android:attr/textAppearanceMedium"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:hint="@string/filemanager_title_open"
+                        android:drawableRight="@drawable/ic_action_collection"
+                        android:drawablePadding="8dp"
+                        android:gravity="center_vertical"/>
             </LinearLayout>
 
+            <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dip"
+                    android:background="?android:attr/listDivider"
+                    android:layout_marginBottom="8dp"/>
+
             <CheckBox
                 android:id="@+id/decrypt_file_delete_after_decryption"
                 android:layout_width="wrap_content"

OpenKeychain/src/main/res/layout/edit_key_key_item.xml

@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.KeyEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:id="@+id/table_keylayout"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:stretchColumns="1" >
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_keyId"
-                    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/keyId"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="00000000 00000000"
-                    android:typeface="monospace" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_algorithm" />
-
-                <TextView
-                    android:id="@+id/algorithm"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_name" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_creation"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_creation" />
-
-                <TextView
-                    android:id="@+id/creation"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_expiry"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_expiry" />
-
-                <Button
-                    android:id="@+id/expiry"
-                    android:layout_width="match_parent"
-                    android:layout_height="40dp"
-                    android:text="@string/none"
-                    android:background="@drawable/button_edgy" />
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/row_certify">
-
-                <TextView
-                    android:id="@+id/label_usage"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_usage" />
-                <CheckBox
-                    android:id="@+id/chkCertify"
-                    android:enabled = "false"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/flag_certify" />
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/row_sign">
-
-                <TextView
-                    android:id="@+id/label_usage2"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip"
-                    android:text="@string/label_usage" />
-                <CheckBox
-                    android:id="@+id/chkSign"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/flag_sign" />
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/row_encrypt">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip" />
-                <CheckBox
-                    android:id="@+id/chkEncrypt"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/flag_encrypt" />
-            </TableRow>
-
-            <TableRow
-                android:id="@+id/row_authenticate">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="10dip" />
-                <CheckBox
-                    android:id="@+id/chkAuthenticate"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/flag_authenticate" />
-            </TableRow>
-        </TableLayout>
-
-        <ImageButton
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:src="@drawable/minus"
-            android:background="@drawable/button_rounded_red"/>
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-</org.sufficientlysecure.keychain.ui.widget.KeyEditor>
-

OpenKeychain/src/main/res/layout/edit_key_section.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.SectionView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <LinearLayout
-        android:id="@+id/header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal" >
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/SectionHeader"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:text="Section Name" />
-
-        <ImageButton
-            android:id="@+id/plusbutton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="10dp"
-            android:src="@drawable/plus"
-            android:background="@drawable/button_rounded_green"/>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/editors"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="6dip" />
-
-</org.sufficientlysecure.keychain.ui.widget.SectionView>

OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml

@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<org.sufficientlysecure.keychain.ui.widget.UserIdEditor xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical" >
-
-    <RadioButton
-        android:id="@+id/isMainUserId"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/label_main_user_id" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal" >
-
-        <TableLayout
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1" >
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_name"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_name" />
-
-                <EditText
-                    android:id="@+id/name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="textPersonName|textCapWords" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_email"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_email" />
-
-                <AutoCompleteTextView
-                    android:id="@+id/email"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="textEmailAddress" />
-            </TableRow>
-
-            <TableRow>
-
-                <TextView
-                    android:id="@+id/label_comment"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:paddingRight="5dip"
-                    android:text="@string/label_comment" />
-
-                <EditText
-                    android:id="@+id/user_id_item_comment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:inputType="text"/>
-            </TableRow>
-        </TableLayout>
-
-        <ImageButton
-            android:id="@+id/delete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="10dip"
-            android:layout_marginLeft="4dip"
-            android:layout_marginRight="6dip"
-            android:src="@drawable/minus"
-            android:background="@drawable/button_rounded_red" />
-    </LinearLayout>
-
-    <View
-        android:id="@+id/separator"
-        android:layout_width="match_parent"
-        android:layout_height="1dip"
-        android:background="?android:attr/listDivider" />
-
-</org.sufficientlysecure.keychain.ui.widget.UserIdEditor>

OpenKeychain/src/main/res/layout/edit_subkey_expiry_dialog.xml

@@ -0,0 +1,16 @@
+<?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">
+
+    <DatePicker
+        android:id="@+id/edit_subkey_expiry_date_picker"
+        android:layout_gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:spinnersShown="true"
+        android:calendarViewShown="false" />
+    <!-- Hide calendarView in tablets because of the unix warparound bug. -->
+
+</LinearLayout>

OpenKeychain/src/main/res/layout/encrypt_activity.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.FixedDrawerLayout 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">
+<android.support.v4.widget.FixedDrawerLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/drawer_layout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".ui.EncryptActivity">
 
     <include layout="@layout/encrypt_content"/>
 

OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml

@@ -1,5 +1,4 @@
 <?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"
@@ -12,66 +11,29 @@
     <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=""
-                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=""
-                android:textAppearance="?android:attr/textAppearanceSmall" />
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:padding="0dp"
+        android:layout_margin="0dp"
+        style="@android:style/Widget.EditText">
 
         <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" />
-
-        <Button
-            android:id="@+id/btn_selectEncryptKeys"
+            android:paddingLeft="12dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="4dp"
-            android:text="@string/select_keys_button_default"
-            android:background="@drawable/button_edgy"
-            android:drawableLeft="@drawable/ic_action_person" />
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="@string/label_asymmetric_from" />
+
+        <Spinner
+            android:id="@+id/sign"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical" />
+
     </LinearLayout>
+
+    <org.sufficientlysecure.keychain.ui.widget.EncryptKeyCompletionView
+        android:id="@+id/recipient_list"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 </LinearLayout>

OpenKeychain/src/main/res/layout/encrypt_asymmetric_signkey.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="wrap_content"
+              android:padding="4dp"
+              android:layout_height="wrap_content">
+    <TextView android:id="@android:id/title"
+              android:textColor="?android:attr/textColorSecondary"
+              android:textSize="18sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"/>
+    <TextView android:id="@android:id/text1"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+    <TextView android:id="@android:id/text2"
+              android:textColor="?android:attr/textColorTertiary"
+              android:textSize="14sp"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:singleLine="true"
+              android:ellipsize="end"
+              android:layout_marginTop="-4dip"/>
+</LinearLayout>

OpenKeychain/src/main/res/layout/encrypt_content.xml

@@ -1,23 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 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"
-    android:orientation="vertical">
-
-    <android.support.v4.view.ViewPager
-        android:id="@+id/encrypt_pager_mode"
+<LinearLayout
+        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="150dp">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <android.support.v4.view.PagerTabStrip
-            android:id="@+id/encrypt_pager_tab_strip_mode"
+    <include layout="@layout/notify_area"/>
+
+    <org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager
+            android:id="@+id/encrypt_pager_mode"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="top"
-            android:textColor="@color/emphasis" />
-    </android.support.v4.view.ViewPager>
+            android:layout_height="match_parent"
+            android:orientation="vertical">
+
+    </org.sufficientlysecure.keychain.ui.widget.NoSwipeWrapContentViewPager>
 
     <android.support.v4.view.ViewPager
         android:id="@+id/encrypt_pager_content"

OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml

@@ -21,43 +21,4 @@
                 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/asciiArmor"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:text="@string/label_ascii_armor"/>
-    </LinearLayout>
 </merge>

OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml

@@ -1,87 +1,72 @@
 <?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:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fillViewport="true">
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="4dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
-        android:orientation="vertical">
-
-        <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" />
-
-            <ImageButton
-                android:id="@+id/btn_browse"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                android:layout_gravity="center_vertical"
-                android:src="@drawable/ic_action_collection"
-                android:background="@drawable/button_rounded"/>
-        </LinearLayout>
-
-        <org.sufficientlysecure.keychain.ui.widget.FoldableLinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            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>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <TextView
-                android:id="@+id/action_encrypt_file"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:textAppearance="?android:attr/textAppearanceMedium"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:orientation="vertical">
+        <ListView
+                android:id="@+id/selected_files_list"
+                android:dividerHeight="4dip"
+                android:divider="@android:color/transparent"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:layout_marginTop="8dp"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:minHeight="?android:attr/listPreferredItemHeight"
-                android:text="@string/btn_encrypt_file"
-                android:clickable="true"
-                style="@style/SelectableItem"
-                android:drawableRight="@drawable/ic_action_save"
-                android:drawablePadding="8dp"
-                android:gravity="center_vertical"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentLeft="true"
-                android:layout_alignParentStart="true"
-                android:layout_marginBottom="8dp" />
+                android:layout_height="0dip"
+                android:layout_weight="1"/>
 
-            <View
+        <View
                 android:layout_width="match_parent"
                 android:layout_height="1dip"
-                android:background="?android:attr/listDivider"
-                android:layout_above="@+id/action_encrypt_file" />
+                android:background="?android:attr/listDivider"/>
 
-        </RelativeLayout>
+        <!-- Note: The following construct should be a widget, we use it quiet often -->
+
+        <LinearLayout
+                android:id="@+id/action_encrypt_share"
+                android:paddingLeft="8dp"
+                android:layout_width="match_parent"
+                android:layout_height="?android:attr/listPreferredItemHeight"
+                android:layout_marginBottom="8dp"
+                android:clickable="true"
+                style="@style/SelectableItem"
+                android:orientation="horizontal">
+
+            <TextView
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:layout_width="0dip"
+                    android:layout_height="match_parent"
+                    android:text="@string/btn_encrypt_share_file"
+                    android:layout_weight="1"
+                    android:drawableRight="@drawable/ic_action_share"
+                    android:drawablePadding="8dp"
+                    android:gravity="center_vertical"/>
+
+            <View
+                    android:layout_width="1dip"
+                    android:layout_height="match_parent"
+                    android:gravity="right"
+                    android:layout_marginBottom="8dp"
+                    android:layout_marginTop="8dp"
+                    android:background="?android:attr/listDivider"/>
+
+            <ImageButton
+                    android:id="@+id/action_encrypt_file"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:padding="8dp"
+                    android:src="@drawable/ic_action_save"
+                    android:layout_gravity="center_vertical"
+                    style="@style/SelectableItem"/>
+
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>

OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml

@@ -1,52 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/modeSymmetric"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
+    android:stretchColumns="1"
     android:paddingTop="4dp"
     android:paddingBottom="4dp"
     android:paddingLeft="16dp"
     android:paddingRight="16dp"
-    android:orientation="vertical">
+    android:layout_centerVertical="true">
 
-    <TableLayout
-        android:id="@+id/modeSymmetric"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="1"
-        android:layout_centerVertical="true">
+    <TableRow>
 
-        <TableRow>
+        <TextView
+            android:id="@+id/label_passphrase"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingRight="8dp"
+            android:text="@string/label_passphrase"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <TextView
-                android:id="@+id/label_passphrase"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="8dp"
-                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>
 
-            <EditText
-                android:id="@+id/passphrase"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:inputType="textPassword" />
-        </TableRow>
+    <TableRow>
 
-        <TableRow>
+        <TextView
+            android:id="@+id/label_passphraseAgain"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:paddingRight="8dp"
+            android:text="@string/label_passphrase_again"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-            <TextView
-                android:id="@+id/label_passphraseAgain"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingRight="8dp"
-                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>
-</RelativeLayout>
+        <EditText
+            android:id="@+id/passphraseAgain"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:inputType="textPassword" />
+    </TableRow>
+</TableLayout>

OpenKeychain/src/main/res/layout/file_list_entry.xml

@@ -0,0 +1,60 @@
+<?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="48dip"
+        android:background="@drawable/attachment_bg_holo">
+
+    <ImageView
+            android:id="@+id/thumbnail"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:scaleType="center"
+            android:layout_width="48dip"
+            android:layout_height="48dip"/>
+
+    <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/thumbnail"
+            android:layout_centerVertical="true">
+
+        <TextView
+                android:id="@+id/filename"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="32dip"
+                android:maxLines="1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:attr/textColorSecondary"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:ellipsize="end"/>
+
+        <TextView
+                android:id="@+id/filesize"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="32dip"
+                android:maxLines="1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="?android:attr/textColorTertiary"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textSize="12sp"
+                android:ellipsize="end"/>
+
+    </LinearLayout>
+
+    <ImageButton
+            android:id="@+id/action_remove_file_from_list"
+            android:layout_width="48dip"
+            android:layout_height="48dip"
+            android:layout_alignParentRight="true"
+            android:paddingRight="16dip"
+            android:paddingLeft="16dip"
+            android:src="@drawable/ic_action_cancel"
+            android:clickable="true"
+            android:layout_centerVertical="true"
+            style="@style/SelectableItem"/>
+</RelativeLayout>

OpenKeychain/src/main/res/layout/file_list_entry_add.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:padding="4dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clickable="true"
+        style="@style/SelectableItem">
+    <TextView
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:text="@string/btn_add_files"
+            android:drawableLeft="@drawable/ic_action_collection"
+            android:drawablePadding="8dp"
+            android:gravity="center"/>
+</FrameLayout>

OpenKeychain/src/main/res/layout/import_keys_list_entry.xml

@@ -100,7 +100,7 @@
             android:orientation="vertical" />
 
         <TextView
-            android:id="@+id/keyId"
+            android:id="@+id/subkey_item_key_id"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="0xBBBBBBBBBBBBBBBB"

OpenKeychain/src/main/res/layout/recipient_box_entry.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@drawable/attachment_bg_holo">
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="4dip"
+            android:id="@android:id/text1"
+            android:layout_gravity="center_vertical"/>
+
+    <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:layout_marginLeft="12dip"
+            android:cropToPadding="true"
+            android:background="#ccc"
+            android:scaleType="centerCrop"/>
+</LinearLayout>

OpenKeychain/src/main/res/layout/recipient_selection_list_entry.xml

@@ -0,0 +1,51 @@
+<?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="48dip"
+        android:orientation="horizontal"
+        android:gravity="center_vertical">
+    <LinearLayout
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:layout_weight="1">
+        <TextView android:id="@android:id/title"
+                  android:textColor="?android:attr/textColorSecondary"
+                  android:textSize="18sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="8dip"
+                  android:singleLine="true"
+                  android:ellipsize="end"/>
+        <TextView android:id="@android:id/text1"
+                  android:textColor="?android:attr/textColorTertiary"
+                  android:textSize="14sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="16dip"
+                  android:singleLine="true"
+                  android:ellipsize="end"
+                  android:layout_marginTop="-4dip"/>
+        <TextView android:id="@android:id/text2"
+                  android:textColor="?android:attr/textColorTertiary"
+                  android:textSize="14sp"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:paddingLeft="16dip"
+                  android:singleLine="true"
+                  android:ellipsize="end"
+                  android:layout_marginTop="-4dip"/>
+    </LinearLayout>
+    <ImageView
+            android:id="@android:id/icon"
+            android:layout_width="56dip"
+            android:layout_height="56dip"
+            android:layout_marginLeft="12dip"
+            android:cropToPadding="true"
+            android:background="#ccc"
+            android:scaleType="centerCrop"/>
+</LinearLayout>

OpenKeychain/src/main/res/layout/select_key_item.xml

@@ -38,7 +38,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <TextView
-            android:id="@+id/keyId"
+            android:id="@+id/subkey_item_key_id"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="0xBBBBBBBBBBBBBBB"

OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml

@@ -15,7 +15,7 @@
         android:text="@string/api_settings_select_key"
         android:drawableLeft="@drawable/ic_action_accounts"
         android:background="@drawable/button_edgy"
-        android:textSize="14dp"/>
+        android:textSize="14sp"/>
 
     <LinearLayout
         android:layout_width="match_parent"

OpenKeychain/src/main/res/layout/view_key_share_fragment.xml

@@ -133,7 +133,6 @@
             android:id="@+id/view_key_action_upload"
             android:paddingLeft="8dp"
             android:paddingRight="8dp"
-            android:layout_marginBottom="8dp"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -144,8 +143,7 @@
             android:layout_weight="1"
             android:drawableRight="@drawable/ic_action_upload"
             android:drawablePadding="8dp"
-            android:gravity="center_vertical"
-            android:editable="false" />
+            android:gravity="center_vertical" />
 
         <View
             android:layout_width="match_parent"

OpenKeychain/src/main/res/layout/view_key_subkey_item.xml

@@ -6,36 +6,39 @@
     android:orientation="horizontal"
     android:singleLine="true">
 
-    <ImageView
-        android:id="@+id/ic_masterKey"
+    <FrameLayout
+        android:id="@+id/subkey_item_buttons"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/key_small"
-        android:padding="8dp"
-        android:layout_centerVertical="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/user_id_item_edit_image"
-        android:src="@drawable/ic_action_edit"
-        android:padding="8dp"
         android:layout_centerVertical="true"
         android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
+        android:layout_alignParentEnd="true">
+
+        <ImageView
+            android:id="@+id/subkey_item_edit_image"
+            android:src="@drawable/ic_action_edit"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp" />
+
+        <ImageButton
+            android:id="@+id/subkey_item_delete_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:src="@drawable/ic_action_cancel"
+            style="@style/SelectableItem" />
+
+    </FrameLayout>
 
     <LinearLayout
         android:orientation="vertical"
-        android:layout_toRightOf="@id/ic_masterKey"
-        android:layout_toLeftOf="@id/user_id_item_edit_image"
+        android:layout_toLeftOf="@id/subkey_item_buttons"
         android:layout_centerVertical="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginRight="8dp"
-        android:id="@+id/linearLayout">
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -46,7 +49,7 @@
             android:paddingTop="2dip">
 
             <TextView
-                android:id="@+id/keyId"
+                android:id="@+id/subkey_item_key_id"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="0x00000000"
@@ -55,7 +58,7 @@
                 android:layout_weight="1" />
 
             <ImageView
-                android:id="@+id/ic_certifyKey"
+                android:id="@+id/subkey_item_ic_certify"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/certify_small"
@@ -63,7 +66,7 @@
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/ic_encryptKey"
+                android:id="@+id/subkey_item_ic_encrypt"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/encrypted_small"
@@ -71,7 +74,7 @@
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/ic_signKey"
+                android:id="@+id/subkey_item_ic_sign"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/signed_small"
@@ -79,7 +82,7 @@
                 android:layout_gravity="center_vertical" />
 
             <ImageView
-                android:id="@+id/ic_revokedKey"
+                android:id="@+id/subkey_item_ic_revoked"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:src="@drawable/revoked_key_small"
@@ -94,7 +97,7 @@
             android:layout_height="match_parent">
 
             <TextView
-                android:id="@+id/keyDetails"
+                android:id="@+id/subkey_item_details"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:paddingRight="5dip"
@@ -103,7 +106,7 @@
                 android:layout_weight="1" />
 
             <TextView
-                android:id="@+id/keyExpiry"
+                android:id="@+id/subkey_item_expiry"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="Expiry: 4/7/2016"

OpenKeychain/src/main/res/layout/view_key_user_id_item.xml

@@ -69,7 +69,7 @@
         android:layout_height="match_parent"
         android:src="@drawable/ic_action_edit"
         android:padding="8dp"
-        android:layout_gravity="center_horizontal" />
+        android:layout_gravity="center_vertical" />
 
     <ImageButton
         android:id="@+id/user_id_item_delete_button"

OpenKeychain/src/main/res/menu/encrypt_activity.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/check_use_symmetric" android:title="@string/label_symmetric" android:checkable="true"/>
+    <item android:id="@+id/check_use_armor" android:title="@string/label_file_ascii_armor" android:checkable="true" />
+    <item android:id="@+id/check_delete_after_encrypt" android:title="@string/label_delete_after_encryption" android:checkable="true" />
+</menu>

OpenKeychain/src/main/res/raw-ar/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-cs/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-el/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-es/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Primeros pasos</h2>
-<p>Primero necesita una clave privada (secreta) personal. Cree una mediante las opciones de menú en &quot;Claves&quot;, o importe claves privadas existentes. En adelante puede descargar las claves de sus amigos, o intercambiarlas mediante códigos QR o vía NFC.</p>
+<p>Primero necesita una clave privada (secreta) personal. Cree una mediante las opciones de menú en "Claves", o importe claves privadas existentes. En adelante puede descargar las claves de sus amigos, o intercambiarlas mediante códigos QR o vía 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>
 

OpenKeychain/src/main/res/raw-et/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-fr/help_changelog.html

@@ -38,7 +38,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>prise en charge des ports du serveur de clefs</li>
 <li>désactiver la possibilité de générer des clefs faibles</li>
 <li>bien plus de travail interne sur l'API</li>
-<li>certifier les ID des utilisateurs</li>
+<li>certifier les ID d'utilisateurs</li>
 <li>requête du serveur de clef basée sur une sortie lisible par la machine</li>
 <li>verrouiller le tiroir de navigation sur les tablettes</li>
 <li>suggestions de courriels à la création des clefs</li>
@@ -56,7 +56,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>autres correctifs internes affectant la modifications des clefs (merci à Ash hughes)</li>
 <li>interrogation des serveurs de clefs directement depuis l'écran d'importation</li>
 <li>correctif de mise en page et du style des fenêtres de dialogue sur Android 2.2-3.0</li>
-<li>corrige un plantage pour les clefs avec des ID utilisateur vides</li>
+<li>corriger un plantage pour les clefs avec des ID d'utilisateurs vides</li>
 <li>corrige un plantage et des listes vides en revenant de l'écran de signature</li>
 <li>Bouncy Castle (bibliothèque cryptographique) mise à jour de 1.47 à 1.50 et compilée depuis la source</li>
 <li>correction du téléversement d'une clef depuis l'écran de signature</li>
@@ -111,7 +111,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>correction de l'ajout de compte sur Froyo</li>
 <li>suppression sécurisée de fichiers</li>
 <li>option de suppression du fichier de clef après l'importation</li>
-<li>chiffrement/déchiffrement de flux (galerie, etc...)</li>
+<li>chiffrement/déchiffrement de flux (galerie, etc.)</li>
 <li>nouvelles options (langue, forcer les signatures v3)</li>
 <li>changements dans l'interface</li>
 <li>correctifs de bogues</li>

OpenKeychain/src/main/res/raw-fr/help_wot.html

@@ -11,7 +11,7 @@
 <p>L'évaluation de la confiance est fondée sur la simple supposition que toutes les clefs ayant des clefs secrètes disponibles sont de confiance. Les clefs publiques contenant au moins un ID d'utilisateur certifié par une clef de confiance seront marquées par un point vert dans le listage des clefs. Il n'est pas (encore) possible de spécifier les niveaux de confiance pour les certificats d'autres clefs publiques inconnues.</p>
 
 <h2>Certifications des clefs</h2>
-<p>La prise en charge de la certification des clefs est disponible et les ID d'utilisateur peuvent être certifiées individuellement. Il n'est pas encore possible de spécifier le niveau de confiance ou de créer des certificats locaux et d'autres types spéciaux.</p>
+<p>La prise en charge de la certification des clefs est disponible et les ID d'utilisateurs peuvent être certifiées individuellement. Il n'est pas encore possible de spécifier le niveau de confiance ou de créer des certificats locaux et d'autres types spéciaux.</p>
 
 </body>
 </html>

OpenKeychain/src/main/res/raw-ja/help_changelog.html

@@ -38,7 +38,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <li>鍵サーバのポート設定のサポート</li>
 <li>弱い鍵の生成が可能だったのを無効化</li>
 <li>さらなるAPIでの内部動作</li>
-<li>ユーザーIDの証明</li>
+<li>ユーザIDの証明</li>
 <li>鍵サーバへの要求をマシンリーダブル出力を基盤にした</li>
 <li>タブレットでのナビゲーションドロワーのロック</li>
 <li>鍵の生成についてメールでのサジェスト</li>

OpenKeychain/src/main/res/raw-ja/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>入門</h2>
-<p>最初にあなたの個人用秘密鍵が必要になります。オプションメニューの&quot;鍵&quot;で生成するか、既存の秘密鍵をインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p>
+<p>最初にあなたの個人用秘密鍵が必要になります。オプションメニューの"鍵"で生成するか、既存の秘密鍵をインポートします。その後、あなたの友人の鍵をダウンロード、もしくはQRコードやNFCで交換します。</p>
 
 <p>ファイルの選択を拡張するには<a href="market://details?id=org.openintents.filemanager">OI File Manager</a>、<a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a>を生成したQRコードのスキャンのため、それぞれのインストールを必要とします。 リンクをクリックして、Google Play Store上かF-Droidからインストールしてください。</p>
 

OpenKeychain/src/main/res/raw-ja/help_wot.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>信頼の輪</h2>
-<p>信頼の輪はPGPが証明の作成と維持する一面を説明します。ユーザが公開鍵が属する者の追跡を維持し、他のユーザーとその情報を共有する手助けになるメカニズムを提供します。暗号化通信のプライバシーを確保するためには、あなたが暗号化したいという相手の公開鍵が必要な要素となります</p>
+<p>信頼の輪はPGPが証明の作成と維持する一面を説明します。ユーザが公開鍵が属する者の追跡を維持し、他のユーザとその情報を共有する手助けになるメカニズムを提供します。暗号化通信のプライバシーを確保するためには、あなたが暗号化したいという相手の公開鍵が必要な要素となります</p>
 
 <h2>OpenKeychainでサポート</h2>
 <p>OpenKeychainで信頼の輪の基本のみサポートされます。とても重い作業を進めており今後やってくるリリースにおいて状態が変更されていきます。</p>

OpenKeychain/src/main/res/raw-ko/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Getting started</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-pl/help_changelog.html

@@ -136,7 +136,7 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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 &quot;wyświetl&quot; i &quot;wyślij&quot;, umożliwia szyfrowanie/deszyfrowanie plików wprost z menadżera plików.</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>

OpenKeychain/src/main/res/raw-pl/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Pierwsze kroki</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or 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>
 

OpenKeychain/src/main/res/raw-ro/help_about.html

@@ -0,0 +1,50 @@
+<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>
+<li>Tim Bray</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>

OpenKeychain/src/main/res/raw-ro/help_changelog.html

@@ -0,0 +1,156 @@
+<html>
+<head></head>
+<body>
+<h2>2.7</h2>
+<ul>
+<li>Purple! (Dominik, Vincent)</li>
+<li>New key view design (Dominik, Vincent)</li>
+<li>New flat Android buttons (Dominik, Vincent)</li>
+<li>API fixes (Dominik)</li>
+<li>Keybase.io import (Tim Bray)</li>
+</ul>
+<h2>2.6.1</h2>
+<ul>
+<li>some fixes for regression bugs</li>
+</ul>
+<h2>2.6</h2>
+<ul>
+<li>key certifications (thanks to Vincent Breitmoser)</li>
+<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>new design for signature verification</li>
+<li>custom key length (thanks to Greg Witczak)</li>
+<li>fix share-functionality from other apps</li>
+</ul>
+<h2>2.5</h2>
+<ul>
+<li>fix decryption of symmetric pgp messages/files</li>
+<li>refactored edit key screen (thanks to Ash Hughes)</li>
+<li>new modern design for encrypt/decrypt screens</li>
+<li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
+</ul>
+<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>

OpenKeychain/src/main/res/raw-ro/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>

OpenKeychain/src/main/res/raw-ro/help_start.html

@@ -0,0 +1,22 @@
+<html>
+<head></head>
+<body>
+<h2>Getting started</h2>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>Applications</h2>
+<p>Several applications support OpenKeychain to encrypt/sign your private communication:<br><img src="apps_k9"><br>K-9 Mail: OpenKeychain support available in current <a href="https://github.com/k9mail/k-9/releases/tag/4.904">alpha build</a>!<br><a href="market://details?id=eu.siacs.conversations"><img src="apps_conversations"><br>Conversations</a>: Jabber/XMPP client<br><a href="market://details?id=org.lf_net.pgpunlocker"><img src="apps_pgpauth"><br>PGPAuth</a>: App to send a PGP-signed request to a server to open or close something, e.g. a door</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>

OpenKeychain/src/main/res/raw-ro/help_wot.html

@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Web of Trust</h2>
+<p>The Web of Trust describes the part of PGP which deals with creation and bookkeeping of certifications. It provides mechanisms to help the user keep track of who a public key belongs to, and share this information with others; To ensure the privacy of encrypted communication, it is essential to know that the public key you encrypt to belongs to the person you think it does.</p>
+
+<h2>Support in OpenKeychain</h2>
+<p>There is only basic support for Web of Trust in OpenKeychain. This is a heavy work in progress and subject to changes in upcoming releases.</p>
+
+<h2>Trust Model</h2>
+<p>Trust evaluation is based on the simple assumption that all keys which have secret keys available are trusted. Public keys which contain at least one user id certified by a trusted key will be marked with a green dot in the key listings. It is not (yet) possible to specify trust levels for certificates of other known public keys.</p>
+
+<h2>Certifying keys</h2>
+<p>Support for key certification is available, and user ids can be certified individually. It is not yet possible to specify the level of trust or create local and other special types of certificates.</p>
+
+</body>
+</html>

OpenKeychain/src/main/res/raw-ro/nfc_beam_share.html

@@ -0,0 +1,11 @@
+<html>
+<head></head>
+<body>
+<ol>
+<li>Make sure that NFC is turned on in Settings &gt; More &gt; 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>

OpenKeychain/src/main/res/raw-ru/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Приступая</h2>
-<p>Для начала Вас нужен свой секретный ключ. Создайте его  в меню раздела &quot;Ключи&quot; или импортируйте ранее созданный ключ. Позже вы сможете поделиться данными своего ключа с друзьями с помощью QR кода или NFC.</p>
+<p>Для начала Вас нужен свой секретный ключ. Создайте его  в меню раздела "Ключи" или импортируйте ранее созданный ключ. Позже вы сможете поделиться данными своего ключа с друзьями с помощью QR кода или NFC.</p>
 
 <p>Рекомендуется установить <a href="market://details?id=org.openintents.filemanager">OI File Manager</a> для удобного выбора файлов и <a href="market://details?id=com.google.zxing.client.android">Barcode Scanner</a> для распознавания QR кодов. Перейдите по ссылкам на соответствующие страницы Google Play или F-Droid для дальнейшей установки.</p>
 

OpenKeychain/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 secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-uk/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>Приступаючи до роботи</h2>
-<p>Спершу вам потрібний особистий секретний ключ. Створіть один через меню параметрів у „Ключі&quot; або імпортуйте наявні секретні ключі через &quot;Імпорт ключів&quot;. Після цього ви зможете завантажувати ключі ваших друзів чи обміняти їх через штрих-коди або 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>
 

OpenKeychain/src/main/res/raw-zh/help_start.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <h2>快速上手</h2>
-<p>First you need a personal secret key. Create one via the option menus in &quot;Keys&quot; or import existing secret keys. Afterwards, you can download your friends' keys or exchange them via QR Codes or NFC.</p>
+<p>First you need a personal secret key. Create one via the option menus in "Keys" or import existing secret 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>
 

OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html

@@ -2,7 +2,7 @@
 <head></head>
 <body>
 <ol>
-<li>確定在 &quot;設定&quot; &gt; &quot;更多內容…&quot; &gt; &quot;NFC&quot; 裡面已經開啟 NFC 和 Android Beam。</li>
+<li>確定在 "設定" &gt; "更多內容…" &gt; "NFC" 裡面已經開啟 NFC 和 Android Beam。</li>
 <li>將兩部裝置背對背貼近(幾乎接觸)，你會感覺到一股震動。</li>
 <li>震動之後你會看見你夥伴的畫面變成卡片狀，並且背景帶有如 Star Trek 般的特效。</li>
 <li>輕觸卡片，內容隨即顯示在你的裝置上。</li>

OpenKeychain/src/main/res/raw/help_about.html

@@ -9,40 +9,41 @@ And don't add newlines before or after p tags because of transifex -->
 <p><a href="http://www.openkeychain.org">OpenKeychain</a> is an OpenPGP implementation for Android.</p>
 <p>License: GPLv3+</p>
 
-<h2>Developers OpenKeychain</h2>
+<h2>Developers</h2>
 <ul>
-<li>Dominik Schürmann (Lead developer)</li>
-<li>Ash Hughes (crypto patches)</li>
+<li>Dominik Schürmann (Maintainer)</li>
+<li>Art O Cathain</li>
+<li>Ash Hughes</li>
 <li>Brian C. Barnes</li>
-<li>Bahtiar 'kalkin' Gadimov (UI)</li>
+<li>Bahtiar 'kalkin' Gadimov</li>
+<li>Daniel Albert
 <li>Daniel Hammann</li>
 <li>Daniel Haß</li>
 <li>Greg Witczak</li>
+<li>'mar-v-in'</li>
+<li>Markus Doits</li>
 <li>Miroojin Bakshi</li>
 <li>Nikhil Peter Raj</li>
 <li>Paul Sarbinowski</li>
+<li>'Senecaso'</li>
 <li>Sreeram Boyapati</li>
-<li>Vincent Breitmoser</li>
+<li>Thialfihar (APG 1.x)</li>
 <li>Tim Bray</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>
+<li>Vincent Breitmoser</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/timbray/KeybaseLib">KeybaseLib</a> (Apache License v2)</li>
+<li><a href="https://github.com/JohnPersano/SuperToasts">SuperToasts</a> (Apache License v2)</li>
+<li><a href="https://github.com/splitwise/TokenAutoComplete">TokenAutoComplete</a> (Apache License v2)</li>
+<li><a href="https://github.com/rtreffer/minidns">MiniDNS</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>

OpenKeychain/src/main/res/raw/help_changelog.html

@@ -5,6 +5,20 @@ And don't add newlines before or after p tags because of transifex -->
 <head>
 </head>
 <body>
+<h2>2.8</h2>
+<ul>
+<li>So many bugs have been fixed in this release that we focus on the main new features</li>
+<li>Key edit: awesome new design, key revocation</li>
+<li>Key import: awesome new design, secure keyserver connections via hkps, keyserver resolving via DNS SRV records</li>
+<li>New first time screen</li>
+<li>New create key screen: autocompletion of name and email based on your personal Android accounts</li>
+<li>File encryption: awesome new design, support for encrypting multiple files</li>
+<li>New icons to show status of key (by Brennan Novak)</li>
+<li>Important bug fix: Importing of large key collections from a file is now possible</li>
+<li>Notification showing cached passphrases</li>
+</ul>
+<p>This release wouldn't be possible without the work of Vincent Breitmoser (GSoC 2014), mar-v-in (GSoC 2014), Daniel Albert, Art O Cathain, Daniel Haß, Tim Bray, Thialfihar</p>
+
 <h2>2.7</h2>
 <ul>
 <li>Purple! (Dominik, Vincent)</li>
@@ -16,23 +30,23 @@ And don't add newlines before or after p tags because of transifex -->
 
 <h2>2.6.1</h2>
 <ul>
-<li>some fixes for regression bugs</li>
+<li>Some fixes for regression bugs</li>
 </ul>
 
 <h2>2.6</h2>
 <ul>
-<li>key certifications (thanks to Vincent Breitmoser)</li>
-<li>support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
-<li>new design for signature verification</li>
-<li>custom key length (thanks to Greg Witczak)</li>
-<li>fix share-functionality from other apps</li>
+<li>Key certifications (thanks to Vincent Breitmoser)</li>
+<li>Support for GnuPG partial secret keys (thanks to Vincent Breitmoser)</li>
+<li>New design for signature verification</li>
+<li>Custom key length (thanks to Greg Witczak)</li>
+<li>Fix share-functionality from other apps</li>
 </ul>
 
 <h2>2.5</h2>
 <ul>
-<li>fix decryption of symmetric pgp messages/files</li>
-<li>refactored edit key screen (thanks to Ash Hughes)</li>
-<li>new modern design for encrypt/decrypt screens</li>
+<li>Fix decryption of symmetric pgp messages/files</li>
+<li>Refactored edit key screen (thanks to Ash Hughes)</li>
+<li>New modern design for encrypt/decrypt screens</li>
 <li>OpenPGP API version 3 (multiple api accounts, internal fixes, key lookup)</li>
 </ul>
 
@@ -41,48 +55,48 @@ And don't add newlines before or after p tags because of transifex -->
 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>
+<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>
+<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>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>
+<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>
+<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>
@@ -92,73 +106,73 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 
 <h2>2.1</h2>
 <ul>
-<li>lots of bug fixes</li>
-<li>new API for developers</li>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
+<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>
@@ -169,11 +183,11 @@ Daniel Hammann, Daniel Haß, Greg Witczak, Miroojin Bakshi, Nikhil Peter Raj, Pa
 <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>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>
+<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>

OpenKeychain/src/main/res/values-ar/strings.xml

@@ -25,6 +25,9 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
   <!--Navigation Drawer-->
   <!--hints-->
   <!--certs-->
@@ -32,6 +35,9 @@
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <!--PassphraseCache-->
   <!--unsorted-->
+  <!--First Time-->
 </resources>

OpenKeychain/src/main/res/values-cs/strings.xml

@@ -1,17 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_select_recipients">Vybrat veřejný klíč</string>
-  <string name="title_select_secret_key">Vybrat veřjný klíč</string>
   <string name="title_encrypt">Zašifrovat</string>
   <string name="title_decrypt">Rozšifrovat</string>
   <string name="title_authentication">Heslo</string>
-  <string name="title_create_key">Vytvořit klíč</string>
   <string name="title_edit_key">Editovat klíč</string>
   <string name="title_preferences">Možnosti</string>
   <string name="title_api_registered_apps">Appky</string>
   <string name="title_key_server_preference">Nastavení keyservrů</string>
-  <string name="title_set_passphrase">Nastavit heslo</string>
+  <string name="title_change_passphrase">Změnit heslo</string>
   <string name="title_encrypt_to_file">Zašifrovat do souboru</string>
   <string name="title_decrypt_to_file">Rozšifrovat do souboru</string>
   <string name="title_import_keys">Importovat klíče</string>
@@ -19,6 +16,8 @@
   <string name="title_export_keys">Exportovat klíče</string>
   <string name="title_key_not_found">Klíč nebyl nalezen</string>
   <string name="title_send_key">Nahrát na keyserver</string>
+  <string name="title_certify_key">Certifikovat identity</string>
+  <string name="title_key_details">Detaily klíče</string>
   <string name="title_help">Nápověda</string>
   <!--section-->
   <string name="section_user_ids">Identity</string>
@@ -26,6 +25,10 @@
   <string name="section_general">Obecné</string>
   <string name="section_defaults">Výchozí hodnoty</string>
   <string name="section_advanced">Pokročilé</string>
+  <string name="section_actions">Akce</string>
+  <string name="section_certification_key">Klíč použitý pro certifikaci</string>
+  <string name="section_upload_key">Uploadovat klíč</string>
+  <string name="section_key_server">Keyserver</string>
   <!--button-->
   <string name="btn_encrypt_file">Zaširovat a uložit soubor</string>
   <string name="btn_save">Uložit</string>
@@ -33,41 +36,31 @@
   <string name="btn_delete">Smazat</string>
   <string name="btn_no_date">Nic</string>
   <string name="btn_okay">OK</string>
-  <string name="btn_change_passphrase">Změnit nové heslo</string>
-  <string name="btn_set_passphrase">Nastavit nové heslo</string>
   <string name="btn_export_to_server">Nahrát na keyserver</string>
   <string name="btn_next">Další</string>
   <string name="btn_back">Zpět</string>
+  <string name="btn_lookup_key">Vyhledat klíč</string>
   <!--menu-->
   <string name="menu_preferences">Nastavení</string>
+  <string name="menu_help">Nápověda</string>
   <string name="menu_export_key">Exportovat do souboru</string>
   <string name="menu_delete_key">Smazat klíč</string>
-  <string name="menu_create_key">Vytvořit klíč</string>
-  <string name="menu_create_key_expert">Vytvořit klíč (pokročilé)</string>
   <string name="menu_search">Hledat</string>
-  <string name="menu_key_server">Keyserver...</string>
-  <string name="menu_update_key">Obnovit z keyservru</string>
-  <string name="menu_export_key_to_server">Obnovit na keyserveru</string>
-  <string name="menu_share">Sdílet...</string>
-  <string name="menu_share_qr_code">pomocí QR kódu</string>
-  <string name="menu_share_nfc">pomocí NFC</string>
   <string name="menu_beam_preferences">Beam settings</string>
+  <string name="menu_key_edit_cancel">Zrušit</string>
+  <string name="menu_encrypt_to">Zašifrovat do...</string>
+  <string name="menu_select_all">Vybrat vše</string>
+  <string name="menu_add_keys">Přidat klíče</string>
   <!--label-->
-  <string name="label_sign">Podepsat</string>
   <string name="label_message">Zpráva</string>
   <string name="label_file">Soubor</string>
   <string name="label_no_passphrase">Bez hesla</string>
   <string name="label_passphrase">Heslo</string>
-  <string name="label_passphrase_again">Znovu</string>
   <string name="label_algorithm">Algoritmus</string>
   <string name="label_ascii_armor">ASCII Armor</string>
-  <string name="label_select_public_keys">Příjemci</string>
-  <string name="label_delete_after_encryption">Smazat po zašifrování</string>
   <string name="label_delete_after_decryption">Smazat po rozšifrování</string>
   <string name="label_encryption_algorithm">Šifrovací algoritmus</string>
   <string name="label_hash_algorithm">Hashovací algoritmus</string>
-  <string name="label_asymmetric">veřejným klíčem</string>
-  <string name="label_symmetric">heslem</string>
   <string name="label_passphrase_cache_ttl">Cache hesel</string>
   <string name="label_message_compression">Komprimovat zprávu</string>
   <string name="label_file_compression">Komprimovat soubor</string>
@@ -82,11 +75,15 @@
   <string name="label_comment">Komentář</string>
   <string name="label_email">Email</string>
   <string name="label_send_key">Po vytvoření nahrt na vybraný keyserver</string>
+  <string name="label_fingerprint">Otisk</string>
+  <string name="expiry_date_dialog_title">Nastavit datum expirace</string>
+  <string name="user_id_no_name">&lt;beze jména&gt;</string>
   <string name="none">&lt;žádný&gt;</string>
   <string name="no_key">&lt;žádný klíč&gt;</string>
   <string name="can_encrypt">slouží k šifrovní</string>
   <string name="can_sign">slouží k podpisu</string>
   <string name="expired">po epiraci</string>
+  <string name="revoked">revokovat</string>
   <string name="secret_key">Tajný klíč:</string>
   <!--choice-->
   <string name="choice_none">Žádný</string>
@@ -101,15 +98,21 @@
   <string name="choice_2hours">2 hodiny</string>
   <string name="choice_4hours">4 hodiny</string>
   <string name="choice_8hours">8 hodin</string>
+  <string name="choice_forever">navždy</string>
   <string name="dsa">DSA</string>
+  <string name="elgamal">ElGamal</string>
+  <string name="rsa">RSA</string>
   <string name="filemanager_title_open">Otevřít...</string>
   <string name="warning">Varovnání</string>
   <string name="error">Chyba</string>
   <string name="error_message">Chyba: %s</string>
   <!--key flags-->
+  <string name="flag_certify">Certifikovat</string>
+  <string name="flag_sign">Podepsat</string>
+  <string name="flag_encrypt">Zašifrovat</string>
+  <string name="flag_authenticate">Authentikovat</string>
   <!--sentences-->
   <string name="wrong_passphrase">Špatné heslo.</string>
-  <string name="set_a_passphrase">Nejprve nastavit heslo.</string>
   <string name="no_filemanager_installed">Není nainstalován žádný compatibilní správce souborů.</string>
   <string name="passphrases_do_not_match">Hesla se neshodují.</string>
   <string name="passphrase_must_not_be_empty">Prosím zadejte heslo.</string>
@@ -124,7 +127,9 @@
   <string name="specify_file_to_encrypt_to">Prosím specifikujte do kterého souboru zašifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
   <string name="specify_file_to_decrypt_to">Prosím specifikujte do kterého souboru rozšifrovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
   <string name="specify_file_to_export_to">Prosím specifikujte do kterého souboru exportovat.\nVAROVÁNÍ: Pokud soubor již existuje, bude přepsán.</string>
+  <string name="key_deletion_confirmation_multi">Opravdu si přejete smazat všechny vybrané veřejné klíče?\nToto nebude možné vzít zpět!</string>
   <string name="secret_key_deletion_confirmation">Opravdu chcete smazat TAJNÝ klíč \'%s\'?\nToto je nevratná operace!</string>
+  <string name="public_key_deletetion_confirmation">Opravdu chcete smazat veřejný klíč \'%s\'?\nToto nebude možné vrátit zpět!</string>
   <string name="key_exported">Úspěšně exportován 1 klíč.</string>
   <string name="keys_exported">Úspěšně exportován %d klíč.</string>
   <string name="no_keys_exported">Žádný kláč pro export.</string>
@@ -132,6 +137,8 @@
   <string name="key_not_found">Nemohu najít klíč %08X.</string>
   <string name="key_send_success">Úspěšně nahráno na keyserver.</string>
   <string name="list_empty">Seznam je prázný!</string>
+  <string name="key_copied_to_clipboard">Klíč byl zkopírován do schránky!</string>
+  <string name="key_too_big_for_sharing">Klíč je příliš velký aby byl sdílen pomocí této metody!</string>
   <!--errors
          no punctuation, all lowercase,
          they will be put after "error_message", e.g. "Error: file not found"-->
@@ -140,32 +147,153 @@
   <string name="error_no_secret_key_found">žádný vhodný tajný klíč nenalezen</string>
   <string name="error_external_storage_not_ready">externí úložiště není připraveno</string>
   <string name="error_key_size_minimum512bit">délka klíče musí být alespoň 512 bitů</string>
-  <string name="error_master_key_must_not_be_el_gamal">hlavní klíč nemůže být typu ElGamal</string>
   <string name="error_unknown_algorithm_choice">neznámý typ algoritmu</string>
+  <string name="error_user_id_no_email">žádný email nenalezen</string>
   <string name="error_key_needs_a_user_id">potřebuji alespoň jednu identitu</string>
-  <string name="error_main_user_id_must_not_be_empty">hlavní identita nesmí být prázdná</string>
-  <string name="error_key_needs_master_key">potřebuji alespoň hlavní klíč</string>
+  <string name="error_no_signature_passphrase">nebylo poskytnuto heslo</string>
+  <string name="error_no_signature_key">nebyl poskytnut podpisový klíč</string>
+  <string name="error_invalid_data">kryptovaná data nejsou správná</string>
+  <string name="error_integrity_check_failed">selhala kontrola integrity! Data byla pozměněna!</string>
+  <string name="error_wrong_passphrase">špatné heslo</string>
+  <string name="error_could_not_extract_private_key">nebylo možné extrahovat privátní klíč</string>
   <!--errors without preceeding Error:-->
+  <string name="error_jelly_bean_needed">Musíte mít Android 4.1 abyste mohli používat Androidí NFC Beam technologii!</string>
+  <string name="error_nfc_needed">NFC není na vašem zařízení k dispozici!</string>
+  <string name="error_nothing_import">Žádný klíč nenalezen!</string>
+  <string name="error_generic_report_bug">Nastala obecná chyba, prosím vytvořte nový bug report pro OpenKeychain.</string>
   <!--results shown after decryption/verification-->
   <!--progress dialogs, usually ending in '…'-->
+  <string name="progress_done">Hotovo.</string>
+  <string name="progress_cancel">Zrušit</string>
+  <string name="progress_saving">ukládám...</string>
+  <string name="progress_importing">importuji...</string>
+  <string name="progress_exporting">exportuji...</string>
+  <string name="progress_building_key">vytvářím klíč...</string>
+  <string name="progress_building_master_key">vytvářím hlavní klíč...</string>
+  <string name="progress_extracting_signature_key">extrahuji podpisový klíč...</string>
+  <string name="progress_extracting_key">extrahuji klíč...</string>
+  <string name="progress_preparing_streams">připravuji streamy...</string>
+  <string name="progress_encrypting">šifruji data...</string>
+  <string name="progress_decrypting">dešifruji data...</string>
+  <string name="progress_preparing_signature">připravuji podpis...</string>
+  <string name="progress_generating_signature">generuji podpis...</string>
+  <string name="progress_processing_signature">zpracovávám podpis...</string>
+  <string name="progress_verifying_signature">verifikuji podpis...</string>
+  <string name="progress_signing">podepisuji...</string>
+  <string name="progress_reading_data">načítám data...</string>
+  <string name="progress_finding_key">hledám klíč...</string>
+  <string name="progress_decompressing_data">rozbaluji data...</string>
+  <string name="progress_verifying_integrity">verifikuji integritu...</string>
+  <string name="progress_deleting_securely">mažu \'%s\' bezpečně...</string>
   <!--action strings-->
+  <string name="hint_public_keys">Jméno/Email/ID klíče</string>
   <!--key bit length selections-->
+  <string name="key_size_512">512</string>
+  <string name="key_size_768">768</string>
+  <string name="key_size_1024">1024</string>
+  <string name="key_size_1536">1536</string>
+  <string name="key_size_2048">2048</string>
+  <string name="key_size_3072">3072</string>
+  <string name="key_size_4096">4096</string>
+  <string name="key_size_8192">8192</string>
+  <string name="key_size_custom">Vlastní velikost klíče</string>
+  <string name="key_size_custom_info">Napište vlastní délku klíče (v bitech):</string>
+  <string name="key_size_custom_info_rsa">délka RSA klíče musí být větší než 1024 a nejvýše 8192. Zároveň musí být dělitelná 8mi.</string>
+  <string name="key_size_custom_info_dsa">Délka DSA klíče musí být alespoň 512 a nejvýše 1024. Zároveň musí být dělitelná 64.</string>
   <!--compression-->
+  <string name="compression_fast">rychle</string>
+  <string name="compression_very_slow">velmi pomalu</string>
   <!--Help-->
+  <string name="help_tab_start">Začít</string>
+  <string name="help_tab_faq">FAQ</string>
+  <string name="help_tab_wot">Síť důvěry</string>
+  <string name="help_tab_nfc_beam">NFC Beam</string>
+  <string name="help_tab_changelog">Historie změn</string>
+  <string name="help_tab_about">O aplikaci</string>
+  <string name="help_about_version">Verze:</string>
   <!--Import-->
+  <string name="import_import">Importovat vybrané klíče</string>
+  <string name="import_qr_code_wrong">QR kód nerozpoznán! Zkuste to znovu prosím!</string>
+  <string name="import_qr_code_too_short_fingerprint">Fingerprint je příliš krátký (&lt; 16 znaků)</string>
   <!--Import result toast-->
   <!--Intent labels-->
+  <string name="intent_decrypt_file">Dešifrovat soubor pomocí OpenKeychain</string>
+  <string name="intent_import_key">Importovat kíč pomocí OpenKeychain</string>
+  <string name="intent_send_encrypt">Zašifrovat pomocí OpenKeychain</string>
+  <string name="intent_send_decrypt">Dešifrovat pomocí OpenKeychain</string>
   <!--Remote API-->
+  <string name="api_no_apps">Neregistrovaná appka!\n\nSeznam podporovaných aplikací třetích stran je možo nalézt v \'Nápovědě\'!</string>
+  <string name="api_settings_show_info">Zobrazit pokročilé informace</string>
+  <string name="api_settings_hide_info">Schovat pokročilé informace</string>
+  <string name="api_settings_show_advanced">Zobrazit pokročilá nastavení</string>
+  <string name="api_settings_hide_advanced">Schovat pokročilá nastavení</string>
+  <string name="api_settings_no_key">Žádný klíč nebyl vybrán</string>
+  <string name="api_settings_select_key">Vybrat klíč</string>
+  <string name="api_settings_create_key">Vytvořit nový klíč pro tento účet</string>
+  <string name="api_settings_save">Uložit</string>
+  <string name="api_settings_cancel">Zrušit</string>
+  <string name="api_settings_revoke">Zneplatnit přístup</string>
+  <string name="api_settings_delete_account">Smazat účet</string>
+  <string name="api_settings_package_name">Jméno balíčku</string>
+  <string name="api_settings_package_signature">SHA-256 z podpisu balíčku</string>
+  <string name="api_settings_accounts">Účty</string>
+  <string name="api_settings_accounts_empty">Žádné účty nejsou specifikovány pro tuto appku.</string>
+  <string name="api_register_text">Zobrazená appka chce zašifrovat/rozšifrovat zprávy a podepsat je vačím jménem.\nPovolit přístup?\n\nVAROVÁNÍ: Pokud nevíte proč se tato obrazovka objevila, zamítněte přístup! Také můžete zneplatnit přístup jindy v obrazovce \'Appky\'.</string>
+  <string name="api_register_allow">Povolit přístup</string>
+  <string name="api_register_disallow">Zamítnout přístup</string>
+  <string name="api_register_error_select_key">Prosím vyberte klíč!</string>
+  <string name="api_select_pub_keys_missing_text">Nebyl nalezen žádný veřejný klíč pro tyto identity:</string>
+  <string name="api_select_pub_keys_dublicates_text">Existuje více jak jeden veřejný klíč pro tyto identity:</string>
+  <string name="api_select_pub_keys_text">Zkontrolujte prosím seznam příjemců!</string>
+  <string name="api_error_wrong_signature">Selhala kontrola podpisu! Instalovali jste tuto appku z jiného zdroje? Pokud jste si jistí, že toto není útok, zneplatněte registraci této appky v OpenKeychain a poté ji znovu zaregistrujte.</string>
   <!--Share-->
+  <string name="share_qr_code_dialog_title">Sdílet pomocí QR kódu</string>
+  <string name="share_nfc_dialog">Sdílet pomocí NFC</string>
   <!--Key list-->
+  <string name="key_list_empty_text1">Žádné klíče nejsou zatím k dispozici...</string>
+  <string name="key_list_empty_text2">Můžete začít pomocí</string>
+  <string name="key_list_empty_text3">nebo</string>
+  <string name="key_list_empty_button_create">vytvářím váš vlastní klíč</string>
   <!--Key view-->
+  <string name="key_view_action_edit">Editovat klíč</string>
+  <string name="key_view_action_encrypt">Šifruji pomocí těchto klíčů.</string>
+  <string name="key_view_action_certify">Certifikovat identity</string>
+  <string name="key_view_tab_main">Hlavní info</string>
+  <string name="key_view_tab_certs">Certifikáty</string>
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
   <!--Navigation Drawer-->
+  <string name="nav_encrypt">Podepisuji a šifruji</string>
+  <string name="nav_decrypt">Dešifruji a kontroluji</string>
+  <string name="nav_apps">Appky</string>
+  <string name="drawer_open">Otevřít navigační panel</string>
+  <string name="drawer_close">Zavří navigační panel</string>
+  <string name="my_keys">Moje Klíče</string>
   <!--hints-->
   <!--certs-->
+  <string name="cert_default">výchozí</string>
+  <string name="cert_none">žádný</string>
+  <string name="cert_casual">příležitostně</string>
+  <string name="cert_positive">pozitivní</string>
+  <string name="cert_revoke">revokované</string>
+  <string name="cert_verify_ok">OK</string>
+  <string name="cert_verify_failed">selhalo!</string>
+  <string name="cert_verify_error">chyba!</string>
+  <string name="cert_verify_unavailable">klíč není k dispozici</string>
   <!--Import Public log entries-->
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <!--PassphraseCache-->
   <!--unsorted-->
+  <string name="label_user_id">Identita</string>
+  <string name="unknown_uid">&lt;neznámý&gt;</string>
+  <string name="empty_certs">Žádné certifikáty pro tento klíč</string>
+  <string name="label_revocation">Důvod revokace</string>
+  <string name="label_verify_status">Stav ověření</string>
+  <string name="label_cert_type">Typ</string>
+  <!--First Time-->
 </resources>

OpenKeychain/src/main/res/values-de/strings.xml

@@ -1,19 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_select_recipients">Öffentlichen Schlüssel auswählen</string>
-  <string name="title_select_secret_key">Privaten Schlüssel auswählen</string>
+  <string name="title_select_recipients">Wähle Schlüssel</string>
+  <string name="title_select_secret_key">Wähle Deinen Schlüssel</string>
   <string name="title_encrypt">Verschlüsseln</string>
   <string name="title_decrypt">Entschlüsseln</string>
   <string name="title_authentication">Passwort</string>
-  <string name="title_create_key">Schlüssel erstellen</string>
+  <string name="title_create_key">Erzeuge Deinen Schlüssel</string>
   <string name="title_edit_key">Schlüssel bearbeiten</string>
   <string name="title_preferences">Einstellungen</string>
   <string name="title_api_registered_apps">Apps</string>
-  <string name="title_key_server_preference">Schlüsselserver</string>
-  <string name="title_change_passphrase">Passphrase ändern</string>
-  <string name="title_set_passphrase">Passwort setzen</string>
-  <string name="title_share_with">Teilen über...</string>
+  <string name="title_key_server_preference">Schlüsselserver Einstellungen</string>
+  <string name="title_change_passphrase">Passwort ändern</string>
   <string name="title_share_fingerprint_with">Teile Fingerabdruck über…</string>
   <string name="title_share_key">Teile Schlüssel über...</string>
   <string name="title_share_file">Datei teilen mit…</string>
@@ -27,66 +25,43 @@
   <string name="title_certify_key">Identitäten beglaubigen</string>
   <string name="title_key_details">Schlüsseldetails</string>
   <string name="title_help">Hilfe</string>
+  <string name="title_log_display">Log</string>
   <!--section-->
   <string name="section_user_ids">Identitäten</string>
   <string name="section_keys">Unterschlüssel</string>
   <string name="section_general">Allgemein</string>
   <string name="section_defaults">Standardwerte</string>
   <string name="section_advanced">Fortgeschrittene Einstellungen</string>
-  <string name="section_master_key">Hauptschlüssel</string>
-  <string name="section_master_user_id">Hauptidentität</string>
   <string name="section_actions">Aktionen</string>
   <string name="section_share_key">Gesamter Schlüssel</string>
   <string name="section_certification_key">Mit diesem Schlüssel beglaubigen</string>
   <string name="section_upload_key">Schlüssel hochladen</string>
   <string name="section_key_server">Schlüsselserver</string>
-  <string name="section_encrypt_and_or_sign">Verschlüsseln und/oder Signieren</string>
-  <string name="section_decrypt_verify">Entschlüsseln und Verifizieren</string>
   <string name="section_fingerprint">Fingerabdruck</string>
   <string name="section_key_to_certify">Zu beglaubigender Schlüssel</string>
   <!--button-->
-  <string name="btn_certify">Beglaubigen</string>
   <string name="btn_decrypt_verify_file">Datei entschlüsseln, verifizieren und speichern</string>
   <string name="btn_decrypt_verify_message">Entschlüsseln und verifizieren</string>
-  <string name="btn_decrypt_verify_clipboard">Aus der Zwischenablage</string>
   <string name="btn_encrypt_file">Datei verschlüsseln und speichern</string>
   <string name="btn_save">Speichern</string>
   <string name="btn_do_not_save">Abbrechen</string>
   <string name="btn_delete">Löschen</string>
   <string name="btn_no_date">Keine</string>
   <string name="btn_okay">Okay</string>
-  <string name="btn_change_passphrase">Passwort ändern</string>
-  <string name="btn_set_passphrase">Neues Passwort setzen</string>
   <string name="btn_export_to_server">Auf Schlüsselserver hochladen</string>
   <string name="btn_next">Weiter</string>
   <string name="btn_back">Zurück</string>
-  <string name="btn_clipboard">Zwischenablage</string>
-  <string name="btn_share">Teilen mit…</string>
   <string name="btn_lookup_key">Schlüssel nachschlagen</string>
-  <string name="btn_encryption_advanced_settings_show">Erweiterte Einstellungen anzeigen</string>
-  <string name="btn_encryption_advanced_settings_hide">Erweiterte Einstellungen verbergen</string>
-  <string name="btn_share_encrypted_signed">Verschlüsselt/signierte Nachricht teilen…</string>
   <string name="btn_view_cert_key">Beglaubigungsschlüssel anzeigen</string>
+  <string name="btn_create_key">Erzeuge Schlüssel</string>
   <!--menu-->
   <string name="menu_preferences">Einstellungen</string>
   <string name="menu_help">Hilfe</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_create_key">Erzeuge meinen Schlüssel</string>
+  <string name="menu_import_existing_key">Importiere existierenden Schlüssel</string>
   <string name="menu_search">Suchen</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_title_fingerprint">Teile Fingerabdruck…</string>
-  <string name="menu_share_title">Teile gesamten Schlüssel…</string>
-  <string name="menu_share_default_fingerprint">mit…</string>
-  <string name="menu_share_default">mit…</string>
-  <string name="menu_share_qr_code">mit QR-Code</string>
-  <string name="menu_share_qr_code_fingerprint">mit QR-Code</string>
-  <string name="menu_share_nfc">mit NFC</string>
-  <string name="menu_copy_to_clipboard">In die Zwischenablage kopieren</string>
   <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>
@@ -95,22 +70,18 @@
   <string name="menu_export_all_keys">Alle Schlüssel exportieren</string>
   <string name="menu_advanced">Erweiterte Info anzeigen</string>
   <!--label-->
-  <string name="label_sign">Signieren</string>
   <string name="label_message">Nachricht</string>
   <string name="label_file">Datei</string>
   <string name="label_no_passphrase">Kein Passwort</string>
   <string name="label_passphrase">Passwort</string>
-  <string name="label_passphrase_again">Wiederholen</string>
+  <string name="label_passphrase_again">Passwort wiederholen</string>
   <string name="label_algorithm">Algorithmus</string>
   <string name="label_ascii_armor">ASCII-Armor</string>
-  <string name="label_select_public_keys">Empfänger</string>
-  <string name="label_delete_after_encryption">Nach Verschlüsselung löschen</string>
+  <string name="label_conceal_pgp_application">Lass andere wissen dass du OpenKeychain nutzt</string>
+  <string name="label_conceal_pgp_application_summary">Fügt \'OpenKeychain v2.7\' zu OpenPGP Signaturen, Daten und exportierten Schlüsseln hinzu</string>
   <string name="label_delete_after_decryption">Nach Entschlüsselung löschen</string>
-  <string name="label_share_after_encryption">Nach Verschlüsselung teilen</string>
   <string name="label_encryption_algorithm">Verschlüsselungsalgorithmus</string>
   <string name="label_hash_algorithm">Hash-Algorithmus</string>
-  <string name="label_asymmetric">mit Öffentlichem Schlüssel</string>
-  <string name="label_symmetric">mit Passwort</string>
   <string name="label_passphrase_cache_ttl">Passwort-Cache</string>
   <string name="label_message_compression">Nachrichten-Komprimierung</string>
   <string name="label_file_compression">Datei-Komprimierung</string>
@@ -127,12 +98,7 @@
   <string name="label_email">E-Mail</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>
-  </plurals>
   <string name="user_id_no_name">&lt;kein Name&gt;</string>
   <string name="none">&lt;keine&gt;</string>
   <string name="no_key">&lt;kein Schlüssel&gt;</string>
@@ -179,7 +145,6 @@
   <string name="flag_authenticate">Authentifizieren</string>
   <!--sentences-->
   <string name="wrong_passphrase">Falsches Passwort.</string>
-  <string name="set_a_passphrase">Zuerst muss ein Passwort gesetzt werden.</string>
   <string name="no_filemanager_installed">Kein passender Dateimanager installiert.</string>
   <string name="passphrases_do_not_match">Die Passwörter stimmten nicht überein.</string>
   <string name="passphrase_must_not_be_empty">Bitte ein Passwort eingeben.</string>
@@ -198,15 +163,12 @@
   <string name="specify_file_to_export_to">Bitte angeben, in welche Datei exportiert werden soll.\nWARNUNG: Datei wird überschrieben, wenn sie bereits existiert. </string>
   <string name="key_deletion_confirmation_multi">Möchtest du wirklich alle ausgewählten öffentlichen 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="ask_save_changed_key">Es wurden am Schlüsselbund Veränderungen vorgenommen. Sollen dies gespeichert werden?</string>
-  <string name="ask_empty_id_ok">Es wurde eine leere Identität hinzugefügt. Wirklich fortfahren?</string>
   <string name="public_key_deletetion_confirmation">Soll der öffentliche 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>
+  <string name="also_export_secret_keys">Exportiere auch private Schlüssel</string>
   <string name="key_exported">1 Schlüssel erfolgreich exportiert.</string>
   <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.</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="bad_keys_encountered">
     <item quantity="one">%d schlechter privater Schlüssel ignoriert. Evtl. wurde er mit folgender Option exportiert:\n --export-secret-subkeys\nUnbedingt mit der Option \n --export-secret-keys\nexportieren.</item>
@@ -218,7 +180,6 @@
   <string name="nfc_successful">Schlüssel erfolgreich mit NFC-Beam gesendet!</string>
   <string name="key_copied_to_clipboard">Schlüssel wurde in die Zwischenablage kopiert!</string>
   <string name="fingerprint_copied_to_clipboard">Fingerabdruck wurde in die Zwischenablage kopiert!</string>
-  <string name="key_has_already_been_certified">Schlüssel wurde bereits beglaubigt</string>
   <string name="select_key_to_certify">Bitte wähle einen Schlüssel um zu Beglaubigen!</string>
   <string name="key_too_big_for_sharing">Schlüssel ist zu groß um so geteilt zu werden!</string>
   <!--errors
@@ -229,32 +190,29 @@
   <string name="error_no_secret_key_found">kein geeigneter privater Schlüssel gefunden</string>
   <string name="error_external_storage_not_ready">Externes Laufwerk ist nicht bereit</string>
   <string name="error_key_size_minimum512bit">Schlüssel muss mindestens 512 Bit lang sein</string>
-  <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_no_email">keine E-Mail gefunden</string>
   <string name="error_key_needs_a_user_id">Mindestens eine Identität wird benötigt</string>
-  <string name="error_main_user_id_must_not_be_empty">Hauptidentität darf nicht leer sein</string>
-  <string name="error_key_needs_master_key">Mindestens ein Hauptschlüssel wird benötigt</string>
   <string name="error_no_signature_passphrase">kein Passwort angegeben</string>
   <string name="error_no_signature_key">kein Signaturschlüssel angegeben</string>
   <string name="error_invalid_data">Verschlüsselte Daten nicht gültig</string>
   <string name="error_integrity_check_failed">Integritätscheck fehlgeschlagen! Die Daten wurden modifiziert!</string>
   <string name="error_wrong_passphrase">falsches Passwort</string>
-  <string name="error_saving_keys">Es trat ein Fehler beim Speichern einiger Schlüssel auf</string>
   <string name="error_could_not_extract_private_key">Privater Schlüssel konnte nicht extrahiert werden</string>
-  <string name="error_expiry_must_come_after_creation">Ablaufdatum muss später sein als das Erstellungsdatum</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Binäre Daten ohne ohne Datei im Dateisystem werden nicht unterstützt.</string>
   <string name="error_jelly_bean_needed">Android 4.1 wird benötigt um Androids NFC Beam nutzen zu können!</string>
   <string name="error_nfc_needed">NFC steht auf diesem Gerät nicht zur Verfügung!</string>
-  <string name="error_query_too_short">zu kurze Schlüsselanfrage</string>
-  <string name="error_too_many_responses">Die Schlüsselanfrage liefert zu viele Ergebnisse. Bitte verfeinern sie sie Anfrage.</string>
+  <string name="error_nothing_import">Keine Schlüssel gefunden!</string>
+  <string name="error_query_too_short">Suchanfrage zu kurz. Bitte ändere deine Andrage!</string>
+  <string name="error_searching_keys">Ein Fehler ist beim Suchen der Schlüssel aufgetreten.</string>
+  <string name="error_too_many_responses">Die Schlüsselsuche ergab zu viele Treffer. Bitte präzisiere deine Anfrage!</string>
+  <string name="error_too_short_or_too_many_responses">Keine oder zu viele Schlüssel wurden gefunden. Bitte verbessere deine Anfrage!</string>
+  <string name="error_import_no_valid_keys">Keine gültigen Schlüssel in Datei/Zwischenablage gefunden!</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_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>
-  <string name="error_change_something_first">Es müssen vorm Speichern erst Veränderungen am Schlüsselbund vorgenommen werden</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Ungültige Signatur!</string>
   <string name="decrypt_result_signature_unknown_pub_key">Unbekannter öffentlicher Schlüssel</string>
@@ -270,19 +228,23 @@
   <string name="progress_saving">wird gespeichert…</string>
   <string name="progress_importing">wird importiert…</string>
   <string name="progress_exporting">wird exportiert…</string>
+  <string name="progress_uploading">hochladen...</string>
   <string name="progress_building_key">Schlüssel wird erstellt…</string>
-  <string name="progress_certifying_master_key">Hauptschlüssel wird beglaubigt…</string>
   <string name="progress_building_master_key">Hauptschlüssel wird erstellt…</string>
-  <string name="progress_adding_sub_keys">Unterschlüssel wird hinzugefügt…</string>
-  <string name="progress_saving_key_ring">Schlüssel wird gespeichert…</string>
+  <string name="progress_generating_rsa">erzeuge neuen RSA Schlüssel...</string>
+  <string name="progress_generating_dsa">erzeuge neuen DSA Schlüssel...</string>
+  <string name="progress_generating_elgamal">erzeuge neuen ElGamal Schlüssel...</string>
+  <string name="progress_modify">verändere Schlüsselbund...</string>
+  <string name="progress_modify_unlock">entsperre Schlüsselbund...</string>
+  <string name="progress_modify_adduid">füge User ID hinzu...</string>
+  <string name="progress_modify_primaryuid">ändere Haupt User ID...</string>
+  <string name="progress_modify_subkeychange">verändere Unterschlüssel...</string>
+  <string name="progress_modify_subkeyadd">füge Unterschlüssel hinzu...</string>
+  <string name="progress_modify_passphrase">ändere Passwort...</string>
   <plurals name="progress_exporting_key">
     <item quantity="one">Schlüssel wird exportiert…</item>
     <item quantity="other">Schlüssel werden exportiert…</item>
   </plurals>
-  <plurals name="progress_generating">
-    <item quantity="one">Schlüssel wird erstellt, das kann bis zu 3 Minuten dauern…</item>
-    <item quantity="other">Schlüssel wird erstellt, das kann bis zu 3 Minuten dauern…</item>
-  </plurals>
   <string name="progress_extracting_signature_key">Signaturschlüssel wird extrahiert…</string>
   <string name="progress_extracting_key">Schlüssel wird extrahiert…</string>
   <string name="progress_preparing_streams">Datenstrom wird vorbereitet…</string>
@@ -299,8 +261,8 @@
   <string name="progress_verifying_integrity">Integrität wird überprüft…</string>
   <string name="progress_deleting_securely">\'%s\' wird sicher gelöscht…</string>
   <!--action strings-->
-  <string name="hint_secret_keys">Private Schlüssel suchen</string>
-  <string name="action_share_key_with">Teile Schlüssel über…</string>
+  <string name="hint_public_keys">Name/Email/Schlüssel ID...</string>
+  <string name="hint_keybase_search">Name/Keybase.io Benutzername...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
   <string name="key_size_768">768</string>
@@ -326,29 +288,38 @@
   <string name="help_tab_about">Über</string>
   <string name="help_about_version">Version:</string>
   <!--Import-->
+  <string name="import_tab_keyserver">Schlüsselserver</string>
+  <string name="import_tab_direct">Datei/Zwischenablage</string>
+  <string name="import_tab_qr_code">QR Kode/NFC</string>
+  <string name="import_tab_keybase">Keybase.io</string>
   <string name="import_import">Ausgewählte Schlüssel importieren</string>
-  <string name="import_from_clipboard">Zwischenablage</string>
-  <plurals name="import_qr_code_missing">
-    <item quantity="one">QR-Codes mit folgender ID fehlt: %s</item>
-    <item quantity="other">QR-Codes mit folgenden IDs fehlen: %s</item>
-  </plurals>
-  <string name="import_qr_code_start_with_one">Bitte fange mit QR-Code der ID 1 an</string>
   <string name="import_qr_code_wrong">Falsch formatierter QR-Code! Bitte erneut versuchen!</string>
-  <string name="import_qr_code_finished">QR-Code wurde erfolgreich eingescannt!</string>
   <string name="import_qr_code_too_short_fingerprint">Der Fingerabdruck ist zu kurz (&lt; 16 Zeichen)</string>
-  <string name="import_qr_scan_button">Qr-Code mittels \'Barcode Scanner\' einscannen</string>
-  <string name="import_nfc_text">Um Schlüssel über NFC zu erhalten muss das Gerät entsperrt sein.</string>
-  <string name="import_nfc_help_button">Hilfe</string>
-  <string name="import_clipboard_button">Schlüssel aus der Zwischenablage einfügen</string>
-  <string name="import_keybase_button">Schlüssel von Keybase.io erhalten</string>
+  <string name="import_qr_code_button">QR Kode Einlesen...</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">1 Schlüssel erfolgreich importiert</item>
+    <item quantity="other">%1$d Schlüssel erfolgreich importiert</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="one">Schlüssel %2$s erfolgreich importiert</item>
+    <item quantity="other">%1$d Schlüssel erfolgreich importiert: %2$s.</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="one">Schlüssel %2$s erfolgreich aktualisiert.</item>
+    <item quantity="other">%1$d Schlüssel erfolgreich aktualisiert: %2$s.</item>
+  </plurals>
+  <string name="view_log">Log ansehen</string>
+  <string name="import_error_nothing">Nichts zu importieren.</string>
+  <string name="import_error">Fehler bei der Verarbeitung der Schlüssel!</string>
+  <string name="import_with_warnings">, mit Warnungen</string>
   <!--Intent labels-->
   <string name="intent_decrypt_file">Datei entschlüsseln mit OpenKeychain</string>
   <string name="intent_import_key">Schlüssel importieren mit OpenKeychain</string>
   <string name="intent_send_encrypt">Verschlüsseln mit OpenKeychain </string>
   <string name="intent_send_decrypt">Entschlüsseln mit OpenKeychain </string>
   <!--Remote API-->
-  <string name="api_no_apps">Keine verknüpften Apps vorhanden\n\nEine Liste von unterstützten Drittanbieter-Apps finden Sie unter \"Hilfe\"!</string>
+  <string name="api_no_apps">Keine registrierten Apps!\n\nEine Liste der unterstützten Anwendungen ist in der \'Hilfe\' verfügbar.</string>
   <string name="api_settings_show_info">Erweiterte Informationen anzeigen</string>
   <string name="api_settings_hide_info">Erweiterte Informationen ausblenden</string>
   <string name="api_settings_show_advanced">Erweiterte Einstellungen anzeigen</string>
@@ -364,9 +335,8 @@
   <string name="api_settings_package_name">Paketname</string>
   <string name="api_settings_package_signature">SHA-256 der Paketsignatur</string>
   <string name="api_settings_accounts">Konten</string>
-  <string name="api_settings_accounts_empty">Keine Accounts mit dieser App verknüpft.</string>
-  <string name="api_create_account_text">Die Anwendung erfordert die Erstellung eines neuen Accounts. Bitte wähle einen existierenden Schlüssel oder erstelle einen neuen.\nAnwendungen sind auf die Nutzung der Schlüssel beschränkt, die du hier auswählst!</string>
-  <string name="api_register_text">Folgende Anwendung beantragt Zugriff auf OpenKeychains API.\nZugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen, warum diese Anfrage erscheint, sollten Sie den Zugriff nicht erlauben! Sie können Zugriffe später über das Menü \'Registrierte Anwendungen\' widerrufen.</string>
+  <string name="api_settings_accounts_empty">Keine Konten mit dieser Anwendung verknüpft.</string>
+  <string name="api_register_text">Folgende Anwendung möchte Nachrichten ver-/entschlüsseln und in Ihrem Namen signieren\nZugriff erlauben?\n\nVORSICHT: Sollten Sie nicht wissen warum dieses Fenster erscheint, sollten Sie den Zugriff nicht gewähren! Sie können Zugriffe später über das Menü \'Anwendungen\' widerrufen.</string>
   <string name="api_register_allow">Zugriff erlauben</string>
   <string name="api_register_disallow">Zugriff verbieten</string>
   <string name="api_register_error_select_key">Bitte einen Schlüssel auswählen!</string>
@@ -376,9 +346,6 @@
   <string name="api_error_wrong_signature">Signaturüberprüfung fehlgeschlagen! Haben Sie diese Anwendung aus einer anderen Quelle installiert? Wenn Sie eine Attacke ausschliessen können, sollten Sie die Registrierung der App in OpenKeychain widerrufen und die Anwendung erneut registrieren.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Über QR-Code teilen</string>
-  <string name="share_qr_code_dialog_start">Mit \'Weiter\' durch alle QR-Codes gehen und diese nacheinander scannen.</string>
-  <string name="share_qr_code_dialog_fingerprint_text">Fingerabdruck:</string>
-  <string name="share_qr_code_dialog_progress">QR-Code mit ID %1$d von %2$d</string>
   <string name="share_nfc_dialog">Über NFC teilen</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
@@ -389,7 +356,6 @@
   <string name="key_list_empty_text2">Du kannst anfangen OpenKeychain zu benutzen indem du</string>
   <string name="key_list_empty_text3">oder</string>
   <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">Schlüssel bearbeiten</string>
   <string name="key_view_action_encrypt">Mit diesem Schlüssel verschlüsseln</string>
@@ -400,29 +366,27 @@
   <string name="key_view_tab_share">Teilen</string>
   <string name="key_view_tab_keys">Unterschlüssel</string>
   <string name="key_view_tab_certs">Beglaubigungen</string>
+  <!--Edit key-->
+  <string name="edit_key_action_add_identity">Identität hinzufügen</string>
+  <string name="edit_key_action_add_subkey">Unterschlüssel hinzufügen</string>
+  <!--Create key-->
+  <!--View key-->
   <!--Navigation Drawer-->
   <string name="nav_keys">Schlüssel</string>
   <string name="nav_encrypt">Signieren und Verschlüsseln</string>
   <string name="nav_decrypt">Entschlüsseln und Verifizieren</string>
-  <string name="nav_import">Schlüssel Importieren</string>
   <string name="nav_apps">Apps</string>
   <string name="drawer_open">Menü öffnen</string>
   <string name="drawer_close">Menü schließen</string>
-  <string name="edit">Bearbeiten</string>
   <string name="my_keys">Meine Schlüssel</string>
-  <string name="label_secret_key">Private Schlüssel</string>
-  <string name="secret_key_yes">verfügbar</string>
-  <string name="secret_key_no">nicht verfügbar</string>
   <!--hints-->
-  <string name="encrypt_content_edit_text_hint">Hier die Nachricht schreiben welche verschlüsselt und/oder signiert werden soll…</string>
-  <string name="decrypt_content_edit_text_hint">Hier die verschlüsselte Nachricht eingeben um sie zu entschlüsseln und/oder zu verifzieren…</string>
+  <string name="decrypt_content_edit_text_hint">Hier die verschlüsselte Nachricht eingeben um sie zu entschlüsseln und/oder zu verifizieren…</string>
   <!--certs-->
   <string name="cert_default">normal</string>
   <string name="cert_none">kein</string>
   <string name="cert_casual">einfach überprüft</string>
   <string name="cert_positive">positiv</string>
   <string name="cert_revoke">widerrufen</string>
-  <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">fehlgeschlagen!</string>
   <string name="cert_verify_error">Fehler!</string>
   <string name="cert_verify_unavailable">Schlüssel nicht verfügbar</string>
@@ -438,7 +402,9 @@
   <string name="msg_is_importing_subkeys">Geheime Unterschlüssel werden bearbeitet</string>
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <!--PassphraseCache-->
   <!--unsorted-->
   <string name="section_certifier_id">Beglaubiger</string>
   <string name="section_cert">Zertifikatdetails</string>
@@ -451,13 +417,11 @@
   <string name="label_cert_type">Typ</string>
   <string name="error_key_not_found">Schlüssel nicht gefunden!</string>
   <string name="error_key_processing">Fehler bei der Verarbeitung des Schlüssels!</string>
-  <string name="no_subkey">Unterschlüssel nicht verfügbar</string>
   <string name="key_stripped">nicht verfügbar</string>
-  <string name="secret_cannot_multiple">Geheime Schlüssel können nur einzeln gelöscht werden!</string>
   <string name="title_view_cert">Zertifikatdetails anzeigen</string>
   <string name="unknown_algorithm">unbekannt</string>
   <string name="can_sign_not">Kann nicht unterschreiben</string>
-  <string name="error_encoding">Kodierungsfehler</string>
   <string name="error_no_encrypt_subkey">Kein Unterschlüssel zum Verschlüsseln verfügbar!</string>
   <string name="contact_show_key">Schlüssel anzeigen (%s)</string>
+  <!--First Time-->
 </resources>

OpenKeychain/src/main/res/values-el/strings.xml

@@ -1,10 +1,7 @@
 <?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-->
@@ -16,13 +13,10 @@
   <string name="btn_okay">ΟΚ</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_key_size">Μέγεθος κλειδιού</string>
@@ -47,6 +41,9 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
   <!--Navigation Drawer-->
   <!--hints-->
   <!--certs-->
@@ -54,6 +51,9 @@
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <!--PassphraseCache-->
   <!--unsorted-->
+  <!--First Time-->
 </resources>

OpenKeychain/src/main/res/values-es/strings.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_select_recipients">Seleccionar la clave pública</string>
-  <string name="title_select_secret_key">Seleccionar la clave secreta</string>
+  <string name="title_select_recipients">Seleccionar claves</string>
+  <string name="title_select_secret_key">Seleccionar su clave</string>
   <string name="title_encrypt">Cifrar</string>
   <string name="title_decrypt">Descifrar</string>
   <string name="title_authentication">Frase de contraseña</string>
-  <string name="title_create_key">Crear clave</string>
+  <string name="title_create_key">Crear mi clave</string>
   <string name="title_edit_key"> Editar clave</string>
-  <string name="title_wizard">Bienvenido a OpenKeychain</string>
   <string name="title_preferences"> Preferencias</string>
   <string name="title_api_registered_apps">Aplicaciones</string>
   <string name="title_key_server_preference">Prioridad del servidor de claves</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_share_with">Compartir con...</string>
   <string name="title_share_fingerprint_with">Compartir huella de validación de clave con...</string>
   <string name="title_share_key">Compartir clave con...</string>
   <string name="title_share_file">Compartir fichero con...</string>
@@ -35,60 +32,39 @@
   <string name="section_general">General</string>
   <string name="section_defaults">Predeterminados</string>
   <string name="section_advanced">Avanzado</string>
-  <string name="section_master_key">Clave maestra</string>
-  <string name="section_master_user_id">Identidad primaria</string>
   <string name="section_actions">Acciones</string>
   <string name="section_share_key">Clave completa</string>
   <string name="section_certification_key">Tu clave usada para las certificaciones</string>
   <string name="section_upload_key">Cargar clave</string>
   <string name="section_key_server">Servidor de claves</string>
-  <string name="section_encrypt_and_or_sign">Cifrar y/o firmar</string>
-  <string name="section_decrypt_verify">Descifrar y verificar</string>
   <string name="section_fingerprint">Huella de validación de clave</string>
   <string name="section_key_to_certify">Clave a ser certificada</string>
   <!--button-->
-  <string name="btn_certify">Certificar</string>
   <string name="btn_decrypt_verify_file">Descifrar, verificar, y guardar fichero</string>
   <string name="btn_decrypt_verify_message">Descifrar y verificar mensaje</string>
-  <string name="btn_decrypt_verify_clipboard">Desde el portapapeles</string>
   <string name="btn_encrypt_file">Cifrar y guardar fichero</string>
+  <string name="btn_encrypt_share_file">Cifrar y compartir fichero</string>
   <string name="btn_save">Guardar</string>
   <string name="btn_do_not_save">Cancelar</string>
   <string name="btn_delete">Eliminar</string>
   <string name="btn_no_date">Ninguno</string>
   <string name="btn_okay">De acuerdo</string>
-  <string name="btn_change_passphrase">Cambiar nueva frase de contraseña</string>
-  <string name="btn_set_passphrase">Establecer nueva frase de contraseña</string>
   <string name="btn_export_to_server">Cargar al servidor de claves</string>
   <string name="btn_next">Siguiente</string>
   <string name="btn_back">Volver</string>
-  <string name="btn_clipboard">Portapapeles</string>
-  <string name="btn_share">Compartir con...</string>
   <string name="btn_lookup_key">Buscar clave</string>
-  <string name="btn_encryption_advanced_settings_show">Mostrar ajustes avanzados</string>
-  <string name="btn_encryption_advanced_settings_hide">Ocultar ajustes avanzados</string>
-  <string name="btn_share_encrypted_signed">Compartir mensaje cifrado/firmado...</string>
+  <string name="btn_share_encrypted_signed">Cifrar y compartir mensaje</string>
   <string name="btn_view_cert_key">Ver clave de verificación</string>
+  <string name="btn_create_key">Crear clave</string>
+  <string name="btn_add_files">Añadir fichero(s)</string>
   <!--menu-->
   <string name="menu_preferences">Ajustes</string>
   <string name="menu_help">Ayuda</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_create_key">Crear mi clave</string>
+  <string name="menu_import_existing_key">Importar clave existente</string>
   <string name="menu_search">Buscar</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_qr_code">con código QR</string>
-  <string name="menu_share_qr_code_fingerprint">con código QR</string>
-  <string name="menu_share_nfc">con NFC</string>
-  <string name="menu_copy_to_clipboard">Copiar al portapapeles</string>
   <string name="menu_beam_preferences">Ajustes de Beam</string>
   <string name="menu_key_edit_cancel">Cancelar</string>
   <string name="menu_encrypt_to">Cifrar hacia...</string>
@@ -97,22 +73,26 @@
   <string name="menu_export_all_keys">Exportar todas las claves</string>
   <string name="menu_advanced">Mostrar información avanzada</string>
   <!--label-->
-  <string name="label_sign">Firmar</string>
   <string name="label_message">Mensaje</string>
   <string name="label_file">Archivo</string>
+  <string name="label_files">Fichero(s)</string>
+  <string name="label_file_colon">Fichero:</string>
   <string name="label_no_passphrase">No hay frase de contraseña</string>
   <string name="label_passphrase">Frase de contraseña</string>
-  <string name="label_passphrase_again">De nuevo</string>
+  <string name="label_passphrase_again">Repeat Passphrase</string>
   <string name="label_algorithm">Algoritmo</string>
   <string name="label_ascii_armor">Armadura ASCII</string>
-  <string name="label_select_public_keys">Destinatarios</string>
-  <string name="label_delete_after_encryption">Borrar después del cifrado</string>
+  <string name="label_file_ascii_armor">Ficheros: Armadura ASCII</string>
+  <string name="label_conceal_pgp_application">Permitir a otros saber que está usando OpenKeychain</string>
+  <string name="label_conceal_pgp_application_summary">Escribe \'OpenKeychain v2.7\' en las firmas OpenPGP, el texto cifrado, y las claves exportadas</string>
+  <string name="label_asymmetric_from">Desde:</string>
+  <string name="label_to">Hacia: </string>
+  <string name="label_delete_after_encryption">Ficheros: 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">con clave pública</string>
-  <string name="label_symmetric">con frase contraseña</string>
+  <string name="label_asymmetric">Con clave pública</string>
+  <string name="label_symmetric">Con frase contraseña</string>
   <string name="label_passphrase_cache_ttl">Caché de frase de contraseña</string>
   <string name="label_message_compression">Compresión de mensaje</string>
   <string name="label_file_compression">Compresión de archivo</string>
@@ -129,12 +109,7 @@
   <string name="label_email">Email</string>
   <string name="label_send_key">Cargar clave al servidor de claves seleccionado después de la certificación</string>
   <string name="label_fingerprint">Huella digital</string>
-  <string name="select_keys_button_default">Seleccionar</string>
   <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>
-  </plurals>
   <string name="user_id_no_name">&lt;sin nombre&gt;</string>
   <string name="none">&lt;ninguna&gt;</string>
   <string name="no_key">&lt;sin clave&gt;</string>
@@ -181,7 +156,6 @@
   <string name="flag_authenticate">Autentificar</string>
   <!--sentences-->
   <string name="wrong_passphrase">Frase de contraseña incorrecta.</string>
-  <string name="set_a_passphrase">Establece una frase de contraseña antes.</string>
   <string name="no_filemanager_installed">No hay un gestor de archivos compatible instalado.</string>
   <string name="passphrases_do_not_match">Las frases de contraseña no coinciden.</string>
   <string name="passphrase_must_not_be_empty">Por favor, introduce una frase de contraseña.</string>
@@ -200,15 +174,12 @@
   <string name="specify_file_to_export_to">Por favor, especifica hacia qué archivo quieres exportar.\nADVERTENCIA: El archivo se sobreescribirá si ya existiese.</string>
   <string name="key_deletion_confirmation_multi">¿De veras quiere borrar todas las claves públicas seleccionadas?\n¡No puede deshacer esto!</string>
   <string name="secret_key_deletion_confirmation">¿Quieres realmente borrar la clave SECRETA \'%s\'?\n¡No podrás deshacerlo!</string>
-  <string name="ask_save_changed_key">Has hecho cambios en el almacén de claves, ¿quieres guardarlos?</string>
-  <string name="ask_empty_id_ok">Ha añadido una identidad vacía, ¿está seguro de que quiere continuar?</string>
   <string name="public_key_deletetion_confirmation">¿De veras quiere borrar la clave pública \'%s\'?\n¡No puede deshacer esto!</string>
-  <string name="also_export_secret_keys">¿Exportar también las claves secretas?</string>
+  <string name="also_export_secret_keys">Exportar también claves secretas (privadas)</string>
   <string name="key_exported">Se ha exportado 1 clave satisfactoriamente.</string>
   <string name="keys_exported">%d claves exportadas satisfactoriamente.</string>
   <string name="no_keys_exported">No se han exportado claves.</string>
   <string name="key_creation_el_gamal_info">Nota: Sólo las subclaves soportan ElGamal.</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="bad_keys_encountered">
     <item quantity="one">%d mala clave secreta ignorada. Quizás hayas exportado con la opción\n--export-secret-subkeys\nAsegúrate de que exportas con\n--export-secret-keys\nen su lugar.</item>
@@ -220,7 +191,6 @@
   <string name="nfc_successful">¡Clave enviada con éxito vía NFC Beam (haz NFC)!</string>
   <string name="key_copied_to_clipboard">¡La clave ha sido copiada al portapapeles!</string>
   <string name="fingerprint_copied_to_clipboard">¡La huella de validación de clave se ha copiado al portapapeles!</string>
-  <string name="key_has_already_been_certified">¡La clave ya ha sido certificada!</string>
   <string name="select_key_to_certify">Por favor ¡seleccione una clave para ser usada en certificación!</string>
   <string name="key_too_big_for_sharing">¡La clave es demasiado grande para ser compartida de esta forma!</string>
   <!--errors
@@ -231,35 +201,29 @@
   <string name="error_no_secret_key_found">no se ha encontrado una clave secreta adecuada</string>
   <string name="error_external_storage_not_ready">el almacenamiento externo no está preparado</string>
   <string name="error_key_size_minimum512bit">el tamaño de clave debe ser de al menos 512bit</string>
-  <string name="error_master_key_must_not_be_el_gamal">la clave maestra no puede ser una clave ElGamal</string>
   <string name="error_unknown_algorithm_choice">elegido algoritmo desconocido</string>
   <string name="error_user_id_no_email">no se ha encontrado un email</string>
   <string name="error_key_needs_a_user_id">necesita al menos una identidad</string>
-  <string name="error_main_user_id_must_not_be_empty">la identidad primaria no debe estar vacía</string>
-  <string name="error_key_needs_master_key">necesitas al menos una clave maestra</string>
   <string name="error_no_signature_passphrase">no has proporcionado una frase de contraseña</string>
   <string name="error_no_signature_key">no has proporcionado una clave de firma</string>
   <string name="error_invalid_data">cifrado de datos no válido</string>
   <string name="error_integrity_check_failed">¡ha fallado la comprobación de integridad! ¡Los datos han sido modificados!</string>
   <string name="error_wrong_passphrase">frase de contraseña incorrecta</string>
-  <string name="error_saving_keys">error al guardar algunas claves</string>
   <string name="error_could_not_extract_private_key">no se puede extraer la clave privada</string>
-  <string name="error_expiry_must_come_after_creation">la fecha de caducidad debe ser posterior a la fecha de creación</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Los datos binarios directos sin un fichero existente en el sistema de ficheros no están soportados.</string>
   <string name="error_jelly_bean_needed">¡Necesita Android 4.1 para usar la característica NFC Beam (haz NFC) de Android!</string>
   <string name="error_nfc_needed">¡NFC no está disponible en tu dispositivo!</string>
   <string name="error_nothing_import">¡No se encontraron claves!</string>
-  <string name="error_query_too_short">Petición de búsqueda de clave demasiado corta</string>
-  <string name="error_searching_keys">Error irrecuperable buscando claves en el servidor</string>
-  <string name="error_too_many_responses">La petición de búsqueda de clave devolvió demasiados candidatos; por favor refine su petición</string>
-  <string name="error_import_no_valid_keys">El Fichero/Portapapeles está vacío</string>
+  <string name="error_query_too_short">Petición de búsqueda demasiado corta. Por favor, ¡refine su petición!</string>
+  <string name="error_searching_keys">Ocurrió un error al buscar claves.</string>
+  <string name="error_too_many_responses">La petición de búsqueda de claves devolvió demasiados candidatos. Por favor.¡refine su petición!</string>
+  <string name="error_too_short_or_too_many_responses">O no hay claves, o bien se han encontrado demasiadas. Por favor, ¡mejore su petición!</string>
+  <string name="error_import_no_valid_keys">¡No se encontraron claves válidas en Fichero/Portapapeles!</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_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>
-  <string name="error_change_something_first">Debes hacer cambios en el almacén de claves antes de que puedas guardarlo</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">¡Firma no válida!</string>
   <string name="decrypt_result_signature_unknown_pub_key">Clave pública desconocida</string>
@@ -275,19 +239,25 @@
   <string name="progress_saving">guardando...</string>
   <string name="progress_importing">importando...</string>
   <string name="progress_exporting">exportando...</string>
+  <string name="progress_uploading">subiendo...</string>
   <string name="progress_building_key">construyendo la clave...</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_generating_rsa">generando nueva clave RSA...</string>
+  <string name="progress_generating_dsa">generando nueva clave DSA...</string>
+  <string name="progress_generating_elgamal">generando nueva clave ElGamal...</string>
+  <string name="progress_modify">modificando juego de claves...</string>
+  <string name="progress_modify_unlock">desbloqueando juego de claves...</string>
+  <string name="progress_modify_adduid">añadiendo identidades de usuario...</string>
+  <string name="progress_modify_revokeuid">revocando identidades de usuario...</string>
+  <string name="progress_modify_primaryuid">cambiando identidad primaria de usuario...</string>
+  <string name="progress_modify_subkeychange">modificando subclaves...</string>
+  <string name="progress_modify_subkeyrevoke">revocando subclaves...</string>
+  <string name="progress_modify_subkeyadd">añadiendo subclaves...</string>
+  <string name="progress_modify_passphrase">cambiando frase contraseña...</string>
   <plurals name="progress_exporting_key">
     <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>
@@ -298,6 +268,7 @@
   <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_certifying">certificando...</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>
@@ -305,8 +276,6 @@
   <string name="progress_deleting_securely">borrando \'%s\' de forma segura…</string>
   <!--action strings-->
   <string name="hint_public_keys">Identidad de Nombre/Correo/Clave...</string>
-  <string name="hint_secret_keys">Buscar claves secretas</string>
-  <string name="action_share_key_with">Compartir la clave con...</string>
   <string name="hint_keybase_search">Nombre de usuario de Nombre/Keybase.io...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
@@ -338,37 +307,25 @@
   <string name="import_tab_qr_code">Código QR/NFC</string>
   <string name="import_tab_keybase">Keybase.io</string>
   <string name="import_import">Importar las claves seleccionadas</string>
-  <string name="import_from_clipboard">Importar desde el portapapeles</string>
-  <plurals name="import_qr_code_missing">
-    <item quantity="one">El código QR con ID %s se ha extraviado</item>
-    <item quantity="other">Los códigos QR con IDs %s se han extraviado</item>
-  </plurals>
-  <string name="import_qr_code_start_with_one">Por favor, comienza con el código QR de ID 1</string>
   <string name="import_qr_code_wrong">¡El código QR está deformado! ¡Por favor, prueba de nuevo!</string>
-  <string name="import_qr_code_finished">¡El escaneo del código QR ha finalizado!</string>
   <string name="import_qr_code_too_short_fingerprint">La huella de validación (fingerprint) de clave es demasiado corta (&lt; 16 caracteres)</string>
-  <string name="import_qr_scan_button">Escanea el código QR con \'Barcode Scanner\'</string>
-  <string name="import_nfc_text">Para recibir las claves a través de NFC, el dispositivo tiene que estar desbloqueado.</string>
-  <string name="import_nfc_help_button">Ayuda</string>
   <string name="import_qr_code_button">Escaneando código QR...</string>
-  <string name="import_clipboard_button">Tomar la clave desde el portapapeles</string>
-  <string name="import_keybase_button">Obtener clave desde Keybase.io</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="one">Clave importada con éxito</item>
     <item quantity="other">%1$d claves importadas con éxito</item>
   </plurals>
   <plurals name="import_keys_added_and_updated_2">
-    <item quantity="one"> y clave%2$s actualizada.</item>
-    <item quantity="other"> y %1$d claves%2$s actualizadas.</item>
+    <item quantity="one">y actualizada clave%2$s.</item>
+    <item quantity="other">y actualizadas %1$d claves%2$s.</item>
   </plurals>
   <plurals name="import_keys_added">
     <item quantity="one">Clave%2$s importada con éxito.</item>
     <item quantity="other">%1$d claves%2$s importadas con éxito.</item>
   </plurals>
   <plurals name="import_keys_updated">
-    <item quantity="one">Clave%2$s importada con éxito.</item>
-    <item quantity="other">%1$d claves%2$s importadas con éxito.</item>
+    <item quantity="one">Clave%2$s actualizada con éxito.</item>
+    <item quantity="other">%1$d claves%2$s actualizadas con éxito.</item>
   </plurals>
   <string name="view_log">Ver registro (log)</string>
   <string name="import_error_nothing">No hay nada que importar.</string>
@@ -380,7 +337,7 @@
   <string name="intent_send_encrypt">Cifrar con OpenKeychain</string>
   <string name="intent_send_decrypt">Descifrar con OpenKeychain</string>
   <!--Remote API-->
-  <string name="api_no_apps">¡No hay aplicaciones registradas!\n\n¡Una lista de aplicaciones soportadas de terceros puede encontrarse en \'Ayuda\'!</string>
+  <string name="api_no_apps">¡No hay aplicaciones registradas!\n\n¡Puede encontrar una lista de aplicaciones de terceros soportadas en la \'Ayuda\'!</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>
@@ -396,9 +353,9 @@
   <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_create_account_text">La aplicación solicita la creación de una nueva cuenta. Por favor, selecciona una clave privada que ya exista o crea una nueva.\n¡Las aplicaciones tienen restringido el uso de claves a las que tú selecciones aquí!</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_settings_accounts_empty">No hay cuentas adjuntas a esta aplicación</string>
+  <string name="api_create_account_text">La aplicación solicita la creación de una nueva cuenta. Por favor, seleccione una de sus claves existentes o cree una nueva.\n¡Las aplicaciones están restringidas al uso de las claves que usted seleccione aquí!</string>
+  <string name="api_register_text">La aplicación mostrada quiere cifrar, descrifrar y firmar mensajes en su nombre.\n¿Permitir acceso?\n\nADVERTENCIA: Si no sabe por qué apareció esta pantalla, ¡no permita el acceso! Puede revocar el acceso más tarde usando la pantalla de \'Aplicaciones\'.</string>
   <string name="api_register_allow">Permitir el acceso</string>
   <string name="api_register_disallow">Denegar el acceso</string>
   <string name="api_register_error_select_key">¡Por favor, selecciona una clave!</string>
@@ -408,9 +365,6 @@
   <string name="api_error_wrong_signature">¡La comprobación de la firma ha fallado! ¿Has instalado esta app desde una fuente distinta? Si estás seguro de que esto no es un ataque, revoca el registro de esta app en OpenKeychain y regístrala de nuevo.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Compartir con código QR</string>
-  <string name="share_qr_code_dialog_start">Pasa por todos los códigos QR usando \'Siguiente\', y escanéalos de uno en uno.</string>
-  <string name="share_qr_code_dialog_fingerprint_text">Huella digital:</string>
-  <string name="share_qr_code_dialog_progress">Código QR con ID %1$d de %2$d</string>
   <string name="share_nfc_dialog">Compartir con NFC</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
@@ -421,32 +375,54 @@
   <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>
+  <string name="key_list_empty_button_import">importando una clave existente.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Editar clave</string>
   <string name="key_view_action_encrypt">Cifrar con esta clave</string>
   <string name="key_view_action_certify">Certificar identidades</string>
+  <string name="key_view_action_update">Actualizar desde el servidor de claves</string>
   <string name="key_view_action_share_with">Compartir con...</string>
   <string name="key_view_action_share_nfc">Compartir sobre NFC juntando los dispositivos por el reverso</string>
+  <string name="key_view_action_upload">Actualizar al servidor de claves</string>
   <string name="key_view_tab_main">Información principal</string>
   <string name="key_view_tab_share">Compartir</string>
   <string name="key_view_tab_keys">Subclaves</string>
   <string name="key_view_tab_certs">Certificados</string>
+  <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Cambiar frase contraseña</string>
+  <string name="edit_key_action_add_identity">Añadir identidad</string>
+  <string name="edit_key_action_add_subkey">Añadir subclave</string>
+  <string name="edit_key_edit_user_id_title">¡Seleccione una acción!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Cambiar a la identidad primaria</item>
+    <item>Revocar identidad</item>
+  </string-array>
+  <string name="edit_key_edit_subkey_title">¡Seleccione una acción!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Cambiar periodo hasta la expiración</item>
+    <item>Revocar subclave</item>
+  </string-array>
+  <!--Create key-->
+  <string name="create_key_upload">Subir clave al servidor de claves</string>
+  <string name="create_key_empty">Este campo es obligatorio</string>
+  <string name="create_key_passphrases_not_equal">Las frases contraseña no coinciden</string>
+  <string name="create_key_final_text">Ha introducido la siguiente identidad:</string>
+  <string name="create_key_final_robot_text">Crear una clave puede llevar un tiempo, hágase con una taza de café entre tanto...\n(3 subclaves, RSA 4096 bits)</string>
+  <string name="create_key_text">Introduzca su nombre completo, dirección de correo electrónico, y elija una frase contraseña.</string>
+  <string name="create_key_hint_full_name">Nombre completo, ej. Max Mustermann</string>
+  <!--View key-->
+  <string name="view_key_revoked">¡Esta clave ha sido revocada!</string>
+  <string name="view_key_expired">¡Esta clave ha expirado!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Claves</string>
   <string name="nav_encrypt">Firmar y cifrar</string>
   <string name="nav_decrypt">Descifrar y verificar</string>
-  <string name="nav_import">Importar claves</string>
   <string name="nav_apps">Aplicaciones</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>
   <!--hints-->
-  <string name="encrypt_content_edit_text_hint">Escribe aquí el mensaje que quieras cifrar y/o firmar...</string>
+  <string name="encrypt_content_edit_text_hint">El mensaje introducido aquí estará firmado usando la clave seleccionada en \'Desde\' y cifrada para todos los receptores seleccionados en \'Hacia\'.</string>
   <string name="decrypt_content_edit_text_hint">Introduce aquí el texto cifrado para descifrarlo y/o verificarlo...</string>
   <!--certs-->
   <string name="cert_default">predeterminado</string>
@@ -454,7 +430,7 @@
   <string name="cert_casual">casual</string>
   <string name="cert_positive">positivo</string>
   <string name="cert_revoke">revocada</string>
-  <string name="cert_verify_ok">correcto</string>
+  <string name="cert_verify_ok">Correcto</string>
   <string name="cert_verify_failed">¡falló!</string>
   <string name="cert_verify_error">¡error!</string>
   <string name="cert_verify_unavailable">clave no disponible</string>
@@ -498,7 +474,7 @@
   <string name="msg_ip_reinsert_secret">Re-insertando clave secreta</string>
   <string name="msg_ip_uid_cert_bad">¡Se encontró un certificado defectuoso!</string>
   <string name="msg_ip_uid_cert_error">¡Error procesando certificado!</string>
-  <string name="msg_ip_uid_cert_good">La identificación de usuario está certificada por %1$s (%2$s)</string>
+  <string name="msg_ip_uid_cert_good">La identidad del usuario está certificada por %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Ignorando un certificado publicado por una clave pública desconocida</item>
     <item quantity="other">Ignorando %s certificados publicados por claves públicas desconocidas</item>
@@ -512,6 +488,7 @@
   <string name="msg_ip_uid_processing">Procesando identidad (id) de usuario %s</string>
   <string name="msg_ip_uid_revoked">La identificación de usuario está revocada</string>
   <string name="msg_is_bad_type_public">Se intentó importar un juego de claves (keyring) público como secreto. Esto es un fallo, por favor ¡consigne un informe!</string>
+  <string name="msg_is_bad_type_uncanon">Se intentó importar un juego de claves sin canonicalización. ¡Esto es un fallo, por favor rellene un informe!</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importando clave secreta (privada) %s</string>
   <string name="msg_is_db_exception">¡Error de base de datos!</string>
@@ -532,6 +509,7 @@
   <string name="msg_kc_revoke_bad_local">Eliminando certificado de revocación de juego de claves, con distintivo \"local\"</string>
   <string name="msg_kc_revoke_bad_time">Eliminando certificado de revocación de juego de claves, con marca de tiempo futura</string>
   <string name="msg_kc_revoke_bad_type">Eliminando certificado de clave maestra, de tipo desconocido (%s)</string>
+  <string name="msg_kc_revoke_bad_type_uid">Eliminando identidad de usuario en posición equivocada</string>
   <string name="msg_kc_revoke_bad">Eliminando certificado defectuoso de revocación de juego de claves</string>
   <string name="msg_kc_revoke_dup">Eliminando certificado redundante de revocación de juego de claves </string>
   <string name="msg_kc_sub">Procesando subclave %s</string>
@@ -569,6 +547,7 @@
   <string name="msg_kc_uid_revoke_dup">Eliminando certificado redundate de revocación para la identidad de usuario \"%s\"</string>
   <string name="msg_kc_uid_revoke_old">Eliminando certificado desactualizado de revocación para la identidad de usuario \"%s\"</string>
   <string name="msg_kc_uid_no_cert">No se encontró ningún auto-certificado válido para la identificación de usuario %s, eliminándola del juego de claves.</string>
+  <string name="msg_kc_uid_remove">Eliminando identidad de usuario %s no válida</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Incorporándolas en el juego de claves públicas %s</string>
   <string name="msg_mg_secret">Incorporándolas en el juego de claves secretas (privadas) %s</string>
@@ -576,12 +555,29 @@
   <string name="msg_mg_heterogeneous">Se intentaron consolidar juegos de claves heterogéneos</string>
   <string name="msg_mg_new_subkey">Añadiendo nueva subclave %s</string>
   <string name="msg_mg_found_new">Se encontraron %s nuevos certificados en el juego de claves</string>
+  <string name="msg_mg_unchanged">No hay nuevos certificados</string>
+  <!--createSecretKeyRing-->
+  <string name="msg_cr">Generando nueva clave maestra</string>
+  <string name="msg_cr_error_no_master">¡No se especificaron opciones de clave!</string>
+  <string name="msg_cr_error_no_user_id">¡Los juegos de claves tienen que estar creados con al menos una identidad de usuario!</string>
+  <string name="msg_cr_error_no_certify">¡La clave maestra debe tener el indicador de certificado!</string>
+  <string name="msg_cr_error_keysize_512">¡El tamaño de la clave debe ser mayor o igual de 512!</string>
+  <string name="msg_cr_error_internal_pgp">¡Error PGP interno!</string>
+  <string name="msg_cr_error_unknown_algo">¡Seleccionado algoritmo defectuoso!</string>
+  <string name="msg_cr_error_master_elgamal">¡La clave maestra no debe ser del tipo ElGamal!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modificando el juego de claves %s</string>
   <string name="msg_mf_error_encode">¡Excepción en la codificación!</string>
+  <string name="msg_mf_error_fingerprint">¡La actual huella de validación de clave no coincide con la esperada!</string>
+  <string name="msg_mf_error_keyid">No hay identidad de clave. Esto es un error interno, por favor ¡consigne un informe de error!</string>
+  <string name="msg_mf_error_integrity">Error interno, ¡fallo en la comprobación de integridad!</string>
+  <string name="msg_mf_error_noexist_primary">¡Especificada identidad de usuario primaria defectuosa!</string>
+  <string name="msg_mf_error_revoked_primary">¡Las identidades de usuario revocadas no pueden ser primarias!</string>
   <string name="msg_mf_error_pgp">¡Excepción interna de PGP!</string>
   <string name="msg_mf_error_sig">¡Excepción con la firma!</string>
   <string name="msg_mf_passphrase">Cambiando frase contraseña</string>
+  <string name="msg_mf_primary_replace_old">Reemplazando certificado de la anterior identidad de usuario primaria </string>
+  <string name="msg_mf_primary_new">Generando nuevo certificado para nueva identidad de usuario primaria</string>
   <string name="msg_mf_subkey_change">Modificando subclave %s</string>
   <string name="msg_mf_subkey_missing">¡Intentó operar sobre una subclave ausente %s!</string>
   <string name="msg_mf_subkey_new">Generando nueva subclave %2$s de %1$s bits</string>
@@ -592,9 +588,17 @@
   <string name="msg_mf_uid_add">Añadiendo identidad de usuario %s</string>
   <string name="msg_mf_uid_primary">Cambiando identidad de usuario (uid) primaria a %s</string>
   <string name="msg_mf_uid_revoke">Revocando identidad de usuario %s</string>
+  <string name="msg_mf_uid_error_empty">¡La identidad de usuario no debe estar vacía!</string>
   <string name="msg_mf_unlock_error">¡Error desbloqueando juego de claves!</string>
   <string name="msg_mf_unlock">Desbloqueando juego de claves</string>
+  <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Haga clic para limpiar las frases contraseña almacenadas en caché</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain ha almacenado en caché %d frases contraseña</string>
+  <string name="passp_cache_notif_keys">Frases contraseña almacenadas en caché:</string>
+  <string name="passp_cache_notif_clear">Limpiar caché</string>
+  <string name="passp_cache_notif_pwd">Contraseña</string>
   <!--unsorted-->
+  <string name="internal_error">¡Error interno!</string>
   <string name="section_certifier_id">Certificador</string>
   <string name="section_cert">Detalles del certificado</string>
   <string name="label_user_id">Identidad</string>
@@ -606,14 +610,17 @@
   <string name="label_cert_type">Tipo</string>
   <string name="error_key_not_found">¡Clave no encontrada!</string>
   <string name="error_key_processing">¡Error procesando clave!</string>
-  <string name="no_subkey">subclave no disponible</string>
   <string name="key_stripped">desnudo, sin clave</string>
-  <string name="secret_cannot_multiple">¡Las claves privadas (secretas) sólo pueden borrarse individualmente!</string>
+  <string name="secret_cannot_multiple">¡Sus claves propias sólo pueden ser borradas individualmente!</string>
   <string name="title_view_cert">Ver detalles del certificado</string>
   <string name="unknown_algorithm">desconocido</string>
   <string name="can_sign_not">no puede firmarse</string>
-  <string name="error_encoding">Error de codificación</string>
   <string name="error_no_encrypt_subkey">¡No hay subclave de cifrado disponible!</string>
   <string name="info_no_manual_account_creation">No cree Cuentas-OpenKeychain manualmente.\nPara más información, vea la Ayuda.</string>
   <string name="contact_show_key">Mostrar clave (%s)</string>
+  <!--First Time-->
+  <string name="first_time_text1">¡Recupere su privacidad con OpenKeychain!</string>
+  <string name="first_time_create_key">Crear mi clave</string>
+  <string name="first_time_import_key">Importar clave existente</string>
+  <string name="first_time_skip">Omitir configuración</string>
 </resources>

OpenKeychain/src/main/res/values-et/strings.xml

@@ -1,16 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <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_key_server_preference">Võtmeserveri seaded</string>
-  <string name="title_set_passphrase">Määra salasõne</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>
@@ -30,22 +26,13 @@
   <!--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>
   <!--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_passphrase_cache_ttl">Salasõne puhverdus</string>
   <string name="label_creation">Loodud</string>
@@ -79,7 +66,6 @@
   <!--key flags-->
   <!--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_for_symmetric_encryption">Sümmeetriline krüpteering</string>
   <!--errors
@@ -99,6 +85,9 @@
   <!--Share-->
   <!--Key list-->
   <!--Key view-->
+  <!--Edit key-->
+  <!--Create key-->
+  <!--View key-->
   <!--Navigation Drawer-->
   <!--hints-->
   <!--certs-->
@@ -106,6 +95,9 @@
   <!--Import Secret log entries-->
   <!--Keyring Canonicalization log entries-->
   <!--Keyring merging log entries-->
+  <!--createSecretKeyRing-->
   <!--modifySecretKeyRing-->
+  <!--PassphraseCache-->
   <!--unsorted-->
+  <!--First Time-->
 </resources>

OpenKeychain/src/main/res/values-fr/strings.xml

@@ -1,20 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_select_recipients">Choisir la clef publique</string>
-  <string name="title_select_secret_key">Choisir la clef secrète</string>
+  <string name="title_select_recipients">Choisir des clefs</string>
+  <string name="title_select_secret_key">Choisir ma clef</string>
   <string name="title_encrypt">Chiffrer</string>
   <string name="title_decrypt">Déchiffrer</string>
   <string name="title_authentication">Phrase de passe</string>
-  <string name="title_create_key">Créer une clef</string>
+  <string name="title_create_key">Créer ma clef</string>
   <string name="title_edit_key">Modifier une clef</string>
-  <string name="title_wizard">Bienvenue à OpenKeychain</string>
   <string name="title_preferences">Préférences</string>
   <string name="title_api_registered_apps">Applis</string>
   <string name="title_key_server_preference">Préférences du serveur de clefs</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_share_with">Partager avec...</string>
   <string name="title_share_fingerprint_with">Partager l\'empreinte avec...</string>
   <string name="title_share_key">Partager la clef avec...</string>
   <string name="title_share_file">Partager le fichier avec...</string>
@@ -35,60 +32,36 @@
   <string name="section_general">Général</string>
   <string name="section_defaults">Valeurs par défaut</string>
   <string name="section_advanced">Avancé</string>
-  <string name="section_master_key">Clef maîtresse</string>
-  <string name="section_master_user_id">Identité principale</string>
   <string name="section_actions">Actions</string>
   <string name="section_share_key">Clef entière</string>
   <string name="section_certification_key">Votre clef utilisée pour la certification</string>
   <string name="section_upload_key">Téléverser la clef</string>
   <string name="section_key_server">Serveur de clefs</string>
-  <string name="section_encrypt_and_or_sign">Chiffrer et/ou signer</string>
-  <string name="section_decrypt_verify">Déchiffrer et vérifier</string>
   <string name="section_fingerprint">Empreinte</string>
   <string name="section_key_to_certify">Clef à certifier !</string>
   <!--button-->
-  <string name="btn_certify">Certifier</string>
   <string name="btn_decrypt_verify_file">Déchiffrer, vérifier et enregistrer le fichier</string>
   <string name="btn_decrypt_verify_message">Déchiffrer et enregistrer le message</string>
-  <string name="btn_decrypt_verify_clipboard">À partir du presse-papiers</string>
   <string name="btn_encrypt_file">Chiffrer et enregistrer le fichier</string>
   <string name="btn_save">Enregistrer</string>
   <string name="btn_do_not_save">Annuler</string>
   <string name="btn_delete">Supprimer</string>
   <string name="btn_no_date">Aucune</string>
   <string name="btn_okay">OK</string>
-  <string name="btn_change_passphrase">Changer la nouvelle phrase de passe</string>
-  <string name="btn_set_passphrase">Définir la nouvelle phrase de passe</string>
   <string name="btn_export_to_server">Téléverser vers le serveur de clefs</string>
   <string name="btn_next">Suivant</string>
   <string name="btn_back">Retour</string>
-  <string name="btn_clipboard">Presse-papiers</string>
-  <string name="btn_share">Partager avec...</string>
   <string name="btn_lookup_key">Rechercher la clef</string>
-  <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>
-  <string name="btn_share_encrypted_signed">Partager le message chiffré/signé...</string>
   <string name="btn_view_cert_key">Voir la clef de certification</string>
+  <string name="btn_create_key">Créer la clef</string>
   <!--menu-->
   <string name="menu_preferences">Paramètres</string>
   <string name="menu_help">Aide</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_create_key">Créer ma clef</string>
+  <string name="menu_import_existing_key">Importer une clef existante</string>
   <string name="menu_search">Rechercher</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_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>
-  <string name="menu_copy_to_clipboard">Copier vers le presse-papiers</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>
@@ -97,22 +70,18 @@
   <string name="menu_export_all_keys">Exporter toutes les clefs</string>
   <string name="menu_advanced">Afficher les infos avancées</string>
   <!--label-->
-  <string name="label_sign">Signer</string>
   <string name="label_message">Message</string>
   <string name="label_file">Fichier</string>
   <string name="label_no_passphrase">Aucune phrase de passe</string>
   <string name="label_passphrase">Phrase de passe</string>
-  <string name="label_passphrase_again">Confirmation</string>
+  <string name="label_passphrase_again">Répéter la phrase de passe</string>
   <string name="label_algorithm">Algorithme</string>
   <string name="label_ascii_armor">Armure ASCII</string>
-  <string name="label_select_public_keys">Destinataires</string>
-  <string name="label_delete_after_encryption">Supprimer après le chiffrement</string>
+  <string name="label_conceal_pgp_application">Informez les autres de votre utilisation d\'OpenKeychain</string>
+  <string name="label_conceal_pgp_application_summary">Ajoute « OpenKeychain v2.7 » aux signatures OpenPGP, aux cryptogrammes, et aux clefs exportées</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">avec une clef publique</string>
-  <string name="label_symmetric">avec une phrase de passe</string>
   <string name="label_passphrase_cache_ttl">Cache de la phrase de passe</string>
   <string name="label_message_compression">Compression des messages</string>
   <string name="label_file_compression">Compression des fichiers</string>
@@ -129,12 +98,7 @@
   <string name="label_email">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>
-  </plurals>
   <string name="user_id_no_name">&lt;aucun nom&gt;</string>
   <string name="none">&lt;aucune&gt;</string>
   <string name="no_key">&lt;pas de clef&gt;</string>
@@ -181,7 +145,6 @@
   <string name="flag_authenticate">Authentifier</string>
   <!--sentences-->
   <string name="wrong_passphrase">Phrase de passe erronée</string>
-  <string name="set_a_passphrase">Définir d\'abord une phrase de passe.</string>
   <string name="no_filemanager_installed">Aucun gestionnaire de fichiers compatible installé.</string>
   <string name="passphrases_do_not_match">Les phrases de passe ne correspondent pas.</string>
   <string name="passphrase_must_not_be_empty">Veuillez saisir une phrase de passe</string>
@@ -200,15 +163,12 @@
   <string name="specify_file_to_export_to">Veuillez spécifier vers quel fichier exporter.\nAVERTISSEMENT ! Le fichier sera écrasé s\'il existe.</string>
   <string name="key_deletion_confirmation_multi">Voulez-vous vraiment supprimer toutes les clefs publiques 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="ask_save_changed_key">Vous avez apporté des changements au trousseau, voulez-vous l\'enregistrer ?</string>
-  <string name="ask_empty_id_ok">Vous avez ajouté une identité vide, êtes-vous certain de vouloir continuer ?</string>
   <string name="public_key_deletetion_confirmation">Voulez-vous vraiment supprimer la clef publique %s ?\nCeci est irréversible !</string>
-  <string name="also_export_secret_keys">Exporter aussi les clefs secrètes ?</string>
+  <string name="also_export_secret_keys">Importer aussi les clefs secrètes</string>
   <string name="key_exported">1 clef exportée avec succès.</string>
   <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.</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="bad_keys_encountered">
     <item quantity="one">%d mauvaise clef ignorée. Vous avez peut-être exporté avec l\'option\n --export-secret-subkeys\nAssurez-vous d\'exporter plutôt avec\n --export-secret-keys.</item>
@@ -220,7 +180,6 @@
   <string name="nfc_successful">Clef envoyée par Beam NFC avec succès |</string>
   <string name="key_copied_to_clipboard">La clef a été copié vers le presse-papiers !</string>
   <string name="fingerprint_copied_to_clipboard">L\'empreinte a été copié vers le presse-papiers !</string>
-  <string name="key_has_already_been_certified">La clef a déjà été certifiée !</string>
   <string name="select_key_to_certify">Veuillez choisir une clef à utiliser pour la certification !</string>
   <string name="key_too_big_for_sharing">La clef est trop grosse pour être partagée ainsi !</string>
   <!--errors
@@ -231,35 +190,29 @@
   <string name="error_no_secret_key_found">aucune clefs secrète adéquate n\'a été trouvée</string>
   <string name="error_external_storage_not_ready">le stockage externe n\'est pas prêt</string>
   <string name="error_key_size_minimum512bit">la taille de la clef doit être d\'au moins 512 bits</string>
-  <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_no_email">aucun courriel trouvé</string>
   <string name="error_key_needs_a_user_id">au moins une identité est nécessaire</string>
-  <string name="error_main_user_id_must_not_be_empty">l\'identité principale ne doit pas être vide</string>
-  <string name="error_key_needs_master_key">au moins une clef maîtresse est nécessaire</string>
   <string name="error_no_signature_passphrase">aucune phrase de passe n\'a été donnée</string>
   <string name="error_no_signature_key">aucune clef de signature n\'a été donnée</string>
   <string name="error_invalid_data">aucune donnée de chiffrement valide</string>
   <string name="error_integrity_check_failed">la vérification de l\'intégrité a échoué ! Les données ont été modifiées !</string>
   <string name="error_wrong_passphrase">phrase de passe erronnée</string>
-  <string name="error_saving_keys">erreur lors de la sauvegarde de certaines clefs</string>
   <string name="error_could_not_extract_private_key">impossible d\'extraire la clef privée</string>
-  <string name="error_expiry_must_come_after_creation">la date d\'expiration doit venir après la date de création</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Les données binaires directes sans fichier dans le système de fichiers ne sont pas prises en charge.</string>
   <string name="error_jelly_bean_needed">Il vous faut Android 4.1 pour utiliser la fonction Beam NFC d\'Android !</string>
   <string name="error_nfc_needed">La NFC n\'est pas disponible sur votre appareil !</string>
   <string name="error_nothing_import">Aucune clef trouvée !</string>
-  <string name="error_query_too_short">La requête de recherche de clef est trop courte</string>
-  <string name="error_searching_keys">Erreur irrécupérable lors de la recherche de clef sur le serveur</string>
-  <string name="error_too_many_responses">La requête de recherche de clef a retourné trop de candidats. Veuillez raffiner la requête</string>
-  <string name="error_import_no_valid_keys">Le fichier/le presse-papiers est vide</string>
+  <string name="error_query_too_short">La demande de recherche est trop courte. Veuillez la préciser !</string>
+  <string name="error_searching_keys">Une erreur est survenue lors de la recherche de clefs.</string>
+  <string name="error_too_many_responses">La demande de recherche de clef a retourné trop de candidats.  Veuillez la préciser !</string>
+  <string name="error_too_short_or_too_many_responses">Soit aucune clef n\'a été trouvée, soit trop de clefs. Veuillez améliorer votre demande !</string>
+  <string name="error_import_no_valid_keys">Aucune clef valide n\'a été trouvée dans le fichier/presse-papiers |</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_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>
-  <string name="error_change_something_first">Vous devez apporter des changements au trousseau avant de pouvoir l\'enregistrer</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Signature invalide !</string>
   <string name="decrypt_result_signature_unknown_pub_key">Clef publique inconnue</string>
@@ -275,19 +228,25 @@
   <string name="progress_saving">sauvegarde...</string>
   <string name="progress_importing">importation...</string>
   <string name="progress_exporting">exportation...</string>
+  <string name="progress_uploading">téléversement...</string>
   <string name="progress_building_key">assemblage de la clef...</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_generating_rsa">génération d\'une nouvelle clef RSA...</string>
+  <string name="progress_generating_dsa">génération d\'une nouvelle clef DSA...</string>
+  <string name="progress_generating_elgamal">génération d\'une nouvelle clef ElGamal...</string>
+  <string name="progress_modify">modification du trousseau...</string>
+  <string name="progress_modify_unlock">déverrouillage du trousseau...</string>
+  <string name="progress_modify_adduid">ajout des IDs d\'utilisateur...</string>
+  <string name="progress_modify_revokeuid">révocation des IDs d\'utilisateur...</string>
+  <string name="progress_modify_primaryuid">changement de l\'ID d\'utilisateur principale...</string>
+  <string name="progress_modify_subkeychange">modification des sous-clefs...</string>
+  <string name="progress_modify_subkeyrevoke">révocation des sous-clefs...</string>
+  <string name="progress_modify_subkeyadd">ajout des sous-clefs...</string>
+  <string name="progress_modify_passphrase">changement de la phrase de passe...</string>
   <plurals name="progress_exporting_key">
     <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>
@@ -298,6 +257,7 @@
   <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_certifying">certification...</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>
@@ -305,8 +265,6 @@
   <string name="progress_deleting_securely">suppression sûre de « %s »...</string>
   <!--action strings-->
   <string name="hint_public_keys">Nom/courriel/ ID clef...</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="hint_keybase_search">Nom/nom d\'utilisateur keybase.io...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
@@ -338,26 +296,26 @@
   <string name="import_tab_qr_code">Code QR/NFC</string>
   <string name="import_tab_keybase">Keybase.io</string>
   <string name="import_import">Importer les clefs choisies</string>
-  <string name="import_from_clipboard">Importer à partir du presse-papiers</string>
-  <plurals name="import_qr_code_missing">
-    <item quantity="one">Le code QR avec l\'ID %s est manquant</item>
-    <item quantity="other">Les codes QR avec les IDs %s sont manquants</item>
-  </plurals>
-  <string name="import_qr_code_start_with_one">Veuillez commencer par le code QR avec l\'ID 1</string>
   <string name="import_qr_code_wrong">Code QR incorrecte ! Veuillez réessayer !</string>
-  <string name="import_qr_code_finished">Balayage de code QR terminé !</string>
   <string name="import_qr_code_too_short_fingerprint">L\'empreinte est trop courte (&lt; 16 caractères)</string>
-  <string name="import_qr_scan_button">Numériser le code QR avec le lecteur de code-barres</string>
-  <string name="import_nfc_text">Pour recevoir des clefs par la NFC, les appareils doivent être déverrouillés.</string>
-  <string name="import_nfc_help_button">Aide</string>
   <string name="import_qr_code_button">Balayer le code QR...</string>
-  <string name="import_clipboard_button">Obtenir la clef depuis le presse-papiers</string>
-  <string name="import_keybase_button">Obtenir la clef depuis Keybase.io</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="one">Clef importée avec succès</item>
     <item quantity="other">%1$d clefs importées avec succès</item>
   </plurals>
+  <plurals name="import_keys_added_and_updated_2">
+    <item quantity="one">et mise à jour de la clef%2$s.</item>
+    <item quantity="other">et mise à jour de %1$d clefs%2$s.</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="one">Une clef%2$s importée avec succès.</item>
+    <item quantity="other">%1$d clefs%2$s importées avec succès.</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="one">Une clef%2$s mise à jour avec succès.</item>
+    <item quantity="other">%1$d clefs%2$s mises à jour avec succès</item>
+  </plurals>
   <string name="view_log">Consulter le journal</string>
   <string name="import_error_nothing">Rien à importer.</string>
   <string name="import_error">Erreur lors de l\'importation des clefs !</string>
@@ -384,9 +342,9 @@
   <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_create_account_text">L\'application demande la création d\'un nouveau compte. Veuillez choisir un clef privée existante ou en créer une.\nLes applications sont restreintes à l\'utilisation de clefs choisies ici.</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_settings_accounts_empty">Aucun compte n\'est attaché à cette appli.</string>
+  <string name="api_create_account_text">L\'appli demande la création d\'un nouveau compte. Veuillez choisir une de vos clefs existantes ou en créer une nouvelle.\nLes applis ne peuvent utiliser que les clefs que vous choisissez ici !</string>
+  <string name="api_register_text">L\'application affichée veut chiffrer/déchiffrer des messages et les signer en votre nom.\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 « Applis ».</string>
   <string name="api_register_allow">Permettre l\'accès</string>
   <string name="api_register_disallow">Enlever l\'accès</string>
   <string name="api_register_error_select_key">Veuillez choisir une clef !</string>
@@ -396,9 +354,6 @@
   <string name="api_error_wrong_signature">La vérification de la signature a échoué ! Avez-vous installé cette appli à partir d\'une source différente ? Si vous êtes sûr que ce n\'est pas une attaque, révoquez l\'enregistrement de cette appli dans OpenKeychain et enregistrez-la à nouveau.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Partager par un code QR</string>
-  <string name="share_qr_code_dialog_start">Balayer tous les codes QR un par un en utilisant « Suivant ».</string>
-  <string name="share_qr_code_dialog_fingerprint_text">Empreinte :</string>
-  <string name="share_qr_code_dialog_progress">Code QR avec l\'ID %1$d de %2$d</string>
   <string name="share_nfc_dialog">Partager par la NFC</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
@@ -409,32 +364,53 @@
   <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>
+  <string name="key_list_empty_button_import">importation d\'une clef existante.</string>
   <!--Key view-->
   <string name="key_view_action_edit">Modifier la clef</string>
   <string name="key_view_action_encrypt">Chiffrer avec cette clef</string>
   <string name="key_view_action_certify">Certifier les identités</string>
+  <string name="key_view_action_update">Mise à jour depuis le serveur de clefs</string>
   <string name="key_view_action_share_with">Partager avec...</string>
   <string name="key_view_action_share_nfc">Partager par NFC en tenant les appareils dos à dos</string>
+  <string name="key_view_action_upload">Téléverser vers le serveur de clefs</string>
   <string name="key_view_tab_main">Infos principales</string>
   <string name="key_view_tab_share">Partager</string>
   <string name="key_view_tab_keys">Sous-clefs</string>
   <string name="key_view_tab_certs">Certificats</string>
+  <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Changer la phrase de passe</string>
+  <string name="edit_key_action_add_identity">Ajouter une identité</string>
+  <string name="edit_key_action_add_subkey">Ajouter une sous-clef</string>
+  <string name="edit_key_edit_user_id_title">Choisir une action !</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Changer en identité principale</item>
+    <item>Révoquer l\'identité</item>
+  </string-array>
+  <string name="edit_key_edit_subkey_title">Choisissez une action !</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Changer l\'expiration</item>
+    <item>Révoquer la sous-clef</item>
+  </string-array>
+  <!--Create key-->
+  <string name="create_key_upload">Téléverser la clef vers le serveur de clefs</string>
+  <string name="create_key_empty">Ce champ est exigé</string>
+  <string name="create_key_passphrases_not_equal">Les phrases de passe ne correspondent pas</string>
+  <string name="create_key_final_text">Vous avez saisie l\'identité suivante :</string>
+  <string name="create_key_final_robot_text">Créer une clef peut prendre du temps, prenez donc un café en attendant...\n(3 sous-clefs, RSA 4096 bits)</string>
+  <string name="create_key_text">Saisissez votre nom complet, votre adresse courriel et choisissez votre phrase de passe.</string>
+  <string name="create_key_hint_full_name">Nom complet, p. ex. Marc-Olivier Lagacé</string>
+  <!--View key-->
+  <string name="view_key_revoked">Cette clef a été révoquée !</string>
+  <string name="view_key_expired">Cette clef est expirée !</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Clefs</string>
   <string name="nav_encrypt">Signer et chiffrer</string>
   <string name="nav_decrypt">Déchiffrer et vérifier</string>
-  <string name="nav_import">Importer les clefs</string>
   <string name="nav_apps">Applis</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>
   <!--hints-->
-  <string name="encrypt_content_edit_text_hint">Écrire ici le message à chiffrer et/ou signer...</string>
   <string name="decrypt_content_edit_text_hint">Saisir le cryptogramme à déchiffrer et/ou à vérifier ici...</string>
   <!--certs-->
   <string name="cert_default">valeur par défaut</string>
@@ -442,7 +418,7 @@
   <string name="cert_casual">rapide</string>
   <string name="cert_positive">positif</string>
   <string name="cert_revoke">révoqué</string>
-  <string name="cert_verify_ok">ok</string>
+  <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">échec!</string>
   <string name="cert_verify_error">erreur!</string>
   <string name="cert_verify_unavailable">clef non disponible</string>
@@ -486,20 +462,21 @@
   <string name="msg_ip_reinsert_secret">Réinsertion de la clef secrète</string>
   <string name="msg_ip_uid_cert_bad">Un mauvais certificat a été rencontré !</string>
   <string name="msg_ip_uid_cert_error">Erreur lors du traitement du certificat !</string>
-  <string name="msg_ip_uid_cert_good">L\'ID utilisateur est certifié par %1$s (%2$s)</string>
+  <string name="msg_ip_uid_cert_good">L\'ID d\'utilisateur est certifié par %1$s</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="one">Un certificat ignoré provenant d\'une clef publique inconnue</item>
     <item quantity="other">%s certificats ignorés provenant de clefs publiques inconnues</item>
   </plurals>
-  <string name="msg_ip_uid_classifying_zero">Classification des ID utilisateurs (aucune clef de confiance disponible)</string>
+  <string name="msg_ip_uid_classifying_zero">Classification des ID d\'utilisateurs (aucune clef de confiance disponible)</string>
   <plurals name="msg_ip_uid_classifying">
-    <item quantity="one">Classification des ID utilisateurs (en utilisant une clef de confiance)</item>
-    <item quantity="other">Classification des ID utilisateurs (en utilisant %s clefs de confiance)</item>
+    <item quantity="one">Classification des ID d\'utilisateurs (en utilisant une clef de confiance)</item>
+    <item quantity="other">Classification des ID d\'utilisateurs (en utilisant %s clefs de confiance)</item>
   </plurals>
-  <string name="msg_ip_uid_reorder">Réorganisation des ID utilisateurs</string>
-  <string name="msg_ip_uid_processing">Traitement de l\'ID utilisateur %s</string>
-  <string name="msg_ip_uid_revoked">L\'ID utilisateur est révoqué</string>
+  <string name="msg_ip_uid_reorder">Réorganisation des ID d\'utilisateurs</string>
+  <string name="msg_ip_uid_processing">Traitement de l\'ID d\'utilisateur %s</string>
+  <string name="msg_ip_uid_revoked">L\'ID d\'utilisateur est révoqué</string>
   <string name="msg_is_bad_type_public">Tentative d\'importer le trousseau public comme secret. Ceci est un bogue, veuillez remplir un rapport !</string>
+  <string name="msg_is_bad_type_uncanon">Tentative d\'importer un trousseau sans canonicalisation. Ceci est un bogue, veuillez remplir un rapport !</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importation de la clef secrète %s</string>
   <string name="msg_is_db_exception">Erreur de base de données!</string>
@@ -514,12 +491,13 @@
   <!--Keyring Canonicalization log entries-->
   <string name="msg_kc_public">Canonicalisation du trousseau public %s</string>
   <string name="msg_kc_secret">Canonicalisation du trousseau secret %s</string>
-  <string name="msg_kc_fatal_no_uid">La canonicalisation du trousseau a échoué : le trousseau n\'a pas d\'ID utilisateur valides</string>
+  <string name="msg_kc_fatal_no_uid">La canonicalisation du trousseau a échoué : le trousseau n\'a pas d\'ID d\'utilisateur valides</string>
   <string name="msg_kc_master">Traitement de la clef maîtresse</string>
   <string name="msg_kc_revoke_bad_err">Suppression du mauvais certificat de révocation du trousseau</string>
   <string name="msg_kc_revoke_bad_local">Suppression du certificat de révocation du trousseau ayant le drapeau « local »</string>
   <string name="msg_kc_revoke_bad_time">Suppression du certificat de révocation du trousseau ayant une estampille temporelle dans le futur</string>
   <string name="msg_kc_revoke_bad_type">Suppression du certificat de clef maîtresse de type inconnu (%s)</string>
+  <string name="msg_kc_revoke_bad_type_uid">Suppression de la certification de l\'ID d\'utilisateur en mauvaise position</string>
   <string name="msg_kc_revoke_bad">Suppression du mauvais certificat de révocation du trousseau</string>
   <string name="msg_kc_revoke_dup"> Suppression du certificat redondant de révocation du trousseau</string>
   <string name="msg_kc_sub">Traitement de la sous-clef %s</string>
@@ -530,9 +508,9 @@
   <string name="msg_kc_sub_bad_time">Suppression du certificat de liaison de la sous-clef ayant une estampille temporelle dans le futur</string>
   <string name="msg_kc_sub_bad_type">Type de certificat de sous-clef inconnu : %s</string>
   <string name="msg_kc_sub_dup">Suppression du certificat redondant de liaison de sous-clef</string>
-  <string name="msg_kc_sub_primary_bad">Suppression du certificat de liaison de la sous-clef à cause d\'un certificat de liaison primaire invalide</string>
-  <string name="msg_kc_sub_primary_bad_err">Suppression du certificat de liaison de la sous-clef due à un mauvais certificat de liaison</string>
-  <string name="msg_kc_sub_primary_none">Suppression du certificat de liaison de la sous-clef due à un certificat de liaison primaire manquant</string>
+  <string name="msg_kc_sub_primary_bad">Suppression du certificat de liaison de la sous-clef à cause d\'un certificat de liaison principal invalide</string>
+  <string name="msg_kc_sub_primary_bad_err">Suppression du certificat de liaison de la sous-clef due à un mauvais certificat principal de liaison</string>
+  <string name="msg_kc_sub_primary_none">Suppression du certificat de liaison de la sous-clef due à un certificat principal de liaison manquant</string>
   <string name="msg_kc_sub_no_cert">Aucun certificat valide trouvé pour %s, qui est maintenant enlevé du trousseau</string>
   <string name="msg_kc_sub_revoke_bad_err">Suppression du certificat de révocation de la mauvaise sous-clef</string>
   <string name="msg_kc_sub_revoke_bad">Suppression du certificat de révocation de la mauvaise sous-clef</string>
@@ -547,16 +525,17 @@
     <item quantity="one">Canonicalisation du trousseau réussie, un certificat redondant supprimé</item>
     <item quantity="other">Canonicalisation du trousseau réussie, %d certificats redondants supprimés</item>
   </plurals>
-  <string name="msg_kc_uid_bad_err">Suppression du mauvais auto-certificat pour l\'ID utilisateur %s</string>
-  <string name="msg_kc_uid_bad_local">Suppression du certificat d\'ID utilisateur ayant le drapeau « local »</string>
-  <string name="msg_kc_uid_bad_time">Suppression de l\'ID utilisateur ayant une estampille temporelle dans le futur</string>
-  <string name="msg_kc_uid_bad_type">Suppression du certificat d\'ID utilisateur de type inconnu (%s)</string>
-  <string name="msg_kc_uid_bad">Suppression du mauvais auto-certificat pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_dup">Suppression de l\'auto-certificat périmé pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_foreign">Suppression du certificat étranger d\'ID utilisateur par %s</string>
-  <string name="msg_kc_uid_revoke_dup">Suppression du certificat de révocation redondant pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_revoke_old">Suppression du certificat de révocation périmé pour l\'ID utilisateur « %s »</string>
-  <string name="msg_kc_uid_no_cert">Aucun auto-certificat valide trouvé pour l\'ID utilisateur %s, qui est maintenant enlevé du trousseau</string>
+  <string name="msg_kc_uid_bad_err">Suppression du mauvais auto-certificat pour l\'ID d\'utilisateur %s</string>
+  <string name="msg_kc_uid_bad_local">Suppression du certificat d\'ID d\'utilisateur ayant le drapeau « local »</string>
+  <string name="msg_kc_uid_bad_time">Suppression de l\'ID d\'utilisateur ayant une estampille temporelle dans le futur</string>
+  <string name="msg_kc_uid_bad_type">Suppression du certificat d\'ID d\'utilisateur de type inconnu (%s)</string>
+  <string name="msg_kc_uid_bad">Suppression du mauvais auto-certificat pour l\'ID d\'utilisateur « %s »</string>
+  <string name="msg_kc_uid_dup">Suppression de l\'auto-certificat périmé pour l\'ID d\'utilisateur « %s »</string>
+  <string name="msg_kc_uid_foreign">Suppression du certificat étranger d\'ID d\'utilisateur par %s</string>
+  <string name="msg_kc_uid_revoke_dup">Suppression du certificat de révocation redondant pour l\'ID d\'utilisateur « %s »</string>
+  <string name="msg_kc_uid_revoke_old">Suppression du certificat de révocation périmé pour l\'ID d\'utilisateur « %s »</string>
+  <string name="msg_kc_uid_no_cert">Aucun auto-certificat valide trouvé pour l\'ID d\'utilisateur %s, qui est maintenant enlevé du trousseau</string>
+  <string name="msg_kc_uid_remove">Suppression de l\'ID d\'utilisateur invalide %s</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Fusion vers le trousseau public %s</string>
   <string name="msg_mg_secret">Fusion vers le trousseau secret %s</string>
@@ -564,16 +543,29 @@
   <string name="msg_mg_heterogeneous">Il a été tenté de consolider les trousseaux hétérogènes</string>
   <string name="msg_mg_new_subkey">Ajout de la nouvelle sous-clef %s</string>
   <string name="msg_mg_found_new">%s nouveaux certificats trouvés dans le trousseau</string>
+  <string name="msg_mg_unchanged">Aucun nouveau certificat</string>
+  <!--createSecretKeyRing-->
+  <string name="msg_cr">Génération d\'une nouvelle clef maîtresse</string>
+  <string name="msg_cr_error_no_master">Aucune option de clef maîtresse n\'a été spécifiée !</string>
+  <string name="msg_cr_error_no_user_id">Les trousseaux doivent être créés avec au moins un ID d\'utilisateur !</string>
+  <string name="msg_cr_error_no_certify">La clef maîtresse doit avoir le drapeau « certifié » !</string>
+  <string name="msg_cr_error_keysize_512">La taille de la clef doit être supérieure ou égale à 512 !</string>
+  <string name="msg_cr_error_internal_pgp">Erreur interne PGP !</string>
+  <string name="msg_cr_error_unknown_algo">Mauvais choix d’algorithme !</string>
+  <string name="msg_cr_error_master_elgamal">La clef maîtresse ne doit pas être de type ElGamal !</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modification du trousseau %s</string>
   <string name="msg_mf_error_encode">Exception d\'encodage !</string>
   <string name="msg_mf_error_fingerprint">L\'empreinte de clef effective ne correspond pas à celle attendue !</string>
-  <string name="msg_mf_error_keyid">Aucune ID de clef. Ceci est une erreur de programmation, veuillez remplir un rapport de bogue !</string>
+  <string name="msg_mf_error_keyid">Aucune ID de clef. Ceci est une erreur interne, veuillez remplir un rapport de bogue !</string>
   <string name="msg_mf_error_integrity">Erreur interne, le contrôle d\'intégrité a échoué !</string>
-  <string name="msg_mf_error_revoked_primary">Les IDs d\'un utilisateur révoqué ne peuvent pas être primaires !</string>
+  <string name="msg_mf_error_noexist_primary">Mauvais ID principal spécifié !</string>
+  <string name="msg_mf_error_revoked_primary">Les IDs d\'utilisateurs révoqués ne peuvent pas être principaux !</string>
   <string name="msg_mf_error_pgp">Exception interne PGP !</string>
   <string name="msg_mf_error_sig">Exception de signature !</string>
   <string name="msg_mf_passphrase">Changement de la phrase de passe</string>
+  <string name="msg_mf_primary_replace_old">Remplacement du certificat de l\'ID d\'utilisateur principal précédent</string>
+  <string name="msg_mf_primary_new">Génération d\'un nouveau certificat pour le nouvel ID d\'utilisateur principal</string>
   <string name="msg_mf_subkey_change">Modification de la sous-clef %s</string>
   <string name="msg_mf_subkey_missing">Une action a été tentée sur la sous-clef manquante %s !</string>
   <string name="msg_mf_subkey_new">Génération d\'une nouvelle sous-clef %2$s de %1$s bit</string>
@@ -581,12 +573,20 @@
   <string name="msg_mf_subkey_past_expiry">La date d\'expiration ne peut pas être dans le passé !</string>
   <string name="msg_mf_subkey_revoke">Révocation de la sous-clef %s</string>
   <string name="msg_mf_success">Trousseau modifié avec succès</string>
-  <string name="msg_mf_uid_add">Ajout de l\'ID utilisateur %s</string>
-  <string name="msg_mf_uid_primary">Changement de l\'UID primaire en %s</string>
-  <string name="msg_mf_uid_revoke">Révocation de l\'ID utilisateur %s</string>
+  <string name="msg_mf_uid_add">Ajout de l\'ID d\'utilisateur %s</string>
+  <string name="msg_mf_uid_primary">Changement de l\'UID principal en %s</string>
+  <string name="msg_mf_uid_revoke">Révocation de l\'ID d\'utilisateur %s</string>
+  <string name="msg_mf_uid_error_empty">L\'ID d\'utilisateur ne peut pas être vide !</string>
   <string name="msg_mf_unlock_error">Erreur lors du déverrouillage du trousseau !</string>
   <string name="msg_mf_unlock">Déverrouillage du trousseau</string>
+  <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Cliquer ici pour effacer les phrases de passe mises en cache</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain a mis en cache %d phrases de passe</string>
+  <string name="passp_cache_notif_keys">Phrases de passe mises en cache :</string>
+  <string name="passp_cache_notif_clear">Effacer le cache</string>
+  <string name="passp_cache_notif_pwd">Mot de passe</string>
   <!--unsorted-->
+  <string name="internal_error">Erreur interne !</string>
   <string name="section_certifier_id">Certificateur</string>
   <string name="section_cert">Détails du certificat</string>
   <string name="label_user_id">identité</string>
@@ -598,14 +598,17 @@
   <string name="label_cert_type">Type</string>
   <string name="error_key_not_found">Clef introuvable !</string>
   <string name="error_key_processing">Erreur lors du traitement de la clef !</string>
-  <string name="no_subkey">sous-clef non disponible</string>
   <string name="key_stripped">dépouillée</string>
-  <string name="secret_cannot_multiple">Les clefs secrètes ne peuvent être supprimées qu\'individuellement !</string>
+  <string name="secret_cannot_multiple">Vos propres clefs ne peuvent être supprimées qu\'individuellement !</string>
   <string name="title_view_cert">Voir les détails du certificat</string>
   <string name="unknown_algorithm">inconnu</string>
   <string name="can_sign_not">impossible de signer</string>
-  <string name="error_encoding">Erreur d\'encodage</string>
   <string name="error_no_encrypt_subkey">Aucune sous-clef de chiffrement n\'est disponible !</string>
   <string name="info_no_manual_account_creation">Ne pas créer de comptes-OpenKeychain manuellement.\nPour plus d\'informations, consultez l\'aide.</string>
   <string name="contact_show_key">Montrer la clef (%s)</string>
+  <!--First Time-->
+  <string name="first_time_text1">Reprenez le contrôle de votre confidentialité avec OpenKeychain |</string>
+  <string name="first_time_create_key">Créer ma clef</string>
+  <string name="first_time_import_key">Importer une clef existante</string>
+  <string name="first_time_skip">Ignorer le paramétrage</string>
 </resources>

OpenKeychain/src/main/res/values-it/strings.xml

@@ -1,20 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <!--title-->
-  <string name="title_select_recipients">Seleziona Chiave Pubblica</string>
-  <string name="title_select_secret_key">Seleziona Chiave Privata</string>
   <string name="title_encrypt">Codifica</string>
   <string name="title_decrypt">Decodifica</string>
   <string name="title_authentication">Frase di accesso</string>
-  <string name="title_create_key">Crea Chiave</string>
   <string name="title_edit_key">Modifica Chiave</string>
-  <string name="title_wizard">Benvenuto in OpenKeychain</string>
   <string name="title_preferences">Preferenze</string>
   <string name="title_api_registered_apps">Apps</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_set_passphrase">Imposta Frase di Accesso</string>
-  <string name="title_share_with">Condividi con...</string>
   <string name="title_share_fingerprint_with">Condivi impronta con...</string>
   <string name="title_share_key">Condividi chiave con...</string>
   <string name="title_share_file">Condividi file con...</string>
@@ -35,60 +29,33 @@
   <string name="section_general">Generale</string>
   <string name="section_defaults">Predefiniti</string>
   <string name="section_advanced">Avanzato</string>
-  <string name="section_master_key">Chiave Principale</string>
-  <string name="section_master_user_id">Identità Primaria</string>
   <string name="section_actions">Azioni</string>
   <string name="section_share_key">Intera chiave</string>
   <string name="section_certification_key">La Tua Chiave usata per la certificazione</string>
   <string name="section_upload_key">Carica Chiave</string>
   <string name="section_key_server">Server delle Chiavi</string>
-  <string name="section_encrypt_and_or_sign">Codifica e/o Firma</string>
-  <string name="section_decrypt_verify">Decodifica e Verifica</string>
   <string name="section_fingerprint">Impronta</string>
   <string name="section_key_to_certify">Chiave da certificare</string>
   <!--button-->
-  <string name="btn_certify">Certifica</string>
   <string name="btn_decrypt_verify_file">Decodifica, verifica e salva su file</string>
   <string name="btn_decrypt_verify_message">Decodifica e verifica messaggio</string>
-  <string name="btn_decrypt_verify_clipboard">Dagli Appunti</string>
   <string name="btn_encrypt_file">Codifica e salva file</string>
   <string name="btn_save">Salva</string>
   <string name="btn_do_not_save">Annulla</string>
   <string name="btn_delete">Elimina</string>
   <string name="btn_no_date">Nessuno</string>
   <string name="btn_okay">OK</string>
-  <string name="btn_change_passphrase">Cambia Nuova Frase di Accesso</string>
-  <string name="btn_set_passphrase">Imposta Nuova Frase di Accesso</string>
   <string name="btn_export_to_server">Carica sul Server delle Chiavi</string>
   <string name="btn_next">Prossimo</string>
   <string name="btn_back">Precedente</string>
-  <string name="btn_clipboard">Appunti</string>
-  <string name="btn_share">Condividi...</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>
-  <string name="btn_share_encrypted_signed">Condividi messaggio codificato/firmato...</string>
   <string name="btn_view_cert_key">Mostra chiave di certificazione</string>
   <!--menu-->
   <string name="menu_preferences">Impostazioni</string>
   <string name="menu_help">Aiuto</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 (avanzato)</string>
   <string name="menu_search">Cerca</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_default_fingerprint">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>
-  <string name="menu_copy_to_clipboard">Copia negli appunti</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>
@@ -97,22 +64,18 @@
   <string name="menu_export_all_keys">Esporta tutte le chiavi</string>
   <string name="menu_advanced">Mostra informazioni avanzate</string>
   <!--label-->
-  <string name="label_sign">Firma</string>
   <string name="label_message">Messaggio</string>
   <string name="label_file">File</string>
   <string name="label_no_passphrase">Nessuna Frase di Accesso</string>
   <string name="label_passphrase">Frase di Accesso</string>
-  <string name="label_passphrase_again">Di nuovo</string>
+  <string name="label_passphrase_again">Ripeti Frase di Accesso</string>
   <string name="label_algorithm">Algortimo</string>
   <string name="label_ascii_armor">Armatura ASCII</string>
-  <string name="label_select_public_keys">Destinatari</string>
-  <string name="label_delete_after_encryption">Cancella Dopo Codifica</string>
+  <string name="label_conceal_pgp_application">Fai sapere agli altri che utilizzi OpenKeychain</string>
+  <string name="label_conceal_pgp_application_summary">Scrive \'OpenKeychain v2.7\' nelle firme OpenPGP, testi cifrati e chiavi esportate</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">con Chiave Pubblica</string>
-  <string name="label_symmetric">con Frase di Accesso</string>
   <string name="label_passphrase_cache_ttl">Cache Frase di Accesso</string>
   <string name="label_message_compression">Compressione Messaggio</string>
   <string name="label_file_compression">Compressione File</string>
@@ -129,12 +92,7 @@
   <string name="label_email">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>
-  </plurals>
   <string name="user_id_no_name">&lt;nessun nome&gt;</string>
   <string name="none">&lt;nessuno&gt;</string>
   <string name="no_key">&lt;nessuna chiave&gt;</string>
@@ -181,7 +139,6 @@
   <string name="flag_authenticate">Convalida</string>
   <!--sentences-->
   <string name="wrong_passphrase">Frase di Accesso errata</string>
-  <string name="set_a_passphrase">Imposta prima una frase di accesso.</string>
   <string name="no_filemanager_installed">Nessun gestore file compatibile installato.</string>
   <string name="passphrases_do_not_match">Le frasi di accesso non corrispondono.</string>
   <string name="passphrase_must_not_be_empty">Si prega di inserire una frase di accesso.</string>
@@ -200,15 +157,11 @@
   <string name="specify_file_to_export_to">Perfavore specifica su quale file esportare.\nATTENZIONE: Il file sara\' sovrascritto se esistente.</string>
   <string name="key_deletion_confirmation_multi">Vuoi veramente eliminare tutte le chiavi pubbliche selezionate?\nNon potrai annullare!</string>
   <string name="secret_key_deletion_confirmation">Vuoi veramente eliminare la chiave PRIVATA \'%s\'?\nNon potrai annullare!</string>
-  <string name="ask_save_changed_key">Hai apportato modifiche al tuo portachiavi, vuoi salvarlo?</string>
-  <string name="ask_empty_id_ok">Hai aggiunto una identità vuota, sei sicuro di voler continuare?</string>
   <string name="public_key_deletetion_confirmation">Vuoi veramente eliminare la chiave pubblica \'%s\'?\nNon potrai annullare!</string>
-  <string name="also_export_secret_keys">Esportare anche le chiavi segrete?</string>
   <string name="key_exported">1 chiave esportata correttamente.</string>
   <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: supporto sottochiavi solo per ElGamal.</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="bad_keys_encountered">
     <item quantity="one">%d chiave segreta non valida ignorata. Forse hai esportato con opzione\n--export-secret-subkeys\nAssicurati di esportare con\n--export-secret-keys\ninvece.</item>
@@ -220,7 +173,6 @@
   <string name="nfc_successful">Chiave correttamente inviata tramite NFC Beam!</string>
   <string name="key_copied_to_clipboard">Chiave copiata negli appunti!</string>
   <string name="fingerprint_copied_to_clipboard">Impronta copiata negli appunti!</string>
-  <string name="key_has_already_been_certified">La chiave è già certificata!</string>
   <string name="select_key_to_certify">Per favore seleziona una chiave per la certificazione!</string>
   <string name="key_too_big_for_sharing">Chiave troppo grande per essere condivisa in questo modo!</string>
   <!--errors
@@ -231,35 +183,24 @@
   <string name="error_no_secret_key_found">nessuna chiave privata adatta trovata</string>
   <string name="error_external_storage_not_ready">memoria esterna non pronta</string>
   <string name="error_key_size_minimum512bit">La grandezza della chiave deve essere almeno di 512bit</string>
-  <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_no_email">Nessuna email trovata</string>
   <string name="error_key_needs_a_user_id">neccessaria almeno una identità</string>
-  <string name="error_main_user_id_must_not_be_empty">L\'identità primaria non può essere vuota</string>
-  <string name="error_key_needs_master_key">necessaria almeno una chiave principale</string>
   <string name="error_no_signature_passphrase">nessuna frase di accesso inserita</string>
   <string name="error_no_signature_key">nessuna chiave di firma inserita</string>
   <string name="error_invalid_data">dati di codifica non validi</string>
   <string name="error_integrity_check_failed">Controllo di integrita\' fallito! I dati sono stati modificati!</string>
   <string name="error_wrong_passphrase">frase di accesso errata</string>
-  <string name="error_saving_keys">errore nel salvataggio di alcune chiavi</string>
   <string name="error_could_not_extract_private_key">impossibile estrarre la chiave privata</string>
-  <string name="error_expiry_must_come_after_creation">La data di scadenza deve essere postuma quella di creazione</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">Flusso di dati diretto senza file corrispettivo nel filesystem non e\' supportato.</string>
   <string name="error_jelly_bean_needed">Devi avere Android 4.1 per usare Android NFC Beam!</string>
   <string name="error_nfc_needed">NFC non disponibile nel tuo dispositivo!</string>
   <string name="error_nothing_import">Nessuna chiave trovata!</string>
-  <string name="error_query_too_short">Chiave della query di ricerca troppo corta</string>
-  <string name="error_searching_keys">Errore irreversibile nella ricerca di chiavi sul server</string>
-  <string name="error_too_many_responses">Chiave della query di ricerca ha generato troppi candidati; Si prega di perfezionare la ricerca</string>
-  <string name="error_import_no_valid_keys">File/Appunti vuoti</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_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>
-  <string name="error_change_something_first">È necessario apportare modifiche al portachiavi prima prima che sia possibile salvarlo</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">Firma non valida!</string>
   <string name="decrypt_result_signature_unknown_pub_key">Chiave pubblica sconosciuta</string>
@@ -276,18 +217,11 @@
   <string name="progress_importing">importazione...</string>
   <string name="progress_exporting">esportazione...</string>
   <string name="progress_building_key">fabbricazione chiave...</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>
   </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>
@@ -305,8 +239,6 @@
   <string name="progress_deleting_securely">eliminazione sicura di \'%s\'...</string>
   <!--action strings-->
   <string name="hint_public_keys">Nome/Email/ID Chiave...</string>
-  <string name="hint_secret_keys">Cerca Chiave Privata</string>
-  <string name="action_share_key_with">Condividi chiave con...</string>
   <string name="hint_keybase_search">Nome/Keybase.io nome utente...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
@@ -338,22 +270,22 @@
   <string name="import_tab_qr_code">Codice QR/NFC</string>
   <string name="import_tab_keybase">Keybase.io</string>
   <string name="import_import">Importa chiavi selezionate</string>
-  <string name="import_from_clipboard">Importa dagli appunti</string>
-  <plurals name="import_qr_code_missing">
-    <item quantity="one">Codice QR con ID %s mancante</item>
-    <item quantity="other">Codici QR con ID %s mancanti</item>
-  </plurals>
-  <string name="import_qr_code_start_with_one">Perfavore inizia col Codice QR con ID 1</string>
   <string name="import_qr_code_wrong">Codica QR deformato! Prova di nuovo!</string>
-  <string name="import_qr_code_finished">Scansione codice QR completata!</string>
   <string name="import_qr_code_too_short_fingerprint">Impronta troppo corta (&lt; 16 caratteri)</string>
-  <string name="import_qr_scan_button">Scansiona il Codice QR con \'Barcode Scanner\'</string>
-  <string name="import_nfc_text">Per ricevere le chiavi via NFC, il dispositivo deve essere sbloccato.</string>
-  <string name="import_nfc_help_button">Aiuto</string>
   <string name="import_qr_code_button">Scansione Codice QR</string>
-  <string name="import_clipboard_button">Ottieni chiave dagli appunti</string>
-  <string name="import_keybase_button">Ottieni chiave da Keybase.io</string>
   <!--Import result toast-->
+  <plurals name="import_keys_added_and_updated_1">
+    <item quantity="one">Chiave importata correttamente.</item>
+    <item quantity="other">%1$d chiavi importate correttamente.</item>
+  </plurals>
+  <plurals name="import_keys_added">
+    <item quantity="one">Chiave%2$s importata correttamente.</item>
+    <item quantity="other">%1$d chiavi%2$s importate correttamente.</item>
+  </plurals>
+  <plurals name="import_keys_updated">
+    <item quantity="one">Chiave%2$s aggiornata con successo.</item>
+    <item quantity="other">Aggiornate %1$d chiavi%2$s con successo.</item>
+  </plurals>
   <string name="view_log">Mostra registro</string>
   <string name="import_error_nothing">Niente da importare</string>
   <string name="import_error">Errore di importazione chiavi!</string>
@@ -381,7 +313,6 @@
   <string name="api_settings_package_signature">SHA-256 della Firma del Pacchetto</string>
   <string name="api_settings_accounts">Account</string>
   <string name="api_settings_accounts_empty">Nessun account collegato a questa applicazione</string>
-  <string name="api_create_account_text">L\'applicazione richiede la creazione di un nuovo account. Si prega di selezionare una chiave privata esistente o crearne una nuova.\nLe applicazioni sono limitate all\'utilizzo delle chiavi selezionate qui!</string>
   <string name="api_register_text">Le app visualizzate hanno richiesto l\'accesso a OpenKeychain.\nPermetti accesso?\n\nATTENZIONE: Se non sai perche\' questo schermata e\' apparsa, nega l\'accesso! Puoi revocare l\'accesso dopo, usando la schermata \'App Registrate\'.</string>
   <string name="api_register_allow">Permetti accesso</string>
   <string name="api_register_disallow">Nega accesso</string>
@@ -392,9 +323,6 @@
   <string name="api_error_wrong_signature">Controllo della firma fallito! Hai installato questa app da una fonte diversa? Se sei sicuro che non sia un attacco, revoca la registrazione di questa app in OpenKeychain e dopo registra di nuovo l\'app.</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">Condividi tramite Codice QR</string>
-  <string name="share_qr_code_dialog_start">Scorri tutti i Codici QR usando \'Prossimo\', a scansionali uno ad uno.</string>
-  <string name="share_qr_code_dialog_fingerprint_text">Impronta:</string>
-  <string name="share_qr_code_dialog_progress">Codice QR con ID %1$d di %2$d</string>
   <string name="share_nfc_dialog">Condividi tramite NFC</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
@@ -405,7 +333,6 @@
   <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 con questa chiave</string>
@@ -416,21 +343,35 @@
   <string name="key_view_tab_share">Condividi</string>
   <string name="key_view_tab_keys">Sottochiavi</string>
   <string name="key_view_tab_certs">Certificati</string>
+  <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">Cambia Frase Di Accesso</string>
+  <string name="edit_key_action_add_identity">Aggiungi Identità</string>
+  <string name="edit_key_action_add_subkey">Aggiungi Sottochiave</string>
+  <string name="edit_key_edit_user_id_title">Seleziona un azione!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>Cambia in Identita\' Primaria</item>
+    <item>Revoca identita\'</item>
+  </string-array>
+  <string name="edit_key_edit_subkey_title">Seleziona un azione!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>Cambia Scadenza</item>
+    <item>Revoca Sottochiave</item>
+  </string-array>
+  <!--Create key-->
+  <string name="create_key_upload">Carica chiave nel server delle chiavi</string>
+  <string name="create_key_empty">Questo campo è necessario</string>
+  <!--View key-->
+  <string name="view_key_revoked">Questa chiave è stata revocata!</string>
+  <string name="view_key_expired">Questa chiave è scaduta</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">Chiavi</string>
   <string name="nav_encrypt">Firma e Codifica</string>
   <string name="nav_decrypt">Decodifica e Verifica</string>
-  <string name="nav_import">Importa Chiavi</string>
   <string name="nav_apps">Apps</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>
   <!--hints-->
-  <string name="encrypt_content_edit_text_hint">Scrivi qui il messaggio da codificare e/o firmare...</string>
   <string name="decrypt_content_edit_text_hint">Inserisci il testo cifrato qui per la decodifica e/o verifica...</string>
   <!--certs-->
   <string name="cert_default">predefiniti</string>
@@ -438,7 +379,7 @@
   <string name="cert_casual">casuale</string>
   <string name="cert_positive">positivo</string>
   <string name="cert_revoke">revocato</string>
-  <string name="cert_verify_ok">ok</string>
+  <string name="cert_verify_ok">OK</string>
   <string name="cert_verify_failed">fallito!</string>
   <string name="cert_verify_error">errore!</string>
   <string name="cert_verify_unavailable">chiave non disponibile</string>
@@ -482,11 +423,21 @@
   <string name="msg_ip_reinsert_secret">Reinserimento chiave segreta</string>
   <string name="msg_ip_uid_cert_bad">Riscontrato certificato sbagliato!</string>
   <string name="msg_ip_uid_cert_error">Errore elaborazione certificato!</string>
-  <string name="msg_ip_uid_cert_good">ID utente certificato da %1$s (%2$s)</string>
+  <string name="msg_ip_uid_cert_good">ID utente certificato da %1$s</string>
+  <plurals name="msg_ip_uid_certs_unknown">
+    <item quantity="one">Ignoro un certificato rilasciato da chiavi pubbliche sconosciute</item>
+    <item quantity="other">Ignoro %s certificati rilasciati da chiavi pubbliche sconosciute</item>
+  </plurals>
+  <string name="msg_ip_uid_classifying_zero">Classificazione ID utenti(nessuna firma affidabile disponibile)</string>
+  <plurals name="msg_ip_uid_classifying">
+    <item quantity="one">Classificazione ID utenti (uso di una chiave verificata)</item>
+    <item quantity="other">Classificazione ID utenti (uso di %s chiavi verificate)</item>
+  </plurals>
   <string name="msg_ip_uid_reorder">Riordinamento ID utenti</string>
   <string name="msg_ip_uid_processing">Elaborazione ID utente %s</string>
   <string name="msg_ip_uid_revoked">ID utente revocato</string>
   <string name="msg_is_bad_type_public">Ho cercato di importare portachiavi pubblico come privato. Questo è un bug, per cortesia inviateci un rapporto!</string>
+  <string name="msg_is_bad_type_uncanon">Tentativo di importare un portachiavi senza canonicalizzazione. Questo è un bug, per cortesia inviateci un rapporto!</string>
   <!--Import Secret log entries-->
   <string name="msg_is">Importazione chiave segreta %s</string>
   <string name="msg_is_db_exception">Errore Banca Dati!</string>
@@ -507,6 +458,7 @@
   <string name="msg_kc_revoke_bad_local">Rimozione certificato di revoca del portachiavi con caratteristica \"locale\"</string>
   <string name="msg_kc_revoke_bad_time">Rimozione certificato di revoca del portachiavi con marca temporale futura</string>
   <string name="msg_kc_revoke_bad_type">Rimozione certificato della chiave principale di tipo sconosciuto (%s)</string>
+  <string name="msg_kc_revoke_bad_type_uid">Rimozione certificazione ID Utente in posizione errata</string>
   <string name="msg_kc_revoke_bad">Rimozione certificato di revoca del portachiavi corrotto</string>
   <string name="msg_kc_revoke_dup">Rimozione certificato di revoca del portachiavi ridondante</string>
   <string name="msg_kc_sub">Elaborazione sottochiave %s</string>
@@ -525,7 +477,15 @@
   <string name="msg_kc_sub_revoke_bad">Rimozione certificato di revoca corrotto della sottochiave</string>
   <string name="msg_kc_sub_revoke_dup">Rimozione certificato di revoca ridondante della sottochiave</string>
   <string name="msg_kc_success">Canonicalizzazione del portachiavi avvenuta con successo, nessuna modifica</string>
+  <plurals name="msg_kc_success_bad">
+    <item quantity="one">Canonicalizzazione portachiavi con successo, rimosso un certificato errato</item>
+    <item quantity="other">Canonicalizzazione portachiavi con successo, rimossi %d certificati errati</item>
+  </plurals>
   <string name="msg_kc_success_bad_and_red">Canonicalizzazione portachiavi con successo, rimossi %1$s certificati errati e %2$s certificati ridondanti</string>
+  <plurals name="msg_kc_success_redundant">
+    <item quantity="one">Canonicalizzazione portachiavi con successo, rimosso un certificato ridondante</item>
+    <item quantity="other">Canonicalizzazione portachiavi con successo, rimossi %d certificati ridondanti</item>
+  </plurals>
   <string name="msg_kc_uid_bad_err">Rimozione autocertificazione corrotta per ID utente %s</string>
   <string name="msg_kc_uid_bad_local">Rimozione certificato ID utente con caratteristica \"locale\"</string>
   <string name="msg_kc_uid_bad_time">Rimozione ID utente con marca temporale futura</string>
@@ -536,6 +496,7 @@
   <string name="msg_kc_uid_revoke_dup">Rimozione certificato di revoca ridondante per ID utente \"%s\"</string>
   <string name="msg_kc_uid_revoke_old">Rimozione certificato di revoca scaduto per ID utente \"%s\"</string>
   <string name="msg_kc_uid_no_cert">Nessuna autocertificazione valida trovata per ID utente %s, rimozione dal portachiavi</string>
+  <string name="msg_kc_uid_remove">Rimozione ID Utente %s non valido</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">Fusione nel portachiavi pubblico %s</string>
   <string name="msg_mg_secret">Fusione nel portachiavi privato %s</string>
@@ -543,12 +504,29 @@
   <string name="msg_mg_heterogeneous">Tentativo di consolidare portachiavi eterogenei</string>
   <string name="msg_mg_new_subkey">Aggiunta nuova sottochiave %s</string>
   <string name="msg_mg_found_new">Trovati %s nuovi certificati nel portachiavi</string>
+  <string name="msg_mg_unchanged">Nessun nuovo certificato</string>
+  <!--createSecretKeyRing-->
+  <string name="msg_cr">Generazione nuova chiave principale</string>
+  <string name="msg_cr_error_no_master">Nessuna opzione della chiave principale specificata!</string>
+  <string name="msg_cr_error_no_user_id">I portachiavi devono essere creati con almeno un ID utente!</string>
+  <string name="msg_cr_error_no_certify">La chiave principale deve avere la caratteristica di certificazione!</string>
+  <string name="msg_cr_error_keysize_512">La grandezza della chiave deve essere di 512bit o maggiore</string>
+  <string name="msg_cr_error_internal_pgp">Errore PGP interno!</string>
+  <string name="msg_cr_error_unknown_algo">Pessima opzione di algortimo!</string>
+  <string name="msg_cr_error_master_elgamal">La chiave principale non deve essere del tipo ElGamal!</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">Modifica del portachiavi %s</string>
   <string name="msg_mf_error_encode">Eccezione di codifica!</string>
+  <string name="msg_mf_error_fingerprint">Impronta chiave attuale non corrispondente!</string>
+  <string name="msg_mf_error_keyid">Nessun ID chiave. Questo è un errore di programmazione, per favore invia una segnalazione!</string>
+  <string name="msg_mf_error_integrity">Errore interno, controllo di integrità fallito!</string>
+  <string name="msg_mf_error_noexist_primary">ID utente primario specificato non valido!</string>
+  <string name="msg_mf_error_revoked_primary">ID utente revocato non può essere primario!</string>
   <string name="msg_mf_error_pgp">Eccezione interna di PGP!</string>
   <string name="msg_mf_error_sig">Eccezione di firma!</string>
   <string name="msg_mf_passphrase">Cambio frase di accesso</string>
+  <string name="msg_mf_primary_replace_old">Sostituzione certificato del ID utente primario precedente</string>
+  <string name="msg_mf_primary_new">Generazione di un nuovo certificato per il nuovo ID utente primario</string>
   <string name="msg_mf_subkey_change">Modifica sottochiave %s</string>
   <string name="msg_mf_subkey_missing">Tentativo di operare su sottochiave mancante %s!</string>
   <string name="msg_mf_subkey_new">Generazione nuovi %1$s bit %2$s sottochiave</string>
@@ -559,9 +537,17 @@
   <string name="msg_mf_uid_add">Aggiunta id utente %s</string>
   <string name="msg_mf_uid_primary">Cambio UID primario in %s</string>
   <string name="msg_mf_uid_revoke">Revoca ID utente %s</string>
+  <string name="msg_mf_uid_error_empty">ID Utente non può essere vuoto!</string>
   <string name="msg_mf_unlock_error">Errore di apertura portachiavi!</string>
   <string name="msg_mf_unlock">Apertura portachiavi</string>
+  <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">Clicca per rimuovere la frase di accesso nella cache</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychain ha memorizzato nella cache %d frasi di accesso</string>
+  <string name="passp_cache_notif_keys">Frasi di accesso memorizzate:</string>
+  <string name="passp_cache_notif_clear">Pulisci Cache</string>
+  <string name="passp_cache_notif_pwd">Password</string>
   <!--unsorted-->
+  <string name="internal_error">Errore interno!</string>
   <string name="section_certifier_id">Certificatore</string>
   <string name="section_cert">Dettagli Certificato</string>
   <string name="label_user_id">Identit</string>
@@ -573,14 +559,14 @@
   <string name="label_cert_type">Tipo</string>
   <string name="error_key_not_found">Chiave non trovata!</string>
   <string name="error_key_processing">Errore di elaborazione chiave!</string>
-  <string name="no_subkey">sottochiave non disponibile</string>
   <string name="key_stripped">ripulito</string>
-  <string name="secret_cannot_multiple">Le chiavi segrete possono essere cancellate solo individualmente!</string>
   <string name="title_view_cert">Visualizza Dettagli Certificati</string>
   <string name="unknown_algorithm">sconosciuto</string>
   <string name="can_sign_not">non può firmare</string>
-  <string name="error_encoding">Errore di codifica</string>
   <string name="error_no_encrypt_subkey">Nessuna sottochiave di codifica disponibile!</string>
   <string name="info_no_manual_account_creation">Non creare account OpenKeychain manualmente\nPer ulteriori informazioni, vedere la Guida.</string>
   <string name="contact_show_key">Mostra chiave (%s)</string>
+  <!--First Time-->
+  <string name="first_time_text1">Riappropriati della tua riservatezza con OpenKeychain!</string>
+  <string name="first_time_skip">Salta Installazione</string>
 </resources>

OpenKeychain/src/main/res/values-ja/strings.xml

@@ -1,20 +1,17 @@
 <?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_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_create_key">自分の鍵の生成</string>
   <string name="title_edit_key">鍵の編集</string>
-  <string name="title_wizard">OpenKeychainへようこそ</string>
   <string name="title_preferences">設定</string>
   <string name="title_api_registered_apps">アプリ</string>
   <string name="title_key_server_preference">鍵サーバ設定</string>
   <string name="title_change_passphrase">パスフレーズの変更</string>
-  <string name="title_set_passphrase">パスフレーズの設定</string>
-  <string name="title_share_with">...で共有</string>
   <string name="title_share_fingerprint_with">...で指紋の共有</string>
   <string name="title_share_key">...で鍵の共有</string>
   <string name="title_share_file">...でファイルの共有</string>
@@ -35,60 +32,39 @@
   <string name="section_general">一般</string>
   <string name="section_defaults">デフォルト</string>
   <string name="section_advanced">拡張</string>
-  <string name="section_master_key">主鍵</string>
-  <string name="section_master_user_id">メインのユーザID</string>
   <string name="section_actions">アクション</string>
   <string name="section_share_key">すべての鍵</string>
   <string name="section_certification_key">あなたの鍵を証明に利用します</string>
   <string name="section_upload_key">鍵のアップロード</string>
   <string name="section_key_server">鍵サーバ</string>
-  <string name="section_encrypt_and_or_sign">暗号化/署名</string>
-  <string name="section_decrypt_verify">復号化と検証</string>
   <string name="section_fingerprint">指紋</string>
   <string name="section_key_to_certify">鍵は検証されています。</string>
   <!--button-->
-  <string name="btn_certify">証明</string>
   <string name="btn_decrypt_verify_file">復号化と検証、そしてファイルの保存</string>
   <string name="btn_decrypt_verify_message">メッセージの復号化と検証</string>
-  <string name="btn_decrypt_verify_clipboard">クリップボードから</string>
   <string name="btn_encrypt_file">暗号化してファイルを保存</string>
+  <string name="btn_encrypt_share_file">暗号化してファイルを共有</string>
   <string name="btn_save">保存</string>
   <string name="btn_do_not_save">キャンセル</string>
   <string name="btn_delete">削除</string>
   <string name="btn_no_date">無し</string>
   <string name="btn_okay">OK</string>
-  <string name="btn_change_passphrase">新しいパスフレーズに変更</string>
-  <string name="btn_set_passphrase">新しいパスフレーズを設定</string>
   <string name="btn_export_to_server">鍵サーバへアップロード</string>
   <string name="btn_next">次</string>
   <string name="btn_back">戻る</string>
-  <string name="btn_clipboard">クリップボード</string>
-  <string name="btn_share">...で共有</string>
   <string name="btn_lookup_key">鍵検出</string>
-  <string name="btn_encryption_advanced_settings_show">拡張設定を表示</string>
-  <string name="btn_encryption_advanced_settings_hide">拡張設定を隠す</string>
-  <string name="btn_share_encrypted_signed">暗号化/署名メッセージの共有...</string>
+  <string name="btn_share_encrypted_signed">暗号化してメッセージを共有</string>
   <string name="btn_view_cert_key">検証した鍵を見る</string>
+  <string name="btn_create_key">鍵の生成</string>
+  <string name="btn_add_files">ファイルの追加</string>
   <!--menu-->
   <string name="menu_preferences">設定</string>
   <string name="menu_help">ヘルプ</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_create_key">自分の鍵の生成</string>
+  <string name="menu_import_existing_key">既存の鍵のインポート</string>
   <string name="menu_search">検索</string>
-  <string name="menu_key_server">鍵サーバ...</string>
-  <string name="menu_update_key">鍵サーバからの更新</string>
-  <string name="menu_export_key_to_server">鍵サーバへのアップロード</string>
-  <string name="menu_share">共有...</string>
-  <string name="menu_share_title_fingerprint">指紋の共有...</string>
-  <string name="menu_share_title">すべての鍵の共有...</string>
-  <string name="menu_share_default_fingerprint">...(指紋)</string>
-  <string name="menu_share_default">...(鍵)</string>
-  <string name="menu_share_qr_code">QRコードで共有(鍵)</string>
-  <string name="menu_share_qr_code_fingerprint">QRコードで共有(指紋)</string>
-  <string name="menu_share_nfc">NFCで共有</string>
-  <string name="menu_copy_to_clipboard">クリップボードへコピー</string>
   <string name="menu_beam_preferences">Beamの設定</string>
   <string name="menu_key_edit_cancel">キャンセル</string>
   <string name="menu_encrypt_to">暗号化...</string>
@@ -97,18 +73,22 @@
   <string name="menu_export_all_keys">すべての鍵のエクスポート</string>
   <string name="menu_advanced">詳細情報を表示</string>
   <!--label-->
-  <string name="label_sign">署名</string>
   <string name="label_message">メッセージ</string>
   <string name="label_file">ファイル</string>
+  <string name="label_files">ファイル</string>
+  <string name="label_file_colon">ファイル:</string>
   <string name="label_no_passphrase">パスフレーズなし</string>
   <string name="label_passphrase">パスフレーズ</string>
-  <string name="label_passphrase_again">もう一度</string>
+  <string name="label_passphrase_again">再度パスフレーズを入力</string>
   <string name="label_algorithm">アルゴリズム</string>
   <string name="label_ascii_armor">アスキー形式</string>
-  <string name="label_select_public_keys">受信者</string>
-  <string name="label_delete_after_encryption">暗号化後に削除</string>
+  <string name="label_file_ascii_armor">ファイル: アスキー形式</string>
+  <string name="label_conceal_pgp_application">他の人にあなたがOpenKeychain使用していることを知ってもらいましょう</string>
+  <string name="label_conceal_pgp_application_summary">OpenPGPの 署名、暗号文、そしてエクスポートした鍵に  \'OpenKeychain v2.7\' と書くようになりました</string>
+  <string name="label_asymmetric_from">差出人:</string>
+  <string name="label_to">宛先</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>
@@ -123,17 +103,13 @@
   <string name="label_expiry">満了</string>
   <string name="label_usage">使い方</string>
   <string name="label_key_size">鍵サイズ</string>
-  <string name="label_main_user_id">メインのユーザID</string>
+  <string name="label_main_user_id">主ユーザID</string>
   <string name="label_name">名前</string>
   <string name="label_comment">コメント</string>
   <string name="label_email">Eメールアドレス</string>
   <string name="label_send_key">証明後選択した鍵サーバに鍵をアップロード</string>
   <string name="label_fingerprint">指紋</string>
-  <string name="select_keys_button_default">選択</string>
   <string name="expiry_date_dialog_title">期限日時を設定</string>
-  <plurals name="select_keys_button">
-    <item quantity="other">%d を選択</item>
-  </plurals>
   <string name="user_id_no_name">&lt;名前なし&gt;</string>
   <string name="none">&lt;無し&gt;</string>
   <string name="no_key">&lt;鍵無し&gt;</string>
@@ -178,7 +154,6 @@
   <string name="flag_authenticate">認証</string>
   <!--sentences-->
   <string name="wrong_passphrase">良くないパスフレーズ</string>
-  <string name="set_a_passphrase">最初にパスフレーズを設定してください。</string>
   <string name="no_filemanager_installed">互換性のないファイルマネージャがインストールされています。</string>
   <string name="passphrases_do_not_match">パスフレーズが一致しません。</string>
   <string name="passphrase_must_not_be_empty">パスフレーズを入れてください。</string>
@@ -197,15 +172,12 @@
   <string name="specify_file_to_export_to">どのファイルをエクスポートするか決めてください。\n注意: 既存のファイルがあると上書きされます。</string>
   <string name="key_deletion_confirmation_multi">選択したすべての公開鍵を削除して本当に良いのですか?\nこれは元に戻せません!</string>
   <string name="secret_key_deletion_confirmation">秘密鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
-  <string name="ask_save_changed_key">あなたは鍵輪に変更を加えました、これを保存しますか?</string>
-  <string name="ask_empty_id_ok">あなたは空のユーザIDを追加しました、このまま続けますか?</string>
   <string name="public_key_deletetion_confirmation">公開鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string>
-  <string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string>
+  <string name="also_export_secret_keys">秘密鍵もエクスポートします</string>
   <string name="key_exported">1つの鍵をエクスポートしました。</string>
   <string name="keys_exported">%d の鍵をエクスポートしました。</string>
   <string name="no_keys_exported">鍵をエクスポートしていません。</string>
   <string name="key_creation_el_gamal_info">ノート: 副鍵はElGamalでのみサポートされます。</string>
-  <string name="key_creation_weak_rsa_info">付記: 長さ1024bitかそれ以下で生成されたRSA鍵は安全とはみなされず、新な鍵の生成は無効にされています。</string>
   <string name="key_not_found">鍵 %08X は見付かりませんでした。</string>
   <plurals name="bad_keys_encountered">
     <item quantity="other">%d の問題ある鍵を無視しました。 おそらく次のオプションでエクスポートしています\n --export-secret-subkeys\n代りに次のオプションでエクスポートしてください。\n --export-secret-keys</item>
@@ -216,7 +188,6 @@
   <string name="nfc_successful">NFCビームで鍵を送信しました!</string>
   <string name="key_copied_to_clipboard">鍵はクリプボードにコピーされました!</string>
   <string name="fingerprint_copied_to_clipboard">指紋はクリプボードにコピーされました!</string>
-  <string name="key_has_already_been_certified">鍵はすでに検証されています!</string>
   <string name="select_key_to_certify">検証に使う鍵を選択して下さい!</string>
   <string name="key_too_big_for_sharing">この共有方法では鍵が大きすぎます!</string>
   <!--errors
@@ -227,34 +198,28 @@
   <string name="error_no_secret_key_found">組になっている秘密鍵が見付かりません</string>
   <string name="error_external_storage_not_ready">外部ストレージが準備できていません</string>
   <string name="error_key_size_minimum512bit">鍵サイズは最低でも512bit必要です</string>
-  <string name="error_master_key_must_not_be_el_gamal">主鍵を ElGamal にすることはできません</string>
   <string name="error_unknown_algorithm_choice">未知のアルゴリズムを選択しています</string>
   <string name="error_user_id_no_email">メールが見付かりません</string>
   <string name="error_key_needs_a_user_id">最低でも1つのユーザIDが必要です</string>
-  <string name="error_main_user_id_must_not_be_empty">メインのユーザIDは空にすることはできません</string>
-  <string name="error_key_needs_master_key">主鍵が最低でも1つ必要です</string>
   <string name="error_no_signature_passphrase">パスフレーズが与えられていません</string>
   <string name="error_no_signature_key">署名鍵を与えられていません</string>
   <string name="error_invalid_data">暗号化データが不正です</string>
   <string name="error_integrity_check_failed">完全性チェックが失敗しました! データに変更があります!</string>
   <string name="error_wrong_passphrase">正しくないパスフレーズです</string>
-  <string name="error_saving_keys">鍵の保存エラー</string>
   <string name="error_could_not_extract_private_key">秘密鍵を取り出すことができません</string>
-  <string name="error_expiry_must_come_after_creation">期限日時は生成日時より後である必要があります</string>
   <!--errors without preceeding Error:-->
-  <string name="error_only_files_are_supported">ファイルシステムに存在するファイルではないバイナリデータはサポートされません。</string>
   <string name="error_jelly_bean_needed">Android NFC Beam機能を使うにはAndroid 4.1  が必要です!</string>
   <string name="error_nfc_needed">あなたのデバイスにはNFCが存在しません!</string>
   <string name="error_nothing_import">鍵が見当りません!</string>
-  <string name="error_query_too_short">鍵検索のクエリが短かすぎます</string>
-  <string name="error_searching_keys">サーバでの鍵の検索が回復不可能なエラーになりました</string>
-  <string name="error_too_many_responses">鍵検索のクエリが沢山の候補を返しました; クエリを精密化してください</string>
-  <string name="error_import_no_valid_keys">ファイル/クリップボードが空です</string>
+  <string name="error_query_too_short">鍵検索のクエリが短かすぎます。クエリを精密化してください!</string>
+  <string name="error_searching_keys">鍵の検索時にエラーが発生しました。</string>
+  <string name="error_too_many_responses">鍵検索のクエリが沢山の候補を返しました。クエリを精密化してください!</string>
+  <string name="error_too_short_or_too_many_responses">鍵がまったく無いか、多すぎる鍵が見付かりました。クエリを改善してください!</string>
+  <string name="error_import_no_valid_keys">ファイル/クリップボードにて正しい鍵が見付かりません!</string>
   <string name="error_generic_report_bug">一般エラーが発生しました、この新しいバグの情報をOpenKeychainプロジェクトに送ってください</string>
   <plurals name="error_import_non_pgp_part">
     <item quantity="other">読み込んだファイルのOpenPGPオブジェクト部分は正しいですが、OpenPGPの鍵ではありません</item>
   </plurals>
-  <string name="error_change_something_first">あなたは鍵輪を保存する前に変更を加えなくてはなりません</string>
   <!--results shown after decryption/verification-->
   <string name="decrypt_result_invalid_signature">不正な署名です!</string>
   <string name="decrypt_result_signature_unknown_pub_key">不明な公開鍵</string>
@@ -270,17 +235,24 @@
   <string name="progress_saving">保存...</string>
   <string name="progress_importing">インポート...</string>
   <string name="progress_exporting">エクスポート...</string>
+  <string name="progress_uploading">アップロード中...</string>
   <string name="progress_building_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_generating_rsa">新しいRSA鍵を生成中...</string>
+  <string name="progress_generating_dsa">新しいDSA鍵を生成中...</string>
+  <string name="progress_generating_elgamal">新しいElGamal鍵を生成中...</string>
+  <string name="progress_modify">鍵輪を変更中...</string>
+  <string name="progress_modify_unlock">鍵輪のロック解除中...</string>
+  <string name="progress_modify_adduid">ユーザIDを追加中...</string>
+  <string name="progress_modify_revokeuid">ユーザIDを破棄中...</string>
+  <string name="progress_modify_primaryuid">主ユーザIDを変更中...</string>
+  <string name="progress_modify_subkeychange">副鍵の変更中...</string>
+  <string name="progress_modify_subkeyrevoke">副鍵の破棄中...</string>
+  <string name="progress_modify_subkeyadd">副鍵を追加中...</string>
+  <string name="progress_modify_passphrase">パスフレーズの変更中...</string>
   <plurals name="progress_exporting_key">
     <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>
@@ -291,6 +263,7 @@
   <string name="progress_processing_signature">署名処理中...</string>
   <string name="progress_verifying_signature">署名の検証中...</string>
   <string name="progress_signing">署名中...</string>
+  <string name="progress_certifying">検証中...</string>
   <string name="progress_reading_data">データ読み込み中...</string>
   <string name="progress_finding_key">鍵検索中...</string>
   <string name="progress_decompressing_data">データの展開中...</string>
@@ -298,8 +271,6 @@
   <string name="progress_deleting_securely">\'%s\' を完全に削除中…</string>
   <!--action strings-->
   <string name="hint_public_keys">名前/メール/鍵ID...</string>
-  <string name="hint_secret_keys">秘密鍵の検索</string>
-  <string name="action_share_key_with">...で鍵の共有</string>
   <string name="hint_keybase_search">名前/Keybase.io名...</string>
   <!--key bit length selections-->
   <string name="key_size_512">512</string>
@@ -331,26 +302,15 @@
   <string name="import_tab_qr_code">QRコード/NFC</string>
   <string name="import_tab_keybase">Keybase.io</string>
   <string name="import_import">選択した鍵のインポート</string>
-  <string name="import_from_clipboard">クリップボードからインポート</string>
-  <plurals name="import_qr_code_missing">
-    <item quantity="other">ID %s のQRコードがありません</item>
-  </plurals>
-  <string name="import_qr_code_start_with_one">QRコードをID 1で始めてください</string>
   <string name="import_qr_code_wrong">不適QRコード! もう一度!</string>
-  <string name="import_qr_code_finished">QRコードの読み取り完了!</string>
   <string name="import_qr_code_too_short_fingerprint">指紋が短かすぎます (&lt; 16 文字)</string>
-  <string name="import_qr_scan_button">\'バーコードスキャナー\'でQRコードをスキャンする</string>
-  <string name="import_nfc_text">NFCで鍵を受信しました、デバイスのロックを解除する必要があります。</string>
-  <string name="import_nfc_help_button">ヘルプ</string>
   <string name="import_qr_code_button">QCコードのスキャン...</string>
-  <string name="import_clipboard_button">クリップボードから鍵を取得</string>
-  <string name="import_keybase_button">Keybase.ioから鍵を取得</string>
   <!--Import result toast-->
   <plurals name="import_keys_added_and_updated_1">
     <item quantity="other">%1$d の鍵のインポートに成功</item>
   </plurals>
   <plurals name="import_keys_added_and_updated_2">
-    <item quantity="other">そして%1$d の鍵%2$s をアップデート。</item>
+    <item quantity="other">そして、%1$d の鍵を %2$s アップデートした。</item>
   </plurals>
   <plurals name="import_keys_added">
     <item quantity="other">%1$d の鍵%2$sのインポートに成功。</item>
@@ -368,7 +328,7 @@
   <string name="intent_send_encrypt">OpenKeychainで暗号化</string>
   <string name="intent_send_decrypt">OpenKeychainで復号化</string>
   <!--Remote API-->
-  <string name="api_no_apps">未登録のアプリケーションです!\n\n\"ヘルプ\"のサードパーティ製アプリケーションのサポートリストにあるかを見てください!</string>
+  <string name="api_no_apps">未登録のアプリです!\n\n\"ヘルプ\"のサードパーティ製アプリケーションのサポートリストにあるかを見てください!</string>
   <string name="api_settings_show_info">詳細情報を表示</string>
   <string name="api_settings_hide_info">詳細情報を非表示</string>
   <string name="api_settings_show_advanced">拡張設定を表示</string>
@@ -384,9 +344,9 @@
   <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_create_account_text">このアプリケーションは新しいアカウントの生成を要求しています。すでにある秘密鍵を選択するか、新しく生成してください。\nここであなたが選択する鍵の使い道についてアプリケーションには制約があります!</string>
-  <string name="api_register_text">表示されているアプリケーションはOpenKeychainへのアクセスを要求しています。\nアクセスを許可しますか?\n\n注意: もしなぜスクリーンに表れたかわからないなら、アクセスを許可しないでください! あなたは\'登録済みアプリケーション\'スクリーンを使って、以降のアクセスを破棄するこもできます。</string>
+  <string name="api_settings_accounts_empty">このアプリに接続されてるアカウントはありません。</string>
+  <string name="api_create_account_text">このアプリは新しいアカウントの生成を要求しています。すでにある鍵1つを選択するか、新たに生成してください。\nここであなたが選択する鍵の使い道についてアプリケーションには制約があります!</string>
+  <string name="api_register_text">表示されているアプリはメッセージの暗号/復号化とあなたの名前での署名付けを要求しています。\nアクセスを許可しますか?\n\n注意: もしなぜスクリーンに表れたかわからないなら、アクセスを許可しないでください! あなたは後で\'アプリ\'スクリーンを使い、アクセスを破棄するこもできます。</string>
   <string name="api_register_allow">許可されたアクセス</string>
   <string name="api_register_disallow">許可されないアクセス</string>
   <string name="api_register_error_select_key">鍵を選択してください!</string>
@@ -396,9 +356,6 @@
   <string name="api_error_wrong_signature">署名チェックが失敗! 違うところからこのアプリをインストールしましたか? もし攻撃されてでなくそうであるなら、OpenKeychainにあるこのアプリの登録を破棄し、再度アプリを登録してください。</string>
   <!--Share-->
   <string name="share_qr_code_dialog_title">QRコードで共有</string>
-  <string name="share_qr_code_dialog_start">すべてのQRコードを見る場合、\'次\' を押して一つ一つスキャンしてください。</string>
-  <string name="share_qr_code_dialog_fingerprint_text">指紋:</string>
-  <string name="share_qr_code_dialog_progress">%2$d の ID %1$d のQRコード</string>
   <string name="share_nfc_dialog">NFCで共有</string>
   <!--Key list-->
   <plurals name="key_list_selected_keys">
@@ -408,32 +365,54 @@
   <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>
+  <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">ユーザID検証</string>
+  <string name="key_view_action_update">鍵サーバからの更新</string>
   <string name="key_view_action_share_with">...で共有</string>
   <string name="key_view_action_share_nfc">デバイスの後ろ同士を固定してNFC経由で共有</string>
+  <string name="key_view_action_upload">鍵サーバへのアップロード</string>
   <string name="key_view_tab_main">情報</string>
   <string name="key_view_tab_share">共有</string>
   <string name="key_view_tab_keys">副鍵</string>
   <string name="key_view_tab_certs">証明</string>
+  <!--Edit key-->
+  <string name="edit_key_action_change_passphrase">パスフレーズの変更</string>
+  <string name="edit_key_action_add_identity">ユーザIDの追加</string>
+  <string name="edit_key_action_add_subkey">副鍵の追加</string>
+  <string name="edit_key_edit_user_id_title">アクションを選んでください!</string>
+  <string-array name="edit_key_edit_user_id">
+    <item>主IDを変更</item>
+    <item>IDを破棄</item>
+  </string-array>
+  <string name="edit_key_edit_subkey_title">アクションを選んでください!</string>
+  <string-array name="edit_key_edit_subkey">
+    <item>期限を変更</item>
+    <item>副鍵を破棄</item>
+  </string-array>
+  <!--Create key-->
+  <string name="create_key_upload">鍵サーバへアップロード</string>
+  <string name="create_key_empty">このフィールドは必須です</string>
+  <string name="create_key_passphrases_not_equal">パスフレーズが一致しない</string>
+  <string name="create_key_final_text">あたなが入力したIDは以下です:</string>
+  <string name="create_key_final_robot_text">しばらくの間鍵を生成しています、その間はコーヒーでもどうぞ....\n(3つの副鍵、RSA、4096bit)</string>
+  <string name="create_key_text">フルネーム、Eメールアドレスを入力そしてパスフレーズを選択してください。</string>
+  <string name="create_key_hint_full_name">フルネーム、例えば Max Mustermann</string>
+  <!--View key-->
+  <string name="view_key_revoked">この鍵は破棄されています!</string>
+  <string name="view_key_expired">この鍵は期限切れです!</string>
   <!--Navigation Drawer-->
   <string name="nav_keys">鍵</string>
   <string name="nav_encrypt">署名と暗号化</string>
   <string name="nav_decrypt">復号化と検証</string>
-  <string name="nav_import">鍵のインポート</string>
   <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>
+  <string name="encrypt_content_edit_text_hint">ここで入力したメッセージは、「差出人」で選択した鍵で署名され、「宛先」で選択したすべての受信者に対してその鍵で暗号化します。</string>
   <string name="decrypt_content_edit_text_hint">ここに入力された暗号化テキストを復号化/検証...</string>
   <!--certs-->
   <string name="cert_default">デフォルト</string>
@@ -485,7 +464,7 @@
   <string name="msg_ip_reinsert_secret">秘密鍵を再挿入中</string>
   <string name="msg_ip_uid_cert_bad">問題のある検証と遭遇しました!</string>
   <string name="msg_ip_uid_cert_error">検証の処理中にエラーしました!</string>
-  <string name="msg_ip_uid_cert_good">ユーザIDは %1$s (%2$s) によって検証されました</string>
+  <string name="msg_ip_uid_cert_good">ユーザIDは %1$s によって検証されました</string>
   <plurals name="msg_ip_uid_certs_unknown">
     <item quantity="other">不明な公開鍵から %s の検証を無視</item>
   </plurals>
@@ -497,6 +476,7 @@
   <string name="msg_ip_uid_processing">ユーザID %s の処理中</string>
   <string name="msg_ip_uid_revoked">ユーザIDは破棄されました</string>
   <string name="msg_is_bad_type_public">公開鍵の鍵輪を秘密鍵としてインポートを試行しました。これはバグで、ファイルをレポートしてください\"</string>
+  <string name="msg_is_bad_type_uncanon">正規化せずに鍵輪へインポートを試行した。これはバグで、ファイルをレポートしてください!</string>
   <!--Import Secret log entries-->
   <string name="msg_is">秘密鍵 %s のインポート中</string>
   <string name="msg_is_db_exception">データベースエラー!</string>
@@ -517,6 +497,7 @@
   <string name="msg_kc_revoke_bad_local">鍵輪のローカルフラグ付き破棄証明を破棄中</string>
   <string name="msg_kc_revoke_bad_time">鍵輪の未来にタイムスタンプがある破棄証明を破棄中</string>
   <string name="msg_kc_revoke_bad_type">問題のある主鍵の不明な型 (%s) の証明を破棄中</string>
+  <string name="msg_kc_revoke_bad_type_uid">不正な位置のユーザID検証を破棄中</string>
   <string name="msg_kc_revoke_bad">問題のある鍵輪の破棄証明を破棄中</string>
   <string name="msg_kc_revoke_dup">重複している鍵輪の破棄証明を破棄中</string>
   <string name="msg_kc_sub">副鍵 %s の処理中</string>
@@ -552,6 +533,7 @@
   <string name="msg_kc_uid_revoke_dup">ユーザID \"%s\" による重複した破棄証明を破棄中</string>
   <string name="msg_kc_uid_revoke_old">ユーザID \"%s\" による期限切れ破棄証明を破棄中</string>
   <string name="msg_kc_uid_no_cert">ユーザID %s の正常な自己署名が見付かりませんでした、鍵輪から除去しました</string>
+  <string name="msg_kc_uid_remove">正しくないユーザID %s を破棄中</string>
   <!--Keyring merging log entries-->
   <string name="msg_mg_public">公開鍵の鍵輪 %s にマージ中</string>
   <string name="msg_mg_secret">秘密鍵の鍵輪 %s にマージ中</string>
@@ -559,16 +541,29 @@
   <string name="msg_mg_heterogeneous">種類の異なる鍵輪を統合しようとした</string>
   <string name="msg_mg_new_subkey">新しい副鍵 %s を追加中</string>
   <string name="msg_mg_found_new">鍵輪に新しい検証を %s 発見</string>
+  <string name="msg_mg_unchanged">新しい証明がない</string>
+  <!--createSecretKeyRing-->
+  <string name="msg_cr">新しい主鍵を生成中</string>
+  <string name="msg_cr_error_no_master">主鍵オプション特有ではありません!</string>
+  <string name="msg_cr_error_no_user_id">鍵輪は最低でも1つのユーザIDの生成が必要です!</string>
+  <string name="msg_cr_error_no_certify">主鍵は検証フラグが必須です!</string>
+  <string name="msg_cr_error_keysize_512">鍵サイズは512かそれ以上が必須です!</string>
+  <string name="msg_cr_error_internal_pgp">PGP内部エラー!</string>
+  <string name="msg_cr_error_unknown_algo">悪いアルゴリズムを選択しています!</string>
+  <string name="msg_cr_error_master_elgamal">主鍵を ElGamal にすることはできません</string>
   <!--modifySecretKeyRing-->
   <string name="msg_mr">鍵輪 %s を変更中</string>
   <string name="msg_mf_error_encode">エンコード例外!</string>
-  <string name="msg_mf_error_fingerprint">現実の鍵指紋が予想と合致しませんでした!</string>
-  <string name="msg_mf_error_keyid">鍵IDがない。 これはプログラミングのエラーで、バグレポートの提出をお願いします!</string>
+  <string name="msg_mf_error_fingerprint">現実の鍵指紋が想定の1つと合致しませんでした!</string>
+  <string name="msg_mf_error_keyid">鍵IDがない。 これは内部エラーで、バグレポートの提出をお願いします!</string>
   <string name="msg_mf_error_integrity">内部エラー、完全性チェックが失敗!</string>
+  <string name="msg_mf_error_noexist_primary">問題のある主ユーザIDが指定された!</string>
   <string name="msg_mf_error_revoked_primary">主ユーザIDの破棄はできません!</string>
   <string name="msg_mf_error_pgp">PGP内部例外!</string>
   <string name="msg_mf_error_sig">署名例外!</string>
   <string name="msg_mf_passphrase">パスフレーズの変更中</string>
+  <string name="msg_mf_primary_replace_old">以前の主ユーザIDで証明を入れ替え中</string>
+  <string name="msg_mf_primary_new">新しい主ユーザIDで新しい証明を生成中</string>
   <string name="msg_mf_subkey_change">副鍵 %s を変更中</string>
   <string name="msg_mf_subkey_missing">遺失した副鍵 %s の操作をしようとした!</string>
   <string name="msg_mf_subkey_new">新しい %1$s ビットの %2$s 副鍵の生成中</string>
@@ -579,9 +574,17 @@
   <string name="msg_mf_uid_add">ユーザID %s を追加中</string>
   <string name="msg_mf_uid_primary">主UIDを %s に変更中</string>
   <string name="msg_mf_uid_revoke">ユーザID %s を破棄中</string>
+  <string name="msg_mf_uid_error_empty">ユーザIDは空にすることはできません!</string>
   <string name="msg_mf_unlock_error">鍵輪のロック解除エラー!</string>
   <string name="msg_mf_unlock">鍵輪のロック解除中</string>
+  <!--PassphraseCache-->
+  <string name="passp_cache_notif_click_to_clear">クリックしてパスフレーズのキャッシュをクリア</string>
+  <string name="passp_cache_notif_n_keys">OpenKeychainは %d のパスフレーズをキャッシュしています</string>
+  <string name="passp_cache_notif_keys">パスフレーズのキャッシュ:</string>
+  <string name="passp_cache_notif_clear">キャッシュクリア</string>
+  <string name="passp_cache_notif_pwd">パスワード</string>
   <!--unsorted-->
+  <string name="internal_error">内部エラー!</string>
   <string name="section_certifier_id">検証者</string>
   <string name="section_cert">証明の詳細</string>
   <string name="label_user_id">ユーザID</string>
@@ -593,14 +596,17 @@
   <string name="label_cert_type">種別</string>
   <string name="error_key_not_found">鍵が見当りません!</string>
   <string name="error_key_processing">鍵処理中のエラー!</string>
-  <string name="no_subkey">副鍵がありません</string>
   <string name="key_stripped">スリム化</string>
-  <string name="secret_cannot_multiple">秘密鍵は個別にしか削除できません!</string>
+  <string name="secret_cannot_multiple">あなたが所有者の鍵は個別にしか削除できません!</string>
   <string name="title_view_cert">証明の詳細を見る</string>
   <string name="unknown_algorithm">不明</string>
   <string name="can_sign_not">署名不可</string>
-  <string name="error_encoding">エンコードエラー</string>
   <string name="error_no_encrypt_subkey">暗号化の副鍵がありません!</string>
   <string name="info_no_manual_account_creation">OpenKeychainのアカウントを手動では生成できません.\nより詳細は、ヘルプを参照のこと。</string>
   <string name="contact_show_key">鍵 (%s) を表示</string>
+  <!--First Time-->
+  <string name="first_time_text1">OpenKeychainであなたのプライバシーを取り戻しましょう!</string>
+  <string name="first_time_create_key">自分の鍵の生成</string>
+  <string name="first_time_import_key">既存の鍵のインポート</string>
+  <string name="first_time_skip">セットアップをスキップ</string>
 </resources>