diff --git a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
index b767184e..bfb54b51 100644
--- a/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
+++ b/app/src/main/java/net/pokeranalytics/android/model/realm/Game.kt
@@ -6,8 +6,8 @@ import io.realm.annotations.PrimaryKey
 import io.realm.kotlin.where
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.model.interfaces.CountableUsage
-import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.model.interfaces.NameManageable
+import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.adapter.StaticRowRepresentableDataSource
 import net.pokeranalytics.android.ui.view.RowRepresentable
 import net.pokeranalytics.android.ui.view.RowRepresentableEditDescriptor
@@ -23,7 +23,7 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 		val rowRepresentation : List<RowRepresentable> by lazy {
 			val rows = ArrayList<RowRepresentable>()
 			rows.add(SimpleRow.NAME)
-			rows.addAll(GameRow.values())
+//			rows.addAll(GameRow.values())
 			rows
 		}
 	}
@@ -40,6 +40,13 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	// CountableUsage
 	override var useCount: Int = 0
 
+	fun getNotNullShortName() : String {
+		this.shortName?.let {
+			return it
+		}
+		return this.name
+	}
+
 	override fun getDisplayName(): String {
 		return this.name
 	}
@@ -72,16 +79,12 @@ open class Game : RealmObject(), NameManageable, StaticRowRepresentableDataSourc
 	}
 
 	override fun isValidForSave(): Boolean {
-		return name.isNotEmpty() && !shortName.isNullOrEmpty()
+		return name.isNotEmpty()
 	}
 
 	override fun getFailedSaveMessage(status: SaveValidityStatus): Int {
         return when (status) {
-            SaveValidityStatus.DATA_INVALID -> if (name.isEmpty()) {
-                R.string.variant_empty_name_error
-            } else {
-                R.string.variant_empty_shortname_error
-            }
+            SaveValidityStatus.DATA_INVALID -> R.string.variant_empty_name_error
             SaveValidityStatus.ALREADY_EXISTS -> R.string.duplicate_variant_error
             else -> super.getFailedSaveMessage(status)
         }
diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
index 7c4afe21..9a07a96d 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/EditableDataFragment.kt
@@ -12,7 +12,10 @@ import kotlinx.android.synthetic.main.fragment_editable_data.view.*
 import net.pokeranalytics.android.R
 import net.pokeranalytics.android.exceptions.ConfigurationException
 import net.pokeranalytics.android.model.LiveData
-import net.pokeranalytics.android.model.interfaces.*
+import net.pokeranalytics.android.model.interfaces.Deletable
+import net.pokeranalytics.android.model.interfaces.Editable
+import net.pokeranalytics.android.model.interfaces.Savable
+import net.pokeranalytics.android.model.interfaces.SaveValidityStatus
 import net.pokeranalytics.android.ui.activity.EditableDataActivity
 import net.pokeranalytics.android.ui.activity.components.PokerAnalyticsActivity
 import net.pokeranalytics.android.ui.adapter.RowRepresentableAdapter
@@ -183,9 +186,9 @@ open class EditableDataFragment : PokerAnalyticsFragment(), RowRepresentableDele
 	 */
 	private fun deleteData() {
 		val builder = AlertDialog.Builder(requireContext())
-		builder.setTitle(R.string.warning)
-			.setMessage(R.string.are_you_sure_you_want_to_do_that_)
-			.setNegativeButton(R.string.no, null)
+		builder
+			.setMessage(R.string.are_you_sure_you_want_to_delete)
+			.setNegativeButton(R.string.cancel, null)
 			.setPositiveButton(R.string.yes) { _, _ ->
                 val deletable = this.item as Deletable
                 val realm = this.getRealm()
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e7612e62..e9db407a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">Einsatz</string>
 	<string name="ante_value">Einsatz</string>
 	<string name="app_store">Upgrade</string>
-	<string name="are_you_sure_you_want_to_do_that_">Möchten Sie das wirklich tun?</string>
+	<string name="are_you_sure_you_want_to_delete">Möchten Sie das wirklich tun?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Möchten Sie Ihre Daten von Poker Analytics 3 wirklich importieren? Ihre aktuellen Daten von Poker Analytics 5 werden dann gelöscht.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Sie müssen ein iCloud-Konto auf Ihrem Gerät hinzufügen, um diese Funktion nutzen zu können.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Sie müssen iCloud wieder aktivieren, um Ihre Daten von iCloud migrieren und den iCloud-Speicher ausschalten zu können.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index a8f24c1a..fde8c339 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">Ante</string>
 	<string name="ante_value">Ante</string>
 	<string name="app_store">Actualizar</string>
-	<string name="are_you_sure_you_want_to_do_that_">¿Seguro que deseas hacer eso?</string>
+	<string name="are_you_sure_you_want_to_delete">¿Seguro que deseas hacer eso?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">¿Seguro que deseas importar los datos de Poker Analytics 3? Esto borrará tus datos actuales de Poker Analytics 5.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Debes agregar una cuenta iCloud en tu dispositivo para poder utilizar esta función.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Debes volver a activar iCloud para poder migrar tus datos desde iCloud y desactivar el almacenamiento de iCloud.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 076aa2b7..6a212e9a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -33,7 +33,7 @@
 	<string name="ante">Ante</string>
 	<string name="ante_value">Ante</string>
 	<string name="app_store">App Store</string>
-	<string name="are_you_sure_you_want_to_do_that_">Êtes-vous sûr de vouloir faire cela ?</string>
+	<string name="are_you_sure_you_want_to_delete">Êtes-vous sûr de vouloir faire cela ?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Etes-vous sûr de vouloir importer les données de Poker Analytics 3? Les données de Poker Analytics 5 seront effacées.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Pour utiliser cette option, veuillez rajouter un compte iCloud.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Veuillez ré-activer votre compte iCloud pour pouvoir migrer vos données.</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index acd3f2d5..fd7ca81a 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">अंटे</string>
 	<string name="ante_value">अंटे</string>
 	<string name="app_store">अपग्रेड करें</string>
-	<string name="are_you_sure_you_want_to_do_that_">क्या आप वाकई यह करना चाहते हैं?</string>
+	<string name="are_you_sure_you_want_to_delete">क्या आप वाकई यह करना चाहते हैं?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">क्या आप वाकई अपना Poker Analytics 3 डेटा इम्पोर्ट करना चाहते हैं? यह आपके वर्तमान Poker Analytics 5 डेटा को मिटा देगा.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">आपको यह सुविधा उपयोग करने के लिए अपने डिवाइस पर एक iCloud अकाउंट जोड़ने की आवश्यकता है.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">आपको अपना डेटा iCloud  से विस्थापित करने और iCloud स्टोरेज को बंद करने में समर्थ होने के लिए iCloud को पुन: सक्षम करने की आवश्यकता है.  </string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 22e2d4a9..bc2ca2d0 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">Invito</string>
 	<string name="ante_value">Invito</string>
 	<string name="app_store">Upgrade</string>
-	<string name="are_you_sure_you_want_to_do_that_">Sei sicuro di volerlo fare?</string>
+	<string name="are_you_sure_you_want_to_delete">Sei sicuro di volerlo fare?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Sei sicuro di voler importare i tuoi dati di Analitica del poker 3? Questa operazione cancellerà i tuoi dati correnti di Analitica del poker 4.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Devi aggiungere un account iCloud sul tuo dispositivo per poter utilizzare questa funzionalità.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Devi riabilitare iCloud per poter migrare i tuoi dati da iCloud ed essere in grado di chiudere il tuo spazio di archiviazione iCloud.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a024803c..7ef3ef1c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">アンティ</string>
 	<string name="ante_value">アンティ</string>
 	<string name="app_store">アップグレード</string>
-	<string name="are_you_sure_you_want_to_do_that_">本当にこれを実行してもよろしいですか?</string>
+	<string name="are_you_sure_you_want_to_delete">本当にこれを実行してもよろしいですか?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Poker Analytics 3 のデータを本当にインポートしてもよろしいですか?これにより、現在の Poker Analytics 5 データが消えます。</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">この機能を使用するには、デバイスに iCloud アカウントを追加する必要があります。</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">iCould からデータを移行し、iCloud ストレージをオフにするには、iCloud を最有効化する必要があります。</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index cc3ad4e2..de814433 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">Ante</string>
 	<string name="ante_value">Ante</string>
 	<string name="app_store">Upgrade</string>
-	<string name="are_you_sure_you_want_to_do_that_">Tem certeza de que deseja prosseguir?</string>
+	<string name="are_you_sure_you_want_to_delete">Tem certeza de que deseja prosseguir?</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Tem certeza de que deseja importar os seus dados do Poker Analytics 3? Isso apagará os seus dados atuais do Poker Analytics 5.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Você precisa adicionar uma conta do iCloud no seu aparelho para poder utilizar esse recurso.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Você precisa reativar o iCloud para poder migrar os seus dados do iCloud e depois desativar o armazenamento no iCloud.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 44f9c853..8107607e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -32,7 +32,7 @@
 	<string name="ante">Анте</string>
 	<string name="ante_value">Анте</string>
 	<string name="app_store">Апгрейд</string>
-	<string name="are_you_sure_you_want_to_do_that_">Подтвердите ваше решение</string>
+	<string name="are_you_sure_you_want_to_delete">Подтвердите ваше решение</string>
 	<string name="are_you_sure_you_want_to_import_your_data_from_v3">Вы действительно хотите импортировать свои данные из Poker Analytics 3? Это действие приведет к потере текущих данных в Poker Analytics 5.</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">Необходимо добавить учётную запись iCloud на ваше устройство для использования этой возможности.</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">Вам нужно повторно включить использование iCloud для перемещения ваших данных с iCloud чтобы вы могли после этого включить использование хранилища iCloud.</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 45bb4e31..794da5e7 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -27,7 +27,7 @@
 	<string name="ante">底注</string>
 	<string name="ante_value">底注</string>
 	<string name="app_store">升级</string>
-	<string name="are_you_sure_you_want_to_do_that_">确定那么做？</string>
+	<string name="are_you_sure_you_want_to_delete">确定那么做？</string>
 	<string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">必须在设备上添加iCloud帐户才能使用此功能。</string>
 	<string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">必须重新启用iCloud才能将数据从iCloud移出并关闭iCloud存储。</string>
 	<string name="ask_user_to_use_icloud">iCloud存储现在可用，你要使用它并在所有设备上自动分享你数据吗？</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 588d4212..a50e37ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -50,7 +50,7 @@
     <string name="ante">Ante</string>
     <string name="ante_value">Ante</string>
     <string name="app_store">Upgrade</string>
-    <string name="are_you_sure_you_want_to_do_that_">Are you sure you want to do that?</string>
+    <string name="are_you_sure_you_want_to_delete">Are you sure you want to delete?</string>
     <string name="are_you_sure_you_want_to_import_your_data_from_v3">Are you sure you want to import your Poker Analytics 3 data? This will erase your current Poker Analytics 5 data.</string>
     <string name="ask_user_to_add_icloud_account_to_be_able_to_use_icloud_storage">You need to add an iCloud account on your device to be able to use this feature.</string>
     <string name="ask_user_to_enable_icloud_to_migrate_data_from_icloud_to_local">You need to re-enable iCloud to be able to migrate your data from iCloud and be able to turn off iCloud storage.</string>