diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
12 files changed, 33 insertions, 70 deletions
diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml index b6c5a1c9a..7e71ccf53 100644 --- a/OpenKeychain/src/main/res/layout/edit_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/edit_key_activity.xml @@ -1,46 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:bootstrapbutton="http://schemas.android.com/apk/res-auto" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:fillViewport="true" - android:orientation="vertical" > +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" > + <include layout="@layout/notify_area"/> - <TextView - style="@style/SectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="4dp" - android:text="@string/label_passphrase" /> + <FrameLayout + android:id="@+id/edit_key_fragment_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" /> - <CheckBox - android:id="@+id/edit_key_no_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/label_no_passphrase" /> - - <Button - android:id="@+id/edit_key_btn_change_passphrase" - android:layout_width="match_parent" - android:layout_height="60dp" - android:padding="4dp" - android:text="@string/btn_set_passphrase" - android:drawableLeft="@drawable/ic_action_edit" - android:background="@drawable/button_edgy" /> - - <LinearLayout - android:id="@+id/edit_key_container" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - </LinearLayout> - </LinearLayout> - -</ScrollView>
\ No newline at end of file +</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml b/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml deleted file mode 100644 index f96b993c5..000000000 --- a/OpenKeychain/src/main/res/layout/edit_key_activity_new.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?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"> - - <FrameLayout - android:id="@+id/edit_key_fragment_container" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> - -</LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml index c4c2c35cb..6c9bed872 100644 --- a/OpenKeychain/src/main/res/layout/key_list_activity.xml +++ b/OpenKeychain/src/main/res/layout/key_list_activity.xml @@ -2,10 +2,19 @@ <android.support.v4.widget.FixedDrawerLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/drawer_layout" android:layout_width="match_parent" - android:layout_height="match_parent" > + android:layout_height="match_parent"> - <include layout="@layout/key_list_content"/> + <LinearLayout + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <include layout="@layout/drawer_list" /> + <include layout="@layout/notify_area"/> + + <include layout="@layout/key_list_content"/> + + <include layout="@layout/drawer_list" /> + + </LinearLayout> </android.support.v4.widget.FixedDrawerLayout>
\ 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 27078c9e4..b15a73c0e 100644 --- a/OpenKeychain/src/main/res/layout/view_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml @@ -4,11 +4,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <LinearLayout - android:id="@+id/card_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" /> + <include layout="@layout/notify_area"/> <LinearLayout android:id="@+id/view_key_status_layout" diff --git a/OpenKeychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml index 50afd5c57..002243482 100644 --- a/OpenKeychain/src/main/res/values-es/strings.xml +++ b/OpenKeychain/src/main/res/values-es/strings.xml @@ -370,7 +370,7 @@ <item quantity="one">Clave%2$s importada con éxito.</item> <item quantity="other">%1$d claves%2$s importadas con éxito.</item> </plurals> - <string name="import_view_log">Ver registro (log)</string> + <string name="view_log">Ver registro (log)</string> <string name="import_error_nothing">No hay nada que importar.</string> <string name="import_error">¡Error importando claves!</string> <string name="import_with_warnings">, con advertencias</string> diff --git a/OpenKeychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml index f3627e9eb..a3030a65e 100644 --- a/OpenKeychain/src/main/res/values-fr/strings.xml +++ b/OpenKeychain/src/main/res/values-fr/strings.xml @@ -358,7 +358,7 @@ <item quantity="one">Clef importée avec succès</item> <item quantity="other">%1$d clefs importées avec succès</item> </plurals> - <string name="import_view_log">Consulter le journal</string> + <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> <string name="import_with_warnings">, avec des avertissements</string> diff --git a/OpenKeychain/src/main/res/values-it/strings.xml b/OpenKeychain/src/main/res/values-it/strings.xml index c8ec2614d..476b7fb31 100644 --- a/OpenKeychain/src/main/res/values-it/strings.xml +++ b/OpenKeychain/src/main/res/values-it/strings.xml @@ -354,7 +354,7 @@ <string name="import_clipboard_button">Ottieni chiave dagli appunti</string> <string name="import_keybase_button">Ottieni chiave da Keybase.io</string> <!--Import result toast--> - <string name="import_view_log">Mostra registro</string> + <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> <string name="import_with_warnings">, con avvisi</string> diff --git a/OpenKeychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml index 13463df25..db1150102 100644 --- a/OpenKeychain/src/main/res/values-ja/strings.xml +++ b/OpenKeychain/src/main/res/values-ja/strings.xml @@ -358,7 +358,7 @@ <plurals name="import_keys_updated"> <item quantity="other">%1$d の鍵%2$sのアップデートに成功。</item> </plurals> - <string name="import_view_log">ログを見る</string> + <string name="view_log">ログを見る</string> <string name="import_error_nothing">インポートするものがありません。</string> <string name="import_error">鍵のインポートのエラー!</string> <string name="import_with_warnings">、とワーニング</string> diff --git a/OpenKeychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml index 539a431b5..d15e35f50 100644 --- a/OpenKeychain/src/main/res/values-ru/strings.xml +++ b/OpenKeychain/src/main/res/values-ru/strings.xml @@ -371,7 +371,7 @@ <item quantity="few">и обновлено %1$d ключей%2$s.</item> <item quantity="other">и обновлено %1$d ключей%2$s.</item> </plurals> - <string name="import_view_log">Смотреть журнал</string> + <string name="view_log">Смотреть журнал</string> <string name="import_error_nothing">Нет данных для импорта.</string> <string name="import_error">Ошибка импорта ключей!</string> <string name="import_with_warnings">, с предупреждениями</string> diff --git a/OpenKeychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml index 6f5cc7cf1..90ad799a5 100644 --- a/OpenKeychain/src/main/res/values-uk/strings.xml +++ b/OpenKeychain/src/main/res/values-uk/strings.xml @@ -352,7 +352,7 @@ <string name="import_clipboard_button">Отримати ключ з буфера обміну</string> <string name="import_keybase_button">Отримати ключ із Keybase.io</string> <!--Import result toast--> - <string name="import_view_log">Переглянути журнал</string> + <string name="view_log">Переглянути журнал</string> <string name="import_error_nothing">Нема що імпортувати.</string> <string name="import_error">Помилка імпорту ключів!</string> <!--Intent labels--> diff --git a/OpenKeychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml index c0042d215..449a09003 100644 --- a/OpenKeychain/src/main/res/values/colors.xml +++ b/OpenKeychain/src/main/res/values/colors.xml @@ -5,6 +5,7 @@ <color name="emphasis_dark">#9933cc</color> <color name="bg_gray">#cecbce</color> <color name="tertiary_text_light">#808080</color> + <color name="alert">#ffdd3333</color> <color name="holo_gray_light">#33999999</color> <color name="holo_gray_bright">#33CCCCCC</color> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index f6648ca3d..3a5e77d38 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -403,7 +403,7 @@ <item quantity="one">Successfully updated 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="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> @@ -695,6 +695,7 @@ <string name="passp_cache_notif_pwd">Password</string> <!-- unsorted --> + <string name="internal_error">Internal error!</string> <string name="section_certifier_id">Certifier</string> <string name="section_cert">Certificate Details</string> <string name="label_user_id">Identity</string> |