Merge pull request wewewe718#50 from dmitriy-ilchenko/develop

Develop
humphreye · Nov 11, 2020 · be54706 · be54706
2 parents 38e599c + d4832ef
commit be54706
Show file tree

Hide file tree

Showing 11 changed files with 1,874 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Change Log
 
+## 1.7
+* Add translations: Chinese, French, Japanese, Polish, Spanish
+
 ## 1.6
 * Add a setting to avoid duplicates in history
 * Add an option to manually save to history

diff --git a/app/build.gradle b/app/build.gradle
@@ -12,8 +12,8 @@ android {
         applicationId "com.example.barcodescanner"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 8
-        versionName "1.6"
+        versionCode 9
+        versionName "1.7"
         multiDexEnabled true
         vectorDrawables.useSupportLibrary  true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,10 +24,6 @@ android {
             }
         }
 
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file("local.properties").newDataInputStream())
-
-        resValue "string", "sentryDSN", properties.getProperty("sentryDSN")
         buildConfigField "boolean", "ERROR_REPORTS_ENABLED_BY_DEFAULT", "true"
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,7 +28,7 @@
 
         <meta-data
             android:name="io.sentry.dsn"
-            android:value="@string/sentryDSN"
+            android:value="https://09f3022eb19f4fa7ba332b1f44188ff1@o432234.ingest.sentry.io/5384638"
             />
 
         <provider

diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
diff --git a/app/src/main/res/values-fr-FR/strings.xml b/app/src/main/res/values-fr-FR/strings.xml
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
@@ -194,7 +194,6 @@
         <item>JSON</item>
     </string-array>
     <string name="activity_export_history_file_name_hint">Nome do arquivo</string>
-    <string name="activity_export_history_file_name_default" translatable="false">db</string>
     <string name="activity_export_history_export">Exportar</string>
     <string name="activity_export_history_exported">Salvado em pasta de Downloads</string>
 
@@ -361,5 +360,4 @@
 
     <!--Barcode formats-->
     <string name="barcode_format_qr_code">Código QR</string>
-
 </resources>
diff --git a/app/src/main/res/values-zh-CN/strings.xml b/app/src/main/res/values-zh-CN/strings.xml
diff --git a/fastlane/metadata/android/en-US/changelogs/9.txt b/fastlane/metadata/android/en-US/changelogs/9.txt
@@ -0,0 +1 @@
+* Add translations: Chinese, French, Japanese, Polish, Spanish
diff --git a/fastlane/metadata/android/ru/changelogs/9.txt b/fastlane/metadata/android/ru/changelogs/9.txt
@@ -0,0 +1 @@
+* Добавлены переводы: китайский, французский, японский, польский, испанский
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Add translations: Chinese, French, Japanese, Polish, Spanish
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		* Добавлены переводы: китайский, французский, японский, польский, испанский