From dcc37a1f6ff34021cbca72bad9c49586f9e6c14b Mon Sep 17 00:00:00 2001
From: Kenny Root <kenny@the-b.org>
Date: Tue, 7 Apr 2009 06:09:11 +0000
Subject: Externalize some strings, fix indentation while I'm at it

---
 res/layout/act_generatepubkey.xml | 247 +++++++++++++++++++++++++-------------
 1 file changed, 162 insertions(+), 85 deletions(-)

(limited to 'res/layout/act_generatepubkey.xml')

diff --git a/res/layout/act_generatepubkey.xml b/res/layout/act_generatepubkey.xml
index 0b0ae5a..b5a5fe6 100644
--- a/res/layout/act_generatepubkey.xml
+++ b/res/layout/act_generatepubkey.xml
@@ -1,90 +1,167 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-	ConnectBot: simple, powerful, open-source SSH client for Android
-	Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey
-	
-	This program is free software: you can redistribute it and/or modify
-	it under the terms of the GNU General Public License as published by
-	the Free Software Foundation, either version 3 of the License, or
-	(at your option) any later version.
-	
-	This program is distributed in the hope that it will be useful,
-	but WITHOUT ANY WARRANTY; without even the implied warranty of
-	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-	GNU General Public License for more details.
-	
-	You should have received a copy of the GNU General Public License
-	along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    ConnectBot: simple, powerful, open-source SSH client for Android
+    Copyright (C) 2007-2008 Kenny Root, Jeffrey Sharkey This program
+    is free software: you can redistribute it and/or modify it under
+    the terms of the GNU General Public License as published by the
+    Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version. This program is distributed
+    in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+    without even the implied warranty of MERCHANTABILITY or FITNESS
+    FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+    more details. You should have received a copy of the GNU General
+    Public License along with this program. If not, see
+    <http://www.gnu.org/licenses/>.
 -->
 
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_height="wrap_content"
-	android:scrollbars="vertical" android:layout_width="fill_parent">
-	
-	<TableLayout
-		android:orientation="vertical"
-		android:layout_height="wrap_content"
-		android:paddingLeft="10dip"
-		android:paddingRight="10dip"
-		android:scrollbars="vertical" android:layout_width="fill_parent">
-			
-		<TableRow>
-			<TextView android:text="Nickname:" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
-			<EditText android:id="@+id/nickname" android:hint="My work key" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1"/>
-		</TableRow>
-	
-		<TableRow>
-			<TextView android:text="Type:" android:paddingRight="10dip" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="bottom|right" android:layout_gravity="center_vertical"/>
-			<RadioGroup
-				android:id="@+id/key_type"
-				android:layout_width="wrap_content"
-				android:layout_height="wrap_content"
-				android:orientation="horizontal"
-				android:checkedButton="@+id/rsa">
-			
-				<RadioButton
-					android:id="@+id/rsa"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="RSA"
-					android:paddingRight="30dip"
-					/>
-			
-				<RadioButton
-					android:id="@+id/dsa"
-					android:layout_width="wrap_content"
-					android:layout_height="wrap_content"
-					android:text="DSA"
-					/>
-	
-			</RadioGroup>
-		</TableRow>
-		
-		<TableRow>
-			<TextView android:text="Bits:" android:paddingRight="10dip" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="right|center_vertical" />
-			<EditText android:id="@+id/bits" android:layout_height="wrap_content" android:text="1024" android:numeric="integer" android:singleLine="true" android:layout_weight="1"/>
-		</TableRow>
-		
-		<SeekBar android:layout_height="wrap_content" android:id="@+id/bits_slider" android:layout_width="fill_parent" android:paddingBottom="10dip" android:max="3328" android:progress="256"/>
-	
-		<TextView android:text="Note: password can be blank" android:gravity="left" android:layout_height="wrap_content" android:layout_width="wrap_content" />
-	
-		<TableRow>
-			<TextView android:paddingRight="10dip" android:gravity="right|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:text="Password:" />
-			<EditText android:id="@+id/password1" android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:singleLine="true" android:layout_weight="1"/>
-		</TableRow>
-		
-		<TableRow>
-			<LinearLayout android:paddingRight="10dip" android:orientation="vertical" android:gravity="right|center_vertical" >
-				<TextView android:gravity="right|bottom" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:text="Password:" />
-				<TextView android:gravity="right|top" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceSmall" android:text="(again)" />
-			</LinearLayout>
-			<EditText android:id="@+id/password2" android:layout_width="wrap_content" android:layout_height="wrap_content" android:password="true" android:singleLine="true" android:layout_weight="1"/>
-		</TableRow>
-		
-		<CheckBox android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/unlock_at_startup" android:text="Unlock when ConnectBot starts"/>
-		
-	    <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:id="@+id/save" android:text="Save" android:enabled="false"/>
-	
-	</TableLayout>
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_height="wrap_content"
+    android:scrollbars="vertical"
+    android:layout_width="fill_parent">
+
+    <TableLayout
+        android:orientation="vertical"
+        android:layout_height="wrap_content"
+        android:paddingLeft="10dip"
+        android:paddingRight="10dip"
+        android:scrollbars="vertical"
+        android:layout_width="fill_parent">
+
+        <TableRow>
+            <TextView
+                android:text="@string/prompt_nickname"
+                android:paddingRight="10dip"
+                android:gravity="right|center_vertical"
+                android:textAppearance="?android:attr/textAppearanceMedium" />
+
+            <EditText
+                android:id="@+id/nickname"
+                android:hint="@string/prompt_nickname_hint_pubkey"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:layout_weight="1" />
+        </TableRow>
+
+        <TableRow>
+            <TextView
+                android:text="@string/prompt_type"
+                android:paddingRight="10dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:gravity="bottom|right"
+                android:layout_gravity="center_vertical" />
+
+            <RadioGroup
+                android:id="@+id/key_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                android:checkedButton="@+id/rsa">
+
+                <RadioButton
+                    android:id="@+id/rsa"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="RSA"
+                    android:paddingRight="30dip" />
+
+                <RadioButton
+                    android:id="@+id/dsa"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="DSA" />
+            </RadioGroup>
+        </TableRow>
+
+        <TableRow>
+            <TextView
+                android:text="@string/prompt_bits"
+                android:paddingRight="10dip"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:gravity="right|center_vertical" />
+
+            <EditText
+                android:id="@+id/bits"
+                android:layout_height="wrap_content"
+                android:text="1024"
+                android:numeric="integer"
+                android:singleLine="true"
+                android:layout_weight="1" />
+        </TableRow>
+
+        <SeekBar
+            android:layout_height="wrap_content"
+            android:id="@+id/bits_slider"
+            android:layout_width="fill_parent"
+            android:paddingBottom="10dip"
+            android:max="3328"
+            android:progress="256" />
+
+        <TextView
+            android:text="@string/prompt_password_can_be_blank"
+            android:gravity="left"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content" />
+
+        <TableRow>
+            <TextView
+                android:paddingRight="10dip"
+                android:gravity="right|center_vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/prompt_password" />
+
+            <EditText
+                android:id="@+id/password1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:password="true"
+                android:singleLine="true"
+                android:layout_weight="1" />
+        </TableRow>
+
+        <TableRow>
+            <LinearLayout
+                android:paddingRight="10dip"
+                android:orientation="vertical"
+                android:gravity="right|center_vertical">
+
+                <TextView
+                    android:gravity="right|bottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:text="@string/prompt_password" />
+
+                <TextView
+                    android:gravity="right|top"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:text="@string/prompt_again" />
+            </LinearLayout>
+
+            <EditText
+                android:id="@+id/password2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:password="true"
+                android:singleLine="true"
+                android:layout_weight="1" />
+        </TableRow>
+
+        <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/unlock_at_startup"
+            android:text="@string/pubkey_load_on_start" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/save"
+            android:text="@string/pubkey_generate"
+            android:enabled="false" />
+    </TableLayout>
 </ScrollView>
\ No newline at end of file
-- 
cgit v1.2.3