diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
25 files changed, 285 insertions, 87 deletions
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png Binary files differnew file mode 100644 index 000000000..86da228e9 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_view_as_list.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png Binary files differnew file mode 100644 index 000000000..ccb4c7d7b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_view_as_list.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png Binary files differnew file mode 100644 index 000000000..b9c93c8c2 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_view_as_list.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png Binary files differnew file mode 100644 index 000000000..460041640 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_view_as_list.png diff --git a/OpenKeychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml index 76ba183b7..3ad087da3 100644 --- a/OpenKeychain/src/main/res/layout/help_activity.xml +++ b/OpenKeychain/src/main/res/layout/help_activity.xml @@ -4,7 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical" > - <org.sufficientlysecure.keychain.util.SlidingTabLayout + <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/sliding_tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 2a332823e..0486b6bd6 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -1,22 +1,37 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<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:layout_height="fill_parent" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/card_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" /> <FrameLayout android:id="@+id/import_navigation_fragment" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" android:orientation="vertical" /> + <FrameLayout + android:id="@+id/import_keys_list_container" + android:layout_width="match_parent" + android:layout_height="0dp" + android:orientation="vertical" + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:layout_weight="0.9" /> + <LinearLayout android:id="@+id/import_footer" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" android:orientation="vertical" android:paddingLeft="16dp" android:paddingRight="16dp"> @@ -43,16 +58,4 @@ style="@style/SelectableItem" /> </LinearLayout> - - <FrameLayout - android:id="@+id/import_keys_list_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_above="@+id/import_footer" - android:layout_alignParentLeft="true" - android:layout_below="@+id/import_navigation_fragment" - android:orientation="vertical" - android:paddingTop="8dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" /> -</RelativeLayout>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/log_display_activity.xml b/OpenKeychain/src/main/res/layout/log_display_activity.xml new file mode 100644 index 000000000..591e2650c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/log_display_activity.xml @@ -0,0 +1,46 @@ +<?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"> + + <fragment + android:id="@+id/list" + android:name="org.sufficientlysecure.keychain.ui.LogDisplayFragment" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="0.9" + android:layout_marginRight="8dp" + android:layout_marginLeft="8dp" /> + + <LinearLayout + android:id="@+id/import_footer" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="8dp" + android:paddingLeft="16dp" + android:paddingRight="16dp"> + + <View + android:layout_width="match_parent" + android:layout_height="1dip" + android:background="?android:attr/listDivider" /> + + <TextView + android:id="@+id/import_import" + android:paddingLeft="8dp" + android:paddingRight="8dp" + android:layout_marginBottom="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:text="Close" + android:minHeight="?android:attr/listPreferredItemHeight" + android:gravity="center_vertical" + android:clickable="true" + style="@style/SelectableItem" /> + + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/log_display_fragment.xml b/OpenKeychain/src/main/res/layout/log_display_fragment.xml new file mode 100644 index 000000000..442e72d09 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/log_display_fragment.xml @@ -0,0 +1,11 @@ +<?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"> + + <ListView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/log_text" /> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/log_display_item.xml b/OpenKeychain/src/main/res/layout/log_display_item.xml new file mode 100644 index 000000000..35489afed --- /dev/null +++ b/OpenKeychain/src/main/res/layout/log_display_item.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:id="@+id/log_img" + android:minWidth="10dp" + android:background="@color/bg_gray" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Log Entry Text" + android:id="@+id/log_text" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_marginLeft="8dp" /> +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml index f43aade25..5aa1cd167 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -35,7 +35,7 @@ android:visibility="gone" android:id="@+id/status_divider" /> - <org.sufficientlysecure.keychain.util.SlidingTabLayout + <org.sufficientlysecure.keychain.ui.widget.SlidingTabLayout android:id="@+id/view_key_sliding_tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" /> diff --git a/OpenKeychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml index 864016801..64877d725 100644 --- a/OpenKeychain/src/main/res/menu/key_view.xml +++ b/OpenKeychain/src/main/res/menu/key_view.xml @@ -31,4 +31,10 @@ app:showAsAction="never" android:title="@string/menu_delete_key" /> + <item + android:id="@+id/menu_key_view_advanced" + app:showAsAction="never" + android:checkable="true" + android:title="@string/menu_advanced" /> + </menu>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml index e2dfa196b..3485846ad 100644 --- a/OpenKeychain/src/main/res/values-de/strings.xml +++ b/OpenKeychain/src/main/res/values-de/strings.xml @@ -206,23 +206,23 @@ <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> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">%d Schlüssel erfolgreich hinzugefügt</item> <item quantity="other">%d Schlüssel erfolgreich hinzugefügt</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">und %d Schlüssel erfolgreich aktualisiert.</item> <item quantity="other">und %d Schlüssel erfolgreich aktualisiert.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">%d Schlüssel erfolgreich hinzugefügt.</item> <item quantity="other">%d Schlüssel erfolgreich hinzugefügt.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">%d Schlüssel erfolgreich aktualisiert.</item> <item quantity="other">%d Schlüssel erfolgreich aktualisiert.</item> </plurals> - <string name="no_keys_added_or_updated">Keine Schlüssel hinzugefügt oder aktualisiert.</string> + <string name="import_error_nothing">Keine Schlüssel hinzugefügt oder aktualisiert.</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> diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 45d3d565b..f1e4e347d 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -206,23 +206,23 @@ <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> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">%d clave añadida satisfactoriamente</item> <item quantity="other">%d claves añadidas satisfactoriamente</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">y actualizada %d clave.</item> <item quantity="other">y actualizadas %d claves.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">%d clave añadida satisfactoriamente.</item> <item quantity="other">%d claves añadidas satisfactoriamente.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">%d clave actualizada satisfactoriamente.</item> <item quantity="other">%d claves actualizadas satisfactoriamente.</item> </plurals> - <string name="no_keys_added_or_updated">No se han añadido o actualizado claves.</string> + <string name="import_error_nothing">No se han añadido o actualizado claves.</string> <string name="key_exported">Se ha exportado 1 clave satisfactoriamente.</string> <string name="keys_exported">%d claves exportadas satisfactoriamente.</string> <string name="no_keys_exported">No se han exportado claves.</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index f49127b6f..55a85fb9b 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -206,23 +206,23 @@ <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> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">%d clef ajoutée avec succès</item> <item quantity="other">%d clefs ajoutées avec succès</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">et %d clef mise à jour.</item> <item quantity="other">et %d clefs mises à jour.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">%d clef ajoutée avec succès.</item> <item quantity="other">%d clefs ajoutées avec succès.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">%d clef mise à jour avec succès.</item> <item quantity="other">%d clefs mises à jour avec succès.</item> </plurals> - <string name="no_keys_added_or_updated">Aucune clef ajoutée ou mise à jour.</string> + <string name="import_error_nothing">Aucune clef ajoutée ou mise à jour.</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> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index eae4dd4af..300627fa7 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -206,23 +206,23 @@ <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> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">%d chiave aggiunta correttamente</item> <item quantity="other">%d chiavi aggiunte correttamente</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">e %d chiave aggiornata.</item> <item quantity="other">e %d chiavi aggiornate.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">%d chiave aggiunta correttamente.</item> <item quantity="other">%d chiavi aggiunte correttamente.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">%d chiave aggiornata correttamente.</item> <item quantity="other">%d chiavi aggiornate correttamente.</item> </plurals> - <string name="no_keys_added_or_updated">Nessuna chiave aggiunta o aggiornata.</string> + <string name="import_error_nothing">Nessuna chiave aggiunta o aggiornata.</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> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index c40e9dbdc..63fef2af2 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -203,19 +203,19 @@ <string name="ask_empty_id_ok">あなたは空のユーザIDを追加しました、このまま続けますか?</string> <string name="public_key_deletetion_confirmation">公開鍵\'%s\'を本当に削除してもよいですか?\nこれは元に戻せません!</string> <string name="also_export_secret_keys">秘密鍵もエクスポートしますか?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="other">%d の鍵を追加しました</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="other">そして %d の鍵をアップロードしました。</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="other">%d の鍵を追加しました。</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="other">%d の鍵をアップロードしました。</item> </plurals> - <string name="no_keys_added_or_updated">鍵の追加もしくは更新はありませんでした。</string> + <string name="import_error_nothing">鍵の追加もしくは更新はありませんでした。</string> <string name="key_exported">1つの鍵をエクスポートしました。</string> <string name="keys_exported">%d の鍵をエクスポートしました。</string> <string name="no_keys_exported">鍵をエクスポートしていません。</string> diff --git a/OpenKeychain/src/main/res/values-nl/strings.xml b/OpenKeychain/src/main/res/values-nl/strings.xml index d35d83517..f75d7a166 100644 --- a/OpenKeychain/src/main/res/values-nl/strings.xml +++ b/OpenKeychain/src/main/res/values-nl/strings.xml @@ -206,23 +206,23 @@ <string name="ask_empty_id_ok">U heeft een lege identiteit toegevoegd, weet u zeker dat u wilt doorgaan?</string> <string name="public_key_deletetion_confirmation">Wilt u echt de publieke sleutel \'%s\' verwijderen?\nDit kunt u niet ongedaan maken!</string> <string name="also_export_secret_keys">Ook geheime sleutels exporteren?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Succesvol %d sleutel toegevoegd</item> <item quantity="other">Succesvol %d sleutels toegevoegd</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">en %d sleutel bijgewerkt.</item> <item quantity="other">en %d sleutels bijgewerkt.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">Succesvol %d sleutel toegevoegd.</item> <item quantity="other">Succesvol %d sleutels toegevoegd.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">Succesvol %d sleutel bijgewerkt.</item> <item quantity="other">Succesvol %d sleutels bijgewerkt.</item> </plurals> - <string name="no_keys_added_or_updated">Geen sleutels toegevoegd of bijgewerkt.</string> + <string name="import_error_nothing">Geen sleutels toegevoegd of bijgewerkt.</string> <string name="key_exported">1 sleutel succesvol geëxporteerd.</string> <string name="keys_exported">Succesvol %d sleutels geëxporteerd.</string> <string name="no_keys_exported">Geen sleutels geëxporteerd.</string> diff --git a/OpenKeychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml index d1b7de393..851e77c3a 100644 --- a/OpenKeychain/src/main/res/values-pl/strings.xml +++ b/OpenKeychain/src/main/res/values-pl/strings.xml @@ -191,27 +191,27 @@ <string name="ask_save_changed_key">Zostały dokonane zmiany w pęku kluczy, czy chcesz je zachować?</string> <string name="public_key_deletetion_confirmation">Czy na pewno chcesz usunąć klucz publiczny \'%s\'?\nNie można cofnąć tej operacji!</string> <string name="also_export_secret_keys">Czy wyeksportować również klucze prywatne?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Pomyślnie dodano %d klucz</item> <item quantity="few">Pomyślnie dodano %d kluczy</item> <item quantity="other">Pomyślnie dodano %d kluczy</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">i zaktualizowano %d klucz.</item> <item quantity="few">i zaktualizowano %d kluczy.</item> <item quantity="other">i zaktualizowano %d kluczy.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">Pomyślnie dodano %d klucz.</item> <item quantity="few">Pomyślnie dodano %d kluczy.</item> <item quantity="other">Pomyślnie dodano %d kluczy.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">Pomyślnie zaktualizowano %d klucz.</item> <item quantity="few">Pomyślnie zaktualizowano %d kluczy.</item> <item quantity="other">Pomyślnie zaktualizowano %d kluczy.</item> </plurals> - <string name="no_keys_added_or_updated">Nie dodano ani zaktualizowano żadnych kluczy.</string> + <string name="import_error_nothing">Nie dodano ani zaktualizowano żadnych kluczy.</string> <string name="key_exported">Pomyślnie wyeksportowano 1 klucz.</string> <string name="keys_exported">Pomyślnie wyeksportowano %d kluczy.</string> <string name="no_keys_exported">Nie wyeksportowano żadnych kluczy.</string> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 0becea0bc..b108324d1 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -206,27 +206,27 @@ <string name="ask_empty_id_ok">Вы добавили пустой идентификатор. Вы уверены, что хотите продолжить?</string> <string name="public_key_deletetion_confirmation">Вы правда хотите удалить публичный ключ \'%s\'?\nЭто действие нельзя отменить!</string> <string name="also_export_secret_keys">Экспортировать секретные ключи?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Успешно добавлено %d ключ</item> <item quantity="few">Успешно добавлено %d ключей</item> <item quantity="other">Успешно добавлено %d ключей</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">и обновлен %d ключ.</item> <item quantity="few">и обновлено %d ключей.</item> <item quantity="other">и обновлено %d ключей.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">Добавлен %d ключ</item> <item quantity="few">Добавлено %d ключей</item> <item quantity="other">Добавлено %d ключей</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">Обновлен %d ключ.</item> <item quantity="few">Обновлено %d ключей.</item> <item quantity="other">Обновлено %d ключей.</item> </plurals> - <string name="no_keys_added_or_updated">Нет обновленных или добавленных ключей</string> + <string name="import_error_nothing">Нет обновленных или добавленных ключей</string> <string name="key_exported">Успешный экспорт 1 ключа.</string> <string name="keys_exported">Экспортировано %d ключей.</string> <string name="no_keys_exported">Ключи не были экспортированы.</string> diff --git a/OpenKeychain/src/main/res/values-sl/strings.xml b/OpenKeychain/src/main/res/values-sl/strings.xml index 8b12cdebe..0fe44725b 100644 --- a/OpenKeychain/src/main/res/values-sl/strings.xml +++ b/OpenKeychain/src/main/res/values-sl/strings.xml @@ -212,31 +212,31 @@ <string name="ask_empty_id_ok">Dodali ste prazno identiteto, ali res želite nadaljevati?</string> <string name="public_key_deletetion_confirmation">Ali res želite izbrisati javni ključ \'%s\'?\nTega koraka ne boste mogli preklicati!</string> <string name="also_export_secret_keys">Želite izvoziti tudi zasebne ključe?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Uspešno dodan %d ključ</item> <item quantity="two">Uspešno dodana %d ključa</item> <item quantity="few">Uspešno dodani %d ključi</item> <item quantity="other">Uspešno dodanih %d ključev</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">in posodbljen %d.</item> <item quantity="two">in posodobljena %d.</item> <item quantity="few">in posodobljeni %d.</item> <item quantity="other">in posodobljenih %d.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">Uspešno dodan %d ključ.</item> <item quantity="two">Uspešno dodana %d ključa.</item> <item quantity="few">Uspešno dodani %d ključi.</item> <item quantity="other">Uspešno dodanih %d ključev.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">Uspešno posodobljen %d ključ.</item> <item quantity="two">Uspešno posodobljena %d ključa.</item> <item quantity="few">Uspešno posodobljeni %d ključi.</item> <item quantity="other">Uspešno posodobljenih %d ključev.</item> </plurals> - <string name="no_keys_added_or_updated">Noben ključ ni bil dodan ali posodobljen.</string> + <string name="import_error_nothing">Noben ključ ni bil dodan ali posodobljen.</string> <string name="key_exported">Uspešno izvožen 1 ključ.</string> <string name="keys_exported">Uspešno izvoženih ključev: %d</string> <string name="no_keys_exported">Noben ključ ni bil izvožen.</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index b27b6ffd3..2951d13f8 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -209,27 +209,27 @@ <string name="ask_empty_id_ok">Ви вже додали порожню сутність. Ви справді хочете продовжити?</string> <string name="public_key_deletetion_confirmation">Ви справді хочете вилучити відкритий ключ \'%s\'?\nВи не зможете це відмінити!</string> <string name="also_export_secret_keys">Також експортувати секретні ключі?</string> - <plurals name="keys_added_and_updated_1"> + <plurals name="import_keys_added_and_updated_1"> <item quantity="one">Успішно додано %d ключ</item> <item quantity="few">Успішно додано %d ключі</item> <item quantity="other">Успішно додано %d ключів</item> </plurals> - <plurals name="keys_added_and_updated_2"> + <plurals name="import_keys_added_and_updated_2"> <item quantity="one">і оновлено %d ключ.</item> <item quantity="few">і оновлено %d ключі.</item> <item quantity="other">і оновлено %d ключів.</item> </plurals> - <plurals name="keys_added"> + <plurals name="import_keys_added"> <item quantity="one">Успішно додано %d ключ.</item> <item quantity="few">Успішно додано %d ключі.</item> <item quantity="other">Успішно додано %d ключів.</item> </plurals> - <plurals name="keys_updated"> + <plurals name="import_keys_updated"> <item quantity="one">Успішно оновлено %d ключ.</item> <item quantity="few">Успішно оновлено %d ключі.</item> <item quantity="other">Успішно оновлено %d ключів.</item> </plurals> - <string name="no_keys_added_or_updated">Жодного ключа не додано та не оновлено.</string> + <string name="import_error_nothing">Жодного ключа не додано та не оновлено.</string> <string name="key_exported">Успішно експортовано 1 ключ.</string> <string name="keys_exported">Успішно експортовано %d ключів.</string> <string name="no_keys_exported">Жодного ключа не експортовано.</string> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index eeb6b3742..5a2c38419 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -28,6 +28,7 @@ <string name="title_certify_key">Certify Identities</string> <string name="title_key_details">Key Details</string> <string name="title_help">Help</string> + <string name="title_log_display">Log</string> <!-- section --> <string name="section_user_ids">Identities</string> @@ -102,6 +103,7 @@ <string name="menu_select_all">Select all</string> <string name="menu_add_keys">Add keys</string> <string name="menu_export_all_keys">Export all keys</string> + <string name="menu_advanced">Show advanced info</string> <!-- label --> <string name="label_sign">Sign</string> @@ -220,24 +222,6 @@ <string name="public_key_deletetion_confirmation">Do you really want to delete the public key \'%s\'?\nYou can\'t undo this!</string> <string name="also_export_secret_keys">Also export secret keys?</string> - <plurals name="keys_added_and_updated_1"> - <item quantity="one">Successfully added %d key</item> - <item quantity="other">Successfully added %d keys</item> - </plurals> - <plurals name="keys_added_and_updated_2"> - <item quantity="one"> and updated %d key.</item> - <item quantity="other"> and updated %d keys.</item> - </plurals> - <plurals name="keys_added"> - <item quantity="one">Successfully added %d key.</item> - <item quantity="other">Successfully added %d keys.</item> - </plurals> - <plurals name="keys_updated"> - <item quantity="one">Successfully updated %d key.</item> - <item quantity="other">Successfully updated %d keys.</item> - </plurals> - - <string name="no_keys_added_or_updated">No keys added or updated.</string> <string name="key_exported">Successfully exported 1 key.</string> <string name="keys_exported">Successfully exported %d keys.</string> <string name="no_keys_exported">No keys exported.</string> @@ -406,6 +390,28 @@ <string name="import_clipboard_button">Get key from clipboard</string> <string name="import_keybase_button">Get key from Keybase.io</string> + <!-- Import result toast --> + <plurals name="import_keys_added_and_updated_1"> + <item quantity="one">Successfully added %1$d key</item> + <item quantity="other">Successfully added %1$d keys</item> + </plurals> + <plurals name="import_keys_added_and_updated_2"> + <item quantity="one"> and updated %1$d key%2$s.</item> + <item quantity="other"> and updated %1$d keys%2$s.</item> + </plurals> + <plurals name="import_keys_added"> + <item quantity="one">Successfully added %1$d key%2$s.</item> + <item quantity="other">Successfully added %1$d keys%2$s.</item> + </plurals> + <plurals name="import_keys_updated"> + <item quantity="one">Successfully updated %1$d key%2$s.</item> + <item quantity="other">Successfully updated %1$d keys%2$s.</item> + </plurals> + <string name="import_view_log">View Log</string> + <string name="import_error_nothing">Nothing to import.</string> + <string name="import_error">Error importing keys!</string> + <string name="import_with_warnings">, with warnings</string> + <!-- Intent labels --> <string name="intent_decrypt_file">Decrypt File with OpenKeychain</string> <string name="intent_import_key">Import Key with OpenKeychain</string> @@ -499,6 +505,91 @@ <string name="cert_verify_error">error!</string> <string name="cert_verify_unavailable">key unavailable</string> + <!-- Import Public log entries --> + <string name="msg_ip_apply_batch">Applying insert batch operation.</string> + <string name="msg_ip_bad_type_secret">Tried to import secret keyring as public. This is a bug, please file a report!</string> + <string name="msg_ip_delete_old_fail">No old key deleted (creating a new one?)</string> + <string name="msg_ip_delete_old_ok">Deleted old key from database</string> + <string name="msg_ip_encode_fail">Operation failed due to encoding error</string> + <string name="msg_ip_fail_io_exc">Operation failed due to i/o error</string> + <string name="msg_ip_fail_op_ex">Operation failed due to database error</string> + <string name="msg_ip_fail_remote_ex">Operation failed due to internal error</string> + <string name="msg_ip">Importing public keyring %s</string> + <string name="msg_ip_insert_keyring">Encoding keyring data</string> + <string name="msg_ip_insert_subkeys">Evaluating subkeys</string> + <string name="msg_ip_prepare">Preparing database operations</string> + <string name="msg_ip_prepare_success">OK</string> + <string name="msg_ip_preserving_secret">Preserving available secret key</string> + <string name="msg_ip_subkey">Processing subkey %s</string> + <string name="msg_ip_subkey_expired">Subkey expired on %s</string> + <string name="msg_ip_subkey_expires">Subkey expires on %s</string> + <string name="msg_ip_subkey_flags">Subkey flags: %s</string> + <string name="msg_ip_subkey_flags_ces">Subkey flags: certify, encrypt, sign</string> + <string name="msg_ip_subkey_flags_cex">Subkey flags: certify, encrypt</string> + <string name="msg_ip_subkey_flags_cxs">Subkey flags: certify, sign</string> + <string name="msg_ip_subkey_flags_xes">Subkey flags: encrypt, sign</string> + <string name="msg_ip_subkey_flags_cxx">Subkey flags: certify</string> + <string name="msg_ip_subkey_flags_xex">Subkey flags: encrypt</string> + <string name="msg_ip_subkey_flags_xxs">Subkey flags: sign</string> + <string name="msg_ip_subkey_flags_xxx">Subkey flags: none</string> + <string name="msg_ip_success">Successfully imported public keyring</string> + <string name="msg_ip_reinsert_secret">Re-inserting secret key</string> + <string name="msg_ip_uid_cert_bad">Encountered bad certificate!</string> + <string name="msg_ip_uid_cert_error">Error processing certificate!</string> + <string name="msg_ip_uid_cert_good">Found good certificate from %1$s (%2$s)</string> + <string name="msg_ip_uid_certs_unknown">Ignoring %s certificates from unknown pubkeys</string> + <string name="msg_ip_uid_classifying">Classifying user ids, using %s trusted signatures</string> + <string name="msg_ip_uid_reorder">Re-ordering user ids</string> + <string name="msg_ip_uid_processing">Processing user id %s</string> + <string name="msg_ip_uid_revoked">Found uid revocation certificate</string> + <string name="msg_ip_uid_self_good">Found good self certificate</string> + <string name="msg_is_bad_type_public">Tried to import public keyring as secret. This is a bug, please file a report!</string> + + <!-- Import Secret log entries --> + <string name="msg_is">Importing secret key %s</string> + <string name="msg_is_importing_subkeys">Processing secret subkeys</string> + <string name="msg_is_io_excption">Error encoding keyring</string> + <string name="msg_is_subkey_nonexistent">Subkey %s unavailable in public key</string> + <string name="msg_is_subkey_ok">Marked %s as available</string> + <string name="msg_is_subkey_stripped">Marked %s as stripped</string> + <string name="msg_is_success">Successfully imported secret keyring</string> + + <!-- Keyring Canonicalization log entries --> + <string name="msg_kc">Canonicalizing keyring %s</string> + <string name="msg_kc_master">Processing master key</string> + <string name="msg_kc_master_success">OK</string> + <string name="msg_kc_revoke_bad_err">Removing bad keyring revocation certificate</string> + <string name="msg_kc_revoke_bad_local">Removing keyring revocation certificate with "local" flag</string> + <string name="msg_kc_revoke_bad_time">Removing keyring revocation certificate with future timestamp</string> + <string name="msg_kc_revoke_bad_type">Removing master key certificate of unknown type (%s)</string> + <string name="msg_kc_revoke_bad">Removing bad keyring revocation certificate</string> + <string name="msg_kc_revoke_dup">Removing redundant keyring revocation certificate</string> + <string name="msg_kc_sub">Processing subkey %s</string> + <string name="msg_kc_sub_bad">Removing invalid subkey binding certificate</string> + <string name="msg_kc_sub_bad_err">Removing bad subkey binding certificate</string> + <string name="msg_kc_sub_bad_local">Removing subkey binding certificate with "local" flag</string> + <string name="msg_kc_sub_bad_keyid">Subkey binding issuer id mismatch</string> + <string name="msg_kc_sub_bad_time">Removing subkey binding certificate with future timestamp</string> + <string name="msg_kc_sub_bad_type">Unknown subkey certificate type: %s</string> + <string name="msg_kc_sub_primary_bad">Removing subkey binding certificate due to invalid primary binding certificate</string> + <string name="msg_kc_sub_primary_bad_err">Removing subkey binding certificate due to bad primary binding certificate</string> + <string name="msg_kc_sub_primary_none">Removing subkey binding certificate due to missing primary binding certificate</string> + <string name="msg_kc_sub_no_cert">No valid certificate found for %s, removing from ring</string> + <string name="msg_kc_sub_revoke_bad_err">Removing bad subkey revocation key</string> + <string name="msg_kc_sub_revoke_bad">Removing bad subkey revocation key</string> + <string name="msg_kc_sub_revoke_dup">Removing redundant keyring revocation key</string> + <string name="msg_kc_sub_success">Subkey binding OK</string> + <string name="msg_kc_success">Keyring canonicalization successful</string> + <string name="msg_kc_success_removed">Keyring canonicalization successful, removed %s certificates</string> + <string name="msg_kc_uid_bad_err">Removing bad self certificate for user id %s</string> + <string name="msg_kc_uid_bad_local">Removing user id certificate with "local" flag</string> + <string name="msg_kc_uid_bad_time">Removing user id with future timestamp</string> + <string name="msg_kc_uid_bad_type">Removing user id certificate of unknown type (%s)</string> + <string name="msg_kc_uid_bad">Removing bad self certificate for user id "%s"</string> + <string name="msg_kc_uid_dup">Removing outdated self certificate for user id "%s"</string> + <string name="msg_kc_uid_revoke_dup">Removing redundant revocation certificate for user id "%s"</string> + <string name="msg_kc_uid_revoke_old">Removing outdated revocation certificate for user id "%s"</string> + <!-- unsorted --> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> @@ -519,5 +610,7 @@ <string name="can_sign_not">cannot sign</string> <string name="error_encoding">Encoding error</string> <string name="error_no_encrypt_subkey">No encryption subkey available!</string> + <string name="info_no_manual_account_creation">Do not create OpenKeychain-Accounts manually.\nFor more information, see Help.</string> + <string name="contact_show_key">Show key (%s)</string> </resources> diff --git a/OpenKeychain/src/main/res/xml/account_desc.xml b/OpenKeychain/src/main/res/xml/account_desc.xml new file mode 100644 index 000000000..94ffdf40b --- /dev/null +++ b/OpenKeychain/src/main/res/xml/account_desc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> + +<account-authenticator xmlns:android="http://schemas.android.com/apk/res/android" + android:accountType="org.sufficientlysecure.keychain" + android:icon="@drawable/icon" + android:label="@string/app_name"/> diff --git a/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml new file mode 100644 index 000000000..5f5f2be80 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/custom_pgp_contacts_structure.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<ContactsSource xmlns:android="http://schemas.android.com/apk/res/android"> + <ContactsDataKind android:mimeType="vnd.android.cursor.item/vnd.org.sufficientlysecure.keychain.key" + android:detailColumn="data1"/> +</ContactsSource>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml new file mode 100644 index 000000000..d8fe60e91 --- /dev/null +++ b/OpenKeychain/src/main/res/xml/sync_adapter_desc.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<sync-adapter xmlns:android="http://schemas.android.com/apk/res/android" + android:contentAuthority="com.android.contacts" + android:accountType="org.sufficientlysecure.keychain" + android:supportsUploading="false" + android:userVisible="true"/>
\ No newline at end of file |