ATCS migration

Copy  ...\AndorsTrailRelease\andors-trail\AndorsTrail  to  a temporary directory, then delete it.

Open Android Studio, New > Import Project, select the AndorsTrail folder from the temporary location, choose  ...\AndorsTrailRelease\andors-trail\AndorsTrail  as target directory.   Click next a few times.
It then shows some error about not finding build tools. Below it there should be the option to 'Add google Maven reposiroty and sync project'. Click that option and then 'Do Refactor' (Bottom Left).

In the newly created file 'app/build.gradle'
In line 4 change the compileSdkVersion to 30 (or higher?)
In line 9 change the minSdkVersion to 14 instead of 4
In line 22 change the version from '29.+' to '28.0.0' and the compile at the beginning to implementation
Then Click 'Sync Project with Gradle Files' (icon in top right) that should no longer give errors.

Then replace the url in the tmx files with an https version of it since it makes problems later on (Replace  "http://"  to  "https://"  with Notepad++ for all *.tmx  files in subfolder XML)

After that rename all maps to .xml instead of .tmx (CMD:  ren  ...\AndorsTrailRelease\andors-trail\AndorsTrail\app\src\main\res\xml\*.tmx *.xml)

.gitignore

@@ -1,22 +1,4 @@
-# Android ignores
-gen/
-bin/
-target/
-local.properties
-
-#IntelliJ
-.idea/
-out/production/
-out/test/
-*.iws
-*.ipr
-
-# Other
-.metadata
-.svn/
-
-/AndorsTrail/.gradle
-/AndorsTrail/gradle/wrapper
-/AndorsTrail/app/build/
-/AndorsTrail/app/debug/
-/AndorsTrail/app/release/
+/AndorsTrail/app/build/*
+/AndorsTrail/app/release/*
+/AndorsTrail/res
+/AndorsTrail/res/*

AndorsTrail/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Sun Jun 12 09:41:58 CEST 2022
+gradle.version=7.3.3

AndorsTrail/.idea/compiler.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>

AndorsTrail/.idea/gradle.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="linkedExternalProjectsSettings">
+      <GradleProjectSettings>
+        <option name="testRunner" value="GRADLE" />
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="1.8" />
+        <option name="modules">
+          <set>
+            <option value="$PROJECT_DIR$" />
+            <option value="$PROJECT_DIR$/app" />
+          </set>
+        </option>
+      </GradleProjectSettings>
+    </option>
+  </component>
+</project>

AndorsTrail/.idea/jarRepositories.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
+    </remote-repository>
+  </component>
+</project>

AndorsTrail/.idea/misc.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/build/classes" />
+  </component>
+  <component name="ProjectType">
+    <option name="id" value="Android" />
+  </component>
+</project>

AndorsTrail/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

AndorsTrail/.idea/workspace.xml

@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidLayouts">
+    <shared>
+      <config />
+    </shared>
+  </component>
+  <component name="AndroidLogFilters">
+    <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="2aa454ac-d630-4e72-aa8c-69af78bc82e2" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\chris\.android\avd\Nexus_5_API_30.avd]" />
+  <component name="ExternalProjectsData">
+    <projectState path="$PROJECT_DIR$">
+      <ProjectState />
+    </projectState>
+  </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand>
+              <path>
+                <item name="" type="6a2764b6:ExternalProjectsStructure$RootNode" />
+                <item name="AndorsTrail" type="f1a62948:ProjectNode" />
+              </path>
+            </expand>
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
+  <component name="GenerateSignedApkSettings">
+    <option name="KEY_STORE_PATH" value="C:\AT\sec\AndorsTrail.keystore" />
+    <option name="KEY_ALIAS" value="andorstrail" />
+    <option name="REMEMBER_PASSWORDS" value="true" />
+    <option name="BUILD_TARGET_KEY" value="apk" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
+  </component>
+  <component name="ProblemsViewState">
+    <option name="selectedIndex" value="1" />
+  </component>
+  <component name="ProjectId" id="2AT3M4nTILAI64xGFpUWWwJwWLT" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="ApkExportedModule" value="AndorsTrail.app" />
+    <property name="ExportApk.ApkPath" value="C:\AT\AndorsTrailRelease\andors-trail\AndorsTrail\app" />
+    <property name="ExportApk.BuildVariants" value="release" />
+    <property name="ResourceManagerPrefKey.ResourceType" value="XML" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="RunOnceActivity.cidr.known.project.marker" value="true" />
+    <property name="android.sdk.path" value="$USER_HOME$/AppData/Local/Android/Sdk" />
+    <property name="cidr.known.project.marker" value="true" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../../../sec/AndorsTrail.keystore" />
+    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
+    <property name="settings.editor.selected.configurable" value="android.sdk-updates" />
+    <property name="settings.editor.splitter.proportion" value="0.2" />
+    <property name="show.inlinked.gradle.project.popup" value="false" />
+  </component>
+  <component name="RunManager">
+    <configuration name="&lt;template&gt;" type="Applet" default="true" selected="false">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="HTML_FILE_NAME" />
+      <option name="HTML_USED" value="false" />
+      <option name="WIDTH" value="400" />
+      <option name="HEIGHT" value="300" />
+      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+      <option name="VM_PARAMETERS" />
+    </configuration>
+    <configuration name="&lt;template&gt;" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" default="true" selected="false">
+      <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+    </configuration>
+    <configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
+      <module name="AndorsTrail.app" />
+      <option name="DEPLOY" value="true" />
+      <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
+      <option name="DEPLOY_AS_INSTANT" value="false" />
+      <option name="ARTIFACT_NAME" value="" />
+      <option name="PM_INSTALL_OPTIONS" value="" />
+      <option name="ALL_USERS" value="false" />
+      <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+      <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
+      <option name="ACTIVITY_EXTRA_FLAGS" value="" />
+      <option name="MODE" value="default_activity" />
+      <option name="CLEAR_LOGCAT" value="false" />
+      <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+      <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
+      <option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
+      <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+      <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+      <option name="DEBUGGER_TYPE" value="Auto" />
+      <Auto>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Auto>
+      <Hybrid>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Hybrid>
+      <Java />
+      <Native>
+        <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
+        <option name="SHOW_STATIC_VARS" value="true" />
+        <option name="WORKING_DIR" value="" />
+        <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
+        <option name="SHOW_OPTIMIZED_WARNING" value="true" />
+      </Native>
+      <Profilers>
+        <option name="ADVANCED_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
+        <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
+        <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
+        <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
+      </Profilers>
+      <option name="DEEP_LINK" value="" />
+      <option name="ACTIVITY_CLASS" value="" />
+      <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
+      <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
+      <method v="2" />
+    </configuration>
+    <configuration default="true" type="Application" factoryName="Application">
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="JUnit" factoryName="JUnit">
+      <option name="TEST_OBJECT" value="class" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+    <configuration default="true" type="TestNG">
+      <option name="TEST_OBJECT" value="CLASS" />
+      <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+      <properties />
+      <listeners />
+      <method v="2">
+        <option name="Make" enabled="true" />
+      </method>
+    </configuration>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="2aa454ac-d630-4e72-aa8c-69af78bc82e2" name="Changes" comment="" />
+      <created>1655019703212</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1655019703212</updated>
+    </task>
+    <servers />
+  </component>
+</project>

AndorsTrail/app/build.gradle

@@ -5,7 +5,7 @@ android {
     buildToolsVersion "30.0.3"
 
     defaultConfig {
-        applicationId "com.gpl.rpg.AndorsTrail_beta2"
+        applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
         targetSdkVersion 30
     }
@@ -16,6 +16,10 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
         }
     }
+
+    lintOptions {
+        baseline file("lint-baseline.xml")
+    }
 }
 
 dependencies {

AndorsTrail/app/lint-baseline.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<issues format="6" by="lint 7.2.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.2.1)" variant="fatal" version="7.2.1">
+
+    <issue
+        id="ResAuto"
+        message="In Gradle projects, always use `http://schemas.android.com/apk/res-auto` for custom attributes"
+        errorLine1="    xmlns:app=&quot;http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail&quot; >"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/drawable/ui_blue_buttonbar_frame.xml"
+            line="3"
+            column="16"/>
+    </issue>
+
+    <issue
+        id="ResAuto"
+        message="In Gradle projects, always use `http://schemas.android.com/apk/res-auto` for custom attributes"
+        errorLine1="    xmlns:app=&quot;http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail&quot; >"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/drawable/ui_charcoal_buttonbar_frame.xml"
+            line="3"
+            column="16"/>
+    </issue>
+
+    <issue
+        id="ResAuto"
+        message="In Gradle projects, always use `http://schemas.android.com/apk/res-auto` for custom attributes"
+        errorLine1="    xmlns:app=&quot;http://schemas.android.com/apk/res/com.gpl.rpg.AndorsTrail&quot; >"
+        errorLine2="               ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/res/drawable/ui_green_buttonbar_frame.xml"
+            line="3"
+            column="16"/>
+    </issue>
+
+</issues>

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -2,9 +2,9 @@
 
 <manifest 
 	xmlns:android="http://schemas.android.com/apk/res/android" 
-	package="com.gpl.rpg.AndorsTrail_beta2"
-	android:versionCode="65"
-	android:versionName="0.8.1beta"
+	package="com.gpl.rpg.AndorsTrail"
+	android:versionCode="64"
+	android:versionName="0.7.17"
 	android:installLocation="auto"
 	>
 	<uses-sdk 
@@ -25,9 +25,9 @@
 
 
 	<application 
-		android:name=".AndorsTrailApplication"
+		android:name="com.gpl.rpg.AndorsTrail.AndorsTrailApplication"
 		android:label="@string/app_name" 
-		android:icon="@drawable/icon_beta"
+		android:icon="@drawable/icon"
 		android:description="@string/app_description"
         android:allowBackup="true"
         android:theme="@style/AndorsTrailTheme_Blue"
@@ -36,7 +36,7 @@
 		android:preserveLegacyExternalStorage="true"
 		>
 		<activity 
-		    android:name=".activity.StartScreenActivity"
+		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
 		    >
 			<intent-filter>
@@ -45,29 +45,29 @@
 			</intent-filter>
 		</activity>
    		<activity 
-			android:name=".activity.MainActivity"
+			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
 			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
-		<activity android:name=".activity.HeroinfoActivity" />
-		<activity android:name=".activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ShopActivity" />
-		<activity android:name=".activity.AboutActivity" />
-		<activity android:name=".activity.LoadingActivity" />
-		<activity android:name=".activity.Preferences" />
-		<activity android:name=".activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
-		<activity android:name=".activity.DisplayWorldMapActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LevelUpActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ConversationActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ShopActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.AboutActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadingActivity" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.Preferences" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity" android:theme="@style/AndorsTrailDialogTheme_Blue" />
+		<activity android:name="com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity" />
 
         <provider
         android:name="android.support.v4.content.FileProvider"
-        android:authorities="com.gpl.rpg.AndorsTrail_beta2.fileprovider"
+        android:authorities="com.gpl.rpg.AndorsTrail.fileprovider"
         android:grantUriPermissions="true"
         android:exported="false">
         <meta-data

AndorsTrail/app/src/main/assets/translation/.gitignore

@@ -1,20 +0,0 @@
-# Android ignores
-gen/
-bin/
-target/
-local.properties
-
-#IntelliJ
-.idea/
-out/production/
-out/test/
-*.iws
-*.ipr
-
-# Other
-.metadata
-.svn/
-
-#/AndorsTrail/app/build/*
-#/AndorsTrail/app/release/*
-#/AndorsTrail/.gradle/*

AndorsTrail/app/src/main/assets/translation/ar.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-11-17 15:16+0200\n"
-"PO-Revision-Date: 2022-06-04 18:27+0000\n"
+"PO-Revision-Date: 2022-02-18 21:31+0000\n"
 "Last-Translator: عادل نصري <nsrya06@gmail.com>\n"
 "Language-Team: Arabic <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/ar/>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.11-dev\n"
 
 #: actorconditions_v069.json:bless
 msgid "Bless"
@@ -414,7 +414,7 @@ msgstr "ما نوع الكتاب الذي في يدك؟"
 
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
-msgstr "أجل، أنا هنا لتسليم الطلبية'وسادة قطنية'. لكن لماذا ؟"
+msgstr ""
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1701,7 +1701,7 @@ msgstr "يبدو أنك تحب كتبك حقًا."
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
-msgstr "وأنا فتى التوصيل الخاص بك. هل طلبت \"كتاب قديم مترب\"؟"
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -5848,107 +5848,96 @@ msgstr "أوف. هذا يثبت ما سمعته عنكم الهمجيون الذ
 
 #: conversationlist_ambelie.json:ambelie_5
 msgid "I, Ambelie, of the house of Laumwill in Feygard, am on an excursion to the southern Nor City."
-msgstr "أنا، أمبلياي من عائلة لومويل من فايغارد، أنا في رحلة جنوب مدينة نور."
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_6
 msgid "An excursion to see if Nor City really is all that I have heard about it. If it really can compare itself to the glamour of the great city of Feygard."
 msgstr ""
-"رحلة لأرى إن كانت مدينة نور كما سمعت عنها. إن كانت تستحق أن تقارن بمدينة "
-"فايغارد العظيمة."
 
 #: conversationlist_ambelie.json:ambelie_6:0
 #: conversationlist_ambelie.json:ambelie_9:0
 msgid "Nor City, where is that?"
-msgstr "مدينة نور، أين تقع؟"
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_6:1
 msgid "If you like it so much in Feygard, why would you even leave?"
-msgstr "إذا كنتي تحبين فايغارد كثيرا، فلماذا أصلا تغادرين؟"
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_6:2
 msgid "Ehh ... I'm here to ... escort you safely to Nor City."
-msgstr "إيه ... أنا هنا ل ... أرافقك بأمان إلى مدينة نور."
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_7
 msgid "Don't you know of Nor City? I will take note that the savages here haven't even heard of the city."
 msgstr ""
-"ألم تسمع عن مدينة نور؟ سأسجل ملاحظة أن الهمجيين هنا لم يسمعوا أصلا عن "
-"المدينة."
 
 #: conversationlist_ambelie.json:ambelie_8
 msgid "I am beginning to be even more certain that Nor City will never, even in my wildest dreams, be comparable to the great city of Feygard."
 msgstr ""
-"لقد بدأت في أن أكون أكثر يقينًا من أن مدينة نور لن تكون قابلة للمقارنة أبدًا "
-"، حتى في أكثر أحلامي جموحًا ، بمدينة فايغارد العظيمة."
 
 #: conversationlist_ambelie.json:ambelie_8:0
 #: conversationlist_ambelie.json:ambelie_9:1
 msgid "Good luck on your excursion."
-msgstr "حظا سعيدا في رحلتك."
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_9
 msgid "All the noblewomen in Feygard keep talking about the mysterious Shadow in Nor City. I just have to see it myself."
 msgstr ""
-"تواصل جميع النساء النبيلة في فايغارد الحديث عن الظل الغامض في مدينة نور. أنا "
-"فقط يجب أن أراه بنفسي."
 
 #: conversationlist_ambelie.json:ambelie_10
 msgid "Thank you. Now please leave before someone sees me talking to a commoner like you."
 msgstr ""
-"شكرًا لك. الآن من فضلك غادر قبل أن يراني شخص ما أتحدث إلى عامة الناس مثلك."
 
 #: conversationlist_ambelie.json:ambelie_10:0
 msgid "Commoner? Are you trying to insult me? Goodbye."
-msgstr "عامة؟ هل تحاول إهانتي؟ وداعا."
+msgstr ""
 
 #: conversationlist_ambelie.json:ambelie_10:1
 msgid "Whatever, you probably wouldn't even survive a forest wasp."
-msgstr "أيا كان ، ربما لن تنجو حتى من دبور الغابة."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_1
 msgid "Ha ha, you tell him Garl! *burp*"
-msgstr "ها ها، أخبره غارل! *تجشؤ*"
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_2
 msgid "Sing, drink, fight! All who oppose Feygard will fall!"
-msgstr "غني ، اشرب ، قاتل! كل من يعارض فيجارد سوف يسقط!"
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_3
 msgid "We will stand tall. Feygard, city of peace!"
-msgstr "سوف نظل صامدين. فايغارد، مدينة السلام!"
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_3:0
 msgid "I had better be going."
-msgstr "من الأفضل أن أذهب."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_3:1
 #: conversationlist_foamingflask_guards.json:ff_captain_2:0
 #: conversationlist_foamingflask_outsideguard.json:ff_outsideguard_2:0
 msgid "Feygard, where is that?"
-msgstr "فايغارد، أين تقغ؟"
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_4
 msgid "What, you haven't heard of Feygard, kid? Just follow the road northwest and you will see the great city of Feygard rise above the treetops."
 msgstr ""
-"ماذا ، لم تسمع عن فايغارد، يا فتى؟ ما عليك سوى اتباع الطريق الشمالي الغربي و "
-"سترى مدينة فايغارد العظيمة ترتفع فوق قمم الأشجار."
 
 #: conversationlist_foamingflask_guards.json:ff_guard_4:0
 msgid "Thanks. Bye."
-msgstr "شكرا، وداعا."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_rincel_1
 msgid "A boy?! Apart from you, there have been no children in here that I have seen."
-msgstr "صبي؟! بصرف النظر عنك، لم أرى أي أطفال هنا."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_rincel_2
 msgid "Check with the captain over there. He has been around here for longer than us."
-msgstr "إسأل القائد هناك. إنه هنا قبلنا."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_rincel_2:0
 #: conversationlist_foamingflask_guards.json:ff_captain_4:1
 msgid "Thank you, Goodbye."
-msgstr "شكرا، وداعا."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_rincel_2:1
 #: conversationlist_foamingflask_guards.json:ff_captain_4:0
@@ -5957,61 +5946,56 @@ msgstr "شكرا، وداعا."
 #: conversationlist_omi2.json:prim_commoner3_3:1
 #: conversationlist_omi2.json:prim_commoner3_5:0
 msgid "Thank you. Shadow be with you."
-msgstr "شكرا، ليكن الظل معك."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_guard_shadow_1
 msgid "Don't bring that cursed Shadow in here son. We want none of that. Now leave."
-msgstr "لا تحضر ذلك الظل الملعون هنا يا بني. لا نريد أيًا من ذلك. الآن غادر."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_1
 msgid "Are you lost, son? This is no place for a kid like you."
-msgstr "هل أنت تائه يا بني؟ هذا ليس مكان لطفل مثلك."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_1:0
 #: conversationlist_foamingflask_guards.json:ff_captain_1:1
 msgid "I have a shipment of iron swords from Gandoren for you."
-msgstr "لدي شحنة من السيوف الحديدية من غاندورين لك."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_1:4
 msgid "Hi! I have been sent by Herg ... Hertzsen Laumwill, patriarch of the Laumwill family, to bring back his daughter!"
 msgstr ""
-"مرحبا! لقد تم إرسالي من قبل هيرج ... هيرتزين لومويل ، بطريارك عائلة لامويل ، "
-"لإعادة ابنته!"
 
 #: conversationlist_foamingflask_guards.json:ff_captain_2
 msgid "I am the guard captain of this patrol. We hail from the great city of Feygard."
-msgstr "أنا قائد حرس هذه الدورية. نحن من مدينة فايغارد العظيمة."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_3
 msgid "We are travelling the main road to make sure the merchants and travelers are safe. We keep the peace around here."
 msgstr ""
-"نحن نسير على الطريق الرئيسي للتأكد من سلامة التجار و المسافرين. نحافظ على "
-"السلام هنا."
 
 #: conversationlist_foamingflask_guards.json:ff_captain_3:0
 msgid "You mentioned Feygard. Where is that?"
-msgstr "لقد ذكرت فايغارد. أين تقع؟"
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_4
 msgid "The great city of Feygard is the greatest sight you will ever see. Follow the road northwest."
 msgstr ""
-"مدينة فايغارد العظيمة هي أعظم مشهد تراه على الإطلاق. اتبع طريق الشمال الغربي."
 
 #: conversationlist_foamingflask_guards.json:ff_captain_rincel_1
 msgid "There was a kid running around in here a while ago."
-msgstr "كان هناك طفل يتجول هنا منذ فترة."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_rincel_2
 msgid "I never talked to him though, so I don't know if he is the one you are looking for."
-msgstr "لم أتحدث معه أبدًا ، لذلك لا أعرف ما إذا كان هو الشخص الذي تبحث عنه."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_rincel_2:0
 msgid "OK, that might be something worth checking anyway."
-msgstr "حسنًا ، قد يكون هذا شيئًا يستحق التحقق منه على أي حال."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_rincel_3
 msgid "I noticed he left to the west heading out of the Foaming Flask tavern."
-msgstr "لقد لاحظت أنه غادر إلى الغرب متجهًا من حانة قوارير الرغوة."
+msgstr ""
 
 #: conversationlist_foamingflask_guards.json:ff_captain_rincel_3:0
 msgid "West. Got it. Thanks for the information."
@@ -59016,3 +59000,4 @@ msgstr "قصر غوينمارت"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "بريم هافن"
+

AndorsTrail/app/src/main/assets/translation/ckb.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-02-16 11:56+0200\n"
-"PO-Revision-Date: 2022-06-26 18:22+0000\n"
-"Last-Translator: Basan <ahmadalaaazaden@gmail.com>\n"
+"PO-Revision-Date: 2021-04-05 20:27+0000\n"
+"Last-Translator: Rener kaka <Rabarajax51@gmail.com>\n"
 "Language-Team: Kurdish (Central) <https://hosted.weblate.org/projects/"
 "andors-trail/game-content/ckb/>\n"
 "Language: ckb\n"
@@ -12,64 +12,63 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.6-dev\n"
 
 #: actorconditions_v069.json:bless
 msgid "Bless"
-msgstr "پیرۆزکردن"
+msgstr ""
 
 #: actorconditions_v069.json:poison_weak
 msgid "Weak Poison"
-msgstr "ژەهری لاواز"
+msgstr ""
 
 #: actorconditions_v069.json:str
 msgid "Strength"
-msgstr "هێز"
+msgstr ""
 
 #: actorconditions_v069.json:regen
-#, fuzzy
 msgid "Shadow Regeneration"
-msgstr "دروستبوونەوەی سێبەر"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:speed_minor
 msgid "Minor speed"
-msgstr "خێرایی کەم"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:fatigue_minor
 msgid "Minor fatigue"
-msgstr "ماندوبوونی کەم"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:feebleness_minor
 msgid "Minor weapon feebleness"
-msgstr "لاوازی چەکی کەم"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:bleeding_wound
 msgid "Bleeding wound"
-msgstr "برینی خوێنبەربوو"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:rage_minor
 msgid "Minor berserker rage"
-msgstr "تووڕەیی شەڕشێتی کەم"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:blackwater_misery
 msgid "Blackwater misery"
-msgstr "ئازاری ڕەشەئاو"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:intoxicated
 msgid "Intoxicated"
-msgstr "سەرخۆش"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:dazed
 msgid "Dazed"
-msgstr "گێژبوو"
+msgstr ""
 
 #: actorconditions_v0610.json:chaotic_grip
 msgid "Chaotic grip"
-msgstr "گرتنی پشێوی"
+msgstr ""
 
 #: actorconditions_v0610.json:chaotic_curse
 msgid "Chaotic curse"
-msgstr "نەفرەتی پشێوی"
+msgstr ""
 
 #: actorconditions_v0611.json:contagion
 msgid "Insect contagion"
@@ -58885,3 +58884,4 @@ msgstr ""
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr ""
+

AndorsTrail/app/src/main/assets/translation/de.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Andors Trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-05-23 21:19+0000\n"
+"PO-Revision-Date: 2022-04-08 05:24+0000\n"
 "Last-Translator: Roman Leo <roman.leo@gmx.de>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/de/>\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.12-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:28+0000\n"
 
 #: [none]
@@ -419,8 +419,6 @@ msgstr "Was ist das für ein Buch, das du da in der Hand hast?"
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
 msgstr ""
-"Ja, ich bin hier um die Bestellung für ein \"Plüschkissen\" zu liefern. Aber "
-"wofür?"
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1708,7 +1706,6 @@ msgstr "Du scheinst deine Bücher wirklich zu mögen."
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
 msgstr ""
-"Und ich bin dein Lieferkind. Hast du ein „Staubiges altes Buch“ bestellt?"
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -6255,7 +6252,7 @@ msgstr "Ja, ich habe herausgefunden, was mit ihm passiert ist."
 
 #: conversationlist_wrye.json:wrye_return_1:3
 msgid "Not yet, but your order has finally arrived."
-msgstr "Noch nicht, aber deine Bestellung ist endlich angekommen."
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_return_2
 msgid "Welcome back. Thank you for your help in finding out what happened to my son."
@@ -6270,8 +6267,6 @@ msgstr "Gern geschehen."
 #: conversationlist_wrye.json:wrye_return_2:2
 msgid "Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?"
 msgstr ""
-"Ja, ich bin zurückgekommen um deine Bestellung einer \"Leier\" "
-"auszuhändigen. Du musst gut darin sein sie zu spielen?"
 
 #: conversationlist_wrye.json:wrye_mourn_1
 msgid "Shadow help me."
@@ -6286,8 +6281,6 @@ msgstr "Was ist los?"
 #: conversationlist_wrye.json:wrye_mourn_1:1
 msgid "Excuse me, I'm here to deliver your order for a 'Lyre'."
 msgstr ""
-"Entschuldige mich bitte, ich bin hier um deine Bestellung für eine \"Leier\" "
-"abzugeben."
 
 #: conversationlist_wrye.json:wrye_mourn_2
 msgid "My son! My son is gone."
@@ -6305,7 +6298,7 @@ msgstr "Was ist mit ihm?"
 
 #: conversationlist_wrye.json:wrye_mourn_2:2
 msgid "Maybe your order here will comfort you?"
-msgstr "Vielleicht tröstet dich deine Bestellung hier?"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_3
 msgid "I don't want to talk about it. Not with an outsider like you."
@@ -17276,8 +17269,6 @@ msgstr "Wie kannst du wissen woher ich komme?"
 #: conversationlist_arghes.json:arghes_2:3
 msgid "And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?"
 msgstr ""
-"Und wie interessant, dass du ein Paar 'Gelbe Stiefel' bestellt hast. Hast du "
-"das wirklich bestellt?"
 
 #: conversationlist_arghes.json:arghes_3a
 msgid "Is that so? Hmm, most interesting. It does not change anything, however."
@@ -25618,7 +25609,6 @@ msgstr "Warum liegst du am hellichten Tage im Bett herum?"
 #: conversationlist_guynmart_npc.json:guynmart_servant_10:1
 msgid "I'm here to give you your ordered item. You don't want it?"
 msgstr ""
-"Ich bin hier um dir deinen bestellten Artikel zu geben. Du willst ihn nicht?"
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_20
 msgid "I am checking that the bed of young Robalyrius is still in order."
@@ -29267,8 +29257,6 @@ msgstr "Du siehst wieder fröhlich aus."
 #: conversationlist_stoutford_combined.json:odirath_0:5
 msgid "Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you"
 msgstr ""
-"Hast du wirklich so eine hässliche Porzellanfigur bestellt? Ups, tut mir "
-"Leid, ich wollte dich nicht beleidigen"
 
 #: conversationlist_stoutford_combined.json:odirath_1
 msgid "I did see someone that might have been your brother. He was with a rather dubious looking person. They didn't stay around here very long though. Sorry, but that's all I can tell you. You should ask around town. Other townsfolk may know more."
@@ -33958,8 +33946,6 @@ msgstr "Eh, entschuldige die Störung."
 #: conversationlist_arulir_mountain.json:tjure_0:3
 msgid "I'm surprised to see you here as well. Did you order 'Mysterious green something'?"
 msgstr ""
-"Ich bin überrascht dich auch hier zu sehen. Hast du 'Geheimnisvolles grünes "
-"Etwas' bestellt?"
 
 #: conversationlist_arulir_mountain.json:tjure_0_10
 msgid "I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out."
@@ -34080,23 +34066,20 @@ msgstr "*seufz* Du warst meine letzte Hoffnung. Lass mich nun allein."
 
 #: conversationlist_arulir_mountain.json:tjure_90:0
 msgid "Hope you learned from it."
-msgstr "Hoffe, du hast daraus gelernt."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_90:1
 msgid "OK. One question before I go: did you order a 'Mysterious green something'?"
 msgstr ""
-"GUT. Eine Frage, bevor ich gehe: Hast du ein \"Mysteriöses grünes Etwas\" "
-"bestellt?"
 
 #: conversationlist_arulir_mountain.json:tjure_100:0
 #: conversationlist_arulir_mountain.json:tjure_200:0
 msgid "It was an interesting experience."
-msgstr "Es war eine interessante Erfahrung."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:1
 msgid "No problem. By the way, did you order a 'Mysterious green something'?"
 msgstr ""
-"Kein Problem. Übrigens, hast du ein „Geheimnisvolles grünes Etwas“ bestellt?"
 
 #: conversationlist_arulir_mountain.json:tjure_200
 msgid "Oh, you look better than the last time we met. Thank you for your help."
@@ -34105,7 +34088,6 @@ msgstr "Oh, du siehst besser aus als bei unserem letzten Treffen. Danke dir für
 #: conversationlist_arulir_mountain.json:tjure_200:1
 msgid "Indeed. By the way, did you order a 'Mysterious green something'?"
 msgstr ""
-"Tatsächlich. Übrigens, hast du ein \"Mysteriöses grünes Etwas\" bestellt?"
 
 #: conversationlist_arulir_mountain.json:watermark_script_100
 msgid "This seems to be a very strange place. Maybe even dangerous."
@@ -35824,7 +35806,7 @@ msgstr "Hast du jemals einen solchen Handschuh gesehen? [Zeigst Venanra den Hand
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_0:5
 msgid "Did you order an 'Old, worn cape'?"
-msgstr "Hast du einen 'Alten, abgenutzten Umhang' bestellt?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_1
 msgid "We are working on some nice green dresses. We can also repair and improve your clothes."
@@ -36746,7 +36728,7 @@ msgstr "Ich suche meinen Bruder Andor. Hast du in der Stadt jemanden gesehen, de
 
 #: conversationlist_brimhaven.json:edrin_0_0:6
 msgid "Hello, did you order a 'Striped Hammer'?"
-msgstr "Hallo, hast du einen 'Gestreiften Hammer' bestellt?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:edrin_5_0
 msgid "Yes, that's the one that matches the dagger! Now that I have both pieces, I can repair the dagger for you if you wish."
@@ -37115,7 +37097,7 @@ msgstr "Vielleicht kann ich dir helfen."
 
 #: conversationlist_brimhaven.json:brv_fortune_choice:3
 msgid "Are you the one who ordered a 'Crystal Globe'?"
-msgstr "Bist du derjenige, der eine 'Kristallkugel' bestellt hat?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_andor_10
 msgid "I see you talking to your brother, somewhere far from here in a big city. Feygard or Nor City, I think."
@@ -37259,7 +37241,7 @@ msgstr "Ich suche gerade..."
 
 #: conversationlist_brimhaven.json:brv_fortune_10:2
 msgid "So you are the one who ordered a 'Crystal Globe'?"
-msgstr "Du bist also derjenige, der eine 'Kristallkugel' bestellt hat?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_50
 msgid "It will cost you 100 gold."
@@ -47726,248 +47708,211 @@ msgstr "Da könnte was dran sein. Du bist ein sehr überzeugender Redner."
 
 #: conversationlist_omi2.json:omi2_fix_ehrenfest_53
 msgid "You are wrong. I'm not here, just an illusion."
-msgstr "Du liegst falsch. Ich bin nicht hier, nur eine Illusion."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10
 msgid "Ah! You have finally returned, my new worker."
-msgstr "Ah! Du bist endlich zurückgekehrt, mein neuer Arbeiter."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10:2
 msgid "Ah! You are still insolent."
-msgstr "Ah! Du bist immer noch unverschämt."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_20
 msgid "I need someone to deliver all of the items that are in storage."
-msgstr "Ich brauche jemanden, der alle eingelagerten Artikel liefert."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30
 msgid "Come back to me when you have delivered all of the items. The order is not important. Here is the list of customers."
 msgstr ""
-"Komm zu mir zurück, wenn du alle Artikel geliefert hast. Die Reihenfolge ist "
-"nicht wichtig. Hier ist die Liste der Kunden."
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:0
 msgid "It will be done."
-msgstr "Es wird erledigt."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:1
 msgid "You want me to deliver these items to your customers?"
-msgstr "Du möchtest, dass ich diese Artikel an deine Kunden liefere?"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40
 msgid "Yes yes, hurry now. I have work to do here."
-msgstr "Ja ja, beeile dich jetzt. Ich habe hier Arbeit zu tun."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:0
 msgid "I'm going now."
-msgstr "Ich gehe jetzt."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:1
 msgid "Hope I get paid better this time."
-msgstr "Ich hoffe, ich werde dieses Mal besser bezahlt."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_arcir
 msgid "Yes, an old but useful book, but you should have wiped it off first. Anyway, here's my delivery fee."
 msgstr ""
-"Ja, ein altes, aber nützliches Buch, aber du hättest es zuerst abwischen "
-"sollen. Wie auch immer, hier ist meine Liefergebühr."
 
 #: conversationlist_delivery.json:brv_wh_delivery_edrin
 msgid "Ah, yes, a striped hammer. Don't look so impatient. Here's my delivery charge, and now you can leave!"
 msgstr ""
-"Ah, ja, ein gestreifter Hammer. Schau nicht so ungeduldig. Hier ist meine "
-"Liefergebühr, und jetzt kannst du gehen!"
 
 #: conversationlist_delivery.json:brv_wh_delivery_odirath
 msgid "Yes, indeed. A gift for my beautiful daughter... but why did it take so long? Sigh, here's my delivery fee."
 msgstr ""
-"Ja, in der Tat. Ein Geschenk für meine schöne Tochter... aber warum hat es "
-"so lange gedauert? Seufz, hier ist meine Liefergebühr."
 
 #: conversationlist_delivery.json:brv_wh_delivery_venanra
 msgid "Yes I did, kid. Incredibly, it has become the latest fashion to buy new capes with holes. Here's my delivery fee."
 msgstr ""
-"Ja, das habe ich, Kind. Unglaublicherweise ist es die neueste Mode geworden, "
-"neue Umhänge mit Löchern zu kaufen. Hier ist meine Liefergebühr."
 
 #: conversationlist_delivery.json:brv_wh_delivery_tjure
 msgid "What?! My lucky clover...but why now? Anyway, I'll no longer run out of luck. Here's my delivery fee."
 msgstr ""
-"Was?! Mein Glücksklee... Aber warum gerade jetzt? Wie auch immer, ich werde "
-"nicht mehr das Glück haben. Hier ist meine Liefergebühr."
 
 #: conversationlist_delivery.json:brv_wh_delivery_servant
 msgid "Finally, I'm no longer afraid of that room every time my lord turns off the lights to scare me. Here's my delivery fee."
 msgstr ""
-"Endlich habe ich keine Angst mehr vor diesem Raum wenn mein Lord das Licht "
-"ausschaltet um mir Angst zu machen. Hier ist meine Liefergebühr."
 
 #: conversationlist_delivery.json:brv_wh_delivery_arghes
 msgid "Yes kid, thank you. Here, take this gold for them."
-msgstr "Ja, Kind, danke. Hier, nimm dieses Gold für sie."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre_negative
 msgid "That's not what I'm waiting for! Go out and find out what happened to my son, please!"
 msgstr ""
-"Darauf warte ich nicht! Gehe raus und finde heraus, was mit meinem Sohn "
-"passiert ist, bitte!"
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre
 msgid "Yes, I'm longing for it just like how I'm longing for my son. But now I can mourn as I play his favorite song until I die."
 msgstr ""
-"Ja, ich sehne mich danach, genauso wie ich mich nach meinem Sohn sehne. Aber "
-"jetzt kann ich trauern, während ich sein Lieblingslied spiele, bis ich "
-"sterbe."
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre:0
 msgid "My sincere condolence for the loss of your beloved son."
-msgstr "Mein aufrichtiges Beileid für den Verlust deines geliebten Sohnes."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail
 msgid "Oh wow! Finally, your brother's gift has arrived and we only have to wait for his arrival."
 msgstr ""
-"Oh Wahnsinn! Endlich ist das Geschenk deines Bruders angekommen und wir "
-"müssen nur noch auf seine Ankunft warten."
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:0
 msgid "Sigh. I hope so."
-msgstr "Seufzen. Ich hoffe doch."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:1
 msgid "What?! Where's my gift?"
-msgstr "Was?! Wo ist mein Geschenk?"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail3
 msgid "I already gave you his shield."
-msgstr "Ich habe dir bereits seinen Schild gegeben."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2
 msgid "Anyway, it's been a very long time so please go look for your brother."
 msgstr ""
-"Wie auch immer, es ist schon sehr lange her, also suche bitte nach deinem "
-"Bruder."
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:1
 msgid "I'm still looking for him."
-msgstr "Ich suche ihn immer noch."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:2
 msgid "Eh, you have to pay for it..."
-msgstr "Eh, du musst dafür bezahlen..."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4
 msgid "Ah, yes, I almost forgot. Here you are."
-msgstr "Ach ja, fast hätte ich es vergessen. Hier sind sie."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:0
 msgid "Thanks. I'm on my way again, bye."
-msgstr "Danke. Ich bin wieder auf dem Weg, tschüss."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:1
 msgid "Hmm... Bye"
-msgstr "Hmm... Auf Wiedersehen"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune
 msgid ""
 "Ah yes, I need a new one. My current crystal globe has become a bit cloudy - otherwise I would of course have seen that you would bring me a new globe.\n"
 "Here is the gold for it."
 msgstr ""
-"Ah ja, ich brauche eine neue. Meine jetzige Kristallkugel ist etwas trüb "
-"geworden - sonst hätte ich natürlich gesehen, dass du mir einen neuen Globus "
-"bringen würdest.\n"
-"Hier ist das Gold dafür."
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:0
 msgid "Do you want to try the crystal ball with me to see if it works?"
 msgstr ""
-"Möchtest du die Kristallkugel mit mir ausprobieren, um zu sehen, ob sie "
-"funktioniert?"
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:1
 msgid "Thanks for choosing Facutloni's delivery."
-msgstr "Vielen Dank, dass du dich für Facutlonis Lieferung entschieden hast."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune_10
 msgid "You say you want me to help you?"
-msgstr "Du sagst, du willst, dass ich dir helfe?"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10
 msgid "You are back. Did you deliver all of the items?"
-msgstr "Du bist zurück. Hast du alle Artikel geliefert?"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10:0
 msgid "Yes. I delivered everything."
-msgstr "Ja. Ich habe alles geliefert."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no
 msgid "Then what are you standing there for?! Get out and deliver everything!"
-msgstr "Warum stehst du dann?! Gehe raus und liefere alles aus!"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:0
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:0
 msgid "[Run]"
-msgstr "[Lauf]"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:1
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:1
 msgid "Yes boss."
-msgstr "Ja, Chef."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes
 msgid "That's nice to hear. Then you can now give me the... eh...330 gold pieces that you should have received from the sales."
 msgstr ""
-"Das ist schön zu hören. Dann kannst du mir jetzt die... äh... 330 "
-"Goldstücke, die du aus dem Verkauf erhalten haben solltest geben."
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:0
 msgid "Sure. Here you are."
-msgstr "Sicher. Hier sind sie."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:1
 msgid "Uh, I had expenses along the way and I don't have all the gold anymore."
 msgstr ""
-"Uh, ich hatte Ausgaben auf dem Weg und ich habe nicht mehr das ganze Gold."
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1
 msgid "And then you walk into my sight? Go get my gold!"
-msgstr "Und dann gehst du in mein Blickfeld? Geh und hol mir mein Gold!"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:2
 msgid "Oh, I just found the 330 gold pieces in my pocket. Please take it."
 msgstr ""
-"Oh, ich habe gerade die 330 Goldstücke in meiner Tasche gefunden. Bitte nimm "
-"sie."
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10
 msgid "Good job! I am glad that you work responsibly."
-msgstr "Gut gemacht! Ich freue mich, dass du verantwortungsvoll arbeitest."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:0
 msgid "And seriously."
-msgstr "Und im Ernst."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:1
 msgid "I travelled far and wide."
-msgstr "Ich bin weit und breit gereist."
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward
 msgid "That is serious. And here you have your well-deserved reward: 100 gold."
 msgstr ""
-"Das ist gravierend. Und hier hast du deine wohlverdiente Belohnung: 100 Gold."
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward:1
 msgid "What the?"
-msgstr "Was zum?"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_scrooge
 msgid "Pardon?"
-msgstr "Verzeihung?"
+msgstr ""
 
 #: conversationlist_delivery.json:tjure_wh_delivery_90:0
 msgid "Not until I have delivered this to you. Are you the one who ordered a 'Mysterious green something'?"
 msgstr ""
-"Nicht, bis ich dir das geliefert habe. Bist du derjenige, der ein "
-"\"Mysteriöses grünes Etwas\" bestellt hat?"
 
 #: itemcategories_1.json:dagger
 msgid "Dagger"
@@ -51606,22 +51551,11 @@ msgstr "Du fühlst dich warm und wohlig, wenn du ihn hältst."
 
 #: itemlist_delivery.json:facutloni_docket
 msgid "Facutloni's Docket"
-msgstr "Facutlonis Zettel"
+msgstr ""
 
 #: itemlist_delivery.json:facutloni_docket:description
 msgid "A document listing the contents of a delivery   Arcir the book-lover from Fallhaven ordered a 'Dusty Old Book'.   Edrin the metalsmith from Brimhaven ordered a 'Striped Hammer'.   Odirath the armorer from Stoutford ordered a 'Pretty Porcelain Figure'.   Venanra the laundress from Brimhaven ordered an 'Old, worn cape'.   Tjure the unlucky merchant ordered a 'Mysterious green something'.   Servant the servant from Guynmart Castle ordered a 'Chandelier'.   Arghes from Remgard tavern ordered 'Yellow Boots'.   Wyre the mournful woman from Vilegard ordered a 'Lyre'.   Mikhail from Crossglen ordered a 'Plush Pillow'.   Pangitain the fortune teller from Brimhaven ordered a 'Crystal Globe'. "
 msgstr ""
-"Ein Dokument, welches den Inhalt einer Lieferung auflistet   Arcir, der "
-"Buchliebhaber aus Fallhaven, bestellte ein 'Staubiges altes Buch'.   Edrin "
-"der Metallschmied aus Brimhaven bestellte einen 'gestreiften Hammer'.   "
-"Odirath, der Waffenschmied aus Stoutford, bestellte eine 'Hübsche Figur aus "
-"Porzellan'.   Venanra, die Wäscherin aus Brimhaven, bestellte einen 'Alten "
-"getragenen Umhang'.   Der unglückliche Händler bestellte ein 'Mysteriöses "
-"grünes Etwas'.   Der Diener aus Guynmart Castle bestellte einen "
-"'Kronleuchter'.   Arghes aus dem Wirtshaus Remgard bestellte 'Gelbe "
-"Stiefel'.   Wyre, die trauernde Frau aus Vilegard, bestellte eine Leier'.   "
-"Mikhail von Crossglen bestellte ein 'Plüschkissen'.   Pangitain, die "
-"Wahrsagerin aus Brimhaven, bestellte eine 'Kristallkugel' "
 
 #: monsterlist_crossglen_animals.json:tiny_rat
 msgid "Tiny rat"
@@ -59855,72 +59789,59 @@ msgstr "Für meinen Mut und meine...Unwissenheit?, gewährte General Ortholion m
 
 #: questlist_delivery.json:brv_wh_delivery
 msgid "Delivery"
-msgstr "Lieferung"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:10
 msgid "Facutloni asked me to help him deliver all of the items ordered by his customers a long time ago. He even gave me an old document with the names and items written on it."
 msgstr ""
-"Facutloni bat mich ihm zu helfen alle Artikel zu liefern die vor langer Zeit "
-"von seinen Kunden bestellt wurden. Er gab mir sogar ein altes Dokument mit "
-"den Namen und Gegenständen die darauf geschrieben waren."
 
 #: questlist_delivery.json:brv_wh_delivery:20
 msgid "Arcir the Fallhaven book-lover ordered a 'Dusty Old book'."
 msgstr ""
-"Arcir, der Buchliebhaber aus Fallhaven, bestellte ein 'Staubiges altes Buch'."
 
 #: questlist_delivery.json:brv_wh_delivery:30
 msgid "Edrin the Brimhaven metalsmith ordered a 'Striped Hammer'."
 msgstr ""
-"Edrin der Brimhavener Metallschmied bestellte einen 'Gestreiften Hammer'."
 
 #: questlist_delivery.json:brv_wh_delivery:40
 msgid "Odirath the Stoutford armorer ordered a 'Pretty Porcelain Figure'."
 msgstr ""
-"Odirath, der Stoutford-Waffenschmied, bestellte eine 'Hübsche "
-"Porzellanfigur'."
 
 #: questlist_delivery.json:brv_wh_delivery:50
 msgid "Venanra the Brimhaven laundress ordered an 'Old, worn cape'."
 msgstr ""
-"Venanra die Brimhaven Wäscherin bestellte einen 'Alten getragenen Umhang'."
 
 #: questlist_delivery.json:brv_wh_delivery:60
 msgid "Tjure the unlucky Brimhaven merchant ordered a 'Mysterious green something'."
 msgstr ""
-"Tjure der unglückliche Brimhavener Händler bestellte ein 'Mysteriöses grünes "
-"Etwas'."
 
 #: questlist_delivery.json:brv_wh_delivery:70
 msgid "Servant the Guynmart servant ordered a 'Chandelier'."
 msgstr ""
-"Der Diener aus der Guynmart Dienerschaft bestellte einen 'Kronleuchter'."
 
 #: questlist_delivery.json:brv_wh_delivery:80
 msgid "Arghes at Remgard tavern ordered 'Yellow boots'."
-msgstr "Arghes aus der Taverne Remgard bestellte 'Gelbe Stiefel'."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:90
 msgid "Wyre the mournful Vilegard woman ordered a 'Lyre'."
-msgstr "Wyre, die trauernde Frau von Vilegard, bestellte eine 'Leier'."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:100
 msgid "Mikhail ordered a 'Plush Pillow'."
-msgstr "Mikhail bestellte ein 'Plüschkissen'."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:110
 msgid "Pangitain the Brimhaven fortune teller ordered a 'Crystal Globe'."
-msgstr "Pangitain, die Brimhavener Wahrsagerin, bestellte eine 'Kristallkugel'."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:120
 msgid "Facutloni wants me to report back after the deliveries are complete."
 msgstr ""
-"Facutloni möchte, dass ich mich melde, nachdem die Lieferungen abgeschlossen "
-"sind."
 
 #: questlist_delivery.json:brv_wh_delivery:130
 msgid "I reported back to Facutloni. He is very happy."
-msgstr "Ich meldete mich bei Facutloni zurück. Er ist sehr glücklich."
+msgstr ""
 
 #: worldmap.xml:world1:crossglen
 msgid "Crossglen"
@@ -59973,3 +59894,4 @@ msgstr "Guynmart Castle"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "Brimhaven"
+

AndorsTrail/app/src/main/assets/translation/eo.po

@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-03-18 19:50+0200\n"
-"PO-Revision-Date: 2022-05-14 11:15+0000\n"
-"Last-Translator: Tanja Orme <irizanjo@gmail.com>\n"
+"PO-Revision-Date: 2021-05-21 13:52+0000\n"
+"Last-Translator: Jakub Fabijan <animatorzPolski@gmail.com>\n"
 "Language-Team: Esperanto <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/eo/>\n"
 "Language: eo\n"
@@ -12,7 +12,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.7-dev\n"
 
 #: actorconditions_v069.json:bless
 msgid "Bless"
@@ -32,11 +32,11 @@ msgstr ""
 
 #: actorconditions_v069_bwm.json:speed_minor
 msgid "Minor speed"
-msgstr "Malforta rapideco"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:fatigue_minor
 msgid "Minor fatigue"
-msgstr "Malforta laceco"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:feebleness_minor
 msgid "Minor weapon feebleness"
@@ -44,7 +44,7 @@ msgstr ""
 
 #: actorconditions_v069_bwm.json:bleeding_wound
 msgid "Bleeding wound"
-msgstr "Sanganta vundo"
+msgstr "Homoragia vundo"
 
 #: actorconditions_v069_bwm.json:rage_minor
 msgid "Minor berserker rage"
@@ -60,35 +60,35 @@ msgstr "Ebria"
 
 #: actorconditions_v069_bwm.json:dazed
 msgid "Dazed"
-msgstr "Hebeta"
+msgstr ""
 
 #: actorconditions_v0610.json:chaotic_grip
 msgid "Chaotic grip"
-msgstr "Ĥaosa tenado"
+msgstr ""
 
 #: actorconditions_v0610.json:chaotic_curse
 msgid "Chaotic curse"
-msgstr "Ĥaosa malbeno"
+msgstr ""
 
 #: actorconditions_v0611.json:contagion
 msgid "Insect contagion"
-msgstr "Insekta kontaĝo"
+msgstr ""
 
 #: actorconditions_v0611.json:blister
 msgid "Blistering skin"
-msgstr "Bruligita haŭto"
+msgstr ""
 
 #: actorconditions_v0611.json:stunned
 msgid "Stunned"
-msgstr "Hebeta"
+msgstr ""
 
 #: actorconditions_v0611.json:focus_dmg
 msgid "Focused damage"
-msgstr "Celita domaĝo"
+msgstr ""
 
 #: actorconditions_v0611.json:focus_ac
 msgid "Focused accuracy"
-msgstr "Fokusa precizeco"
+msgstr ""
 
 #: actorconditions_v0611.json:poison_irdegh
 msgid "Irdegh poison"
@@ -191,9 +191,8 @@ msgid "Minor sting"
 msgstr ""
 
 #: actorconditions_stoutford.json:confusion
-#, fuzzy
 msgid "Confusion"
-msgstr "Konfuzo"
+msgstr "Malordo"
 
 #: actorconditions_stoutford.json:clumsiness
 msgid "Clumsiness"
@@ -14835,7 +14834,7 @@ msgstr ""
 
 #: conversationlist_talion_2.json:talion_cure_6:0
 msgid "Drink the potion."
-msgstr "Trinki la pocion."
+msgstr "Trinki la pocion"
 
 #: conversationlist_talion_2.json:talion_cure_7
 msgid "[The potion smells rancid, but you manage to drink it all down. The pain from the stomach decreases, and you feel one of the rotworms crawling up into your mouth. You quickly spit the worm out into the now empty vial.]"
@@ -57247,7 +57246,7 @@ msgstr "Mi venkis."
 
 #: questlist_stoutford_combined.json:stn_colonel:143
 msgid "It won."
-msgstr "Ĝi venkis."
+msgstr "Ĝi venkis"
 
 #: questlist_stoutford_combined.json:stn_colonel:151
 msgid "The fifth and last opponent came towards me: Bully."
@@ -58124,7 +58123,7 @@ msgstr ""
 
 #: questlist_brimhaven2.json:brv_school2:152
 msgid "I killed the evil statue."
-msgstr "Mi mortigis la malbonan statuon."
+msgstr "Mi mortis la malbonan statuon"
 
 #: questlist_brimhaven2.json:brv_school2:200
 msgid "The teacher thanked me for saving her. School is over for me. I can go to the general store and get a cake for good performance."
@@ -58224,7 +58223,7 @@ msgstr ""
 
 #: questlist_brimhaven_2.json:cat_and_mouse
 msgid "A cat and mouse game"
-msgstr "Ludo de kato kaj muso"
+msgstr "Ludo kato kaj muso."
 
 #: questlist_brimhaven_2.json:cat_and_mouse:10
 msgid "I agreed to help Seviron trap the mouse that the cat cannot catch. I need to get some cheese, a large empty bottle, and three rocks."
@@ -58389,7 +58388,7 @@ msgstr ""
 
 #: questlist_fungi_panic.json:fungi_panic:163
 msgid "And a third time."
-msgstr "Kaj trian fojon."
+msgstr "Kaj tria folio"
 
 #: questlist_fungi_panic.json:fungi_panic:164
 msgid "After another fight with Zuul'khan I got through the black fog again."
@@ -58885,3 +58884,4 @@ msgstr ""
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr ""
+

AndorsTrail/app/src/main/assets/translation/es.po

@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: andors-trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-08-05 04:23+0000\n"
-"Last-Translator: Andrés Morgensen <expressindia_aeromax@slmail.me>\n"
+"PO-Revision-Date: 2021-11-13 08:28+0000\n"
+"Last-Translator: Alejandro Ruiz Medina <aleordenata@gmail.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/es/>\n"
 "Language: es\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14-dev\n"
+"X-Generator: Weblate 4.9.1-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:26+0000\n"
 
 #: [none]
@@ -425,8 +425,6 @@ msgstr "¿Qué clase de libro es el que tienes en la mano?"
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
 msgstr ""
-"Sí, estoy aquí para entregar el pedido de una 'Almohada de felpa'. ¿Pero "
-"para qué?"
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1713,7 +1711,7 @@ msgstr "Realmente parece que te gustan tus libros."
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
-msgstr "Y yo soy tu repartidor. ¿Pediste un 'Libro viejo polvoriento'?"
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -6260,7 +6258,7 @@ msgstr "Sí, he descubierto la historia de lo que le pasó."
 
 #: conversationlist_wrye.json:wrye_return_1:3
 msgid "Not yet, but your order has finally arrived."
-msgstr "Todavía no, pero tu pedido finalmente ha llegado."
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_return_2
 msgid "Welcome back. Thank you for your help in finding out what happened to my son."
@@ -6275,7 +6273,6 @@ msgstr "De nada."
 #: conversationlist_wrye.json:wrye_return_2:2
 msgid "Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?"
 msgstr ""
-"Sí, volví para entregarte tu pedido de un 'Lyre'. ¿Debes ser bueno jugando?"
 
 #: conversationlist_wrye.json:wrye_mourn_1
 msgid "Shadow help me."
@@ -6289,7 +6286,7 @@ msgstr "¿Cuál es el problema?"
 
 #: conversationlist_wrye.json:wrye_mourn_1:1
 msgid "Excuse me, I'm here to deliver your order for a 'Lyre'."
-msgstr "Disculpe, estoy aquí para entregar su pedido de un 'Lyre'."
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_2
 msgid "My son! My son is gone."
@@ -6307,7 +6304,7 @@ msgstr "¿Qué pasa con él?"
 
 #: conversationlist_wrye.json:wrye_mourn_2:2
 msgid "Maybe your order here will comfort you?"
-msgstr "¿Tal vez tu pedido... te consolará?"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_3
 msgid "I don't want to talk about it. Not with an outsider like you."
@@ -17278,8 +17275,6 @@ msgstr "¿Cómo sabes de donde soy?"
 #: conversationlist_arghes.json:arghes_2:3
 msgid "And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?"
 msgstr ""
-"Y qué interesante que hayas pedido un par de 'botas amarillas'. ¿Realmente "
-"ordenaste esto?"
 
 #: conversationlist_arghes.json:arghes_3a
 msgid "Is that so? Hmm, most interesting. It does not change anything, however."
@@ -25619,7 +25614,7 @@ msgstr "¿Estás acostado en la cama a plena luz del día?"
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_10:1
 msgid "I'm here to give you your ordered item. You don't want it?"
-msgstr "Estoy aquí para darle su artículo pedido. ¿No lo quieres?"
+msgstr ""
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_20
 msgid "I am checking that the bed of young Robalyrius is still in order."
@@ -29268,8 +29263,6 @@ msgstr "Te ves feliz de nuevo."
 #: conversationlist_stoutford_combined.json:odirath_0:5
 msgid "Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you"
 msgstr ""
-"¿Realmente ordenaste una figura de porcelana tan fea? Uy, lo siento, no "
-"quise ofenderte"
 
 #: conversationlist_stoutford_combined.json:odirath_1
 msgid "I did see someone that might have been your brother. He was with a rather dubious looking person. They didn't stay around here very long though. Sorry, but that's all I can tell you. You should ask around town. Other townsfolk may know more."
@@ -33959,8 +33952,6 @@ msgstr "Eh, siento molestarte."
 #: conversationlist_arulir_mountain.json:tjure_0:3
 msgid "I'm surprised to see you here as well. Did you order 'Mysterious green something'?"
 msgstr ""
-"Estoy sorprendido de verte aquí también. ¿Oye pediste 'Algo verde y "
-"misterioso'?"
 
 #: conversationlist_arulir_mountain.json:tjure_0_10
 msgid "I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out."
@@ -34081,20 +34072,20 @@ msgstr "*Suspiro* Eras mi última esperanza. Déjame ahora."
 
 #: conversationlist_arulir_mountain.json:tjure_90:0
 msgid "Hope you learned from it."
-msgstr "Espero que hayas aprendido de eso."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_90:1
 msgid "OK. One question before I go: did you order a 'Mysterious green something'?"
-msgstr "Ok. Una pregunta antes de irme: ¿pediste 'Algo verde y misterioso'?"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:0
 #: conversationlist_arulir_mountain.json:tjure_200:0
 msgid "It was an interesting experience."
-msgstr "Fue una experiencia interesante."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:1
 msgid "No problem. By the way, did you order a 'Mysterious green something'?"
-msgstr "No hay problema. Por cierto, ¿pediste 'Algo verde y misterioso'?"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_200
 msgid "Oh, you look better than the last time we met. Thank you for your help."
@@ -34102,7 +34093,7 @@ msgstr "Oh, te ves mejor que la última vez que nos vimos. Gracias por tu ayuda.
 
 #: conversationlist_arulir_mountain.json:tjure_200:1
 msgid "Indeed. By the way, did you order a 'Mysterious green something'?"
-msgstr "Por cierto. Por cierto, ¿pediste 'Algo verde y misterioso'?"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:watermark_script_100
 msgid "This seems to be a very strange place. Maybe even dangerous."
@@ -35821,7 +35812,7 @@ msgstr "¿Has visto alguna vez guantes como estos? [Le muestra a Venanra los gua
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_0:5
 msgid "Did you order an 'Old, worn cape'?"
-msgstr "¿Pediste una 'Capa vieja y gastada'?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_1
 msgid "We are working on some nice green dresses. We can also repair and improve your clothes."
@@ -36743,7 +36734,7 @@ msgstr "Estoy buscando a mi hermano, Andor ¿Has visto por la ciudad a alguien q
 
 #: conversationlist_brimhaven.json:edrin_0_0:6
 msgid "Hello, did you order a 'Striped Hammer'?"
-msgstr "Hola, ¿ordenaste un 'Martillo rayado'?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:edrin_5_0
 msgid "Yes, that's the one that matches the dagger! Now that I have both pieces, I can repair the dagger for you if you wish."
@@ -37112,7 +37103,7 @@ msgstr "Tal vez pueda ayudarte."
 
 #: conversationlist_brimhaven.json:brv_fortune_choice:3
 msgid "Are you the one who ordered a 'Crystal Globe'?"
-msgstr "¿Eres tú quien ordenó un 'Globo de Cristal'?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_andor_10
 msgid "I see you talking to your brother, somewhere far from here in a big city. Feygard or Nor City, I think."
@@ -37256,7 +37247,7 @@ msgstr "Estoy buscando..."
 
 #: conversationlist_brimhaven.json:brv_fortune_10:2
 msgid "So you are the one who ordered a 'Crystal Globe'?"
-msgstr "¿Entonces eres la que ordenó un 'Globo de Cristal'?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_50
 msgid "It will cost you 100 gold."
@@ -37422,7 +37413,7 @@ msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_talk
 msgid "You rattle at the iron bars."
-msgstr "Sacudes los barrotes de hierro."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_talk:0
 msgid "Hey, I'm starving!"
@@ -37459,124 +37450,114 @@ msgstr "Qué co..."
 #: conversationlist_brimhaven.json:remgard_prison_thief_10
 msgid "Don't look startled. You should have expected this from us thieves."
 msgstr ""
-"No te sorprendas. Deberías haber esperado esto de nosotros los ladrones."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_12
 msgid "Especially when you have carried such a lot of bonemeal potions with you."
 msgstr ""
-"Especialmente cuando has llevado tantas pociones de harina de huesos contigo."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_12:0
 msgid "Hey, what do you know about it?"
-msgstr "Oye, ¿qué sabes al respecto?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_14
 msgid "We know everything."
-msgstr "Lo sabemos todo."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_14:0
 msgid "Yeah, obviously."
-msgstr "Sí, obviamente."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_20
 msgid "We are thankful for your potions, and we are always grateful."
-msgstr "Estamos agradecidos por sus pociones, y siempre estaremos agradecidos."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_22
 msgid "So we offer you half of your stock. And your freedom. Deal?"
-msgstr "Así que te ofrecemos la mitad de tu stock. Y tu libertad. ¿Acuerdo?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_22:0
 msgid "Do I have a choice?"
-msgstr "¿Tengo elección?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_30
 msgid "Sure you do. You could get nothing and stay here to starve."
 msgstr ""
-"Seguro lo haces. No podrías conseguir nada y quedarte aquí para morirte de "
-"hambre."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_30:0
 msgid "Ah no. Let's have the first offer."
-msgstr "Ahh! no. Vamos a tener la primera oferta."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_52
 msgid "Here we go. I will count out loud, so you can check that I don't cheat."
 msgstr ""
-"Aquí vamos. Contaré en voz alta, para que puedas comprobar que no hago "
-"trampa."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_52:0
 msgid "[muttering] Cheat - with my own potions ..."
-msgstr "[murmurando] Hacer trampa - con mis propias pociones..."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_54
 msgid "You already have your share. You do not try to cheat, do you? In that case I would be very disappointed."
 msgstr ""
-"Ya tienes tu parte. No hiciste trampa, ¿verdad? Por que en ese caso estaría "
-"muy decepcionado."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_54:0
 msgid "No, no. Everything is awful."
-msgstr "No, no todo es horrible."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback_1000
 msgid "1000 bonemeal potions."
-msgstr "1000 pociones de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback_100
 msgid "100 bonemeal potions."
-msgstr "100 pociones de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback_10
 msgid "10 bonemeal potions."
-msgstr "10 pociones de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback_1
 msgid "1 bonemeal potion."
-msgstr "1 pocion de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback2_1000
 msgid "1000 exotic bonemeal potions."
-msgstr "1000 pociones exóticas de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback2_100
 msgid "100 exotic bonemeal potions."
-msgstr "100 pociones exóticas de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback2_10
 msgid "10 exotic bonemeal potions."
-msgstr "10 pociones exóticas de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_getback2_1
 msgid "1 exotic bonemeal potion."
-msgstr "1 poción exótica de harina de hueso."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_100
 msgid "Ha ha ha! That was fun, wasn't it?"
-msgstr "¡Jajaja! Eso fue divertido, ¿no?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_110
 msgid "Now it's all settled. We may leave now."
-msgstr "Ahora está todo arreglado. Podemos irnos ahora."
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_110:0
 msgid "What? How can we leave?"
-msgstr "¿Qué? ¿Cómo podemos irnos?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_112
 msgid "Oh, that is easy. Check the back wall - it is fake. We had it exchanged secretly, and those stupid guards haven't found out yet."
 msgstr ""
-"Eso es fácil. Revisa la pared trasera, es falsa. Lo intercambiamos en "
-"secreto, y esos estúpidos guardias aún no se dieron cuenta."
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_112:0
 msgid "Oh really?"
-msgstr "¿Ah, enserió?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:remgard_prison_thief_200
 msgid "Bye now. I will keep an eye on you."
-msgstr "Hasta luego. Te mantendré al tanto."
+msgstr ""
 
 #: conversationlist_brimhaven2.json:brv_school_check_duel_14a
 msgid "When the other students see how you killed Golin, a panic breaks out. Screaming, they all run out of the building."
@@ -43016,154 +42997,141 @@ msgstr "¡Realmente necesito tu ayuda!"
 
 #: conversationlist_gorwath.json:gorwath_letter
 msgid "Hey, Andor!"
-msgstr "¡Hola, Andor!"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter:0
 msgid "I am not Andor. What do you want from him?"
-msgstr "Yo no soy Andor. ¿Qué quieres de él?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_1
 msgid "Oh, Andor promised to meet me here. Who are you?"
-msgstr "Oh vaya!, Andor prometió verme aquí. ¿Quién eres tú?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_1:0
 msgid "My name is $playername. I'm looking for my brother too, he has been away for a while now."
 msgstr ""
-"Mi nombre es $playername. Estoy buscando a mi hermano también, él ha estado "
-"fuera por un tiempo."
 
 #: conversationlist_gorwath.json:gorwath_letter_1:1
 msgid "My name is none of your business. Get out of our property now!"
-msgstr "Mi nombre no te importa. ¡Sal de aqui ahora!"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_2
 msgid "Oh dear, oh dear. This is a very personal matter. I don't want everyone to know about it."
 msgstr ""
-"Oh cielos, oh cielos. Este es un asunto muy personal. No quiero que todos lo "
-"sepan."
 
 #: conversationlist_gorwath.json:gorwath_letter_2:0
 msgid "I want to help you since my brother did not. Please tell me what's on your mind."
 msgstr ""
-"Quiero ayudarte ya que mi hermano no lo hizo. Por favor, dime lo que tienes "
-"en mente."
 
 #: conversationlist_gorwath.json:gorwath_letter_3
 msgid "Really? That's very kind of you."
-msgstr "¿En serio? Es muy amable por tu parte."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_10
 msgid "You probably don't know me. I am Gorwath. I only recently moved to Crossglen to live with my aunt."
 msgstr ""
-"Probablemente no me conoces. Soy Gorwath. Recientemente me mudé a Crossglen "
-"para vivir con mi tía."
 
 #: conversationlist_gorwath.json:gorwath_letter_10:0
 msgid "With Leta?"
-msgstr "¿Con Leta?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_11
 msgid "Yes. You know her? Then you will also know how strict she can be. Sigh."
 msgstr ""
-"Sí. ¿Usted la conoce? Entonces también sabrás lo estricta que puede ser. "
-"\"Suspira\"."
 
 #: conversationlist_gorwath.json:gorwath_letter_12
 msgid "I met someone at the last weekly market and I want to send them something."
-msgstr "Conocí a alguien en el último mercado semanal y quiero enviarle algo."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_12:0
 msgid "Who is he?"
-msgstr "¿Quién es él?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_13
 msgid "To be precise, I have a letter ... for ... a lovely girl."
-msgstr "Para ser precisos, tengo una carta... para... una chica encantadora."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_13:0
 msgid "Huh?"
-msgstr "¿Eh?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_14
 msgid "Yes, she is the most beautiful girl in the world! Her name is Arensia."
-msgstr "¡Sí, ella es la chica más hermosa del mundo! Su nombre es Arensia."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_14:0
 msgid "Hm, I don't know anyone here by that name."
-msgstr "Hm, no conozco a nadie aquí con ese nombre."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_15
 msgid "Unfortunately she lives in Fallhaven. My aunt would never allow me to go there."
 msgstr ""
-"Desafortunadamente, ella vive en Fallhaven. Mi tía nunca me dejaría ir allí."
 
 #: conversationlist_gorwath.json:gorwath_letter_15:0
 msgid "And how could I help you?"
-msgstr "¿Y en qué podría ayudarte?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_16
 msgid "Andor promised to take the letter to her. Maybe you could ..."
-msgstr "Andor prometió llevarle la carta. Tal vez podrías ..."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_16:0
 msgid "I could what?"
-msgstr "¿podría que?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_20
 msgid "Would you be so kind to give her my letter?"
-msgstr "¿Serías tan amable de darle mi carta?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_20:0
 msgid "Yeah sure, why not?"
-msgstr "Sí, seguro. ¿Por qué no?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_20:1
 msgid "No I'm busy. Good bye."
-msgstr "No, estoy ocupado. Adiós."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_22
 msgid "You really don't want to help me? Then I have no more hope."
-msgstr "¿Realmente no quieres ayudarme? Entonces no tengo más esperanzas."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_22:0
 msgid "Now, now. Give me your precious letter, I'll do it."
-msgstr "Ahora, ahora. Dame tu preciosa carta, lo haré yo."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_22:1
 msgid "Sorry, but I have no time. I have to find my brother now."
-msgstr "Lo siento, pero no tengo tiempo. Ahora necesito encontrar a mi hermano."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_22:2
 msgid "Grow up and solve your problems yourself. I'm not a postman!"
-msgstr "Madura y resuelve tus problemas tú mismo. ¡No soy un cartero!"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_24
 msgid ""
 "Good by then. I will not disturb you anymore.\n"
 "* Sob *"
 msgstr ""
-"Adiós entonces. No te molestaré más.\n"
-"*Sollozo*"
 
 #: conversationlist_gorwath.json:gorwath_letter_50
 msgid "Thanks a lot. Here's the letter. Go to Fallhaven and look for Arensia."
-msgstr "Muchas gracias. Aquí está la carta. Ve a Fallhaven y busca a Arensia."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_50:0
 msgid "Fallhaven is a big city. How shall I find her?"
-msgstr "Fallhaven es una gran ciudad. ¿Cómo la encontraré?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter_52
 msgid "She is the daughter of Jakrar the woodcutter, so she will surely live there."
-msgstr "Ella es la hija de Jakrar el leñador, por lo que seguro vive allí."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_love
 msgid "You are back! Did you find Arensia?"
-msgstr "¡Estas de vuelta! ¿Encontraste a Arensia?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_love:0
 msgid "Yes. I gave her the letter and she asked me to tell you that she loves you too."
-msgstr "Sí. Le dí la carta y me pidió que te diga que ella también te ama."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_love_1
 msgid "That's great! I'm so excited!"
@@ -43171,53 +43139,51 @@ msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_love_2
 msgid "You have truly earned these gold pieces."
-msgstr "Realmente te has ganado estas piezas de oro."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_exit
 msgid "I will go now and prepare a present for lovely Arensia."
-msgstr "Ahora iré y prepararé un regalo para la encantadora Arsensia."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_exit_1
 msgid "And when we get married, you will of course be invited."
-msgstr "Y cuando nos casemos, por supuesto estarás invitado."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_tmp
 msgid "Did you give her the letter yet?"
-msgstr "¿Ya le entregaste la carta?"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_tmp:0
 msgid "Eh ... no. I thought, it wasn't that important."
-msgstr "Eh... no. Pensé que no era tan importante."
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_tmp2
 msgid "Not that important?? I can barely breathe if I don't get her answer! Hurry now! Please, do."
 msgstr ""
-"¡¿No tan importante?! ¡Apenas si puedo respirar si no consigo su respuesta! ¡"
-"Deprisa! Por favor, hazlo."
 
 #: conversationlist_gorwath.json:gorwath_done
 msgid "Thanks again for your great help!"
-msgstr "¡Nuevamente, gracias por tu enorme ayuda!"
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_1:1
 msgid "I have a letter for you."
-msgstr "Tengo una carta para ti."
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_done
 msgid "What a beautiful day, isn't it?"
-msgstr "Que día más bonito, ¿verdad?"
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_letter
 msgid "A letter? From whom?"
-msgstr "¿Una carta? ¿De quién?"
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_letter:0
 msgid "It is from Gorwath, of Crossgl..."
-msgstr "Es de Gorwarth, de Crossgl..."
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_letter_10
 msgid "Oh really? Give it to me - quickly!"
-msgstr "¿De verdad? Dámela - ¡rápido!"
+msgstr ""
 
 #: conversationlist_gorwath.json:arensia_letter_20
 msgid ""
@@ -43225,44 +43191,36 @@ msgid ""
 "\n"
 "Oh that's cute. Tell Gorwath I love him too."
 msgstr ""
-"[Leyendo]\n"
-"\n"
-"Oh, que adorable. Dile a Gorwath que yo también lo amo."
 
 #: conversationlist_gorwath.json:arensia_letter_20:0
 msgid "I'll be happy to tell him that."
-msgstr "Estaré encantado de decírselo."
+msgstr ""
 
 #: conversationlist_omi2.json:bwm17_worker
 msgid "Hello child, if you came to climb the mountain here, then I have to disappoint you."
 msgstr ""
-"Hola niño, si has venido a escalar esta montaña, vas a quedar decepcionado."
 
 #: conversationlist_omi2.json:bwm17_worker_1
 msgid "The ladder was in danger of collapsing. I'm fixing it right now. Come again later."
 msgstr ""
-"La escalera estaba a punto de colapsar. Estoy arreglándola ahora mismo. "
-"Vuelve más tarde."
 
 #: conversationlist_omi2.json:bwm17_questenabled
 msgid "The ladder is under construction."
-msgstr "La escalera está bajo construcción."
+msgstr ""
 
 #: conversationlist_omi2.json:bwm17_vine_1
 msgid "There are some flies teeming on the basket. Apart from some rotten meat and vegetables, there does not seem to be anything valuable inside it."
 msgstr ""
-"Hay algunas moscas pululando en la canasta. Aparte de un poco de carne y "
-"verduras podridas, no parece haber nada de valor en su interior."
 
 #: conversationlist_omi2.json:bwm17_vine_1:0
 #: conversationlist_omi2.json:bwm17_vine_3:0
 #: conversationlist_omi2.json:bwm72_corpse1_1:1
 msgid "Leave it be."
-msgstr "Déjalo estar."
+msgstr ""
 
 #: conversationlist_omi2.json:bwm17_vine_1:1
 msgid "Take a better look."
-msgstr "Echa un mejor vistazo."
+msgstr ""
 
 #: conversationlist_omi2.json:bwm17_vine_2
 msgid "Under all the rotten food, there is a long vine all rolled up. It might be useful, so you decide to take it."
@@ -51568,7 +51526,7 @@ msgstr "Arambold"
 
 #: monsterlist_crossglen_npcs.json:tharal
 msgid "Tharal"
-msgstr "Taral"
+msgstr "Tharal"
 
 #: monsterlist_crossglen_npcs.json:drunk
 msgid "Drunk"
@@ -51966,7 +51924,7 @@ msgstr "Carterista"
 
 #: monsterlist_v068_npcs.json:troublemaker
 msgid "Troublemaker"
-msgstr "Buscapleitos"
+msgstr "Alborotador"
 
 #: monsterlist_v068_npcs.json:farrik
 msgid "Farrik"
@@ -55066,11 +55024,11 @@ msgstr "Ladrón"
 
 #: monsterlist_gorwath.json:gorwath
 msgid "Gorwath"
-msgstr "Gorwat"
+msgstr ""
 
 #: monsterlist_gorwath.json:arensia
 msgid "Arensia"
-msgstr "Arensia"
+msgstr ""
 
 #: monsterlist_omi2.json:mountain_wolf_2
 msgid "Trained mountain wolf"
@@ -55106,7 +55064,7 @@ msgstr ""
 
 #: monsterlist_omi2.json:ehrenfest
 msgid "Ehrenfest"
-msgstr "Ehrenfest"
+msgstr ""
 
 #: monsterlist_omi2.json:ortholion
 #: monsterlist_omi2.json:ortholion_hidden
@@ -55213,7 +55171,7 @@ msgstr ""
 
 #: monsterlist_omi2.json:kamelio
 msgid "Kamelio"
-msgstr "Kamelio"
+msgstr ""
 
 #: monsterlist_omi2.json:kamelio2
 msgid "Undead Kamelio"
@@ -59774,3 +59732,4 @@ msgstr "Castillo de Guynmart"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "Brimhaven"
+

AndorsTrail/app/src/main/assets/translation/fr.po

@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: Andors Trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-06-20 10:23+0000\n"
-"Last-Translator: Lacrom <englishmaninnewyork98@gmail.com>\n"
+"PO-Revision-Date: 2022-03-27 00:51+0000\n"
+"Last-Translator: Roman Leo <roman.leo@gmx.de>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/fr/>\n"
 "Language: fr\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 4.12-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:28+0000\n"
 
 #: [none]
@@ -377,7 +377,7 @@ msgstr "Blessures glaciales"
 
 #: actorconditions_omi2.json:relax
 msgid "Requiescence"
-msgstr "Récupération"
+msgstr ""
 
 #: actorconditions_omi2.json:kazarite_misery
 msgid "Kazaul possession"
@@ -432,8 +432,6 @@ msgstr "Quel genre de livre as-tu dans les mains ?"
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
 msgstr ""
-"Oui, je suis ici pour livrer la commande d'un \"oreiller en peluche\" . Mais "
-"pour quoi faire ?"
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1202,7 +1200,7 @@ msgstr "Je me cache ici à cause de mon épouse. Elle est toujours après moi pa
 #: conversationlist_crossglen_leta.json:oromir2:0
 #: conversationlist_algangror.json:algangror_remgard_5:1
 msgid "[Lie] OK."
-msgstr "[Mentir] OK."
+msgstr "(En mentant) OK."
 
 #: conversationlist_crossglen_leta.json:oromir2:1
 msgid "Your secret is safe with me."
@@ -1721,8 +1719,6 @@ msgstr "Vous semblez beaucoup aimer vos livres."
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
 msgstr ""
-"Et je suis votre garçon de livraison. Avez-vous commandé un \"vieux livre "
-"poussiéreux\" ?"
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -6269,7 +6265,7 @@ msgstr "Oui, J'ai trouvé l'histoire qui raconte ce qui lui est arrivé."
 
 #: conversationlist_wrye.json:wrye_return_1:3
 msgid "Not yet, but your order has finally arrived."
-msgstr "Pas encore, mais votre commande est arrivée."
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_return_2
 msgid "Welcome back. Thank you for your help in finding out what happened to my son."
@@ -6284,8 +6280,6 @@ msgstr "De rien."
 #: conversationlist_wrye.json:wrye_return_2:2
 msgid "Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?"
 msgstr ""
-"Oui, je suis revenu pour livrer la \"lyre\" que vous avez commandé. Vous "
-"êtes virtuose dans ce domaine ?"
 
 #: conversationlist_wrye.json:wrye_mourn_1
 msgid "Shadow help me."
@@ -6299,7 +6293,7 @@ msgstr "Que se passe-t-il ?"
 
 #: conversationlist_wrye.json:wrye_mourn_1:1
 msgid "Excuse me, I'm here to deliver your order for a 'Lyre'."
-msgstr "Excusez-moi, je suis ici pour livrer votre commande pour une \"lyre\"."
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_2
 msgid "My son! My son is gone."
@@ -6317,7 +6311,7 @@ msgstr "Qu'en est-il de lui ?"
 
 #: conversationlist_wrye.json:wrye_mourn_2:2
 msgid "Maybe your order here will comfort you?"
-msgstr "Peut-être que votre commande ici vous réconfortera ?"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_3
 msgid "I don't want to talk about it. Not with an outsider like you."
@@ -17288,8 +17282,6 @@ msgstr "Comment savez-vous d'où je viens ?"
 #: conversationlist_arghes.json:arghes_2:3
 msgid "And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?"
 msgstr ""
-"Comme il est étrange que vous ayez commandé une paire de \"bottes jaunes\". "
-"Les avez-vous réellement commandées ?"
 
 #: conversationlist_arghes.json:arghes_3a
 msgid "Is that so? Hmm, most interesting. It does not change anything, however."
@@ -25629,7 +25621,7 @@ msgstr "Vous traînez au lit en pleine journée ?"
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_10:1
 msgid "I'm here to give you your ordered item. You don't want it?"
-msgstr "Je suis ici pour livrer votre commande. Vous n'en voulez pas ?"
+msgstr ""
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_20
 msgid "I am checking that the bed of young Robalyrius is still in order."
@@ -29278,8 +29270,6 @@ msgstr "Vous avez l'air à nouveau heureux."
 #: conversationlist_stoutford_combined.json:odirath_0:5
 msgid "Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you"
 msgstr ""
-"Avez-vous vraiment commandé cette horrible figurine en porcelaine ? Oups, "
-"désolé je ne voulais pas vous offenser."
 
 #: conversationlist_stoutford_combined.json:odirath_1
 msgid "I did see someone that might have been your brother. He was with a rather dubious looking person. They didn't stay around here very long though. Sorry, but that's all I can tell you. You should ask around town. Other townsfolk may know more."
@@ -33969,8 +33959,6 @@ msgstr "Heu, désolé de vous avoir dérangé."
 #: conversationlist_arulir_mountain.json:tjure_0:3
 msgid "I'm surprised to see you here as well. Did you order 'Mysterious green something'?"
 msgstr ""
-"Je suis de même surpris de te voir ici. As-tu commandé une \"mystérieuse "
-"chose verte\" ?"
 
 #: conversationlist_arulir_mountain.json:tjure_0_10
 msgid "I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out."
@@ -34091,24 +34079,20 @@ msgstr "[Soupir] Tu étais mon dernier espoir. Laisse-moi maintenant."
 
 #: conversationlist_arulir_mountain.json:tjure_90:0
 msgid "Hope you learned from it."
-msgstr "J'espère que vous en avez tiré des leçons."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_90:1
 msgid "OK. One question before I go: did you order a 'Mysterious green something'?"
 msgstr ""
-"OK. Une question avant que je parte : as-tu commandé une \"mystérieuse chose "
-"verte\" ?"
 
 #: conversationlist_arulir_mountain.json:tjure_100:0
 #: conversationlist_arulir_mountain.json:tjure_200:0
 msgid "It was an interesting experience."
-msgstr "C'était une expérience intéressante."
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:1
 msgid "No problem. By the way, did you order a 'Mysterious green something'?"
 msgstr ""
-"Pas de problème. Par ailleurs, as-tu commandé une \"mystérieuse chose verte\""
-" ?"
 
 #: conversationlist_arulir_mountain.json:tjure_200
 msgid "Oh, you look better than the last time we met. Thank you for your help."
@@ -34117,7 +34101,6 @@ msgstr "Oh, tu as l'air mieux que la dernière fois. Merci pour ton aide."
 #: conversationlist_arulir_mountain.json:tjure_200:1
 msgid "Indeed. By the way, did you order a 'Mysterious green something'?"
 msgstr ""
-"Bien sûr. Par ailleurs, as-tu commandé une \"mystérieuse chose verte\" ?"
 
 #: conversationlist_arulir_mountain.json:watermark_script_100
 msgid "This seems to be a very strange place. Maybe even dangerous."
@@ -35836,7 +35819,7 @@ msgstr "As-tu déjà vu un gant comme celui-ci ? [Montrer le gant à Venanra.]"
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_0:5
 msgid "Did you order an 'Old, worn cape'?"
-msgstr "Avez-vous commandé une \"vieille cape usée\" ?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_1
 msgid "We are working on some nice green dresses. We can also repair and improve your clothes."
@@ -36758,7 +36741,7 @@ msgstr "Je cherche mon frère, Andor. Auriez-vous vu quelqu'un en ville qui me r
 
 #: conversationlist_brimhaven.json:edrin_0_0:6
 msgid "Hello, did you order a 'Striped Hammer'?"
-msgstr "Bonjour, avez-vous commandé un \"marteau à rayures\" ?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:edrin_5_0
 msgid "Yes, that's the one that matches the dagger! Now that I have both pieces, I can repair the dagger for you if you wish."
@@ -37127,7 +37110,7 @@ msgstr "Je peux peut-être vous aider."
 
 #: conversationlist_brimhaven.json:brv_fortune_choice:3
 msgid "Are you the one who ordered a 'Crystal Globe'?"
-msgstr "Est-tu celui qui a apporté une \"boule de cristal\" ?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_andor_10
 msgid "I see you talking to your brother, somewhere far from here in a big city. Feygard or Nor City, I think."
@@ -37271,7 +37254,7 @@ msgstr "Je recherche..."
 
 #: conversationlist_brimhaven.json:brv_fortune_10:2
 msgid "So you are the one who ordered a 'Crystal Globe'?"
-msgstr "Donc tu es celui qui a commandé une \"boule de cristal\" ?"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_50
 msgid "It will cost you 100 gold."
@@ -38401,7 +38384,7 @@ msgstr "J'ai pas de travail à te proposer pour le moment."
 
 #: conversationlist_brimhaven2.json:brv_wh_item_00_1
 msgid "You have found the second crystal globe. Now that's a pair!"
-msgstr "Tu as trouvé la deuxième boule de cristal. C'est une paire !"
+msgstr "Tu as trouvé le deuxième globe de cristal. C'est une paire !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_00_4
 #: conversationlist_brimhaven2.json:brv_wh_item_01_4
@@ -38440,11 +38423,11 @@ msgstr "Tu as trouvé la botte jaune !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_04_1
 msgid "You have found the second chandelier!"
-msgstr "Tu as trouvé le deuxième chandelier !"
+msgstr "Tu as trouvé le deuxième lustre !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_05_1
 msgid "You have found the second mysterious green something!"
-msgstr "Tu as trouvé la deuxième mystérieuse chose verte !"
+msgstr "Tu as trouvé le deuxième truc vert mystérieux !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_06_1
 msgid "You have found the second old, worn cape!"
@@ -38456,11 +38439,11 @@ msgstr "Tu as trouvé la deuxième jolie figurine en porcelaine !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_08_1
 msgid "You have found the second striped hammer!"
-msgstr "Tu as trouvé le deuxième marteau à rayures !"
+msgstr "Tu as trouvé le deuxième marteau rayé !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_09_1
 msgid "You have found the second dusty old book!"
-msgstr "Tu as trouvé le deuxième vieux livre poussiéreux !"
+msgstr "Tu as trouvé le deuxième livre poussiéreux !"
 
 #: conversationlist_brimhaven2.json:brv_wh_item_xx_2
 msgid "You put it back to its former place."
@@ -42497,299 +42480,259 @@ msgid ""
 "I obtained the book some years ago. It was a present from Bogsten - you know him? - and instantly I took a fancy for these fabulous recipes.\n"
 "Please find it and return it to me."
 msgstr ""
-"J'ai obtenu ce livre il y a quelques années. C'était un cadeau de Bogsten - "
-"tu le connais ? - et j'ai tout de suite été sous le charme de ces fabuleuses "
-"recettes.\n"
-"S'il te plaît, retrouve-le pour moi."
 
 #: conversationlist_gison.json:gison_p2_10_5:0
 msgid "What's written in that chapter?"
-msgstr "Qu'est-il écrit dans ce chapitre ?"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_6
 msgid "That's a good question. I don't know that language, therefore I ignored the pages for ages. Maybe the robbers know what that chapter is about."
 msgstr ""
-"C'est une bonne question. Je ne connais pas ce langage, donc j'ai ignoré ces "
-"pages pendant des années. Peut-être que les voleurs savent de quoi parle ce "
-"chapitre."
 
 #: conversationlist_gison.json:gison_p2_10_7
 msgid "You want a reward?"
-msgstr "Tu veux une récompense ?"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_8
 msgid "I don't have that much money. As a simple token of gratitude I can offer to make some soup for you. I don't own very much more."
 msgstr ""
-"Je n’ai pas autant d’argent. En guise de remerciement, je peux t'offrir de "
-"la soupe. Je ne possède pas beaucoup plus."
 
 #: conversationlist_gison.json:gison_p2_10_8:0
 msgid "I guess it's not worth the trouble. Time to go."
-msgstr "Je suppose que ça ne vaut pas le coup. Il est temps de partir."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_8:1
 msgid "Sounds fair."
-msgstr "Cela semble juste."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_9
 msgid "Well, will you help me?"
-msgstr "Eh bien, veux-tu m'aider ?"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_9:0
 msgid "Sure thing. I'll search for your book."
-msgstr "Bien sûr. Je vais chercher votre livre."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_9:1
 msgid "Find somebody else."
-msgstr "Trouvez quelqu'un d'autre."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_10_10
 msgid "Oh, well. I started to believe that I could not trust my knowledge of human nature anymore."
 msgstr ""
-"Oh, bien. J'ai commencé à croire que je ne pouvais plus faire confiance à ma "
-"connaissance de la nature humaine."
 
 #: conversationlist_gison.json:gison_p2_10_11
 msgid "I really thank you."
-msgstr "Merci beaucoup."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_15
 msgid "The robbers came from the south. Maybe you should start your search in that direction. Take care!"
 msgstr ""
-"Les voleurs sont venus du sud. Tu devrais peut-être commencer tes recherches "
-"dans cette direction. Fais attention !"
 
 #: conversationlist_gison.json:gison_p2_15:0
 msgid "I will. Thank you."
-msgstr "Je serai prudent. Merci."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50
 msgid "Did you find my precious cook book?"
-msgstr "As-tu trouvé mon précieux livre de cuisine ?"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50:0
 msgid "Yes I have. Look here."
-msgstr "Oui, je l'ai trouvé. Regardez."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50:1
 msgid "[Lie] I found the robbers, but they had destroyed the book."
-msgstr "[Mentir] J'ai trouvé les voleurs, mais ils avaient détruit le livre."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50_1
 msgid "Is it really true? I can't believe it!"
-msgstr "C'est vrai ? Je n'arrive pas à y croire !"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50_1:0
 msgid "A sorcerer named Zuul'khan was reciting dark words from it. You were right, the robbers wanted these strange written lines."
 msgstr ""
-"Un sorcier nommé Zuul'khan récitait des incantations occultes en le lisant. "
-"Vous aviez raison, les voleurs convoitaient ces étranges inscriptions."
 
 #: conversationlist_gison.json:gison_p2_50_2
 msgid "But you have two similar looking books?"
-msgstr "Mais tu as deux livres similaires ?"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50_2:0
 msgid "Yes, the robbers have made a complete copy of the book, just without the spell."
 msgstr ""
-"Oui, les voleurs ont fait une copie complète du livre, mais sans le "
-"sortilège."
 
 #: conversationlist_gison.json:gison_p2_50_3
 msgid "Then give me the copy. I don't want to be raided again."
-msgstr "Alors donne-moi la copie. Je ne souhaite pas être attaqué à nouveau."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_50_3:0
 msgid "OK. Then I'll take the version with the spell. I can't read the dark words, but that doesn't bother me."
 msgstr ""
-"OK. Je vais prendre la version avec le sortilège, alors. Je ne peux pas lire "
-"les inscriptions, mais cela ne me dérange pas."
 
 #: conversationlist_gison.json:gison_p2_50_5
 msgid "Noo!"
-msgstr "Nooon !"
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_62
 msgid "Well, you tried to help. Thank you."
-msgstr "Eh bien, tu as essayé d'aider. Merci."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_62_10
 msgid "It's a pity that I can't cook my delicious soup any more."
 msgstr ""
-"C'est vraiment dommage que je ne puisse plus cuisiner ma délicieuse soupe."
 
 #: conversationlist_gison.json:gison_p2_70
 msgid "Thank you for your help retrieving my precious cookbook. Would you like some soup as a small reward?"
 msgstr ""
-"Merci de ton aide pour recupérer mon précieux livre de cuisine. Veux-tu de "
-"la soupe comme petite récompense ?"
 
 #: conversationlist_gison.json:gison_p2_70:0
 msgid "Oh yes."
-msgstr "Oh, oui."
+msgstr ""
 
 #: conversationlist_gison.json:gison_p2_70_10
 msgid "Give me 2 of Bogsten's mushrooms and an empty bottle, then I could sell you a portion for only 50 gold."
 msgstr ""
-"Donne-moi deux champignons de Bogsten et une bouteille vide, alors je "
-"pourrai te vendre une portion pour 50 pièces d'or."
 
 #: conversationlist_gison.json:nimael_1
 msgid "Please help us. We got raided."
-msgstr "S'il te plaît, aide-nous. Nous avons été attaqués."
+msgstr ""
 
 #: conversationlist_gison.json:nimael_2
 msgid "I don't know exactly. Everything went so fast ... I'm too upset and my head hurts too much."
 msgstr ""
-"Je ne sais pas vraiment. Tout s'est passé si vite... Je suis trop énervé et "
-"j'ai trop mal a la tête."
 
 #: conversationlist_gison.json:nimael_3
 msgid "If you want to help us, please talk to Gison."
-msgstr "Si tu veux nous aider, parle à Gison s'il te plaît."
+msgstr ""
 
 #: conversationlist_gison.json:nimael_3:0
 msgid "OK. Get well."
-msgstr "OK. Bon rétablissement."
+msgstr ""
 
 #: conversationlist_gison.json:nimael_busy
 msgid "I'm busy at the moment. Please talk to Gison. He's over there."
 msgstr ""
-"Je suis occupée en ce moment. Parle à Gison s'il te plaît, il est juste là."
 
 #: conversationlist_gison.json:nimael_busy:0
 msgid "Alaun told me that you also make very good soup."
-msgstr "Alaun m'a dit que vous préparez également une soupe délicieuse."
+msgstr ""
 
 #: conversationlist_gison.json:nimael_busy:1
 #: conversationlist_gorwath.json:gorwath_exit:0
 msgid "OK. Bye."
-msgstr "OK. Au revoir."
+msgstr ""
 
 #: conversationlist_gison.json:nimael_4
 msgid "Thanks for helping us!"
-msgstr "Merci de ton aide !"
+msgstr ""
 
 #: conversationlist_gison.json:nimael_4:1
 msgid "I only hope it'll be worth the trouble."
-msgstr "J'espère juste que ça en vaudra la peine."
+msgstr ""
 
 #: conversationlist_gison.json:gael_1
 msgid "Shut the door, please!"
-msgstr "Ferme la porte, s'il te plaît !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_2
 msgid "From the outside."
-msgstr "De l'extérieur."
+msgstr ""
 
 #: conversationlist_gison.json:gael_2:0
 msgid "Very friendly."
-msgstr "Très amical."
+msgstr ""
 
 #: conversationlist_gison.json:gael_10
 msgid "No, I am not Gison!"
-msgstr "Non, je ne suis pas Gison !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_10_1
 msgid "And no, I have no soup for anyone!"
-msgstr "Et non, je n'ai de soupe pour personne !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_soup
 msgid "I hate this smell!"
-msgstr "Je déteste cette odeur !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_soup_1
 msgid "You have some of that disgusting soup in your bag! I can smell it."
-msgstr "Tu as de cette répugnante soupe dans ton sac ! Je peux le sentir."
+msgstr ""
 
 #: conversationlist_gison.json:gael_soup_2
 msgid "Out with you!"
-msgstr "Dehors !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_bottle
 msgid "I hear those soup bottles clinking in your bag."
-msgstr "J'entends ces bouteilles de soupe s'entrechoquer dans ton sac."
+msgstr ""
 
 #: conversationlist_gison.json:gael_bottle_1
 msgid "Even though they are empty, I hate that sound!"
-msgstr "Même si elles sont vides, je déteste ce son !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_20
 msgid "Hi kid. I am Gael, son of those people in the house over there."
-msgstr "Salut gamin. Je suis Gael, le fils des résidents de la maison juste là."
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_1
 msgid "I moved out here because I couldn't stand the suffocating smell of mushroom soup anymore. Or vegetable soup, for that matter."
 msgstr ""
-"J'ai déménagé ici parce que je ne pouvais plus supporter l'odeur suffocante "
-"de la soupe aux champignons. Ou la soupe de légumes, d'ailleurs."
 
 #: conversationlist_gison.json:gael_20_2
 msgid "I like meat. Wolves, boars, dogs, puppies. Any kind, really."
 msgstr ""
-"J'aime la viande. Loups, sangliers, chiens, chiots. N'importe quelle sorte, "
-"vraiment."
 
 #: conversationlist_gison.json:gael_20_3
 msgid "And snakes, of course. They give the finest meat of all."
 msgstr ""
-"Et les serpents bien sûr. Ils donnent la viande la plus raffinée de toutes."
 
 #: conversationlist_gison.json:gael_20_4
 msgid "Cooked, grilled, baked, fried, stewed...ahh, snake meat - nothing compares to it!"
 msgstr ""
-"Cuite, grillée, au four, farcie, en ragoût... ahh, la viande de serpent - "
-"elle est incomparable."
 
 #: conversationlist_gison.json:gael_20_4:0
 msgid "Yes, I love it too!"
-msgstr "Oui, j'adore aussi !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_4:1
 msgid "To each his own, I guess."
-msgstr "A chacun ses goûts je suppose."
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_5
 msgid "Now that I mention it: I am running out of meat. I'll have to go out hunting again."
 msgstr ""
-"Maintenant que j'en parle : je suis à court de viande. Je vais encore devoir "
-"repartir à la chasse."
 
 #: conversationlist_gison.json:gael_20_5:0
 msgid "Would you like me to give you some meat?"
-msgstr "Voulez-vous que je vous donne de la viande ?"
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_5:1
 msgid "Good luck! I am leaving then."
-msgstr "Bonne chance ! Je m'en vais."
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_6:0
 msgid "Oh, I just noticed that I don't have enough meat with me. I will be back soon with 10 pieces of meat, just you wait."
 msgstr ""
-"Oh, je viens de remarquer que je n'ai pas assez de viande sur moi. Je serai "
-"rapidement de retour avec 10 morceaux de viande, attendez."
 
 #: conversationlist_gison.json:gael_20_6:1
 msgid "Here, I have 10 nice pieces of meat for you. I cannot promise that it is all from snakes, though."
-msgstr "Tenez, j'ai 10 belles pièces de viande pour vous."
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_7
 msgid "Excellent! In return, I can give you this nice little purse, made of the finest snake leather. Look here, isn't it beautiful?"
 msgstr ""
-"Excellent ! En retour, je peux te donner cette petite bourse, faite de la "
-"plus délicate peau de serpent. Regarde, n'est-ce pas magnifique ?"
 
 #: conversationlist_gison.json:gael_20_7:0
 msgid "Wow, it is magnificent! Thank you!"
-msgstr "Ouah, elle est incroyable ! Merci !"
+msgstr ""
 
 #: conversationlist_gison.json:gael_20_8
 msgid "May it serve you well."
-msgstr "Qu'elle te serve bien."
+msgstr ""
 
 #: conversationlist_gison.json:gison_cavekey
 msgid "You look at a wall of stones. There's no way through."
-msgstr "Tu regardes un mur de pierres. Il n’y a pas de passage."
+msgstr ""
 
 #: conversationlist_gison.json:gison_cavekey:0
 msgid "Examine it more closely."
@@ -47657,8 +47600,6 @@ msgstr ""
 #: conversationlist_delivery.json:brv_wh_delivery_edrin
 msgid "Ah, yes, a striped hammer. Don't look so impatient. Here's my delivery charge, and now you can leave!"
 msgstr ""
-"Ah, oui, un marteau à rayures. Ne sois pas si impatient. Voici mes frais de "
-"livraison, et maintenant tu peux partir !"
 
 #: conversationlist_delivery.json:brv_wh_delivery_odirath
 msgid "Yes, indeed. A gift for my beautiful daughter... but why did it take so long? Sigh, here's my delivery fee."
@@ -47737,10 +47678,6 @@ msgid ""
 "Ah yes, I need a new one. My current crystal globe has become a bit cloudy - otherwise I would of course have seen that you would bring me a new globe.\n"
 "Here is the gold for it."
 msgstr ""
-"Ah oui, j'ai besoin d'une nouvelle. Ma boule de cristal actuelle est devenue "
-"trouble - autrement j'aurais bien évidemment vu que tu m'en apporterais une "
-"nouvelle.\n"
-"Voici l'argent pour la livraison."
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:0
 msgid "Do you want to try the crystal ball with me to see if it works?"
@@ -47823,8 +47760,6 @@ msgstr ""
 #: conversationlist_delivery.json:tjure_wh_delivery_90:0
 msgid "Not until I have delivered this to you. Are you the one who ordered a 'Mysterious green something'?"
 msgstr ""
-"Pas avant de t'avoir livré cela. Est-tu celui qui a commandé une "
-"\"mystérieuse chose verte\" ?"
 
 #: itemcategories_1.json:dagger
 msgid "Dagger"
@@ -49018,7 +48953,7 @@ msgstr "Flacon de Buceth rempli de liquide vert"
 
 #: itemlist_v0610_2.json:chaosreaper
 msgid "Chaosreaper"
-msgstr "Faucheur du Chaos"
+msgstr "Rapière du Chaos"
 
 #: itemlist_v0610_2.json:izthiel_claw
 msgid "Izthiel claw"
@@ -50526,7 +50461,7 @@ msgstr "Bouclier en papier"
 #: itemlist_brimhaven2.json:brv_wh_item_00
 #: monsterlist_brimhaven2.json:brv_wh_item_40
 msgid "Crystal globe"
-msgstr "Boule de cristal"
+msgstr "Globe de cristal"
 
 #: itemlist_brimhaven2.json:brv_wh_item_01
 #: monsterlist_brimhaven2.json:brv_wh_item_41
@@ -50545,17 +50480,17 @@ msgstr "botte jaune"
 #: itemlist_brimhaven2.json:brv_wh_item_04
 #: monsterlist_brimhaven2.json:brv_wh_item_44
 msgid "Chandelier"
-msgstr "Chandelier"
+msgstr "Lustre"
 
 #: itemlist_brimhaven2.json:brv_wh_item_05
 #: monsterlist_brimhaven2.json:brv_wh_item_45
 msgid "Mysterious green something"
-msgstr "Mystérieuse chose verte"
+msgstr "Chose verte mystérieuse"
 
 #: itemlist_brimhaven2.json:brv_wh_item_06
 #: monsterlist_brimhaven2.json:brv_wh_item_46
 msgid "Old, worn cape"
-msgstr "Vieille cape usée"
+msgstr "Vieille cape usagée"
 
 #: itemlist_brimhaven2.json:brv_wh_item_07
 #: monsterlist_brimhaven2.json:brv_wh_item_47
@@ -51415,17 +51350,6 @@ msgstr ""
 #: itemlist_delivery.json:facutloni_docket:description
 msgid "A document listing the contents of a delivery   Arcir the book-lover from Fallhaven ordered a 'Dusty Old Book'.   Edrin the metalsmith from Brimhaven ordered a 'Striped Hammer'.   Odirath the armorer from Stoutford ordered a 'Pretty Porcelain Figure'.   Venanra the laundress from Brimhaven ordered an 'Old, worn cape'.   Tjure the unlucky merchant ordered a 'Mysterious green something'.   Servant the servant from Guynmart Castle ordered a 'Chandelier'.   Arghes from Remgard tavern ordered 'Yellow Boots'.   Wyre the mournful woman from Vilegard ordered a 'Lyre'.   Mikhail from Crossglen ordered a 'Plush Pillow'.   Pangitain the fortune teller from Brimhaven ordered a 'Crystal Globe'. "
 msgstr ""
-"Un document listant le contenu d'une livraison   Arcir, l'amateur de livres "
-"de Fallhaven, a commandé un \"vieux livre poussiéreux\".   Edrin le "
-"métallurgiste de Brimhaven a commandé un \"marteau à rayures\".   Odirath "
-"l'armurier de Stoutford a commandé une \"jolie figurine en porcelaine\".   "
-"Venanra, la blanchisseuse de Brimhaven, a commandé une \"vieille cape usée\""
-"   Tjure, le marchand malchanceux, a commandé une \"mystérieuse chose verte\""
-"    Servant le servant du château de Guynmart a commandé un \"chandelier\""
-".   Arghes de la taverne de Remgard a commandé des \"bottes jaunes\".   Wyre "
-"la femme endeuillée de Vilegard a commandé une \"lyre\".   Mikhail de "
-"Crossglen a commandé un \"oreiller en peluche\".   Pangitain, le diseur de "
-"bonne aventure de Brimhaven, a commandé une \"boule de cristal\". "
 
 #: monsterlist_crossglen_animals.json:tiny_rat
 msgid "Tiny rat"
@@ -52180,7 +52104,7 @@ msgstr "Apparition tourmentée"
 
 #: monsterlist_v069_monsters.json:skeletal_reaper
 msgid "Skeletal reaper"
-msgstr "Faucheur squelettique"
+msgstr "Camarde osseuse"
 
 #: monsterlist_v069_monsters.json:kazaul_spawn
 msgid "Kazaul spawn"
@@ -59028,7 +58952,7 @@ msgstr "Facutloni m'a demandé de l'aider à vérifier la réserve. Je dois vér
 
 #: questlist_brimhaven2.json:brv_wh:100
 msgid "I have found a pair of crystal globes."
-msgstr "J'ai trouvé une paire de boules de cristal."
+msgstr "J'ai trouvé une paire de globe de cristal."
 
 #: questlist_brimhaven2.json:brv_wh:101
 msgid "I have found a pair of plush pillows."
@@ -59044,15 +58968,15 @@ msgstr "J'ai trouvé une paire de bottes."
 
 #: questlist_brimhaven2.json:brv_wh:104
 msgid "I have found a pair of chandeliers."
-msgstr "J'ai trouvé une paire de chandeliers."
+msgstr "J'ai trouvé une paire de lustres."
 
 #: questlist_brimhaven2.json:brv_wh:105
 msgid "I have found a pair of mysterious green somethings."
-msgstr "J'ai trouvé une paire de mystérieuses choses vertes."
+msgstr "J'ai trouvé une paire d'une chose mystérieuse verte."
 
 #: questlist_brimhaven2.json:brv_wh:106
 msgid "I have found a pair of old, worn capes."
-msgstr "J'ai trouvé une paire de vieilles capes usées."
+msgstr "J'ai trouvé une paie de capes vieilles et usagées."
 
 #: questlist_brimhaven2.json:brv_wh:107
 msgid "I have found a pair of pretty porcelain figures."
@@ -59661,42 +59585,34 @@ msgstr ""
 #: questlist_delivery.json:brv_wh_delivery:20
 msgid "Arcir the Fallhaven book-lover ordered a 'Dusty Old book'."
 msgstr ""
-"Arcir, l'amateur de livres de Falhaven a commandé un \"vieux livre "
-"poussiéreux\"."
 
 #: questlist_delivery.json:brv_wh_delivery:30
 msgid "Edrin the Brimhaven metalsmith ordered a 'Striped Hammer'."
 msgstr ""
-"Eldrin le métallurgiste de Brimhaven a commandé un \"marteau à rayures\"."
 
 #: questlist_delivery.json:brv_wh_delivery:40
 msgid "Odirath the Stoutford armorer ordered a 'Pretty Porcelain Figure'."
 msgstr ""
-"Odirath l'armurier de Stoutford a commandé une \"jolie figurine en "
-"porcelaine\"."
 
 #: questlist_delivery.json:brv_wh_delivery:50
 msgid "Venanra the Brimhaven laundress ordered an 'Old, worn cape'."
 msgstr ""
-"Venanra la blanchisseuse de Brimhaven a commandé une \"vieille cape usée\"."
 
 #: questlist_delivery.json:brv_wh_delivery:60
 msgid "Tjure the unlucky Brimhaven merchant ordered a 'Mysterious green something'."
 msgstr ""
-"Tjure, le marchant malchanceux de Brimhaven a commandé une \"mystérieuse "
-"chose verte\"."
 
 #: questlist_delivery.json:brv_wh_delivery:70
 msgid "Servant the Guynmart servant ordered a 'Chandelier'."
-msgstr "Servant le servant de Guynmart a commandé un \"chandelier\"."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:80
 msgid "Arghes at Remgard tavern ordered 'Yellow boots'."
-msgstr "Arghes à la taverne de Remgard a commandé des \"bottes jaunes\"."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:90
 msgid "Wyre the mournful Vilegard woman ordered a 'Lyre'."
-msgstr "Wyre la femme endeuillée de Vilegard a commandé une \"lyre\"."
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:100
 msgid "Mikhail ordered a 'Plush Pillow'."
@@ -59705,7 +59621,6 @@ msgstr ""
 #: questlist_delivery.json:brv_wh_delivery:110
 msgid "Pangitain the Brimhaven fortune teller ordered a 'Crystal Globe'."
 msgstr ""
-"Pangitain le diseur de bonne aventure a commandé une \"boule de cristal\"."
 
 #: questlist_delivery.json:brv_wh_delivery:120
 msgid "Facutloni wants me to report back after the deliveries are complete."
@@ -59766,3 +59681,4 @@ msgstr "Le château de Guynmart"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "Brimhaven"
+

AndorsTrail/app/src/main/assets/translation/ja.po

@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Andors Trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-04-19 16:12+0000\n"
+"PO-Revision-Date: 2022-03-08 17:34+0000\n"
 "Last-Translator: Meiru <sanna+hw@dismail.de>\n"
 "Language-Team: Japanese <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/ja/>\n"
@@ -418,7 +418,7 @@ msgstr "その手にしている本は何ですか？"
 
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
-msgstr "はい、プラッシュ枕の注文をお届けに参りました。でも何のために？"
+msgstr ""
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1705,7 +1705,7 @@ msgstr "本がお好きなんですね。"
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
-msgstr "そして僕は配達の子供です。ほこりだらけの古い本を注文されましたか？"
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -6252,7 +6252,7 @@ msgstr "はい、彼の身に何が起きたのかがわかりました。"
 
 #: conversationlist_wrye.json:wrye_return_1:3
 msgid "Not yet, but your order has finally arrived."
-msgstr "まだですが、ご注文の品がやっと届きましたよ。"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_return_2
 msgid "Welcome back. Thank you for your help in finding out what happened to my son."
@@ -6266,7 +6266,7 @@ msgstr "どういたしまして。"
 
 #: conversationlist_wrye.json:wrye_return_2:2
 msgid "Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?"
-msgstr "はい、ご注文の竪琴をお届けに伺いました。お上手なんでしょうね。"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_1
 msgid "Shadow help me."
@@ -6280,7 +6280,7 @@ msgstr "どうしたんです？"
 
 #: conversationlist_wrye.json:wrye_mourn_1:1
 msgid "Excuse me, I'm here to deliver your order for a 'Lyre'."
-msgstr "すみません、ご注文の竪琴を届けに参りました。"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_2
 msgid "My son! My son is gone."
@@ -6298,7 +6298,7 @@ msgstr "彼がどうしたの？"
 
 #: conversationlist_wrye.json:wrye_mourn_2:2
 msgid "Maybe your order here will comfort you?"
-msgstr "注文した品があなたを慰めてくれるかもしれませんよ？"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_3
 msgid "I don't want to talk about it. Not with an outsider like you."
@@ -17260,8 +17260,7 @@ msgstr "こりゃ面白い。フォールヘブンのガキが、このレムガ
 
 #: conversationlist_arghes.json:arghes_2:0
 msgid "I'm not from Fallhaven, I'm from Crossglen, west of Fallhaven."
-msgstr "僕はフォールヘブン出身じゃないんだ。フォールヘブンから西にあるクロスグレンの"
-"出身です。"
+msgstr "僕はフォールヘブンじゃなくて、フォールヘブンから西にあるクロスグレンの出身です。"
 
 #: conversationlist_arghes.json:arghes_2:2
 msgid "How do you know where I am from?"
@@ -17269,8 +17268,7 @@ msgstr "どうして僕がどこから来たのかわかるのですか？"
 
 #: conversationlist_arghes.json:arghes_2:3
 msgid "And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?"
-msgstr "そしてイエローブーツをご注文とは面白いですね。本当にあなたがこれを注文したの"
-"ですか？"
+msgstr ""
 
 #: conversationlist_arghes.json:arghes_3a
 msgid "Is that so? Hmm, most interesting. It does not change anything, however."
@@ -25610,7 +25608,7 @@ msgstr "真っ昼間からベッドで寝転がってるの？"
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_10:1
 msgid "I'm here to give you your ordered item. You don't want it?"
-msgstr "ご注文の品をお届けに上がりました。いらないの？"
+msgstr ""
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_20
 msgid "I am checking that the bed of young Robalyrius is still in order."
@@ -29258,7 +29256,7 @@ msgstr "嬉しそうですね。"
 
 #: conversationlist_stoutford_combined.json:odirath_0:5
 msgid "Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you"
-msgstr "本当にこんな醜い磁器フィギュアを注文したのですか？　おっと失礼しました"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:odirath_1
 msgid "I did see someone that might have been your brother. He was with a rather dubious looking person. They didn't stay around here very long though. Sorry, but that's all I can tell you. You should ask around town. Other townsfolk may know more."
@@ -33947,7 +33945,7 @@ msgstr "ええと、お邪魔してすみません。"
 
 #: conversationlist_arulir_mountain.json:tjure_0:3
 msgid "I'm surprised to see you here as well. Did you order 'Mysterious green something'?"
-msgstr "僕もここであなたに会うなんて驚きです。不思議な緑のものをご注文されましたか?"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_0_10
 msgid "I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out."
@@ -34068,21 +34066,20 @@ msgstr "（ため息）あなたが最後の希望だったのに。私のこと
 
 #: conversationlist_arulir_mountain.json:tjure_90:0
 msgid "Hope you learned from it."
-msgstr "いい勉強になるといいですね。"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_90:1
 msgid "OK. One question before I go: did you order a 'Mysterious green something'?"
-msgstr "わかりました。行く前にひとつ質問が。不思議な緑のものを注文されませんでしたか"
-"？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:0
 #: conversationlist_arulir_mountain.json:tjure_200:0
 msgid "It was an interesting experience."
-msgstr "興味深い体験でした。"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:1
 msgid "No problem. By the way, did you order a 'Mysterious green something'?"
-msgstr "どういたしまして。ところで、 不思議な緑のものを注文されましたか？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_200
 msgid "Oh, you look better than the last time we met. Thank you for your help."
@@ -34090,7 +34087,7 @@ msgstr "おお、前にお会いしたときよりも元気そうですね。助
 
 #: conversationlist_arulir_mountain.json:tjure_200:1
 msgid "Indeed. By the way, did you order a 'Mysterious green something'?"
-msgstr "そうですね。ところで、 不思議な緑のものを注文されましたか？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:watermark_script_100
 msgid "This seems to be a very strange place. Maybe even dangerous."
@@ -35809,7 +35806,7 @@ msgstr "この手袋を見たことがありますか？（ヴェナンラにグ
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_0:5
 msgid "Did you order an 'Old, worn cape'?"
-msgstr "古いすり切れたケープを注文しましたか？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_1
 msgid "We are working on some nice green dresses. We can also repair and improve your clothes."
@@ -36731,7 +36728,7 @@ msgstr "僕の兄のアンドールを探しています。町で僕に似た人
 
 #: conversationlist_brimhaven.json:edrin_0_0:6
 msgid "Hello, did you order a 'Striped Hammer'?"
-msgstr "こんにちは、ストライプハンマーの注文はこちらですか？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:edrin_5_0
 msgid "Yes, that's the one that matches the dagger! Now that I have both pieces, I can repair the dagger for you if you wish."
@@ -37100,7 +37097,7 @@ msgstr "あなたの力になれるかも。"
 
 #: conversationlist_brimhaven.json:brv_fortune_choice:3
 msgid "Are you the one who ordered a 'Crystal Globe'?"
-msgstr "クリスタルグローブをご注文のお客様でしょうか？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_andor_10
 msgid "I see you talking to your brother, somewhere far from here in a big city. Feygard or Nor City, I think."
@@ -37244,7 +37241,7 @@ msgstr "探しているのは…"
 
 #: conversationlist_brimhaven.json:brv_fortune_10:2
 msgid "So you are the one who ordered a 'Crystal Globe'?"
-msgstr "あなたがクリスタルグローブをご注文した方ですか？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_50
 msgid "It will cost you 100 gold."
@@ -47711,227 +47708,211 @@ msgstr "そうかもしれない。あなたはとても口のうまい話し手
 
 #: conversationlist_omi2.json:omi2_fix_ehrenfest_53
 msgid "You are wrong. I'm not here, just an illusion."
-msgstr "違う。ここにはいない、ただの幻だ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10
 msgid "Ah! You have finally returned, my new worker."
-msgstr "おお！　新人か、やっと戻ってきたな。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10:2
 msgid "Ah! You are still insolent."
-msgstr "ああ！　あなたはまだそうやって偉そうに。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_20
 msgid "I need someone to deliver all of the items that are in storage."
-msgstr "倉庫にあるアイテムのすべてを配達する人が要る。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30
 msgid "Come back to me when you have delivered all of the items. The order is not important. Here is the list of customers."
-msgstr "すべてのアイテムを配達できたら戻ってきてくれ。順番は気にしなくていい。こちら"
-"が顧客のリストだ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:0
 msgid "It will be done."
-msgstr "そうする。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:1
 msgid "You want me to deliver these items to your customers?"
-msgstr "この品物をお客に届けるんですか？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40
 msgid "Yes yes, hurry now. I have work to do here."
-msgstr "それでいい、急げ。私にはここで仕事がある。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:0
 msgid "I'm going now."
-msgstr "行ってきます。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:1
 msgid "Hope I get paid better this time."
-msgstr "今回はちゃんとした給料があるといいな。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_arcir
 msgid "Yes, an old but useful book, but you should have wiped it off first. Anyway, here's my delivery fee."
-msgstr "ああ、古いが役に立つ本なのだよ。だが先にそれを拭いておくべきだったね。とにか"
-"く、こちらが配送料だよ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_edrin
 msgid "Ah, yes, a striped hammer. Don't look so impatient. Here's my delivery charge, and now you can leave!"
-msgstr "ああ、そうだ。ストライプハンマーだ。そう急かさないでくれ。これが配達料だ、ほ"
-"らもう行ってもいいぞ！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_odirath
 msgid "Yes, indeed. A gift for my beautiful daughter... but why did it take so long? Sigh, here's my delivery fee."
-msgstr "そうですね。愛しい娘への贈り物でして…しかしどうしてまたこんなに時間がかかった"
-"ので？　ハァ、こちらが配達料です。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_venanra
 msgid "Yes I did, kid. Incredibly, it has become the latest fashion to buy new capes with holes. Here's my delivery fee."
-msgstr "ええそうです、坊や。信じられないことに、穴のあいた新しいケープを買うのが近頃"
-"流行りのファッションになっています。こちらが配達料です。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_tjure
 msgid "What?! My lucky clover...but why now? Anyway, I'll no longer run out of luck. Here's my delivery fee."
-msgstr "なんですって！？　私の幸運のクローバーが…しかしなぜ今になって？　"
-"とにかく、これで運が尽きることはないでしょう。こちらが配送料です。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_servant
 msgid "Finally, I'm no longer afraid of that room every time my lord turns off the lights to scare me. Here's my delivery fee."
-msgstr "ようやくですか。これでわが主人が私を怖がらせるために灯りを消そうとも、あの部"
-"屋に怯えずによくなりました。こちらが配送料です。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_arghes
 msgid "Yes kid, thank you. Here, take this gold for them."
-msgstr "そうだガキ、ありがとよ。ほらこいつが金だ、受け取りな。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre_negative
 msgid "That's not what I'm waiting for! Go out and find out what happened to my son, please!"
-msgstr "私が待っているのはそんなものではありません！　"
-"息子に何があったか調べてください！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre
 msgid "Yes, I'm longing for it just like how I'm longing for my son. But now I can mourn as I play his favorite song until I die."
-msgstr "ええ、息子を恋しがるように焦がれているの。だけど今は死ぬまであの子の好きな曲"
-"を奏でて悲しむことができる。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre:0
 msgid "My sincere condolence for the loss of your beloved son."
-msgstr "愛する息子さんがお亡くなりになったこと心からお悔やみ申し上げます。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail
 msgid "Oh wow! Finally, your brother's gift has arrived and we only have to wait for his arrival."
-msgstr "おおっ！　やっとおまえのお兄さんへのプレゼントが届いたのだな。あとは帰ってく"
-"るのを待つだけか。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:0
 msgid "Sigh. I hope so."
-msgstr "ハァ。そうですね。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:1
 msgid "What?! Where's my gift?"
-msgstr "え？！　僕のプレゼントは？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail3
 msgid "I already gave you his shield."
-msgstr "おまえには盾をあげただろう。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2
 msgid "Anyway, it's been a very long time so please go look for your brother."
-msgstr "とにかく、ずいぶん時間が経っているからお兄さんを探してきてはくれんかね。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:1
 msgid "I'm still looking for him."
-msgstr "まだ探してます。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:2
 msgid "Eh, you have to pay for it..."
-msgstr "えっと、お金を支払ってくれないと…"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4
 msgid "Ah, yes, I almost forgot. Here you are."
-msgstr "ああ、そうだったな、もう少しで忘れるところだったぞ。さあどうぞ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:0
 msgid "Thanks. I'm on my way again, bye."
-msgstr "ありがとう。また行きます、さようなら。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:1
 msgid "Hmm... Bye"
-msgstr "うーん…さようなら"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune
 msgid ""
 "Ah yes, I need a new one. My current crystal globe has become a bit cloudy - otherwise I would of course have seen that you would bring me a new globe.\n"
 "Here is the gold for it."
 msgstr ""
-"ええそうです、新しいものが必要でしてね。今のクリスタルグローブは少し曇ってい"
-"るのです。そうでなければ、あなたが新しいグローブを持ってきてくれるのが見えて"
-"いたことでしょう。\n"
-"こちらが代金です。"
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:0
 msgid "Do you want to try the crystal ball with me to see if it works?"
-msgstr "水晶球を一緒に試してみませんか？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:1
 msgid "Thanks for choosing Facutloni's delivery."
-msgstr "ファクトロニの配送をご利用いただきありがとうございました。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune_10
 msgid "You say you want me to help you?"
-msgstr "私の手助けをお求めということですか？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10
 msgid "You are back. Did you deliver all of the items?"
-msgstr "戻ってきたか。すべてのアイテムを配達したか？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10:0
 msgid "Yes. I delivered everything."
-msgstr "はい。すべて配達しました。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no
 msgid "Then what are you standing there for?! Get out and deliver everything!"
-msgstr "だったら何でそこで突っ立っているんだ？！　出て行って全部配達してこい！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:0
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:0
 msgid "[Run]"
-msgstr "（走る）"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:1
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:1
 msgid "Yes boss."
-msgstr "はい、ボス。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes
 msgid "That's nice to hear. Then you can now give me the... eh...330 gold pieces that you should have received from the sales."
-msgstr "それはよかった。なら売り上げで受け取っているはずの…あー…330ゴールドをこっちに"
-"寄越すんだ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:0
 msgid "Sure. Here you are."
-msgstr "ええ。どうぞ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:1
 msgid "Uh, I had expenses along the way and I don't have all the gold anymore."
-msgstr "えっと、途中で出費があってお金の全額は持ってないんだ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1
 msgid "And then you walk into my sight? Go get my gold!"
-msgstr "なのに私の前まで来たのか？　金を取ってこい！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:2
 msgid "Oh, I just found the 330 gold pieces in my pocket. Please take it."
-msgstr "あっ、ポケットの中にちょうど330ゴールドありました。どうぞ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10
 msgid "Good job! I am glad that you work responsibly."
-msgstr "よくやってくれた！　仕事をしっかり勤め上げてくれて嬉しいぞ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:0
 msgid "And seriously."
-msgstr "大変でした。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:1
 msgid "I travelled far and wide."
-msgstr "あちこち旅したんだ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward
 msgid "That is serious. And here you have your well-deserved reward: 100 gold."
-msgstr "それは苦労をかけたな。ではそれに見合う報酬を与えよう。100ゴールドだ。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward:1
 msgid "What the?"
-msgstr "何これ？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_scrooge
 msgid "Pardon?"
-msgstr "何だって？"
+msgstr ""
 
 #: conversationlist_delivery.json:tjure_wh_delivery_90:0
 msgid "Not until I have delivered this to you. Are you the one who ordered a 'Mysterious green something'?"
-msgstr "これをあなたに届けるまではダメです。あなたは不思議な緑のものを注文した人です"
-"か？"
+msgstr ""
 
 #: itemcategories_1.json:dagger
 msgid "Dagger"
@@ -51517,7 +51498,7 @@ msgstr "洞窟シダ"
 
 #: itemlist_omi2.json:elm_fern:description
 msgid "A fern inside a cave is something unusual, not seen every day."
-msgstr "洞窟の中のシダは珍しいもので、日常で見られるものではない。"
+msgstr "洞窟の中のシダとは通常、日常的に見られるものではない。"
 
 #: itemlist_omi2.json:yczorah
 msgid "Yczorah tentacle"
@@ -51565,20 +51546,11 @@ msgstr "持っていると温かみがあり心地よい感覚を覚える。"
 
 #: itemlist_delivery.json:facutloni_docket
 msgid "Facutloni's Docket"
-msgstr "ファクトロニの注文表"
+msgstr ""
 
 #: itemlist_delivery.json:facutloni_docket:description
 msgid "A document listing the contents of a delivery   Arcir the book-lover from Fallhaven ordered a 'Dusty Old Book'.   Edrin the metalsmith from Brimhaven ordered a 'Striped Hammer'.   Odirath the armorer from Stoutford ordered a 'Pretty Porcelain Figure'.   Venanra the laundress from Brimhaven ordered an 'Old, worn cape'.   Tjure the unlucky merchant ordered a 'Mysterious green something'.   Servant the servant from Guynmart Castle ordered a 'Chandelier'.   Arghes from Remgard tavern ordered 'Yellow Boots'.   Wyre the mournful woman from Vilegard ordered a 'Lyre'.   Mikhail from Crossglen ordered a 'Plush Pillow'.   Pangitain the fortune teller from Brimhaven ordered a 'Crystal Globe'. "
 msgstr ""
-"納品の内容をリストした文書。フォールヘブンの本好きのアルシルは、ほこりだらけ"
-"の古い本を注文した。ブリムヘブンの金属細工師エドリンは、ストライプハンマーを"
-"注文した。スタウトフォードの防具屋オディラスは、可愛い磁器フィギュアを注文し"
-"た。ブリムヘブンのクリーニング屋ヴェナンラは、古いすり切れたケープを注文した"
-"。不幸なブリムヘブン商人トジャーは、不思議な緑のものを注文した。グインマート"
-"使用人の従者は、シャンデリアを注文した。レムガード酒場のアーゲスは、イエロー"
-"ブーツを注文した。ヴィルガードで死を悼むライ夫人は、竪琴を注文した。ミハイル"
-"は、プラッシュ枕を注文した。ブリムヘブンの占い師パンギタインは、クリスタルグ"
-"ローブを注文した。 "
 
 #: monsterlist_crossglen_animals.json:tiny_rat
 msgid "Tiny rat"
@@ -59812,60 +59784,59 @@ msgstr "あなたの勇敢さと…無知？に対して、オルトリオン将
 
 #: questlist_delivery.json:brv_wh_delivery
 msgid "Delivery"
-msgstr "デリバリー"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:10
 msgid "Facutloni asked me to help him deliver all of the items ordered by his customers a long time ago. He even gave me an old document with the names and items written on it."
-msgstr "ファクトロニから、顧客に前々から注文を受けていた商品をすべて配達するのを手伝"
-"ってほしいと頼まれた。名前と商品が書かれた古い書類もくれた。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:20
 msgid "Arcir the Fallhaven book-lover ordered a 'Dusty Old book'."
-msgstr "フォールヘブンの本好きのアルシルは、ほこりだらけの古い本を注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:30
 msgid "Edrin the Brimhaven metalsmith ordered a 'Striped Hammer'."
-msgstr "ブリムヘブンの金属細工師エドリンは、ストライプハンマーを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:40
 msgid "Odirath the Stoutford armorer ordered a 'Pretty Porcelain Figure'."
-msgstr "スタウトフォードの防具屋オディラスは、可愛い磁器フィギュアを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:50
 msgid "Venanra the Brimhaven laundress ordered an 'Old, worn cape'."
-msgstr "ブリムヘブンのクリーニング屋ヴェナンラは、古いすり切れたケープを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:60
 msgid "Tjure the unlucky Brimhaven merchant ordered a 'Mysterious green something'."
-msgstr "不幸なブリムヘブン商人トジャーは、不思議な緑のものを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:70
 msgid "Servant the Guynmart servant ordered a 'Chandelier'."
-msgstr "グインマート使用人の従者は、シャンデリアを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:80
 msgid "Arghes at Remgard tavern ordered 'Yellow boots'."
-msgstr "レムガード酒場のアーゲスは、イエローブーツを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:90
 msgid "Wyre the mournful Vilegard woman ordered a 'Lyre'."
-msgstr "ヴィルガードで死を悼むライ夫人は、竪琴を注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:100
 msgid "Mikhail ordered a 'Plush Pillow'."
-msgstr "ミハイルは、プラッシュ枕を注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:110
 msgid "Pangitain the Brimhaven fortune teller ordered a 'Crystal Globe'."
-msgstr "ブリムヘブンの占い師パンギタインは、クリスタルグローブを注文した。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:120
 msgid "Facutloni wants me to report back after the deliveries are complete."
-msgstr "ファクトロニは納品が完了したら報告するようにと言っている。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:130
 msgid "I reported back to Facutloni. He is very happy."
-msgstr "ファクトロニに報告した。彼はとても喜んでいる。"
+msgstr ""
 
 #: worldmap.xml:world1:crossglen
 msgid "Crossglen"
@@ -59918,3 +59889,4 @@ msgstr "グインマート城"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "ブリムヘブン"
+

AndorsTrail/app/src/main/assets/translation/nl.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: andors-trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-07-30 15:21+0000\n"
-"Last-Translator: mitchell van den Hurk <mitchell.vdhurk@outlook.com>\n"
+"PO-Revision-Date: 2021-11-30 15:00+0000\n"
+"Last-Translator: protagnost <joachimjbeens@gmail.com>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/nl/>\n"
 "Language: nl\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.14-dev\n"
+"X-Generator: Weblate 4.10-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:26+0000\n"
 
 #: [none]
@@ -1633,13 +1633,13 @@ msgstr "Nee, ik heb hem niet gezien."
 
 #: conversationlist_fallhaven.json:fallhaven_guard
 msgid "Keep out of trouble."
-msgstr "Blijf uit de problemen."
+msgstr ""
 
 #: conversationlist_fallhaven.json:fallhaven_priest:0
 #: conversationlist_jolnor.json:jolnor_chapel_1:0
 #: conversationlist_buceth.json:buceth_1:1
 msgid "Can you tell me more about the Shadow?"
-msgstr "Kan je me meer vertellen over de Schaduw?"
+msgstr ""
 
 #: conversationlist_fallhaven.json:priest_shadow_1
 msgid "The Shadow protects us. It keeps us safe and comforts us when we sleep."
@@ -1661,7 +1661,7 @@ msgstr ""
 #: conversationlist_fallhaven.json:rigmor:1
 #: conversationlist_fallhaven.json:rigmor_1:0
 msgid "I really need to go."
-msgstr "Ik moet echt gaan."
+msgstr ""
 
 #: conversationlist_fallhaven.json:rigmor_1
 msgid "Your brother, you say? His name is Andor? No. I don't recall meeting anyone like that."
@@ -1693,12 +1693,12 @@ msgstr "Laat me je koopwaar zien."
 
 #: conversationlist_fallhaven_arcir.json:arcir_start
 msgid "Hello. I'm Arcir."
-msgstr "Hallo. Ik ben Arcir."
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:0
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse:0
 msgid "I noticed your statue of Elythara downstairs."
-msgstr "Ik heb beneden je standbeeld van Elythara opgemerkt."
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:1
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse:1
@@ -58947,3 +58947,4 @@ msgstr ""
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr ""
+

AndorsTrail/app/src/main/assets/translation/pa.po

@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Andors Trail\n"
 "POT-Creation-Date: Sun Nov 10 11:14:56 CET 2013\n"
-"PO-Revision-Date: 2022-07-08 16:18+0000\n"
-"Last-Translator: Anupam Malhotra <anpm.malhotra@gmail.com>\n"
+"PO-Revision-Date: 2019-08-22 18:23+0000\n"
+"Last-Translator: Sanjna <r.sanjna@yahoo.com>\n"
 "Language-Team: Punjabi <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/pa/>\n"
 "Language: pa\n"
@@ -11,7 +11,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.13.1-dev\n"
+"X-Generator: Weblate 3.9-dev\n"
 
 #: [none]
 msgid "translator-credits"
@@ -26,32 +26,28 @@ msgid "Weak Poison"
 msgstr "ਕਮਜ਼ੋਰ ਜ਼ਹਿਰ"
 
 #: actorconditions_v069.json:str
-#, fuzzy
 msgid "Strength"
-msgstr "ਤਾਕਤ"
+msgstr ""
 
 #: actorconditions_v069.json:regen
 msgid "Shadow Regeneration"
 msgstr ""
 
 #: actorconditions_v069_bwm.json:speed_minor
-#, fuzzy
 msgid "Minor speed"
-msgstr "ਹਲਕੀ ਗਤੀ"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:fatigue_minor
-#, fuzzy
 msgid "Minor fatigue"
-msgstr "ਹਲਕੀ ਥਕਾਵਟ"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:feebleness_minor
 msgid "Minor weapon feebleness"
 msgstr ""
 
 #: actorconditions_v069_bwm.json:bleeding_wound
-#, fuzzy
 msgid "Bleeding wound"
-msgstr "ਖੂਨ ਵਹਿਣ ਵਾਲਾ ਜ਼ਖ਼ਮ"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:rage_minor
 msgid "Minor berserker rage"
@@ -62,9 +58,8 @@ msgid "Blackwater misery"
 msgstr ""
 
 #: actorconditions_v069_bwm.json:intoxicated
-#, fuzzy
 msgid "Intoxicated"
-msgstr "ਨਸ਼ੇ ਵਿੱਚ ਧੁੱਤ"
+msgstr ""
 
 #: actorconditions_v069_bwm.json:dazed
 msgid "Dazed"
@@ -83,28 +78,24 @@ msgid "Insect contagion"
 msgstr ""
 
 #: actorconditions_v0611.json:blister
-#, fuzzy
 msgid "Blistering skin"
-msgstr "ਛਾਲੇ ਵਾਲੀ ਚਮੜੀ"
+msgstr ""
 
 #: actorconditions_v0611.json:stunned
-#, fuzzy
 msgid "Stunned"
-msgstr "ਦੰਗ ਰਹਿ ਗਿਆ"
+msgstr ""
 
 #: actorconditions_v0611.json:focus_dmg
 msgid "Focused damage"
-msgstr "ਨੁਕਸਾਨ 'ਤੇ ਕੇਂਦ੍ਰਿਤ"
+msgstr ""
 
 #: actorconditions_v0611.json:focus_ac
-#, fuzzy
 msgid "Focused accuracy"
-msgstr "ਸ਼ੁੱਧਤਾ 'ਤੇ ਕੇਂਦ੍ਰਿਤ"
+msgstr ""
 
 #: actorconditions_v0611.json:poison_irdegh
-#, fuzzy
 msgid "Irdegh poison"
-msgstr "ਇਰਦੇਘ ਜ਼ਹਿਰ"
+msgstr ""
 
 #: actorconditions_v0611_2.json:rotworm
 msgid "Kazaul rotworms"
@@ -127,51 +118,44 @@ msgid "Shadow guardian blessing"
 msgstr ""
 
 #: actorconditions_v0611_2.json:crit1
-#, fuzzy
 msgid "Internal bleeding"
-msgstr "ਅੰਦਰੂਨੀ ਖੂਨ ਵਹਿਣਾ"
+msgstr ""
 
 #: actorconditions_v0611_2.json:crit2
-#, fuzzy
 msgid "Fracture"
-msgstr "ਫ੍ਰੈਕਚਰ"
+msgstr ""
 
 #: actorconditions_v0611_2.json:concussion
-#, fuzzy
 msgid "Concussion"
-msgstr "ਝਟਕਾ"
+msgstr ""
 
 #: actorconditions_v0612_2.json:food
 msgid "Sustenance"
 msgstr ""
 
 #: actorconditions_v0612_2.json:foodp
-#, fuzzy
 msgid "Food-poisoning"
-msgstr "ਭੋਜਨ-ਜ਼ਹਿਰੀਲਾਪਣ"
+msgstr ""
 
 #: actorconditions_v070.json:slime
 msgid "Corrosive slime"
 msgstr ""
 
 #: actorconditions_v070.json:sense_1
-#, fuzzy
 msgid "Heightened senses"
-msgstr "ਵਧੀਆਂ ਇੰਦਰੀਆਂ"
+msgstr ""
 
 #: actorconditions_v070.json:courage
-#, fuzzy
 msgid "Courage"
-msgstr "ਹਿੰਮਤ"
+msgstr ""
 
 #: actorconditions_v070.json:fear
 msgid "Fear"
-msgstr "ਡਰ"
+msgstr ""
 
 #: actorconditions_v070.json:def
-#, fuzzy
 msgid "Fortified defense"
-msgstr "ਮਜ਼ਬੂਤ ਰੱਖਿਆ"
+msgstr ""
 
 #: actorconditions_v070.json:crit_aware
 msgid "Vulnerability awareness"
@@ -186,29 +170,24 @@ msgid "Bark skin"
 msgstr ""
 
 #: actorconditions_v070.json:shadow_acc
-#, fuzzy
 msgid "Shadow's accuracy"
-msgstr "ਪਰਛਾਵੇਂ ਦੀ ਸਟੀਕਤਾ"
+msgstr ""
 
 #: actorconditions_v070.json:shadow_prot
-#, fuzzy
 msgid "Shadow's protection"
-msgstr "ਪਰਛਾਵੇਂ ਦੀ ਸੁਰੱਖਿਆ"
+msgstr ""
 
 #: actorconditions_v070.json:shadow_dmg
-#, fuzzy
 msgid "Shadow's strength"
-msgstr "ਪਰਛਾਵੇਂ ਦੀ ਤਾਕਤ"
+msgstr ""
 
 #: actorconditions_v070.json:haste
-#, fuzzy
 msgid "Haste"
-msgstr "ਜਲਦਬਾਜ਼ੀ"
+msgstr ""
 
 #: actorconditions_v070.json:fire
-#, fuzzy
 msgid "Ablaze"
-msgstr "ਸੜਨਾ"
+msgstr ""
 
 #: actorconditions_v070.json:sting_minor
 msgid "Minor sting"
@@ -58908,3 +58887,4 @@ msgstr ""
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr ""
+

AndorsTrail/app/src/main/assets/translation/tr.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: andors-trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-05-07 03:12+0000\n"
-"Last-Translator: Kerem Yavuz Kaya <keremkaya5361@gmail.com>\n"
+"PO-Revision-Date: 2022-01-26 10:10+0000\n"
+"Last-Translator: Burak Hüseyin Ekseli <burakekseli@yandex.com>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/tr/>\n"
 "Language: tr\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.12.1\n"
+"X-Generator: Weblate 4.11-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:26+0000\n"
 
 #: [none]
@@ -1739,11 +1739,11 @@ msgstr "Kitaplarım bana inanılmaz haz veriyor. Eski nesillerin bilgi birikimin
 
 #: conversationlist_fallhaven_arcir.json:arcir_books_1:0
 msgid "Do you have a book called 'Calomyran Secrets'?"
-msgstr "\"Calomyran'ın Sırları\" adında bir kitabın var mı?"
+msgstr "\"Calomyran Sırları\" adında bir kitabın var mı?"
 
 #: conversationlist_fallhaven_arcir.json:arcir_calomyran_1
 msgid "'Calomyran Secrets'? Hmm, yes I think I have one of those in my basement."
-msgstr "\"Calomyran'ın Sırları\"? Hmm, evet sanırım bodrumumda bir tane olacak."
+msgstr "\"Calomyran Sırları\"? Hmm, evet sanırım bodrumumda bir tane olacak."
 
 #: conversationlist_fallhaven_arcir.json:arcir_calomyran_2
 msgid "Old man Benradas came by last week, wanting to sell me that book. Since it's not really my kind of book, I declined."
@@ -1837,7 +1837,7 @@ msgstr "Ciddiyim."
 
 #: conversationlist_fallhaven_bucus.json:bucus_thieves_2:1
 msgid "Yeah, pretty funny eh?"
-msgstr "Evet, çok komik değil mi?"
+msgstr "Evet, çok komik di mi?"
 
 #: conversationlist_fallhaven_bucus.json:bucus_thieves_3
 msgid "OK, tell you what kid. Do a task for me and maybe I'll consider giving you more info."
@@ -1849,7 +1849,7 @@ msgstr "Ne tür bir görev hakkında konuşuyoruz?"
 
 #: conversationlist_fallhaven_bucus.json:bucus_thieves_3:1
 msgid "As long as this leads to some treasure, I'm in!"
-msgstr "İşin ucunda hazine varsa ben de varım!"
+msgstr "İşin ucunda hazine falan olacaksa ben varım!"
 
 #: conversationlist_fallhaven_bucus.json:bucus_thieves_4
 msgid "Bring me the key of Luthor and we can talk more. I don't know anything about the key itself, but rumor has it that it is located somewhere in the catacombs beneath Fallhaven Church."
@@ -22255,7 +22255,7 @@ msgstr ""
 
 #: conversationlist_pathway_fallhaven.json:guard_pathway_2:0
 msgid "Maybe I could help?"
-msgstr "Yardım edebilir miyim?"
+msgstr "Belki yardım edebilirim."
 
 #: conversationlist_pathway_fallhaven.json:guard_pathway_2:1
 msgid "Well, this is your problem. Goodbye."
@@ -22846,7 +22846,7 @@ msgstr ""
 #: conversationlist_graveyard1.json:algore_special2:0
 #: conversationlist_fungi_panic.json:fungi_rescued_110:0
 msgid "Good luck!"
-msgstr "İyi şanslar!"
+msgstr ""
 
 #: conversationlist_halvor_surprise.json:halvor_chwood_0
 msgid "The world is such a small place. We keep meeting in the most unusual places."
@@ -23281,7 +23281,7 @@ msgstr ""
 #: conversationlist_fungi_panic.json:zuul_khan4:0
 #: conversationlist_omi2.json:ortholion_guard9_1:1
 msgid "Why?"
-msgstr "Neden?"
+msgstr ""
 
 #: conversationlist_stoutford.json:glasforn_rumblings20_3
 msgid "Well, you see, I keep some beds for occasions like this one. You can use the one in the corner, near the painting, if you wish to rest."
@@ -23311,7 +23311,7 @@ msgstr ""
 #: conversationlist_stoutford.json:glasforn_rumblings20_6:0
 #: conversationlist_guynmart2_npc.json:guynmart_wise_170
 msgid "..."
-msgstr "..."
+msgstr ""
 
 #: conversationlist_stoutford.json:glasforn_rumblings30_0
 msgid "So kid, have you tried that bed? Our beds are the best!"
@@ -27663,7 +27663,7 @@ msgstr ""
 #: conversationlist_guynmart2_npc.json:guynmart_wise_812:0
 #: conversationlist_omicronrg9.json:troublemaker_guild02_9:1
 msgid "But ..."
-msgstr "Ama ..."
+msgstr ""
 
 #: conversationlist_guynmart2_npc.json:guynmart_wise_814
 msgid "A bottle of red wine with it, of course. Ooooh!"
@@ -29185,7 +29185,7 @@ msgstr ""
 
 #: conversationlist_stoutford_combined.json:odirath_1_2:1
 msgid "Monsters?"
-msgstr "Canavarlar?"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:odirath_1_3
 msgid "Just follow the path west, but you will have to find a way past the rockfall."
@@ -29986,7 +29986,7 @@ msgstr ""
 
 #: conversationlist_stoutford_combined.json:berbane_100:0
 msgid "...?"
-msgstr "...?"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:berbane_102
 msgid "[Loud voice] Pay attention and listen everybody! The castle is free! The trembling is over!"
@@ -29994,7 +29994,7 @@ msgstr ""
 
 #: conversationlist_stoutford_combined.json:berbane_102:0
 msgid "...??"
-msgstr "...??"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:berbane_110
 msgid "[Loud voice] My trainee and I, we were in the castle. I demonstrated how to fight properly. Lord Erwyn himself was an especially good demonstration object."
@@ -30195,7 +30195,7 @@ msgstr ""
 
 #: conversationlist_stoutford_combined.json:stn_boralla6_12
 msgid "No! Wait!"
-msgstr "Hayır! Bekle!"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:stn_boralla6_12:0
 msgid ""
@@ -30659,7 +30659,7 @@ msgstr ""
 
 #: conversationlist_stoutford_combined.json:stn_colonel_131_10b
 msgid "Surprise!"
-msgstr "Sürpriz!"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:stn_colonel_132
 msgid "I am impressed. You won the fight with my poser."
@@ -31389,7 +31389,7 @@ msgstr ""
 
 #: conversationlist_omicronrg9.json:fanamor_guild_5a:0
 msgid "What ...?"
-msgstr "Ne ...?"
+msgstr ""
 
 #: conversationlist_omicronrg9.json:fanamor_guild_6
 msgid "Argh ... The Feygard Scout hit me badly. I have not much time ... I am bleeding very heavily."
@@ -34487,7 +34487,7 @@ msgstr ""
 
 #: conversationlist_burhczyd.json:burhczydx_9a_6a:0
 msgid "Hmmm ..."
-msgstr "Hmmm ..."
+msgstr ""
 
 #: conversationlist_burhczyd.json:burhczydx_9a_6_81a
 msgid "First of all, you can have back your 100 pieces of gold."
@@ -34507,7 +34507,7 @@ msgstr ""
 
 #: conversationlist_burhczyd.json:burhczydx_9a_6_83a:0
 msgid "Mikhail's ring!"
-msgstr "Mikhail'in yüzüğü!"
+msgstr ""
 
 #: conversationlist_burhczyd.json:burhczydx_9a_6_84a
 msgid "Then we have a ruby gem - not of much worth, really."
@@ -35309,7 +35309,7 @@ msgstr ""
 
 #: conversationlist_brimhaven.json:arlish_12:0
 msgid "Yes, please."
-msgstr "Evet, lütfen."
+msgstr ""
 
 #: conversationlist_brimhaven.json:arlish_12:1
 msgid "No, thank you. I prefer the cake as a whole."
@@ -35469,7 +35469,7 @@ msgstr ""
 #: conversationlist_brimhaven.json:brv_farmer_girl_0:0
 #: conversationlist_brimhaven.json:brv_villager1
 msgid "Hello"
-msgstr "Merhaba"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_woodcutter_1
 msgid ""
@@ -35519,7 +35519,7 @@ msgstr ""
 
 #: conversationlist_brimhaven.json:brv_old_farmer_2:0
 msgid "Thanks"
-msgstr "Teşekkürler"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_farmer
 msgid "It is really warm today. Please let me finish my work before it gets too hot."
@@ -36099,7 +36099,7 @@ msgstr ""
 #: conversationlist_brimhaven.json:brv_inn_guest_0:0
 #: conversationlist_brimhaven2.json:brv_school_history_32:0
 msgid "Sorry."
-msgstr "Üzgünüm."
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_inn_guest_0:1
 msgid "Maybe it was you that bumped into me!"
@@ -36996,19 +36996,19 @@ msgstr ""
 
 #: conversationlist_brimhaven.json:blackjack_bet:0
 msgid "1 Gold"
-msgstr "1 altın"
+msgstr ""
 
 #: conversationlist_brimhaven.json:blackjack_bet:1
 msgid "2 Gold"
-msgstr "2 altın"
+msgstr ""
 
 #: conversationlist_brimhaven.json:blackjack_bet:2
 msgid "5 Gold"
-msgstr "5 altın"
+msgstr ""
 
 #: conversationlist_brimhaven.json:blackjack_bet:3
 msgid "10 Gold"
-msgstr "10 altın"
+msgstr ""
 
 #: conversationlist_brimhaven.json:stoutford_grave_1
 msgid "Here lies Adegil, the tree cutter, killed by a falling branch."
@@ -38366,7 +38366,7 @@ msgstr ""
 #: conversationlist_brimhaven2.json:guard_advent_58:0
 #: conversationlist_fungi_panic.json:bogsten_90_40:0
 msgid "What??"
-msgstr "Ne??"
+msgstr ""
 
 #: conversationlist_brimhaven_blackjack.json:brv_tavern_west_waitress_10
 msgid "Welcome to my tavern. How can I help you?"
@@ -40487,7 +40487,7 @@ msgstr ""
 
 #: conversationlist_fungi_panic.json:zuul_khan_70_84
 msgid "Hmm. Maybe."
-msgstr "Hmm. Belki."
+msgstr ""
 
 #: conversationlist_fungi_panic.json:zuul_khan_70_10
 msgid "Did you make up your mind at last?"
@@ -42598,7 +42598,7 @@ msgstr "Gerçekten yardımına ihtiyacım var!"
 
 #: conversationlist_gorwath.json:gorwath_letter
 msgid "Hey, Andor!"
-msgstr "Hey, Andor!"
+msgstr ""
 
 #: conversationlist_gorwath.json:gorwath_letter:0
 msgid "I am not Andor. What do you want from him?"
@@ -45502,7 +45502,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:ortholion_conversation2_7a:0
 msgid "W...What?!"
-msgstr "N... Ne?!"
+msgstr ""
 
 #: conversationlist_omi2.json:ortholion_conversation2_7a:1
 msgid "Hah. I always knew you were far too shady to be an honest man."
@@ -45535,7 +45535,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:ortholion_conversation2_2b:0
 msgid "Stop!"
-msgstr "Dur!"
+msgstr ""
 
 #: conversationlist_omi2.json:ortholion_conversation2_2b:1
 msgid "Do you always talk this much, liar?"
@@ -46287,7 +46287,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:ortholion_guard9_1
 msgid "Be quiet."
-msgstr "Sessiz ol."
+msgstr ""
 
 #: conversationlist_omi2.json:orhtolion_guard9_2
 msgid "Look *points to the large crystals*...It grows."
@@ -46330,7 +46330,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:ortholion_guard9_6a
 msgid "You sure?"
-msgstr "Emin misin?"
+msgstr ""
 
 #: conversationlist_omi2.json:ortholion_guard9_7
 msgid "Where are my partners then?"
@@ -46350,7 +46350,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:ortholion_guard9_6b:0
 msgid "I'm sorry."
-msgstr "Üzgünüm."
+msgstr ""
 
 #: conversationlist_omi2.json:ortholion_guard9_6b:1
 msgid "Save your breath. We still have a mission, and monsters to slay."
@@ -46731,7 +46731,7 @@ msgstr ""
 
 #: conversationlist_omi2.json:kamelio_undead:0
 msgid "Aah!"
-msgstr "Aah!"
+msgstr ""
 
 #: conversationlist_omi2.json:kamelio_undead:1
 msgid "Hmpf, I will kill you ten more times if needed."
@@ -50867,7 +50867,7 @@ msgstr "Küçük eşek arısı"
 #: monsterlist_guynmart.json:guynmart_fighter1
 #: monsterlist_guynmart.json:guynmart_fighter2
 msgid "Beetle"
-msgstr "Böcek"
+msgstr ""
 
 #: monsterlist_crossglen_animals.json:forest_wasp
 msgid "Forest wasp"
@@ -51171,7 +51171,7 @@ msgstr "Thoronir"
 
 #: monsterlist_fallhaven_npcs.json:chapelgoer
 msgid "Mourning woman"
-msgstr "Ağıt yakan kadın"
+msgstr ""
 
 #: monsterlist_fallhaven_npcs.json:potion_merchant
 msgid "Potion merchant"
@@ -51234,7 +51234,7 @@ msgstr "Unzel"
 
 #: monsterlist_fallhaven_npcs.json:shady_bandit
 msgid "Shady bandit"
-msgstr "Şüpheli haydut"
+msgstr ""
 
 #: monsterlist_wilderness.json:wild_fox
 msgid "Wild fox"
@@ -51242,7 +51242,7 @@ msgstr "Vahşi tilki"
 
 #: monsterlist_wilderness.json:stinging_wasp
 msgid "Stinging wasp"
-msgstr "Isıran yaban arısı"
+msgstr ""
 
 #: monsterlist_wilderness.json:wild_boar
 msgid "Wild boar"
@@ -51250,7 +51250,7 @@ msgstr "Vahşi yaban domuzu"
 
 #: monsterlist_wilderness.json:forest_beetle
 msgid "Forest beetle"
-msgstr "Orman böceği"
+msgstr ""
 
 #: monsterlist_wilderness.json:wolf
 msgid "Wolf"
@@ -51258,7 +51258,7 @@ msgstr "Kurt"
 
 #: monsterlist_wilderness.json:forest_serpent
 msgid "Forest serpent"
-msgstr "Orman yılanı"
+msgstr ""
 
 #: monsterlist_wilderness.json:vicious_forest_serpent
 msgid "Vicious forest serpent"
@@ -51351,7 +51351,7 @@ msgstr "Av köpeği"
 #: monsterlist_wilderness.json:highwayman
 #: monsterlist_v070_npcs.json:highwayman1
 msgid "Highwayman"
-msgstr "Soyguncu"
+msgstr ""
 
 #: monsterlist_v068_npcs.json:smug_looking_thief
 msgid "Smug looking thief"
@@ -58829,7 +58829,7 @@ msgstr ""
 
 #: questlist_gison.json:gison_cookbook:15
 msgid "I agreed to help him."
-msgstr "Ona yardım etmeye karar verdim."
+msgstr ""
 
 #: questlist_gison.json:gison_cookbook:20
 msgid "Gison said the thieves came from the south. I should begin my search there."
@@ -58862,7 +58862,6 @@ msgstr ""
 #: questlist_gorwath.json:postman:10
 msgid "Gorwath would like me to give a letter to Arensia, in Fallhaven."
 msgstr ""
-"Gorwath, Fallhaven'da bulunan Arsenia'ya götürmem için bana bir mektup verdi."
 
 #: questlist_gorwath.json:postman:12
 msgid "But I decided not to help him with that."
@@ -58870,7 +58869,7 @@ msgstr ""
 
 #: questlist_gorwath.json:postman:15
 msgid "He gave me the letter."
-msgstr "Mektubu bana verdi."
+msgstr ""
 
 #: questlist_gorwath.json:postman:20
 msgid "I gave the letter to Arensia, who was visibly happy about it. Gorwath needs to hear that."
@@ -59155,3 +59154,4 @@ msgstr "Guynmart Kalesi"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "Brimhaven"
+

AndorsTrail/app/src/main/assets/translation/uk.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: andors-trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-05-19 19:31+0000\n"
-"Last-Translator: Artem <artem@molotov.work>\n"
+"PO-Revision-Date: 2021-08-12 16:37+0000\n"
+"Last-Translator: Никита <nbulatskiy@icloud.com>\n"
 "Language-Team: Ukrainian <https://hosted.weblate.org/projects/andors-trail/"
 "game-content/uk/>\n"
 "Language: uk\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 4.13-dev\n"
+"X-Generator: Weblate 4.8-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:25+0000\n"
 
 #: [none]
@@ -724,10 +724,10 @@ msgid ""
 "\n"
 "Hey kid, wanna join us in our drinking game?"
 msgstr ""
-"Пий, пий, пий, пий ще трохи.\n"
-"Пий, пий, пий, допоки тримають ноги.\n"
+"Пий, пий, пий, випий ще трохи.\n"
+"Пий, пий, пий, поки на ногах.\n"
 "\n"
-"Гей, малий, зіграєш з нами у випивальну гру?"
+"Гей, малий, приєднаєшся до нашої п'яної гри?"
 
 #: conversationlist_crossglen.json:drunk1:0
 #: conversationlist_crossglen_odair.json:odair4:2
@@ -1600,7 +1600,7 @@ msgstr "Привіт. Чим можу допомогти?"
 #: conversationlist_fallhaven.json:fallhaven_citizen3:0
 #: conversationlist_omi2.json:ortholion_guard_0c:0
 msgid "Have you seen my brother Andor? He looks a bit like me."
-msgstr "Ви бачили мого брата Ендора? Він трохи схожий на мене."
+msgstr "[REVIEW]Ти не бачив мого брата Ендора?"
 
 #: conversationlist_fallhaven.json:fallhaven_citizen4
 msgid "You're that kid from Crossglen village right?"
@@ -2108,7 +2108,7 @@ msgstr "Ну, добре. Клятий охоронець викинув мен
 
 #: conversationlist_fallhaven_drunk.json:fallhaven_drunk_4
 msgid "Drink drink drink, drink some more. Drink, drink ... Uh how did it go again?"
-msgstr "Пий, пий, пий, пий ще трохи. Пий, пий ... Еге, як же це там далі?"
+msgstr "Пий, пий, пий, випий ще. Пий, пий ... Еге, як же це там далі?"
 
 #: conversationlist_fallhaven_drunk.json:fallhaven_drunk_5
 msgid "Were you saying something? Where was I? Yes, so we were in this dungeon."
@@ -2430,84 +2430,74 @@ msgstr "Я радий, що ти все ще живий!"
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_1:0
 msgid "As you know I can handle myself."
-msgstr "Як ви знаєте, я можу впоратися сам."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_1:1
 msgid "Why? Has something happened?"
-msgstr "Чому? Щось трапилося?"
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_2
 msgid "Did you not hear of the most dangerous snake ever seen? It has been spotted on Fallhaven's southern border."
 msgstr ""
-"Ти не чув про найнебезпечнішу змію у світі? Вона була помічена на південному "
-"кордоні Фолгевену."
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_2:0
 msgid "A snake?"
-msgstr "Змія?"
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_2:1
 msgid ""
 "No, I didn't hear, and I also don't want to.\n"
 "Please give me something to drink."
 msgstr ""
-"Ні, я не чув, і не хочу чути.\n"
-"Будь ласка, дай-но мені щось випити."
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_3
 msgid "No normal snake. Huge as a house! Making noise like a hundred galloping horses!"
 msgstr ""
-"Ненормальна змія. Велика, наче дім! А шипить, наче сотня коней, що біжить "
-"галопом!"
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_4
 msgid "Few people dare to walk outside of the city nowadays."
-msgstr "Нині мало хто наважується виходити за межі міста."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_4:0
 #: conversationlist_fungi_panic.json:bela_trade_2:0
 msgid "Sounds interesting."
-msgstr "Звучить цікаво."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_4:1
 msgid "Thanks for the warning. I'll avoid that area."
-msgstr "Дякую за попередження. Я буду уникати цієї зони."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_5
 msgid "Good. Enough of such dark words - now go, have a seat anywhere."
-msgstr "Добре. Досить цих похмурих слів - йдіть, сідайте де завгодно."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_10
 msgid "Oh no - what have I done? I shouldn't have talked of the giant snake. Promise me you won't go there!"
 msgstr ""
-"О ні - що я наробила? Я не повинна була розмовляти з цією гігантською змією. "
-"Пообіцяй мені, що ти туди не підеш!"
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_10:0
 msgid "Well, if it makes you happy."
-msgstr "Що ж, гаразд, якщо це зробить тебе щасливим."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_10:1
 msgid "Of course I'll go there."
-msgstr "Звісно я прийду туди."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_11
 msgid "What a waste of such a young, promising life! Well...don't forget to pay your tab before you leave my tavern."
 msgstr ""
-"Що за марнотратство такого юного, перспективного життя! Що ж… не забудь "
-"оплатити заставу, перед тим як підеш з моєї таверни."
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_20
 msgid "You are back!"
-msgstr "Ти повернувся!"
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_20:0
 msgid "Sure. And your little snake monster is no more."
-msgstr "Звісно. І твого маленького зміїного монстра більше немає."
+msgstr ""
 
 #: conversationlist_fallhaven_tavern.json:bela_gsnake_21
 msgid "Incredible! Let's feast now! Everyone have a free drink!"
-msgstr "Неймовірно! Розвеселімося! Кожному безкоштовне спиртне!"
+msgstr ""
 
 #: conversationlist_fallhaven_larcal.json:larcal
 msgid "I don't have time for you, kid. Get lost."
@@ -3154,7 +3144,7 @@ msgstr "Добре тоді, це твоє життя. В бій. Я з нете
 
 #: conversationlist_wilderness.json:fct_bandit1_10
 msgid "Now the area is clean of these nasty highwaymen at last."
-msgstr "Нарешті територія вивільнилася від цих потворних розбійників."
+msgstr ""
 
 #: conversationlist_flagstone.json:zombie1
 msgid "Fresh flesh!"
@@ -3446,16 +3436,16 @@ msgstr "Ти не бачив мого брата Ендора? Він схожи
 
 #: conversationlist_fallhaven_south.json:alaun:1
 msgid "Do you have a job for me?"
-msgstr "У тебе є робота для мене?"
+msgstr ""
 
 #: conversationlist_fallhaven_south.json:alaun:2
 #: conversationlist_fallhaven_south.json:alaun:3
 msgid "About the soup..."
-msgstr "На рахунок супу…"
+msgstr ""
 
 #: conversationlist_fallhaven_south.json:alaun:4
 msgid "Gison gave me some of his soup."
-msgstr "Ґісон дав мені трішки свого супу."
+msgstr ""
 
 #: conversationlist_fallhaven_south.json:alaun_2
 msgid "You are looking for your brother you say? Looks like you? Hmm."
@@ -3606,8 +3596,6 @@ msgstr "Дякую, що повернув мені сокиру!"
 #: conversationlist_fallhaven_south.json:alaun_1
 msgid "Oh, how surprising. How nice of you. Indeed there is something you could do for me."
 msgstr ""
-"О, як несподівано. Це мило з твого боку. Справді, ти можеш дещо для мене "
-"зробити."
 
 #: conversationlist_fallhaven_south.json:alaun_1:0
 msgid "Tell me what it is."
@@ -3629,9 +3617,7 @@ msgstr "Ах, ти тут щоб отримати гроші, добре."
 
 #: conversationlist_fallhaven_south.json:alaun_5
 msgid "I'll give you 10 gold if you do this little job for me: Bring me some of that delicious soup which Gison cooks using mushrooms and wild herbs."
-msgstr ""
-"Я дам тобі десять золотих, якщо ти зробиш невеличку послугу для мене: "
-"Принеси мені того смачного Ґісонового супу з грибів та диких трав."
+msgstr "Я дам тобі десять золотих, якщо ти зробиш невеличку послугу для мене: Принеси мені того смачного Ґізонового супу з грибів та диких трав."
 
 #: conversationlist_fallhaven_south.json:alaun_5:0
 msgid "Sounds easy, I'll do it!"
@@ -51267,7 +51253,7 @@ msgstr ""
 
 #: monsterlist_v068_npcs.json:troublemaker
 msgid "Troublemaker"
-msgstr "Порушник спокою"
+msgstr ""
 
 #: monsterlist_v068_npcs.json:farrik
 msgid "Farrik"
@@ -51321,7 +51307,7 @@ msgstr ""
 
 #: monsterlist_v068_npcs.json:jolnor
 msgid "Jolnor"
-msgstr "Йольнор"
+msgstr ""
 
 #: monsterlist_v068_npcs.json:alynndir
 msgid "Alynndir"
@@ -51337,7 +51323,7 @@ msgstr ""
 
 #: monsterlist_v068_npcs.json:ogam
 msgid "Ogam"
-msgstr "Оґам"
+msgstr ""
 
 #: monsterlist_v068_npcs.json:foaming_flask_cook
 msgid "Foaming Flask cook"
@@ -51365,7 +51351,7 @@ msgstr ""
 
 #: monsterlist_v068_npcs.json:wrye
 msgid "Wrye"
-msgstr "Врай"
+msgstr ""
 
 #: monsterlist_v068_npcs.json:oluag
 msgid "Oluag"
@@ -51588,7 +51574,7 @@ msgstr ""
 
 #: monsterlist_v069_npcs.json:bjorgur
 msgid "Bjorgur"
-msgstr "Бйоргур"
+msgstr ""
 
 #: monsterlist_v069_npcs.json:prim_prisoner
 msgid "Prim prisoner"
@@ -51596,7 +51582,7 @@ msgstr ""
 
 #: monsterlist_v069_npcs.json:fulus
 msgid "Fulus"
-msgstr "Фулус"
+msgstr ""
 
 #: monsterlist_v069_npcs.json:guthbered
 msgid "Guthbered"
@@ -51693,7 +51679,7 @@ msgstr ""
 
 #: monsterlist_v069_npcs.json:herec
 msgid "Herec"
-msgstr "Херек"
+msgstr ""
 
 #: monsterlist_v069_npcs.json:iducus
 msgid "Iducus"
@@ -51729,7 +51715,7 @@ msgstr ""
 
 #: monsterlist_v069_npcs.json:throdna
 msgid "Throdna"
-msgstr "Тродна"
+msgstr ""
 
 #: monsterlist_v069_npcs.json:throdnas_guard
 msgid "Throdna's guard"
@@ -51854,7 +51840,7 @@ msgstr ""
 
 #: monsterlist_v0610_npcs1.json:benbyr
 msgid "Benbyr"
-msgstr "Бенбір"
+msgstr ""
 
 #: monsterlist_v0610_npcs1.json:celdar
 msgid "Celdar"
@@ -51870,7 +51856,7 @@ msgstr ""
 
 #: monsterlist_v0610_npcs1.json:erinith
 msgid "Erinith"
-msgstr "Ерініт"
+msgstr ""
 
 #: monsterlist_v0610_npcs1.json:fanamor
 msgid "Fanamor"
@@ -51886,7 +51872,7 @@ msgstr ""
 
 #: monsterlist_v0610_npcs1.json:gandoren
 msgid "Gandoren"
-msgstr "Гандорен"
+msgstr ""
 
 #: monsterlist_v0610_npcs1.json:grimion
 msgid "Grimion"
@@ -51930,7 +51916,7 @@ msgstr ""
 
 #: monsterlist_v0610_npcs1.json:minarra
 msgid "Minarra"
-msgstr "Мінарра"
+msgstr ""
 
 #: monsterlist_v0610_npcs1.json:puny_warehouserat
 msgid "Warehouse rat"
@@ -53560,7 +53546,7 @@ msgstr ""
 
 #: monsterlist_stoutford_combined.json:stoutford_armorer
 msgid "Odirath"
-msgstr "Одірат"
+msgstr ""
 
 #: monsterlist_stoutford_combined.json:cave_troll_1
 #: monsterlist_stoutford_combined.json:cave_troll_7
@@ -53793,7 +53779,7 @@ msgstr ""
 
 #: monsterlist_omicronrg9.json:g03_crackshot
 msgid "Crackshot"
-msgstr "Крекшот"
+msgstr ""
 
 #: monsterlist_omicronrg9.json:g03_crackshot_dying
 msgid "Dying Crackshot"
@@ -54245,7 +54231,7 @@ msgstr ""
 #: monsterlist_fungi_panic.json:zuul_khan9
 #: monsterlist_gison.json:gison_thiefboss
 msgid "Zuul'khan"
-msgstr "Зуульхан"
+msgstr ""
 
 #: monsterlist_fungi_panic.json:weak_fungi
 msgid "Weak fungi"
@@ -54313,7 +54299,7 @@ msgstr ""
 
 #: monsterlist_fungi_panic.json:bogsten_gambler1
 msgid "Bogal"
-msgstr "Богал"
+msgstr ""
 
 #: monsterlist_fungi_panic.json:bogsten_gambler2
 msgid "Botisto"
@@ -54329,15 +54315,15 @@ msgstr ""
 
 #: monsterlist_gison.json:gison
 msgid "Gison"
-msgstr "Ґісон"
+msgstr ""
 
 #: monsterlist_gison.json:nimael
 msgid "Nimael"
-msgstr "Німаель"
+msgstr ""
 
 #: monsterlist_gison.json:gael
 msgid "Gael"
-msgstr "Гаель"
+msgstr ""
 
 #: monsterlist_gison.json:small_stone_worm
 msgid "Small stone worm"
@@ -54367,11 +54353,11 @@ msgstr ""
 
 #: monsterlist_gorwath.json:gorwath
 msgid "Gorwath"
-msgstr "Ґорват"
+msgstr ""
 
 #: monsterlist_gorwath.json:arensia
 msgid "Arensia"
-msgstr "Аренсія"
+msgstr ""
 
 #: monsterlist_omi2.json:mountain_wolf_2
 msgid "Trained mountain wolf"
@@ -54407,7 +54393,7 @@ msgstr ""
 
 #: monsterlist_omi2.json:ehrenfest
 msgid "Ehrenfest"
-msgstr "Еренфест"
+msgstr ""
 
 #: monsterlist_omi2.json:ortholion
 #: monsterlist_omi2.json:ortholion_hidden
@@ -54514,7 +54500,7 @@ msgstr ""
 
 #: monsterlist_omi2.json:kamelio
 msgid "Kamelio"
-msgstr "Камеліо"
+msgstr ""
 
 #: monsterlist_omi2.json:kamelio2
 msgid "Undead Kamelio"
@@ -59047,3 +59033,4 @@ msgstr ""
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr ""
+

AndorsTrail/app/src/main/assets/translation/zh_CN.po

@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: andors-trail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-11-10 11:48+0000\n"
-"PO-Revision-Date: 2022-04-22 12:58+0000\n"
-"Last-Translator: 徐雪开 <a1744361575@gmail.com>\n"
+"PO-Revision-Date: 2022-04-15 09:26+0000\n"
+"Last-Translator: Lu Xu <oliver_lew@outlook.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
 "andors-trail/game-content/zh_Hans/>\n"
 "Language: zh_CN\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 4.12.1-dev\n"
+"X-Generator: Weblate 4.12-dev\n"
 "X-Launchpad-Export-Date: 2015-11-02 12:26+0000\n"
 
 #: [none]
@@ -427,7 +427,7 @@ msgstr "你手里的是什么书？"
 
 #: conversationlist_mikhail.json:mikhail_default:9
 msgid "Yes, I'm here to deliver the order for a 'Plush Pillow'. But what for?"
-msgstr "是的，我是来送“毛绒枕头”的订单的。但为了什么呢？"
+msgstr ""
 
 #: conversationlist_mikhail.json:mikhail_tasks
 msgid "Oh yes, there were some things I need help with, bread and rats. Which one would you like to talk about?"
@@ -1714,7 +1714,7 @@ msgstr "你好像真的很喜欢书。"
 
 #: conversationlist_fallhaven_arcir.json:arcir_start:2
 msgid "And I'm your delivery kid. Did you order a 'Dusty old book'?"
-msgstr "而我是你的快递小哥。你是否订购了一本'尘封的旧书'？"
+msgstr ""
 
 #: conversationlist_fallhaven_arcir.json:arcir_anythingelse
 msgid "Anything else you wanted to ask?"
@@ -6261,7 +6261,7 @@ msgstr "是的，我已经知道他发生了什么事。"
 
 #: conversationlist_wrye.json:wrye_return_1:3
 msgid "Not yet, but your order has finally arrived."
-msgstr "还没有，但你的订单终于到了。"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_return_2
 msgid "Welcome back. Thank you for your help in finding out what happened to my son."
@@ -6275,7 +6275,7 @@ msgstr "不客气。"
 
 #: conversationlist_wrye.json:wrye_return_2:2
 msgid "Yes, I came back to deliver your order of a 'Lyre'. You must be good at playing it?"
-msgstr "是的，我回来送你订购的“七弦琴”。你一定很擅长弹吧？"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_1
 msgid "Shadow help me."
@@ -6289,7 +6289,7 @@ msgstr "出什么事了？"
 
 #: conversationlist_wrye.json:wrye_mourn_1:1
 msgid "Excuse me, I'm here to deliver your order for a 'Lyre'."
-msgstr "打扰一下，我是来送你订购的 \"琴 \"的。"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_2
 msgid "My son! My son is gone."
@@ -6307,7 +6307,7 @@ msgstr "他呢？"
 
 #: conversationlist_wrye.json:wrye_mourn_2:2
 msgid "Maybe your order here will comfort you?"
-msgstr "也许这把琴能安慰你"
+msgstr ""
 
 #: conversationlist_wrye.json:wrye_mourn_3
 msgid "I don't want to talk about it. Not with an outsider like you."
@@ -17277,7 +17277,7 @@ msgstr "你怎么知道我来自哪里？"
 
 #: conversationlist_arghes.json:arghes_2:3
 msgid "And how interesting that you ordered a pair of 'Yellow boots'. Did you really order this?"
-msgstr "还有，你订了一双'黄靴'，多有意思。你真的订购了这个吗？"
+msgstr ""
 
 #: conversationlist_arghes.json:arghes_3a
 msgid "Is that so? Hmm, most interesting. It does not change anything, however."
@@ -25617,7 +25617,7 @@ msgstr "你在光天化日之下躺在床上？"
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_10:1
 msgid "I'm here to give you your ordered item. You don't want it?"
-msgstr "我来这里是为了给您订购的物品。你不想要吗？"
+msgstr ""
 
 #: conversationlist_guynmart_npc.json:guynmart_servant_20
 msgid "I am checking that the bed of young Robalyrius is still in order."
@@ -29265,7 +29265,7 @@ msgstr "你看起来又很高兴。"
 
 #: conversationlist_stoutford_combined.json:odirath_0:5
 msgid "Did you really order such an ugly porcelain figure? Oops, sorry I didn't mean to offend you"
-msgstr "你真的订购了这么丑的瓷器吗？哎呀，对不起，我不是故意的。"
+msgstr ""
 
 #: conversationlist_stoutford_combined.json:odirath_1
 msgid "I did see someone that might have been your brother. He was with a rather dubious looking person. They didn't stay around here very long though. Sorry, but that's all I can tell you. You should ask around town. Other townsfolk may know more."
@@ -33954,7 +33954,7 @@ msgstr "嗯，很抱歉打扰你。"
 
 #: conversationlist_arulir_mountain.json:tjure_0:3
 msgid "I'm surprised to see you here as well. Did you order 'Mysterious green something'?"
-msgstr "我很惊讶在这里也能看到你。你是否订购了'神秘绿色之物'？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_0_10
 msgid "I am Tjure of Brimhaven. I am ... was ... a successful merchant. But my luck has run out."
@@ -34075,20 +34075,20 @@ msgstr "*叹息*你是我最后的希望。现在离开我吧。"
 
 #: conversationlist_arulir_mountain.json:tjure_90:0
 msgid "Hope you learned from it."
-msgstr "希望你能从中吸取教训。"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_90:1
 msgid "OK. One question before I go: did you order a 'Mysterious green something'?"
-msgstr "好的。在我走之前有一个问题：你是否订购了一个'神秘绿色之物'？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:0
 #: conversationlist_arulir_mountain.json:tjure_200:0
 msgid "It was an interesting experience."
-msgstr "真是一次有趣的经历。"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_100:1
 msgid "No problem. By the way, did you order a 'Mysterious green something'?"
-msgstr "没问题。顺便说一下，你是否订购了一个'神秘绿色之物'？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:tjure_200
 msgid "Oh, you look better than the last time we met. Thank you for your help."
@@ -34096,7 +34096,7 @@ msgstr "哦，你看起来比我们上次见面时好多了。谢谢你的帮助
 
 #: conversationlist_arulir_mountain.json:tjure_200:1
 msgid "Indeed. By the way, did you order a 'Mysterious green something'?"
-msgstr "的确如此。顺便说一句，你是否订购了一个'神秘绿色之物'？"
+msgstr ""
 
 #: conversationlist_arulir_mountain.json:watermark_script_100
 msgid "This seems to be a very strange place. Maybe even dangerous."
@@ -35815,7 +35815,7 @@ msgstr "你见过这样的手套吗？[向维南拉展示手套。］"
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_0:5
 msgid "Did you order an 'Old, worn cape'?"
-msgstr "你是否订购了一件'破旧披风'？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_laundry_boss_1
 msgid "We are working on some nice green dresses. We can also repair and improve your clothes."
@@ -36737,7 +36737,7 @@ msgstr "我在寻找我的哥哥，安道尔。你在镇上有没有看到长得
 
 #: conversationlist_brimhaven.json:edrin_0_0:6
 msgid "Hello, did you order a 'Striped Hammer'?"
-msgstr "你好，你是否订购了'纹锤'？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:edrin_5_0
 msgid "Yes, that's the one that matches the dagger! Now that I have both pieces, I can repair the dagger for you if you wish."
@@ -37106,7 +37106,7 @@ msgstr "也许我能帮到你。"
 
 #: conversationlist_brimhaven.json:brv_fortune_choice:3
 msgid "Are you the one who ordered a 'Crystal Globe'?"
-msgstr "你是那个订购了'水晶球'的人吗？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_andor_10
 msgid "I see you talking to your brother, somewhere far from here in a big city. Feygard or Nor City, I think."
@@ -37250,7 +37250,7 @@ msgstr "我正在寻找..."
 
 #: conversationlist_brimhaven.json:brv_fortune_10:2
 msgid "So you are the one who ordered a 'Crystal Globe'?"
-msgstr "那么你就是那个订购了'水晶球'的人？"
+msgstr ""
 
 #: conversationlist_brimhaven.json:brv_fortune_50
 msgid "It will cost you 100 gold."
@@ -47717,219 +47717,211 @@ msgstr "这听起来有点像真的。你是一个非常有说服力的演讲者
 
 #: conversationlist_omi2.json:omi2_fix_ehrenfest_53
 msgid "You are wrong. I'm not here, just an illusion."
-msgstr "你错了。我不在这里，只是一个幻觉。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10
 msgid "Ah! You have finally returned, my new worker."
-msgstr "啊!你终于回来了，我的新员工。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10:2
 msgid "Ah! You are still insolent."
-msgstr "啊！你还是无礼。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_20
 msgid "I need someone to deliver all of the items that are in storage."
-msgstr "我需要有人运送仓库里所有的物品。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30
 msgid "Come back to me when you have delivered all of the items. The order is not important. Here is the list of customers."
-msgstr "当你送完所有的物品后再来找我。顺序并不重要。这是客户的名单。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:0
 msgid "It will be done."
-msgstr "不久会完成。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_30:1
 msgid "You want me to deliver these items to your customers?"
-msgstr "你想让我把这些东西送到你的客户手中？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40
 msgid "Yes yes, hurry now. I have work to do here."
-msgstr "对对对，现在赶快。我在这还有事要做。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:0
 msgid "I'm going now."
-msgstr "我现在就去。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_40:1
 msgid "Hope I get paid better this time."
-msgstr "希望我这次能得到更好的报酬。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_arcir
 msgid "Yes, an old but useful book, but you should have wiped it off first. Anyway, here's my delivery fee."
-msgstr "是的，一本有用的旧书，但你应该先把它擦干净。总之，这是我的快递费。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_edrin
 msgid "Ah, yes, a striped hammer. Don't look so impatient. Here's my delivery charge, and now you can leave!"
-msgstr "啊，是的，一把纹锤。别显得那么不耐烦。这是我的送货费，现在你可以走了！。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_odirath
 msgid "Yes, indeed. A gift for my beautiful daughter... but why did it take so long? Sigh, here's my delivery fee."
-msgstr "是的，确实如此。给我美丽女儿的礼物......"
-"但为什么花这么长时间？唉，这是我的快递费。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_venanra
 msgid "Yes I did, kid. Incredibly, it has become the latest fashion to buy new capes with holes. Here's my delivery fee."
-msgstr "是的，我做到了，孩子。令人难以置信的是，购买有洞的新斗篷已经成为最新的潮流。"
-"这是我的快递费。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_tjure
 msgid "What?! My lucky clover...but why now? Anyway, I'll no longer run out of luck. Here's my delivery fee."
-msgstr "什么？我的幸运三叶草......"
-"但为什么是现在？不管怎么说，我不会再倒霉了。这是我的快递费。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_servant
 msgid "Finally, I'm no longer afraid of that room every time my lord turns off the lights to scare me. Here's my delivery fee."
-msgstr "终于，我不再害怕那个房间了，每次我的主子都会关灯来吓唬我。这是我的快递费。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_arghes
 msgid "Yes kid, thank you. Here, take this gold for them."
-msgstr "是的，孩子，谢谢你。拿着，给他们这些黄金。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre_negative
 msgid "That's not what I'm waiting for! Go out and find out what happened to my son, please!"
-msgstr "这不是我盼望的东西！求你出去看看我儿子出了什么事！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre
 msgid "Yes, I'm longing for it just like how I'm longing for my son. But now I can mourn as I play his favorite song until I die."
-msgstr "是的，我爱它，就像爱我的儿子一样。但现在我可以在播放他最喜欢的歌曲时哀悼，直"
-"到我死去。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_wyre:0
 msgid "My sincere condolence for the loss of your beloved son."
-msgstr "我对你失去爱子表示诚挚的哀悼。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail
 msgid "Oh wow! Finally, your brother's gift has arrived and we only have to wait for his arrival."
-msgstr "哇哦！终于，你哥哥的礼物到了，我们只需要等待他的到来。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:0
 msgid "Sigh. I hope so."
-msgstr "唉。希望如此。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail:1
 msgid "What?! Where's my gift?"
-msgstr "什么？我的礼物呢？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail3
 msgid "I already gave you his shield."
-msgstr "我已经给了你他的盾牌。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2
 msgid "Anyway, it's been a very long time so please go look for your brother."
-msgstr "总之，已经过了很长时间了，所以请你去找你的兄弟。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:1
 msgid "I'm still looking for him."
-msgstr "我还在找他。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail2:2
 msgid "Eh, you have to pay for it..."
-msgstr "诶，你还没付钱......。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4
 msgid "Ah, yes, I almost forgot. Here you are."
-msgstr "啊，对，我差点忘了。给你。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:0
 msgid "Thanks. I'm on my way again, bye."
-msgstr "谢谢。我又要上路了，再见。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_mikhail4:1
 msgid "Hmm... Bye"
-msgstr "嗯...再见"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune
 msgid ""
 "Ah yes, I need a new one. My current crystal globe has become a bit cloudy - otherwise I would of course have seen that you would bring me a new globe.\n"
 "Here is the gold for it."
 msgstr ""
-"啊，是的，我需要一个新的。我现在的水晶球已经有点浑浊了--"
-"否则我当然会看到你会给我带来一个新的水晶球。\n"
-"这是酬金。"
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:0
 msgid "Do you want to try the crystal ball with me to see if it works?"
-msgstr "你想不想和我一起试试水晶球，看看它是否有效？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune:1
 msgid "Thanks for choosing Facutloni's delivery."
-msgstr "感谢你选择Facutloni'的快递。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_brv_fortune_10
 msgid "You say you want me to help you?"
-msgstr "你说要我帮你？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10
 msgid "You are back. Did you deliver all of the items?"
-msgstr "你回来了,所有的物品都送到了吗？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10:0
 msgid "Yes. I delivered everything."
-msgstr "是的，我送完了所有的东西。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no
 msgid "Then what are you standing there for?! Get out and deliver everything!"
-msgstr "那你还站在那里干什么？滚出去，把东西都送完！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:0
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:0
 msgid "[Run]"
-msgstr "[跑]"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_no:1
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:1
 msgid "Yes boss."
-msgstr "是的老板。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes
 msgid "That's nice to hear. Then you can now give me the... eh...330 gold pieces that you should have received from the sales."
-msgstr "很高兴听到这个消息。那么你现在可以把你应该从销售中得到的......呃......"
-"330个金币交给我。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:0
 msgid "Sure. Here you are."
-msgstr "当然，给你。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes:1
 msgid "Uh, I had expenses along the way and I don't have all the gold anymore."
-msgstr "呃，我一路上都有花销，我没有所有的金币了。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1
 msgid "And then you walk into my sight? Go get my gold!"
-msgstr "然后你就走进我的视线？去拿我的金币吧！"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_1:2
 msgid "Oh, I just found the 330 gold pieces in my pocket. Please take it."
-msgstr "哦，我刚刚在我的口袋里发现了330枚金币。请收下吧。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10
 msgid "Good job! I am glad that you work responsibly."
-msgstr "干得好!我很高兴你能负责任地工作。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:0
 msgid "And seriously."
-msgstr "而且说真的。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_10_10_yes_10:1
 msgid "I travelled far and wide."
-msgstr "我走了很远很远。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward
 msgid "That is serious. And here you have your well-deserved reward: 100 gold."
-msgstr "这是很认真的。这里有你应得的奖励：100金币。"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_reward:1
 msgid "What the?"
-msgstr "什么情况？"
+msgstr ""
 
 #: conversationlist_delivery.json:brv_wh_delivery_boss_scrooge
 msgid "Pardon?"
-msgstr "抱歉？"
+msgstr ""
 
 #: conversationlist_delivery.json:tjure_wh_delivery_90:0
 msgid "Not until I have delivered this to you. Are you the one who ordered a 'Mysterious green something'?"
-msgstr "除非我把这个送到你手里。你是那个订购了'神秘绿色之物'的人吗？"
+msgstr ""
 
 #: itemcategories_1.json:dagger
 msgid "Dagger"
@@ -51568,20 +51560,11 @@ msgstr "握住它时，你会有一种温暖和舒适的感觉。"
 
 #: itemlist_delivery.json:facutloni_docket
 msgid "Facutloni's Docket"
-msgstr "Facutloni的记事表"
+msgstr ""
 
 #: itemlist_delivery.json:facutloni_docket:description
 msgid "A document listing the contents of a delivery   Arcir the book-lover from Fallhaven ordered a 'Dusty Old Book'.   Edrin the metalsmith from Brimhaven ordered a 'Striped Hammer'.   Odirath the armorer from Stoutford ordered a 'Pretty Porcelain Figure'.   Venanra the laundress from Brimhaven ordered an 'Old, worn cape'.   Tjure the unlucky merchant ordered a 'Mysterious green something'.   Servant the servant from Guynmart Castle ordered a 'Chandelier'.   Arghes from Remgard tavern ordered 'Yellow Boots'.   Wyre the mournful woman from Vilegard ordered a 'Lyre'.   Mikhail from Crossglen ordered a 'Plush Pillow'.   Pangitain the fortune teller from Brimhaven ordered a 'Crystal Globe'. "
 msgstr ""
-"一份文件列出了Fallhaven的图书爱好者阿西尔（Arcir）订购了一本“尘封的旧书”。  "
-"来自Brimhaven的金属匠埃德林订购了一把“纹锤”。  "
-"来自Stoutford的装甲兵奥迪拉特订购了一个“漂亮的瓷器人物”。  "
-"来自Brimhaven的洗衣店Veranra订购了一件“破旧的斗篷”。  "
-"倒霉的商人Tjure订购了一个“神秘绿色之物”。  "
-"来自Guynmart城堡的仆人仆人订购了一盏“枝形吊灯”。  来自Remgard酒馆的Arghes订购"
-"了“黄靴子”。来自Vilegard的悲伤女人Wyre订购了一把“七弦琴”。  "
-"来自Crossglen的Mikhail订购了一个“毛绒枕头”。  "
-"来自Brimhaven的算命先生Pangitain订购了一个“水晶球” "
 
 #: monsterlist_crossglen_animals.json:tiny_rat
 msgid "Tiny rat"
@@ -59815,60 +59798,59 @@ msgstr "由于我的勇敢和......无知吗，奥瑟里昂将军给了我几天
 
 #: questlist_delivery.json:brv_wh_delivery
 msgid "Delivery"
-msgstr "交货"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:10
 msgid "Facutloni asked me to help him deliver all of the items ordered by his customers a long time ago. He even gave me an old document with the names and items written on it."
-msgstr "Facutloni让我帮助他运送很久以前顾客订购的所有物品。他甚至给了我一份旧文件，上"
-"面写着名字和物品。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:20
 msgid "Arcir the Fallhaven book-lover ordered a 'Dusty Old book'."
-msgstr "Fallhaven的图书爱好者Arcir订购了一本'尘封的旧书'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:30
 msgid "Edrin the Brimhaven metalsmith ordered a 'Striped Hammer'."
-msgstr "Brimhaven的金属匠Edrin订购了一把'纹锤'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:40
 msgid "Odirath the Stoutford armorer ordered a 'Pretty Porcelain Figure'."
-msgstr "Stouford的装甲师Odirath订购了一个'漂亮的瓷娃娃'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:50
 msgid "Venanra the Brimhaven laundress ordered an 'Old, worn cape'."
-msgstr "Brimhaven洗衣店的Venanra订购了一件'破旧的披风'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:60
 msgid "Tjure the unlucky Brimhaven merchant ordered a 'Mysterious green something'."
-msgstr "Tjure这个倒霉的Brimhaven商人订购了一个'神秘绿色之物'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:70
 msgid "Servant the Guynmart servant ordered a 'Chandelier'."
-msgstr "服务Guynmart的仆人订购了一个'吊灯'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:80
 msgid "Arghes at Remgard tavern ordered 'Yellow boots'."
-msgstr "Arghes在Remgard酒馆订购了'黄靴'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:90
 msgid "Wyre the mournful Vilegard woman ordered a 'Lyre'."
-msgstr "哀伤的Vilegard女人Wyre订购了一把'七弦琴'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:100
 msgid "Mikhail ordered a 'Plush Pillow'."
-msgstr "米哈伊尔订购了一个'毛绒枕头'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:110
 msgid "Pangitain the Brimhaven fortune teller ordered a 'Crystal Globe'."
-msgstr "Brimhaven的算命先生Pangitain订购了一个'水晶球'。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:120
 msgid "Facutloni wants me to report back after the deliveries are complete."
-msgstr "Facutloni希望我在交付完成后报告。"
+msgstr ""
 
 #: questlist_delivery.json:brv_wh_delivery:130
 msgid "I reported back to Facutloni. He is very happy."
-msgstr "我向Facutloni汇报了情况。他非常高兴。"
+msgstr ""
 
 #: worldmap.xml:world1:crossglen
 msgid "Crossglen"
@@ -59921,3 +59903,4 @@ msgstr "盖恩玛特城堡"
 #: worldmap.xml:world1:brimhaven_area
 msgid "Brimhaven"
 msgstr "布林海文"
+

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailApplication.java

@@ -1,14 +1,14 @@
-package com.gpl.rpg.AndorsTrail_beta2;
+package com.gpl.rpg.AndorsTrail;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Locale;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta2.util.Pair;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Pair;
 
 import android.app.Activity;
 import android.app.Application;
@@ -26,13 +26,13 @@ public final class AndorsTrailApplication extends Application {
 	public static final boolean DEVELOPMENT_FORCE_CONTINUEGAME = false;
 	public static final boolean DEVELOPMENT_DEBUGBUTTONS = true;
 	public static final boolean DEVELOPMENT_FASTSPEED = false;
-	public static final boolean DEVELOPMENT_VALIDATEDATA = true;
+	public static final boolean DEVELOPMENT_VALIDATEDATA = false;
 	public static final boolean DEVELOPMENT_DEBUGMESSAGES = false;
-	public static final String CURRENT_VERSION_DISPLAY = "0.8.1beta2";
+	public static final String CURRENT_VERSION_DISPLAY = "0.7.17";
 	public static final boolean IS_RELEASE_VERSION = !CURRENT_VERSION_DISPLAY.matches(".*[a-d].*");
 	public static final boolean DEVELOPMENT_INCOMPATIBLE_SAVEGAMES = DEVELOPMENT_DEBUGRESOURCES || DEVELOPMENT_DEBUGBUTTONS || DEVELOPMENT_FASTSPEED || !IS_RELEASE_VERSION;
 	public static final int DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION = 999;
-	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 65;
+	public static final int CURRENT_VERSION = DEVELOPMENT_INCOMPATIBLE_SAVEGAMES ? DEVELOPMENT_INCOMPATIBLE_SAVEGAME_VERSION : 64;
 
 	private final AndorsTrailPreferences preferences = new AndorsTrailPreferences();
 	private WorldContext world = new WorldContext();

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/AndorsTrailPreferences.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2;
+package com.gpl.rpg.AndorsTrail;
 
 import android.content.Context;
 import android.content.SharedPreferences;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/Dialogs.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2;
+package com.gpl.rpg.AndorsTrail;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,29 +24,29 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.activity.ActorConditionInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.BulkSelectionInterface;
-import com.gpl.rpg.AndorsTrail_beta2.activity.ConversationActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.LevelUpActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.LoadSaveActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.MainActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.MonsterEncounterActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.MonsterInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.SkillInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.activity.ActorConditionInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.BulkSelectionInterface;
+import com.gpl.rpg.AndorsTrail.activity.ConversationActivity;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.LevelUpActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadSaveActivity;
+import com.gpl.rpg.AndorsTrail.activity.MainActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterEncounterActivity;
+import com.gpl.rpg.AndorsTrail.activity.MonsterInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.SkillInfoActivity;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
 
 public final class Dialogs {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/WorldSetup.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2;
+package com.gpl.rpg.AndorsTrail;
 
 import java.lang.ref.WeakReference;
 
@@ -6,11 +6,11 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.AsyncTask;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta2.resource.ResourceLoader;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.ResourceLoader;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
 
 public final class WorldSetup {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AboutActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.graphics.drawable.Drawable;
@@ -11,9 +11,9 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class AboutActivity extends AndorsTrailBaseActivity implements ImageGetter {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ActorConditionInfoActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -9,13 +9,13 @@ import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.AbilityModifierInfoView;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView_OnUse;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.AbilityModifierInfoView;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView_OnUse;
 
 public final class ActorConditionInfoActivity extends AndorsTrailBaseActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseActivity.java

@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Activity;
 import android.os.Bundle;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public abstract class AndorsTrailBaseActivity extends Activity {
     @Override

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/AndorsTrailBaseFragmentActivity.java

@@ -1,9 +1,9 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.support.v4.app.FragmentActivity;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
 
 public abstract class AndorsTrailBaseFragmentActivity extends FragmentActivity {
     @Override

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/BulkSelectionInterface.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Dialog;
 import android.content.Intent;
@@ -16,13 +16,13 @@ import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 /**
  * @author ejwessel

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ConversationActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.ArrayList;
 
@@ -29,22 +29,22 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 import android.widget.TextView.BufferType;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ConversationActivity
 		extends AndorsTrailBaseActivity

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DebugInterface.java

@@ -0,0 +1,304 @@
+package com.gpl.rpg.AndorsTrail.activity;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.view.MainView;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.RelativeLayout;
+import android.widget.Toast;
+
+public final class DebugInterface {
+	private final ControllerContext controllerContext;
+	private final MainActivity mainActivity;
+	private final Resources res;
+	private final WorldContext world;
+	
+	private DebugButton[] buttons;
+	private List<DebugButton> tpButtons = new ArrayList<DebugButton>();
+
+	public DebugInterface(ControllerContext controllers, WorldContext world, MainActivity mainActivity) {
+		this.controllerContext = controllers;
+		this.world = world;
+		this.res = mainActivity.getResources();
+		this.mainActivity = mainActivity;
+	}
+
+	public void addDebugButtons() {
+		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
+
+		List<DebugButton> buttonList = new ArrayList<DebugButton>();
+		buttonList.addAll(Arrays.asList(new DebugButton[] {
+			new DebugButton("dbg", new OnClickListener() {
+				boolean hidden = false;
+					@Override
+					public void onClick(View arg0) {
+						hidden = !hidden;
+						for (int i = 1; i < buttons.length; i++) {
+							buttons[i].b.setVisibility(hidden ? View.GONE : View.VISIBLE);
+						}
+						for (DebugButton b : tpButtons) {
+							b.b.setVisibility(View.GONE);
+						}
+					}
+			})
+			,new DebugButton("tp", new OnClickListener() {
+				public void onClick(View arg0) {
+					for (int i = 0; i < buttons.length; i++) {
+						buttons[i].b.setVisibility(View.GONE);
+					}
+					for (DebugButton tpButton : tpButtons) {
+						tpButton.b.setVisibility(View.VISIBLE);
+					}
+				}
+			})
+			,new DebugButton("dmg", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					world.model.player.damagePotential.set(500, 500);
+					world.model.player.attackChance = 500;
+					world.model.player.attackCost = 1;
+					showToast(mainActivity, "DEBUG: damagePotential=500, chance=500%, cost=1", Toast.LENGTH_SHORT);
+				}
+			})
+			/*,new DebugButton("dmg=1", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					world.model.player.damagePotential.set(1, 1);
+					showToast(mainActivity, "DEBUG: damagePotential=1", Toast.LENGTH_SHORT);
+				}
+			})*/
+			,new DebugButton("itm", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					for (ItemType item : world.itemTypes.UNITTEST_getAllItemTypes().values()) {
+						world.model.player.inventory.addItem(item, 10);
+					}
+					world.model.player.inventory.gold += 50000;
+					showToast(mainActivity, "DEBUG: added items", Toast.LENGTH_SHORT);
+				}
+			})
+			,new DebugButton("xp", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					controllerContext.actorStatsController.addExperience(10000);
+					showToast(mainActivity, "DEBUG: given 10000 exp", Toast.LENGTH_SHORT);
+				}
+			})
+			,new DebugButton("rst", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					for(PredefinedMap map : world.maps.getAllMaps()) {
+						map.resetTemporaryData();
+					}
+					showToast(mainActivity, "DEBUG: maps respawned", Toast.LENGTH_SHORT);
+				}
+			})
+			,new DebugButton("hp", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					world.model.player.baseTraits.maxHP = 500;
+					world.model.player.health.max = world.model.player.baseTraits.maxHP;
+					controllerContext.actorStatsController.setActorMaxHealth(world.model.player);
+					world.model.player.conditions.clear();
+					showToast(mainActivity, "DEBUG: hp set to max", Toast.LENGTH_SHORT);
+				}
+			})
+			,new DebugButton("skl", new OnClickListener() {
+				@Override
+				public void onClick(View arg0) {
+					world.model.player.availableSkillIncreases += 10;
+					showToast(mainActivity, "DEBUG: 10 skill points", Toast.LENGTH_SHORT);
+				}
+			})
+			,new DebugButton("spd", new OnClickListener() {
+				boolean fast = Constants.MINIMUM_INPUT_INTERVAL == Constants.MINIMUM_INPUT_INTERVAL_FAST;
+				@Override
+				public void onClick(View arg0) {
+					fast = !fast;
+					if (fast) {
+						Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_FAST;
+					} else {
+						Constants.MINIMUM_INPUT_INTERVAL = Constants.MINIMUM_INPUT_INTERVAL_STD;
+					}
+					MainView.SCROLL_DURATION = Constants.MINIMUM_INPUT_INTERVAL;
+					AndorsTrailApplication.getApplicationFromActivity(mainActivity).getControllerContext().movementController.resetMovementHandler();
+				}
+			})
+		}));
+		
+		tpButtons.addAll(Arrays.asList(new DebugButton[] {
+				new DebugButton("tp", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						for (int i = 0; i < buttons.length; i++) {
+							buttons[i].b.setVisibility(View.VISIBLE);
+						}
+						for (DebugButton tpButton : tpButtons) {
+							tpButton.b.setVisibility(View.GONE);
+						}
+					}
+				})
+				,new DebugButton("cg", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "crossglen", "hall", 0, 0);
+					}
+				})
+				,new DebugButton("vg", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "vilegard_s", "tavern", 0, 0);
+					}
+				})
+				,new DebugButton("cr", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "houseatcrossroads4", "down", 0, 0);
+					}
+				})
+				,new DebugButton("lf", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "loneford9", "south", 0, 0);
+					}
+				})
+				,new DebugButton("fh", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "fallhaven_ne", "clothes", 0, 0);
+					}
+				})
+				,new DebugButton("pm", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain29", "south", 0, 0);
+					}
+				})
+				,new DebugButton("bm", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "blackwater_mountain43", "south", 0, 0);
+					}
+				})
+				,new DebugButton("rmg", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "remgard0", "east", 0, 0);
+					}
+				})
+				,new DebugButton("chr", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "waytolostmine2", "minerhouse4", 0, 0);
+					}
+				})
+				,new DebugButton("ldr", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "lodarhouse0", "lodarhouse", 0, 0);
+					}
+				})
+				,new DebugButton("sf", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "wild20", "south2", 0, 0);
+					}
+				})
+				,new DebugButton("gm", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "guynmart_wood_1", "farmhouse", 0, 0);
+					}
+				})
+				,new DebugButton("bh", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "brimhaven4", "south2", 0, 0);
+					}
+				})
+				,new DebugButton("ar", new OnClickListener() {
+					@Override
+					public void onClick(View arg0) {
+						controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "mountainlake5", "north", 0, 0);
+					}
+				})
+				,new DebugButton("ws", new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				controllerContext.movementController.placePlayerAsyncAt(MapObject.MapObjectType.newmap, "woodsettlement0", "east", 0, 0);
+			}
+		})
+		}));
+		buttonList.addAll(tpButtons);
+		
+		buttons = buttonList.toArray(new DebugButton[buttonList.size()]);
+		addDebugButtons(buttons);
+		
+		for (DebugButton b : tpButtons) {
+			b.b.setVisibility(View.GONE);
+		}
+	}
+
+	private void showToast(Context context, String msg, int duration) {
+		Toast.makeText(context, msg, duration).show();
+	}
+
+	private static class DebugButton {
+		public final String text;
+		public final OnClickListener listener;
+		public Button b = null;
+		public DebugButton(String text, OnClickListener listener) {
+			this.text = text;
+			this.listener = listener;
+		}
+		public void makeButton(Context c, int id) {
+			b = new Button(c);
+			b.setText(text);
+			b.setTextSize(10);//res.getDimension(R.dimen.actionbar_text));
+			b.setId(id);
+			b.setOnClickListener(listener);
+		}
+	}
+
+	private void addDebugButton(DebugButton button, int id, RelativeLayout layout) {
+		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
+
+		RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, res.getDimensionPixelSize(R.dimen.smalltext_buttonheight));
+		if (id == 1)
+			lp.addRule(RelativeLayout.ALIGN_PARENT_LEFT);
+		else
+			lp.addRule(RelativeLayout.RIGHT_OF, id - 1);
+		lp.addRule(RelativeLayout.ABOVE, R.id.main_statusview);
+		button.makeButton(mainActivity, id); 
+		button.b.setLayoutParams(lp);
+		layout.addView(button.b);
+	}
+
+	private void addDebugButtons(DebugButton[] buttons) {
+		if (!AndorsTrailApplication.DEVELOPMENT_DEBUGBUTTONS) return;
+
+		if (buttons == null || buttons.length <= 0) return;
+		RelativeLayout layout = (RelativeLayout) mainActivity.findViewById(R.id.main_container);
+
+		int id = 1;
+		for (DebugButton b : buttons) {
+			addDebugButton(b, id, layout);
+			++id;
+		}
+	}
+}

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/DisplayWorldMapActivity.java

@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.io.File;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.WorldMapController;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.WorldMapController;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/HeroinfoActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,14 +8,14 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Quests;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Skills;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.HeroinfoActivity_Stats;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Inventory;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Quests;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Skills;
+import com.gpl.rpg.AndorsTrail.activity.fragment.HeroinfoActivity_Stats;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class HeroinfoActivity extends AndorsTrailBaseFragmentActivity {
 	private WorldContext world;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.Collections;
 
@@ -11,12 +11,12 @@ import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
 
 public final class ItemInfoActivity extends AndorsTrailBaseActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LevelUpActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,14 +8,14 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ActorStatsController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class LevelUpActivity extends AndorsTrailBaseActivity {
 	private WorldContext world;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadSaveActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.util.Collections;
 import java.util.List;
@@ -19,15 +19,15 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadSaveActivity extends AndorsTrailBaseActivity implements OnClickListener {
 	private boolean isLoading = true;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/LoadingActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -11,15 +11,15 @@ import android.view.ViewTreeObserver;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta2.WorldSetup.OnResourcesLoadedListener;
-import com.gpl.rpg.AndorsTrail_beta2.WorldSetup.OnSceneLoadedListener;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CloudsAnimatorView;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnResourcesLoadedListener;
+import com.gpl.rpg.AndorsTrail.WorldSetup.OnSceneLoadedListener;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public final class LoadingActivity extends AndorsTrailBaseActivity implements OnResourcesLoadedListener, OnSceneLoadedListener {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import java.lang.ref.WeakReference;
 import java.util.Collection;
@@ -18,40 +18,40 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.AttackResult;
-import com.gpl.rpg.AndorsTrail_beta2.controller.CombatController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListener;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatTurnListener;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerMovementListener;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.WorldEventListener;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CombatView;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
-import com.gpl.rpg.AndorsTrail_beta2.view.DisplayActiveActorConditionIcons;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta2.view.MainView;
-import com.gpl.rpg.AndorsTrail_beta2.view.QuickButton;
-import com.gpl.rpg.AndorsTrail_beta2.view.QuickitemView;
-import com.gpl.rpg.AndorsTrail_beta2.view.QuickslotsItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta2.view.StatusView;
-import com.gpl.rpg.AndorsTrail_beta2.view.ToolboxView;
-import com.gpl.rpg.AndorsTrail_beta2.view.VirtualDpadView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.AttackResult;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListener;
+import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListener;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CombatView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.view.DisplayActiveActorConditionIcons;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.MainView;
+import com.gpl.rpg.AndorsTrail.view.QuickButton;
+import com.gpl.rpg.AndorsTrail.view.QuickitemView;
+import com.gpl.rpg.AndorsTrail.view.QuickslotsItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.StatusView;
+import com.gpl.rpg.AndorsTrail.view.ToolboxView;
+import com.gpl.rpg.AndorsTrail.view.VirtualDpadView;
 
 public final class MainActivity
 		extends AndorsTrailBaseActivity

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MonsterEncounterActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -7,13 +7,13 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class MonsterEncounterActivity extends AndorsTrailBaseActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/MonsterInfoActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.view.View;
@@ -8,16 +8,16 @@ import android.view.Window;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
-import com.gpl.rpg.AndorsTrail_beta2.view.RangeBar;
-import com.gpl.rpg.AndorsTrail_beta2.view.TraitsInfoView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.view.RangeBar;
+import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
 public final class MonsterInfoActivity extends AndorsTrailBaseActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/Preferences.java

@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.os.Bundle;
 import android.preference.PreferenceActivity;
 import android.view.Window;
 import android.view.WindowManager;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class Preferences extends PreferenceActivity {
 	@Override

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/ShopActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.res.Resources;
 import android.os.Bundle;
@@ -8,11 +8,11 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.ShopActivity_Buy;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.ShopActivity_Sell;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Buy;
+import com.gpl.rpg.AndorsTrail.activity.fragment.ShopActivity_Sell;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class ShopActivity extends AndorsTrailBaseFragmentActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/SkillInfoActivity.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
 import android.content.Intent;
 import android.content.res.Resources;
@@ -10,15 +10,15 @@ import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo.SkillLevelRequirement;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo.SkillLevelRequirement;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
 
 public final class SkillInfoActivity extends AndorsTrailBaseActivity {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/StartScreenActivity.java

@@ -1,16 +1,16 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity;
+package com.gpl.rpg.AndorsTrail.activity;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_NewGame;
-import com.gpl.rpg.AndorsTrail_beta2.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CloudsAnimatorView;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_MainMenu.OnNewGameRequestedListener;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame;
+import com.gpl.rpg.AndorsTrail.activity.fragment.StartScreenActivity_NewGame.GameCreationOverListener;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CloudsAnimatorView;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 import android.app.Activity;
 import android.app.Dialog;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.Arrays;
 
@@ -21,22 +21,22 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.HeroCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomMenuInflater;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.CustomMenuInflater;
+import com.gpl.rpg.AndorsTrail.view.ItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public final class HeroinfoActivity_Inventory extends Fragment implements CustomMenuInflater.MenuItemSelectedListener {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Quests.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -15,13 +15,13 @@ import android.view.ViewGroup;
 import android.widget.ExpandableListView;
 import android.widget.SimpleExpandableListAdapter;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.Quest;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.quest.Quest;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public final class HeroinfoActivity_Quests extends Fragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Skills.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 
@@ -14,15 +14,15 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.ListView;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.view.SkillListAdapter;
-import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.view.SkillListAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 public final class HeroinfoActivity_Skills extends Fragment {
 
 	private static final int INTENTREQUEST_SKILLINFO = 12;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Stats.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.ArrayList;
 
@@ -15,20 +15,20 @@ import android.widget.TableLayout;
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.GameStatistics;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.HeroCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.view.ItemEffectsView;
-import com.gpl.rpg.AndorsTrail_beta2.view.RangeBar;
-import com.gpl.rpg.AndorsTrail_beta2.view.TraitsInfoView;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.GameStatistics;
+import com.gpl.rpg.AndorsTrail.model.actor.HeroCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.view.ItemEffectsView;
+import com.gpl.rpg.AndorsTrail.view.RangeBar;
+import com.gpl.rpg.AndorsTrail.view.TraitsInfoView;
 
 public final class HeroinfoActivity_Stats extends Fragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivityFragment.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import java.util.HashSet;
 
@@ -13,17 +13,17 @@ import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.view.ShopItemContainerAdapter;
-import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
-import com.gpl.rpg.AndorsTrail_beta2.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.view.ShopItemContainerAdapter.OnContainerItemClickedListener;
 
 public abstract class ShopActivityFragment extends Fragment implements OnContainerItemClickedListener {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Buy.java

@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
 public final class ShopActivity_Buy extends ShopActivityFragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/ShopActivity_Sell.java

@@ -1,13 +1,13 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
 
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.ItemInfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.ItemInfoActivity;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
 
 public final class ShopActivity_Sell extends ShopActivityFragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_MainMenu.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.Manifest;
 import android.annotation.SuppressLint;
@@ -22,22 +22,22 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.Dialogs;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta2.activity.AboutActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.LoadingActivity;
-import com.gpl.rpg.AndorsTrail_beta2.activity.Preferences;
-import com.gpl.rpg.AndorsTrail_beta2.controller.Constants;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames;
-import com.gpl.rpg.AndorsTrail_beta2.savegames.Savegames.FileHeader;
-import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
-import com.gpl.rpg.AndorsTrail_beta2.util.ThemeHelper;
-import com.gpl.rpg.AndorsTrail_beta2.view.CustomDialogFactory;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.Dialogs;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.AboutActivity;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.activity.Preferences;
+import com.gpl.rpg.AndorsTrail.controller.Constants;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames;
+import com.gpl.rpg.AndorsTrail.savegames.Savegames.FileHeader;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.ThemeHelper;
+import com.gpl.rpg.AndorsTrail.view.CustomDialogFactory;
 
 public class StartScreenActivity_MainMenu extends Fragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/activity/fragment/StartScreenActivity_NewGame.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.activity.fragment;
+package com.gpl.rpg.AndorsTrail.activity.fragment;
 
 import android.app.Activity;
 import android.content.Intent;
@@ -15,12 +15,12 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ToggleButton;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.WorldSetup;
-import com.gpl.rpg.AndorsTrail_beta2.activity.LoadingActivity;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.view.SpinnerEmulator;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.WorldSetup;
+import com.gpl.rpg.AndorsTrail.activity.LoadingActivity;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.view.SpinnerEmulator;
 
 public class StartScreenActivity_NewGame extends Fragment {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/context/ControllerContext.java

@@ -1,24 +1,24 @@
-package com.gpl.rpg.AndorsTrail_beta2.context;
+package com.gpl.rpg.AndorsTrail.context;
 
 import java.lang.ref.WeakReference;
 
 import android.content.Context;
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ActorStatsController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.CombatController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ConversationController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.GameRoundController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.InputController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.ItemController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.MapController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.MonsterMovementController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.MonsterSpawningController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.MovementController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.SkillController;
-import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.controller.ActorStatsController;
+import com.gpl.rpg.AndorsTrail.controller.CombatController;
+import com.gpl.rpg.AndorsTrail.controller.ConversationController;
+import com.gpl.rpg.AndorsTrail.controller.GameRoundController;
+import com.gpl.rpg.AndorsTrail.controller.InputController;
+import com.gpl.rpg.AndorsTrail.controller.ItemController;
+import com.gpl.rpg.AndorsTrail.controller.MapController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterMovementController;
+import com.gpl.rpg.AndorsTrail.controller.MonsterSpawningController;
+import com.gpl.rpg.AndorsTrail.controller.MovementController;
+import com.gpl.rpg.AndorsTrail.controller.SkillController;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController;
 
 public final class ControllerContext {
 	//Controllers

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/context/WorldContext.java

@@ -1,17 +1,17 @@
-package com.gpl.rpg.AndorsTrail_beta2.context;
+package com.gpl.rpg.AndorsTrail.context;
 
-import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.DropListCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemCategoryCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestCollection;
-import com.gpl.rpg.AndorsTrail_beta2.resource.ConversationLoader;
-import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.DropListCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategoryCollection;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.map.MapCollection;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestCollection;
+import com.gpl.rpg.AndorsTrail.resource.ConversationLoader;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
 
 public final class WorldContext {
 	//Objectcollections

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ActorStatsController.java

@@ -1,31 +1,31 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.ActorConditionListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.ActorStatsListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerStatsListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.StatsModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnEquip;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorConditionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.ActorStatsListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerStatsListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.StatsModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnEquip;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
 
 public final class ActorStatsController {
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/AttackResult.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 public final class AttackResult {
 	public final boolean isHit;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/CombatController.java

@@ -1,30 +1,30 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
 import android.os.Handler;
 import android.os.Message;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.VisualEffectController.VisualEffectCompletedCallback;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatSelectionListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatTurnListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.VisualEffectController.VisualEffectCompletedCallback;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatSelectionListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatTurnListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 import static java.lang.Math.max;
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/Constants.java

@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.Random;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta2.util.Range;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.Range;
 
 public final class Constants {
 	public static final int PERCENT_EXP_LOST_WHEN_DIED = 30;
@@ -23,8 +23,8 @@ public final class Constants {
 	public static final long MINIMUM_INPUT_INTERVAL_STD = 200;
 	//TODO restore final modifier before release
 	public static long MINIMUM_INPUT_INTERVAL = AndorsTrailApplication.DEVELOPMENT_FASTSPEED ? MINIMUM_INPUT_INTERVAL_FAST : MINIMUM_INPUT_INTERVAL_STD;
-	public static final int MAX_MAP_WIDTH = 46;
-	public static final int MAX_MAP_HEIGHT = 46;
+	public static final int MAX_MAP_WIDTH = 33;
+	public static final int MAX_MAP_HEIGHT = 33;
 
 	public static final int MONSTER_MOVEMENT_TURN_DURATION_MS = 1200;
 	public static final int MONSTER_IMMOBILE_MOVE_COST = 999;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ConversationController.java

@@ -1,35 +1,35 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.GameStatistics;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.conversation.ConversationCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Phrase;
-import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestLogEntry;
-import com.gpl.rpg.AndorsTrail_beta2.model.quest.QuestProgress;
-import com.gpl.rpg.AndorsTrail_beta2.model.script.Requirement;
-import com.gpl.rpg.AndorsTrail_beta2.model.script.ScriptEffect;
-import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.GameStatistics;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.ConversationCollection;
+import com.gpl.rpg.AndorsTrail.model.conversation.Phrase;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestLogEntry;
+import com.gpl.rpg.AndorsTrail.model.quest.QuestProgress;
+import com.gpl.rpg.AndorsTrail.model.script.Requirement;
+import com.gpl.rpg.AndorsTrail.model.script.ScriptEffect;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class ConversationController {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/GameRoundController.java

@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.GameRoundListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.util.TimedMessageTask;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.GameRoundListeners;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class GameRoundController implements TimedMessageTask.Callback {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/InputController.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.Context;
 import android.content.Intent;
@@ -8,11 +8,11 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.View.OnLongClickListener;
 
-import com.gpl.rpg.AndorsTrail_beta2.activity.HeroinfoActivity;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
+import com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
 
 public final class InputController implements OnClickListener, OnLongClickListener{
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/ItemController.java

@@ -1,24 +1,24 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.QuickSlotListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.traits.AbilityModifierTraits;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemContainer.ItemEntry;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnHitReceived;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTraits_OnUse;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.QuickSlotListeners;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.traits.AbilityModifierTraits;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer;
+import com.gpl.rpg.AndorsTrail.model.item.ItemContainer.ItemEntry;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnHitReceived;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTraits_OnUse;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
 
 import static java.lang.Math.min;
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MapController.java

@@ -1,23 +1,23 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.List;
 
 import android.content.res.Resources;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MapLayoutListeners;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.WorldEventListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.conversation.Reply;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.ReplaceableMapSection;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MapLayoutListeners;
+import com.gpl.rpg.AndorsTrail.controller.listeners.WorldEventListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.conversation.Reply;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.ReplaceableMapSection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
 
 public final class MapController {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MonsterMovementController.java

@@ -1,18 +1,18 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.PathFinder.EvaluateWalkable;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MonsterMovementListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.PathFinder.EvaluateWalkable;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterMovementListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public final class MonsterMovementController implements EvaluateWalkable {
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MonsterSpawningController.java

@@ -1,16 +1,16 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.MonsterSpawnListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta2.util.Size;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.MonsterSpawnListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class MonsterSpawningController {
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/MovementController.java

@@ -1,26 +1,26 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.content.res.Resources;
 import android.os.AsyncTask;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.PlayerMovementListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.MapBundle;
-import com.gpl.rpg.AndorsTrail_beta2.model.ModelContainer;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Loot;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapObject;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MonsterSpawnArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.TMXMapTranslator;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
-import com.gpl.rpg.AndorsTrail_beta2.util.TimedMessageTask;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.PlayerMovementListeners;
+import com.gpl.rpg.AndorsTrail.model.MapBundle;
+import com.gpl.rpg.AndorsTrail.model.ModelContainer;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.Loot;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapObject;
+import com.gpl.rpg.AndorsTrail.model.map.MonsterSpawnArea;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.TMXMapTranslator;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.TimedMessageTask;
 
 public final class MovementController implements TimedMessageTask.Callback {
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/PathFinder.java

@@ -1,10 +1,10 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.util.Arrays;
 
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
 
 public class PathFinder {
 	private final int maxWidth;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/SkillController.java

@@ -1,22 +1,22 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.CombatActionListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionEffect;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorConditionType;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillCollection.SkillID;
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.SkillInfo;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.DropList.DropItem;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.Inventory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemCategory;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemType;
-import com.gpl.rpg.AndorsTrail_beta2.model.item.ItemTypeCollection;
-import com.gpl.rpg.AndorsTrail_beta2.util.ConstRange;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.CombatActionListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionEffect;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorConditionType;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillCollection.SkillID;
+import com.gpl.rpg.AndorsTrail.model.ability.SkillInfo;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.item.DropList.DropItem;
+import com.gpl.rpg.AndorsTrail.model.item.Inventory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemCategory;
+import com.gpl.rpg.AndorsTrail.model.item.ItemType;
+import com.gpl.rpg.AndorsTrail.model.item.ItemTypeCollection;
+import com.gpl.rpg.AndorsTrail.util.ConstRange;
 
 public final class SkillController {
 	private final ControllerContext controllers;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/VisualEffectController.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import android.graphics.Color;
 import android.graphics.Paint;
@@ -6,20 +6,20 @@ import android.graphics.Paint.Align;
 import android.graphics.Rect;
 import android.os.Handler;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailPreferences;
-import com.gpl.rpg.AndorsTrail_beta2.context.ControllerContext;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.controller.listeners.VisualEffectFrameListeners;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Monster;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.MonsterType;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection;
-import com.gpl.rpg.AndorsTrail_beta2.resource.VisualEffectCollection.VisualEffect;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileManager;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta2.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailPreferences;
+import com.gpl.rpg.AndorsTrail.context.ControllerContext;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.controller.listeners.VisualEffectFrameListeners;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Monster;
+import com.gpl.rpg.AndorsTrail.model.actor.MonsterType;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection;
+import com.gpl.rpg.AndorsTrail.resource.VisualEffectCollection.VisualEffect;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileManager;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class VisualEffectController {
 	private int effectCount = 0;

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/WorldMapController.java

@@ -1,4 +1,4 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller;
+package com.gpl.rpg.AndorsTrail.controller;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -18,22 +18,22 @@ import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.widget.Toast;
 
-import com.gpl.rpg.AndorsTrail_beta2.AndorsTrailApplication;
-import com.gpl.rpg.AndorsTrail_beta2.R;
-import com.gpl.rpg.AndorsTrail_beta2.activity.DisplayWorldMapActivity;
-import com.gpl.rpg.AndorsTrail_beta2.context.WorldContext;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.LayeredTileMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.MapLayer;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.PredefinedMap;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.NamedWorldMapArea;
-import com.gpl.rpg.AndorsTrail_beta2.model.map.WorldMapSegment.WorldMapSegmentMap;
-import com.gpl.rpg.AndorsTrail_beta2.resource.tiles.TileCollection;
-import com.gpl.rpg.AndorsTrail_beta2.util.AndroidStorage;
-import com.gpl.rpg.AndorsTrail_beta2.util.Coord;
-import com.gpl.rpg.AndorsTrail_beta2.util.CoordRect;
-import com.gpl.rpg.AndorsTrail_beta2.util.L;
-import com.gpl.rpg.AndorsTrail_beta2.util.Size;
+import com.gpl.rpg.AndorsTrail.AndorsTrailApplication;
+import com.gpl.rpg.AndorsTrail.R;
+import com.gpl.rpg.AndorsTrail.activity.DisplayWorldMapActivity;
+import com.gpl.rpg.AndorsTrail.context.WorldContext;
+import com.gpl.rpg.AndorsTrail.model.map.LayeredTileMap;
+import com.gpl.rpg.AndorsTrail.model.map.MapLayer;
+import com.gpl.rpg.AndorsTrail.model.map.PredefinedMap;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.NamedWorldMapArea;
+import com.gpl.rpg.AndorsTrail.model.map.WorldMapSegment.WorldMapSegmentMap;
+import com.gpl.rpg.AndorsTrail.resource.tiles.TileCollection;
+import com.gpl.rpg.AndorsTrail.util.AndroidStorage;
+import com.gpl.rpg.AndorsTrail.util.Coord;
+import com.gpl.rpg.AndorsTrail.util.CoordRect;
+import com.gpl.rpg.AndorsTrail.util.L;
+import com.gpl.rpg.AndorsTrail.util.Size;
 
 public final class WorldMapController {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListener.java

@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
 
 public interface ActorConditionListener {
 	public void onActorConditionAdded(Actor actor, ActorCondition condition);

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorConditionListeners.java

@@ -1,8 +1,8 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta2.model.ability.ActorCondition;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.util.ListOfListeners;
+import com.gpl.rpg.AndorsTrail.model.ability.ActorCondition;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.util.ListOfListeners;
 
 public final class ActorConditionListeners extends ListOfListeners<ActorConditionListener> implements ActorConditionListener {
 

AndorsTrail/app/src/main/java/com/gpl/rpg/AndorsTrail/controller/listeners/ActorStatsListener.java

@@ -1,7 +1,7 @@
-package com.gpl.rpg.AndorsTrail_beta2.controller.listeners;
+package com.gpl.rpg.AndorsTrail.controller.listeners;
 
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Actor;
-import com.gpl.rpg.AndorsTrail_beta2.model.actor.Player;
+import com.gpl.rpg.AndorsTrail.model.actor.Actor;
+import com.gpl.rpg.AndorsTrail.model.actor.Player;
 
 public interface ActorStatsListener {
 	void onActorHealthChanged(Actor actor);