diff options
Diffstat (limited to 'app/src')
29 files changed, 64 insertions, 45 deletions
diff --git a/app/src/main/java/org/connectbot/ConsoleActivity.java b/app/src/main/java/org/connectbot/ConsoleActivity.java index dc1cb91..79f1269 100644 --- a/app/src/main/java/org/connectbot/ConsoleActivity.java +++ b/app/src/main/java/org/connectbot/ConsoleActivity.java @@ -508,7 +508,8 @@ public class ConsoleActivity extends Activity { } // activate consider if within x tolerance - if (Math.abs(e1.getX() - e2.getX()) < ViewConfiguration.getTouchSlop() * 4) { + int touchSlop = ViewConfiguration.get(ConsoleActivity.this).getScaledTouchSlop(); + if (Math.abs(e1.getX() - e2.getX()) < touchSlop * 4) { View flip = findCurrentView(R.id.console_flip); if (flip == null) return false; diff --git a/app/src/main/java/org/connectbot/HostListActivity.java b/app/src/main/java/org/connectbot/HostListActivity.java index f0fdf16..a0d7901 100644 --- a/app/src/main/java/org/connectbot/HostListActivity.java +++ b/app/src/main/java/org/connectbot/HostListActivity.java @@ -442,27 +442,40 @@ public class HostListActivity extends ListActivity { * Disconnects all active connections and closes the activity if appropriate. */ private void disconnectAll() { - // TODO(jklein24): Show a confirm dialog before actually disconnecting. if (bound == null) { waitingForDisconnectAll = true; return; } - bound.disconnectAll(true, false); - updateHandler.sendEmptyMessage(-1); - waitingForDisconnectAll = false; - - if (closeOnDisconnectAll) { - // Clear the intent so that the activity can be relaunched without closing. - // TODO(jlklein): Find a better way to do this. - setIntent(new Intent()); - finish(); - } + new AlertDialog.Builder(HostListActivity.this) + .setMessage(getString(R.string.disconnect_all_message)) + .setPositiveButton(R.string.disconnect_all_pos, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + bound.disconnectAll(true, false); + updateHandler.sendEmptyMessage(-1); + waitingForDisconnectAll = false; + + // Clear the intent so that the activity can be relaunched without closing. + // TODO(jlklein): Find a better way to do this. + setIntent(new Intent()); + + if (closeOnDisconnectAll) { + finish(); + } + } + }) + .setNegativeButton(R.string.disconnect_all_neg, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + waitingForDisconnectAll = false; + // Clear the intent so that the activity can be relaunched without closing. + // TODO(jlklein): Find a better way to do this. + setIntent(new Intent()); + } + }).create().show(); } /** - * @param text * @return */ private boolean startConsoleActivity() { diff --git a/app/src/main/jni/com_google_ase_Exec.cpp b/app/src/main/jni/com_google_ase_Exec.cpp index b78f356..b2fa39f 100644 --- a/app/src/main/jni/com_google_ase_Exec.cpp +++ b/app/src/main/jni/com_google_ase_Exec.cpp @@ -79,7 +79,7 @@ int jniGetFDFromFileDescriptor(JNIEnv* env, jobject fileDescriptor) { static int create_subprocess( const char* cmd, const char* arg0, const char* arg1, int* pProcessId) { - char* devname; + char devname[32]; int ptm; pid_t pid; @@ -91,7 +91,7 @@ static int create_subprocess( fcntl(ptm, F_SETFD, FD_CLOEXEC); if(grantpt(ptm) || unlockpt(ptm) || - ((devname = (char*) ptsname(ptm)) == 0)){ + ptsname_r(ptm, devname, sizeof(devname))){ LOG("[ trouble with /dev/ptmx - %s ]\n", strerror(errno)); return -1; } diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 7b3baa4..d19430f 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">Recull Entropia</string> <string name="pubkey_touch_prompt">Toca aquesta caixa per obtenir aleatorietat: %1$d%% completat</string> <string name="pubkey_touch_hint">Per assegurar l\'aleatorietat durant la generació de la clau, mou el dit aleatoriament per sobre la caixa de sota.</string> - <string name="pubkey_generating">Generant parell de claus...</string> + <string name="pubkey_generating">Generant parell de claus…</string> <string name="pubkey_copy_private">Còpia la clau privada</string> <string name="pubkey_copy_public">Còpia la clau pública</string> <string name="pubkey_list_empty">Pulsa Menu per crear\no importar parells de claus.</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index d66550a..2f9e8fd 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">For at garantere tilfældig data til oprettelse af nøglen, skal du flytte din finger tilfældigt indenfor boksen nedenfor.</string> - <string name="pubkey_generating">Opretter nøglepar...</string> + <string name="pubkey_generating">Opretter nøglepar…</string> <string name="pubkey_copy_private">Kopier privat nøgle</string> <string name="pubkey_copy_public">Kopier offentlig nøgle</string> <string name="pubkey_list_empty">Tryk Menu for at oprette\nog importere nøglepar.</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index eadad3b..7f73841 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,7 +23,7 @@ <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> <string name="pubkey_touch_hint">Um eine gute Zufallsverteilung zu gewährleisten, bewegen Sie Ihren Finger zufällig über die Box unten!</string> - <string name="pubkey_generating">Erzeuge Schlüsselpaar...</string> + <string name="pubkey_generating">Erzeuge Schlüsselpaar…</string> <string name="pubkey_copy_private">Privaten Schlüssel kopieren</string> <string name="pubkey_copy_public">Öffentlichen Schlüssel kopieren</string> <string name="pubkey_list_empty">\"Menu\" drücken, um Schlüsselpaare\nzu erzeugen oder zu importieren.</string> @@ -104,7 +104,7 @@ <string name="list_keymode_none">Ausschalten</string> <string name="list_pubkeyids_none">Keine Schlüssel verwenden</string> <string name="list_pubkeyids_any">Beliebigen entsperrten Schlüssel verwenden</string> - <string name="hostpref_nickname_title">Nutzername</string> + <string name="hostpref_nickname_title">Spitzname</string> <string name="hostpref_color_title">Farbkategorie</string> <string name="hostpref_fontsize_title">Fontgröße (pt)</string> <string name="hostpref_pubkeyid_title">Verwende pubkey Authentisierung</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 91a7889..a8462fc 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">Entropia biltzen</string> <string name="pubkey_touch_prompt">Ukitu kaxa hau ausazkotasuna lortzeko: %1$d%% eginda</string> <string name="pubkey_touch_hint">Gakoa sortzeko beharrezko den ausazkotasuna lortzeko, mugitu hatza ausaz azpiko kaxaren gainean.</string> - <string name="pubkey_generating">Gako parea sortzen...</string> + <string name="pubkey_generating">Gako parea sortzen…</string> <string name="pubkey_copy_private">Kopiatu gako pribatua</string> <string name="pubkey_copy_public">Kopiatu gako publikoa</string> <string name="pubkey_list_empty">Sakatu \"Menu\" gako pareak\nsortu edo inportatzeko</string> diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 39d2e66..d17bd22 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Liikuta sormeasi alla olevan laatikon kohdalla sattumanvaraisesti varmistaaksesi avaimen luonnin satunnaisuuden.</string> - <string name="pubkey_generating">Luodaan avainparia...</string> + <string name="pubkey_generating">Luodaan avainparia…</string> <string name="pubkey_copy_private">Kopio yksityinen avain</string> <string name="pubkey_copy_public">Kopioi julkinen avain</string> <string name="pubkey_list_empty">Paina valikkopainiketta\nluodaksesi tai tuodaksesi\navainpareja.</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index efc4f96..daf0608 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -23,7 +23,7 @@ <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> <string name="pubkey_touch_hint">Afin d\'assurer la qualité des nombres aléatoires utilisés pendant la génération de la clé, merci de bouger votre doigt de façon aléatoire sur la boîte ci-dessous.</string> - <string name="pubkey_generating">Génération de la paire de clés en cours...</string> + <string name="pubkey_generating">Génération de la paire de clés en cours…</string> <string name="pubkey_copy_private">Copier la clé privée</string> <string name="pubkey_copy_public">Copier la clé publique</string> <string name="pubkey_list_empty">Cliquer sur le Menu pour créer\nou importer des paires de clés.</string> @@ -112,7 +112,7 @@ <string name="list_keymode_none">Désactivé</string> <string name="list_pubkeyids_none">Ne pas utiliser les clés publiques</string> <string name="list_pubkeyids_any">Utiliser une clé pour l\'authentification</string> - <string name="hostpref_nickname_title">Surnom</string> + <string name="hostpref_nickname_title">Pseudonyme</string> <string name="hostpref_color_title">Catégorie de couleur</string> <string name="hostpref_fontsize_title">Taille de police (pt)</string> <string name="hostpref_pubkeyid_title">Utiliser l\'authentification par clé publique</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 75b4769..ebcbdcd 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -21,7 +21,7 @@ <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> <string name="pubkey_touch_hint">Para garantir aleatoriedade durante a xeración da chave, mova o dedo aleatoriamente na casiña a continuación</string> - <string name="pubkey_generating">Xerando par de chaves...</string> + <string name="pubkey_generating">Xerando par de chaves…</string> <string name="pubkey_copy_private">Copiar chave privada</string> <string name="pubkey_copy_public">Copiar chave pública</string> <string name="pubkey_list_empty">Pulse Menu para crear\nou importar pares de chaves</string> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 429146e..10c0623 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">נאסף גיבוב</string> <string name="pubkey_touch_prompt">יש לגעת בתיבה זו כדי לאסוף נתונים אקראיים: %1$d%% הושלמו</string> <string name="pubkey_touch_hint">כדי להבטיח את האקראיות במהלך יצירת המפתח, עליך להעביר את האצבע באקראיות על התיבה שלהלן.</string> - <string name="pubkey_generating">צמד המפתחות נוצר...</string> + <string name="pubkey_generating">צמד המפתחות נוצר…</string> <string name="pubkey_copy_private">העתקת המפתח הפרטי</string> <string name="pubkey_copy_public">העתקת המפתח הציבורי</string> <string name="pubkey_list_empty">יש לגעת ב„תפריט“ כדי ליצור\nאו לייבא צמדי מפתחות.</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 66c9947..61becd0 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">A kulcs egyediségének biztosítása érdekében mozgassa ujját véletlenszerűen az alábbi dobozban.</string> - <string name="pubkey_generating">Kulcspár generálása...</string> + <string name="pubkey_generating">Kulcspár generálása…</string> <string name="pubkey_copy_private">Privát kulcs másolása</string> <string name="pubkey_copy_public">Nyilvános kulcs másolása</string> <string name="pubkey_list_empty">Nyomjon Menu-t, kulcspár\n létrehozáshoz/importáláshoz.</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 4a9407d..c8d93c9 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Untuk memastikan ketidaktentuan selama pembuatan kunci, gerakkan tangan anda secara acak diatas kotak dibawah ini.</string> - <string name="pubkey_generating">Membuat pasangan kunci...</string> + <string name="pubkey_generating">Membuat pasangan kunci…</string> <string name="pubkey_copy_private">Salin kunci pribadi</string> <string name="pubkey_copy_public">Salin kunci publik</string> <string name="pubkey_list_empty">Sentuh Menu untuk membuat/atau mengimpor pasangan kunci.</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 4558633..174849a 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -21,7 +21,7 @@ <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> <string name="pubkey_touch_hint">Til þess að tryggja handahófs kenndan lykil, færðu fingurinn á þér handahófskennt yfir kassann að neðan.</string> - <string name="pubkey_generating">Framkalla lykla par...</string> + <string name="pubkey_generating">Framkalla lykla par…</string> <string name="pubkey_copy_private">Afrita einka lykil</string> <string name="pubkey_copy_public">Afrita almennan lykil</string> <string name="pubkey_list_empty">Ýttu á \"Menu\" til þess að búa til\neða fluttu inn lykla par.</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 22a4715..4456460 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">Raccolta entropia</string> <string name="pubkey_touch_prompt">Tocca questo riquadro per raccogliere informazioni casuali: %1$d%% fatto</string> <string name="pubkey_touch_hint">Per poter assicurare una sorgente di casualità durante la generazione della chiave, muovere le dita casualmente sul riquadro sottostante.</string> - <string name="pubkey_generating">La coppia di chiavi viene generata...</string> + <string name="pubkey_generating">La coppia di chiavi viene generata…</string> <string name="pubkey_copy_private">Copia chiave privata</string> <string name="pubkey_copy_public">Copia chiave pubblica</string> <string name="pubkey_list_empty">Seleziona Menu per creare\no importare chiavi.</string> diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index f4f06dd..b44efa8 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">エントロピー収集中</string> <string name="pubkey_touch_prompt">この四角内をランダムに触ってください: %1$d%% 完了</string> <string name="pubkey_touch_hint">鍵作成時のランダムさを保証するため、下の四角内で指をランダムに動かしてください。</string> - <string name="pubkey_generating">鍵ペアを生成しています...</string> + <string name="pubkey_generating">鍵ペアを生成しています……</string> <string name="pubkey_copy_private">秘密鍵をコピー</string> <string name="pubkey_copy_public">公開鍵をコピー</string> <string name="pubkey_list_empty">Menuボタンを押して鍵の作成またはインポートを行ってください。</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index ae84a1a..54d7d30 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -21,7 +21,7 @@ <string name="pubkey_gather_entropy">엔트로피 수집 중</string> <string name="pubkey_touch_prompt">이 사각형의 랜덤으로 터치하세요: %1$d%% 완료</string> <string name="pubkey_touch_hint">키 생성시 랜덤을 보장하기 위해 아래의 사각형 안에서 손가락을 랜덤으로 이동하십시오.</string> - <string name="pubkey_generating">키 쌍 생성 중...</string> + <string name="pubkey_generating">키 쌍 생성 중…</string> <string name="pubkey_copy_private">개인 키 복사</string> <string name="pubkey_copy_public">공개 키 복사</string> <string name="pubkey_list_empty">메뉴 버튼을 눌러 키 쌍을\n만들거나 가져 옵니다.</string> diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index f29fca6..50ce19e 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Beveg fingeren over boksen nedenfor for å sikre vilkårlighet ved generering av nøkkel.</string> - <string name="pubkey_generating">Genererer nøkkelpar...</string> + <string name="pubkey_generating">Genererer nøkkelpar…</string> <string name="pubkey_copy_private">Kopier privat nøkkel</string> <string name="pubkey_copy_public">Kopier offentlig nøkkel</string> <string name="pubkey_list_empty">Trykk \"Meny\" for å opprette\neller importere nøkkelpar.</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index ac9125b..1488b3a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Beweeg je vinger in willekeurige volgorde over het vak beneden om er voor te zorgen dat de invoer willekeurig blijft.</string> - <string name="pubkey_generating">Genereren van een sleutel paar...</string> + <string name="pubkey_generating">Genereren van een sleutel paar…</string> <string name="pubkey_copy_private">Kopieer privé sleutel</string> <string name="pubkey_copy_public">Kopieer publieke sleutel</string> <string name="pubkey_list_empty">Tik op Menu om te maken\nof importeer sleutel paren.</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index f370ad5..37c92f4 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -23,7 +23,7 @@ <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> <string name="pubkey_touch_hint">Dla niepowtarzalności klucza, poruszaj losowo palcem po polu poniżej.</string> - <string name="pubkey_generating">Generowanie pary kluczy...</string> + <string name="pubkey_generating">Generowanie pary kluczy…</string> <string name="pubkey_copy_private">Kopiuj klucz prywatny</string> <string name="pubkey_copy_public">Kopiuj klucz publiczny</string> <string name="pubkey_list_empty">Naciśnij \"Menu\", by utworzyć\nlub zaimportować parę kluczy.</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index de8ed75..7aadeaa 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">Ajustando sensibilidade</string> <string name="pubkey_touch_prompt">Toque na caixa para testar sensibilidade: %1$d%% pronto</string> <string name="pubkey_touch_hint">Para garantir aleatoriedade durante a geração da chave, mova seu dedo aleatoriamente na caixa abaixo.</string> - <string name="pubkey_generating">Gerando par de chaves...</string> + <string name="pubkey_generating">Gerando par de chaves…</string> <string name="pubkey_copy_private">Copiar chave privada</string> <string name="pubkey_copy_public">Copiar chave pública</string> <string name="pubkey_list_empty">Pressione Menu para criar ou importar pares de chaves.</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 2581c39..b98b798 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Pentru a va asigura un grad inalt de stocasticitate in timpul generarii cheii, miscati cat mai aleator degetul in zona de mai jos</string> - <string name="pubkey_generating">Generare cheie ...</string> + <string name="pubkey_generating">Generare cheie …</string> <string name="pubkey_copy_private">Copiaza cheia privata</string> <string name="pubkey_copy_public">Copiaza cheia publica</string> <string name="pubkey_list_empty">Apasa \"Menu\" pentru a crea sau pentru a importa chei.</string> diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 7b91870..47f4aea 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">Pre zabezpečenie náhodnosti počas generovania kľúča pohybujte prstom náhodne po ploche nižšie.</string> - <string name="pubkey_generating">Generujem kľúčový pár...</string> + <string name="pubkey_generating">Generujem kľúčový pár…</string> <string name="pubkey_copy_private">Kopírovať súkromný kľúč</string> <string name="pubkey_copy_public">Kopírovať verejný kľúč</string> <string name="pubkey_list_empty">Ťukni na Menu pre vytvorenie\nalebo importovanie páru kľúčov.</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index d499a5d..887cc24 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">Сакупљам ентропију</string> <string name="pubkey_touch_prompt">Додирните овде да бисте сакупили ентропију: %1$d%% завршено</string> <string name="pubkey_touch_hint">Да бисте осигурали насумичност током генерисања кључа, померајте прст насумично преко поља испод.</string> - <string name="pubkey_generating">Генеришем пар кључева...</string> + <string name="pubkey_generating">Генеришем пар кључева…</string> <string name="pubkey_copy_private">Копирај приватни кључ</string> <string name="pubkey_copy_public">Копирај јавни кључ</string> <string name="pubkey_list_empty">Тапните „Мени“ да бисте направили \nили увезли пар кључева.</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 063d586..5151a14 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -22,7 +22,7 @@ <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> <string name="pubkey_touch_hint">För att försäkra dig om att nyckeln som skapas är slumpmässig, rör fingret slumpmässigt över skärmen.</string> - <string name="pubkey_generating">Genererar nyckelpar...</string> + <string name="pubkey_generating">Genererar nyckelpar…</string> <string name="pubkey_copy_private">Kopiera privat nyckel</string> <string name="pubkey_copy_public">Kopiera publik nyckel</string> <string name="pubkey_list_empty">Tryck på Meny för att\nskapa eller importera nyckelpar</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 22e2f48..dd9cfed 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -23,7 +23,7 @@ <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> <string name="pubkey_touch_hint">Anahtar oluşturmada gerekli rastgele girdi kaydedebilmemiz için parmağınızı aşağıdaki kutu üzerinde rastgele haraket ettiriniz.</string> - <string name="pubkey_generating">Anahtar çifti oluşturuluyor...</string> + <string name="pubkey_generating">Anahtar çifti oluşturuluyor…</string> <string name="pubkey_copy_private">Özel-anahtarı kopyala</string> <string name="pubkey_copy_public">Umumi-anahtarı kopyala</string> <string name="pubkey_list_empty">Anahtar-çiftini oluşturmak için\nveya dişardan eklemek için \"Menü\"ye dokunun.</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 35b2ab5..2541406 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">正在收集熵</string> <string name="pubkey_touch_prompt">触摸这个方框来收集随机数：%1$d%% 完成</string> <string name="pubkey_touch_hint">请在方框内随机移动手指来生成随机密钥</string> - <string name="pubkey_generating">正在生成密钥对...</string> + <string name="pubkey_generating">正在生成密钥对……</string> <string name="pubkey_copy_private">复制私钥</string> <string name="pubkey_copy_public">复制公钥</string> <string name="pubkey_list_empty">点击\"菜单\"来创建或者导入密钥对</string> diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 59d0e6e..159d1fa 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -23,7 +23,7 @@ <string name="pubkey_gather_entropy">正在收集用戶熵</string> <string name="pubkey_touch_prompt">觸摸此方框來收集隨機數：%1$d％完成</string> <string name="pubkey_touch_hint">由於金鑰產生的時候需要隨機資訊，請在下面的方框中隨意移動您的手指。</string> - <string name="pubkey_generating">正在產生金鑰對...</string> + <string name="pubkey_generating">正在產生金鑰對……</string> <string name="pubkey_copy_private">複製私鑰</string> <string name="pubkey_copy_public">複製公鑰</string> <string name="pubkey_list_empty">按「選單」鍵來產生\n或匯入金鑰對。</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7d351a4..67f478d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,7 +18,8 @@ */ --> -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" + xmlns:tools="http://schemas.android.com/tools"> <!-- Summary of what ConnectBot is; used as a short description in the Android running apps list --> <string name="app_desc">"Simple, powerful, open-source SSH client."</string> @@ -59,7 +60,7 @@ <string name="pubkey_gather_entropy">"Gathering Entropy"</string> <string name="pubkey_touch_prompt">"Touch this box to gather randomness: %1$d%% done"</string> <string name="pubkey_touch_hint">"In order to assure randomness during the key generation, move your finger randomly over the box below."</string> - <string name="pubkey_generating">"Generating key pair..."</string> + <string name="pubkey_generating">"Generating key pair…"</string> <string name="pubkey_copy_private">"Copy private key"</string> <string name="pubkey_copy_public">"Copy public key"</string> <!-- Note that the '\n' just splits lines, so it's actually "create or import" --> @@ -424,6 +425,10 @@ <string name="delete_pos">"Yes, delete"</string> <string name="delete_neg">"Cancel"</string> + <string name="disconnect_all_message">"Are you sure you want to disconnect from all connected hosts?"</string> + <string name="disconnect_all_pos">"Yes, disconnect"</string> + <string name="disconnect_all_neg">"Cancel"</string> + <!-- Button to agree to license terms. --> <string name="wizard_agree">"Agree"</string> <!-- Button to go to the next page in the first time start-up wizard. --> @@ -435,7 +440,7 @@ <!-- Displayed in terminal when attempting to connect to a host. The first two variables are host:port and the third is the protocol (e.g., SSH) --> - <string name="terminal_connecting">"Connecting to %1$s:%2$d via %3$s"</string> + <string name="terminal_connecting" tools:ignore="PluralsCandidate">"Connecting to %1$s:%2$d via %3$s"</string> <!-- Displays the host key to the user in the terminal --> <string name="terminal_sucess">"Verified host '%1$s' key: %2$s"</string> |