diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-21 01:03:45 -0700 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-10-21 01:03:45 -0700 |
| commit | 5e43d1ea5436af16f227a98fee495f707c885a96 (patch) | |
| tree | 072b13f104cf2da87db80b0a6b78214139ae0618 /res/layout | |
| parent | f49967fb3f24bf0a22d09b5823bd174a45e758f7 (diff) | |
| parent | f21030aacec6b7f36ea1b8adc86769e3f0b8a9ad (diff) | |
Merge branch 'release-0.2.1'0.2.1
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/about.xml | 2 | ||||
| -rw-r--r-- | res/layout/basic_settings.xml | 2 | ||||
| -rw-r--r-- | res/layout/log_in_dialog.xml | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/res/layout/about.xml b/res/layout/about.xml index 74835d1e..40a15794 100644 --- a/res/layout/about.xml +++ b/res/layout/about.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:autoLink="all" - android:text="@string/copyright_guicode" /> + android:text="@string/repository_url_text" /> <TextView android:id="@+id/translation" diff --git a/res/layout/basic_settings.xml b/res/layout/basic_settings.xml index b71ae664..542de365 100644 --- a/res/layout/basic_settings.xml +++ b/res/layout/basic_settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:leap="http://schemas.android.com/apk/res/se.leap.leapclient" + xmlns:leap="http://schemas.android.com/apk/res/se.leap.bitmaskclient" android:layout_width="wrap_content" android:layout_height="wrap_content" > diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml index 4c9fdbad..3a9eebb8 100644 --- a/res/layout/log_in_dialog.xml +++ b/res/layout/log_in_dialog.xml @@ -22,7 +22,7 @@ android:layout_marginRight="4dp" android:layout_marginTop="16dp" android:ems="10" - android:hint="@string/username_ask" + android:hint="@string/username_hint" android:inputType="textUri" > <requestFocus /> @@ -33,7 +33,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ems="10" - android:hint="@string/password_ask" + android:hint="@string/password_hint" android:inputType="textPassword" /> </LinearLayout>
\ No newline at end of file |