cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' into linked-identities

Browse Source 
Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
This commit is contained in:
Vincent Breitmoser
2015-03-24 15:29:02 +01:00
parent fe32e7bff4 8b4388e1a2
commit f9ef1160ca
136 changed files with 1910 additions and 1282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
OpenKeychain/src/main/res/drawable-hdpi/ic_nfc_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
OpenKeychain/src/main/res/drawable-mdpi/ic_nfc_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 701 B

BIN
OpenKeychain/src/main/res/drawable-xhdpi/ic_nfc_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
OpenKeychain/src/main/res/drawable-xxhdpi/ic_nfc_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
OpenKeychain/src/main/res/drawable-xxxhdpi/ic_nfc_grey_24dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

22
OpenKeychain/src/main/res/layout/api_select_sign_key_activity.xml
View File

@@ -35,6 +35,28 @@
android:text="@string/api_select_sign_key_text"
android:textAppearance="?android:attr/textAppearanceMedium" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/api_select_sign_key_none"
android:background="?android:selectableItemBackground"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:text="@string/none"
android:layout_height="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:clickable="true" />
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<FrameLayout
android:id="@+id/api_select_sign_key_list_fragment"
android:layout_width="match_parent"

4
OpenKeychain/src/main/res/layout/create_key_name_fragment.xml
View File

@@ -56,11 +56,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/btn_back"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableLeft="@drawable/ic_chevron_left_grey_24dp"
android:drawablePadding="8dp"
android:gravity="left|center_vertical"
android:clickable="false"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
<TextView

104
OpenKeychain/src/main/res/layout/create_key_start_fragment.xml Normal file
View File

@@ -0,0 +1,104 @@
<?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="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_above="@+id/create_key_buttons">
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:adjustViewBounds="true"
android:src="@drawable/first_time_1"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="@color/holo_gray_bright"
android:id="@+id/create_key_buttons">
<TextView
android:id="@+id/create_key_create_key_button"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_time_create_key"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
android:drawablePadding="8dp"
android:gravity="right|center_vertical"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
<!--<TextView-->
<!--android:id="@+id/create_key_yubikey_button"-->
<!--android:paddingLeft="16dp"-->
<!--android:paddingRight="16dp"-->
<!--android:textAppearance="?android:attr/textAppearanceMedium"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_weight="1"-->
<!--android:text="@string/first_time_yubikey"-->
<!--android:textAllCaps="true"-->
<!--android:minHeight="?android:attr/listPreferredItemHeight"-->
<!--android:drawableRight="@drawable/ic_chevron_right_grey_24dp"-->
<!--android:drawablePadding="8dp"-->
<!--android:gravity="right|center_vertical"-->
<!--android:clickable="true"-->
<!--style="?android:attr/borderlessButtonStyle" />-->
<TextView
android:id="@+id/create_key_import_button"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_time_import_key"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_chevron_right_grey_24dp"
android:drawablePadding="8dp"
android:gravity="right|center_vertical"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
<TextView
android:id="@+id/create_key_cancel"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/btn_do_not_save"
android:textAllCaps="true"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_close_grey_24dp"
android:drawablePadding="8dp"
android:gravity="right|center_vertical"
android:clickable="true"
style="?android:attr/borderlessButtonStyle" />
</LinearLayout>
</RelativeLayout>

137
OpenKeychain/src/main/res/layout/first_time_activity.xml
View File

@@ -1,137 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="16dp">
<ImageView
android:id="@+id/status_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/statusbar_height" />
<LinearLayout
android:id="@+id/first_time_buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:layout_alignParentBottom="true"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/first_time_import_key"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_time_import_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_folder_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dp"
android:layout_height="match_parent"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/first_time_create_key"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/first_time_create_key"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_key_plus_grey600_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:clickable="true"
android:background="?android:selectableItemBackground" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"
android:background="?android:attr/listDivider" />
<TextView
android:id="@+id/first_time_cancel"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/first_time_skip"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center"
android:clickable="true"
android:background="?android:selectableItemBackground"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:layout_below="@+id/status_bar"
android:layout_above="@+id/first_time_buttons">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/app_name"
android:drawableLeft="@drawable/ic_launcher"
android:drawablePadding="8dp"
android:gravity="center"
android:layout_gravity="center_horizontal" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:adjustViewBounds="true"
android:src="@drawable/first_time_1"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="64dp"
android:layout_marginRight="64dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/first_time_text1"
android:layout_gravity="center_horizontal"
android:gravity="center_horizontal"
android:layout_marginBottom="16dp" />
</LinearLayout>
</RelativeLayout>

20
OpenKeychain/src/main/res/layout/import_keys_activity.xml
View File

@@ -50,18 +50,19 @@
android:layout_weight="1"
android:background="@android:color/white" />
<LinearLayout
<RelativeLayout
android:id="@+id/import_footer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:background="@android:color/white">
<View
android:id="@+id/import_divider"
android:layout_width="match_parent"
android:layout_height="1dip"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:background="?android:attr/listDivider" />
<TextView
@@ -70,7 +71,10 @@
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_below="@id/import_divider"
android:text="@string/import_import"
android:minHeight="?android:attr/listPreferredItemHeight"
android:drawableRight="@drawable/ic_file_download_grey_24dp"
@@ -79,6 +83,12 @@
android:clickable="true"
android:background="?android:selectableItemBackground" />
</LinearLayout>
<RelativeLayout
android:id="@+id/import_snackbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/import_import" />
</RelativeLayout>
</LinearLayout>
</RelativeLayout>

25
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@@ -99,14 +99,12 @@
android:layout_weight="1" />
<LinearLayout
android:id="@+id/view_key_action_key_share"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:clickable="true"
android:background="?android:selectableItemBackground"
android:orientation="horizontal">
<TextView
android:id="@+id/view_key_action_key_share"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:textAppearance="?android:attr/textAppearanceMedium"
@@ -116,7 +114,25 @@
android:layout_weight="1"
android:drawableRight="@drawable/ic_share_grey_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical" />
android:gravity="center_vertical"
android:background="?android:selectableItemBackground"/>
<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/view_key_action_key_nfc"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:padding="8dp"
android:src="@drawable/ic_nfc_grey_24dp"
android:layout_gravity="center_vertical"
android:background="?android:selectableItemBackground" />
<View
android:layout_width="1dip"
@@ -154,6 +170,7 @@
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dip"

24
OpenKeychain/src/main/res/menu/encrypt_file_activity.xml
View File

@@ -18,17 +18,33 @@
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" />
<item
android:id="@+id/check_enable_compression"
android:title="@string/label_enable_compression"
android:checked="true"
android:checkable="true" />
<item
android:id="@+id/check_encrypt_filenames"
android:title="@string/label_encrypt_filenames"
android:checked="true"
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_hidden_recipients"-->
<!--android:title="@string/label_hidden_recipients"-->
<!--android:checked="false"-->
<!--android:checkable="true" />-->
</menu>

8
OpenKeychain/src/main/res/menu/encrypt_text_activity.xml
View File

@@ -18,9 +18,17 @@
android:id="@+id/check_use_symmetric"
android:title="@string/label_symmetric"
android:checkable="true" />
<item
android:id="@+id/check_enable_compression"
android:title="@string/label_enable_compression"
android:checked="true"
android:checkable="true" />
<!--<item-->
<!--android:id="@+id/check_hidden_recipients"-->
<!--android:title="@string/label_hidden_recipients"-->
<!--android:checked="false"-->
<!--android:checkable="true" />-->
</menu>

2
OpenKeychain/src/main/res/menu/key_list.xml
View File

@@ -16,7 +16,7 @@
<item
android:id="@+id/menu_key_list_create"
android:title="@string/menu_create_key"
android:title="@string/menu_manage_keys"
app:showAsAction="never" />
<item

4
OpenKeychain/src/main/res/raw/help_certification.html
View File

@@ -22,10 +22,10 @@ To confirm keys between more than two persons, we suggest to use the key exchang
This certification is a <a href="http://tools.ietf.org/html/rfc4880#section-5.2.1">"generic certification (0x10)"</a> described in the standard by:
"The issuer of this certification does not make any particular assertion as to how well the certifier has checked that the owner of the key is in fact the person described by the User ID."</p>
<p>Traditionally, certifications (often with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
<p>Traditionally, certifications (also with higher certification levels, such as "positive certifications" (0x13)) are organized in OpenPGP's Web of Trust.
Our model of key confirmation is a much simpler concept to avoid common usability problems related to this Web of Trust.
We assume that keys are verified only to a certain degree that is still usable enough to be executed "on the go".
We also do not implement (potentially transitive) trust signatures or any other internal trust model.
We also do not implement (potentially transitive) trust signatures or an ownertrust database like in GnuPG.
Furthermore, keys which contain at least one user ID certified by a trusted key will be marked as "confirmed" in the key listings.</p>
</body>

2
OpenKeychain/src/main/res/values-cs/strings.xml
View File

@@ -71,7 +71,7 @@
<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 moje klíče</string>
<string name="menu_manage_keys">Vytvořit moje klíče</string>
<string name="menu_import_existing_key">Importovat ze souboru</string>
<string name="menu_search">Hledat</string>
<string name="menu_beam_preferences">Beam settings</string>

2
OpenKeychain/src/main/res/values-de/strings.xml
View File

@@ -88,7 +88,7 @@
<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">Erzeuge meinen Schlüssel</string>
<string name="menu_manage_keys">Erzeuge meinen Schlüssel</string>
<string name="menu_import_existing_key">Von Datei importieren</string>
<string name="menu_search">Suchen</string>
<string name="menu_nfc_preferences">NFC-Einstellungen</string>

2
OpenKeychain/src/main/res/values-es/strings.xml
View File

@@ -89,7 +89,7 @@
<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 mi clave</string>
<string name="menu_manage_keys">Crear mi clave</string>
<string name="menu_import_existing_key">Importar desde fichero</string>
<string name="menu_search">Buscar</string>
<string name="menu_nfc_preferences">Configuraciones NFC</string>

2
OpenKeychain/src/main/res/values-eu/strings.xml
View File

@@ -76,7 +76,7 @@
<string name="menu_help">Laguntza</string>
<string name="menu_export_key">Esportatu agirira</string>
<string name="menu_delete_key">Ezabatu giltza</string>
<string name="menu_create_key">Sortu nire giltza</string>
<string name="menu_manage_keys">Sortu nire giltza</string>
<string name="menu_import_existing_key">inportatu agiritik</string>
<string name="menu_search">Bilatu</string>
<string name="menu_nfc_preferences">NFC ezarpenak</string>

2
OpenKeychain/src/main/res/values-fi/strings.xml
View File

@@ -70,7 +70,7 @@
<string name="menu_help">Apua</string>
<string name="menu_export_key">Vie tiedostoon</string>
<string name="menu_delete_key">Poista avain</string>
<string name="menu_create_key">Luo minun avaimeni</string>
<string name="menu_manage_keys">Luo minun avaimeni</string>
<string name="menu_import_existing_key">Tuo tiedostosta</string>
<string name="menu_search">Etsi</string>
<string name="menu_beam_preferences">Beam asetukset</string>

2
OpenKeychain/src/main/res/values-fr/strings.xml
View File

@@ -89,7 +89,7 @@
<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 ma clef</string>
<string name="menu_manage_keys">Créer ma clef</string>
<string name="menu_import_existing_key">Importer depuis un fichier</string>
<string name="menu_search">Rechercher</string>
<string name="menu_nfc_preferences">Paramètres NFC</string>

2
OpenKeychain/src/main/res/values-it/strings.xml
View File

@@ -69,7 +69,7 @@
<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 mia chiave</string>
<string name="menu_manage_keys">Crea mia chiave</string>
<string name="menu_import_existing_key">Importa da file</string>
<string name="menu_search">Cerca</string>
<string name="menu_beam_preferences">Impostazioni Beam</string>

2
OpenKeychain/src/main/res/values-ja/strings.xml
View File

@@ -89,7 +89,7 @@
<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_manage_keys">自分の鍵の生成</string>
<string name="menu_import_existing_key">ファイルからインポート</string>
<string name="menu_search">検索</string>
<string name="menu_nfc_preferences">NFC設定</string>

2
OpenKeychain/src/main/res/values-nl/strings.xml
View File

@@ -96,7 +96,7 @@
<string name="menu_help">Help</string>
<string name="menu_export_key">Exporteren naar bestand</string>
<string name="menu_delete_key">Sleutel verwijderen</string>
<string name="menu_create_key">Mijn sleutel aanmaken</string>
<string name="menu_manage_keys">Mijn sleutel aanmaken</string>
<string name="menu_import_existing_key">Importeren van bestand</string>
<string name="menu_search">Zoeken</string>
<string name="menu_nfc_preferences">NFC-instellingen</string>

2
OpenKeychain/src/main/res/values-pl/strings.xml
View File

@@ -78,7 +78,7 @@
<string name="menu_help">Pomoc</string>
<string name="menu_export_key">Eksportuj do pliku</string>
<string name="menu_delete_key">Usuń klucz</string>
<string name="menu_create_key">Utwórz mój klucz</string>
<string name="menu_manage_keys">Utwórz mój klucz</string>
<string name="menu_import_existing_key">Importuj z pliku</string>
<string name="menu_search">Szukaj</string>
<string name="menu_beam_preferences">Ustawienia Beam</string>

2
OpenKeychain/src/main/res/values-ru/strings.xml
View File

@@ -85,7 +85,7 @@
<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_manage_keys">Создать свой ключ</string>
<string name="menu_import_existing_key">Импорт из файла</string>
<string name="menu_search">Поиск</string>
<string name="menu_nfc_preferences">Настройки NFC</string>

2
OpenKeychain/src/main/res/values-sl/strings.xml
View File

@@ -75,7 +75,7 @@
<string name="menu_help">Pomoč</string>
<string name="menu_export_key">Izvozi v datoteko</string>
<string name="menu_delete_key">Izbriši ključ</string>
<string name="menu_create_key">Ustvari zasebni ključ</string>
<string name="menu_manage_keys">Ustvari zasebni ključ</string>
<string name="menu_import_existing_key">Uvozi iz datoteke</string>
<string name="menu_search">Išči</string>
<string name="menu_beam_preferences">Nastavitve Beam</string>

2
OpenKeychain/src/main/res/values-sr/strings.xml
View File

@@ -89,7 +89,7 @@
<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_manage_keys">Направи ми кључ</string>
<string name="menu_import_existing_key">Увези из фајла</string>
<string name="menu_search">Претрага</string>
<string name="menu_nfc_preferences">НФЦ поставке</string>

2
OpenKeychain/src/main/res/values-sv/strings.xml
View File

@@ -78,7 +78,7 @@
<string name="menu_help">Hjälp</string>
<string name="menu_export_key">Exportera till fil</string>
<string name="menu_delete_key">Radera nyckel</string>
<string name="menu_create_key">Skapa min nyckel</string>
<string name="menu_manage_keys">Skapa min nyckel</string>
<string name="menu_import_existing_key">Importera från fil</string>
<string name="menu_search">Sök</string>
<string name="menu_beam_preferences">Beam-inställningar</string>

2
OpenKeychain/src/main/res/values-tr/strings.xml
View File

@@ -69,7 +69,7 @@
<string name="menu_help">Yardım</string>
<string name="menu_export_key">Dosyaya ver</string>
<string name="menu_delete_key">Anahtar sil</string>
<string name="menu_create_key">Anahtarımı oluştur</string>
<string name="menu_manage_keys">Anahtarımı oluştur</string>
<string name="menu_import_existing_key">Dosyadan al</string>
<string name="menu_search">Ara</string>
<string name="menu_beam_preferences">NFC ayarları</string>

2
OpenKeychain/src/main/res/values-uk/strings.xml
View File

@@ -69,7 +69,7 @@
<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_manage_keys">Створити мій ключ</string>
<string name="menu_import_existing_key">Імпорт з файлу</string>
<string name="menu_search">Пошук</string>
<string name="menu_beam_preferences">Налаштування променя</string>

2
OpenKeychain/src/main/res/values-zh-rTW/strings.xml
View File

@@ -65,7 +65,7 @@
<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_manage_keys">建立金鑰</string>
<string name="menu_import_existing_key">從檔案匯入</string>
<string name="menu_search">搜尋</string>
<string name="menu_beam_preferences">Beam 設定</string>

2
OpenKeychain/src/main/res/values-zh/strings.xml
View File

@@ -57,7 +57,7 @@
<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_manage_keys">创建密钥</string>
<string name="menu_search">搜索</string>
<string name="menu_beam_preferences">参数</string>
<string name="menu_key_edit_cancel">取消</string>

12
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -45,6 +45,7 @@
<string name="title_keys">"Keys"</string>
<string name="title_delete_secret_key">"Delete YOUR key '%s'?"</string>
<string name="title_export_log">"Export Log"</string>
<string name="title_manage_my_keys">"Manage my keys"</string>
<!-- section -->
<string name="section_user_ids">"Identities"</string>
@@ -107,7 +108,7 @@
<string name="menu_help">"Help"</string>
<string name="menu_export_key">"Export to file"</string>
<string name="menu_delete_key">"Delete key"</string>
<string name="menu_create_key">"Create my key"</string>
<string name="menu_manage_keys">"Manage my keys"</string>
<string name="menu_import_existing_key">"Import from file"</string>
<string name="menu_search">"Search"</string>
<string name="menu_nfc_preferences">"NFC settings"</string>
@@ -142,7 +143,7 @@
<string name="label_label_use_default_yubikey_pin_summary">"Uses default PIN (123456) to access YubiKeys over NFC"</string>
<string name="label_asymmetric_from">"Signed by:"</string>
<string name="label_to">"Encrypt to:"</string>
<string name="label_delete_after_encryption">"Delete file after encryption"</string>
<string name="label_delete_after_encryption">"Delete files after encryption"</string>
<string name="label_delete_after_decryption">"Delete after decryption"</string>
<string name="label_encryption_algorithm">"Encryption algorithm"</string>
<string name="label_hash_algorithm">"Hash algorithm"</string>
@@ -168,6 +169,8 @@
<string name="label_first_keyserver_is_used">"(First keyserver listed is preferred)"</string>
<string name="label_preferred">"preferred"</string>
<string name="label_enable_compression">"Enable compression"</string>
<string name="label_encrypt_filenames">"Encrypt filenames"</string>
<string name="label_hidden_recipients">"Hide recipients"</string>
<string name="user_id_no_name">"&lt;no name&gt;"</string>
<string name="none">"&lt;none&gt;"</string>
@@ -1211,8 +1214,9 @@
<!-- First Time -->
<string name="first_time_text1">"Take back your privacy with OpenKeychain!"</string>
<string name="first_time_create_key">"Create my key"</string>
<string name="first_time_import_key">"Import from file"</string>
<string name="first_time_create_key">"Create my key (recommended)"</string>
<string name="first_time_import_key">"Import key from file"</string>
<string name="first_time_yubikey">"Use YubiKey NEO"</string>
<string name="first_time_skip">"Skip Setup"</string>
<!-- unsorted -->