From baf698b76e67438f7533be9212e50245820d195b Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 09:40:11 +0100
Subject: [PATCH 1/9] Add GDPR Activity & improve email contact

---
 app/src/main/AndroidManifest.xml              |  5 ++
 .../android/ui/activity/GDPRActivity.kt       | 36 ++++++++++
 .../android/ui/fragment/SettingsFragment.kt   | 19 ++++--
 .../android/util/UIExtensions.kt              |  3 +-
 app/src/main/res/layout/activity_gdpr.xml     | 66 +++++++++++++++++++
 5 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/java/net/pokeranalytics/android/ui/activity/GDPRActivity.kt
 create mode 100644 app/src/main/res/layout/activity_gdpr.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 620cdc53..a7bce528 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -41,6 +41,11 @@
 			android:name=".ui.activity.CurrenciesActivity"
 			android:launchMode="singleTop" />
 
+		<activity
+			android:name=".ui.activity.GDPRActivity"
+			android:launchMode="singleTop" />
+
+
 		<meta-data
 			android:name="preloaded_fonts"
 			android:resource="@array/preloaded_fonts" />
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/GDPRActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/GDPRActivity.kt
new file mode 100644
index 00000000..acbaf74e
--- /dev/null
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/GDPRActivity.kt
@@ -0,0 +1,36 @@
+package net.pokeranalytics.android.ui.activity
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import kotlinx.android.synthetic.main.activity_gdpr.*
+import net.pokeranalytics.android.R
+import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
+
+class GDPRActivity : PokerAnalyticsActivity() {
+
+    companion object {
+        fun newInstance(context: Context) {
+            val intent = Intent(context, GDPRActivity::class.java)
+            context.startActivity(intent)
+        }
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_gdpr)
+
+        initUI()
+    }
+
+    /**
+     * Init UI
+     */
+    private fun initUI() {
+
+	    setSupportActionBar(toolbar)
+	    supportActionBar?.setDisplayHomeAsUpEnabled(true)
+
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
index bf2cbf16..cc7ab50a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/SettingsFragment.kt
@@ -1,15 +1,17 @@
 package net.pokeranalytics.android.ui.fragment
 
+import android.content.Intent
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import kotlinx.android.synthetic.main.fragment_settings.*
 import net.pokeranalytics.android.BuildConfig
+import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.CurrenciesActivity
 import net.pokeranalytics.android.ui.activity.DataListActivity
+import net.pokeranalytics.android.ui.activity.GDPRActivity
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
 import net.pokeranalytics.android.ui.adapter.RowRepresentableDelegate
@@ -70,8 +72,8 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 
 		when (row) {
 			SettingRow.RATE_APP -> parentActivity.openPlayStorePage()
-			SettingRow.CONTACT_US -> parentActivity.openContactMail()
-			SettingRow.BUG_REPORT -> Toast.makeText(requireContext(), "Bug report", Toast.LENGTH_SHORT).show()
+			SettingRow.CONTACT_US -> parentActivity.openContactMail(R.string.contact)
+			SettingRow.BUG_REPORT -> parentActivity.openContactMail(R.string.bug_report_subject)
 			SettingRow.CURRENCY -> {
 				CurrenciesActivity.newInstance(requireContext())
 			}
@@ -85,7 +87,7 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 			}
 			SettingRow.PRIVACY_POLICY -> parentActivity.openUrl(URL.PRIVACY_POLICY.value)
 			SettingRow.TERMS_OF_USE -> parentActivity.openUrl(URL.TERMS.value)
-			SettingRow.GDPR -> Toast.makeText(requireContext(), "Show GDPR", Toast.LENGTH_SHORT).show()
+			SettingRow.GDPR -> openGDPRActivity()
 		}
 
 		row.relatedResultsRepresentable?.let {
@@ -111,4 +113,13 @@ class SettingsFragment : PokerAnalyticsFragment(), RowRepresentableDelegate, Sta
 			adapter = settingsAdapterRow
 		}
 	}
+
+	/**
+	 * Open GDPR Activity
+	 */
+	private fun openGDPRActivity() {
+		val intent = Intent(requireContext(), GDPRActivity::class.java)
+		startActivity(intent)
+	}
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt b/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt
index 149449c1..39d7e0c6 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/UIExtensions.kt
@@ -54,10 +54,11 @@ fun PokerAnalyticsActivity.openPlayStorePage() {
 }
 
 // Open email for "Contact us"
-fun PokerAnalyticsActivity.openContactMail() {
+fun PokerAnalyticsActivity.openContactMail(subjectStringRes: Int) {
 	val info = "v${BuildConfig.VERSION_NAME}(${BuildConfig.VERSION_CODE}), Android ${android.os.Build.VERSION.SDK_INT}"
 	val intent = Intent(Intent.ACTION_SENDTO)
 	intent.data = Uri.parse("mailto:${URL.SUPPORT_EMAIL.value}")
+	intent.putExtra(Intent.EXTRA_SUBJECT, getString(subjectStringRes))
 	intent.putExtra(Intent.EXTRA_EMAIL, URL.SUPPORT_EMAIL.value)
 	intent.putExtra(Intent.EXTRA_TEXT, "\n\n$info")
 	startActivity(Intent.createChooser(intent, getString(R.string.contact)))
diff --git a/app/src/main/res/layout/activity_gdpr.xml b/app/src/main/res/layout/activity_gdpr.xml
new file mode 100644
index 00000000..0f04bf83
--- /dev/null
+++ b/app/src/main/res/layout/activity_gdpr.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+
+	<androidx.core.widget.NestedScrollView
+		android:id="@+id/nestedScrollView"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:fillViewport="true"
+		app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+		<androidx.constraintlayout.widget.ConstraintLayout
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content">
+
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/gdprContent"
+				android:layout_width="0dp"
+				android:layout_height="0dp"
+				style="@style/PokerAnalyticsTheme.TextView"
+				android:textSize="20sp"
+				android:gravity="center|top"
+				android:padding="32dp"
+				android:text="@string/gdpr_policy"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent" />
+
+		</androidx.constraintlayout.widget.ConstraintLayout>
+
+	</androidx.core.widget.NestedScrollView>
+
+	<com.google.android.material.appbar.AppBarLayout
+		android:id="@+id/appBar"
+		android:layout_width="match_parent"
+		android:layout_height="128dp"
+		android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+		<com.google.android.material.appbar.CollapsingToolbarLayout
+			android:id="@+id/collapsingToolbar"
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			app:collapsedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.CollapsedTitleAppearance"
+			app:contentScrim="?attr/colorPrimary"
+			app:expandedTitleGravity="bottom"
+			app:expandedTitleMarginStart="72dp"
+			app:expandedTitleTextAppearance="@style/PokerAnalyticsTheme.Toolbar.ExpandedTitleAppearance"
+			app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+
+			<androidx.appcompat.widget.Toolbar
+				android:id="@+id/toolbar"
+				android:layout_width="match_parent"
+				android:layout_height="?attr/actionBarSize"
+				app:layout_collapseMode="pin"
+				app:title="@string/gdpr"
+				app:titleTextColor="@color/white" />
+
+		</com.google.android.material.appbar.CollapsingToolbarLayout>
+
+	</com.google.android.material.appbar.AppBarLayout>
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file

From c7e3ef1998a34a8e42c732a844125f79ba3bc24c Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 09:54:54 +0100
Subject: [PATCH 2/9] Add empty state for Data List

---
 .../android/ui/fragment/DataListFragment.kt   | 11 +++--------
 .../main/res/layout/fragment_data_list.xml    | 19 +++++++++++++++++++
 app/src/main/res/layout/row_header_title.xml  |  2 +-
 app/src/main/res/values/styles.xml            | 16 +++++-----------
 4 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
index d1e84ba7..b56db260 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/DataListFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.LinearLayoutManager
 import io.realm.Realm
 import io.realm.RealmResults
@@ -43,6 +44,7 @@ class DataListFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSourc
 	override fun onResume() {
 		super.onResume()
 		this.recyclerView?.adapter?.notifyDataSetChanged()
+		noDataFound.isVisible = items.isEmpty()
 	}
 
 	override fun rowRepresentableForPosition(position: Int): RowRepresentable? {
@@ -119,14 +121,7 @@ class DataListFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSourc
 
 		this.dataType.relatedResultsRepresentable?.let {
 			this.items = it.items(realm)
-			/*
-			this.items.addChangeListener { newItems ->
-				Timber.d("addChangeListener: $newItems")
-				Timber.d("addChangeListener: ${this.recyclerView}")
-				Timber.d("addChangeListener: ${this}")
-				this.recyclerView?.adapter?.notifyDataSetChanged()
-			}
-			*/
+			noDataFound.isVisible = this.items.isEmpty()
 		}
 	}
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_data_list.xml b/app/src/main/res/layout/fragment_data_list.xml
index 8aaf3bd3..f393713f 100644
--- a/app/src/main/res/layout/fragment_data_list.xml
+++ b/app/src/main/res/layout/fragment_data_list.xml
@@ -28,6 +28,25 @@
 				app:layout_constraintStart_toStartOf="parent"
 				app:layout_constraintTop_toTopOf="parent" />
 
+			<androidx.appcompat.widget.AppCompatTextView
+				android:id="@+id/noDataFound"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginStart="8dp"
+				android:layout_marginTop="8dp"
+				android:layout_marginEnd="8dp"
+				android:layout_marginBottom="8dp"
+				style="@style/PokerAnalyticsTheme.TextView.Header"
+				android:textSize="24sp"
+				android:text="@string/no_data_found"
+				android:visibility="gone"
+				tools:visibility="visible"
+				app:layout_constraintBottom_toBottomOf="parent"
+				app:layout_constraintEnd_toEndOf="parent"
+				app:layout_constraintStart_toStartOf="parent"
+				app:layout_constraintTop_toTopOf="parent"
+				app:layout_constraintVertical_bias="0.3" />
+
 		</androidx.constraintlayout.widget.ConstraintLayout>
 
 	</androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/row_header_title.xml b/app/src/main/res/layout/row_header_title.xml
index 9427c0db..8ec368d4 100644
--- a/app/src/main/res/layout/row_header_title.xml
+++ b/app/src/main/res/layout/row_header_title.xml
@@ -7,7 +7,7 @@
 
 	<androidx.appcompat.widget.AppCompatTextView
 		android:id="@+id/title"
-		style="@style/PokerAnalyticsTheme.TextView.SessionHeader"
+		style="@style/PokerAnalyticsTheme.TextView.Header"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:layout_marginStart="16dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3c1d7ae5..fadf9e90 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -79,10 +79,11 @@
 	</style>
 
 	<style name="PokerAnalyticsTheme.TextView.Header">
-		<item name="android:textSize">22sp</item>
-		<item name="android:textColor">@color/gray_darker</item>
-		<item name="android:fontFamily">@font/roboto_bold</item>
-		<item name="android:paddingTop">8dp</item>
+		<item name="android:textColor">@color/kaki_medium</item>
+		<item name="android:maxLines">1</item>
+		<item name="android:ellipsize">end</item>
+		<item name="android:fontFamily">@font/roboto_medium</item>
+		<item name="android:textSize">16sp</item>
 	</style>
 
 	<style name="PokerAnalyticsTheme.TextView.RowTitle">
@@ -126,13 +127,6 @@
 	</style>
 
 	<!-- Session Row -->
-	<style name="PokerAnalyticsTheme.TextView.SessionHeader">
-		<item name="android:textColor">@color/kaki_medium</item>
-		<item name="android:maxLines">1</item>
-		<item name="android:ellipsize">end</item>
-		<item name="android:fontFamily">@font/roboto_medium</item>
-		<item name="android:textSize">16sp</item>
-	</style>
 
 	<style name="PokerAnalyticsTheme.TextView.SessionRow">
 		<item name="android:textColor">@color/white</item>

From c92a8b970e7701c3266d70e791ab47e9cbbf1de8 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 10:11:28 +0100
Subject: [PATCH 3/9] Update strings %@ to %s

---
 app/src/main/res/values-de/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-es/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-fr/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-hi/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-it/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-ja/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-pt/strings.xml | 48 ++++++++++++-------------
 app/src/main/res/values-ru/strings.xml | 50 +++++++++++++-------------
 app/src/main/res/values/strings.xml    | 48 ++++++++++++-------------
 9 files changed, 217 insertions(+), 217 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6a405ce7..db0853a4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">vor %@</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ hat keinen Zugriff auf Ihre Kontakte und kann den Namen Ihrer existierenden Freunde nicht abrufen. Sie können über die iPhone-Einstellungen Zugriff gewähren, um \'unbekannter Benutzer\' als Namen zu vermeiden.</string>
+	<string name="_ago">vor %s</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s hat keinen Zugriff auf Ihre Kontakte und kann den Namen Ihrer existierenden Freunde nicht abrufen. Sie können über die iPhone-Einstellungen Zugriff gewähren, um \'unbekannter Benutzer\' als Namen zu vermeiden.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Ein Stern kennzeichnet eine Datei, die in Ihrem iCloud-Konto gespeichert ist.</string>
 	<string name="activate">Aktivieren</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud speichert und hält Ihre Daten auf all Ihren Geräten auf dem Laufenden. Wenn Sie es aktivieren, werden Ihren Daten in iCloud migriert. Es kann einige Zeit dauern, bis ein anderes Gerät auf Ihre Daten zugreifen kann.</string>
@@ -153,7 +153,7 @@
 	<string name="end">Ende</string>
 	<string name="end_all_the_games_validation_popup_title">Möchten Sie alle Spiele beenden?</string>
 	<string name="end_date">Enddatum</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Das Enddatum wurde nicht eingestellt. Das Format ist möglicherweise nicht korrekt. Der für das Parsing verwendete Wert ist: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Das Enddatum wurde nicht eingestellt. Das Format ist möglicherweise nicht korrekt. Der für das Parsing verwendete Wert ist: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Ende der Rückkaufzeit und Blind-Erhöhung</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">Ende der Rückkaufzeit in weniger als einer Minute</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">DAS ENDE DER SITZUNG IST NAH, DRÜCKEN SIE AUF DETAILS, UM IHRE SITZUNG ZU BEENDEN UND ERGEBNISSE EINZUSTELLEN</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">Wählen Sie einen Typ</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">Diese Funktion ist gesperrt und leider haben Sie In-App-Einkäufe deaktiviert. Bitte überprüfen Sie Ihre Einstellungen.</string>
 	<string name="file_directory_creation_error">Import fehlgeschlagen. Einige für den Import verwendete Dateien konnten nicht erstellt werden. Dies liegt möglicherweise am fehlenden Speicherplatz.</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">Die Datei mit dem Namen %@ wurde erfolgreich in Ihrem iCloud-Konto gespeichert.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">Die Datei mit dem Namen %s wurde erfolgreich in Ihrem iCloud-Konto gespeichert.</string>
 	<string name="filter">Filter</string>
 	<string name="filter_selection">Filter aktivieren</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Dieser Filter kann nicht gelöscht werden, da er mit einem oder mehreren Berichten verknüpft ist.</string>
@@ -224,7 +224,7 @@
 	<string name="import_from_address_book">Adressbuch verwenden</string>
 	<string name="import_from_v3">Von Poker Analytics 3 importieren</string>
 	<string name="import_not_successfull">Entdeckte Probleme</string>
-	<string name="import_session_save_error_">Fehler beim Speichern der Sitzungen: %@</string>
+	<string name="import_session_save_error_">Fehler beim Speichern der Sitzungen: %s</string>
 	<string name="import_successfull">Import erfolgreich</string>
 	<string name="imported_session">Importierte Sitzungen</string>
 	<string name="in">In</string>
@@ -252,7 +252,7 @@
 	<string name="live_online_room">Live/Raum</string>
 	<string name="load_from_db">Öffnen&#8230;</string>
 	<string name="location">Standort</string>
-	<string name="location_">Standort: %@,</string>
+	<string name="location_">Standort: %s,</string>
 	<string name="location_empty_field_error">Sie müssen diesem Standort einen Namen geben.</string>
 	<string name="location_not_track">Nicht getrackter Standort</string>
 	<string name="location_track">Getrackter Standort</string>
@@ -352,7 +352,7 @@
 	<string name="players">Spieler</string>
 	<string name="players_count">Spieleranzahl</string>
 	<string name="please_check_if_your_values_are_valid">Bitte überprüfen Sie, ob Ihre Werte gültig sind</string>
-	<string name="please_confirm_the_import_start_">Bitte bestätigen Sie den Import von \'%@\'?</string>
+	<string name="please_confirm_the_import_start_">Bitte bestätigen Sie den Import von \'%s\'?</string>
 	<string name="please_report_a_bug">Es ist ein interner Fehler aufgetreten. Wir würden uns freuen, wenn Sie den Fehler melden und die einzelnen Schritte erklären könnten, damit wir den Fehler nachstellen können. Vielen Dank!</string>
 	<string name="please_restart_the_app_to_load_the_theme">Bitte starten Sie die App neu, um das Motiv zu laden</string>
 	<string name="please_select_the_field_corresponding_to">Bitte wählen Sie das Feld entsprechend zu</string>
@@ -410,11 +410,11 @@
 	<string name="result">Ergebnis</string>
 	<string name="resume">Fortsetzen</string>
 	<string name="room">Raum</string>
-	<string name="room_">Raum: %@</string>
+	<string name="room_">Raum: %s</string>
 	<string name="room_empty_field_error">Sie müssen diesem Raum einen Namen geben</string>
 	<string name="rooms">Räume</string>
 	<string name="running_session_state">Läuft</string>
-	<string name="same_name_different_kind_custom_field_log_">Das benutzerdefinierte Feld \'%@\' ist in Ihrer Datenbank bereits vorhanden, aber mit einem anderen Typ. Dieses Feld und all seine Werte werden ignoriert. Wenn Sie diese Werte wirklich behalten möchten, brechen Sie diesen Import ab, geben Sie dem benutzerdefinierten Feld einen neuen Namen und versuchen Sie, den Import neu durchzuführen.</string>
+	<string name="same_name_different_kind_custom_field_log_">Das benutzerdefinierte Feld \'%s\' ist in Ihrer Datenbank bereits vorhanden, aber mit einem anderen Typ. Dieses Feld und all seine Werte werden ignoriert. Wenn Sie diese Werte wirklich behalten möchten, brechen Sie diesen Import ab, geben Sie dem benutzerdefinierten Feld einen neuen Namen und versuchen Sie, den Import neu durchzuführen.</string>
 	<string name="save_report_error_popup_message">Sie müssen ihm einen Namen geben und mindestens eine Statistik wählen, um diesen Bericht zu speichern</string>
 	<string name="saving_imported_data_please_wait_">Importierte Daten werden gespeichert, bitte warten Sie&#8230;</string>
 	<string name="security">Sicherheit</string>
@@ -427,7 +427,7 @@
 	<string name="services">Einstellungen</string>
 	<string name="session">Sitzung</string>
 	<string name="session_duration">Sitzungsdauer</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Der Sitzung gewonnen-Betrag ist nicht eingestellt! Der für das Parsing verwendete Wert ist: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Der Sitzung gewonnen-Betrag ist nicht eingestellt! Der für das Parsing verwendete Wert ist: %s</string>
 	<string name="session_s_comments_updated_">Sitzungskommentare aktualisiert</string>
 	<string name="sessions">Sitzungen</string>
 	<string name="set">Setzen</string>
@@ -448,7 +448,7 @@
 	<string name="standard_deviation">Standardabweichung</string>
 	<string name="start">Start</string>
 	<string name="start_date">Startdatum</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Das Startdatum wurde nicht eingestellt, das Format ist möglicherweise falsch. Der für den Import verwendete Wert ist: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Das Startdatum wurde nicht eingestellt, das Format ist möglicherweise falsch. Der für den Import verwendete Wert ist: %s</string>
 	<string name="start_import">Ja</string>
 	<string name="statistics">Statistiken</string>
 	<string name="stats">Statistiken</string>
@@ -473,12 +473,12 @@
 	<string name="tap_or_slide">ANTIPPEN oder SCHIEBEN</string>
 	<string name="thank_you_message">Glückwunsch, der Inhalt ist jetzt verfügbar.</string>
 	<string name="the_at_">%1$@ um %2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">Der Standort mit dem Namen %@ hat bereits diese Koordinaten.</string>
+	<string name="the_location_named_already_have_these_coordinates">Der Standort mit dem Namen %s hat bereits diese Koordinaten.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">Die aktuelle Rate konnte nicht abgerufen werden. Standardmäßig wird eine Rate von 1 verwendet. Sie können die Rate selbst bearbeiten.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">Die Sitzung existiert bereits! Startdatum: %1$@, Enddatum:%2$@, Gewonnener Betrag: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">Die Sitzung existiert bereits! Startdatum: %1$@, Enddatum:%2$@, Nettoergebnis: %3$@</string>
 	<string name="theme">Motiv</string>
-	<string name="this_game_started_">DIESES SPIELT HAT BEGONNEN %@</string>
+	<string name="this_game_started_">DIESES SPIELT HAT BEGONNEN %s</string>
 	<string name="this_month">Dieser Monat</string>
 	<string name="this_week">Diese Woche</string>
 	<string name="this_year">Dieses Jahr</string>
@@ -513,7 +513,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">Typ</string>
 	<string name="type_de_limite">Limit-Typ</string>
-	<string name="unable_to_get_from_fixer_io_">Rate konnte von fixer.io nicht abgerufen werden - %@</string>
+	<string name="unable_to_get_from_fixer_io_">Rate konnte von fixer.io nicht abgerufen werden - %s</string>
 	<string name="unfollowed_">Entfolgt!</string>
 	<string name="unknown_import_format_popup_message">Dateiformat wurde nicht erkannt</string>
 	<string name="unknown_user">Unbekannter Benutzer</string>
@@ -521,7 +521,7 @@
 	<string name="user_empty_field_error">Sie müssen Ihrem Spieler einen Namen geben</string>
 	<string name="validate">Bestätigen</string>
 	<string name="value">Wert</string>
-	<string name="variant_">Spiel: %@,</string>
+	<string name="variant_">Spiel: %s,</string>
 	<string name="variant_empty_name_error">Sie müssen diesem Spiel einen Namen geben</string>
 	<string name="variant_empty_shortname_error">Sie müssen diesem Spiel einen kurzen Namen geben</string>
 	<string name="version">Version</string>
@@ -533,7 +533,7 @@
 	<string name="week_days">Wochentage</string>
 	<string name="weekdays_or_weekend">Wochentage oder Wochenende</string>
 	<string name="weekend">Wochenende</string>
-	<string name="welcome_in_">Willkommen bei %@</string>
+	<string name="welcome_in_">Willkommen bei %s</string>
 	<string name="win_ratio">Gewinnverhältnis</string>
 	<string name="with">Mit</string>
 	<string name="withdrawal">Auszahlung</string>
@@ -552,7 +552,7 @@
 	<string name="yes_use_icloud">Ja</string>
 	<string name="yesterday">Gestern</string>
 	<string name="yesterday_and_today">Heute und gestern</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Sie können die generierte Datei mit dem Namen %@ innerhalb von iTunes aufrufen.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Sie können die generierte Datei mit dem Namen %s innerhalb von iTunes aufrufen.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">Leider können Sie nicht mehr als %i Vergleichsschlüssel auf einmal aktivieren!</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Sie müssen iCloud bei beiden Apps deaktivieren, bevor Sie Ihre Daten von Poker Analytics 3 importieren können</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Sie ordnen allen importierten Sitzungen die folgenden Werte zu. Bitte überprüfen Sie Folgendes:</string>
@@ -563,7 +563,7 @@
 	<string name="place">Platz</string>
 	<string name="multiplayer">Mehrspieler</string>
 	<string name="add_comment">Kommentar hinzufügen</string>
-	<string name="whats_new_in_">Was ist neu in %@?</string>
+	<string name="whats_new_in_">Was ist neu in %s?</string>
 	<string name="releasenote_question">Gefällt Ihnen Poker Analytics?</string>
 	<string name="releasenote_invitation">Bitte sagen Sie uns Ihre Meinung</string>
 	<string name="releasenote_rating">Bewerten Sie uns!</string>
@@ -571,12 +571,12 @@
 	<string name="stop_notification_body">Es ist an der Zeit!</string>
 	<string name="stop_notification_title">Basierend auf Ihren Verlauf, sieht es aus, als werden Sie müde. Es ist eventuell an der Zeit, aufzuhören.</string>
 	<string name="stop_notifications">Benachrichtigungen stoppen</string>
-	<string name="stop_notification_in_">Eine Stopp-Benachrichtigung wurde in %@ eingestellt</string>
+	<string name="stop_notification_in_">Eine Stopp-Benachrichtigung wurde in %s eingestellt</string>
 	<string name="save_authorize">Speichern &amp; genehmigen</string>
 	<string name="select_a_color">Farbe auswählen</string>
 	<string name="spotlight_indexing">Spotlight-Indexing</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ ist nicht zum Zugriff auf die Kamera autorisiert. Achten Sie beim Ändern Ihrer Privatsphäre-Einstellungen darauf, dass ungespeicherte Informationen beim automatischen Schließen der App verloren gehen.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ ist nicht zum Zugriff auf die Fotobibliothek autorisiert. Achten Sie beim Ändern Ihrer Privatsphäre-Einstellungen darauf, dass ungespeicherte Informationen beim automatischen Schließen der App verloren gehen.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s ist nicht zum Zugriff auf die Kamera autorisiert. Achten Sie beim Ändern Ihrer Privatsphäre-Einstellungen darauf, dass ungespeicherte Informationen beim automatischen Schließen der App verloren gehen.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s ist nicht zum Zugriff auf die Fotobibliothek autorisiert. Achten Sie beim Ändern Ihrer Privatsphäre-Einstellungen darauf, dass ungespeicherte Informationen beim automatischen Schließen der App verloren gehen.</string>
 	<string name="new_hand">Neues Blatt</string>
 	<string name="new_note">Neuer Hinweis</string>
 	<string name="hand_history">Blatt-Verlauf</string>
@@ -599,9 +599,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">Bedingungen</string>
 	<string name="stop_notifications_explanation">Poker Analytics versucht, Ihre optimale Sitzungsdauer zu ermitteln, und benachrichtigt Sie, wenn die Zeit abgelaufen ist. Hierfür sind rund 50 Sitzungen erforderlich.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync konnte nicht aktiviert werden. Vielleicht haben Sie ältere %@-Daten auf iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync konnte nicht aktiviert werden. Vielleicht haben Sie ältere %s-Daten auf iCloud.</string>
 	<string name="icloud_reset_and_retry">Löschen &amp; wiederholen</string>
-	<string name="_icloud_reset_warning">Hiermit werden Ihre %@-Daten in iCloud zurückgesetzt. Ihre Geräte-Daten werden nicht geändert, aber Sie müssen iCloud Sync auf allen anderen Geräten deaktivieren. Weiter?</string>
+	<string name="_icloud_reset_warning">Hiermit werden Ihre %s-Daten in iCloud zurückgesetzt. Ihre Geräte-Daten werden nicht geändert, aber Sie müssen iCloud Sync auf allen anderen Geräten deaktivieren. Weiter?</string>
 	<string name="remove_picture">Bild entfernen</string>
 	<string name="icloud_is_syncing">Synchronisieren&#8230;</string>
 	<string name="icloud_update_issue">Fehler</string>
@@ -612,7 +612,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">Aufgrund einer größeren Änderung an der Datenbank wurde iCloud aus Sicherheitsgründen in der App deaktiviert und Ihre Daten wurden zurück auf Ihr Gerät geladen. Bitte deaktivieren Sie die iCloud-Synchronisierung auf all Ihren anderen Geräten. Wenn Sie iCloud wieder aktivieren möchten, müssen Sie vorher iCloud-Daten löschen.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">Die iCloud-Synchronisierung konnte nicht deaktiviert werden.</string>
-	<string name="currently_having_chips">Derzeit sind %@ Chips verfügbar</string>
+	<string name="currently_having_chips">Derzeit sind %s Chips verfügbar</string>
 	<string name="icloud_timeout">Zeitüberschreitung bei der iCloud-Anfrage.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">Datenschutz-Einstellungen öffnen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 9dc1b7dc..f2314857 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">hace %@ </string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ no tiene acceso a tus contactos y no puede encontrar el nombre de tus amigos existentes. Puedes otorgar acceso a través de las preferencias del iPhone para evitar nombres de \'usuario desconocido\'.</string>
+	<string name="_ago">hace %s </string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s no tiene acceso a tus contactos y no puede encontrar el nombre de tus amigos existentes. Puedes otorgar acceso a través de las preferencias del iPhone para evitar nombres de \'usuario desconocido\'.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Una estrella significa un archivo guardado en tu cuenta iCloud.</string>
 	<string name="activate">Activar</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud guarda y mantiene tus datos actualizados en todos tus dispositivos. Al activar esta función, tus datos se trasladan a iCloud, es posible que haya alguna demora hasta que otro dispositivo acceda a tus datos.</string>
@@ -154,7 +154,7 @@
 	<string name="end">Fin</string>
 	<string name="end_all_the_games_validation_popup_title">¿Deseas finalizar todas las partidas?</string>
 	<string name="end_date">Fecha de finalización</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">No se estableció la fecha de finalización. Es posible que el formato no sea correcto. Este es el valor utilizado para el análisis: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">No se estableció la fecha de finalización. Es posible que el formato no sea correcto. Este es el valor utilizado para el análisis: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Fin del período de recompra y aumento de ciegas</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">El período de recompra finaliza en menos de un minuto</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">EL CIERRE DE SESIÓN ESTÁ PRÓXIMO, PULSA EN DETALLES PARA DETENER LA SESIÓN Y ESTABLECER LOS RESULTADOS</string>
@@ -173,7 +173,7 @@
 	<string name="export_popup_title">Elegir un tipo</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">Esta función está bloqueada y lamentablemente desactivaste las compras en la aplicación. Verifica tus ajustes.</string>
 	<string name="file_directory_creation_error">Error al importar. No se pudieron crear algunos archivos utilizados para la importación, probablemente sea por falta de espacio.</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">El archivo con nombre %@ se guardó satisfactoriamente en tu cuenta iCloud.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">El archivo con nombre %s se guardó satisfactoriamente en tu cuenta iCloud.</string>
 	<string name="filter">Filtro</string>
 	<string name="filter_selection">Activación del filtro</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Este filtro no se puede eliminar porque está asociado a uno o más informes.</string>
@@ -226,7 +226,7 @@
 	<string name="import_from_address_book">Utilizar libreta de direcciones</string>
 	<string name="import_from_v3">Importar de Poker Analytics 3</string>
 	<string name="import_not_successfull">Problema(s) identificado(s)</string>
-	<string name="import_session_save_error_">Error al guardar sesiones: %@</string>
+	<string name="import_session_save_error_">Error al guardar sesiones: %s</string>
 	<string name="import_successfull">Se realizó la importación</string>
 	<string name="imported_session">Sesiones importadas</string>
 	<string name="in">En</string>
@@ -251,7 +251,7 @@
 	<string name="live_online_room">Tiempo real/Sala</string>
 	<string name="load_from_db">Abrir&#8230;</string>
 	<string name="location">Ubicación</string>
-	<string name="location_">Ubicación: %@,  </string>
+	<string name="location_">Ubicación: %s,  </string>
 	<string name="location_empty_field_error">Debes asignar un nombre a esta ubicación.</string>
 	<string name="location_not_track">Ubicación sin registrar</string>
 	<string name="location_track">Ubicación registrada</string>
@@ -353,7 +353,7 @@
 	<string name="players">Jugadores</string>
 	<string name="players_count">Total del jugador</string>
 	<string name="please_check_if_your_values_are_valid">Verifica si tus valores son válidos</string>
-	<string name="please_confirm_the_import_start_">¿Confirmas la importación de \'%@\'?</string>
+	<string name="please_confirm_the_import_start_">¿Confirmas la importación de \'%s\'?</string>
 	<string name="please_report_a_bug">Se produjo un problema interno. Nos gustaría que nos envíes un informe del error con los pasos para reproducirlo. ¡Muchas gracias!</string>
 	<string name="please_restart_the_app_to_load_the_theme">Reinicia la aplicación para cargar el tema</string>
 	<string name="please_select_the_field_corresponding_to">Selecciona el campo que corresponde a</string>
@@ -411,11 +411,11 @@
 	<string name="result">Resultado</string>
 	<string name="resume">Reiniciar</string>
 	<string name="room">Sala</string>
-	<string name="room_">Sala: %@</string>
+	<string name="room_">Sala: %s</string>
 	<string name="room_empty_field_error">Debes asignarle un nombre a esta sala</string>
 	<string name="rooms">Salas</string>
 	<string name="running_session_state">En curso</string>
-	<string name="same_name_different_kind_custom_field_log_">El campo personalizado \'%@\' ya existe en tu base de datos pero con un tipo diferente. Este campo será ignorado al igual que todos sus valores. Si deseas verdaderamente mantener estos valores, debes cancelar esta importación, renombrar el campo personalizado y volver a intentarlo.</string>
+	<string name="same_name_different_kind_custom_field_log_">El campo personalizado \'%s\' ya existe en tu base de datos pero con un tipo diferente. Este campo será ignorado al igual que todos sus valores. Si deseas verdaderamente mantener estos valores, debes cancelar esta importación, renombrar el campo personalizado y volver a intentarlo.</string>
 	<string name="save_report_error_popup_message">Para guardar este informe, debes asignarle un nombre y seleccionar al menos una estadística.</string>
 	<string name="saving_imported_data_please_wait_">Guardando datos importados, espera por favor&#8230;</string>
 	<string name="security">Seguridad</string>
@@ -428,7 +428,7 @@
 	<string name="services">Ajustes</string>
 	<string name="session">Sesión</string>
 	<string name="session_duration">Duración de la sesión</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">No se estableció el Importe ganado en la sesión. Este es el valor utilizado para el análisis: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">No se estableció el Importe ganado en la sesión. Este es el valor utilizado para el análisis: %s</string>
 	<string name="session_s_comments_updated_">Se actualizaron los comentarios de la sesión</string>
 	<string name="sessions">Sesiones</string>
 	<string name="set">Establecer</string>
@@ -449,7 +449,7 @@
 	<string name="standard_deviation">Desviación estándar</string>
 	<string name="start">Comenzar</string>
 	<string name="start_date">Fecha de inicio</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La fecha de inicio no ha sido establecida, es posible que el formato sea incorrecto. Este es el valor utilizado durante la importación: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La fecha de inicio no ha sido establecida, es posible que el formato sea incorrecto. Este es el valor utilizado durante la importación: %s</string>
 	<string name="start_import">Sí</string>
 	<string name="statistics">Estadísticas</string>
 	<string name="stats">Estadísticas</string>
@@ -474,12 +474,12 @@
 	<string name="tap_or_slide">TOCA o DESLIZA</string>
 	<string name="thank_you_message">¡Felicitaciones! El contenido ya está disponible.</string>
 	<string name="the_at_">El %1$@ a las %2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">La ubicación denominada %@ ya tiene estas coordenadas.</string>
+	<string name="the_location_named_already_have_these_coordinates">La ubicación denominada %s ya tiene estas coordenadas.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">No se pudo encontrar la calificación actual. Se utilizará una calificación de 1 de manera predeterminada. Si lo deseas, puedes editar la calificación tú mismo.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">Esta sesión ya existe. Fecha de inicio: %1$@, Fecha de finalización: %2$@, Importe ganado: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">Esta sesión ya existe. Fecha de inicio: %1$@, Fecha de finalización: %2$@, Resultado neto: %3$@</string>
 	<string name="theme">Tema</string>
-	<string name="this_game_started_">Tu sesión comenzó: %@</string>
+	<string name="this_game_started_">Tu sesión comenzó: %s</string>
 	<string name="this_month">Este mes</string>
 	<string name="this_week">Esta semana</string>
 	<string name="this_year">Este año</string>
@@ -514,7 +514,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">Tipo</string>
 	<string name="type_de_limite">Tipo de límite</string>
-	<string name="unable_to_get_from_fixer_io_">No se puede obtener calificación de fixer.io: %@</string>
+	<string name="unable_to_get_from_fixer_io_">No se puede obtener calificación de fixer.io: %s</string>
 	<string name="unfollowed_">Dejó de seguir</string>
 	<string name="unknown_import_format_popup_message">Formato de archivo desconocido</string>
 	<string name="unknown_user">Usuario desconocido</string>
@@ -522,7 +522,7 @@
 	<string name="user_empty_field_error">Debes asignarle un nombre a este jugador</string>
 	<string name="validate">Validar</string>
 	<string name="value">Valor</string>
-	<string name="variant_">Partida: %@,  </string>
+	<string name="variant_">Partida: %s,  </string>
 	<string name="variant_empty_name_error">Debes asignarle un nombre a esta partida</string>
 	<string name="variant_empty_shortname_error">Debes asignarle un nombre corto a esta partida</string>
 	<string name="version">Versión</string>
@@ -534,7 +534,7 @@
 	<string name="week_days">Días de semana</string>
 	<string name="weekdays_or_weekend">Días de semana o fin de semana</string>
 	<string name="weekend">Fin de semana</string>
-	<string name="welcome_in_">Te damos la bienvenida a %@</string>
+	<string name="welcome_in_">Te damos la bienvenida a %s</string>
 	<string name="win_ratio">Ratio de ganancias</string>
 	<string name="with">Con</string>
 	<string name="withdrawal">Cobrar</string>
@@ -553,7 +553,7 @@
 	<string name="yes_use_icloud">Sí</string>
 	<string name="yesterday">Ayer</string>
 	<string name="yesterday_and_today">Hoy y ayer</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Puedes encontrar el archivo generado denominado %@ en iTunes.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Puedes encontrar el archivo generado denominado %s en iTunes.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">Disculpa, no puedes activar más de %i claves de comparación al mismo tiempo.</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Debes desactivar iCloud en las dos aplicaciones antes de importar tus datos desde Poker Analytics 3</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Vas a asignar los siguientes valores a las sesiones importadas. Verifica lo siguiente: </string>
@@ -562,7 +562,7 @@
 	<string name="add_comment">Agregar comentario</string>
 	<string name="from_hour_">Desde las</string>
 	<string name="to_hour_">Hasta las</string>
-	<string name="whats_new_in_">¿Qué hay de nuevo en %@?</string>
+	<string name="whats_new_in_">¿Qué hay de nuevo en %s?</string>
 	<string name="releasenote_question">¿Te agrada Poker Analytics?</string>
 	<string name="releasenote_invitation">Cuéntanos qué te parece la aplicación</string>
 	<string name="releasenote_rating">Califícanos!</string>
@@ -570,12 +570,12 @@
 	<string name="stop_notification_title">¡Ya es hora!</string>
 	<string name="stop_notification_body">Según tu historial, parece que comienzas a cansarte. Tal vez ya sea hora de parar.</string>
 	<string name="stop_notifications">Detener notificaciones</string>
-	<string name="stop_notification_in_">Se estableció una notificación para detener en %@</string>
+	<string name="stop_notification_in_">Se estableció una notificación para detener en %s</string>
 	<string name="save_authorize">Guardar y autorizar</string>
 	<string name="select_a_color">Selecciona un color</string>
 	<string name="spotlight_indexing">Spotlight indexando</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">La aplicación %@ no está autorizada a acceder a la cámara. Si modificas tus ajustes de privacidad, ten en cuenta que los datos que no se guardaron se perderán debido al cierre automático de la aplicación.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">La aplicación %@ no está autorizada a acceder a la biblioteca de fotos. Si modificas tus ajustes de privacidad, ten en cuenta que los datos que no se guardaron se perderán debido al cierre automático de la aplicación.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">La aplicación %s no está autorizada a acceder a la cámara. Si modificas tus ajustes de privacidad, ten en cuenta que los datos que no se guardaron se perderán debido al cierre automático de la aplicación.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">La aplicación %s no está autorizada a acceder a la biblioteca de fotos. Si modificas tus ajustes de privacidad, ten en cuenta que los datos que no se guardaron se perderán debido al cierre automático de la aplicación.</string>
 	<string name="new_hand">Nueva mano</string>
 	<string name="new_note">Nueva nota</string>
 	<string name="tap_to_learn_more">Toca en un elemento para más información</string>
@@ -596,9 +596,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">Condiciones</string>
 	<string name="stop_notifications_explanation">Poker Analytics estima tu mejor tiempo de sesión y te envía una notificación cuando alcanzas este tiempo. Requiere cerca de 50 sesiones. </string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">No se pudo activar la sincronización de iCloud. Es posible que tengas datos anteriores de %@ en iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">No se pudo activar la sincronización de iCloud. Es posible que tengas datos anteriores de %s en iCloud.</string>
 	<string name="icloud_reset_and_retry">Borrar e reintentar</string>
-	<string name="_icloud_reset_warning">Se restablecerán los datos de %@ en iCloud, no se modificarán los datos locales, pero deberás desactivar iCloud en todos tus otros dispositivos. ¿Seguro que deseas hacerlo?</string>
+	<string name="_icloud_reset_warning">Se restablecerán los datos de %s en iCloud, no se modificarán los datos locales, pero deberás desactivar iCloud en todos tus otros dispositivos. ¿Seguro que deseas hacerlo?</string>
 	<string name="remove_picture">Eliminar imagen</string>
 	<string name="icloud_is_syncing">Sincronizando</string>
 	<string name="icloud_update_issue">Error</string>
@@ -609,7 +609,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">Debido a una importante modificación en la base de datos, por razones de seguridad se desactivó iCloud en la aplicación y tus datos se trasladaron a tu dispositivo. Desactiva la sincronización con iCloud en todos tus otros dispositivos. Si deseas volver a activar iCloud, deberás eliminar antes los datos que contiene.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">No se pudo desactivar la sincronización con iCloud.</string>
-	<string name="currently_having_chips">Actualmente tiene %@ chips</string>
+	<string name="currently_having_chips">Actualmente tiene %s chips</string>
 	<string name="icloud_timeout">Se agotó el tiempo de la solicitud de iCloud.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">Abrir ajustes de privacidad</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 5f9bbe70..bd5411b9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">depuis %@</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ n\'a pas accès à vos contacts pour récupérer les noms des joueurs sauvés dans des précédentes sessions. Vous devriez donner cet accès via les préférences de l\'iPhone pour éviter les noms \'joueur inconnu\'.</string>
+	<string name="_ago">depuis %s</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s n\'a pas accès à vos contacts pour récupérer les noms des joueurs sauvés dans des précédentes sessions. Vous devriez donner cet accès via les préférences de l\'iPhone pour éviter les noms \'joueur inconnu\'.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Une étoile indique que votre fichier se trouve sur votre compte iCloud.</string>
 	<string name="activate">Activer</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud sauvegarde et actualise vos données sur tous vos appareils. À l\'activation, vos données seront migrées vers iCloud. Cela prendra un peu de temps avant d\'y accéder avec autre appareil.</string>
@@ -156,7 +156,7 @@
 	<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_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: %@</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>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">La fin de session est proche, tapez sur Details pour arrêter votre session.</string>
@@ -175,7 +175,7 @@
 	<string name="export_popup_title">Choisissez un format</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">La fonctionnalité est désactivée et malheureusement vous avez désactivé les achats in-app. Vous pouvez les activer en modifiant vos réglages.</string>
 	<string name="file_directory_creation_error">L\'import a échoué. Des fichiers nécessaires à l\'import n\'ont pas pu être créés, il manque probablement de l\'espace.</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">Le fichier généré \'%@\' a été sauvé avec succès sur votre compte iCloud.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">Le fichier généré \'%s\' a été sauvé avec succès sur votre compte iCloud.</string>
 	<string name="filter">Filtre</string>
 	<string name="filter_selection">Activation d\'un filtre</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Ce filtre est utilisé dans un ou plusieurs rapports empêchant la suppression.</string>
@@ -228,7 +228,7 @@
 	<string name="import_from_address_book">Utiliser le carnet d\'adresses</string>
 	<string name="import_from_v3">Importer depuis Poker Analytics 3</string>
 	<string name="import_not_successfull">problème(s) identifié(s)</string>
-	<string name="import_session_save_error_">Erreur lors de la sauvegarde de la session: %@</string>
+	<string name="import_session_save_error_">Erreur lors de la sauvegarde de la session: %s</string>
 	<string name="import_successfull">L\'import a été réalisé avec succès</string>
 	<string name="imported_session">Sessions importées</string>
 	<string name="in">Dans</string>
@@ -256,7 +256,7 @@
 	<string name="live_online_room">Live/Site</string>
 	<string name="load_from_db">Ouvrir&#8230;</string>
 	<string name="location">Lieu</string>
-	<string name="location_">Lieu: %@, </string>
+	<string name="location_">Lieu: %s, </string>
 	<string name="location_empty_field_error">Il est nécessaire d\'indiquer un nom pour ce lieu.</string>
 	<string name="location_not_track">Lieu non suivi</string>
 	<string name="location_track">Lieu suivi</string>
@@ -364,7 +364,7 @@
 	<string name="players">Joueurs</string>
 	<string name="players_count">Nombre de joueurs</string>
 	<string name="please_check_if_your_values_are_valid">Vérifiez vos données</string>
-	<string name="please_confirm_the_import_start_">Souhaitez-vous importer le fichier \'%@\' ?</string>
+	<string name="please_confirm_the_import_start_">Souhaitez-vous importer le fichier \'%s\' ?</string>
 	<string name="please_report_a_bug">Une erreur interne s\'est produite. Merci de nous envoyer un rapport contenant les étapes pour reproduire le bug, merci!</string>
 	<string name="please_restart_the_app_to_load_the_theme">Merci de quitter l\'application pour charger le thème</string>
 	<string name="please_select_the_field_corresponding_to">Choisissez le champ correspondant à</string>
@@ -422,11 +422,11 @@
 	<string name="result">Résultat</string>
 	<string name="resume">Reprendre</string>
 	<string name="room">Site de Poker</string>
-	<string name="room_">Site de Poker: %@</string>
+	<string name="room_">Site de Poker: %s</string>
 	<string name="room_empty_field_error">Il est nécessaire d\'indiquer un nom pour ce site de poker</string>
 	<string name="rooms">Sites de poker</string>
 	<string name="running_session_state">En cours</string>
-	<string name="same_name_different_kind_custom_field_log_">Le champ perso \'%@\' existe déjà dans la base de données mais avec un type différent. Le champ et les valeurs qui lui sont associées ont été ignorées. Si vous souhaitez conserver ces valeurs, annulez l\'import, renommez le champ perso, et recommencez l\'import.</string>
+	<string name="same_name_different_kind_custom_field_log_">Le champ perso \'%s\' existe déjà dans la base de données mais avec un type différent. Le champ et les valeurs qui lui sont associées ont été ignorées. Si vous souhaitez conserver ces valeurs, annulez l\'import, renommez le champ perso, et recommencez l\'import.</string>
 	<string name="save_report_error_popup_message">Il est nécessaire d\'indiquer un nom et de choisir au moins une statistique pour sauvegarder le rapport</string>
 	<string name="saving_imported_data_please_wait_">Sauvegarde, veuillez patienter&#8230;</string>
 	<string name="security">Sécurité</string>
@@ -439,7 +439,7 @@
 	<string name="services">Réglages</string>
 	<string name="session">Session</string>
 	<string name="session_duration">Durée de la session</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">La somme gagnée n\'a pas été défini, voilà la valeur utilisée lors de l\'importation: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">La somme gagnée n\'a pas été défini, voilà la valeur utilisée lors de l\'importation: %s</string>
 	<string name="session_s_comments_updated_">Les commentaires de la session ont été mises à jour !</string>
 	<string name="sessions">Sessions</string>
 	<string name="set">Définir</string>
@@ -460,7 +460,7 @@
 	<string name="standard_deviation">Ecart type</string>
 	<string name="start">Démarrer</string>
 	<string name="start_date">Début</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La date de démarrage n\'a pas été défini, le format est peut-être incorrect. Voici la valeur utilisée lors de l\'importation: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La date de démarrage n\'a pas été défini, le format est peut-être incorrect. Voici la valeur utilisée lors de l\'importation: %s</string>
 	<string name="start_import">Oui</string>
 	<string name="statistics">Statistiques</string>
 	<string name="stats">Stats</string>
@@ -485,12 +485,12 @@
 	<string name="tap_or_slide">APPUYER ou GLISSER</string>
 	<string name="thank_you_message">Félicitations, le contenu est maintenant disponible.</string>
 	<string name="the_at_">Le %1$@ à %2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">Le lieu %@ possède déjà ces coordonnées.</string>
+	<string name="the_location_named_already_have_these_coordinates">Le lieu %s possède déjà ces coordonnées.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">Le taux n\'a pas pu être actualisé, un taux de 1 sera utilisé par défaut.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">La session existe déjà ! Date de démarrage: %1$@, date de fin:%2$@, résultat net: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">La session existe déjà ! Date de démarrage: %1$@, date de fin:%2$@, résultat net: %3$@</string>
 	<string name="theme">Thème</string>
-	<string name="this_game_started_">Cette session a démarré: %@</string>
+	<string name="this_game_started_">Cette session a démarré: %s</string>
 	<string name="this_month">Ce mois-ci</string>
 	<string name="this_week">Cette semaine</string>
 	<string name="this_year">Cette année</string>
@@ -525,7 +525,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">Type</string>
 	<string name="type_de_limite">Type de limite</string>
-	<string name="unable_to_get_from_fixer_io_">Impossible à récupérer via fixer.io - %@</string>
+	<string name="unable_to_get_from_fixer_io_">Impossible à récupérer via fixer.io - %s</string>
 	<string name="unfollowed_">Désinscription</string>
 	<string name="unknown_import_format_popup_message">Le format du fichier n\'est pas reconnu</string>
 	<string name="unknown_user">Joueur inconnu</string>
@@ -533,7 +533,7 @@
 	<string name="user_empty_field_error">Il est nécessaire d\'indiquer un nom pour ce joueur</string>
 	<string name="validate">Valider</string>
 	<string name="value">Valeur</string>
-	<string name="variant_">Jeu: %@, </string>
+	<string name="variant_">Jeu: %s, </string>
 	<string name="variant_empty_name_error">Il est nécessaire d\'indiquer un nom pour ce jeu</string>
 	<string name="variant_empty_shortname_error">Il est nécessaire d\'indiquer un acronyme pour ce jeu</string>
 	<string name="version">Version</string>
@@ -545,7 +545,7 @@
 	<string name="week_days">En semaine</string>
 	<string name="weekdays_or_weekend">Semaine ou week-end</string>
 	<string name="weekend">Week-end</string>
-	<string name="welcome_in_">Bienvenue dans %@</string>
+	<string name="welcome_in_">Bienvenue dans %s</string>
 	<string name="win_ratio">Ratio de victoires</string>
 	<string name="with">Avec</string>
 	<string name="withdrawal">Retrait</string>
@@ -564,7 +564,7 @@
 	<string name="yes_use_icloud">Oui</string>
 	<string name="yesterday">Hier</string>
 	<string name="yesterday_and_today">Hier et aujourd\'hui</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Vous pouvez retrouver le fichier généré \'%@\' dans iTunes.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Vous pouvez retrouver le fichier généré \'%s\' dans iTunes.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">Désolé, vous ne pouvez pas activer plus de %i comparateurs simultanément !</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Vous devez désactiver iCloud sur les deux apps avant de pouvoir importer les données de Poker Analytics 3.</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Vous êtes sur le point d\'affecter les valeurs suivantes à toutes les sessions importées: </string>
@@ -573,7 +573,7 @@
 	<string name="add_comment">Nouveau commentaire</string>
 	<string name="from_hour_">De</string>
 	<string name="to_hour_">À</string>
-	<string name="whats_new_in_">Nouveautés de la %@!</string>
+	<string name="whats_new_in_">Nouveautés de la %s!</string>
 	<string name="releasenote_question">Vous aimez Poker Analytics?</string>
 	<string name="releasenote_invitation">Dites nous ce que vous en pensez</string>
 	<string name="releasenote_rating">Notez-nous !</string>
@@ -581,12 +581,12 @@
 	<string name="stop_notification_body">D\'après votre historique, il apparait que vous commencez à fatiguer. Il est peut-être temps de s\'arrêter!</string>
 	<string name="stop_notification_title">C\'est l\'heure!</string>
 	<string name="stop_notifications">Notifications d\'arrêt</string>
-	<string name="stop_notification_in_">Une notification d\'arrêt sera envoyée dans %@</string>
+	<string name="stop_notification_in_">Une notification d\'arrêt sera envoyée dans %s</string>
 	<string name="save_authorize">Sauvegarder &amp; autoriser</string>
 	<string name="select_a_color">Choisir une couleur</string>
 	<string name="spotlight_indexing">Indexation Spotlight</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ n\'est pas autorisé à utiliser l\'appareil photo. Si vous changez vos paramètres de confidentialité, l\'app sera fermée et les données non sauvegardées seront perdues.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ is not authorized to access the photo library. Si vous changez vos paramètres de confidentialité, l\'app sera fermée et les données non sauvegardées seront perdues.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s n\'est pas autorisé à utiliser l\'appareil photo. Si vous changez vos paramètres de confidentialité, l\'app sera fermée et les données non sauvegardées seront perdues.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s is not authorized to access the photo library. Si vous changez vos paramètres de confidentialité, l\'app sera fermée et les données non sauvegardées seront perdues.</string>
 	<string name="new_hand">Nouvelle main</string>
 	<string name="new_note">Nouvelle note</string>
 	<string name="follow_us">Nous suivre</string>
@@ -608,9 +608,9 @@
 	<string name="health_kit_not_available_error">L\'application Santé et les données associées ne sont pas disponible sur cet appareil.</string>
 	<string name="terms">Conditions</string>
 	<string name="stop_notifications_explanation">Poker Analytics tente d\'estimer votre durée optimale de sessions pour vous envoyer une notification de fin de session. Requiert environ 50 sessions.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">La synchronisation iCloud n\'a pas pu être activé. Peut-être que vous avez d\'anciennes données de %@ sur iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">La synchronisation iCloud n\'a pas pu être activé. Peut-être que vous avez d\'anciennes données de %s sur iCloud.</string>
 	<string name="icloud_reset_and_retry">Nettoyer &amp; recommencer</string>
-	<string name="_icloud_reset_warning">Vous allez effacer vos données de %@ sur iCloud, vos données locales ne seront pas modifées mais vous devriez désactiver la synchro sur tous vos autres appareils. Êtes-vous sûr de vouloir faire cela ?</string>
+	<string name="_icloud_reset_warning">Vous allez effacer vos données de %s sur iCloud, vos données locales ne seront pas modifées mais vous devriez désactiver la synchro sur tous vos autres appareils. Êtes-vous sûr de vouloir faire cela ?</string>
 	<string name="remove_picture">Enlever la photo</string>
 	<string name="icloud_is_syncing">Synchro en cours</string>
 	<string name="icloud_ok_and_ready">OK</string>
@@ -621,7 +621,7 @@
 	<string name="icloud_status">Status iCloud</string>
 	<string name="icloud_migration_failure_error_message">À cause d\'une importante modification de la structure de la base de données, la synchronisation iCloud a été désactivé et vos données ont été migré en local. Si vous voulez réactiver la synchronisation iCloud, vous devez d\'abord effacer vos données d\'iCloud.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">La synchronisation iCloud n\'a pas pu être désactivé.</string>
-	<string name="currently_having_chips">J\'ai %@ jetons</string>
+	<string name="currently_having_chips">J\'ai %s jetons</string>
 	<string name="icloud_timeout">La requête iCloud a expiré.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">Ouvrir les réglages de confidentialités</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 09da3ab3..83ecb202 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">%@ पहले</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ की आपके संपर्कों तक पहुँच नहीं है और आपके मौजुदा दोस्तों के नामों को पुन: प्राप्त नहीं कर सकता है. किसी \'अज्ञात उपयोगकर्ता\' से बचाव के लिए आपको  iPhone प्राथमिकताएं द्वारा पहुँच प्रदान करनी होगी.</string>
+	<string name="_ago">%s पहले</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s की आपके संपर्कों तक पहुँच नहीं है और आपके मौजुदा दोस्तों के नामों को पुन: प्राप्त नहीं कर सकता है. किसी \'अज्ञात उपयोगकर्ता\' से बचाव के लिए आपको  iPhone प्राथमिकताएं द्वारा पहुँच प्रदान करनी होगी.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">एक सि‍तारा आपके iCloud अकाउंट में स्टोर की गई फाइल दर्शाता है.</string>
 	<string name="activate">सक्षम करें</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud आपके डेटा को सभी ड‍िवाइस पर सहेजता और अप टू डेट रखता है. जब सक्रिय किया जाए आपके डेटा iCloud पर स्थानांतरित हो जाते हैं, किसी अन्य डिवाइस से आपके डेटा पर पहुँच करने में कुछ समय लग सकता है.</string>
@@ -153,7 +153,7 @@
 	<string name="end">समाप्त</string>
 	<string name="end_all_the_games_validation_popup_title">क्या आप सभी गेम समाप्त करना चाहते हैं?</string>
 	<string name="end_date">समाप्ति तारीख</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">समाप्ति तारीख सेट नहीं की गई है! यह फार्मेट सही नहीं हो सकता है. पार्सिंग के लिउ उपयोग किया जानेे वाला मान यहां है: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">समाप्ति तारीख सेट नहीं की गई है! यह फार्मेट सही नहीं हो सकता है. पार्सिंग के लिउ उपयोग किया जानेे वाला मान यहां है: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">पुर्नखरीद अवधि की समाप्ति और ब्लाइंडस में वृद्धि</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">पुन: खरीद अवधि समाप्ति एक मिनट से कम</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">सत्र समाप्ति बंद है, आपका सत्र रोकने और परिणाम सेट करने के लिए विवरण दबाएं</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">एक प्रकार चुनें</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">यह सुविधाा लॉक है और दुर्भाग्य से आपने इन-एप्प खरीद को अक्षम किया है. कृपया अपनी सेटिंग्स की जाँच करें.</string>
 	<string name="file_directory_creation_error">इम्पोर्ट विफल हुआ. इम्पोर्ट के लिए उपयोग की जाने वाली कुछ फाइल तैयार नहीं की जा सकी, शायद यह स्थान की कमी के कारण है</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">%@ नाम की फाइल सफलतापूर्वक आपके iCloud अकाउंट में सहेजी गई है.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">%s नाम की फाइल सफलतापूर्वक आपके iCloud अकाउंट में सहेजी गई है.</string>
 	<string name="filter">फिल्टर करें</string>
 	<string name="filter_selection">फिल्टर सक्रिय करना</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">यह फिल्टर हटाया नहीं जा सकता क्योंकि या एक या अधिक रिपोर्टों से लिंक किया गया है.</string>
@@ -225,7 +225,7 @@
 	<string name="import_from_address_book">एड्रेस बुक उपयोग करें</string>
 	<string name="import_from_v3">Analytics 3 से इम्पोर्ट करें</string>
 	<string name="import_not_successfull">चिह्नित मुद्दा(मुद्दे)</string>
-	<string name="import_session_save_error_">सत्रों को सहेेजते समय त्रुटि : %@</string>
+	<string name="import_session_save_error_">सत्रों को सहेेजते समय त्रुटि : %s</string>
 	<string name="import_successfull">इम्पोर्ट सफल</string>
 	<string name="imported_session">इम्पोर्ट किए गए सत्र</string>
 	<string name="in">में</string>
@@ -250,7 +250,7 @@
 	<string name="live_online_room">लाइव/कक्ष</string>
 	<string name="load_from_db">खोलें&#8230;</string>
 	<string name="location">स्थान</string>
-	<string name="location_">स्थान: %@,  </string>
+	<string name="location_">स्थान: %s,  </string>
 	<string name="location_empty_field_error">आपको इस स्थान का नाम देने की जरूरत है.</string>
 	<string name="location_not_track">बगैर ट्रैक हुआ स्थान</string>
 	<string name="location_track">ट्रैक किया गया स्थान</string>
@@ -352,7 +352,7 @@
 	<string name="players">खिलाड़ी</string>
 	<string name="players_count">खिलाड़ी की गणना</string>
 	<string name="please_check_if_your_values_are_valid">कृपया जाँच करें क्या आपके मान वैध है</string>
-	<string name="please_confirm_the_import_start_">कृपया \'%@\' की पुष्टि करें? </string>
+	<string name="please_confirm_the_import_start_">कृपया \'%s\' की पुष्टि करें? </string>
 	<string name="please_report_a_bug">एक आंतरिक मुद्दा उत्पन्न हुआ. यदि आप बग को पुन: उत्पन्न करने के लिए चरणों सहित एक बग की रिपोर्ट कर सकें तो हमें खुशी होगी धन्यवाद!</string>
 	<string name="please_restart_the_app_to_load_the_theme">थीम को लोड करने के लिए कृपया गेम को पुन: आरंभ करें</string>
 	<string name="please_select_the_field_corresponding_to">कृपया इसके अनुरूप फील्ड को चुनें</string>
@@ -410,11 +410,11 @@
 	<string name="result">परिणाम</string>
 	<string name="resume">पुन: आरंभ करें</string>
 	<string name="room">कक्ष</string>
-	<string name="room_">कक्ष: %@</string>
+	<string name="room_">कक्ष: %s</string>
 	<string name="room_empty_field_error">आपको इस कक्ष का नामकरण करने की जरूरत है</string>
 	<string name="rooms">कक्ष</string>
 	<string name="running_session_state">संचालित है</string>
-	<string name="same_name_different_kind_custom_field_log_">कस्टम फील्ड \'%@\' पहले ही आपके डेटाबेस में परंतु एक अलग प्रकार के साथ मौजूद है. इस फील्ड और इसके सभी मानों की उपेक्षा की जााएगी. यदि आप वाकई इन मूूल्यों को रखना चाहते हैं, इम्पोर्ट रद्द करें, कस्टम फील्ड का पुन: नामकरण करें और इम्पोर्ट के लिए पुन: प्रयास करें.</string>
+	<string name="same_name_different_kind_custom_field_log_">कस्टम फील्ड \'%s\' पहले ही आपके डेटाबेस में परंतु एक अलग प्रकार के साथ मौजूद है. इस फील्ड और इसके सभी मानों की उपेक्षा की जााएगी. यदि आप वाकई इन मूूल्यों को रखना चाहते हैं, इम्पोर्ट रद्द करें, कस्टम फील्ड का पुन: नामकरण करें और इम्पोर्ट के लिए पुन: प्रयास करें.</string>
 	<string name="save_report_error_popup_message">यह रिपोर्ट सहेजने के लिए आपको इसका नामकरण करने और कम से कम एक आंकड़ा चुनने की आवश्यकता है</string>
 	<string name="saving_imported_data_please_wait_">इम्पोर्ट डेटा सहेज रहे हैं, कृपया प्रतीक्षा करें&#8230;</string>
 	<string name="security">सुरक्षा</string>
@@ -427,7 +427,7 @@
 	<string name="services">सेटिंग्स</string>
 	<string name="session">सत्र</string>
 	<string name="session_duration">सत्र की अवधि</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">सत्र की जी‍ती गई राशि सेट नहीं की गई है! पार्सिंग के लिए यहां मान है: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">सत्र की जी‍ती गई राशि सेट नहीं की गई है! पार्सिंग के लिए यहां मान है: %s</string>
 	<string name="session_s_comments_updated_">सत्र की टिप्पणियां अद्यतन की गई</string>
 	<string name="sessions">सत्रों</string>
 	<string name="set">सेट करें</string>
@@ -448,7 +448,7 @@
 	<string name="standard_deviation">स्टैण्डर्ड विचलन</string>
 	<string name="start">आरंभ करें</string>
 	<string name="start_date">आरंभ तारीख</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">आरंभ तारीख सेट नहीं की गई है, फार्मेट त्रुटिपूर्ण हो सकता है. इम्पोर्ट के दौरान उपयोग किया गया मान यहां है: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">आरंभ तारीख सेट नहीं की गई है, फार्मेट त्रुटिपूर्ण हो सकता है. इम्पोर्ट के दौरान उपयोग किया गया मान यहां है: %s</string>
 	<string name="start_import">हाँ</string>
 	<string name="statistics">आँकड़े</string>
 	<string name="stats">आँकड़े</string>
@@ -473,12 +473,12 @@
 	<string name="tap_or_slide">टैप या स्लाइड करें</string>
 	<string name="thank_you_message">बधाई! यह सामग्री अब उपलब्ध है!</string>
 	<string name="the_at_">%1$@ को %2$@ पर</string>
-	<string name="the_location_named_already_have_these_coordinates">%@ नाम का स्थान पहले ही इन निर्देशांक पर है.</string>
+	<string name="the_location_named_already_have_these_coordinates">%s नाम का स्थान पहले ही इन निर्देशांक पर है.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">वर्तमान दर पुन: प्राप्त नहीं की जा सकी. डिफाल्ट रूप से 1 की दर उपयोग की जाएगी. आप अभी स्वयं दर संपादित कर सकते हैं.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">यह सत्र पहले ही मौजूद है! आरंभ तारीख: %1$@, समाप्ति तारीख:%2$@, जीती गई राशि: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">यह सत्र पहले ही मौजूद है! आरंभ तारीख: %1$@, समाप्ति तारीख:%2$@, शुद्ध परिणाम: %3$@ </string>
 	<string name="theme">थीम</string>
-	<string name="this_game_started_">आपका सत्र आरंभ हुअा: %@</string>
+	<string name="this_game_started_">आपका सत्र आरंभ हुअा: %s</string>
 	<string name="this_month">यह महीना</string>
 	<string name="this_week">यह सप्ताह</string>
 	<string name="this_year">यह वर्ष</string>
@@ -513,7 +513,7 @@
 	<string name="twitter">ट्विटर</string>
 	<string name="type">प्रकार</string>
 	<string name="type_de_limite">सीमा का प्रकार</string>
-	<string name="unable_to_get_from_fixer_io_">fixer.io से दर प्राप्त करने में असमर्थ - %@</string>
+	<string name="unable_to_get_from_fixer_io_">fixer.io से दर प्राप्त करने में असमर्थ - %s</string>
 	<string name="unfollowed_">अनफॉलो हुआ!</string>
 	<string name="unknown_import_format_popup_message">फाइल फार्मेट पहचाना नहीं गया है</string>
 	<string name="unknown_user">अज्ञात उपयोगकर्ता</string>
@@ -521,7 +521,7 @@
 	<string name="user_empty_field_error">आपको इस खिलाड़ी का नामकरण करने की जरूरत है</string>
 	<string name="validate">मान्य करें</string>
 	<string name="value">मान</string>
-	<string name="variant_">गेम: %@,  </string>
+	<string name="variant_">गेम: %s,  </string>
 	<string name="variant_empty_name_error">आपको इस गेम का नामकरण करने की जरूरत है</string>
 	<string name="variant_empty_shortname_error">आपको इस गेम का एक छोटा नामकरण करने की जरूरत है</string>
 	<string name="version">संस्करण</string>
@@ -533,7 +533,7 @@
 	<string name="week_days">कार्यदिवसों</string>
 	<string name="weekdays_or_weekend">कार्यदिवसों या सप्ताहांत</string>
 	<string name="weekend">सप्ताहांत</string>
-	<string name="welcome_in_">%@ में स्वागत है</string>
+	<string name="welcome_in_">%s में स्वागत है</string>
 	<string name="win_ratio">जीत का अनुपात</string>
 	<string name="with">के साथ</string>
 	<string name="withdrawal">निकासी</string>
@@ -552,7 +552,7 @@
 	<string name="yes_use_icloud">हाँ</string>
 	<string name="yesterday">कल</string>
 	<string name="yesterday_and_today">आज और कल</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">आप %@ नाम की उत्पन्न की गई फाइल iTunes में पुन: प्राप्त कर सकते हैं.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">आप %s नाम की उत्पन्न की गई फाइल iTunes में पुन: प्राप्त कर सकते हैं.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">माफ करें, आप एक ही समय में %i से अधिक तुलना कुँजियां सक्रिय नहीं कर सकते हैं!</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">आपको Poker Analytics 3 से अपना डेटा इम्पोर्ट करने से पहले दोनों एप्प से iCloud अक्षम करना होगा</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">आप सभी सत्रों के लिए निम्नलिखित मान आवंटित करने जा रहे हैं. कृपया निम्नलिखित जाँच करें:  </string>
@@ -561,7 +561,7 @@
 	<string name="add_comment">टिप्पणी जोड़ें</string>
 	<string name="from_hour_">से</string>
 	<string name="to_hour_">तक</string>
-	<string name="whats_new_in_">%@ में नया क्या है?</string>
+	<string name="whats_new_in_">%s में नया क्या है?</string>
 	<string name="releasenote_question">Poker Analytics पसंद करते हैं?</string>
 	<string name="releasenote_invitation">कृपया हमें बताएं हम कैसा कर रहे हैं</string>
 	<string name="releasenote_rating">एप्प स्टोर में हमारा मूल्यांकन करें</string>
@@ -569,12 +569,12 @@
 	<string name="stop_notification_title">यह ठीक समय है!</string>
 	<string name="stop_notification_body">आपके इतिहासस के आधार पर यह लगता है आपको थकान आरंभ हो गई है, यह ठहरने का समय है!</string>
 	<string name="stop_notifications">सूचनाएं बंद करें</string>
-	<string name="stop_notification_in_">सूचना रोकना %@ में सेट कर दिया गया</string>
+	<string name="stop_notification_in_">सूचना रोकना %s में सेट कर दिया गया</string>
 	<string name="save_authorize">सहेजें और अधिकृत करें</string>
 	<string name="select_a_color">एक रंग चुनें</string>
 	<string name="spotlight_indexing">स्पॉटलाइट सूचीकरण</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ कैमरा तक पहुँच के लिए अधिकृत नहीं है. यदि आप अपनी गोपनीयता सेटिंग्स संशोधित करते हैं तो सावधान रहें कि एप्प के स्वत: बंद होने के कारण बगैर सहेजा गया डेटा समाप्त हो जाएगा.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ फोटो लायब्रेरी तक पहुँच के लिए अधिकृत नहीं है. यदि आप अपनी गोपनीयता सेटिंग्स संशोधित करते हैं तो सावधान रहें कि एप्प के स्वत: बंद होने के कारण बगैर सहेजा गया डेटा समाप्त हो जाएगा.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s कैमरा तक पहुँच के लिए अधिकृत नहीं है. यदि आप अपनी गोपनीयता सेटिंग्स संशोधित करते हैं तो सावधान रहें कि एप्प के स्वत: बंद होने के कारण बगैर सहेजा गया डेटा समाप्त हो जाएगा.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s फोटो लायब्रेरी तक पहुँच के लिए अधिकृत नहीं है. यदि आप अपनी गोपनीयता सेटिंग्स संशोधित करते हैं तो सावधान रहें कि एप्प के स्वत: बंद होने के कारण बगैर सहेजा गया डेटा समाप्त हो जाएगा.</string>
 	<string name="new_hand">नया हैण्ड</string>
 	<string name="new_note">नया नोट</string>
 	<string name="tap_to_learn_more">अधिक जानने के लिए आयटम पर टैप करें</string>
@@ -595,9 +595,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">शर्तेँ</string>
 	<string name="stop_notifications_explanation">Poker Analytics आपकी अनुकूल सत्र अवधि का आकलन करने का प्रयास करता है और जब आप उस अवधि तक पहुँचते हैं तो एक सूचना भेजेगा. लगभग 50 सत्र आवश्यक.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud सिंक्रोनाइजेशन सक्षम करने में समर्थ नहीं था. शायद iCloud.में आपका पुराना %@\' डेटा हो सकता है.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud सिंक्रोनाइजेशन सक्षम करने में समर्थ नहीं था. शायद iCloud.में आपका पुराना %s\' डेटा हो सकता है.</string>
 	<string name="icloud_reset_and_retry">साफ करें और पुन: प्रयास करें</string>
-	<string name="_icloud_reset_warning">आप iCloud पर %@ का डेटा रीसेट करेंगे, आपका स्थानीय डेटा संशोधि‍त नहीं होगा, लेकिन आपको अपने सभी अन्य ड‍िवाइस पर iCloud स‍िंंक्रोनाइजेशन अक्षम करना होगा. क्या आप यह करने के ल‍िए सुन‍िश्चित हैं?</string>
+	<string name="_icloud_reset_warning">आप iCloud पर %s का डेटा रीसेट करेंगे, आपका स्थानीय डेटा संशोधि‍त नहीं होगा, लेकिन आपको अपने सभी अन्य ड‍िवाइस पर iCloud स‍िंंक्रोनाइजेशन अक्षम करना होगा. क्या आप यह करने के ल‍िए सुन‍िश्चित हैं?</string>
 	<string name="remove_picture">चित्र हटाएं</string>
 	<string name="icloud_is_syncing">सिंक्रोनाइज हो रहा है</string>
 	<string name="icloud_update_issue">त्रुटि</string>
@@ -608,7 +608,7 @@
 	<string name="icloud_ok_and_ready">ठीक</string>
 	<string name="icloud_migration_failure_error_message">एक महत्वपूर्ण डेटाबेस संशोधन के कारण, सुरक्षा के लिए एप्प से iCloud को अक्षम कर दिया गया है और आपके डेटा को वापिस आपके स्थानीय डि‍वाइस पर भेज द‍िया है. कृपया अपने सभी अन्य डिवाइस पर iCloud स‍िंंक्रोनाइजेशन अक्षम करें. यदि आप फि‍र से iCloud सक्षम करना चाहते हैं, आपको सबसे पहले iCloud डेटा को हटाना होगा.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">iCloud Sync को अक्षम करनाासमर्थ नहीं था.</string>
-	<string name="currently_having_chips">वर्तमान में %@ चिप्स हैं</string>
+	<string name="currently_having_chips">वर्तमान में %s चिप्स हैं</string>
 	<string name="icloud_timeout">iCloud अनुरोध समय समाप्त.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">गोपन‍ियता सेटिंग्स खोलें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0511fdfe..2015a1b6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">%@ fa</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ non ha accesso ai tuoi contatti e non può recuperare il nome dei tuoi amici esistenti. Potresti consentire l\'accesso attraverso le preferenze di iPhone per evitare qualsiasi nome di \&quot;utente sconosciuto\&quot;.</string>
+	<string name="_ago">%s fa</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s non ha accesso ai tuoi contatti e non può recuperare il nome dei tuoi amici esistenti. Potresti consentire l\'accesso attraverso le preferenze di iPhone per evitare qualsiasi nome di \&quot;utente sconosciuto\&quot;.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Una stella indica un file archiviato sul tuo account iCloud.</string>
 	<string name="activate">Abilita</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud salva e mantiene aggiornati i tuoi dati su tutti i tuoi dispositivi. Quando è attivato, i tuoi dati vengono migrati su iCloud. Potrebbe volerci qualche tempo prima che un altro dispositivo ottenga l\'accesso ai dati.</string>
@@ -153,7 +153,7 @@
 	<string name="end">Fine</string>
 	<string name="end_all_the_games_validation_popup_title">Vuoi terminare tutte le partite?</string>
 	<string name="end_date">Data di fine</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La data di fine non è stata impostata! Il formato potrebbe non essere corretto. Ecco il valore utilizzato per il parsing: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La data di fine non è stata impostata! Il formato potrebbe non essere corretto. Ecco il valore utilizzato per il parsing: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Fine del periodo di riacquisto e aumento dei bui</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">Fine del periodo di riacquisto tra meno di un minuto</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">LA FINE DELLA SESSIONE È VICINA, PREMI DETTAGLI PER TERMINARE LA TUA SESSIONE E IMPOSTARE I RISULTATI</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">Scegli un tipo</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">Questa funzionalità è bloccata e purtroppo hai disabilitato gli acquisti in-app. Controlla le tue impostazioni.</string>
 	<string name="file_directory_creation_error">Importazione non riuscita. Non è stato possibile creare alcuni file usati per l\'importazione, probabilmente a causa di mancanza di spazio.</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">Il file di nome %@ è stato salvato con successo sul tuo account iCloud.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">Il file di nome %s è stato salvato con successo sul tuo account iCloud.</string>
 	<string name="filter">Filtro</string>
 	<string name="filter_selection">Attivazione filtro</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Questo filtro non può essere eliminato perché è collegato a uno o più report.</string>
@@ -225,7 +225,7 @@
 	<string name="import_from_address_book">Usa la rubrica</string>
 	<string name="import_from_v3">Importa da Analitica del poker 3</string>
 	<string name="import_not_successfull">Problema identificato</string>
-	<string name="import_session_save_error_">Errore durante il salvataggio delle sessioni: %@</string>
+	<string name="import_session_save_error_">Errore durante il salvataggio delle sessioni: %s</string>
 	<string name="import_successfull">Importazione riuscita</string>
 	<string name="imported_session">Sessioni importate</string>
 	<string name="in">In</string>
@@ -250,7 +250,7 @@
 	<string name="live_online_room">Live/Sala</string>
 	<string name="load_from_db">Apri&#8230;</string>
 	<string name="location">Posizione</string>
-	<string name="location_">Posizione: %@,  </string>
+	<string name="location_">Posizione: %s,  </string>
 	<string name="location_empty_field_error">Devi dare un nome a questa posizione.</string>
 	<string name="location_not_track">Posizione non monitorata</string>
 	<string name="location_track">Posizione monitorata</string>
@@ -352,7 +352,7 @@
 	<string name="players">Giocatori</string>
 	<string name="players_count">Conteggio giocatori</string>
 	<string name="please_check_if_your_values_are_valid">Controlla se i tuoi valori sono validi</string>
-	<string name="please_confirm_the_import_start_">Confermi l\'importo di \'%@\'?</string>
+	<string name="please_confirm_the_import_start_">Confermi l\'importo di \'%s\'?</string>
 	<string name="please_report_a_bug">Si è verificato un problema interno. Saremmo lieti se potessi segnalare il bug con i passaggi per riprodurlo. Grazie!</string>
 	<string name="please_restart_the_app_to_load_the_theme">Riavvia l\'app per caricare il tema</string>
 	<string name="please_select_the_field_corresponding_to">Seleziona il campo corrispondente a</string>
@@ -410,11 +410,11 @@
 	<string name="result">Risultato</string>
 	<string name="resume">Riprendi</string>
 	<string name="room">Sala</string>
-	<string name="room_">Sala: %@</string>
+	<string name="room_">Sala: %s</string>
 	<string name="room_empty_field_error">Devi dare un nome a questa sala</string>
 	<string name="rooms">Sale</string>
 	<string name="running_session_state">In corso</string>
-	<string name="same_name_different_kind_custom_field_log_">Il campo personalizzato \'%@\' è già esistente nel tuo database, ma con un tipo differente. Questo campo e tutti i suoi valori saranno ignorati. Se vuoi davvero mantenere questi valori, annulla questa importazione, rinomina il campo personalizzato e riprova l\'importazione.</string>
+	<string name="same_name_different_kind_custom_field_log_">Il campo personalizzato \'%s\' è già esistente nel tuo database, ma con un tipo differente. Questo campo e tutti i suoi valori saranno ignorati. Se vuoi davvero mantenere questi valori, annulla questa importazione, rinomina il campo personalizzato e riprova l\'importazione.</string>
 	<string name="save_report_error_popup_message">Per salvare questo report devi dargli un nome e selezionare almeno una statistica</string>
 	<string name="saving_imported_data_please_wait_">Salvataggio dei dati importati in corso, attendere&#8230;</string>
 	<string name="security">Sicurezza</string>
@@ -427,7 +427,7 @@
 	<string name="services">Impostazioni</string>
 	<string name="session">Sessione</string>
 	<string name="session_duration">Durata della sessione</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Il totale vinto della sessione non è stato impostato! Ecco il valore per questo parsing: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Il totale vinto della sessione non è stato impostato! Ecco il valore per questo parsing: %s</string>
 	<string name="session_s_comments_updated_">Commenti della sessione aggiornati</string>
 	<string name="sessions">Sessioni</string>
 	<string name="set">Imposta</string>
@@ -448,7 +448,7 @@
 	<string name="standard_deviation">Deviazione standard</string>
 	<string name="start">Inizio</string>
 	<string name="start_date">Data di inizio</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La data di inizio non è stata impostata: il formato potrebbe essere errato. Ecco il valore usato durante l\'importazione: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">La data di inizio non è stata impostata: il formato potrebbe essere errato. Ecco il valore usato durante l\'importazione: %s</string>
 	<string name="start_import">Sì</string>
 	<string name="statistics">Statistiche</string>
 	<string name="stats">Stat.</string>
@@ -473,12 +473,12 @@
 	<string name="tap_or_slide">TOCCA o SCORRI</string>
 	<string name="thank_you_message">Congratulazioni! I contenuti sono ora disponibili!</string>
 	<string name="the_at_">Il %1$@ alle %2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">La posizione denominata %@ ha già queste coordinate.</string>
+	<string name="the_location_named_already_have_these_coordinates">La posizione denominata %s ha già queste coordinate.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">Non è stato possibile recuperare il tasso corrente. Verrà usato un tasso di 1 come predefinito. Puoi tuttavia modificarlo per conto tuo.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">La sessione è già esistente! Data di inizio: %1$@, data di fine:%2$@, totale vinto: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">La sessione è già esistente! Data di inizio %1$@, data di fine:%2$@, risultato netto: %3$@</string>
 	<string name="theme">Tema</string>
-	<string name="this_game_started_">La tua sessione è iniziata: %@</string>
+	<string name="this_game_started_">La tua sessione è iniziata: %s</string>
 	<string name="this_month">Questo mese</string>
 	<string name="this_week">Questa settimana</string>
 	<string name="this_year">Questo anno</string>
@@ -513,7 +513,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">Tipo</string>
 	<string name="type_de_limite">Tipo di limite</string>
-	<string name="unable_to_get_from_fixer_io_">Impossibile ottenere il tasso da fixer.io - %@</string>
+	<string name="unable_to_get_from_fixer_io_">Impossibile ottenere il tasso da fixer.io - %s</string>
 	<string name="unfollowed_">Non più seguito!</string>
 	<string name="unknown_import_format_popup_message">Il formato del file non è riconosciuto</string>
 	<string name="unknown_user">Utente sconosciuto</string>
@@ -521,7 +521,7 @@
 	<string name="user_empty_field_error">Devi dare un nome a questo giocatore</string>
 	<string name="validate">Convalida</string>
 	<string name="value">Valore</string>
-	<string name="variant_">Partita: %@,  </string>
+	<string name="variant_">Partita: %s,  </string>
 	<string name="variant_empty_name_error">Devi dare un nome a questa partita</string>
 	<string name="variant_empty_shortname_error">Devi dare un nome breve a questa partita</string>
 	<string name="version">Versione</string>
@@ -533,7 +533,7 @@
 	<string name="week_days">Giorni feriali</string>
 	<string name="weekdays_or_weekend">Giorni feriali o fine settimana</string>
 	<string name="weekend">Fine settimana</string>
-	<string name="welcome_in_">Benvenuto in %@</string>
+	<string name="welcome_in_">Benvenuto in %s</string>
 	<string name="win_ratio">Tasso di vincita</string>
 	<string name="with">Con</string>
 	<string name="withdrawal">Prelievo</string>
@@ -552,7 +552,7 @@
 	<string name="yes_use_icloud">Sì</string>
 	<string name="yesterday">Ieri</string>
 	<string name="yesterday_and_today">Oggi e ieri</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Puoi recuperare il file generato di nome %@ in iTunes.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Puoi recuperare il file generato di nome %s in iTunes.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">Spiacenti, non puoi attivare più di %i chiavi di comparazione allo stesso tempo!</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Devi disabilitare iCloud su entrambe le app prima di importare i dati da Analitica del poker 3</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Stai per assegnare i seguenti valori a tutte le sessioni importate. Controlla quanto segue:  </string>
@@ -561,7 +561,7 @@
 	<string name="add_comment">Aggiungi commento</string>
 	<string name="from_hour_">Dalle</string>
 	<string name="to_hour_">Alle</string>
-	<string name="whats_new_in_">Novità in %@?</string>
+	<string name="whats_new_in_">Novità in %s?</string>
 	<string name="releasenote_question">Ti piace Analitica del poker?</string>
 	<string name="releasenote_invitation">Dicci come stiamo andando</string>
 	<string name="releasenote_rating">Valutaci</string>
@@ -569,12 +569,12 @@
 	<string name="stop_notification_title">È ora!</string>
 	<string name="stop_notification_body">In base alla tua cronologia, sembra che inizi a stancarti. Potrebbe essere ora di fermarsi!</string>
 	<string name="stop_notifications">Notifiche di interruzione</string>
-	<string name="stop_notification_in_">Una notifica di interruzione è stata impostata tra %@</string>
+	<string name="stop_notification_in_">Una notifica di interruzione è stata impostata tra %s</string>
 	<string name="save_authorize">Salva e autorizza</string>
 	<string name="select_a_color">Seleziona un colore</string>
 	<string name="spotlight_indexing">Indicizzazione Spotlight</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ non è autorizzata ad accedere alla fotocamera. Se modifichi le tue impostazioni della privacy, devi sapere che i dati non salvati verranno perduti a causa della chiusura automatica dell\'app.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ non è autorizzata ad accedere alla libreria foto. Se modifichi le tue impostazioni della privacy, devi sapere che i dati non salvati verranno perduti a causa della chiusura automatica dell\'app.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s non è autorizzata ad accedere alla fotocamera. Se modifichi le tue impostazioni della privacy, devi sapere che i dati non salvati verranno perduti a causa della chiusura automatica dell\'app.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s non è autorizzata ad accedere alla libreria foto. Se modifichi le tue impostazioni della privacy, devi sapere che i dati non salvati verranno perduti a causa della chiusura automatica dell\'app.</string>
 	<string name="new_hand">Nuova mano</string>
 	<string name="new_note">Nuova nota</string>
 	<string name="tap_to_learn_more">Tocca su un elemento per saperne di più</string>
@@ -595,9 +595,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">condizioni</string>
 	<string name="stop_notifications_explanation">Poker Analytics cerca di valutare la durata ottimale della tua sessione e ti invierà una notifica al raggiungimento di tale durata. Richiede circa 50 sessioni.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">Non si è potuta abilitare la sincronizzazione iCloud. Forse hai dei vecchi dati di %@\' su iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">Non si è potuta abilitare la sincronizzazione iCloud. Forse hai dei vecchi dati di %s\' su iCloud.</string>
 	<string name="icloud_reset_and_retry">Cancella e riprova</string>
-	<string name="_icloud_reset_warning">Resetterai i dati di %@ su iCloud. I tuoi dati locali non verranno modificati, ma dovrai disabilitare la sincronizzazione iCloud su tutti i tuoi altri dispositivi. Sei sicuro di voler procedere?</string>
+	<string name="_icloud_reset_warning">Resetterai i dati di %s su iCloud. I tuoi dati locali non verranno modificati, ma dovrai disabilitare la sincronizzazione iCloud su tutti i tuoi altri dispositivi. Sei sicuro di voler procedere?</string>
 	<string name="remove_picture">Rimuovi immagine</string>
 	<string name="icloud_is_syncing">Sincronizzazione in corso&#8230;</string>
 	<string name="icloud_update_issue">Errore</string>
@@ -608,7 +608,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">A causa di una rilevante modifica del database, iCloud è stato disabilitato sull\'app per ragioni di sicurezza e i tuoi dati sono stati riportati localmente sul tuo dispositivo. Disabilita la sincronizzazione iCloud su tutti i tuoi altri dispositivi. Se desideri riabilitare iCloud, dovrai prima eliminare i dati presenti su iCloud.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">Non è stato possibile disabilitare la sincronizzazione iCloud.</string>
-	<string name="currently_having_chips">La disponibilità attuale è di %@ fiche</string>
+	<string name="currently_having_chips">La disponibilità attuale è di %s fiche</string>
 	<string name="icloud_timeout">La richiesta di iCloud è scaduta.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">Apri le impostazioni della privacy</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 2f4d1abe..2a5a9a09 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">%@ 前</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ では、あなたの連絡先にアクセスできないため、既存のお友達の名前を取得できません。「不明なユーザー」名を回避するには、iPhone のユーザー設定からアクセス権限を付与してください。</string>
+	<string name="_ago">%s 前</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s では、あなたの連絡先にアクセスできないため、既存のお友達の名前を取得できません。「不明なユーザー」名を回避するには、iPhone のユーザー設定からアクセス権限を付与してください。</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">星マークは、iCloud アカウントにファイルが保管されていることを表します。</string>
 	<string name="activate">有効化</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud では、ご使用のすべてのデバイスのデータを保存し、最新の状態に保ちます。アクティブ化すると、データが iCloud 移行されます。他のデバイスからそのデータにアクセスできるまでに少し時間がかかることがあります。</string>
@@ -153,7 +153,7 @@
 	<string name="end">終了</string>
 	<string name="end_all_the_games_validation_popup_title">すべてのゲームを本当に終了してもよろしいですか?</string>
 	<string name="end_date">終了日</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">終了日が設定されていません!形式が正しくない可能性があります。構文解析に使用される値は次のとおりです: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">終了日が設定されていません!形式が正しくない可能性があります。構文解析に使用される値は次のとおりです: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">リバイ期間が終了したため、ブラインドが増加します。</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">リバイ期間が 1 分以内に終了します</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">セッション終了がクローズされました。[詳細] を押してセッションを停止し、結果を設定してください</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">種類を選択</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">この機能はロックされています。残念ですが、アプリ内購入を無効にしているようです。設定を確認してください。</string>
 	<string name="file_directory_creation_error">インポートに失敗しました。インポートに使用されるいくつかのファイルを作成できませんでした。おそらく、スペースの問題が原因だと思われます。</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">ファイル %@ が iCloud アカウント上に正常に保存されました。</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">ファイル %s が iCloud アカウント上に正常に保存されました。</string>
 	<string name="filter">フィルター</string>
 	<string name="filter_selection">フィルター アクティベーション</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">このフィルターは、ひとつ以上のレポートにリンクされているため削除できませんでした。</string>
@@ -225,7 +225,7 @@
 	<string name="import_from_address_book">アドレス帳を使用</string>
 	<string name="import_from_v3">Poker Analytics 3 からインポート</string>
 	<string name="import_not_successfull">特定された問題</string>
-	<string name="import_session_save_error_">セッション保存中のエラー: %@</string>
+	<string name="import_session_save_error_">セッション保存中のエラー: %s</string>
 	<string name="import_successfull">インポート成功</string>
 	<string name="imported_session">インポートされたセッション</string>
 	<string name="in"></string>
@@ -250,7 +250,7 @@
 	<string name="live_online_room">ライブ/ルーム</string>
 	<string name="load_from_db">開きます&#8230;</string>
 	<string name="location">場所</string>
-	<string name="location_">場所: %@,  </string>
+	<string name="location_">場所: %s,  </string>
 	<string name="location_empty_field_error">この場所に名前を付けてください。</string>
 	<string name="location_not_track">トラッキングしていない場所</string>
 	<string name="location_track">トラックしている場所</string>
@@ -352,7 +352,7 @@
 	<string name="players">プレイヤー</string>
 	<string name="players_count">プレイヤーのカウント</string>
 	<string name="please_check_if_your_values_are_valid">値が有効かどうかを確認してください</string>
-	<string name="please_confirm_the_import_start_">\'%@\' のインポートを確認してください</string>
+	<string name="please_confirm_the_import_start_">\'%s\' のインポートを確認してください</string>
 	<string name="please_report_a_bug">内部問題が発生しています。バグの再現ステップとともに、バグ レポートをお送りいただけると幸いです。ありがとうございます!</string>
 	<string name="please_restart_the_app_to_load_the_theme">テーマをロードするには、アプリを再起動してください</string>
 	<string name="please_select_the_field_corresponding_to">対応するフィールドを選択してください</string>
@@ -410,11 +410,11 @@
 	<string name="result">結果</string>
 	<string name="resume">再開</string>
 	<string name="room">ルーム</string>
-	<string name="room_">ルーム: %@</string>
+	<string name="room_">ルーム: %s</string>
 	<string name="room_empty_field_error">このルームに名前を付ける必要があります</string>
 	<string name="rooms">ルーム</string>
 	<string name="running_session_state">実行中</string>
-	<string name="same_name_different_kind_custom_field_log_">カスタム フィールド \'%@\' はすでにデータベースに存在していますが、異なるタイプです。このフィールドとすべての値が無視されます。これらの値を本当に保持したい場合は、インポートをキャンセルしてカスタム フィールドの名前を変更して、インポートを再試行してください。</string>
+	<string name="same_name_different_kind_custom_field_log_">カスタム フィールド \'%s\' はすでにデータベースに存在していますが、異なるタイプです。このフィールドとすべての値が無視されます。これらの値を本当に保持したい場合は、インポートをキャンセルしてカスタム フィールドの名前を変更して、インポートを再試行してください。</string>
 	<string name="save_report_error_popup_message">このレポートを保存するには、名前を付け、少なくともひとつ以上の統計を選択する必要があります</string>
 	<string name="saving_imported_data_please_wait_">インポートされたデータを保存しています。少しお待ちください&#8230;</string>
 	<string name="security">セキュリティ</string>
@@ -427,7 +427,7 @@
 	<string name="services">設定</string>
 	<string name="session">セッション</string>
 	<string name="session_duration">セッション期間</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">セッション勝利金額が設定されました!解析に使用された値: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">セッション勝利金額が設定されました!解析に使用された値: %s</string>
 	<string name="session_s_comments_updated_">セッションのコメントが更新されました</string>
 	<string name="sessions">セッション</string>
 	<string name="set">設定</string>
@@ -448,7 +448,7 @@
 	<string name="standard_deviation">標準偏差</string>
 	<string name="start">開始</string>
 	<string name="start_date">開始日</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">開始日が設定されていません。形式が正しくない可能性があります。インポート中に使用された値: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">開始日が設定されていません。形式が正しくない可能性があります。インポート中に使用された値: %s</string>
 	<string name="start_import">はい</string>
 	<string name="statistics">統計</string>
 	<string name="stats">統計</string>
@@ -473,12 +473,12 @@
 	<string name="tap_or_slide">タップまたはスライド</string>
 	<string name="thank_you_message">おめでとうございます!コンテンツが利用できるようになりました!</string>
 	<string name="the_at_">%1$@ の %2$@ 時</string>
-	<string name="the_location_named_already_have_these_coordinates">場所名 %@ には、すでのこれらのコーディネートがあります</string>
+	<string name="the_location_named_already_have_these_coordinates">場所名 %s には、すでのこれらのコーディネートがあります</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">現在のレートを取得できませんでした。既定で、1 が使用されます。ご自身でレートを編集できます。</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">セッションがすでに存在します。開始日 %1$@、終了日: %2$@、勝利金額: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">セッションがすでに存在します。開始日 %1$@、終了日: %2$@、正味結果: %3$@</string>
 	<string name="theme">テーマ</string>
-	<string name="this_game_started_">セッションが開始されました: %@</string>
+	<string name="this_game_started_">セッションが開始されました: %s</string>
 	<string name="this_month">今月</string>
 	<string name="this_week">今週</string>
 	<string name="this_year">今年</string>
@@ -513,7 +513,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">タイプ</string>
 	<string name="type_de_limite">制限タイプ</string>
-	<string name="unable_to_get_from_fixer_io_"> fixer.io からレートを取得できませんでした - %@</string>
+	<string name="unable_to_get_from_fixer_io_"> fixer.io からレートを取得できませんでした - %s</string>
 	<string name="unfollowed_">フォローが解除されました!</string>
 	<string name="unknown_import_format_popup_message">ファイル形式が認識されません</string>
 	<string name="unknown_user">不明なユーザー</string>
@@ -521,7 +521,7 @@
 	<string name="user_empty_field_error">このプレイヤーに名前を付けてください</string>
 	<string name="validate">検証</string>
 	<string name="value">値</string>
-	<string name="variant_">ゲーム: %@、 </string>
+	<string name="variant_">ゲーム: %s、 </string>
 	<string name="variant_empty_name_error">このゲームに名前を付けてください</string>
 	<string name="variant_empty_shortname_error">このゲームに短い名前を付けてください</string>
 	<string name="version">バージョン</string>
@@ -533,7 +533,7 @@
 	<string name="week_days">平日</string>
 	<string name="weekdays_or_weekend">平日または週末</string>
 	<string name="weekend">週末</string>
-	<string name="welcome_in_">%@ へようこそ</string>
+	<string name="welcome_in_">%s へようこそ</string>
 	<string name="win_ratio">勝率</string>
 	<string name="with">次を伴う</string>
 	<string name="withdrawal">引き出し</string>
@@ -552,7 +552,7 @@
 	<string name="yes_use_icloud">はい</string>
 	<string name="yesterday">昨日</string>
 	<string name="yesterday_and_today">今日および昨日</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">生成した %@ という名前のファイルを iTunes 内で取得できます。</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">生成した %s という名前のファイルを iTunes 内で取得できます。</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">申し訳ございませんが、同時に %i を超える比較キーをアクティブ化できません!</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Poker Analytics 3 からデータをインポートする前に、両方のアプリで iCloud 無効にする必要があります</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">インポートしたすべてのセッションに下記の値を割り当てようとしています。下記を確認してください:  </string>
@@ -561,7 +561,7 @@
 	<string name="add_comment">コメントを追加</string>
 	<string name="from_hour_">から</string>
 	<string name="to_hour_">まで</string>
-	<string name="whats_new_in_">%@ での名前は何ですか?</string>
+	<string name="whats_new_in_">%s での名前は何ですか?</string>
 	<string name="releasenote_question">Poker Analytics リンクしていますか?</string>
 	<string name="releasenote_invitation">感想をお聞かせください</string>
 	<string name="releasenote_rating">App Store で評価してください</string>
@@ -569,12 +569,12 @@
 	<string name="stop_notification_title">時間です!</string>
 	<string name="stop_notification_body">履歴に基づくと、疲れが出始めそうです。停止するタイミングかもしれません!</string>
 	<string name="stop_notifications">停止のおしらせ</string>
-	<string name="stop_notification_in_">停止のお知らせが %@ に設定されています</string>
+	<string name="stop_notification_in_">停止のお知らせが %s に設定されています</string>
 	<string name="save_authorize">保存 &amp; 承認</string>
 	<string name="select_a_color">色を選択</string>
 	<string name="spotlight_indexing">スポットライト インデックス付け</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ は、カメラへのアクセスが承認されていません。プライバシー設定を修正する場合、アプリの自動終了により、未保存のデータが失われます。</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ は、フォト ライブラリーへのアクセスが承認されていません。プライバシー設定を修正する場合、アプリの自動終了により、未保存のデータが失われます。</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s は、カメラへのアクセスが承認されていません。プライバシー設定を修正する場合、アプリの自動終了により、未保存のデータが失われます。</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s は、フォト ライブラリーへのアクセスが承認されていません。プライバシー設定を修正する場合、アプリの自動終了により、未保存のデータが失われます。</string>
 	<string name="new_hand">新しいハンド</string>
 	<string name="new_note">新しいメモ</string>
 	<string name="tap_to_learn_more">アイテムをタップして詳細を表示</string>
@@ -595,9 +595,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">条件</string>
 	<string name="stop_notifications_explanation">Poker Analyticsでは、最適なセッション期間を見積もり、その期間に到達したときに、通知をお送りします。約 50 セッションが必要です。</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud同期を有効化できませんでした。iCloud上に以前の%@のデータがある可能性があります。</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud同期を有効化できませんでした。iCloud上に以前の%sのデータがある可能性があります。</string>
 	<string name="icloud_reset_and_retry">クリア&amp;リトライ</string>
-	<string name="_icloud_reset_warning">iCloud上の%@データをリセットします。ローカルデータは修正されませんが、ほかのすべてのデバイスのiCloud同期を無効にする必要があります。本当に実行してもよろしいですか?</string>
+	<string name="_icloud_reset_warning">iCloud上の%sデータをリセットします。ローカルデータは修正されませんが、ほかのすべてのデバイスのiCloud同期を無効にする必要があります。本当に実行してもよろしいですか?</string>
 	<string name="remove_picture">写真を除去</string>
 	<string name="icloud_is_syncing">同期中</string>
 	<string name="icloud_update_issue">エラー</string>
@@ -608,7 +608,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">データベースに大きな変更を加えたため、iCloudは、安全性を考慮して無効化されており、ご使用のデータは、デバイスにローカルに移動されています。ご使用のすべてのデバイスで、iCloudとの同期を無効化してください。iCloudをもう一度有効化する場合は、iCloudのデータを前もって削除する必要があります。</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">iCloud Syncを無効化できませんでした。</string>
-	<string name="currently_having_chips">現在、%@チップを受け取っています</string>
+	<string name="currently_having_chips">現在、%sチップを受け取っています</string>
 	<string name="icloud_timeout">iCloudリクエストのタイムアウトです。</string>
 	<string name="vs">VS</string>
 	<string name="open_privacy_settings">プライバシー設定を開く</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 72b0b46c..99aafec2 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">%@ atrás</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">O %@ não possui acesso à lista de contatos e não pode obter os nomes dos seus amigos. Você pode permitir o acesso nos ajustes dos iPhone para evitar exibir \'usuário desconhecido\' no lugar do nome.</string>
+	<string name="_ago">%s atrás</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">O %s não possui acesso à lista de contatos e não pode obter os nomes dos seus amigos. Você pode permitir o acesso nos ajustes dos iPhone para evitar exibir \'usuário desconhecido\' no lugar do nome.</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Um asterisco indica um arquivo armazenado na sua conta do iCloud.</string>
 	<string name="activate">Ativar</string>
 	<string name="activate_icloud_storage_detailed_explaination">O iCloud salva e mantém os seus dados atualizados em todos os seus aparelhos. Quando ativado, os seus dados migram para o iCloud. Pode levar algum tempo até que outro aparelho tenha acesso aos seus dados.</string>
@@ -153,7 +153,7 @@
 	<string name="end">Fim</string>
 	<string name="end_all_the_games_validation_popup_title">Deseja finalizar todos os jogos?</string>
 	<string name="end_date">Data final</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">A data final não foi definida! O formato pode estar incorreto. Este é o valor usado na análise: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">A data final não foi definida! O formato pode estar incorreto. Este é o valor usado na análise: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Fim do período de re-buy e aumento das blinds</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">Fim do período de re-buy em menos de um minuto.</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">O FIM DA SESSÃO ESTÁ PRÓXIMO, PRESSIONE OS DETALHES PARA PARAR A SUA SESSÃO E DEFINIR OS RESULTADOS</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">Escolha um formato</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">Esse recurso está bloqueado e infelizmente você desativou as compras no app. Verifique os seus ajustes.</string>
 	<string name="file_directory_creation_error">A importação falhou. Alguns arquivos usados na importação não puderam ser criados, isso provavelmente se deve à falta de espaço</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">O arquivo %@ foi salvo com sucesso na sua conta do iCloud.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">O arquivo %s foi salvo com sucesso na sua conta do iCloud.</string>
 	<string name="filter">Filtro</string>
 	<string name="filter_selection">Ativação do filtro</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Este filtro não pode ser excluído porque está conectado a um ou mais relatórios.</string>
@@ -225,7 +225,7 @@
 	<string name="import_from_address_book">Usar agenda</string>
 	<string name="import_from_v3">Importar do Poker Analytics 3</string>
 	<string name="import_not_successfull">Problemas identificados</string>
-	<string name="import_session_save_error_">Erro ao salvar sessões: %@</string>
+	<string name="import_session_save_error_">Erro ao salvar sessões: %s</string>
 	<string name="import_successfull">Importação bem sucedida</string>
 	<string name="imported_session">Sessões importadas</string>
 	<string name="in">Em</string>
@@ -250,7 +250,7 @@
 	<string name="live_online_room">Ao vivo/Sala</string>
 	<string name="load_from_db">Abrir&#8230;</string>
 	<string name="location">Local</string>
-	<string name="location_">Local: %@,  </string>
+	<string name="location_">Local: %s,  </string>
 	<string name="location_empty_field_error">Você precisa nomear esse local.</string>
 	<string name="location_not_track">Localização não rastreada</string>
 	<string name="location_track">Localização rastreada</string>
@@ -352,7 +352,7 @@
 	<string name="players">Jogadores</string>
 	<string name="players_count">Número de jogadores</string>
 	<string name="please_check_if_your_values_are_valid">Verifique se os valores são válidos</string>
-	<string name="please_confirm_the_import_start_">Confirmar a importação de \'%@\'?</string>
+	<string name="please_confirm_the_import_start_">Confirmar a importação de \'%s\'?</string>
 	<string name="please_report_a_bug">Ocorreu um problema interno. Agradeceríamos se você puder reportar o bug incluindo os passos para reproduzi-lo. Obrigado! </string>
 	<string name="please_restart_the_app_to_load_the_theme">Reinicie o app para carregar o tema</string>
 	<string name="please_select_the_field_corresponding_to">Selecione o campo correspondente a</string>
@@ -410,11 +410,11 @@
 	<string name="result">Resultado</string>
 	<string name="resume">Retomar</string>
 	<string name="room">Sala</string>
-	<string name="room_">Sala: %@</string>
+	<string name="room_">Sala: %s</string>
 	<string name="room_empty_field_error">Você precisa nomear essa sala</string>
 	<string name="rooms">Salas</string>
 	<string name="running_session_state">Correndo</string>
-	<string name="same_name_different_kind_custom_field_log_">O campo personalizado \'%@\' já existe no seu banco de dados, mas com um tipo diferente. Esse campo e todos os seus valores, serão ignorados. Se realmente deseja manter esses valores, cancele esta importação, renomeie o campo personalizado e tente importar novamente.</string>
+	<string name="same_name_different_kind_custom_field_log_">O campo personalizado \'%s\' já existe no seu banco de dados, mas com um tipo diferente. Esse campo e todos os seus valores, serão ignorados. Se realmente deseja manter esses valores, cancele esta importação, renomeie o campo personalizado e tente importar novamente.</string>
 	<string name="save_report_error_popup_message">Para salvar esse relatório, é necessário nomeá-lo e selecionar pelo menos uma estatística</string>
 	<string name="saving_imported_data_please_wait_">Salvando dados importados, aguarde&#8230;</string>
 	<string name="security">Segurança</string>
@@ -427,7 +427,7 @@
 	<string name="services">Ajustes</string>
 	<string name="session">Sessão</string>
 	<string name="session_duration">Duração da sessão</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">A Sessão Quantia de Ganhos não foi definida! Aqui está o valor usado na análise: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">A Sessão Quantia de Ganhos não foi definida! Aqui está o valor usado na análise: %s</string>
 	<string name="session_s_comments_updated_">Comentários da sessão atualizados</string>
 	<string name="sessions">Sessões</string>
 	<string name="set">Definir</string>
@@ -448,7 +448,7 @@
 	<string name="standard_deviation">Fora do padrão</string>
 	<string name="start">Iniciar</string>
 	<string name="start_date">Data inicial</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">A data inicial não foi definida, o formato pode estar incorreto. Aqui está o valor usado durante a importação: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">A data inicial não foi definida, o formato pode estar incorreto. Aqui está o valor usado durante a importação: %s</string>
 	<string name="start_import">Sim</string>
 	<string name="statistics">Estatísticas</string>
 	<string name="stats">Estatísticas</string>
@@ -473,12 +473,12 @@
 	<string name="tap_or_slide">TOQUE ou DESLIZE</string>
 	<string name="thank_you_message">Parabéns! O conteúdo já está disponível!</string>
 	<string name="the_at_">%1$@ às %2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">Já existe um local chamado %@ com essas coordenadas.</string>
+	<string name="the_location_named_already_have_these_coordinates">Já existe um local chamado %s com essas coordenadas.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">A taxa atual não pôde ser obtida. Será usado 1 como taxa padrão. Você pode editar a taxa manualmente.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">A sessão já existe! Data inicial: %1$@, Data final:%2$@, Quantia ganha: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">A sessão já existe! Data Inicial: %1$@, Data Final:%2$@, Resultado Líquido: %3$@</string>
 	<string name="theme">Tema</string>
-	<string name="this_game_started_">Sua sessão começou: %@</string>
+	<string name="this_game_started_">Sua sessão começou: %s</string>
 	<string name="this_month">Este mês</string>
 	<string name="this_week">Esta semana</string>
 	<string name="this_year">Este ano</string>
@@ -513,7 +513,7 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">Tipo</string>
 	<string name="type_de_limite">Tipo de limite</string>
-	<string name="unable_to_get_from_fixer_io_">Não foi possível obter taxa do fixer.io - %@</string>
+	<string name="unable_to_get_from_fixer_io_">Não foi possível obter taxa do fixer.io - %s</string>
 	<string name="unfollowed_">Deixou de seguir!</string>
 	<string name="unknown_import_format_popup_message">Formato de arquivo desconhecido</string>
 	<string name="unknown_user">Usuário desconhecido</string>
@@ -521,7 +521,7 @@
 	<string name="user_empty_field_error">Você precisa nomear esse jogador</string>
 	<string name="validate">Validar</string>
 	<string name="value">Valor</string>
-	<string name="variant_">Jogo: %@,  </string>
+	<string name="variant_">Jogo: %s,  </string>
 	<string name="variant_empty_name_error">Você precisa nomear esse jogo</string>
 	<string name="variant_empty_shortname_error">Você precisar dar um nome curto a esse jogo</string>
 	<string name="version">Versão</string>
@@ -533,7 +533,7 @@
 	<string name="week_days">Dias úteis</string>
 	<string name="weekdays_or_weekend">Dias Úteis ou Final de Semana</string>
 	<string name="weekend">Final de semana</string>
-	<string name="welcome_in_">Bem-vindo ao %@</string>
+	<string name="welcome_in_">Bem-vindo ao %s</string>
 	<string name="win_ratio">Taxa de vitórias</string>
 	<string name="with">Com</string>
 	<string name="withdrawal">Saque</string>
@@ -552,7 +552,7 @@
 	<string name="yes_use_icloud">Sim</string>
 	<string name="yesterday">Ontem</string>
 	<string name="yesterday_and_today">Hoje e ontem</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Você pode obter o arquivo gerado %@ dentro do iTunes.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Você pode obter o arquivo gerado %s dentro do iTunes.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">Você não pode ativar mais de %i chaves de comparação ao mesmo tempo!</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Você deve desativar o iCloud em ambos os apps antes de importar os seus dados do Poker Analytics 3</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Você está prestes a designar os seguintes valores a todas a sessões importadas. Confira: </string>
@@ -561,7 +561,7 @@
 	<string name="add_comment">Adicionar comentário</string>
 	<string name="from_hour_">De</string>
 	<string name="to_hour_">Até</string>
-	<string name="whats_new_in_">O que há de novo no %@?</string>
+	<string name="whats_new_in_">O que há de novo no %s?</string>
 	<string name="releasenote_question">Curtindo o Poker Analytics?</string>
 	<string name="releasenote_invitation">Por favor, nos diga como estamos indo</string>
 	<string name="releasenote_rating">Avalie-nos</string>
@@ -569,12 +569,12 @@
 	<string name="stop_notification_title">Já está na hora!</string>
 	<string name="stop_notification_body">Com base no seu histórico, parece que você está ficando fatigado. Talvez seja hora de parar!</string>
 	<string name="stop_notifications">Notificações para parar</string>
-	<string name="stop_notification_in_">Uma notificação para parar foi definida em %@</string>
+	<string name="stop_notification_in_">Uma notificação para parar foi definida em %s</string>
 	<string name="save_authorize">Salvar e autorizar</string>
 	<string name="select_a_color">Selecione uma cor</string>
 	<string name="spotlight_indexing">Idexação do Spotlight</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">O %@ não tem autorização para acessar a câmera. Se você alterar os ajustes de privacidade, tenha em mente que os dados não salvos serão perdidos devido ao fechamento automático do app.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">O %@ não tem autorização para acessar a biblioteca de fotos. Se você alterar os ajustes de privacidade, tenha em mente que os dados não salvos serão perdidos devido ao fechamento automático do app.</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">O %s não tem autorização para acessar a câmera. Se você alterar os ajustes de privacidade, tenha em mente que os dados não salvos serão perdidos devido ao fechamento automático do app.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">O %s não tem autorização para acessar a biblioteca de fotos. Se você alterar os ajustes de privacidade, tenha em mente que os dados não salvos serão perdidos devido ao fechamento automático do app.</string>
 	<string name="new_hand">Nova mão</string>
 	<string name="new_note">Nova nota</string>
 	<string name="tap_to_learn_more">Toque em um item para saber mais</string>
@@ -595,9 +595,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">Condições</string>
 	<string name="stop_notifications_explanation">O Poker Analytics tenta estimar a melhor duração de sessão para você e avisará quando você atingi-la. São necessárias cerca de 50 sessões.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">Não foi possível ativar o iCloud Sync. Talvez você tenha dados antigos do %@ no iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">Não foi possível ativar o iCloud Sync. Talvez você tenha dados antigos do %s no iCloud.</string>
 	<string name="icloud_reset_and_retry">Limpar e tentar novamente</string>
-	<string name="_icloud_reset_warning">Você redefinirá os dados do %@ no iCloud. Os dados locais não serão modificados, mas será necessário desativar o iCloud Sync em todos os seus outros aparelhos. Deseja prosseguir?</string>
+	<string name="_icloud_reset_warning">Você redefinirá os dados do %s no iCloud. Os dados locais não serão modificados, mas será necessário desativar o iCloud Sync em todos os seus outros aparelhos. Deseja prosseguir?</string>
 	<string name="remove_picture">Remover foto</string>
 	<string name="icloud_is_syncing">Sincronizando</string>
 	<string name="icloud_update_issue">Erro</string>
@@ -608,7 +608,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">Devido a uma modificação importante no banco de dados, o iCloud foi desativado no aplicativo por motivos de segurança e os seus dados foram movidos de volta para o dispositivo localmente. Desative a sincronização do iCloud em todos os outros seus dispositivos. Se desejar reativar o iCloud, você terá que apagar o os dados do iCloud antes.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">A Sincronização do iCloud não pôde ser desativada.</string>
-	<string name="currently_having_chips">Há no momento %@ chips</string>
+	<string name="currently_having_chips">Há no momento %s chips</string>
 	<string name="icloud_timeout">O tempo da solicitação do iCloud se esgotou.</string>
 	<string name="vs">vs.</string>
 	<string name="open_privacy_settings">Abrir ajustes de privacidade</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d610a576..1f50c78d 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -1,8 +1,8 @@
 <resources>
 	<string name="app_name">Poker Analytics</string>
 
-	<string name="_ago">%@ назад</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ не имеет доступа к адресной книге и не может определить имена выбранных вами друзей. Предоставьте доступ к контактам в настройках телефона чтобы исключить имена \'неизвестный пользователь\'</string>
+	<string name="_ago">%s назад</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s не имеет доступа к адресной книге и не может определить имена выбранных вами друзей. Предоставьте доступ к контактам в настройках телефона чтобы исключить имена \'неизвестный пользователь\'</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">Звёздочкой отмечены файлы сохранённые на вашем аккаунте iCloud.</string>
 	<string name="activate">Активировать</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud сохраняет и поддерживает в актуальном состоянии ваши данные на всех ваших устройствах. После активации ваши  данные будут перемещены на  iCloud. Потребуется некоторое время прежде чем остальные ваши устройства получат доступ к этим данным.</string>
@@ -153,7 +153,7 @@
 	<string name="end">Конец</string>
 	<string name="end_all_the_games_validation_popup_title">Вы действительно хотите завершить все текущие игры?</string>
 	<string name="end_date">Финальная дата</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Конечная дата не задана! Возможно, некорректный формат. Здесь пример формата используемого для обработки: %@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Конечная дата не задана! Возможно, некорректный формат. Здесь пример формата используемого для обработки: %s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">Конец периода ребаев и увеличение блайндов</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">Окончание период докупок менее чем через минуту</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">Конец сессии закрыт. Нажмите кнопку \'подробнее\'  для установки результатов сессии.</string>
@@ -172,7 +172,7 @@
 	<string name="export_popup_title">Выберите тип</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">Данная возможность заблокирована и у вас отключена возможность совершения внутри-программных покупок. Пожалуйста проверьте настройки вашего устройства.</string>
 	<string name="file_directory_creation_error">Сбой импорта. Некоторые файлы при импорте не удалось создать. Возможно, это связанно с недостатком места на устройстве.</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">Файл с названием %@ успешно сохранён на iCloud.</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">Файл с названием %s успешно сохранён на iCloud.</string>
 	<string name="filter">Фильтр</string>
 	<string name="filter_selection">Выбор фильтра</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">Фильтр не может быть удалён так как он используется в отчёте.</string>
@@ -225,7 +225,7 @@
 	<string name="import_from_address_book">Использовать адресную книгу</string>
 	<string name="import_from_v3">Импорт из Poker Analytics 3</string>
 	<string name="import_not_successfull">Выявлены проблемы</string>
-	<string name="import_session_save_error_">Произошла ошибка при сохранении сессий: %@</string>
+	<string name="import_session_save_error_">Произошла ошибка при сохранении сессий: %s</string>
 	<string name="import_successfull">Экспорт успешен</string>
 	<string name="imported_session">Импортированы сессии</string>
 	<string name="in">В</string>
@@ -253,7 +253,7 @@
 	<string name="live_online_room">Вживую/Интернет</string>
 	<string name="load_from_db">Открыть&#8230;</string>
 	<string name="location">Место</string>
-	<string name="location_">Место: %@, </string>
+	<string name="location_">Место: %s, </string>
 	<string name="location_empty_field_error">Вы должны поименовать это место.</string>
 	<string name="location_not_track">Не указанная локация</string>
 	<string name="location_track">Учтённая локация</string>
@@ -355,7 +355,7 @@
 	<string name="players">Игроков</string>
 	<string name="players_count">Количество игроков</string>
 	<string name="please_check_if_your_values_are_valid">Пожалуйста проверьте указанные значения</string>
-	<string name="please_confirm_the_import_start_">Пожалуйста, подтвердите импорт \'%@\'?</string>
+	<string name="please_confirm_the_import_start_">Пожалуйста, подтвердите импорт \'%s\'?</string>
 	<string name="please_report_a_bug">Произошла ошибка приложения. Пожалуйста, сообщите об ошибке нам, а также опишите действия, которые ее вызвали. Спасибо!</string>
 	<string name="please_restart_the_app_to_load_the_theme">Для смены оформления перезапустите приложение</string>
 	<string name="please_select_the_field_corresponding_to">Пожалуйста выберите поле связанное с</string>
@@ -413,11 +413,11 @@
 	<string name="result">Результат</string>
 	<string name="resume">Продолжить</string>
 	<string name="room">Рум</string>
-	<string name="room_">Рум: %@</string>
+	<string name="room_">Рум: %s</string>
 	<string name="room_empty_field_error">Поименуйте этот рум</string>
 	<string name="rooms">Покерные румы</string>
 	<string name="running_session_state">В процессе…</string>
-	<string name="same_name_different_kind_custom_field_log_">Пользовательское поле \'%@\' уже существует в вашей базе, но с другим типом. Это поле и все его значения будут проигнорированы. Если вам необходимо оставить эти значения, пожалуйста,  отмените текущий импорт, переименуйте ваше поле и повторите импорт.</string>
+	<string name="same_name_different_kind_custom_field_log_">Пользовательское поле \'%s\' уже существует в вашей базе, но с другим типом. Это поле и все его значения будут проигнорированы. Если вам необходимо оставить эти значения, пожалуйста,  отмените текущий импорт, переименуйте ваше поле и повторите импорт.</string>
 	<string name="save_report_error_popup_message">Поименуйте отчёт и выберите как минимум одну статистику для сохранения отчёта</string>
 	<string name="saving_imported_data_please_wait_">Сохраняются импортируемые данные, пожалуйста подождите&#8230;</string>
 	<string name="security">Безопастность</string>
@@ -430,7 +430,7 @@
 	<string name="services">Настройки</string>
 	<string name="session">Сессия</string>
 	<string name="session_duration">Продолжительность сессии</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Результат сессии не определён! Здесь значение используемое при обработке: %@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Результат сессии не определён! Здесь значение используемое при обработке: %s</string>
 	<string name="session_s_comments_updated_">Коментарии к сессии обновлены</string>
 	<string name="sessions">Сессии</string>
 	<string name="set">Установить</string>
@@ -451,7 +451,7 @@
 	<string name="standard_deviation">Стандартное отклонение</string>
 	<string name="start">Старт</string>
 	<string name="start_date">Начальная дата</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Начальная дата не установлена, формат может быть неверен.  Здесь значение используемое при импорте: %@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Начальная дата не установлена, формат может быть неверен.  Здесь значение используемое при импорте: %s</string>
 	<string name="start_import">Да</string>
 	<string name="statistics">Статистика</string>
 	<string name="stats">Статистика</string>
@@ -475,13 +475,13 @@
 	<string name="take_a_picture">Сделать снимок</string>
 	<string name="tap_or_slide">ТАП или СЛАЙД</string>
 	<string name="thank_you_message">Поздравляем, новый контент доступен.</string>
-	<string name="the_at_">THE %@ AT %@</string>
-	<string name="the_location_named_already_have_these_coordinates">Место с названием %@ уже имеет эти координаты.</string>
+	<string name="the_at_">THE %s AT %s</string>
+	<string name="the_location_named_already_have_these_coordinates">Место с названием %s уже имеет эти координаты.</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">Не удаётся получить текущий курс валют. Будет использоваться один к одному. Вы можете отредактировать курс самостоятельно.</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">Сессия уже существует! Дата начала: %1$@, Дата завершения:%2$@, Выиграно: %3$@</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">Сессия уже существует! Дата начала: %1$@, Дата завершения:%2$@, Результат: %3$@</string>
 	<string name="theme">Оформление</string>
-	<string name="this_game_started_">Эта игра начата %@</string>
+	<string name="this_game_started_">Эта игра начата %s</string>
 	<string name="this_month">Текущий месяц</string>
 	<string name="this_week">Текущая неделя</string>
 	<string name="this_year">Текущий год</string>
@@ -516,7 +516,7 @@
 	<string name="twitter">Твиттер</string>
 	<string name="type">Тип</string>
 	<string name="type_de_limite">Тип лимита</string>
-	<string name="unable_to_get_from_fixer_io_">Невозможно получить данные от fixer.io - %@</string>
+	<string name="unable_to_get_from_fixer_io_">Невозможно получить данные от fixer.io - %s</string>
 	<string name="unfollowed_">Подписка отменена!</string>
 	<string name="unknown_import_format_popup_message">Формат файла не распознан</string>
 	<string name="unknown_user">Неизвестный пользователь</string>
@@ -524,7 +524,7 @@
 	<string name="user_empty_field_error">Вы должны поименовать вашего игрок</string>
 	<string name="validate">Проверить</string>
 	<string name="value">Значение</string>
-	<string name="variant_">Игра: %@, </string>
+	<string name="variant_">Игра: %s, </string>
 	<string name="variant_empty_name_error">Пожалуйста укажите имя для этой игры</string>
 	<string name="variant_empty_shortname_error">Пожалуйста укажите короткое название для этой игры</string>
 	<string name="version">Версия</string>
@@ -536,7 +536,7 @@
 	<string name="week_days">Рабочие дни</string>
 	<string name="weekdays_or_weekend">Рабочие или выходные дни</string>
 	<string name="weekend">Выходные</string>
-	<string name="welcome_in_">Добро пожаловать в %@</string>
+	<string name="welcome_in_">Добро пожаловать в %s</string>
 	<string name="win_ratio">Процент выигрышей</string>
 	<string name="with">с</string>
 	<string name="withdrawal">Снятие денег</string>
@@ -555,7 +555,7 @@
 	<string name="yes_use_icloud">Да, использовать iCloud</string>
 	<string name="yesterday">Вчера</string>
 	<string name="yesterday_and_today">Сегодня и вчера</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Вы можете получить созданный с именем %@ файл с помощью программы iTunes.</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">Вы можете получить созданный с именем %s файл с помощью программы iTunes.</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">НЕЛЬЗЯ ВЫБРАТЬ БОЛЕЕ %i ПАРАМЕТРОВ ДЛЯ СРАВНЕНИЯ</string>
 	<string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">Перед импортом данных из Poker Analytics 3 отключите iCloud в обоих приложениях</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">Вы собираетесь задать нижеследующее значение для всех импортируемых сессий. Пожалуйста проверьте данные: </string>
@@ -564,7 +564,7 @@
 	<string name="add_comment">Добавить комментарий</string>
 	<string name="from_hour_">От</string>
 	<string name="to_hour_">До</string>
-	<string name="whats_new_in_">Что нового в %@?</string>
+	<string name="whats_new_in_">Что нового в %s?</string>
 	<string name="releasenote_question">Нравится Poker Analytics?</string>
 	<string name="releasenote_invitation">Сообщите нам свое мнение</string>
 	<string name="releasenote_rating">Оцените нас в App Store</string>
@@ -573,12 +573,12 @@
 	<string name="stop_notification_title">На основании вашей истории, похоже, вы начали уставать. Возможно, пора остановиться!\n
 </string>
 	<string name="stop_notifications">Остановить уведомления</string>
-	<string name="stop_notification_in_">Остановка уведомлений настроена в %@</string>
+	<string name="stop_notification_in_">Остановка уведомлений настроена в %s</string>
 	<string name="save_authorize">Сохранить и разрешить доступ</string>
 	<string name="select_a_color">Выбрать цвет</string>
 	<string name="spotlight_indexing">Индексация в Spotlight</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ не имеет права доступа к камере. Если вы измените параметры конфиденциальности, имейте в виду, что несохраненные данные будут потеряны из-за автоматического закрытия приложения.</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ не имеет права доступа к фотобиблиотеке. Если вы измените параметры конфиденциальности, имейте в виду, что несохраненные данные будут потеряны из-за автоматического закрытия приложения. </string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s не имеет права доступа к камере. Если вы измените параметры конфиденциальности, имейте в виду, что несохраненные данные будут потеряны из-за автоматического закрытия приложения.</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s не имеет права доступа к фотобиблиотеке. Если вы измените параметры конфиденциальности, имейте в виду, что несохраненные данные будут потеряны из-за автоматического закрытия приложения. </string>
 	<string name="new_hand">Новая рука</string>
 	<string name="new_note">Новая заметка</string>
 	<string name="tap_to_learn_more">Коснитесь элемента, чтобы узнать больше</string>
@@ -599,9 +599,9 @@
 	<string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
 	<string name="terms">условия</string>
 	<string name="stop_notifications_explanation">Poker Analytics пытается оценить оптимальную продолжительность сеанса и отправит уведомление, когда вы достигнете этой продолжительности. Требуется около 50 сеансов.</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync не удалось включить. Возможно, у вас есть более старые данные %@\' на iCloud.</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync не удалось включить. Возможно, у вас есть более старые данные %s\' на iCloud.</string>
 	<string name="icloud_reset_and_retry">Очистить и повторить попытку</string>
-	<string name="_icloud_reset_warning">Вы сбросите данные %@ на iCloud, ваши локальные данные не будут изменены, но вам придется отключить iCloud Sync на всех ваших других устройствах. Вы уверены, что хотите это сделать?</string>
+	<string name="_icloud_reset_warning">Вы сбросите данные %s на iCloud, ваши локальные данные не будут изменены, но вам придется отключить iCloud Sync на всех ваших других устройствах. Вы уверены, что хотите это сделать?</string>
 	<string name="remove_picture">Удалить изображение</string>
 	<string name="icloud_is_syncing">Синхронизируется</string>
 	<string name="icloud_update_issue">Ошибка</string>
@@ -612,7 +612,7 @@
 	<string name="icloud_ok_and_ready">OK</string>
 	<string name="icloud_migration_failure_error_message">Ввиду значительной модификации базы данных  в приложении отключен iCloud для обеспечения безопасности, а ваши данные перемещены обратно на ваше локальное устройство. Пожалуйста, отключите синхронизацию с iCloud на всех других устройствах. Если вы хотите снова включить iCloud, вам нужно заранее удалить данные iCloud.</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">iCloud Sync не удалось отключить.</string>
-	<string name="currently_having_chips">Сейчас имеется %@ фишек</string>
+	<string name="currently_having_chips">Сейчас имеется %s фишек</string>
 	<string name="icloud_timeout">Истекло время ожидания iCloud.</string>
 	<string name="vs">против</string>
 	<string name="open_privacy_settings">Открыть настройки приватности</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bf0c02e8..c67cb572 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -48,8 +48,8 @@
 
 	<!-- Translated -->
 
-    <string name="_ago">%@ ago</string>
-    <string name="_doesn_t_have_access_to_your_contacts_alert_message">%@ doesn\'t have access to your contacts and cannot retrieve the name of your existing friends. You might give access through iPhone preferences to avoid any \'unknown user\' name.</string>
+    <string name="_ago">%s ago</string>
+    <string name="_doesn_t_have_access_to_your_contacts_alert_message">%s doesn\'t have access to your contacts and cannot retrieve the name of your existing friends. You might give access through iPhone preferences to avoid any \'unknown user\' name.</string>
     <string name="_indicates_that_the_file_is_on_your_icloud_account_">A star denotes a file stored on your iCloud account.</string>
     <string name="activate">Enable</string>
     <string name="activate_icloud_storage_detailed_explaination">iCloud saves and keeps your data up to date on all your devices. When activated, your data are migrated to iCloud, it may take some time before an other device get access to your data.</string>
@@ -200,7 +200,7 @@
     <string name="end">End</string>
     <string name="end_all_the_games_validation_popup_title">Do you want to end all games?</string>
     <string name="end_date">End date</string>
-    <string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">End date hasn\'t been set! The format may not be correct. Here is the value used for parsing: %@</string>
+    <string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">End date hasn\'t been set! The format may not be correct. Here is the value used for parsing: %s</string>
     <string name="end_of_rebuy_period_and_blinds_level_up">End of re-buy period and blinds increase</string>
     <string name="end_of_rebuy_period_in_less_than_one_minute">End of re-buy period in less than a minute</string>
     <string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">END OF SESSION IS CLOSE, PRESS DETAILS TO STOP YOUR SESSION AND SET RESULTS</string>
@@ -219,7 +219,7 @@
     <string name="export_popup_title">Choose a type</string>
     <string name="feature_locked_and_inapp_purchase_disabled">This feature is locked and unfortunately you\'ve disabled in-app purchases. Please check your settings.</string>
     <string name="file_directory_creation_error">Import failed. Some files used for the import could not be created, this is probably due to a lack of space</string>
-    <string name="file_named_was_successfully_saved_on_your_icloud_account">File named %@ was successfully saved on your iCloud account.</string>
+    <string name="file_named_was_successfully_saved_on_your_icloud_account">File named %s was successfully saved on your iCloud account.</string>
     <string name="filter">Filter</string>
     <string name="filter_selection">Filter activation</string>
     <string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">This filter cannot be deleted because it is linked to one or more reports.</string>
@@ -272,7 +272,7 @@
     <string name="import_from_address_book">Use address book</string>
     <string name="import_from_v3">Import from Poker Analytics 3</string>
     <string name="import_not_successfull">Identified issue(s)</string>
-    <string name="import_session_save_error_">Error when saving sessions: %@</string>
+    <string name="import_session_save_error_">Error when saving sessions: %s</string>
     <string name="import_successfull">Import successful</string>
     <string name="imported_session">Imported sessions</string>
     <string name="in">In</string>
@@ -297,7 +297,7 @@
     <string name="live_online_room">Live/Room</string>
     <string name="load_from_db">Open&#8230;</string>
     <string name="location">Location</string>
-    <string name="location_">Location: %@, </string>
+    <string name="location_">Location: %s, </string>
     <string name="location_empty_field_error">You need to name this location.</string>
     <string name="location_not_track">Untracked location</string>
     <string name="location_track">Tracked location</string>
@@ -399,7 +399,7 @@
     <string name="players">Players</string>
     <string name="players_count">Player\'s count</string>
     <string name="please_check_if_your_values_are_valid">Please check if your values are valid</string>
-    <string name="please_confirm_the_import_start_">Please confirm the import of \'%@\'?</string>
+    <string name="please_confirm_the_import_start_">Please confirm the import of \'%s\'?</string>
     <string name="please_report_a_bug">An internal issue has occurred. We would be glad if you could report a bug with the steps to reproduce the bug. Thank you!</string>
     <string name="please_restart_the_app_to_load_the_theme">Please restart the app to load the theme</string>
     <string name="please_select_the_field_corresponding_to">Please select the field corresponding to</string>
@@ -457,11 +457,11 @@
     <string name="result">Result</string>
     <string name="resume">Resume</string>
     <string name="room">Room</string>
-    <string name="room_">Room: %@</string>
+    <string name="room_">Room: %s</string>
     <string name="room_empty_field_error">You need to give a name to this room</string>
     <string name="rooms">Rooms</string>
     <string name="running_session_state">Playing</string>
-    <string name="same_name_different_kind_custom_field_log_">The custom field \'%@\' already exists in your database but with a different type. This field, and all its values, will be ignored. If you really want to keep these values, cancel this import, rename the custom field, and retry the import.</string>
+    <string name="same_name_different_kind_custom_field_log_">The custom field \'%s\' already exists in your database but with a different type. This field, and all its values, will be ignored. If you really want to keep these values, cancel this import, rename the custom field, and retry the import.</string>
     <string name="save_report_error_popup_message">You need to name it and to select at least one statistic to save this report</string>
     <string name="saving_imported_data_please_wait_">Saving imported data, please wait&#8230;</string>
     <string name="security">Security</string>
@@ -474,7 +474,7 @@
     <string name="services">Settings</string>
     <string name="session">Session</string>
     <string name="session_duration">Session duration</string>
-    <string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Session Won Amount has not been set! Here is the value used for parsing: %@</string>
+    <string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">Session Won Amount has not been set! Here is the value used for parsing: %s</string>
     <string name="session_s_comments_updated_">Session\'s comments updated</string>
     <string name="sessions">Sessions</string>
     <string name="set">Set</string>
@@ -495,7 +495,7 @@
     <string name="standard_deviation">Standard deviation</string>
     <string name="start">Start</string>
     <string name="start_date">Start date</string>
-    <string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Start date hasn\'t been set, the format may be incorrect. Here is the value used during import: %@</string>
+    <string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">Start date hasn\'t been set, the format may be incorrect. Here is the value used during import: %s</string>
     <string name="start_import">Yes</string>
     <string name="statistics">Statistics</string>
     <string name="stats">Stats</string>
@@ -520,12 +520,12 @@
     <string name="tap_or_slide">TAP or SLIDE</string>
     <string name="thank_you_message">Congrats! The content is now available!</string>
     <string name="the_at_">The %1$@ at %2$@</string>
-    <string name="the_location_named_already_have_these_coordinates">The location named %@ already has these coordinates.</string>
+    <string name="the_location_named_already_have_these_coordinates">The location named %s already has these coordinates.</string>
     <string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">The current rate couldn\'t be retrieved. A rate of 1 will be used by default. You can still edit the rate by yourself.</string>
     <string name="the_session_already_exists_start_date_end_date_amount_won_">The session already exists! Start Date: %1$@, End Date:%2$@, Amount won: %3$@</string>
     <string name="the_session_already_exists_start_date_end_date_net_result_">The session already exists! Start Date: %1$@, End Date:%2$@, Net Result: %3$@</string>
     <string name="theme">Theme</string>
-    <string name="this_game_started_">Your session started: %@</string>
+    <string name="this_game_started_">Your session started: %s</string>
     <string name="this_month">This month</string>
     <string name="this_week">This week</string>
     <string name="this_year">This year</string>
@@ -560,7 +560,7 @@
     <string name="twitter">Twitter</string>
     <string name="type">Type</string>
     <string name="type_de_limite">Limit type</string>
-    <string name="unable_to_get_from_fixer_io_">Unable to get rate from fixer.io - %@</string>
+    <string name="unable_to_get_from_fixer_io_">Unable to get rate from fixer.io - %s</string>
     <string name="unfollowed_">Unfollowed!</string>
     <string name="unknown_import_format_popup_message">File format is not recognized</string>
     <string name="unknown_user">Unknown user</string>
@@ -568,7 +568,7 @@
     <string name="user_empty_field_error">You need to name this player</string>
     <string name="validate">Validate</string>
     <string name="value">Value</string>
-    <string name="variant_">Game: %@, </string>
+    <string name="variant_">Game: %s, </string>
     <string name="variant_empty_name_error">You need to name this game</string>
     <string name="variant_empty_shortname_error">You need to give a short name to this game</string>
     <string name="version">Version</string>
@@ -580,7 +580,7 @@
     <string name="week_days">Weekdays</string>
     <string name="weekdays_or_weekend">Weekdays or Weekend</string>
     <string name="weekend">Weekend</string>
-    <string name="welcome_in_">Welcome to %@</string>
+    <string name="welcome_in_">Welcome to %s</string>
     <string name="win_ratio">Win ratio</string>
     <string name="with">With</string>
     <string name="withdrawal">Withdrawal</string>
@@ -599,7 +599,7 @@
     <string name="yes_use_icloud">Yes</string>
     <string name="yesterday">Yesterday</string>
     <string name="yesterday_and_today">Today and yesterday</string>
-    <string name="you_can_retrieve_the_generated_file_named_within_itunes">You can retrieve the generated file named %@ within iTunes.</string>
+    <string name="you_can_retrieve_the_generated_file_named_within_itunes">You can retrieve the generated file named %s within iTunes.</string>
     <string name="you_can_t_have_more_than_i_comparison_keys_selected">Sorry, you can\'t activate more than %i comparison keys at the same time!</string>
     <string name="you_must_disable_icloud_sync_to_be_able_to_import_v3_data_on_both_apps">You must disable iCloud on both apps before importing your data from Poker Analytics 3</string>
     <string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">You\'re going to assign the following values to all imported sessions. Please check the following: </string>
@@ -608,7 +608,7 @@
     <string name="add_comment">Add comment</string>
     <string name="from_hour_">From</string>
     <string name="to_hour_">To</string>
-    <string name="whats_new_in_">What\'s new in %@?</string>
+    <string name="whats_new_in_">What\'s new in %s?</string>
     <string name="releasenote_question">Liking Poker Analytics?</string>
     <string name="releasenote_invitation">Please tell us how we\'re doing</string>
     <string name="releasenote_rating">Rate us!</string>
@@ -616,12 +616,12 @@
     <string name="stop_notification_title">It\'s time!</string>
     <string name="stop_notification_body">Based on your history, it looks like your start to fatigue. It might be time to stop!</string>
     <string name="stop_notifications">Stop notifications</string>
-    <string name="stop_notification_in_">A stop notification has been set in %@</string>
+    <string name="stop_notification_in_">A stop notification has been set in %s</string>
     <string name="save_authorize">Save &amp; authorize</string>
     <string name="select_a_color">Select a color</string>
     <string name="spotlight_indexing">Spotlight indexing</string>
-    <string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ is not authorized to access the camera. If you modify your privacy settings, be aware that unsaved data will be lost due to the automatic closing of the app.</string>
-    <string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%@ is not authorized to access the photo library. If you modify your privacy settings, be aware that unsaved data will be lost due to the automatic closing of the app.</string>
+    <string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s is not authorized to access the camera. If you modify your privacy settings, be aware that unsaved data will be lost due to the automatic closing of the app.</string>
+    <string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">%s is not authorized to access the photo library. If you modify your privacy settings, be aware that unsaved data will be lost due to the automatic closing of the app.</string>
     <string name="new_hand">New hand</string>
     <string name="new_note">New note</string>
     <string name="tap_to_learn_more">Tap on an item to learn more</string>
@@ -643,9 +643,9 @@
     <string name="health_kit_not_available_error">The Health app and all associated data are not available on this device.</string>
     <string name="terms">Terms</string>
     <string name="stop_notifications_explanation">Poker Analytics tries to estimate your optimal session duration and will send a notification when you reach that duration. Requires around 50 sessions.</string>
-    <string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync was not able to be enabled. Maybe you have older %@\' data on iCloud.</string>
+    <string name="_icloud_sync_wasn_t_able_to_be_enabled">iCloud Sync was not able to be enabled. Maybe you have older %s\' data on iCloud.</string>
     <string name="icloud_reset_and_retry">Clear &amp; retry</string>
-    <string name="_icloud_reset_warning">You will reset the data of %@ on iCloud, your local data won\'t be modified, but you will have to disable iCloud Sync on all your other devices. Are you sure you want to do this?</string>
+    <string name="_icloud_reset_warning">You will reset the data of %s on iCloud, your local data won\'t be modified, but you will have to disable iCloud Sync on all your other devices. Are you sure you want to do this?</string>
     <string name="remove_picture">Remove picture</string>
     <string name="icloud_is_syncing">Synchronizing</string>
     <string name="icloud_ok_and_ready">OK</string>
@@ -656,7 +656,7 @@
     <string name="icloud_status">iCloud Status</string>
     <string name="icloud_migration_failure_error_message">Due to a significant database modification, iCloud has been disabled on the app for safety and your data was moved back to your device locally. Please disable iCloud sync on all your other devices. If you want to enable iCloud back, you will have to delete iCloud data beforehand.</string>
     <string name="icloud_sync_wasn_t_able_to_be_disabled">iCloud Sync was not able to be disabled.</string>
-    <string name="currently_having_chips">Currently having %@ chips</string>
+    <string name="currently_having_chips">Currently having %s chips</string>
     <string name="icloud_timeout">The iCloud request time out.</string>
     <string name="vs">vs.</string>
     <string name="open_privacy_settings">Open privacy settings</string>

From b1db4ddbb1bef7289194e9c407e9ae9bba780dd8 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 10:11:42 +0100
Subject: [PATCH 4/9] Add Welcome message

---
 .../android/ui/activity/HomeActivity.kt       | 18 ++++++++++++++-
 .../android/util/Preferences.kt               | 23 +++++++++++++++----
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
index 87f5f11c..9711602c 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt
@@ -3,12 +3,13 @@ package net.pokeranalytics.android.ui.activity
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
+import androidx.appcompat.app.AlertDialog
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import kotlinx.android.synthetic.main.activity_home.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.HomePagerAdapter
-
+import net.pokeranalytics.android.util.Preferences
 
 
 class HomeActivity : PokerAnalyticsActivity() {
@@ -44,6 +45,7 @@ class HomeActivity : PokerAnalyticsActivity() {
 		setContentView(R.layout.activity_home)
 
 		initUI()
+		checkFirstLaunch()
 	}
 
 	/**
@@ -60,6 +62,20 @@ class HomeActivity : PokerAnalyticsActivity() {
 
 	}
 
+	/**
+	 * Check first launch
+	 */
+	private fun checkFirstLaunch() {
+		if (Preferences.getBoolean(Preferences.Keys.FIRST_LAUNCH, this, true)) {
+			Preferences.setBoolean(Preferences.Keys.FIRST_LAUNCH, false, this)
+			val builder = AlertDialog.Builder(this)
+				.setTitle(String.format(getString(R.string.welcome_in_), getString(R.string.app_name)))
+				.setMessage(R.string.popup_message_welcome)
+				.setNegativeButton(R.string.ok, null)
+			builder.show()
+		}
+	}
+
 	/**
 	 * Display a new fragment
 	 */
diff --git a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
index d87d9cdf..20e58f93 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/Preferences.kt
@@ -7,7 +7,8 @@ import java.util.*
 class Preferences {
 
     enum class Keys(var identifier: String) {
-        CURRENCY_CODE("CurrencyCode")
+        CURRENCY_CODE("CurrencyCode"),
+        FIRST_LAUNCH("firstLaunch")
     }
 
     companion object {
@@ -15,10 +16,10 @@ class Preferences {
         var currencyLocale : Locale? = null
 
         fun setString(key: Keys, value: String, context: Context) {
-            val preferences = PreferenceManager.getDefaultSharedPreferences(context)
-            val editor = preferences.edit()
-            editor.putString(key.identifier, value)
-            editor.commit()
+	        val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+	        val editor = preferences.edit()
+	        editor.putString(key.identifier, value)
+	        editor.apply()
         }
 
         fun getString(key: Keys, context: Context) : String? {
@@ -26,6 +27,18 @@ class Preferences {
             return preferences.getString(key.identifier, null)
         }
 
+	    fun setBoolean(key: Keys, value: Boolean, context: Context) {
+		    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+		    val editor = preferences.edit()
+		    editor.putBoolean(key.identifier, value)
+		    editor.apply()
+	    }
+
+	    fun getBoolean(key: Keys, context: Context, defaultValue: Boolean? = false) : Boolean {
+		    val preferences = PreferenceManager.getDefaultSharedPreferences(context)
+		    return preferences.getBoolean(key.identifier, defaultValue ?: false)
+	    }
+
         fun setCurrencyCode(currencyCode: String, context: Context) {
             Preferences.setString(Keys.CURRENCY_CODE, currencyCode, context)
             currencyLocale = null

From f92202b075b045ffd47e49f650d7780a6341db5c Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 10:50:03 +0100
Subject: [PATCH 5/9] Fix stat display

---
 .../java/net/pokeranalytics/android/model/realm/Session.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
index 80a728b2..ec5e0de5 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Session.kt
@@ -328,7 +328,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 				rows.add(
 					HeaderRowRepresentable(
 						RowViewType.HEADER_TITLE_AMOUNT_BIG,
-						title = getDuration(), value = result?.net.toString()
+						title = getDuration(),
+						computedStat = ComputedStat(Stat.NETRESULT, result?.net ?: 0.0)
 					)
 				)
 				rows.add(SeparatorRowRepresentable())
@@ -337,7 +338,8 @@ open class Session : RealmObject(), SessionInterface, Savable,
 				rows.add(
 					HeaderRowRepresentable(
 						RowViewType.HEADER_TITLE_AMOUNT_BIG,
-						resId = R.string.pause, value = result?.net.toString()
+						resId = R.string.pause,
+						computedStat = ComputedStat(Stat.NETRESULT, result?.net ?: 0.0)
 					)
 				)
 				rows.add(SeparatorRowRepresentable())

From 236dd67f9a3700101db9527de3f8819c811fe68a Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 11:29:45 +0100
Subject: [PATCH 6/9] Clean history and add empty message

---
 .../android/ui/fragment/HistoryFragment.kt    |  4 +-
 app/src/main/res/layout/fragment_history.xml  | 86 ++++---------------
 2 files changed, 22 insertions(+), 68 deletions(-)

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
index 7b2aafda..a307e593 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/HistoryFragment.kt
@@ -4,6 +4,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isVisible
 import androidx.recyclerview.widget.DiffUtil
 import io.realm.RealmResults
 import io.realm.Sort
@@ -91,7 +92,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 	 * Init data
 	 */
 	private fun initData() {
-		realmSessions = getRealm().where<Session>().findAll().sort("timeFrame.startDate", Sort.DESCENDING)
+		realmSessions = getRealm().where<Session>().findAll().sort("creationDate", Sort.DESCENDING)
 
 		val viewManager = SmoothScrollLinearLayoutManager(requireContext())
 		historyAdapter = RowRepresentableAdapter(this, this)
@@ -114,6 +115,7 @@ class HistoryFragment : PokerAnalyticsFragment(), LiveRowRepresentableDataSource
 		rows.clear()
 		sessions.clear()
 		sessions.addAll(getRealm().copyFromRealm(realmSessions))
+		noSessionFound.isVisible = sessions.isEmpty()
 
 		GlobalScope.launch {
 
diff --git a/app/src/main/res/layout/fragment_history.xml b/app/src/main/res/layout/fragment_history.xml
index e4ab0748..5651a39a 100644
--- a/app/src/main/res/layout/fragment_history.xml
+++ b/app/src/main/res/layout/fragment_history.xml
@@ -7,71 +7,6 @@
 	android:layout_height="match_parent"
 	tools:context=".ui.activity.HomeActivity">
 
-	<!--
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newSession"
-		android:layout_width="48dp"
-		android:layout_height="48dp"
-		android:layout_marginStart="16dp"
-		android:layout_marginTop="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_cash_game"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newTournament"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toStartOf="parent"
-		app:layout_constraintTop_toTopOf="parent" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newTournament"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_tournoi"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newHand"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newSession"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newHand"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_hand"
-		android:visibility="gone"
-		app:layout_constraintEnd_toStartOf="@+id/newTransaction"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newTournament"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	<androidx.appcompat.widget.AppCompatImageView
-		android:id="@+id/newTransaction"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_marginStart="16dp"
-		android:layout_marginEnd="16dp"
-		android:background="@drawable/rectangle_rounded_green_ripple"
-		android:elevation="4dp"
-		android:scaleType="fitCenter"
-		android:src="@drawable/add_transaction"
-		android:visibility="gone"
-		app:layout_constraintEnd_toEndOf="parent"
-		app:layout_constraintHorizontal_bias="0.5"
-		app:layout_constraintStart_toEndOf="@+id/newHand"
-		app:layout_constraintTop_toTopOf="@+id/newSession" />
-
-	-->
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/newCashGame"
 		style="@style/PokerAnalyticsTheme.Button"
@@ -89,7 +24,6 @@
 		app:layout_constraintStart_toStartOf="parent"
 		app:layout_constraintTop_toTopOf="parent" />
 
-
 	<com.google.android.material.button.MaterialButton
 		android:id="@+id/newTournament"
 		style="@style/PokerAnalyticsTheme.Button"
@@ -106,7 +40,6 @@
 		app:layout_constraintStart_toEndOf="@+id/newCashGame"
 		app:layout_constraintTop_toTopOf="parent" />
 
-
 	<androidx.recyclerview.widget.RecyclerView
 		android:id="@+id/recyclerView"
 		android:layout_width="0dp"
@@ -118,4 +51,23 @@
 		app:layout_constraintTop_toBottomOf="@+id/newCashGame"
 		tools:listitem="@layout/row_history_session" />
 
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/noSessionFound"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="8dp"
+		android:layout_marginTop="8dp"
+		android:layout_marginEnd="8dp"
+		android:layout_marginBottom="8dp"
+		style="@style/PokerAnalyticsTheme.TextView.Header"
+		android:textSize="24sp"
+		android:text="@string/no_sessions"
+		android:visibility="gone"
+		tools:visibility="visible"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_bias="0.5" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

From d38157462e58b026c2fa8c3feeb4ab5291613012 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 11:29:59 +0100
Subject: [PATCH 7/9] Manage NaN

---
 .../main/java/net/pokeranalytics/android/calculus/Stat.kt    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
index 171d5285..423b7641 100644
--- a/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
+++ b/app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt
@@ -6,6 +6,7 @@ import net.pokeranalytics.android.exceptions.FormattingException
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowViewType
 import net.pokeranalytics.android.util.FormatUtils
+import net.pokeranalytics.android.util.NULL_TEXT
 import net.pokeranalytics.android.util.formatted
 import net.pokeranalytics.android.util.formattedHourlyDuration
 
@@ -126,6 +127,10 @@ class ComputedStat(stat: Stat, value: Double) {
      */
     fun format(context: Context): TextFormat {
 
+        if (this.value.isNaN()) {
+            return TextFormat(NULL_TEXT, R.color.white)
+        }
+
         when (this.stat) {
             // Amounts + red/green
             Stat.NETRESULT, Stat.HOURLY_RATE, Stat.AVERAGE, Stat.NET_BB_PER_100_HANDS, Stat.HOURLY_RATE_BB,

From 5d55e37fa1eacf3ac2ac47eace75d04712c7e5c9 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 11:58:16 +0100
Subject: [PATCH 8/9] Add Row title value arrow

---
 .../android/ui/view/RowViewType.kt            |  7 ++-
 app/src/main/res/layout/row_title_arrow.xml   |  4 +-
 .../main/res/layout/row_title_value_arrow.xml | 61 +++++++++++++++++++
 3 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/layout/row_title_value_arrow.xml

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
index 179cd30a..1ed2042a 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/view/RowViewType.kt
@@ -37,8 +37,9 @@ enum class RowViewType(private var layoutRes: Int) {
 
 	// Row
 	TITLE(R.layout.row_title),
-	TITLE_VALUE(R.layout.row_title_value),
 	TITLE_ARROW(R.layout.row_title_arrow),
+	TITLE_VALUE(R.layout.row_title_value),
+	TITLE_VALUE_ARROW(R.layout.row_title_value_arrow),
 	TITLE_SWITCH(R.layout.row_title_switch),
 	TITLE_GRID(R.layout.row_bottom_sheet_grid_title),
 	DATA(R.layout.row_title),
@@ -66,7 +67,9 @@ enum class RowViewType(private var layoutRes: Int) {
 			HEADER_TITLE, HEADER_TITLE_VALUE, HEADER_TITLE_AMOUNT, HEADER_TITLE_AMOUNT_BIG -> HeaderViewHolder(layout)
 
 			// Row View Holder
-			TITLE, TITLE_VALUE, TITLE_ARROW, TITLE_GRID, TITLE_SWITCH, DATA, BOTTOM_SHEET_DATA -> RowViewHolder(layout)
+			TITLE, TITLE_ARROW, TITLE_VALUE, TITLE_VALUE_ARROW, TITLE_GRID, TITLE_SWITCH, DATA, BOTTOM_SHEET_DATA -> RowViewHolder(
+				layout
+			)
 
 			// Row Session
 			ROW_SESSION -> RowSessionViewHolder(layout)
diff --git a/app/src/main/res/layout/row_title_arrow.xml b/app/src/main/res/layout/row_title_arrow.xml
index 48598cc8..a1d94800 100644
--- a/app/src/main/res/layout/row_title_arrow.xml
+++ b/app/src/main/res/layout/row_title_arrow.xml
@@ -20,7 +20,7 @@
 		app:layout_constraintTop_toTopOf="parent"
 		tools:text="Data Type Title" />
 
-	<ImageView
+	<androidx.appcompat.widget.AppCompatImageView
 		android:id="@+id/nextArrow"
 		android:layout_width="24dp"
 		android:layout_height="24dp"
@@ -42,6 +42,6 @@
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
 		android:orientation="vertical"
-		app:layout_constraintGuide_end="16dp" />
+		app:layout_constraintGuide_end="8dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_title_value_arrow.xml b/app/src/main/res/layout/row_title_value_arrow.xml
new file mode 100644
index 00000000..52ab6295
--- /dev/null
+++ b/app/src/main/res/layout/row_title_value_arrow.xml
@@ -0,0 +1,61 @@
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/container"
+	android:layout_width="match_parent"
+	android:layout_height="48dp"
+	android:background="?selectableItemBackground">
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/title"
+		style="@style/PokerAnalyticsTheme.TextView.RowTitle"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_marginTop="16dp"
+		android:layout_marginBottom="16dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintStart_toStartOf="@+id/guidelineStart"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Title" />
+
+	<androidx.appcompat.widget.AppCompatTextView
+		android:id="@+id/value"
+		style="@style/PokerAnalyticsTheme.TextView.RowValue"
+		android:layout_width="0dp"
+		android:layout_height="wrap_content"
+		android:layout_marginStart="16dp"
+		android:layout_marginEnd="16dp"
+		android:ellipsize="end"
+		android:gravity="end"
+		android:maxLines="1"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/nextArrow"
+		app:layout_constraintStart_toEndOf="@+id/title"
+		app:layout_constraintTop_toTopOf="parent"
+		tools:text="Value" />
+
+	<androidx.appcompat.widget.AppCompatImageView
+		android:id="@+id/nextArrow"
+		android:layout_width="24dp"
+		android:layout_height="24dp"
+		android:src="@drawable/ic_arrow_right"
+		android:tint="@color/gray_light"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="@+id/guidelineEnd"
+		app:layout_constraintTop_toTopOf="parent" />
+
+	<androidx.constraintlayout.widget.Guideline
+		android:id="@+id/guidelineStart"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		app:layout_constraintGuide_begin="16dp" />
+
+	<androidx.constraintlayout.widget.Guideline
+		android:id="@+id/guidelineEnd"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:orientation="vertical"
+		app:layout_constraintGuide_end="8dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>

From 4950dc51d40a16f9b7759eed4f20521180784383 Mon Sep 17 00:00:00 2001
From: Aurelien Hubert <aurel.hubert@gmail.com>
Date: Thu, 7 Mar 2019 11:58:43 +0100
Subject: [PATCH 9/9] Add ids

---
 app/src/main/res/layout/fragment_data_list.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/fragment_data_list.xml b/app/src/main/res/layout/fragment_data_list.xml
index f393713f..76c02022 100644
--- a/app/src/main/res/layout/fragment_data_list.xml
+++ b/app/src/main/res/layout/fragment_data_list.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto"
+	android:id="@+id/container"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
 	xmlns:tools="http://schemas.android.com/tools">
@@ -13,6 +14,7 @@
 		app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
 		<androidx.constraintlayout.widget.ConstraintLayout
+			android:id="@+id/constraintLayout"
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content">