diff options
Diffstat (limited to 'app/src/main')
51 files changed, 77 insertions, 73 deletions
diff --git a/app/src/main/java/org/connectbot/PubkeyListActivity.java b/app/src/main/java/org/connectbot/PubkeyListActivity.java index 9f8521f..df00333 100644 --- a/app/src/main/java/org/connectbot/PubkeyListActivity.java +++ b/app/src/main/java/org/connectbot/PubkeyListActivity.java @@ -61,6 +61,7 @@ import android.util.Log; import android.view.ContextMenu; import android.view.LayoutInflater; import android.view.Menu; +import android.view.MenuInflater; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; import android.view.View; @@ -169,52 +170,53 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi } + @Override public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - - MenuItem generatekey = menu.add(R.string.pubkey_generate); - generatekey.setIcon(android.R.drawable.ic_menu_manage); - generatekey.setIntent(new Intent(PubkeyListActivity.this, GeneratePubkeyActivity.class)); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.pubkey_list_activity_menu, menu); + return super.onCreateOptionsMenu(menu); + } - MenuItem importkey = menu.add(R.string.pubkey_import); - importkey.setIcon(android.R.drawable.ic_menu_upload); - importkey.setOnMenuItemClickListener(new OnMenuItemClickListener() { - public boolean onMenuItemClick(MenuItem item) { - Uri sdcard = Uri.fromFile(Environment.getExternalStorageDirectory()); - String pickerTitle = getString(R.string.pubkey_list_pick); + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case R.id.add_new_key_icon: + startActivity(new Intent(this, GeneratePubkeyActivity.class)); + return true; + case R.id.import_existing_key_icon: + Uri sdcard = Uri.fromFile(Environment.getExternalStorageDirectory()); + String pickerTitle = getString(R.string.pubkey_list_pick); + + // Try to use OpenIntent's file browser to pick a file + Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE); + intent.setData(sdcard); + intent.putExtra(FileManagerIntents.EXTRA_TITLE, pickerTitle); + intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getString(android.R.string.ok)); - // Try to use OpenIntent's file browser to pick a file - Intent intent = new Intent(FileManagerIntents.ACTION_PICK_FILE); - intent.setData(sdcard); - intent.putExtra(FileManagerIntents.EXTRA_TITLE, pickerTitle); - intent.putExtra(FileManagerIntents.EXTRA_BUTTON_TEXT, getString(android.R.string.ok)); + try { + startActivityForResult(intent, REQUEST_CODE_PICK_FILE); + } catch (ActivityNotFoundException e) { + // If OI didn't work, try AndExplorer + intent = new Intent(Intent.ACTION_PICK); + intent.setDataAndType(sdcard, MIME_TYPE_ANDEXPLORER_FILE); + intent.putExtra(ANDEXPLORER_TITLE, pickerTitle); try { startActivityForResult(intent, REQUEST_CODE_PICK_FILE); - } catch (ActivityNotFoundException e) { - // If OI didn't work, try AndExplorer - intent = new Intent(Intent.ACTION_PICK); - intent.setDataAndType(sdcard, MIME_TYPE_ANDEXPLORER_FILE); - intent.putExtra(ANDEXPLORER_TITLE, pickerTitle); - - try { - startActivityForResult(intent, REQUEST_CODE_PICK_FILE); - } catch (ActivityNotFoundException e1) { - pickFileSimple(); - } + } catch (ActivityNotFoundException e1) { + pickFileSimple(); } - - return true; } - }); - - return true; + return true; + default: + return super.onOptionsItemSelected(item); + } } protected void handleAddKey(final PubkeyBean pubkey) { if (pubkey.isEncrypted()) { - final View view = inflater.inflate(R.layout.dia_password, null); + final View view = View.inflate(this, R.layout.dia_password, null); final EditText passwordField = (EditText) view.findViewById(android.R.id.text1); new AlertDialog.Builder(PubkeyListActivity.this) @@ -521,7 +523,8 @@ public class PubkeyListActivity extends AppCompatListActivity implements EventLi changePassword.setEnabled(!imported); changePassword.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(MenuItem item) { - final View changePasswordView = inflater.inflate(R.layout.dia_changepassword, null, false); + final View changePasswordView = + View.inflate(PubkeyListActivity.this, R.layout.dia_changepassword, null); ((TableRow) changePasswordView.findViewById(R.id.old_password_prompt)) .setVisibility(pubkey.isEncrypted() ? View.VISIBLE : View.GONE); new AlertDialog.Builder(PubkeyListActivity.this) diff --git a/app/src/main/res/drawable-hdpi/ic_add_box.png b/app/src/main/res/drawable-hdpi/ic_add_box.png Binary files differnew file mode 100644 index 0000000..1137eb5 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_add_box.png diff --git a/app/src/main/res/drawable-hdpi/ic_folder_open.png b/app/src/main/res/drawable-hdpi/ic_folder_open.png Binary files differnew file mode 100644 index 0000000..4f90c63 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_folder_open.png diff --git a/app/src/main/res/drawable-mdpi/ic_add_box.png b/app/src/main/res/drawable-mdpi/ic_add_box.png Binary files differnew file mode 100644 index 0000000..239a702 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_add_box.png diff --git a/app/src/main/res/drawable-mdpi/ic_folder_open.png b/app/src/main/res/drawable-mdpi/ic_folder_open.png Binary files differnew file mode 100644 index 0000000..d7f3571 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_folder_open.png diff --git a/app/src/main/res/drawable-xhdpi/ic_add_box.png b/app/src/main/res/drawable-xhdpi/ic_add_box.png Binary files differnew file mode 100644 index 0000000..b591b0f --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_add_box.png diff --git a/app/src/main/res/drawable-xhdpi/ic_folder_open.png b/app/src/main/res/drawable-xhdpi/ic_folder_open.png Binary files differnew file mode 100644 index 0000000..f55b92e --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_folder_open.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_box.png b/app/src/main/res/drawable-xxhdpi/ic_add_box.png Binary files differnew file mode 100644 index 0000000..99e99b1 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_add_box.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_folder_open.png b/app/src/main/res/drawable-xxhdpi/ic_folder_open.png Binary files differnew file mode 100644 index 0000000..ac4de2c --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_folder_open.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_box.png b/app/src/main/res/drawable-xxxhdpi/ic_add_box.png Binary files differnew file mode 100644 index 0000000..fef1c75 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_add_box.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_folder_open.png b/app/src/main/res/drawable-xxxhdpi/ic_folder_open.png Binary files differnew file mode 100644 index 0000000..e6faa99 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_folder_open.png diff --git a/app/src/main/res/menu/pubkey_list_activity_menu.xml b/app/src/main/res/menu/pubkey_list_activity_menu.xml new file mode 100644 index 0000000..ed9817a --- /dev/null +++ b/app/src/main/res/menu/pubkey_list_activity_menu.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ ConnectBot: simple, powerful, open-source SSH client for Android + ~ Copyright 2015 Kenny Root, Jeffrey Sharkey + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<menu + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:connectbot="http://schemas.android.com/apk/res-auto" + > + + <item android:id="@+id/add_new_key_icon" + android:icon="@drawable/ic_add_box" + android:title="@string/pubkey_add_new" + connectbot:showAsAction="ifRoom" + /> + + <item android:id="@+id/import_existing_key_icon" + android:icon="@drawable/ic_folder_open" + android:title="@string/pubkey_import_existing" + connectbot:showAsAction="ifRoom" + /> + +</menu> diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml index 442f28f..cf7e67c 100644 --- a/app/src/main/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -13,7 +13,6 @@ <string name="help_about">Aangaande ConnectBot</string> <string name="help_keyboard">Sleutelbord</string> <string name="pubkey_generate">Genereer</string> - <string name="pubkey_import">Voer in</string> <string name="pubkey_delete">Verwyder sleutel</string> <string name="pubkey_gather_entropy">Versamel Ewekansigheid</string> <string name="pubkey_touch_prompt">Raak hierdie boks om ewekansigheid te versamel: %1$d%% voltooi</string> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5fb33d6..8a8e130 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -15,7 +15,6 @@ <string name="help_about">حول البرنامج</string> <string name="help_keyboard">لوحة المفاتيح</string> <string name="pubkey_generate">توليد</string> - <string name="pubkey_import">استيراد</string> <string name="pubkey_delete">حذف المفتاح</string> <string name="pubkey_touch_hint">للتاكد من العشوائية خلال توليد المفتاح , حرك اصبعك بشكل عشوائي فوق المربع في الاسفل</string> <string name="pubkey_generating">جاري توليد المفتاح</string> diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index f87787b..097cb5e 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -14,7 +14,6 @@ <string name="help_about">Относно ConnectBot</string> <string name="help_keyboard">Клавиатура</string> <string name="pubkey_generate">Генериране</string> - <string name="pubkey_import">Импортиране</string> <string name="pubkey_delete">Клавиш Delete</string> <string name="pubkey_copy_private">Копира частния ключ</string> <string name="pubkey_copy_public">Копира публичния ключ</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8156cc6..2c166e2 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">Sobre ConnectBot</string> <string name="help_keyboard">Teclat</string> <string name="pubkey_generate">Genera</string> - <string name="pubkey_import">Importa</string> <string name="pubkey_delete">Elimina la clau</string> <string name="pubkey_gather_entropy">Recull Entropia</string> <string name="pubkey_touch_prompt">Toca aquesta caixa per obtenir aleatorietat: %1$d%% completat</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 73ac4f4..ddfb44f 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">O aplikaci ConnectBot</string> <string name="help_keyboard">Klávesnice</string> <string name="pubkey_generate">Vygenerovat</string> - <string name="pubkey_import">Importovat</string> <string name="pubkey_delete">Smazat klíč</string> <string name="pubkey_gather_entropy">Získávání entropie</string> <string name="pubkey_touch_prompt">Dotkněte se plochy pro získání náhodnosti: %1$d%% hotovo</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b84612d..1f6b466 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Om ConnectBot</string> <string name="help_keyboard">Tastatur</string> <string name="pubkey_generate">Opret</string> - <string name="pubkey_import">Importér</string> <string name="pubkey_delete">Slet nøgle</string> <string name="pubkey_gather_entropy">Indsamler entropi</string> <string name="pubkey_touch_prompt">Berør denne boks for at generere tilfældighed: %1$d%% færdig</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ba993d1..2fd8715 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">Über ConnectBot</string> <string name="help_keyboard">Tastatur</string> <string name="pubkey_generate">Erzeugen</string> - <string name="pubkey_import">Importieren</string> <string name="pubkey_delete">Schlüssel löschen</string> <string name="pubkey_gather_entropy">Sammle Entropie</string> <string name="pubkey_touch_prompt">Berühren Sie diese Box, um Zufallszahlen zu erzeugen: %1$d%% fertig</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 8067d0a..ccd0327 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">Acerca de ConnectBot</string> <string name="help_keyboard">Teclado</string> <string name="pubkey_generate">Generar</string> - <string name="pubkey_import">Importar</string> <string name="pubkey_delete">Eliminar clave</string> <string name="pubkey_gather_entropy">Haciendo acopio de entropía</string> <string name="pubkey_touch_prompt">Toque esta caja para conseguir aleatoriedad: %1$d%% hecho</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 9eb598a..52eedc7 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">ConnectBot-i buruz</string> <string name="help_keyboard">Teklatua</string> <string name="pubkey_generate">Sortu</string> - <string name="pubkey_import">Inportatu</string> <string name="pubkey_delete">Ezabatu gakoa</string> <string name="pubkey_gather_entropy">Entropia biltzen</string> <string name="pubkey_touch_prompt">Ukitu kaxa hau ausazkotasuna lortzeko: %1$d%% eginda</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index de26749..b50add6 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Tietoja ConnectBotista</string> <string name="help_keyboard">Näppäimistö</string> <string name="pubkey_generate">Luo</string> - <string name="pubkey_import">Tuo</string> <string name="pubkey_delete">Poista avain</string> <string name="pubkey_gather_entropy">Kerätään satunnaisdataa</string> <string name="pubkey_touch_prompt">Kosketa tätä laatikkoa kerätäksesi satunnaisdataa: %1$d%% valmiina</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 05f88b0..bb0dee8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">À propos de ConnectBot</string> <string name="help_keyboard">Clavier</string> <string name="pubkey_generate">Générer</string> - <string name="pubkey_import">Importer</string> <string name="pubkey_delete">Supprimer la clé</string> <string name="pubkey_gather_entropy">Génération d\'entropie</string> <string name="pubkey_touch_prompt">Touchez cette boîte pour générer de l\'entropie : %1$d%% effectué</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index ebcbdcd..3bc8b23 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -16,7 +16,6 @@ <string name="help_about">Acerca de ConnectBot</string> <string name="help_keyboard">Teclado</string> <string name="pubkey_generate">Xerar</string> - <string name="pubkey_import">Importar</string> <string name="pubkey_delete">Borrar a chave</string> <string name="pubkey_gather_entropy">Xerando Entropía</string> <string name="pubkey_touch_prompt">Toca esta casiña para xerar aleatoriedade: %1$d%% feito</string> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index b9146ed..b3cba42 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">על אודות ConnectBot</string> <string name="help_keyboard">מקלדת</string> <string name="pubkey_generate">יצירה</string> - <string name="pubkey_import">יבוא</string> <string name="pubkey_delete">מחיקת מפתח</string> <string name="pubkey_gather_entropy">נאסף גיבוב</string> <string name="pubkey_touch_prompt">יש לגעת בתיבה זו כדי לאסוף נתונים אקראיים: %1$d%% הושלמו</string> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a9c4a8c..192bc0e 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">O ConnectBot-u</string> <string name="help_keyboard">Tipkovnica</string> <string name="pubkey_generate">Stvori</string> - <string name="pubkey_import">Uvoz</string> <string name="pubkey_delete">Obriši ključ</string> <string name="pubkey_gather_entropy">Sakupljanje Entropije</string> <string name="pubkey_touch_prompt">Dotakni ovaj prozor za prikupljanje slučajnosti: %1$d%% gotovo</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index b74f517..5a102c7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">A ConnectBot névjegye</string> <string name="help_keyboard">Billentyűzet</string> <string name="pubkey_generate">Generálás</string> - <string name="pubkey_import">Importálás</string> <string name="pubkey_delete">Kulcs törlése</string> <string name="pubkey_gather_entropy">Entrópia gyűjtés</string> <string name="pubkey_touch_prompt">Érintse meg a dobozt a véletlenszerű generálásához: %1$d%% kész</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 4b01149..d0bd68f 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Mengenai ConnectBot</string> <string name="help_keyboard">Papan Ketik</string> <string name="pubkey_generate">Buat</string> - <string name="pubkey_import">Impor</string> <string name="pubkey_delete">Tombol Hapus</string> <string name="pubkey_gather_entropy">Kumpulkan Entropy</string> <string name="pubkey_touch_prompt">Sentuh boks ini untuk mengumpulkan ke tidak tentuan: %1$d%% selesai</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index e22c0db..1ae4b42 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -16,7 +16,6 @@ <string name="help_about">Um ConnectBot</string> <string name="help_keyboard">Lyklaborð</string> <string name="pubkey_generate">Búa til</string> - <string name="pubkey_import">Flytja inn</string> <string name="pubkey_delete">Eyða lykli</string> <string name="pubkey_gather_entropy">Safna bitum af handahófi</string> <string name="pubkey_touch_prompt">Snertu kassann til þess að safna bitum af handahófi, %1$d%% búið.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index cde7392..33144e5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">Informazioni su ConnectBot</string> <string name="help_keyboard">Tastiera</string> <string name="pubkey_generate">Genera</string> - <string name="pubkey_import">Importa</string> <string name="pubkey_delete">Elimina chiave</string> <string name="pubkey_gather_entropy">Raccolta entropia</string> <string name="pubkey_touch_prompt">Tocca questo riquadro per raccogliere informazioni casuali: %1$d%% fatto</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 23c89ea..ffe5bfd 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">ConnectBotについて</string> <string name="help_keyboard">キーボード</string> <string name="pubkey_generate">生成</string> - <string name="pubkey_import">インポート</string> <string name="pubkey_delete">鍵を削除</string> <string name="pubkey_gather_entropy">エントロピー収集中</string> <string name="pubkey_touch_prompt">この四角内をランダムに触ってください: %1$d%% 完了</string> diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index d1343d7..cc5b437 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -10,6 +10,5 @@ <string name="help_about">ConnectBot-ის შესახებ</string> <string name="help_keyboard">კლავიატურა</string> <string name="pubkey_generate">გენერირება</string> - <string name="pubkey_import">იმპორტი</string> <string name="pubkey_delete">გასაღების წაშლა</string> </resources> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 49bb602..bd33a12 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -16,7 +16,6 @@ <string name="help_about">ConnectBot 정보</string> <string name="help_keyboard">키보드</string> <string name="pubkey_generate">생성</string> - <string name="pubkey_import">가져오기</string> <string name="pubkey_delete">키 삭제</string> <string name="pubkey_gather_entropy">엔트로피 수집 중</string> <string name="pubkey_touch_prompt">이 사각형의 랜덤으로 터치하세요: %1$d%% 완료</string> diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 5a56d9f..c6e0113 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -15,7 +15,6 @@ <string name="help_about">За ConnectBot</string> <string name="help_keyboard">Тастатура</string> <string name="pubkey_generate">Генерирај</string> - <string name="pubkey_import">Увези</string> <string name="pubkey_delete">Одстрани клуч</string> <string name="pubkey_generating">Се генерира пар на клучеви…</string> <string name="pubkey_copy_private">Копирај го приватниот клуч</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index c444e12..c7351e5 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Om ConnectBot</string> <string name="help_keyboard">Tastatur</string> <string name="pubkey_generate">Generer</string> - <string name="pubkey_import">Importer</string> <string name="pubkey_delete">Slett nøkkel</string> <string name="pubkey_gather_entropy">Samler entropi</string> <string name="pubkey_touch_prompt">Berør denne boksen for å samle tilfeldige tall: %1$d%% ferdig</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 1a89e1f..01a64ae 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Over ConnectBot</string> <string name="help_keyboard">Toetsenbord</string> <string name="pubkey_generate">Genereren</string> - <string name="pubkey_import">Importeren</string> <string name="pubkey_delete">Sleutel verwijderen</string> <string name="pubkey_gather_entropy">Bezig met het verzamelen van Entropie</string> <string name="pubkey_touch_prompt">Raak dit vierkant aan om willekeurigheid te verzamelen: %1$d%% gedaan</string> diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index a506fa1..4810c7e 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -15,7 +15,6 @@ <string name="help_about">A prepaus de ConnectBot</string> <string name="help_keyboard">Clavièr</string> <string name="pubkey_generate">Generar</string> - <string name="pubkey_import">Importar</string> <string name="pubkey_delete">Suprimir la clau</string> <string name="pubkey_gather_entropy">Generacion d\'aleatòri</string> <string name="pubkey_touch_prompt">Tocatz aquesta bóstia per recuperar un nombre aleatòri : %1$d%% fach</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 800dbc1..8775a89 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">O ConnectBot</string> <string name="help_keyboard">Klawiatura</string> <string name="pubkey_generate">Wygeneruj</string> - <string name="pubkey_import">Importuj</string> <string name="pubkey_delete">Usuń klucz</string> <string name="pubkey_gather_entropy">Zbieranie danych losowych</string> <string name="pubkey_touch_prompt">Dotknij to pole, żeby losowo wygenerować dane. Ukończono: %1$d%%</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e149a96..bfdeb96 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">Sobre o ConnectBot</string> <string name="help_keyboard">Teclado</string> <string name="pubkey_generate">Gerar</string> - <string name="pubkey_import">Importar</string> <string name="pubkey_delete">Apagar chave</string> <string name="pubkey_gather_entropy">Ajustando sensibilidade</string> <string name="pubkey_touch_prompt">Toque na caixa para testar sensibilidade: %1$d%% pronto</string> diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index b477fb6..eddd87b 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Sobre ConnectBot</string> <string name="help_keyboard">Teclado</string> <string name="pubkey_generate">Gerar</string> - <string name="pubkey_import">Importar</string> <string name="pubkey_delete">Apagar a chave</string> <string name="pubkey_gather_entropy">Recolhendo entropia</string> <string name="pubkey_touch_prompt">Toque nesta caixa para gerar aleariedade: %1$d%% completo</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index b98b798..1d23677 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Despre ConnectBot</string> <string name="help_keyboard">Tastatură</string> <string name="pubkey_generate">Generează</string> - <string name="pubkey_import">Importă</string> <string name="pubkey_delete">Șterge cheia</string> <string name="pubkey_gather_entropy">Genereaza sursa entropie</string> <string name="pubkey_touch_prompt">Apasa aceasta zona pentru a genera entropie: %1$d%% finalizat</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 9e48e1d..52ac1d1 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">О ConnectBot</string> <string name="help_keyboard">Клавиатура</string> <string name="pubkey_generate">Генерировать</string> - <string name="pubkey_import">Импортировать</string> <string name="pubkey_delete">Удалить ключ</string> <string name="pubkey_gather_entropy">Сбор случайной информации</string> <string name="pubkey_touch_prompt">Нажмите сюда для генерирования случайной информации: %1$d%% готово</string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index e2d8d40..a0c0f2c 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">O programe ConnectBot</string> <string name="help_keyboard">Klávesnica</string> <string name="pubkey_generate">Vygenerovať</string> - <string name="pubkey_import">Importovať</string> <string name="pubkey_delete">Zmazať kľúč</string> <string name="pubkey_gather_entropy">Získavanie entropie</string> <string name="pubkey_touch_prompt">Dotknite sa plochy pre získanie náhodnosti: %1$d%% hotovo</string> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 2d608a2..b8eb7ea 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">O ConnectBotu</string> <string name="help_keyboard">Tipkovnica</string> <string name="pubkey_generate">Ustvari</string> - <string name="pubkey_import">Uvozi javni ključ</string> <string name="pubkey_delete">Izbriši ključ</string> <string name="pubkey_gather_entropy">Zbiranje entropije</string> <string name="pubkey_touch_prompt">Dotaknite to polje za zbiranje naključnih vrednosti: %1$d%% končano</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 7606abf..669610a 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">О Конектботу</string> <string name="help_keyboard">Тастатура</string> <string name="pubkey_generate">Генериши</string> - <string name="pubkey_import">Увези</string> <string name="pubkey_delete">Обриши кључ</string> <string name="pubkey_gather_entropy">Сакупљам ентропију</string> <string name="pubkey_touch_prompt">Додирните овде да бисте сакупили ентропију: %1$d%% завршено</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index f78ca14..e924523 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -17,7 +17,6 @@ <string name="help_about">Om ConnectBot</string> <string name="help_keyboard">Tangentbord</string> <string name="pubkey_generate">Generera</string> - <string name="pubkey_import">Importera</string> <string name="pubkey_delete">Ta bort nyckel</string> <string name="pubkey_gather_entropy">Samlar in entropi</string> <string name="pubkey_touch_prompt">Rör vid rutan för att samla in slumpdata: %1$d%% klart</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 0ff4ba6..4177a14 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">ConnectBot Hakkında</string> <string name="help_keyboard">Klavye</string> <string name="pubkey_generate">Oluştur</string> - <string name="pubkey_import">Harici dosyadan aktar</string> <string name="pubkey_delete">Anahtarı Sil</string> <string name="pubkey_gather_entropy">Entropi Toplanıyor</string> <string name="pubkey_touch_prompt">Rastgele girdi toplamak için bu kutuya dokun: %1$d%% oluşturuldu</string> diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f6d929c..fab2563 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -15,7 +15,6 @@ <string name="help_about">Про ConnectBot</string> <string name="help_keyboard">Клавіатура</string> <string name="pubkey_generate">Генерувати</string> - <string name="pubkey_import">Імпортувати</string> <string name="pubkey_delete">Вилучити ключ</string> <string name="pubkey_list_empty">Tap Menu to create\nor import key pairs.</string> <string name="pubkey_change_password">Змінити пароль</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0facf93..8a984e6 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">关于ConnectBot</string> <string name="help_keyboard">键盘</string> <string name="pubkey_generate">生成</string> - <string name="pubkey_import">导入</string> <string name="pubkey_delete">删除密钥</string> <string name="pubkey_gather_entropy">正在收集熵</string> <string name="pubkey_touch_prompt">触摸这个方框来收集随机数：%1$d%% 完成</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 6107c7d..ee92ad7 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -18,7 +18,6 @@ <string name="help_about">關於 ConnectBot</string> <string name="help_keyboard">鍵盤</string> <string name="pubkey_generate">產生</string> - <string name="pubkey_import">匯入</string> <string name="pubkey_delete">刪除金鑰</string> <string name="pubkey_gather_entropy">正在收集用戶熵</string> <string name="pubkey_touch_prompt">觸摸此方框來收集隨機數：%1$d％完成</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b92cc28..445d894 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -113,7 +113,6 @@ <string name="paste_shortcut">Ctrl-Shift-V</string> <string name="pubkey_generate">"Generate"</string> - <string name="pubkey_import">"Import"</string> <string name="pubkey_delete">"Delete key"</string> <!-- Dialog title when user must move finger randomly over an area to gather entropy (collect random bits) --> <string name="pubkey_gather_entropy">"Gathering Entropy"</string> @@ -652,5 +651,9 @@ <string name="hostpref_add_host">Add host</string> <!-- Text for button which, when clicked, saves an existing host. --> <string name="hostpref_edit_host">Save host</string> + <!-- Text for button which, when clicked, brings up an editor for adding a new pubkey. --> + <string name="pubkey_add_new">Add new pubkey</string> + <!-- Text for button which, when clicked, brings up picker to import an existing pubkey. --> + <string name="pubkey_import_existing">Import existing pubkey</string> </resources> |
