Merge branch 'dev'

app/src/main/java/net/pokeranalytics/android/ui/adapter/ComparisonChartPagerAdapter.kt

@@ -34,9 +34,9 @@ class ComparisonChartPagerAdapter(val context: Context, fragmentManager: Fragmen
 
 	override fun getPageTitle(position: Int): CharSequence? {
 		return when(position) {
-			0 -> context.getString(R.string.bar)
+			0 -> context.getString(R.string.bars)
-			1 -> context.getString(R.string.line)
+			1 -> context.getString(R.string.lines)
-			2-> context.getString(R.string.table)
+			2-> context.getString(R.string.data_table)
 			else -> super.getPageTitle(position)
 		}
 	}

app/src/main/java/net/pokeranalytics/android/ui/adapter/ReportPagerAdapter.kt

@@ -43,8 +43,8 @@ class ReportPagerAdapter(val context: Context, val fragmentManager: FragmentMana
 
 	override fun getPageTitle(position: Int): CharSequence? {
 		return when(position) {
-			0 -> context.getString(R.string.bar)
+			0 -> context.getString(R.string.bars)
-			1 -> context.getString(R.string.line)
+			1 -> context.getString(R.string.lines)
 			2 -> context.getString(R.string.table)
 			else -> ""
 		}

app/src/main/java/net/pokeranalytics/android/ui/fragment/BankrollDataFragment.kt

@@ -169,7 +169,7 @@ class BankrollDataFragment : EditableDataFragment(), StaticRowRepresentableDataS
 		rows.clear()
 		rows.add(SimpleRow.NAME)
 		rows.add(BankrollRow.LIVE)
-		rows.add(BankrollRow.INITIAL_VALUE)
+//		rows.add(BankrollRow.INITIAL_VALUE)
 		rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.currency))
 		rows.add(BankrollRow.CURRENCY)
 		if (this.shouldShowCurrencyRate) {

app/src/main/res/layout/fragment_report_details.xml

@@ -32,13 +32,13 @@
 				android:id="@+id/tabBar"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/bar" />
+				android:text="@string/bars" />
 
 			<com.google.android.material.tabs.TabItem
 				android:id="@+id/tabLine"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:text="@string/line" />
+				android:text="@string/lines" />
 
 			<com.google.android.material.tabs.TabItem
 				android:id="@+id/tabTable"

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

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">Mit diesen Bankroll sind ein oder mehrere Sitzungen verknüpft&#8230; Bitte löschen Sie zunächst die verknüpfte Sitzung(en).</string>
 	<string name="bankroll_variation">Spielkapitalvariante</string>
 	<string name="bankrolls">Bankrolls</string>
-	<string name="bar">Balken</string>
+	<string name="bars">Balken</string>
 	<string name="bar_short">Balken</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">Standardabweichung bei BB</string>

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

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">Hay una o más sesiones asociadas a este bankroll. Primero debes eliminar la sesión o sesiones asociadas</string>
 	<string name="bankroll_variation">Variación del bankroll</string>
 	<string name="bankrolls">Bankrolls</string>
-	<string name="bar">Barra</string>
+	<string name="bars">Barra</string>
 	<string name="bar_short">Barra</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">Desviación estándar en BB</string>

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

@@ -1,6 +1,15 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
+	<string name="session_missing_start_date">Veuillez définir une date de démarrage pour la session</string>
+	<string name="hour">Heure</string>
+	<string name="minute">Minute</string>
+	<string name="more">Autre</string>
+	<string name="variant">Jeu</string>
+	<string name="lines">Lignes</string>
+	<string name="initial_value">Valeur initiale</string>
+	<string name="less_then_2_values_for_display">Il faut au moins deux valeur pour afficher ce rapport!</string>
+
 	<!-- Not translated -->
 	<string name="address">Adresse</string>
 	<string name="suggestions">Suggestions</string>
@@ -73,7 +82,7 @@
 	<string name="bankroll_relationship_error">Cette bankroll contient au moins une session empêchant la suppression.</string>
 	<string name="bankroll_variation">Variation de bankroll</string>
 	<string name="bankrolls">Bankrolls</string>
-	<string name="bar">Histogramme</string>
+	<string name="bars">Bâtons</string>
 	<string name="bar_short">Barre</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">Ecart type en BB</string>
@@ -171,7 +180,7 @@
 	<string name="empty_response_from_store">Aucune réponse du store, veuillez réessayer</string>
 	<string name="end">Fin</string>
 	<string name="end_all_the_games_validation_popup_title">Voulez-vous terminer toutes les parties ?</string>
-	<string name="end_date">Date de fin</string>
+	<string name="end_date">Fin</string>
 	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La date de fin n\'a pas été détecté ! Le format n\'est peut-être pas correct, voici la valeur utilisé pour l\'import: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Fin de la période de recaves et augmentation des blindes</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">Fin de la période de recave dans moins d\'une minute</string>

app/src/main/res/values-hi/strings.xml

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">इस बैंकरोल के साथ एक या अधिक सत्र जुड़ हुए हैं, कृपया पहले लिंक हुए सत्र(त्रों) को हटाएं.</string>
 	<string name="bankroll_variation">बैंकरोल बदलाव</string>
 	<string name="bankrolls">बैंकरोल</string>
-	<string name="bar">बार</string>
+	<string name="bars">बार</string>
 	<string name="bar_short">बार</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">BB में मानक भिन्नता</string>

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

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">Una o più sessioni sono associate a questo bankroll, elimina prima le sessioni collegate.</string>
 	<string name="bankroll_variation">Variazione bankroll</string>
 	<string name="bankrolls">Bankroll</string>
-	<string name="bar">Barra</string>
+	<string name="bars">Barra</string>
 	<string name="bar_short">Barra</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">Deviazione standard in BB</string>

app/src/main/res/values-ja/strings.xml

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">ひとつ以上のセッションがバンクロールに関連付けされています。最初に、リンク済みセッションを削除してください。</string>
 	<string name="bankroll_variation">バンクロール バリエーション</string>
 	<string name="bankrolls">バンクロール</string>
-	<string name="bar">バー</string>
+	<string name="bars">バー</string>
 	<string name="bar_short">バー</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">標準偏差 (BB)</string>

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

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">Uma ou mais sessões estão associadas a este cacife, exclua essas sessões primeiro.</string>
 	<string name="bankroll_variation">Variação do cacife</string>
 	<string name="bankrolls">Cacifes</string>
-	<string name="bar">Barras</string>
+	<string name="bars">Barras</string>
 	<string name="bar_short">Barra</string>
 	<string name="bb">BB</string>
 	<string name="bb_standard_deviation">Desvio padrão no BB</string>

app/src/main/res/values-ru/strings.xml

@@ -56,7 +56,7 @@
 	<string name="bankroll_relationship_error">Одна или несколько сессий используют этот банкролл. Пожалуйста удалите сначала все связанные с этим банкроллом записи.</string>
 	<string name="bankroll_variation">Колебания банкролла</string>
 	<string name="bankrolls">Банкроллы</string>
-	<string name="bar">Плитки</string>
+	<string name="bars">Плитки</string>
 	<string name="bar_short">Плитки</string>
 	<string name="bb">ББ</string>
 	<string name="bb_standard_deviation">Стандартное отклонение в ББ</string>

app/src/main/res/values-zh/strings.xml

@@ -47,7 +47,7 @@
 	<string name="bankroll">资金</string>
 	<string name="bankroll_relationship_error"> 1个或多个进程与此资金关联…请先删除其链接进程。</string>
 	<string name="bankrolls">资金</string>
-	<string name="bar">条形</string>
+	<string name="bars">条形</string>
 	<string name="bar_short">条形</string>
 	<string name="bb">大盲注</string>
 	<string name="bb_standard_deviation">大盲注标准偏差</string>

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

@@ -7,7 +7,7 @@
     <string name="minute">Minute</string>
     <string name="more">More</string>
     <string name="variant">Variant</string>
-    <string name="line">Line</string>
+    <string name="lines">Lines</string>
     <string name="initial_value">Initial Value</string>
     <string name="less_then_2_values_for_display">Can\'t show because there is less than two values to display!</string>
     <!--<string name="session_missing_end_date">Please set the end date for the session</string>-->
@@ -85,7 +85,7 @@
     <string name="bankroll_relationship_error">One or more sessions are associated with this bankroll, please delete the linked session(s) first.</string>
     <string name="bankroll_variation">Bankroll variation</string>
     <string name="bankrolls">Bankrolls</string>
-    <string name="bar">Bar</string>
+    <string name="bars">Bars</string>
     <string name="bar_short">Bar</string>
     <string name="bb">BB</string>
     <string name="bb_standard_deviation">Standard deviation in BB</string>