Commit 21713d45 authored by Nastuzzi Samy's avatar Nastuzzi Samy
Browse files

Merge branch 'master' into develop

parents 36b71c75 726acab0
......@@ -48,19 +48,27 @@
</LinearLayout>
<RelativeLayout
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentBottom="true" >
<TextView
android:id="@+id/text_app_registered"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textStyle="italic"
android:layout_margin="10dp"
android:text="@string/app_not_registred" />
</RelativeLayout>
android:id="@+id/text_app_registered"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textStyle="italic"
android:text="@string/app_not_registred" />
<TextView
android:id="@+id/text_author"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/author"
android:layout_marginBottom="10dp"
android:gravity="center" />
</LinearLayout>
</RelativeLayout>
<resources>
<resources>
<string name="app_name">PayUTC</string>
<string name="payutc">PayUTC</string>
<string name="hello">Pour se connecter, clique sur\n le bouton ou scanne ton badge</string>
......@@ -27,6 +27,7 @@
<string name="realized">Réalisé à</string>
<string name="realized_by_other">Réalisé par une autre fondation</string>
<string name="paiement">Paiement</string>
<string name="author">&lt;/&gt; avec ♥ par Samy NASTUZZI</string>
<string name="error_unexpected">Une erreur improbable a eu lieu</string>
<string name="error_view">Une erreur a empêché la création de la vue</string>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment