From eefd86503b38cb72df2979c4f9f4ce78aa644894 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt.verdnatura@gmail.com>
Date: Tue, 6 Jun 2023 07:26:54 +0200
Subject: [PATCH] version 23.22

---
 .idea/modules/app/vn-delivery.app.iml         |   6 +-
 .idea/modules/app/vn-delivery.app.main.iml    |  10 +-
 .../modules/app/vn-delivery.app.unitTest.iml  |  20 +--
 .idea/workspace.xml                           |  27 ++--
 app/build.gradle                              |   8 +-
 .../es/repartoverdnatura/MainActivity.java    |   6 +-
 app/src/main/res/values-pt/strings.xml        | 142 +++++++++---------
 7 files changed, 110 insertions(+), 109 deletions(-)

diff --git a/.idea/modules/app/vn-delivery.app.iml b/.idea/modules/app/vn-delivery.app.iml
index 07886b3..60e51f8 100644
--- a/.idea/modules/app/vn-delivery.app.iml
+++ b/.idea/modules/app/vn-delivery.app.iml
@@ -10,12 +10,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="alfaDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="betaDebug" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/alfa/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/alfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/alfa/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfa/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/alfa/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/beta/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/betaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/beta/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestBeta/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestBetaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/beta/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
diff --git a/.idea/modules/app/vn-delivery.app.main.iml b/.idea/modules/app/vn-delivery.app.main.iml
index a79dd31..1bb5f59 100644
--- a/.idea/modules/app/vn-delivery.app.main.iml
+++ b/.idea/modules/app/vn-delivery.app.main.iml
@@ -7,11 +7,11 @@
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/alfaDebug" />
+          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/betaDebug" />
           <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/24678e0e6c434f64700cf77d8e77956e/multidex-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f62345edbdf6878deadef9f65e989cc/firebase-inappmessaging-display-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a46e112ee9740241e4e88679f090604f/dagger-android-support-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88c0222d9001e81be4ec8248a677aa70/appcompat-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8357e963b04ec3d0864b0f023a9f943/recyclerview-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/29795646546094df3fde239a549820c6/firebase-core-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/7385f8a1def5be3b40264c6ef366e70e/firebase-measurement-connector-impl-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/ae3593ec92063dbf12f177fa248cac93/firebase-analytics-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/72477d242253c17de810f25e048aa4fd/firebase-inappmessaging-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f5a6d2fea3a09d4615ab8d7cdf0e7400/firebase-analytics-impl-16.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88515ad79691dfd14ca3a2b5817758fa/firebase-iid-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/1ffa650cc26e6ab60128bb475d2f015e/firebase-common-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a4c303d74aeadd342034bd99aecaa1be/play-services-stats-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/68f37c0e259530f808198b45c3075239/firebase-measurement-connector-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c27a39e6363cea255e8f408778861590/play-services-clearcut-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5cb2d34ce13a63989520819eec2bfe51/play-services-phenotype-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/286ab05abee4eaf46c0fae750b9603b4/firebase-iid-interop-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b4d8c9bd383252da6cb653b35bd3472c/play-services-base-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e427af849bc6838f9292c52b9ed673e4/play-services-tasks-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/052b7c6ef2a842b0bb9c599086d43d14/play-services-ads-identifier-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6d3f00ed235e8dfe931c421d52d72c0a/play-services-basement-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8bff76e23f9494813d89bd3df60a0d8/support-v4-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/279cab345c4ab8d15a92228a32c320a2/support-fragment-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3918ec52ad7bbc3967750b6119cfd94e/animated-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2e05b10a89db85a189c12a4a8155f2c8/customtabs-27.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/fe88c30f8b67d4315bf734969bfd8274/support-core-ui-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/85ac079d5d65163a723a3762eb098015/support-core-utils-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c90228c0a26f155825f0c88fb9fc9bc9/support-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/46c7a1ac54cfb951e45d2acc46434941/loader-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2b1b58dca386bfb6cbf8f706b005935a/viewpager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f01a7894de6b681084f37d1e2cc01447/coordinatorlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/377c81ecf8901344247e71b578413791/drawerlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a75dd9e6a6f490fedbe76e42c417ff1f/slidingpanelayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bde3bde7da7707d463979244d15f43b8/customview-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bdead750af7ba3c871eaac61a88ba481/swiperefreshlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6cc31adb3c448a6979c970b445370fb4/asynclayoutinflater-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e2353780e93aeaad4f8e49da74e2f2cc/support-media-compat-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d526fa61dcc2035dcda20548dd08edfd/support-compat-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a9e05a510a5250a9d1b4c15434a70c8d/versionedparcelable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5dbd81b632a700e3f9d10c6d3a76594e/cursoradapter-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/4e618266d26df25ab5f76ce89700cc5f/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2f80ce68b9dbe1706f4548ba03997e4e/documentfile-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/35edf416fed54baa0e29d114033fce08/localbroadcastmanager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6dc934d89310458aa467bce5019cacd5/print-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a6c618c27f165adab478a8a78e390426/viewmodel-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5ca5119e872a89cdeb9722611e1c16b0/interpolator-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a798b117f18cd95f9eec0b73feba20b5/dagger-android-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/97273e080923e0b7923ec0aabee8efc0/livedata-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3fe5687f16f4029af55f90678329903b/livedata-core-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b3c7b8dc8b966a3e97ccbd3f016ef389/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9a3effa40db9286cd5e1dcb7d2dde6d7/constraint-layout-1.1.3-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.0.2/f8d87f15b94b8d74e7ccf61d7eedb558811cdb30/converter-gson-2.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.3.0/1eaa5762cb25c31b1905e2bfdfef70a2e0495ea6/converter-scalars-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/bcacde6a8ccedcc56c127403d26b76072fe6214d/retrofit-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.0/5a11f020cce2d11eb71ba916700600e18c4547e7/okhttp-3.8.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-okhttp/1.12.0/3fdb2c85587702865b464b2f6faabf7e2e294a3d/grpc-okhttp-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.7.5/7a15a7db50f86c4b64aa3367424a60e3a325b8f1/okhttp-2.7.5.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-protobuf-lite/1.12.0/f5bebfbd5e93b8bbb58888a5cfaa9f490fb7b455/grpc-protobuf-lite-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-stub/1.12.0/fbd2bafe09a89442ab3d7a8d8b3e8bafbd59b4e0/grpc-stub-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.12.0/541a5c68ce85c03190e29bc9e0ec611d2b75ff24/grpc-core-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/de4f537f5e3927c41a0848a5cccb9ebd/ink-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/12c37208696163284a88b03ae92ad268/play-services-measurement-base-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value-annotations/1.6/da725083ee79fdcd86d9f3d8a76e38174a01892a/auto-value-annotations-1.6.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.13/37dc0fc55b65aa10f6e1edc4691a1231c904cfb1/dagger-2.13.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f836f9cb1e756f7349962d875473d85/protolite-well-known-types-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-lite/3.0.1/59b5b9c6e1a3054696d23492f888c1f8b583f5fc/protobuf-lite-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-context/1.12.0/5b63a170b786051a42cce08118d5ea3c8f60f749/grpc-context-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.2/6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c/error_prone_annotations-2.1.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-contrib-grpc-metrics/0.11.0/d57b877f1a28a613452d45e35c7faae5af585258/opencensus-contrib-grpc-metrics-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-api/0.11.0/c1ff1f0d737a689d900a3e2113ddc29847188c64/opencensus-api-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/8fbd830426c23158946def82cf2418ee/rxandroid-2.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.14/20dbf7496e417da474eda12717bf4653dbbd5a6b/rxjava-2.1.14.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.2/7446d06ec8d4f7ffcc53f1da37c95f200dcb9387/picasso-2.5.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/sergiodt/AppData/Local/Android/Sdk/platforms/android-28/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="app_alfaDebug" />
+          <option name="moduleName" value="app_betaDebug" />
           <option name="jvmTarget" value="1.6" />
           <option name="friendPaths">
             <array />
@@ -32,12 +32,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="alfaDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="betaDebug" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/alfa/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/alfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/alfa/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfa/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/alfa/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/beta/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/betaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/beta/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestBeta/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestBetaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/beta/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
diff --git a/.idea/modules/app/vn-delivery.app.unitTest.iml b/.idea/modules/app/vn-delivery.app.unitTest.iml
index 0e6eaec..7a51b20 100644
--- a/.idea/modules/app/vn-delivery.app.unitTest.iml
+++ b/.idea/modules/app/vn-delivery.app.unitTest.iml
@@ -3,12 +3,12 @@
   <component name="FacetManager">
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="alfaDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="betaDebug" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/alfa/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/alfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/alfa/debug" />
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfa/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestAlfaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/alfa/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/alfa/debug" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/main/res;file://$MODULE_DIR$/../../../app/src/beta/res;file://$MODULE_DIR$/../../../app/src/debug/res;file://$MODULE_DIR$/../../../app/src/betaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/google-services/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/rs/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/beta/debug" />
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/../../../app/src/androidTest/res;file://$MODULE_DIR$/../../../app/src/androidTestBeta/res;file://$MODULE_DIR$/../../../app/src/androidTestDebug/res;file://$MODULE_DIR$/../../../app/src/androidTestBetaDebug/res;file://$MODULE_DIR$/../../../app/build/generated/res/rs/androidTest/beta/debug;file://$MODULE_DIR$/../../../app/build/generated/res/resValues/androidTest/beta/debug" />
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
       </configuration>
     </facet>
@@ -18,18 +18,18 @@
           <option name="additionalArguments" value="-Xallow-no-source-files" />
         </compilerSettings>
         <compilerArguments>
-          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/alfaDebugUnitTest" />
-          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f62345edbdf6878deadef9f65e989cc/firebase-inappmessaging-display-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a46e112ee9740241e4e88679f090604f/dagger-android-support-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88c0222d9001e81be4ec8248a677aa70/appcompat-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8357e963b04ec3d0864b0f023a9f943/recyclerview-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/29795646546094df3fde239a549820c6/firebase-core-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/7385f8a1def5be3b40264c6ef366e70e/firebase-measurement-connector-impl-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/ae3593ec92063dbf12f177fa248cac93/firebase-analytics-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/72477d242253c17de810f25e048aa4fd/firebase-inappmessaging-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f5a6d2fea3a09d4615ab8d7cdf0e7400/firebase-analytics-impl-16.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88515ad79691dfd14ca3a2b5817758fa/firebase-iid-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/1ffa650cc26e6ab60128bb475d2f015e/firebase-common-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a4c303d74aeadd342034bd99aecaa1be/play-services-stats-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/68f37c0e259530f808198b45c3075239/firebase-measurement-connector-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c27a39e6363cea255e8f408778861590/play-services-clearcut-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5cb2d34ce13a63989520819eec2bfe51/play-services-phenotype-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/286ab05abee4eaf46c0fae750b9603b4/firebase-iid-interop-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b4d8c9bd383252da6cb653b35bd3472c/play-services-base-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e427af849bc6838f9292c52b9ed673e4/play-services-tasks-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/052b7c6ef2a842b0bb9c599086d43d14/play-services-ads-identifier-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6d3f00ed235e8dfe931c421d52d72c0a/play-services-basement-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8bff76e23f9494813d89bd3df60a0d8/support-v4-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/279cab345c4ab8d15a92228a32c320a2/support-fragment-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3918ec52ad7bbc3967750b6119cfd94e/animated-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2e05b10a89db85a189c12a4a8155f2c8/customtabs-27.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/fe88c30f8b67d4315bf734969bfd8274/support-core-ui-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/85ac079d5d65163a723a3762eb098015/support-core-utils-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c90228c0a26f155825f0c88fb9fc9bc9/support-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/46c7a1ac54cfb951e45d2acc46434941/loader-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2b1b58dca386bfb6cbf8f706b005935a/viewpager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f01a7894de6b681084f37d1e2cc01447/coordinatorlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/377c81ecf8901344247e71b578413791/drawerlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a75dd9e6a6f490fedbe76e42c417ff1f/slidingpanelayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bde3bde7da7707d463979244d15f43b8/customview-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bdead750af7ba3c871eaac61a88ba481/swiperefreshlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6cc31adb3c448a6979c970b445370fb4/asynclayoutinflater-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e2353780e93aeaad4f8e49da74e2f2cc/support-media-compat-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d526fa61dcc2035dcda20548dd08edfd/support-compat-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a9e05a510a5250a9d1b4c15434a70c8d/versionedparcelable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5dbd81b632a700e3f9d10c6d3a76594e/cursoradapter-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/4e618266d26df25ab5f76ce89700cc5f/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2f80ce68b9dbe1706f4548ba03997e4e/documentfile-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/35edf416fed54baa0e29d114033fce08/localbroadcastmanager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6dc934d89310458aa467bce5019cacd5/print-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a6c618c27f165adab478a8a78e390426/viewmodel-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5ca5119e872a89cdeb9722611e1c16b0/interpolator-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a798b117f18cd95f9eec0b73feba20b5/dagger-android-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/97273e080923e0b7923ec0aabee8efc0/livedata-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3fe5687f16f4029af55f90678329903b/livedata-core-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b3c7b8dc8b966a3e97ccbd3f016ef389/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9a3effa40db9286cd5e1dcb7d2dde6d7/constraint-layout-1.1.3-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.0.2/f8d87f15b94b8d74e7ccf61d7eedb558811cdb30/converter-gson-2.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.3.0/1eaa5762cb25c31b1905e2bfdfef70a2e0495ea6/converter-scalars-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/bcacde6a8ccedcc56c127403d26b76072fe6214d/retrofit-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.0/5a11f020cce2d11eb71ba916700600e18c4547e7/okhttp-3.8.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-okhttp/1.12.0/3fdb2c85587702865b464b2f6faabf7e2e294a3d/grpc-okhttp-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.7.5/7a15a7db50f86c4b64aa3367424a60e3a325b8f1/okhttp-2.7.5.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-protobuf-lite/1.12.0/f5bebfbd5e93b8bbb58888a5cfaa9f490fb7b455/grpc-protobuf-lite-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-stub/1.12.0/fbd2bafe09a89442ab3d7a8d8b3e8bafbd59b4e0/grpc-stub-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.12.0/541a5c68ce85c03190e29bc9e0ec611d2b75ff24/grpc-core-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/de4f537f5e3927c41a0848a5cccb9ebd/ink-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/12c37208696163284a88b03ae92ad268/play-services-measurement-base-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value-annotations/1.6/da725083ee79fdcd86d9f3d8a76e38174a01892a/auto-value-annotations-1.6.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.13/37dc0fc55b65aa10f6e1edc4691a1231c904cfb1/dagger-2.13.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f836f9cb1e756f7349962d875473d85/protolite-well-known-types-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-lite/3.0.1/59b5b9c6e1a3054696d23492f888c1f8b583f5fc/protobuf-lite-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-context/1.12.0/5b63a170b786051a42cce08118d5ea3c8f60f749/grpc-context-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.2/6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c/error_prone_annotations-2.1.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-contrib-grpc-metrics/0.11.0/d57b877f1a28a613452d45e35c7faae5af585258/opencensus-contrib-grpc-metrics-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-api/0.11.0/c1ff1f0d737a689d900a3e2113ddc29847188c64/opencensus-api-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/8fbd830426c23158946def82cf2418ee/rxandroid-2.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.14/20dbf7496e417da474eda12717bf4653dbbd5a6b/rxjava-2.1.14.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.2/7446d06ec8d4f7ffcc53f1da37c95f200dcb9387/picasso-2.5.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;C:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/build/intermediates/javac/alfaDebug/classes;C:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/build/tmp/kotlin-classes/alfaDebug;C:/Users/sergiodt/AppData/Local/Android/Sdk/platforms/android-28/android.jar" />
+          <option name="destination" value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/betaDebugUnitTest" />
+          <option name="classpath" value="$USER_HOME$/.gradle/caches/transforms-2/files-2.1/9f62345edbdf6878deadef9f65e989cc/firebase-inappmessaging-display-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a46e112ee9740241e4e88679f090604f/dagger-android-support-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88c0222d9001e81be4ec8248a677aa70/appcompat-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8357e963b04ec3d0864b0f023a9f943/recyclerview-v7-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/29795646546094df3fde239a549820c6/firebase-core-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/7385f8a1def5be3b40264c6ef366e70e/firebase-measurement-connector-impl-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/ae3593ec92063dbf12f177fa248cac93/firebase-analytics-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/72477d242253c17de810f25e048aa4fd/firebase-inappmessaging-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f5a6d2fea3a09d4615ab8d7cdf0e7400/firebase-analytics-impl-16.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/88515ad79691dfd14ca3a2b5817758fa/firebase-iid-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/1ffa650cc26e6ab60128bb475d2f015e/firebase-common-16.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a4c303d74aeadd342034bd99aecaa1be/play-services-stats-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/68f37c0e259530f808198b45c3075239/firebase-measurement-connector-17.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c27a39e6363cea255e8f408778861590/play-services-clearcut-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5cb2d34ce13a63989520819eec2bfe51/play-services-phenotype-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/286ab05abee4eaf46c0fae750b9603b4/firebase-iid-interop-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b4d8c9bd383252da6cb653b35bd3472c/play-services-base-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e427af849bc6838f9292c52b9ed673e4/play-services-tasks-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/052b7c6ef2a842b0bb9c599086d43d14/play-services-ads-identifier-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6d3f00ed235e8dfe931c421d52d72c0a/play-services-basement-15.0.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d8bff76e23f9494813d89bd3df60a0d8/support-v4-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/279cab345c4ab8d15a92228a32c320a2/support-fragment-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3918ec52ad7bbc3967750b6119cfd94e/animated-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2e05b10a89db85a189c12a4a8155f2c8/customtabs-27.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/fe88c30f8b67d4315bf734969bfd8274/support-core-ui-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/85ac079d5d65163a723a3762eb098015/support-core-utils-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/c90228c0a26f155825f0c88fb9fc9bc9/support-vector-drawable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/46c7a1ac54cfb951e45d2acc46434941/loader-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2b1b58dca386bfb6cbf8f706b005935a/viewpager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/f01a7894de6b681084f37d1e2cc01447/coordinatorlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/377c81ecf8901344247e71b578413791/drawerlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a75dd9e6a6f490fedbe76e42c417ff1f/slidingpanelayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bde3bde7da7707d463979244d15f43b8/customview-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/bdead750af7ba3c871eaac61a88ba481/swiperefreshlayout-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6cc31adb3c448a6979c970b445370fb4/asynclayoutinflater-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/e2353780e93aeaad4f8e49da74e2f2cc/support-media-compat-26.1.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/d526fa61dcc2035dcda20548dd08edfd/support-compat-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a9e05a510a5250a9d1b4c15434a70c8d/versionedparcelable-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/collections/28.0.0/c1bcdade4d3cc2836130424a3f3e4182c666a745/collections-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5dbd81b632a700e3f9d10c6d3a76594e/cursoradapter-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/4e618266d26df25ab5f76ce89700cc5f/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/2f80ce68b9dbe1706f4548ba03997e4e/documentfile-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/35edf416fed54baa0e29d114033fce08/localbroadcastmanager-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/6dc934d89310458aa467bce5019cacd5/print-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a6c618c27f165adab478a8a78e390426/viewmodel-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/5ca5119e872a89cdeb9722611e1c16b0/interpolator-28.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/a798b117f18cd95f9eec0b73feba20b5/dagger-android-2.13-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/97273e080923e0b7923ec0aabee8efc0/livedata-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/3fe5687f16f4029af55f90678329903b/livedata-core-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.lifecycle/common/1.1.1/207a6efae6a3555e326de41f76bdadd9a239cbce/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/b3c7b8dc8b966a3e97ccbd3f016ef389/runtime-1.1.1-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/android.arch.core/common/1.1.1/e55b70d1f5620db124b3e85a7f4bdc7bd48d9f95/common-1.1.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support/support-annotations/28.0.0/ed73f5337a002d1fd24339d5fb08c2c9d9ca60d8/support-annotations-28.0.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9a3effa40db9286cd5e1dcb7d2dde6d7/constraint-layout-1.1.3-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.android.support.constraint/constraint-layout-solver/1.1.3/bde0667d7414c16ed62d3cfe993cff7f9d732373/constraint-layout-solver-1.1.3.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-gson/2.0.2/f8d87f15b94b8d74e7ccf61d7eedb558811cdb30/converter-gson-2.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/converter-scalars/2.3.0/1eaa5762cb25c31b1905e2bfdfef70a2e0495ea6/converter-scalars-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.retrofit2/retrofit/2.3.0/bcacde6a8ccedcc56c127403d26b76072fe6214d/retrofit-2.3.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp3/okhttp/3.8.0/5a11f020cce2d11eb71ba916700600e18c4547e7/okhttp-3.8.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-okhttp/1.12.0/3fdb2c85587702865b464b2f6faabf7e2e294a3d/grpc-okhttp-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okhttp/okhttp/2.7.5/7a15a7db50f86c4b64aa3367424a60e3a325b8f1/okhttp-2.7.5.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-protobuf-lite/1.12.0/f5bebfbd5e93b8bbb58888a5cfaa9f490fb7b455/grpc-protobuf-lite-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-stub/1.12.0/fbd2bafe09a89442ab3d7a8d8b3e8bafbd59b4e0/grpc-stub-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-core/1.12.0/541a5c68ce85c03190e29bc9e0ec611d2b75ff24/grpc-core-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.gson/gson/2.7/751f548c85fa49f330cecbb1875893f971b33c4e/gson-2.7.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/de4f537f5e3927c41a0848a5cccb9ebd/ink-1.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/12c37208696163284a88b03ae92ad268/play-services-measurement-base-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.auto.value/auto-value-annotations/1.6/da725083ee79fdcd86d9f3d8a76e38174a01892a/auto-value-annotations-1.6.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.dagger/dagger/2.13/37dc0fc55b65aa10f6e1edc4691a1231c904cfb1/dagger-2.13.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/javax.inject/javax.inject/1/6975da39a7040257bd51d21a231b76c915872d38/javax.inject-1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.code.findbugs/jsr305/3.0.1/f7be08ec23c21485b9b5a1cf1654c2ec8c58168d/jsr305-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/9f836f9cb1e756f7349962d875473d85/protolite-well-known-types-16.0.0-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.protobuf/protobuf-lite/3.0.1/59b5b9c6e1a3054696d23492f888c1f8b583f5fc/protobuf-lite-3.0.1.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.grpc/grpc-context/1.12.0/5b63a170b786051a42cce08118d5ea3c8f60f749/grpc-context-1.12.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.guava/guava/20.0/89507701249388e1ed5ddcf8c41f4ce1be7831ef/guava-20.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.google.errorprone/error_prone_annotations/2.1.2/6dcc08f90f678ac33e5ef78c3c752b6f59e63e0c/error_prone_annotations-2.1.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-contrib-grpc-metrics/0.11.0/d57b877f1a28a613452d45e35c7faae5af585258/opencensus-contrib-grpc-metrics-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.opencensus/opencensus-api/0.11.0/c1ff1f0d737a689d900a3e2113ddc29847188c64/opencensus-api-0.11.0.jar;C:/Users/sergiodt/.gradle/caches/transforms-2/files-2.1/8fbd830426c23158946def82cf2418ee/rxandroid-2.0.2-api.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/io.reactivex.rxjava2/rxjava/2.1.14/20dbf7496e417da474eda12717bf4653dbbd5a6b/rxjava-2.1.14.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.reactivestreams/reactive-streams/1.0.2/323964c36556eb0e6209f65c1cef72b53b461ab8/reactive-streams-1.0.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/com.squareup.picasso/picasso/2.5.2/7446d06ec8d4f7ffcc53f1da37c95f200dcb9387/picasso-2.5.2.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-jdk7/1.4.0/9cc187c3dfaf6e4001bdf962e3cdadff7690261b/kotlin-stdlib-jdk7-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib/1.4.0/63e75298e93d4ae0b299bb869cf0c627196f8843/kotlin-stdlib-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains.kotlin/kotlin-stdlib-common/1.4.0/1c752cce0ead8d504ccc88a4fed6471fd83ab0dd/kotlin-stdlib-common-1.4.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.jetbrains/annotations/13.0/919f0dfe192fb4e063e7dacadee7f8bb9a2672a9/annotations-13.0.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/junit/junit/4.12/2973d150c0dc1fefe998f834810d68f278ea58ec/junit-4.12.jar;C:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/org.hamcrest/hamcrest-core/1.3/42a25dc3219429f0e5d060061f71acb49bf010a0/hamcrest-core-1.3.jar;C:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/build/intermediates/javac/betaDebug/classes;C:/Users/sergiodt/AndroidStudioProjects/vn-delivery/app/build/tmp/kotlin-classes/betaDebug;C:/Users/sergiodt/AppData/Local/Android/Sdk/platforms/android-28/android.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
-          <option name="moduleName" value="app_alfaDebug" />
+          <option name="moduleName" value="app_betaDebug" />
           <option name="jvmTarget" value="1.6" />
           <option name="friendPaths">
             <array>
-              <option value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/alfaDebug" />
-              <option value="$MODULE_DIR$/../../../app/build/intermediates/javac/alfaDebug/classes" />
-              <option value="$MODULE_DIR$/../../../app/build/intermediates/javac/alfaDebug/classes" />
-              <option value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/alfaDebug" />
+              <option value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/betaDebug" />
+              <option value="$MODULE_DIR$/../../../app/build/intermediates/javac/betaDebug/classes" />
+              <option value="$MODULE_DIR$/../../../app/build/intermediates/javac/betaDebug/classes" />
+              <option value="$MODULE_DIR$/../../../app/build/tmp/kotlin-classes/betaDebug" />
             </array>
           </option>
           <option name="languageVersion" value="1.4" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b88f4a9..ba48a82 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -41,21 +41,14 @@
     </configurations>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="refs #4678 pasar a picking">
+    <list default="true" id="3b8bed57-fcd9-4c4b-a644-0b0381aae011" name="Default" comment="version Alfa, test pantallas">
       <change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.main.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/modules/app/vn-delivery.app.unitTest.iml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/SilexInterceptor.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/UTILS/SilexInterceptor.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/constraint/group-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/group-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/espresso/group-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/android/support/test/group-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/com/google/firebase/group-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/maven.google/master-index.xml" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/build/intermediates/lint-cache/sdk-registry.xml/sdk-registry.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
     </list>
     <list id="bb82280e-2612-45ba-bd45-0d90b078e5b6" name="ignore" comment="version23.8Beta accede a warehouse" />
     <option name="SHOW_DIALOG" value="false" />
@@ -180,7 +173,7 @@
   },
   "keyToStringList": {
     "ExportApk.BuildVariants": [
-      "alfaRelease"
+      "generalRelease"
     ]
   }
 }]]></component>
@@ -385,7 +378,14 @@
       <option name="project" value="LOCAL" />
       <updated>1685534874452</updated>
     </task>
-    <option name="localTasksCounter" value="11" />
+    <task id="LOCAL-00011" summary="version Alfa, test pantallas">
+      <created>1685628814468</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1685628814468</updated>
+    </task>
+    <option name="localTasksCounter" value="12" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -432,7 +432,8 @@
     <MESSAGE value="version23.18Beta" />
     <MESSAGE value="refs #5618 translate" />
     <MESSAGE value="refs #4678 pasar a picking" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4678 pasar a picking" />
+    <MESSAGE value="version Alfa, test pantallas" />
+    <option name="LAST_COMMIT_MESSAGE" value="version Alfa, test pantallas" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/build.gradle b/app/build.gradle
index decc86e..7e006bd 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "verdnatura.es.repartoverdnatura"
         minSdkVersion 19
         //targetSdkVersion 28
-        versionCode 48
-        versionName "23.22Beta"
+        versionCode 49
+        versionName "23.22"
         // versionName "23.8Beta" versionCode 40
 
 
@@ -20,7 +20,7 @@ android {
     flavorDimensions "version"
     productFlavors {
         create("beta") {
-            applicationIdSuffix = ".sfusion"
+            //applicationIdSuffix = ".sfusion"
         }
         create("general") {
             //versionNameSuffix = "General"
@@ -37,7 +37,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         getByName("release") {
-            applicationIdSuffix = ".sfusion"
+          //  applicationIdSuffix = ".sfusion"
         }
 
         getByName("debug") {
diff --git a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
index 1a7bc7c..1370617 100644
--- a/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
+++ b/app/src/main/java/verdnatura/es/repartoverdnatura/MainActivity.java
@@ -342,10 +342,10 @@ public class MainActivity<RouteLoaded> extends AppCompatActivity {
     public void onLoadSelected(int pos) {
         // Intent i = new Intent(this,LoadVanActivity.class);
 
-        Utils.startPicking(this, "summary",listaRutas.get(pos).getId());
-      /*  Intent i = new Intent(this, ExpeditionSummaryActivity.class);
+      /*  Utils.startPicking(this, "summary",listaRutas.get(pos).getId());*/
+        Intent i = new Intent(this, ExpeditionSummaryActivity.class);
         i.putExtra("route", listaRutas.get(pos));
-        startActivity(i);*/
+        startActivity(i);
     }
 
 
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f17f613..7b8bcd3 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-    <resources>
+<resources>
     <string name="app_name">Transporte Verdnatura</string>
     <string name="reparto">Transporte</string>
     <string name="username">Usuario</string>
@@ -20,8 +20,8 @@
     <string name="cliente">Cliente</string>
     <string name="consignatorio">Consignatario</string>
     <string name="consignatorioAbrev">Consign:</string>
-    <string name="packages">Volumes</string>
-    <string name="warehouse">Armazém</string>
+    <string name="packages" translatable="false">Volumes</string>
+    <string name="warehouse" translatable="false">Armazém</string>
     <string name="volver">voltar</string>
     <string name="please_wait">trabalhando</string>
     <string name="error_conexion">erro de conexão</string>
@@ -37,7 +37,7 @@
     <string name="guardar">Salvar</string>
     <string name="estas_seguro_firma">Tens certeza que queres assinar?</string>
     <string name="si">Sim</string>
-    <string name="no">Não</string>
+    <string name="no" translatable="false">Não</string>
     <string name="info">Informação</string>
     <string name="actualizar">Atualizar</string>
     <string name="ver_loc">Como queres obter a posição?</string>
@@ -69,97 +69,97 @@
     <string name="packingType">Tipo embalagem:</string>
     <string name="summaryRouteTitle">Resumo carga rota:</string>
     <string name="distance">Distancia ao último ponto em que se assinou a descarga em metros:</string>
-    <string name="selecTime">Select Time</string>
-    <string name="expeditionNotFound">Expedición no encontrada</string>
-    <string name="tryAgain">.Vuelva a intentarlo de nuevo</string>
-    <string name="noRows">Sin registros</string>
-    <string name="expedition">Expedición :</string>
-    <string name="scanExpedition">Escanee antes una expedición.</string>
-    <string name="information">Información</string>
-    <string name="markExpeditionFound">¿Desea marcar la expedición como encontrada?</string>
-    <string name="expeditionFound">Expedición no encontrada</string>
-    <string name="optionDeleteExpedition">Esta opción te permite eliminar las expediciones escaneadas.</string>
+    <string name="selecTime">Seleccione Hora</string>
+    <string name="expeditionNotFound">Expedição não encontrada</string>
+    <string name="tryAgain">.Volte a tentar novamente</string>
+    <string name="noRows">Sem registros</string>
+    <string name="expedition">Expedição :</string>
+    <string name="scanExpedition">Escaneie antes uma expedição.</string>
+    <string name="information">Informação</string>
+    <string name="markExpeditionFound">Deseja marcar a expedição como encontrada?</string>
+    <string name="expeditionFound">Expedição não encontrada</string>
+    <string name="optionDeleteExpedition">Esta opção te permite eliminar as expedições escaneadas.</string>
     <string name="deleting">Eliminando</string>
     <string name="scanning">Escaneando</string>
-    <string name="loaded"> cargadas</string>
-    <string name="RouteNotInformation">No se ha encontrado información de la ruta</string>
-    <string name="expeditionLoaded">Expedición ya cargada</string>
-    <string name="adressLoaded">Consignatario cargado</string>
-    <string name="expeditionScanFound">Expedición %1$s ya escaneada como encontrada</string>
-    <string name="selectSector">Selecciona sector</string>
-    <string name="mistakeSaving">Error al guarda. Pruebe de nuevo a seleccionar sector</string>
+    <string name="loaded"> carregadas</string>
+    <string name="RouteNotInformation">Não se encontrou informação da rota</string>
+    <string name="expeditionLoaded">Expedição já carregada</string>
+    <string name="adressLoaded">Consignatario carregado</string>
+    <string name="expeditionScanFound">Expedição %1$s já escaneada como encontrada</string>
+    <string name="selectSector">Selecione sector</string>
+    <string name="mistakeSaving">Erro ao salvar. Prove outra vez a selesionar sector</string>
     <string name="ClientNot">CLIENTE AUSENTE</string>
-    <string name="clientAuthorization">CLIENTE AUTORIZA DESCARGA A REPARTIDOR</string>
-    <string name="clientReject">CLIENTE RECHAZA PEDIDO</string>
-    <string name="packagesMissing">FALTAN BULTOS:</string>
-    <string name="clientDevolution">"RECOGER DEVOLUCIÓN, NÚMERO DE RECLAMACIÓN: "</string>
-    <string name="expeditionsScanned">Expediciones de la ruta y cliente escaneada</string>
-    <string name="expeditionTotal">El total de expediciones escaneadas es diferente al total a entregar. ¿ Quieres guardar las expediciones escaneadas o buscar la/s expedición/es ?</string>
-    <string name="save">GUARDAR</string>
-    <string name="mistakeSending">Error al enviar. Se queda guardado para enviar más tarde</string>
-    <string name="scannerIn">Escáner  entregado</string>
-    <string name="expeditionScanned">Expedición ya escaneada para entrega</string>
+    <string name="clientAuthorization">CLIENTE AUTORIZA DESCARGA AO ESTAFETA</string>
+    <string name="clientReject">CLIENTE REJEITA PEDIDO</string>
+    <string name="packagesMissing">FALTAM VOLUMES:</string>
+    <string name="clientDevolution">\"LEVANTAR DEVOLUÇÃO, NUMERO DE RECLAMAÇÃO: \"</string>
+    <string name="expeditionsScanned">Expedições da rota e cliente escaneadas</string>
+    <string name="expeditionTotal">O total de expedições escaneadas é diferente ao total a entregar. Quer salvar expedições escaneadas ou buscar a\as expedições ?</string>
+    <string name="save">SALVAR</string>
+    <string name="mistakeSending">Erro ao enviar. Fica salvo para enviar mais tarde</string>
+    <string name="scannerIn">Scanner  entregado</string>
+    <string name="expeditionScanned">Expedição já escaneada para entrega</string>
     <string name="delivered"> entregadas</string>
-    <string name="scannerComplete">Escaneo a entregar completo</string>
-    <string name="scanned">" escaneadas"</string>
-    <string name="phonePermission">No tienes permisos para llamar.</string>
-    <string name="installMaps">Please install Google Maps</string>
-    <string name="install">Install</string>
-    <string name="alert">Alert</string>
-    <string name="checkUser">Comprobando usuario</string>
-    <string name="newVersion">Existe una nueva versión. Se recomienda actualizar.</string>
-    <string name="update">Actualizar</string>
+    <string name="scannerComplete">Escaneamento a entregar completo</string>
+    <string name="scanned">\" escaneadas\"</string>
+    <string name="phonePermission">Não tens permissão para ligar.</string>
+    <string name="installMaps">Por favor instale Google Maps</string>
+    <string name="install">Instalar</string>
+    <string name="alert">Alerta</string>
+    <string name="checkUser">Comprovando utilizador</string>
+    <string name="newVersion">Existe uma nova versão. Se recomenda atualizar.</string>
+    <string name="update">Atualizar</string>
     <string name="cancel">Cancelar</string>
-    <string name="newVersionMandatory">Existe una nueva versión. Es necesario actualizar para un correcto funcionamiento</string>
-    <string name="addLog">Añadiendo log</string>
+    <string name="newVersionMandatory">Existe uma nova versão. É necesario atualizar para um correto funcionamento</string>
+    <string name="addLog">Adicionando log</string>
     <string name="find">BUSCAR</string>
-    <string name="expeditionUnload">Expedición descargada</string>
-    <string name="routeLoaded">Ruta cargada</string>
+    <string name="expeditionUnload">Expedição descarregada</string>
+    <string name="routeLoaded">Rota carregada</string>
     <string name="addressLoaded">Consignatario cargado</string>
-    <string name="expeditionNotLoaded">Expedición no cargada</string>
-    <string name="optionUnload">Esta opción te permite descargar expediciones de la furgoneta.</string>
-    <string name="unloading">Descargando</string>
-    <string name="loadVan">Cargando furgo</string>
-    <string name="attention">ATENCIÓN</string>
-    <string name="ticketPending">Tienes tickets pendientes de actualizar,¿Estás seguro de cerrar sesión?</string>
-    <string name="yes">Si</string>
-    <string name="not">No</string>
-    <string name="closeSession">Cerrar sesión</string>
-    <string name="sessionExit">¿Estás seguro de cerrar sesión?</string>
-    <string name="forLoading">Para cargar pulsa consignatario</string>
-    <string name="box">Cajas</string>
+    <string name="expeditionNotLoaded">Expedição não carregada</string>
+    <string name="optionUnload">Esta opção te permite descarregar expedições da carrinha.</string>
+    <string name="unloading">Descarregando</string>
+    <string name="loadVan">Carregando carrinha</string>
+    <string name="attention">ATENÇÃO</string>
+    <string name="ticketPending">Tens tickets pendentes de atualizar. Estás seguro de finalizar sessão?</string>
+    <string name="yes">Sim</string>
+    <string name="not">Não</string>
+    <string name="closeSession">Finalizar sesión</string>
+    <string name="sessionExit">Estás seguro de finalizar sessão?</string>
+    <string name="forLoading">Para carregar pressione consignatario</string>
+    <string name="box">Caixas</string>
     <string name="type">Tipo</string>
     <string name="lost">Perdidas</string>
     <string name="deliveredMenu">Entregadas</string>
     <string name="consignAbbr">Consign</string>
-    <string name="permission">Permite escanear expediciones del consigntario seleccionado</string>
-    <string name="scanExpeditionText">Escanear expedición</string>
+    <string name="permission">Permite escanear expedições do consigntario selecionado</string>
+    <string name="scanExpeditionText">Escanear expedição</string>
     <string name="markFound">Marcar encontrada</string>
-    <string name="selectRoute">selecciona una ruta</string>
-    <string name="scanHint">Escanear expedición encontrada</string>
-    <string name="route">Ruta</string>
-    <string name="defaultMessages">Mensajes predeterminados:</string>
+    <string name="selectRoute">selecciona uma ruta</string>
+    <string name="scanHint">Escanear expedição encontrada</string>
+    <string name="route">Rota</string>
+    <string name="defaultMessages">Mensagens predeterminadas:</string>
     <string name="salePerson">Comercial</string>
     <string name="expedAbbr">Exped:</string>
     <string name="found">Encontrada</string>
-    <string name="warehouseText">Almacén:</string>
-    <string name="characters">140 carácteres restantes</string>
-    <string name="showLogExpedition">Ver log expedición</string>
-    <string name="agency">Agencia</string>
-    <string name="showExpeditionLog">Escanea expedición para ver log o marcarla encontrada</string>
+    <string name="warehouseText">Armazém:</string>
+    <string name="characters">140 caracteres restantes</string>
+    <string name="showLogExpedition">Ver log expedição</string>
+    <string name="agency">Agência</string>
+    <string name="showExpeditionLog">Escaneie expedição para ver log ou marque-a encontrada</string>
     <string name="plate">Matrícula</string>
     <string name="state">Estado</string>
     <string name="date">Data</string>
     <string name="nif">NIF:</string>
-    <string name="fiscalAdress">Dirección fiscal:</string>
+    <string name="fiscalAdress">Morada fiscal:</string>
     <string name="town">Municipio:</string>
     <string name="postalCode">Código postal:</string>
-    <string name="socialAdress">Razón social:</string>
-    <string name="expeditionFoundScan">Escanea expedición encontrada</string>
+    <string name="socialAdress">Razão social:</string>
+    <string name="expeditionFoundScan">Escanear expedição encontrada</string>
     <string name="routeAbbrev">R:</string>
     <string name="consigneeAbrev">C:</string>
     <string name="scanAbrev">Escan</string>
-    <string name="selectOne">(selecciona uno)</string>
+    <string name="selectOne">(seleccione um)</string>
     <string name="buttonOk">OK</string>
     <string name="m3">M3</string>
     <string name="pc">PC</string>