diff options
| author | Teddy <[email protected]> | 2013-08-27 08:48:13 +0800 |
|---|---|---|
| committer | Teddy <[email protected]> | 2013-08-27 08:48:13 +0800 |
| commit | 3849201b28bc38bb8b42574bdf847dd7a5ce8aa7 (patch) | |
| tree | 922a19e548553fb500252e131c6b2745eeca7648 /client/Piztor/res | |
| parent | ae935e1c38c7ffe662fa3381b0a5bd8b91c72b49 (diff) | |
| parent | 0cfa72f9f352a81ff40ce41d2a94aa4f63d3a815 (diff) | |
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/res')
| -rw-r--r-- | client/Piztor/res/layout/login_bottom.xml | 13 | ||||
| -rw-r--r-- | client/Piztor/res/values/strings.xml | 2 |
2 files changed, 1 insertions, 14 deletions
diff --git a/client/Piztor/res/layout/login_bottom.xml b/client/Piztor/res/layout/login_bottom.xml deleted file mode 100644 index e268c39..0000000 --- a/client/Piztor/res/layout/login_bottom.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="200dip" - android:orientation="horizontal" - android:background="@drawable/footbar_background" > - - <ImageView - android:layout_width="fill_parent" - android:layout_height="120dip" - android:src="@drawable/bottom_img"/> - -</LinearLayout> diff --git a/client/Piztor/res/values/strings.xml b/client/Piztor/res/values/strings.xml index 5a5ccc4..4268ca1 100644 --- a/client/Piztor/res/values/strings.xml +++ b/client/Piztor/res/values/strings.xml @@ -16,6 +16,6 @@ <string name="mine">Mine</string> <string name="title_activity_login">Login</string> <string name="title_activity_main">Main</string> - <string name="title_activity_setting">Setting</string> + <string name="title_activity_settings">Settings</string> </resources> |