[tx-robot] updated from transifex

[pub/Android/ownCloud.git] / res / layout / generic_explanation.xml

diff --git a/res/layout/generic_explanation.xml b/res/layout/generic_explanation.xml
index fd2d05b..e684397 100644 (file)
--- a/res/layout/generic_explanation.xml
+++ b/res/layout/generic_explanation.xml
@@ -2,7 +2,7 @@
 <!-- 
   ownCloud Android client application
 
 <!-- 
   ownCloud Android client application
 

-  Copyright (C) 2012-2013 ownCloud Inc.
+  Copyright (C) 2015 ownCloud Inc.

 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,
 
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License version 2,


@@ -30,7 +30,7 @@
                android:layout_weight="2"
            android:padding="10dip"
            android:scrollbarAlwaysDrawVerticalTrack="true"
                android:layout_weight="2"
            android:padding="10dip"
            android:scrollbarAlwaysDrawVerticalTrack="true"

-               android:text="@string/text_placeholder" 
+               android:text="@string/placeholder_sentence" 

                />
     
        <ListView 
                />
     
        <ListView 


@@ -48,14 +48,14 @@
         android:gravity="center"
         android:orientation="horizontal" >
 
         android:gravity="center"
         android:orientation="horizontal" >
 

-               <com.owncloud.android.ui.CustomButton
+               <Button

                    android:id="@+id/ok"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/common_ok" />
                
                    android:id="@+id/ok"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:text="@string/common_ok" />
                

-        <com.owncloud.android.ui.CustomButton
+        <Button

             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/cancel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"