You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@taverna.apache.org by ia...@apache.org on 2016/08/09 11:23:12 UTC
[26/28] incubator-taverna-mobile git commit: remove string.xml error
remove string.xml error
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/76f69d97
Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/76f69d97
Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/76f69d97
Branch: refs/heads/master
Commit: 76f69d974122bdcc4d2ea634983e42b39127fd8b
Parents: e48942f
Author: Sagar <ku...@gmail.com>
Authored: Thu Aug 4 14:33:10 2016 +0530
Committer: Sagar <ku...@gmail.com>
Committed: Thu Aug 4 14:33:10 2016 +0530
----------------------------------------------------------------------
app/src/main/res/layout/fragment_login.xml | 6 +++---
app/src/main/res/values/strings.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/76f69d97/app/src/main/res/layout/fragment_login.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
index df0319a..cbc6ea0 100644
--- a/app/src/main/res/layout/fragment_login.xml
+++ b/app/src/main/res/layout/fragment_login.xml
@@ -65,7 +65,7 @@
android:layout_gravity="center"
android:background="#E1E1E1"
android:padding="10dp"
- android:text="@string/LoginInfo"
+ android:text="@string/logininfo"
android:textSize="20sp"
android:textStyle="normal|bold"
/>
@@ -107,7 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
- android:text="@string/keepLogin"/>
+ android:text="@string/keeplogin"/>
<Button
android:id="@+id/bLogin"
@@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/colorPrimary"
- android:contentDescription="@string/bLoginDescription"
+ android:contentDescription="@string/login_button_description"
android:text="@string/bLogin"
android:textSize="18sp"/>
http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/76f69d97/app/src/main/res/values/strings.xml
----------------------------------------------------------------------
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b13e728..590d1fe 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -28,7 +28,7 @@ limitations under the License.
<item>Date Last Run</item>
</array>
<string name="hello_blank_fragment"> About Workflow </string>
- <string name="LoginInfo">MyExperiment Login</string>
+ <string name="logininfo">MyExperiment Login</string>
<string name="loginusername">Email or Username</string>
<string name="loginpassword">Password</string>
<string name="bLogin">Login</string>
@@ -80,7 +80,7 @@ limitations under the License.
<string name="loading">Loading details</string>
<string name="loadworkflows">Loading Workflows</string>
<string name="fetchrun">Fetching run components </string>
- <string name="keepLogin">Remain Logged-in</string>
+ <string name="keeplogin">Remain Logged-in</string>
<string name="emailerr">Username must not be empty</string>
<string name="passworderr">Password must not be empty</string>
@@ -116,7 +116,7 @@ limitations under the License.
<string name="image_zoom">Image Zoom</string>
<string name="hint_email">Email or Username</string>
<string name="hint_password">Password</string>
- <string name="bLoginDescription">Login Button</string>
+ <string name="login_button_description">Login Button</string>
<string name="err_login_email">Enter valid email</string>
<string name="err_login_password">Enter valid password</string>
</resources>