fix loc

app/src/main/java/net/pokeranalytics/android/calculus/Stat.kt

@@ -68,20 +68,20 @@ enum class Stat : RowRepresentable {
                 NETRESULT -> R.string.net_result
                 HOURLY_RATE -> R.string.average_hour_rate
                 AVERAGE -> R.string.average
-                NUMBER_OF_SETS -> R.string.number_of_groups
+                NUMBER_OF_SETS -> R.string.number_of_sessions
-                NUMBER_OF_GAMES -> R.string.number_of_games
+                NUMBER_OF_GAMES -> R.string.number_of_records
                 DURATION -> R.string.duration
-                AVERAGE_DURATION -> R.string.average_duration
+                AVERAGE_DURATION -> R.string.average_hours_played
-                NET_BB_PER_100_HANDS -> R.string.net_bb_per_100_hands
+                NET_BB_PER_100_HANDS -> R.string.net_result_bb_per_100_hands
-                HOURLY_RATE_BB -> R.string.hourly_rate_bb
+                HOURLY_RATE_BB -> R.string.average_hour_rate_bb_
-                AVERAGE_NET_BB -> R.string.average_net_bb
+                AVERAGE_NET_BB -> R.string.average_net_result_bb_
                 WIN_RATIO -> R.string.win_ratio
                 AVERAGE_BUYIN -> R.string.average_buyin
-                ROI -> R.string.roi
+                ROI -> R.string.tournament_roi
                 STANDARD_DEVIATION -> R.string.standard_deviation
-                STANDARD_DEVIATION_HOURLY -> R.string.standard_deviation_hourly
+                STANDARD_DEVIATION_HOURLY -> R.string.standard_deviation_per_hour
                 STANDARD_DEVIATION_BB_PER_100_HANDS -> R.string.standard_deviation_bb_per_100_hands
-                HANDS_PLAYED -> R.string.hands_played
+                HANDS_PLAYED -> R.string.number_of_hands
             }
         }
 

app/src/main/java/net/pokeranalytics/android/model/LiveData.kt

@@ -149,7 +149,7 @@ enum class LiveData : Localizable {
 	 * Return the new entity title
 	 */
 	fun newEntityLocalizedTitle(context: Context): String {
-		return "${context.getString(R.string.new_entity)} ${this.localizedTitle(context)}"
+		return "${context.getString(R.string.new_str)} ${this.localizedTitle(context)}"
 	}
 
 }

app/src/main/java/net/pokeranalytics/android/ui/activity/HomeActivity.kt

@@ -114,16 +114,16 @@ class HomeActivity : PokerAnalyticsActivity() {
 	private fun updateToolbar(index: Int) {
 		when (index) {
 			0 -> {
-				toolbar.title = getString(R.string.title_history)
+				toolbar.title = getString(R.string.feed)
 				//TODO: Change filter button visibility
 				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 			1 -> {
-				toolbar.title = getString(R.string.title_stats)
+				toolbar.title = getString(R.string.stats)
 				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 			2 -> {
-				toolbar.title = getString(R.string.title_settings)
+				toolbar.title = getString(R.string.services)
 				homeMenu?.findItem(R.id.filter)?.isVisible = false
 			}
 		}

app/src/main/java/net/pokeranalytics/android/ui/view/rowrepresentable/SettingRow.kt

@@ -58,7 +58,8 @@ enum class SettingRow : RowRepresentable {
 					resId = R.string.data_management
 				)
 			)
-			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_NAME, TOURNAMENT_FEATURE, TRANSACTION, TRANSACTION_TYPE))
+			rows.addAll(arrayListOf(BANKROLL, GAME, LOCATION, TOURNAMENT_NAME, TOURNAMENT_FEATURE))
+//, TRANSACTION, TRANSACTION_TYPE //TODO add them back
 
 			rows.add(CustomizableRowRepresentable(customViewType = RowViewType.HEADER_TITLE, resId = R.string.terms))
 			rows.addAll(arrayListOf(PRIVACY_POLICY, TERMS_OF_USE, GDPR))

app/src/main/res/menu/navigation.xml

@@ -4,16 +4,16 @@
     <item
             android:id="@+id/navigation_history"
             android:icon="@drawable/ic_outline_history"
-            android:title="@string/title_history"/>
+            android:title="@string/feed"/>
 
     <item
             android:id="@+id/navigation_stats"
             android:icon="@drawable/ic_outline_chart_bar"
-            android:title="@string/title_stats"/>
+            android:title="@string/stats"/>
 
     <item
             android:id="@+id/navigation_settings"
             android:icon="@drawable/ic_outline_settings"
-            android:title="@string/title_settings"/>
+            android:title="@string/services"/>
 
 </menu>

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

@@ -663,11 +663,9 @@
 	<string name="all_time">Alle</string>
 	<string name="longest_session">Längste Sitzung</string>
 	<string name="minimum_session">Kürzeste Sitzung</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">Letzte Spiele</string>
+	<string name="last_records">Letzte Spiele</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Anzahl der Spiele</string>
+	<string name="number_of_records">Anzahl der Spiele</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">Soll dieses Spiel wirklich gelöscht werden?</string>
+	<string name="do_you_really_to_delete_this_game">Soll dieses Spiel wirklich gelöscht werden?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">Spiel</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">Spiele</string>
 	<string name="comments">Kommentare</string>
 	<string name="operation_empty_field_error">Überprüfen Sie, ob Sie bei Ihrer Transaktion einen Typ und einen Betrag angegeben haben.</string>
 	<string name="operation_type_empty_field_error">Bitte geben Sie dem Transaktionstyp einen Namen.</string>

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

@@ -664,11 +664,9 @@
 	<string name="all_time">Todo el tiempo</string>
 	<string name="longest_session">Sesión más larga</string>
 	<string name="minimum_session">Sesión más corta</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">Últimas partidas</string>
+	<string name="last_records">Últimas partidas</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Número de partidas</string>
+	<string name="number_of_records">Número de partidas</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">¿Deseas verdaderamente eliminar esta partida?</string>
+	<string name="do_you_really_to_delete_this_game">¿Deseas verdaderamente eliminar esta partida?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">Partida</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">Partidas</string>
     <string name="comments">Comentarios</string>
 	<string name="operation_empty_field_error">Verifica que tu transacción tenga un tipo y un importe</string>
 	<string name="operation_type_empty_field_error">Necesitas dar un nombre al tipo de transacción</string>

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

@@ -393,7 +393,7 @@
 	<string name="purchase_status">Etat de la transaction</string>
 	<string name="purchase_successful">Achat effectué!</string>
 	<string name="rakeback">Rakeback</string>
-	<string name="rate">Rate</string>
+	<string name="rate">Taux</string>
 	<string name="rate_it_">Ok, j\'y vais</string>
 	<string name="rebuy">Rebuy</string>
 	<string name="rebuy_count">Nombre de rebuys</string>
@@ -688,5 +688,8 @@
 	<string name="camera_usage_description">L\'appareil photo sert à prendre une photo d\'un joueur</string>
 	<string name="photo_library_add_usage_description">Poker Analytics souhaite sauvegarder cette image dans votre bibliothèque photo</string>
 	<string name="face_id_usage_description">Poker Analytics souhaite accéder à Face ID pour déverrouiller l\'application avec la reconnaissance faciale</string>
+	<string name="number_of_records">Nombre de parties</string>
+	<string name="last_records">Dernières parties</string>
+	<string name="do_you_really_to_delete_this_game">Voulez-vous vraiment supprimer cette partie ?</string>
 
 </resources>

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

@@ -663,11 +663,9 @@
 	<string name="all_time">सारा समय</string>
 	<string name="longest_session">सबसे लंबा सत्र</string>
 	<string name="minimum_session">सबसे छोटा सत्र</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">अंतिम गेम</string>
+	<string name="last_records">अंतिम गेम</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">गेम की संख्या</string>
+	<string name="number_of_records">गेम की संख्या</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">क्या आप वाकई इस गेम को हटाना चाहते हैं?</string>
+	<string name="do_you_really_to_delete_this_game">क्या आप वाकई इस गेम को हटाना चाहते हैं?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">गेम</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">गेम्स</string>
     <string name="comments">टि‍प्पणियां</string>
 	<string name="operation_empty_field_error">जांच करें कि‍ आपके लेनदेन का एक प्रकार और एक राशि है</string>
 	<string name="operation_type_empty_field_error">आपको लेनदेन के प्रकार को नाम देने की जरूरत है</string>

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

@@ -663,11 +663,9 @@
 	<string name="all_time">Tutto il tempo</string>
 	<string name="longest_session">Sessione più lunga</string>
 	<string name="minimum_session">Sessione più breve</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">Ultime partite</string>
+	<string name="last_records">Ultime partite</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Numero di partite</string>
+	<string name="number_of_records">Numero di partite</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">Vuoi davvero eliminare questa partita?</string>
+	<string name="do_you_really_to_delete_this_game">Vuoi davvero eliminare questa partita?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">Partita</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">Partite</string>
     <string name="comments">Commenti</string>
 	<string name="operation_empty_field_error">Controlla che la tua transazione abbia una tipologia e un valore</string>
 	<string name="operation_type_empty_field_error">Devi dare un nome alla tipologia di transazione</string>

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

@@ -663,11 +663,9 @@
 	<string name="all_time">最高記録</string>
 	<string name="longest_session">最長セッション</string>
 	<string name="minimum_session">最短セッション</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">最新のゲーム</string>
+	<string name="last_records">最新のゲーム</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">ゲーム数</string>
+	<string name="number_of_records">ゲーム数</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">このゲームを削除してもよろしいですか?</string>
+	<string name="do_you_really_to_delete_this_game">このゲームを削除してもよろしいですか?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">ゲーム</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">ゲーム</string>
     <string name="comments">コメント</string>
 	<string name="operation_empty_field_error">トランザクションにタイプおよび金額が指定されていることをご確認ください</string>
 	<string name="operation_type_empty_field_error">トランザクションタイプに名前を付けてください</string>

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

@@ -663,11 +663,9 @@
 	<string name="all_time">Histórico</string>
 	<string name="longest_session">Sessão mais longa</string>
 	<string name="minimum_session">Sessão mais curta</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">Últimos jogos</string>
+	<string name="last_records">Últimos jogos</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Número de jogos</string>
+	<string name="number_of_records">Número de jogos</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">Deseja realmente excluir este jogo?</string>
+	<string name="do_you_really_to_delete_this_game">Deseja realmente excluir este jogo?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">Jogo</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">Jogos</string>
     <string name="comments">Comentários</string>
 	<string name="operation_empty_field_error">Verifique se sua transação tem um tipo e um valor</string>
 	<string name="operation_type_empty_field_error">Você precisa nomear o tipo de transação</string>

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

@@ -664,11 +664,9 @@
 	<string name="all_time">Все время</string>
 	<string name="longest_session">Самый долгий сеанс</string>
 	<string name="minimum_session">Самый короткий сеанс</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">Последние игры</string>
+	<string name="last_records">Последние игры</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Число игр</string>
+	<string name="number_of_records">Число игр</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">Вы действительно хотите удалить эту игру?</string>
+	<string name="do_you_really_to_delete_this_game">Вы действительно хотите удалить эту игру?</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">Игра</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">Игры</string>
     <string name="comments">Комментарии</string>
 	<string name="operation_empty_field_error">Убедитесь, ваша транзакция содержит тип и сумму</string>
 	<string name="operation_type_empty_field_error">Вам нужно указать тип транзакции</string>

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

@@ -659,11 +659,9 @@
 	<string name="all_time">全部时间</string>
 	<string name="longest_session">最长进程</string>
 	<string name="minimum_session">最短进程</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_last_records">最新游戏</string>
+	<string name="last_records">最新游戏</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_number_of_records">游戏数目</string>
+	<string name="number_of_records">游戏数目</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">你真要删除此游戏？</string>
+	<string name="do_you_really_to_delete_this_game">你真要删除此游戏？</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_record">游戏</string>
-	<string name="a_game_of_chess_not_the_game_of_chess_records">游戏</string>
     <string name="comments">评论</string>
 	<string name="operation_empty_field_error">检查你的交易有类型和数额</string>
 	<string name="operation_type_empty_field_error">你需要命名交易类型</string>

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

@@ -1,36 +1,14 @@
 <resources>
     <string name="app_name">Poker Analytics</string>
 
-
-    <string name="title_history">History</string>
-    <string name="title_stats">Stats</string>
-    <string name="title_settings">Settings</string>
-
     <!-- Not translated -->
-
-	<!-- Stats -->
-	<string name="hourly_rate">Hourly Rate</string>
-	<string name="number_of_groups">Number of sessions</string>
-	<string name="number_of_games">Number of games</string>
-	<string name="average_duration">Average duration</string>
-	<string name="net_bb_per_100_hands">Net per 100 hands (BB)</string>
-	<string name="hourly_rate_bb">Hourly rate (BB)</string>
-	<string name="average_net_bb">Average net (BB)</string>
-	<string name="roi">ROI</string>
-	<string name="standard_deviation_hourly">Standard deviation hourly</string>
-	<string name="hands_played">Hands played</string>
-
     <string name="address">Address</string>
     <string name="suggestions">Suggestions</string>
     <string name="data_deleted" formatted="false">%s deleted</string>
     <string name="end_date_not_possible">The end date should be after the start date</string>
-
     <string name="save">Save</string>
-
     <string name="tournament_name">Tournament Name</string>
     <string name="tournament_feature">Tournament Feature</string>
-    <string name="new_entity">New</string>
-
     <string name="pending">Pending</string>
 
 	<!-- Translated -->
@@ -639,7 +617,7 @@
     <string name="icloud_update_issue">Error</string>
     <string name="icloud_status_syncing_explanation">iCloud is synchronizing, uploading data from your device to the cloud. It can take some time to be ready for your other devices.</string>
     <string name="icloud_status_error_explanation">iCloud has trouble updating correctly and iCloud is not ready for other devices to be synchronized.</string>
-    <string name="icloud_status_ok_explanation">iCloud status is ok and ready for other devices to be synchronized.</string>
+    <string name="icloud_status_ok_explanation">iCloud status is OK and ready for other devices to be synchronized.</string>
     <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>
@@ -686,7 +664,7 @@
     <string name="hhe_exporting_title">Assembling&#8230;</string>
     <string name="hhe_exporting_message">We\'re joining up all the images in one file, thanks for waiting a little more :)</string>
     <string name="follow_us">Follow us</string>
-    <string name="hhe_generating_error_message">An error occured during generation, please retry.</string>
+    <string name="hhe_generating_error_message">An error occurred during generation, please retry.</string>
     <string name="player_notes">Players notes</string>
     <string name="feed">Feed</string>
     <string name="operation_empty_field_error">Check that your transaction has a type and an amount</string>
@@ -709,11 +687,9 @@
     <string name="all_time">All time</string>
     <string name="longest_session">Longest session</string>
     <string name="minimum_session">Shortest session</string>
-    <string name="a_game_of_chess_not_the_game_of_chess_last_records">Last games</string>
+    <string name="last_records">Last games</string>
-    <string name="a_game_of_chess_not_the_game_of_chess_number_of_records">Number of games</string>
+    <string name="number_of_records">Number of games</string>
-    <string name="a_game_of_chess_not_the_game_of_chess_do_you_really_to_delete_this_game_">Do you really want to delete this game?</string>
+    <string name="do_you_really_to_delete_this_game">Do you really want to delete this game?</string>
-    <string name="a_game_of_chess_not_the_game_of_chess_record">Game</string>
-    <string name="a_game_of_chess_not_the_game_of_chess_records">Games</string>
     <string name="comments">Comments</string>
     <string name="bb_ante_option">Big Blind Ante</string>
     <string name="show_fullscreen">Show full screen</string>