Merge branch 'release/1.0.2'

Android/EasyBudget/app/build.gradle

@@ -42,8 +42,8 @@ android {
         applicationId "com.benoitletondor.easybudgetapp"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 21
-        versionName "1.0.1"
+        versionCode 22
+        versionName "1.0.2"
     }
     buildTypes {
         debug {

Android/EasyBudget/app/src/main/res/layout/fragment_onboarding3.xml

@@ -30,7 +30,7 @@
     <ScrollView android:id="@+id/onboarding_screen_3_top_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="95dp">
+        android:layout_marginBottom="135dp">
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -54,10 +54,20 @@
                 android:textColor="@android:color/white"
                 android:gravity="center_horizontal" />
 
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="40dp"
+                android:text="@string/onboarding_screen_3_psst"
+                android:textStyle="italic|bold"
+                android:layout_marginTop="20dp"
+                android:textColor="@android:color/white"
+                android:maxLines="2"
+                android:ellipsize="end" />
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                android:layout_marginTop="20dp"
                 android:orientation="horizontal"
                 android:maxWidth="300dp"
                 android:layout_marginLeft="60dp"

Android/EasyBudget/app/src/main/res/values-de/strings.xml

@@ -152,6 +152,7 @@
     <string name="onboarding_screen_3_title">Lernen wir uns kennen!</string>
     <string name="onboarding_screen_3_message">Schritt 2: Wie viel haben Sie aktuell auf Ihrem Konto?\n(Sie können das später ändern)</string>
     <string name="onboarding_screen_3_cta">Mit %s beginnen</string>
+    <string name="onboarding_screen_3_psst">Psst: Aus Gründen der Einfachheit können Sie keine Zahlen mit Nachkommastellen verwenden.</string>
 
     <string name="onboarding_screen_4_title">Fertig!</string>
     <string name="onboarding_screen_4_message">(Das war einfach, oder?)</string>

Android/EasyBudget/app/src/main/res/values-es/strings.xml

@@ -152,6 +152,7 @@
     <string name="onboarding_screen_3_title">¡Empecemos!</string>
     <string name="onboarding_screen_3_message">Paso 2: ¿Cuánto dinero tienes en tu cuenta?\n(puedes modificar el monto después)</string>
     <string name="onboarding_screen_3_cta">Empezar con %s</string>
+    <string name="onboarding_screen_3_psst">Psst: For simplicity purpose you cannot use comma and enter floating point numbers.</string>
 
     <string name="onboarding_screen_4_title">¡Ya está!</string>
     <string name="onboarding_screen_4_message">(Ha sido fácil, ¿verdad?)</string>

Android/EasyBudget/app/src/main/res/values-fr/strings.xml

@@ -152,6 +152,7 @@
     <string name="onboarding_screen_3_title">Faisons connaissance !</string>
     <string name="onboarding_screen_3_message">Étape 2 : Combien avez-vous actuellement sur votre compte ?\n(Vous pouvez le changer plus tard)</string>
     <string name="onboarding_screen_3_cta">Démarrer avec %s</string>
+    <string name="onboarding_screen_3_psst">Psst : Pour faire au plus simple, vous ne pouvez pas entrer de nombres à virgule.</string>
 
     <string name="onboarding_screen_4_title">C\'est tout bon !</string>
     <string name="onboarding_screen_4_message">(C\'était facile non ?)</string>

Android/EasyBudget/app/src/main/res/values-it/strings.xml

@@ -152,6 +152,7 @@
     <string name="onboarding_screen_3_title">Presentiamoci!</string>
     <string name="onboarding_screen_3_message">Tappa n° 2: Di quanto disponi attualmente sul tuo conto?\n(Potrai cambiare la cifra più tardi).</string>
     <string name="onboarding_screen_3_cta">Inizia con %s</string>
+    <string name="onboarding_screen_3_psst">Psssss: per ragioni di semplicita, non puoi utilizzare virgole o numeri con la virgola.</string>
 
     <string name="onboarding_screen_4_title">Perfetto!</string>
     <string name="onboarding_screen_4_message">(È stato facile, no?)</string>

Android/EasyBudget/app/src/main/res/values-pt/strings.xml

@@ -152,6 +152,7 @@
     <string name="onboarding_screen_3_title">Vamos nos conhecer!</string>
     <string name="onboarding_screen_3_message">Passo 2: Quanto você tem atualmente em sua conta?\n(Você pode mudar mais tarde)</string>
     <string name="onboarding_screen_3_cta">Começar com %s</string>
+    <string name="onboarding_screen_3_psst">Psiu: por motivos de simplicidade, você não pode usar virgulas e inserer números de ponto fluante.</string>
 
     <string name="onboarding_screen_4_title">Tudo pronto!</string>
     <string name="onboarding_screen_4_message">(Foi fácil, não é?)</string>

Android/EasyBudget/app/src/main/res/values/strings.xml

@@ -163,6 +163,7 @@
     <string name="onboarding_screen_3_title">Let\'s get to know each other!</string>
     <string name="onboarding_screen_3_message">Step 2: How much do you currently have on your account?\n(You can set and change it later)</string>
     <string name="onboarding_screen_3_cta">Start with %s</string>
+    <string name="onboarding_screen_3_psst">Psst: For simplicity purpose you cannot use comma and enter floating point numbers.</string>
 
     <string name="onboarding_screen_4_title">All set!</string>
     <string name="onboarding_screen_4_message">(That was easy, huh?)</string>