diff options
author | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
---|---|---|
committer | goblin911 <[email protected]> | 2013-08-25 21:16:45 +0800 |
commit | 2efdc2f20f0306791ced5ec78a1acddfaf086f42 (patch) | |
tree | a85f2b32d6e6da9d7329ab975fea3bd79e1b94b6 /client/res/values/strings.xml | |
parent | e5599da7fdd344fdcb49e8d6780a1e2ad358ee2d (diff) | |
parent | 263967cbb477983ae8680b431c1d93f102971c30 (diff) |
Merge branch 'master' of https://github.com/Determinant/piztor
Conflicts:
client/Piztor/bin/classes/com/macaroon/piztor/ActMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/AppMgr.class
client/Piztor/bin/classes/com/macaroon/piztor/R$drawable.class
client/Piztor/bin/classes/com/macaroon/piztor/R$id.class
client/Piztor/bin/classes/com/macaroon/piztor/R$layout.class
client/Piztor/bin/classes/com/macaroon/piztor/R$menu.class
client/Piztor/bin/classes/com/macaroon/piztor/R$string.class
client/Piztor/gen/com/macaroon/piztor/R.java
client/Piztor/res/values/strings.xml
client/bin/classes/com/macaroon/piztor/ActStatus.class
client/bin/classes/com/macaroon/piztor/EmptyStatus.class
client/bin/classes/com/macaroon/piztor/Setting.class
client/src/com/macaroon/piztor/AppMgr.java
client/src/com/macaroon/piztor/Setting.java
Diffstat (limited to 'client/res/values/strings.xml')
-rw-r--r-- | client/res/values/strings.xml | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/client/res/values/strings.xml b/client/res/values/strings.xml new file mode 100644 index 0000000..5a5ccc4 --- /dev/null +++ b/client/res/values/strings.xml @@ -0,0 +1,21 @@ +<resources> + + <string name="app_name">piztor</string> + <string name="action_settings">Settings</string> + <string name="hello_world">Hello world!</string> + <string name="settings">Settings</string> + <string name="search">Search</string> + <string name="fetch">Fetch</string> + <string name="checkin">Checkin</string> + <string name="focus">Focus</string> + <string name="show_sex">Show sex: </string> + <string name="male">Male</string> + <string name="female">Female</string> + <string name="show_team">Show team: </string> + <string name="all">All</string> + <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> + +</resources> |