Advance version number to 1.66.1

We always use curly braces around here.

When in doubt, google for "Apple's SSL Bug".

CHANGELOG.md

@@ -1,5 +1,66 @@
 # Change Log
 
+## 1.66.1
+* Show elements of invalid Wifi configurations too
+* Update translations
+
+## 1.66.0
+* Support deep links to encode content via web links
+* Parse International Driver Licenses (IDL) in PDF417 barcodes
+* Add WiFis from system settings
+* Show parsed data items
+* Update translations
+
+## 1.65.2
+* Sanity check ROI metrics
+
+## 1.65.1
+* Improve simple mode
+* Remember quiet zone settings
+* Reduce height for 1D barcodes
+* Add execute argument for binaryeye://encode
+* Update Russian translation
+
+## 1.65.0
+* Add a welcome screen to choose a mode
+* Add a deep link to encode a barcode
+* Remember zoom level of generated barcodes
+* Remove Human Readable Interpretation (HRI) decoration
+* Update Italian translation
+
+## 1.64.2
+* Separate crop window settings for image scanning
+* Fix initializing dataMask
+* Update Russian translation
+
+## 1.64.1
+* Handle empty input for recreation
+* Fix setting up database
+
+## 1.64.0
+* Find barcode by content
+* Immediately replace toasts
+* Use detected barcode for recreation
+* Show data mask of QR Codes
+* Fix deep linking
+* Replace margin with quiet zone switch when generating barcodes
+* Update Russian translation
+* Update Portuguese (Brazil) translation
+
+## 1.63.13
+* Fix UTF-8 conversion of binary escape sequences when creating barcodes
+* Fix scan order for intervals under one second
+* Add arabic translation
+* Update French translation
+
+## 1.63.12
+* Fix magnifying barcode recreation
+
+## 1.63.11
+* Update parcel tracking URL
+* Update multiple translations
+* Only ask for barcode size when exporting/sharing
+
 ## 1.63.10
 * Use maximum brightness when showing a generated barcode
 * Allow file input from share menu

CONTRIBUTING.md

@@ -16,5 +16,10 @@ to squash when merging into master:
 Then write a [good commit message][commit_messages] to keep the history
 meaningful and useful. One feature, one commit.
 
+## Translations
+
+For translations use [Toolate][toolate].
+
 [android_best_practices]: https://developer.android.com/distribute/best-practices/develop/
 [commit_messages]: https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_commit_guidelines
+[toolate]: https://toolate.othing.xyz/projects/binaryeye/

Makefile

@@ -28,6 +28,26 @@ testscan:
 		-c android.intent.category.BROWSABLE \
 		-d 'binaryeye://scan/?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
 
+testencode:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://encode?content=Test\&format=QR_CODE'
+
+testencodenotqr:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://encode?content=Test\&format=DATA_MATRIX'
+
+testencodeexec:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://encode?content=Test\&format=QR_CODE\&execute'
+
+testencodeurl:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'http://markusfisch.de/encode?content=Test\&format=QR_CODE'
+
 testurl:
 	adb shell am start -a android.intent.action.VIEW \
 		-c android.intent.category.BROWSABLE \

PRIVACY.md

@@ -15,7 +15,7 @@ Before Android Q, this feature requires using
 [WifiManager.getConfiguredNetworks][getConfiguredNetworks]
 which requires `ACCESS_FINE_LOCATION`.
 
-On Android Q an better, this permission is not requested nor required.
+On Android Q and better, this permission is not requested nor required.
 
 ### [BLUETOOTH][BLUETOOTH], [BLUETOOTH_ADMIN][BLUETOOTH_ADMIN] and [BLUETOOTH_CONNECT][BLUETOOTH_CONNECT]
 

README.md

@@ -2,7 +2,7 @@
 
 Yet another barcode scanner for Android. As if there weren't [enough][play].
 
-This one is free, without any ads and open source.
+This one is free, without any ads, and open source.
 
 Works in portrait and landscape orientation, can read inverted codes,
 comes in Material Design and can also generate barcodes.
@@ -83,14 +83,14 @@ ZXing can generate the following barcode formats:
 * [QR CODE][qr_code]
 * [UPC A][upc_a]
 
-## Deep Links and Intents
-
-### Deep Links
+## Deep Links
 
 You can invoke Binary Eye with a web URI intent from anything that can
-open URIs. There are two options:
+open URIs.
 
-1. [binaryeye://scan](binaryeye://scan)
+### Decoding
+
+1. [binaryeye://scan](binaryeye://scan) (note: GitHub does not render this as clickable link)
 2. [http(s)://markusfisch.de/BinaryEye](http://markusfisch.de/BinaryEye)
 
 If you want to get the scanned contents, you can add a `ret` query
@@ -104,10 +104,31 @@ Supported symbols are:
 * `RESULT_BYTES` - raw result as a hex string
 * `FORMAT` - barcode format
 
+### Encoding
+
+1. [binaryeye://encode](binaryeye://encode)
+
+You can use the URL arguments `content` and `format` to automatically
+preset this data. For example:
+
+1. [binaryeye://encode?content=Test&format=QR_CODE](binaryeye://encode?content=Test&format=QR_CODE)
+2. [http(s)://markusfisch.de/encode?content=Test&format=QR_CODE](http://markusfisch.de/encode?content=Test&format=QR_CODE)
+3. [http(s)://markusfisch.de/encode?content=Test&format=DATA_MATRIX](http://markusfisch.de/encode?content=Test2&format=DATA_MATRIX&execute)
+
+If you want the code to be generated immediately, add `execute=true` (or just `execute`).
+
+## Intents
+
+You can also use Binary Eye from other apps by using an [Intent][intent].
+
+If you prefer to integrate a barcode scanner into your app, take a look at
+at [BarcodeScannerView][barcode_scanner_view] (if you also want to use
+[ZXing-C++][zxing_cpp]) or read how to
+[scan barcodes with ML Kit on Android][mlkit_barcode_scanning].
+
 ### SCAN Intent
 
-You can also use Binary Eye from other apps by using the
-`com.google.zxing.client.android.SCAN` Intent with
+Use the `com.google.zxing.client.android.SCAN` `Intent` with
 [startActivityForResult()][start_activity] like this:
 
 ```kotlin
@@ -155,6 +176,21 @@ class YourActivity : AppCompatActivity() {
 }
 ```
 
+## Forwarding scans via Bluetooth
+
+**Note:** The companion apps aren't developed nor maintained by the
+author of Binary Eye.
+
+In order to set up Bluetooth forwarding to a computer:
+
+1. Pair your devices (phone and pc) if not paired already
+2. Download and run a companion app:
+	- Windows: https://github.com/KamaleiZestri/BinaryReceptorWindows
+	- Linux: https://github.com/sean666888/bin_eye_bt_receiver
+3. In the settings of Binary Eye, enable "Forward scans with Bluetooth"
+	and select the appropriate target host device that is running the
+	companion application.
+
 [play]: https://play.google.com/store/search?q=barcode%20scanner&c=apps
 [zxing_cpp]: https://github.com/zxing-cpp/zxing-cpp
 [kotlin]: http://kotlinlang.org/
@@ -177,6 +213,9 @@ class YourActivity : AppCompatActivity() {
 [upc_a]: https://en.wikipedia.org/wiki/Universal_Product_Code
 [upc_e]: https://en.wikipedia.org/wiki/Universal_Product_Code#UPC-E
 [upc_ean]: https://en.wikipedia.org/wiki/Universal_Product_Code#EAN-13
+[intent]: https://developer.android.com/reference/android/content/Intent
+[barcode_scanner_view]: https://github.com/markusfisch/BarcodeScannerView
+[mlkit_barcode_scanning]: https://developers.google.com/ml-kit/vision/barcode-scanning/android
 [start_activity]: https://developer.android.com/reference/android/app/Activity#startActivityForResult(android.content.Intent,%20int)
 [on_activity_result]: https://developer.android.com/reference/android/app/Activity#onActivityResult(int,%20int,%20android.content.Intent)
 [intent_result]: https://developer.android.com/training/basics/intents/result

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdk 9
 		targetSdk sdk_version
 
-		versionCode 138
-		versionName '1.63.10'
+		versionCode 149
+		versionName '1.66.1'
 	}
 
 	signingConfigs {
@@ -58,17 +58,20 @@ android {
 		}
 	}
 
+	// Required since Gradle 8.
 	compileOptions {
-		// Required for Gradle 8.
-		sourceCompatibility = 17
-		targetCompatibility = 17
+		sourceCompatibility = JavaVersion.VERSION_1_8
+		targetCompatibility = JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = "1.8"
 	}
 }
 
 dependencies {
 	// Kotlin
 	implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+	implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.9.0"
 
 	// Support
 	implementation "com.android.support:appcompat-v7:$support_version"
@@ -79,8 +82,9 @@ dependencies {
 	// External
 	implementation 'com.github.markusfisch:CameraView:1.10.0'
 	implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
-	implementation 'com.github.markusfisch:zxing-cpp:v2.2.0.5'
+	implementation 'com.github.markusfisch:zxing-cpp:v2.3.0.3'
 
 	// Testing
 	testImplementation 'junit:junit:4.13.2'
+	testImplementation 'org.robolectric:robolectric:4.14'
 }

app/src/main/AndroidManifest.xml

@@ -19,7 +19,8 @@
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
 	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
 	<uses-feature android:name="android.hardware.camera"/>
-	<uses-feature android:name="android.hardware.camera.autofocus"/>
+	<uses-feature android:name="android.hardware.camera.autofocus"
+		android:required="false" />
 	<uses-sdk tools:overrideLibrary="android.support.v14.preference"/>
 	<queries>
 		<intent>
@@ -75,6 +76,15 @@
 				<data android:host="details" android:scheme="market"
 					android:pathSuffix="id=com.xiaomi.scanner"/>
 			</intent-filter>
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:host="markusfisch.de"/>
+				<data android:pathPrefix="/BinaryEye"/>
+				<data android:scheme="http"/>
+				<data android:scheme="https"/>
+			</intent-filter>
 			<intent-filter>
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
@@ -99,14 +109,34 @@
 			</intent-filter>
 		</activity>
 		<activity
-			android:name=".activity.MainActivity"
+			android:name=".activity.WelcomeActivity"
 			android:exported="true"/>
+		<activity
+			android:name=".activity.MainActivity"
+			android:exported="true">
+			<intent-filter android:autoVerify="true">
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:host="markusfisch.de"/>
+				<data android:pathPrefix="/encode"/>
+				<data android:scheme="http"/>
+				<data android:scheme="https"/>
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:scheme="binaryeye" android:host="encode"/>
+			</intent-filter>
+		</activity>
 		<service
 			android:name=".service.ScanTileService"
 			android:icon="@drawable/ic_action_scan"
 			android:label="@string/scan_code"
 			android:exported="true"
-			android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
+			android:permission="android.permission.BIND_QUICK_SETTINGS_TILE"
+			tools:targetApi="n">
 			<intent-filter>
 				<action android:name="android.service.quicksettings.action.QS_TILE"/>
 			</intent-filter>

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/search/OpenOrSearchAction.kt

@@ -15,49 +15,49 @@ object OpenOrSearchAction : IAction {
 	override fun canExecuteOn(data: ByteArray): Boolean = false
 
 	override suspend fun execute(context: Context, data: ByteArray) {
-		view(context, String(data), true)
-	}
-
-	private suspend fun view(
-		context: Context,
-		url: String,
-		search: Boolean
-	) {
-		if (!context.openUrl(url, silent = true) && search) {
-			openSearch(context, url)
-		}
-	}
-
-	private suspend fun openSearch(context: Context, query: String) {
-		val defaultSearchUrl = prefs.defaultSearchUrl
-		if (defaultSearchUrl.isNotEmpty()) {
-			view(
-				context,
-				defaultSearchUrl + query.urlEncode(),
-				false
-			)
-			return
-		}
-		val names = context.resources.getStringArray(
-			R.array.search_engines_names
-		).toMutableList()
-		val urls = context.resources.getStringArray(
-			R.array.search_engines_values
-		).toMutableList()
-		// Remove the "Always ask" entry. The arrays search_engines_*
-		// are used in the preferences too.
-		names.removeFirst()
-		urls.removeFirst()
-		if (prefs.openWithUrl.isNotEmpty()) {
-			names.add(prefs.openWithUrl)
-			urls.add(prefs.openWithUrl)
-		}
-		val queryUri = alertDialog<String>(context) { resume ->
-			setTitle(R.string.pick_search_engine)
-			setItems(names.toTypedArray()) { _, which ->
-				resume(urls[which] + query.urlEncode())
-			}
-		} ?: return
-		view(context, queryUri, false)
+		openUrlOrSearch(context, String(data))
+	}
+}
+
+private suspend fun openUrlOrSearch(
+	context: Context,
+	url: String,
+	search: Boolean = true
+) {
+	if (context.openUrl(url, silent = true) || !search) {
+		return
+	}
+	prependSearchUrl(context, url)?.let {
+		openUrlOrSearch(context, it, false)
+	}
+}
+
+private suspend fun prependSearchUrl(
+	context: Context,
+	query: String
+): String? {
+	val defaultSearchUrl = prefs.defaultSearchUrl
+	if (defaultSearchUrl.isNotEmpty()) {
+		return defaultSearchUrl + query.urlEncode()
+	}
+	val names = context.resources.getStringArray(
+		R.array.search_engines_names
+	).toMutableList()
+	val urls = context.resources.getStringArray(
+		R.array.search_engines_values
+	).toMutableList()
+	// Remove the "Always ask" entry. The arrays search_engines_*
+	// are used in the preferences too.
+	names.removeAt(0)
+	urls.removeAt(0)
+	if (prefs.openWithUrl.isNotEmpty()) {
+		names.add(prefs.openWithUrl)
+		urls.add(prefs.openWithUrl)
+	}
+	return alertDialog(context) { resume ->
+		setTitle(R.string.pick_search_engine)
+		setItems(names.toTypedArray()) { _, which ->
+			resume(urls[which] + query.urlEncode())
+		}
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/vtype/vevent/VEventAction.kt

@@ -88,6 +88,6 @@ private fun List<String>.simpleFindParse(date: String): Date? {
 
 private fun SimpleDateFormat.simpleParse(date: String): Date? = try {
 	parse(date)
-} catch (e: Exception) {
+} catch (_: Exception) {
 	null
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/web/WebAction.kt

@@ -7,7 +7,7 @@ import de.markusfisch.android.binaryeye.content.openUrl
 
 object WebAction : IAction {
 	private val colloquialRegex =
-		"^(URL:[ ]*)*(http[s]*://)*[A-Za-z0-9]{3,}\\.[A-Za-z]{2,}[^ \t\r\n]*$".toRegex()
+		"^(URL:[ ]*)*(http[s]*://)*[A-Za-z0-9-]{3,}\\.[A-Za-z]{2,}[^ \t\r\n]*$".toRegex()
 
 	override val iconResId: Int = R.drawable.ic_action_open
 	override val titleResId: Int = R.string.open_url

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/wifi/WifiAction.kt

@@ -13,10 +13,13 @@ object WifiAction : IAction {
 
 	var password: String? = null
 
-	override fun canExecuteOn(data: ByteArray): Boolean =
-		WifiConnector.parse(String(data)) {
-			password = it
-		} != null
+	override fun canExecuteOn(data: ByteArray): Boolean {
+		// Just check if the data can be parsed as the app should also
+		// show invalid configurations so users can still access them.
+		val inputMap = WifiConnector.parseMap(String(data)) ?: return false
+		password = inputMap["P"]
+		return !inputMap["S"].isNullOrEmpty()
+	}
 
 	override suspend fun execute(
 		context: Context,

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/wifi/WifiConnector.kt

@@ -1,11 +1,13 @@
 package de.markusfisch.android.binaryeye.actions.wifi
 
 import android.content.Context
+import android.content.Intent
 import android.net.wifi.WifiConfiguration
 import android.net.wifi.WifiEnterpriseConfig
 import android.net.wifi.WifiManager
 import android.net.wifi.WifiNetworkSuggestion
 import android.os.Build
+import android.provider.Settings
 import android.support.annotation.RequiresApi
 import de.markusfisch.android.binaryeye.R
 import java.util.*
@@ -35,15 +37,9 @@ import java.util.*
  * The fields can appear in any order. Only "S:" is required.
  */
 object WifiConnector {
-	fun parse(
-		input: String,
-		passwordBlock: ((password: String?) -> Unit)? = null
-	): Any? {
+	fun parse(input: String): Any? {
 		val inputMap = parseMap(input) ?: return null
 		val parsedData = SimpleDataAccessor.of(inputMap) ?: return null
-		passwordBlock?.apply {
-			invoke(parsedData.password)
-		}
 		return try {
 			if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
 				// WifiConfiguration is deprecated in Android Q but
@@ -54,7 +50,7 @@ object WifiConnector {
 			} else {
 				WifiNetworkSuggestion.Builder().apply(parsedData)
 			}
-		} catch (e: IllegalArgumentException) {
+		} catch (_: IllegalArgumentException) {
 			// Some arguments may be out of range, e.g. SSIDs cannot
 			// be longer than 32 characters in some versions of Android.
 			// See: https://github.com/markusfisch/BinaryEye/issues/402
@@ -63,6 +59,13 @@ object WifiConnector {
 	}
 
 	fun addNetwork(context: Context, config: Any): Int {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
+			config is WifiNetworkSuggestion.Builder
+		) {
+			context.suggestNetworkFromBuilder(config)
+			return R.string.wifi_added
+		}
+
 		val wifiManager = context.applicationContext.getSystemService(
 			Context.WIFI_SERVICE
 		) as WifiManager
@@ -93,7 +96,7 @@ object WifiConnector {
 			input.trimAndTerminate()
 		)?.groupValues?.get(1)?.let { pairs ->
 			pairRegex.findAll(pairs).map { pair ->
-				pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2]
+				pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2].unescape
 			}.toMap()
 		}
 	}
@@ -103,17 +106,17 @@ object WifiConnector {
 	) {
 		// This should be private but because of testing it isn't possible.
 		internal val ssid: String
-			get() = inputMap.getValue("S").unescape
+			get() = inputMap.getValue("S")
 		internal val securityType: String
-			get() = inputMap["T"]?.unescape ?: ""
+			get() = inputMap["T"] ?: ""
 		internal val password: String?
-			get() = inputMap["P"]?.unescape
+			get() = inputMap["P"]
 		internal val hidden: Boolean
-			get() = inputMap["H"]?.unescape == "true"
+			get() = inputMap["H"] == "true"
 		internal val anonymousIdentity: String
-			get() = inputMap["AI"]?.unescape ?: inputMap["A"]?.unescape ?: ""
+			get() = inputMap["AI"] ?: inputMap["A"] ?: ""
 		internal val identity: String
-			get() = inputMap["I"]?.unescape ?: ""
+			get() = inputMap["I"] ?: ""
 		internal val eapMethod: Int?
 			get() = if (inputMap["E"].isNullOrEmpty()) {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
@@ -201,7 +204,7 @@ object WifiConnector {
 						})
 					}
 				}
-			} catch (e: IllegalArgumentException) {
+			} catch (_: IllegalArgumentException) {
 				// Don't accept passphrases that aren't ASCII encodeable.
 				return null
 			}
@@ -313,6 +316,21 @@ private fun WifiManager.addNetworkFromBuilder(
 	return result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
 }
 
+@RequiresApi(Build.VERSION_CODES.R)
+private fun Context.suggestNetworkFromBuilder(
+	builder: WifiNetworkSuggestion.Builder
+) {
+	val suggestion = builder.build()
+	startActivity(
+		Intent(Settings.ACTION_WIFI_ADD_NETWORKS).apply {
+			putParcelableArrayListExtra(
+				Settings.EXTRA_WIFI_NETWORK_LIST,
+				arrayListOf(suggestion)
+			)
+		}
+	)
+}
+
 // Make sure the string ends with a semicolon.
 private fun String.trimAndTerminate(): String {
 	var trimmed = trim()
@@ -366,7 +384,7 @@ private fun WifiManager.removeOldNetwork(
 		}?.networkId?.also {
 			removeNetwork(it)
 		}
-	} catch (e: SecurityException) {
+	} catch (_: SecurityException) {
 		// The user didn't allow ACCESS_FINE_LOCATION which is
 		// required to access configuredNetworks and that's fine.
 	}

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/CameraActivity.kt

@@ -1,5 +1,6 @@
 package de.markusfisch.android.binaryeye.activity
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.AlertDialog
 import android.content.Context
@@ -13,11 +14,11 @@ import android.os.Build
 import android.os.Bundle
 import android.support.design.widget.FloatingActionButton
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import android.view.MotionEvent
 import android.view.View
+import android.widget.EditText
 import android.widget.SeekBar
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
@@ -38,11 +39,12 @@ import de.markusfisch.android.binaryeye.graphics.mapPosition
 import de.markusfisch.android.binaryeye.graphics.setFrameRoi
 import de.markusfisch.android.binaryeye.graphics.setFrameToView
 import de.markusfisch.android.binaryeye.media.releaseToneGenerators
+import de.markusfisch.android.binaryeye.net.isScanDeeplink
 import de.markusfisch.android.binaryeye.net.sendAsync
 import de.markusfisch.android.binaryeye.net.urlEncode
 import de.markusfisch.android.binaryeye.preference.Preferences
 import de.markusfisch.android.binaryeye.view.errorFeedback
-import de.markusfisch.android.binaryeye.view.initSystemBars
+import de.markusfisch.android.binaryeye.view.initBars
 import de.markusfisch.android.binaryeye.view.scanFeedback
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.DetectorView
@@ -53,12 +55,14 @@ import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 import de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer
 import de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import de.markusfisch.android.zxingcpp.ZxingCpp.TextMode
 import java.io.FileInputStream
 import java.util.Scanner
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
 
+
 class CameraActivity : AppCompatActivity() {
 	private val frameRoi = Rect()
 	private val matrix = Matrix()
@@ -77,6 +81,7 @@ class CameraActivity : AppCompatActivity() {
 	private var frontFacing = false
 	private var bulkMode = prefs.bulkMode
 	private var restrictFormat: String? = null
+	private var searchTerm: String? = null
 	private var ignoreNext: String? = null
 	private var fallbackBuffer: IntArray? = null
 	private var requestCameraPermission = true
@@ -125,8 +130,7 @@ class CameraActivity : AppCompatActivity() {
 		// custom locale.
 		setTitle(R.string.scan_code)
 
-		initSystemBars(this)
-		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
+		initBars()
 
 		cameraView = findViewById(R.id.camera_view) as CameraView
 		detectorView = findViewById(R.id.detector_view) as DetectorView
@@ -148,14 +152,18 @@ class CameraActivity : AppCompatActivity() {
 		super.onDestroy()
 		fallbackBuffer = null
 		saveZoom()
-		detectorView.saveCropHandlePos()
+		detectorView.storeCropHandlePos(CAMERA_CROP_HANDLE)
 		releaseToneGenerators()
 	}
 
 	override fun onResume() {
 		super.onResume()
+		if (firstStart()) {
+			startActivity(Intent(this, WelcomeActivity::class.java))
+			return
+		}
 		System.gc()
-		updateHints()
+		updateHintsAndTitle()
 		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
 			bulkMode = prefs.bulkMode
 			invalidateOptionsMenu()
@@ -171,18 +179,41 @@ class CameraActivity : AppCompatActivity() {
 		requestCameraPermission = false
 	}
 
-	private fun updateHints() {
+	private fun Context.firstStart(): Boolean {
+		val welcomeShownName = "welcome_shown"
+		if (prefs.preferences.getBoolean(welcomeShownName, false)) {
+			return false
+		}
+		prefs.preferences.edit().putBoolean(welcomeShownName, true).apply()
+		val packageInfo = packageManager.getPackageInfo(packageName, 0)
+		val installedSince = System.currentTimeMillis() - packageInfo.firstInstallTime
+		return installedSince < 86400000
+	}
+
+	private fun updateHintsAndTitle() {
 		val restriction = restrictFormat
 		formatsToRead = if (restriction != null) {
-			title = getString(
-				R.string.scan_format,
-				prettifyFormatName(restriction)
-			)
 			setOf(restriction)
 		} else {
-			setTitle(R.string.scan_code)
 			prefs.barcodeFormats
 		}.toFormatSet()
+		updateTitle()
+	}
+
+	private fun updateTitle() {
+		if (searchTerm != null || restrictFormat != null) {
+			title = getString(
+				R.string.scan_format,
+				prettifyFormatName(
+					listOfNotNull(
+						restrictFormat,
+						searchTerm
+					).joinToString(",")
+				)
+			)
+		} else {
+			setTitle(R.string.scan_code)
+		}
 	}
 
 	private fun setReturnTarget(intent: Intent?) {
@@ -191,7 +222,7 @@ class CameraActivity : AppCompatActivity() {
 				returnResult = true
 			}
 
-			intent?.dataString?.isReturnUrl() == true -> {
+			intent?.dataString?.let(::isScanDeeplink) == true -> {
 				finishAfterShowingResult = true
 				returnUrlTemplate = intent.data?.getQueryParameter("ret")
 			}
@@ -227,6 +258,7 @@ class CameraActivity : AppCompatActivity() {
 		frontFacing = savedState.getBoolean(FRONT_FACING)
 		bulkMode = savedState.getBoolean(BULK_MODE)
 		restrictFormat = savedState.getString(RESTRICT_FORMAT)
+		searchTerm = savedState.getString(SEARCH_TERM)
 	}
 
 	override fun onSaveInstanceState(outState: Bundle) {
@@ -235,6 +267,7 @@ class CameraActivity : AppCompatActivity() {
 		outState.putBoolean(FRONT_FACING, frontFacing)
 		outState.putBoolean(BULK_MODE, bulkMode)
 		outState.putString(RESTRICT_FORMAT, restrictFormat)
+		outState.putString(SEARCH_TERM, searchTerm)
 		super.onSaveInstanceState(outState)
 	}
 
@@ -295,6 +328,11 @@ class CameraActivity : AppCompatActivity() {
 				true
 			}
 
+			R.id.find_code -> {
+				askForCode()
+				true
+			}
+
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -334,12 +372,36 @@ class CameraActivity : AppCompatActivity() {
 			setTitle(R.string.restrict_format)
 			setItems(names.toTypedArray()) { _, which ->
 				restrictFormat = formats[which]
-				updateHints()
+				updateHintsAndTitle()
 			}
 			show()
 		}
 	}
 
+	// Dialogs do not have a parent view.
+	@SuppressLint("InflateParams")
+	private fun askForCode() {
+		val view = layoutInflater.inflate(R.layout.dialog_find_code, null)
+		val editText = view.findViewById<EditText>(R.id.term)
+		searchTerm.let {
+			editText.setText(it)
+		}
+		AlertDialog.Builder(this)
+			.setView(view)
+			.setPositiveButton(android.R.string.ok) { _, _ ->
+				searchTerm = editText.text.toString()
+				if (searchTerm?.isEmpty() == true) {
+					searchTerm = null
+				}
+				updateTitle()
+			}
+			.setNegativeButton(android.R.string.cancel) { _, _ ->
+				searchTerm = null
+				updateTitle()
+			}
+			.show()
+	}
+
 	private fun openReadme() {
 		val intent = Intent(
 			Intent.ACTION_VIEW,
@@ -478,7 +540,8 @@ class CameraActivity : AppCompatActivity() {
 					tryInvert = true,
 					tryDownscale = true,
 					returnCodabarStartEnd = true,
-					maxNumberOfSymbols = 1
+					maxNumberOfSymbols = 1,
+					textMode = TextMode.PLAIN
 				)
 				var useLocalAverage = false
 				camera.setPreviewCallback { frameData, _ ->
@@ -503,7 +566,11 @@ class CameraActivity : AppCompatActivity() {
 							}
 						)?.let { results ->
 							val result = results.first()
-							if (result.text != ignoreNext) {
+							val text = result.text
+							val term = searchTerm
+							if (text != ignoreNext &&
+								(term == null || text.contains(term))
+							) {
 								postResult(result)
 								decoding = false
 							}
@@ -545,7 +612,7 @@ class CameraActivity : AppCompatActivity() {
 			val params = parameters
 			params.zoom = zoom
 			parameters = params
-		} catch (e: RuntimeException) {
+		} catch (_: RuntimeException) {
 			// Ignore. There's nothing we can do.
 		}
 	}
@@ -574,12 +641,21 @@ class CameraActivity : AppCompatActivity() {
 			updateFrameRoiAndMappingMatrix()
 		}
 		detectorView.setPaddingFromWindowInsets()
-		detectorView.restoreCropHandlePos()
+		detectorView.restoreCropHandlePos(CAMERA_CROP_HANDLE)
 	}
 
 	private fun updateFrameRoiAndMappingMatrix() {
 		val viewRect = cameraView.previewRect
-		val viewRoi = if (detectorView.roi.width() < 1) {
+		if (viewRect.width() < 1 ||
+			viewRect.height() < 1 ||
+			!frameMetrics.isValid()
+		) {
+			return
+		}
+		val viewRoi = if (
+			detectorView.roi.width() < 1 ||
+			detectorView.roi.height() < 1
+		) {
 			viewRect
 		} else {
 			detectorView.roi
@@ -674,12 +750,15 @@ class CameraActivity : AppCompatActivity() {
 	}
 
 	companion object {
+		const val CAMERA_CROP_HANDLE = "camera_crop_handle"
+
 		private const val PICK_FILE_RESULT_CODE = 1
 		private const val ZOOM_MAX = "zoom_max"
 		private const val ZOOM_LEVEL = "zoom_level"
 		private const val FRONT_FACING = "front_facing"
 		private const val BULK_MODE = "bulk_mode"
 		private const val RESTRICT_FORMAT = "restrict_format"
+		private const val SEARCH_TERM = "search_term"
 	}
 }
 
@@ -701,7 +780,7 @@ fun Activity.showResult(
 	if (prefs.sendScanActive && prefs.sendScanUrl.isNotEmpty()) {
 		if (prefs.sendScanType == "4") {
 			openUrl(
-				prefs.sendScanUrl + scan.content.urlEncode()
+				prefs.sendScanUrl + scan.text.urlEncode()
 			)
 			return
 		}
@@ -760,12 +839,6 @@ private fun getReturnIntent(result: Result) = Intent().apply {
 	}
 }
 
-private fun String.isReturnUrl() = listOf(
-	"binaryeye://scan",
-	"http://markusfisch.de/BinaryEye",
-	"https://markusfisch.de/BinaryEye"
-).firstOrNull { startsWith(it) } != null
-
 private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
 	urlTemplate
 		.replace("{RESULT}", result.text.urlEncode())

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/MainActivity.kt

@@ -3,11 +3,11 @@ package de.markusfisch.android.binaryeye.activity
 import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.PERMISSION_LOCATION
 import de.markusfisch.android.binaryeye.app.PERMISSION_WRITE
@@ -20,9 +20,9 @@ import de.markusfisch.android.binaryeye.fragment.DecodeFragment
 import de.markusfisch.android.binaryeye.fragment.EncodeFragment
 import de.markusfisch.android.binaryeye.fragment.HistoryFragment
 import de.markusfisch.android.binaryeye.fragment.PreferencesFragment
+import de.markusfisch.android.binaryeye.net.isEncodeDeeplink
 import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
-import de.markusfisch.android.binaryeye.view.initSystemBars
-import de.markusfisch.android.binaryeye.view.recordToolbarHeight
+import de.markusfisch.android.binaryeye.view.initBars
 
 class MainActivity : AppCompatActivity() {
 	override fun onRequestPermissionsResult(
@@ -59,10 +59,7 @@ class MainActivity : AppCompatActivity() {
 		super.onCreate(state)
 		setContentView(R.layout.activity_main)
 
-		initSystemBars(this)
-		val toolbar = findViewById(R.id.toolbar) as Toolbar
-		recordToolbarHeight(toolbar)
-		setSupportActionBar(toolbar)
+		initBars()
 		supportActionBar?.setDisplayHomeAsUpEnabled(true)
 
 		supportFragmentManager.addOnBackStackChangedListener {
@@ -85,6 +82,17 @@ class MainActivity : AppCompatActivity() {
 			return when {
 				intent.hasExtra(PREFERENCES) -> PreferencesFragment()
 				intent.hasExtra(HISTORY) -> HistoryFragment()
+
+				intent.dataString?.let(::isEncodeDeeplink) == true -> {
+					val uri = Uri.parse(intent.dataString)
+					EncodeFragment.newInstance(
+						content = uri.getQueryParameter("content"),
+						format = uri.getQueryParameter("format")?.uppercase(),
+						execute = uri.getQueryParameter("execute")
+							.let { it == "" || it.toBoolean() }
+					)
+				}
+
 				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
 					intent.getStringExtra(ENCODE)
 				)

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/PickActivity.kt

@@ -10,7 +10,6 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
-import android.support.v7.widget.Toolbar
 import android.view.Menu
 import android.view.MenuItem
 import de.markusfisch.android.binaryeye.R
@@ -22,8 +21,7 @@ import de.markusfisch.android.binaryeye.graphics.loadImageUri
 import de.markusfisch.android.binaryeye.graphics.mapPosition
 import de.markusfisch.android.binaryeye.media.releaseToneGenerators
 import de.markusfisch.android.binaryeye.view.colorSystemAndToolBars
-import de.markusfisch.android.binaryeye.view.initSystemBars
-import de.markusfisch.android.binaryeye.view.recordToolbarHeight
+import de.markusfisch.android.binaryeye.view.initBars
 import de.markusfisch.android.binaryeye.view.scanFeedback
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.CropImageView
@@ -75,10 +73,7 @@ class PickActivity : AppCompatActivity() {
 		// locale.
 		setTitle(R.string.pick_code_to_scan)
 
-		initSystemBars(this)
-		val toolbar = findViewById(R.id.toolbar) as Toolbar
-		recordToolbarHeight(toolbar)
-		setSupportActionBar(toolbar)
+		initBars()
 
 		supportFragmentManager.addOnBackStackChangedListener {
 			colorSystemAndToolBars(this@PickActivity)
@@ -91,20 +86,28 @@ class PickActivity : AppCompatActivity() {
 			return
 		}
 
-		cropImageView = findViewById(R.id.image) as CropImageView
-		cropImageView.restrictTranslation = false
-		cropImageView.freeRotation = prefs.freeRotation
-		cropImageView.setImageBitmap(bitmap)
-		cropImageView.onScan = {
-			scanWithinBounds(bitmap)
+		cropImageView = (findViewById(R.id.image) as CropImageView).apply {
+			restrictTranslation = false
+			freeRotation = prefs.freeRotation
+			setImageBitmap(bitmap)
+			onScan = {
+				scanWithinBounds(bitmap)
+			}
+			runAfterLayout = {
+				minWidth = min(
+					minWidth / 2f,
+					max(bitmap.width, bitmap.height).toFloat()
+				)
+			}
 		}
 
-		detectorView = findViewById(R.id.detector_view) as DetectorView
-		detectorView.onRoiChanged = {
-			scanWithinBounds(bitmap)
+		detectorView = (findViewById(R.id.detector_view) as DetectorView).apply {
+			onRoiChanged = {
+				scanWithinBounds(bitmap)
+			}
+			setPaddingFromWindowInsets()
+			restoreCropHandlePos(PICKER_CROP_HANDLE)
 		}
-		detectorView.setPaddingFromWindowInsets()
-		detectorView.restoreCropHandlePos()
 
 		findViewById(R.id.scan).setOnClickListener {
 			showResult()
@@ -200,7 +203,7 @@ class PickActivity : AppCompatActivity() {
 
 	override fun onDestroy() {
 		super.onDestroy()
-		detectorView.saveCropHandlePos()
+		detectorView.storeCropHandlePos(PICKER_CROP_HANDLE)
 		parentJob.cancel()
 		releaseToneGenerators()
 	}
@@ -242,7 +245,7 @@ class PickActivity : AppCompatActivity() {
 	}
 
 	private fun rotateClockwise() {
-		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
+		cropImageView.imageRotation = (cropImageView.imageRotation + 90) % 360
 	}
 
 	private fun loadSentImage(intent: Intent): Bitmap? {
@@ -264,6 +267,10 @@ class PickActivity : AppCompatActivity() {
 			applicationContext.toast(R.string.no_barcode_found)
 		}
 	}
+
+	companion object {
+		private const val PICKER_CROP_HANDLE = "picker_crop_handle"
+	}
 }
 
 private fun getNormalizedRoi(imageRect: RectF, roi: Rect): RectF {

app/src/main/kotlin/de/markusfisch/android/binaryeye/activity/WelcomeActivity.kt

@@ -0,0 +1,32 @@
+package de.markusfisch.android.binaryeye.activity
+
+import android.os.Bundle
+import android.support.v7.app.AppCompatActivity
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.app.prefs
+
+class WelcomeActivity : AppCompatActivity() {
+	override fun onCreate(state: Bundle?) {
+		super.onCreate(state)
+		setContentView(R.layout.activity_welcome)
+		findViewById(R.id.expert).setOnClickListener {
+			finish()
+		}
+		findViewById(R.id.simple).setOnClickListener {
+			prefs.apply {
+				showCropHandle = false
+				zoomBySwiping = false
+				beep = true
+				copyImmediately = true
+				openImmediately = true
+				showMetaData = false
+				showHexDump = false
+				defaultSearchUrl = "https://www.google.com/search?q="
+				openWithUrl = defaultSearchUrl
+				expandEscapeSequences = false
+				brightenScreen = true
+			}
+			finish()
+		}
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/adapter/ScansAdapter.kt

@@ -20,7 +20,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 	private val idIndex = cursor.getColumnIndex(Database.SCANS_ID)
 	private val timeIndex = cursor.getColumnIndex(Database.SCANS_DATETIME)
 	private val nameIndex = cursor.getColumnIndex(Database.SCANS_NAME)
-	private val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
+	private val textIndex = cursor.getColumnIndex(Database.SCANS_TEXT)
 	private val formatIndex = cursor.getColumnIndex(Database.SCANS_FORMAT)
 	private val selections = mutableMapOf<Long, Int>()
 	private val selectedColor = ContextCompat.getColor(
@@ -74,7 +74,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 
 	fun getContent(
 		position: Int
-	) = (getItem(position) as Cursor?)?.getString(contentIndex)
+	) = (getItem(position) as Cursor?)?.getString(textIndex)
 
 	override fun newView(
 		context: Context,
@@ -92,7 +92,7 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 		getViewHolder(view).apply {
 			timeView.text = formatDateTime(cursor.getString(timeIndex))
 			val name = cursor.getString(nameIndex)
-			val content = cursor.getString(contentIndex)
+			val text = cursor.getString(textIndex)
 			var icon = 0
 			contentView.text = when {
 				name?.isNotEmpty() == true -> {
@@ -100,11 +100,11 @@ class ScansAdapter(context: Context, cursor: Cursor) :
 					name
 				}
 
-				content.isNullOrEmpty() -> context.getString(
+				text.isNullOrEmpty() -> context.getString(
 					R.string.binary_data
 				)
 
-				else -> content
+				else -> text
 			}
 			contentView.setCompoundDrawablesWithIntrinsicBounds(
 				icon, 0, 0, 0
@@ -149,7 +149,7 @@ private fun formatDateTime(rfc: String): String {
 				DateFormat.SHORT
 			).format(it)
 		}
-	} catch (e: ParseException) {
+	} catch (_: ParseException) {
 		// Ignore and fall through.
 	}
 	return rfc

app/src/main/kotlin/de/markusfisch/android/binaryeye/bluetooth/BluetoothSender.kt

@@ -24,7 +24,7 @@ fun Scan.sendBluetoothAsync(
 			connect(host, true)
 		}
 		val sent = if (connected) {
-			send(content, host, true)
+			send(text, host)
 		} else {
 			false
 		}
@@ -35,21 +35,20 @@ fun Scan.sendBluetoothAsync(
 }
 
 fun setBluetoothHosts(listPref: ListPreference) {
-	val devices = try {
-		BluetoothAdapter.getDefaultAdapter().bondedDevices
-	} catch (e: SecurityException) {
+	try {
+		val devices = blue.bondedDevices ?: return
+		listPref.entries = devices.map {
+			it.name
+		}.toTypedArray()
+		listPref.entryValues = devices.map {
+			it.address
+		}.toTypedArray()
+		listPref.callChangeListener(listPref.value)
+	} catch (_: SecurityException) {
 		// Do nothing, either the user has denied Bluetooth access
 		// or the permission was removed by the system. We're catching
 		// the exception to keep the app from crashing.
-		null
-	} ?: return
-	listPref.entries = devices.map {
-		it.name
-	}.toTypedArray()
-	listPref.entryValues = devices.map {
-		it.address
-	}.toTypedArray()
-	listPref.callChangeListener(listPref.value)
+	}
 }
 
 private var socket: BluetoothSocket? = null
@@ -71,39 +70,41 @@ private fun connect(deviceName: String, onceMore: Boolean): Boolean = try {
 	writer = socket?.outputStream?.writer()
 	isConnected = true
 	true
-} catch (e: Exception) {
-	if (onceMore)
+} catch (_: SecurityException) {
+	if (onceMore) {
 		connect(deviceName, false)
-	else
+	} else {
 		close()
+	}
 	false
 }
 
-private fun send(message: String, host: String, onceMore: Boolean): Boolean = try {
+private fun send(message: String, host: String): Boolean = try {
 	writer?.apply {
 		write(message)
 		write("\n")
 		flush()
 	}
 	true
-} catch (e: Exception) {
+} catch (_: Exception) {
 	close()
 
-	if (connect(host, false))
-		send(message, host, false)
-	else
+	if (connect(host, false)) {
+		send(message, host)
+	} else {
 		false
+	}
 }
 
 private fun close() {
 	try {
 		writer?.close()
-	} catch (e: IOException) {
+	} catch (_: IOException) {
 		// Catch exception if writer wasn't initialized.
 	}
 	try {
 		socket?.close()
-	} catch (e: IOException) {
+	} catch (_: IOException) {
 		// Nothing we can do about this but keep
 		// the app from crashing.
 	}
@@ -113,11 +114,15 @@ private fun close() {
 }
 
 private fun findByName(findableName: String): BluetoothDevice? {
-	val deviceList = blue.bondedDevices
-	for (device in deviceList) {
-		if (device.address == findableName) {
-			return device
+	try {
+		val deviceList = blue.bondedDevices
+		for (device in deviceList) {
+			if (device.address == findableName) {
+				return device
+			}
 		}
+	} catch (_: SecurityException) {
+		// Fall through.
 	}
 	return null
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/content/Barcode.kt

@@ -0,0 +1,203 @@
+package de.markusfisch.android.binaryeye.content
+
+import android.graphics.Bitmap
+import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.graphics.COLOR_BLACK
+import de.markusfisch.android.binaryeye.graphics.COLOR_WHITE
+import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import de.markusfisch.android.zxingcpp.ZxingCpp.BitMatrix
+import de.markusfisch.android.zxingcpp.ZxingCpp.toBitmap
+import de.markusfisch.android.zxingcpp.ZxingCpp.toSvg
+import de.markusfisch.android.zxingcpp.ZxingCpp.toText
+import java.util.Arrays
+
+enum class BarcodeColors {
+	BLACK_ON_WHITE,
+	WHITE_ON_BLACK,
+	BLACK_ON_TRANSPARENT,
+	WHITE_ON_TRANSPARENT;
+
+	fun foregroundColor(): Int = when (this) {
+		BLACK_ON_WHITE,
+		BLACK_ON_TRANSPARENT -> COLOR_BLACK
+
+		WHITE_ON_BLACK,
+		WHITE_ON_TRANSPARENT -> COLOR_WHITE
+	}
+
+	fun backgroundColor(): Int = when (this) {
+		BLACK_ON_WHITE -> COLOR_WHITE
+		WHITE_ON_BLACK -> COLOR_BLACK
+		BLACK_ON_TRANSPARENT,
+		WHITE_ON_TRANSPARENT -> 0
+	}
+}
+
+fun Scan.toBarcode(): Barcode<*> {
+	val content = text.ifEmpty {
+		raw
+	}
+	return if (symbol != null) {
+		BitMatrixBarcode(
+			symbol,
+			content,
+			format
+		)
+	} else {
+		ContentBarcode(
+			content,
+			format,
+			errorCorrectionLevel.toErrorCorrectionInt()
+		)
+	}
+}
+
+fun String?.toErrorCorrectionInt() = when (this) {
+	"L" -> 0
+	"M" -> 4
+	"Q" -> 6
+	"H" -> 8
+	else -> -1
+}
+
+sealed class Barcode<T>(
+	val content: T,
+	val format: BarcodeFormat,
+	val colors: BarcodeColors
+) {
+	private var _bitmap: Bitmap? = null
+	fun bitmap(): Bitmap {
+		val b = _bitmap ?: bitmap(512)
+		_bitmap = b
+		return b
+	}
+
+	fun bitmap(size: Int): Bitmap {
+		return toBitmap(size)
+	}
+
+	protected abstract fun toBitmap(size: Int): Bitmap
+
+	private var _svg: String? = null
+	fun svg(): String {
+		val s = _svg ?: toSvg()
+		_svg = s
+		return s
+	}
+
+	protected abstract fun toSvg(): String
+
+	private var _text: String? = null
+	fun text(): String {
+		val t = _text ?: toText()
+		_text = t
+		return t
+	}
+
+	protected abstract fun toText(): String
+
+	fun textOrHex(): String = when (content) {
+		is String -> content
+		is ByteArray -> content.toHexString()
+		else -> throw IllegalArgumentException("Illegal arguments")
+	}
+}
+
+class ContentBarcode<T>(
+	content: T,
+	format: BarcodeFormat,
+	val ecLevel: Int = -1,
+	val margin: Int = -1,
+	colors: BarcodeColors = BarcodeColors.BLACK_ON_WHITE
+) : Barcode<T>(content, format, colors) {
+	override fun toBitmap(size: Int) = ZxingCpp.encodeAsBitmap(
+		content, format, size, format.height(size), margin, ecLevel,
+		setColor = colors.foregroundColor(),
+		unsetColor = colors.backgroundColor()
+	)
+
+	override fun toSvg() = ZxingCpp.encodeAsSvg(
+		content, format, margin, ecLevel
+	)
+
+	override fun toText() = ZxingCpp.encodeAsText(
+		content, format, margin, ecLevel,
+		inverted = colors == BarcodeColors.BLACK_ON_WHITE
+	)
+}
+
+class BitMatrixBarcode<T>(
+	val bitMatrix: BitMatrix,
+	content: T,
+	format: BarcodeFormat,
+	colors: BarcodeColors = BarcodeColors.BLACK_ON_WHITE
+) : Barcode<T>(content, format, colors) {
+	override fun toBitmap(size: Int) = bitMatrix.inflate(size).toBitmap(
+		setColor = colors.foregroundColor(),
+		unsetColor = colors.backgroundColor()
+	)
+
+	override fun toSvg() = bitMatrix.inflate().toSvg()
+
+	override fun toText() = bitMatrix.inflate().toText(
+		inverted = colors == BarcodeColors.BLACK_ON_WHITE
+	)
+}
+
+private fun BitMatrix.inflate(
+	size: Int = 0,
+	quietZone: Boolean = true
+): BitMatrix {
+	val extraModules = if (quietZone) 2 else 0
+	val codeWidth = width + extraModules
+	val codeHeight = height + extraModules
+	var scale = size / codeWidth
+	if (scale < 1) {
+		if (size > 0 && !quietZone) {
+			return this
+		}
+		scale = 1
+	}
+	val outWidth = codeWidth * scale
+	val outHeight = codeHeight * scale
+	val scaled = BitMatrix(
+		outWidth,
+		outHeight,
+		ByteArray(outWidth * outHeight)
+	)
+	Arrays.fill(scaled.data, 1)
+	val padding = extraModules / 2
+	val left = padding * scale
+	val top = padding * scale
+	val right = outWidth - left
+	val bottom = outHeight - top
+	for (y in top until bottom) {
+		var dst = y * outWidth + left
+		val offset = (y - top) / scale * width
+		for (x in left until right) {
+			scaled.data[dst++] = data[
+				offset + (x - left) / scale
+			]
+		}
+	}
+	return scaled
+}
+
+private fun BarcodeFormat.height(size: Int) = when (this) {
+	// 1D barcodes don't need as much vertical space.
+	BarcodeFormat.CODABAR,
+	BarcodeFormat.CODE_39,
+	BarcodeFormat.CODE_93,
+	BarcodeFormat.CODE_128,
+	BarcodeFormat.DATA_BAR,
+	BarcodeFormat.DATA_BAR_EXPANDED,
+	BarcodeFormat.DX_FILM_EDGE,
+	BarcodeFormat.EAN_8,
+	BarcodeFormat.EAN_13,
+	BarcodeFormat.ITF,
+	BarcodeFormat.UPC_A,
+	BarcodeFormat.UPC_E -> size / 3
+
+	else -> size
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/content/IdlElementMap.kt

@@ -0,0 +1,67 @@
+package de.markusfisch.android.binaryeye.content
+
+import android.content.Context
+import de.markusfisch.android.binaryeye.R
+
+private val idToLabel = hashMapOf(
+	"DCA" to R.string.idl_vehicle_class,
+	"DCB" to R.string.idl_restriction_codes,
+	"DCD" to R.string.idl_endorsement_codes,
+	"DBA" to R.string.idl_date_of_expiry,
+	"DCS" to R.string.idl_customer_family_name,
+	"DAC" to R.string.idl_customer_first_name,
+	"DCT" to R.string.idl_customer_first_name_alt,
+	"DAD" to R.string.idl_customer_middle_name,
+	"DBD" to R.string.idl_date_of_issue,
+	"DBB" to R.string.idl_date_of_birth,
+	"DBC" to R.string.idl_sex,
+	"DAY" to R.string.idl_eye_color,
+	"DAU" to R.string.idl_body_height,
+	"DAG" to R.string.idl_address_street,
+	"DAI" to R.string.idl_address_city,
+	"DAJ" to R.string.idl_address_jurisdiction_code,
+	"DAK" to R.string.idl_address_postal_code,
+	"DAQ" to R.string.idl_customer_id_number,
+	"DCF" to R.string.idl_document_discriminator,
+	"DCG" to R.string.idl_country,
+	"DDE" to R.string.idl_family_name_truncation,
+	"DDF" to R.string.idl_first_name_truncation,
+	"DDG" to R.string.idl_middle_name_truncation,
+	"DAH" to R.string.idl_address_street_2,
+	"DAZ" to R.string.idl_hair_color,
+	"DCI" to R.string.idl_place_of_birth,
+	"DCJ" to R.string.idl_audit_information,
+	"DCK" to R.string.idl_inventory_control_number,
+	"DBN" to R.string.idl_alias_family_name,
+	"DBG" to R.string.idl_alias_given_name,
+	"DBS" to R.string.idl_alias_suffix_name,
+	"DCU" to R.string.idl_name_suffix,
+	"DCE" to R.string.idl_weight_range,
+	"DCL" to R.string.idl_ethnicity,
+	"DCM" to R.string.idl_standard_vehicle_classification,
+	"DCN" to R.string.idl_standard_endorsement_code,
+	"DCO" to R.string.idl_standard_restriction_code,
+	"DCP" to R.string.idl_vehicle_classification_description,
+	"DCQ" to R.string.idl_endorsement_code_description,
+	"DCR" to R.string.idl_restriction_code_description,
+	"DDA" to R.string.idl_compliance_type,
+	"DDB" to R.string.idl_card_revision_date,
+	"DDC" to R.string.idl_hazmat_endorsement_expiration_date,
+	"DDD" to R.string.idl_limited_duration_document_indicator,
+	"DAW" to R.string.idl_weight_pounds,
+	"DAX" to R.string.idl_weight_kilograms,
+	"DDH" to R.string.idl_under_18_until_date,
+	"DDI" to R.string.idl_under_19_until_date,
+	"DDJ" to R.string.idl_under_21_until_date,
+	"DDK" to R.string.idl_organ_donor_indicator,
+	"DDL" to R.string.idl_veteran_indicator
+)
+
+fun Context.idlToRes(id: String): String {
+	val resId = idToLabel[id]
+	return if (resId != null) {
+		getString(resId)
+	} else {
+		id
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/content/IdlParser.kt

@@ -0,0 +1,122 @@
+package de.markusfisch.android.binaryeye.content
+
+data class IdlInfo(
+	var iin: String? = null,
+	val elements: MutableMap<String, String> = linkedMapOf()
+)
+
+object IdlParser {
+	private fun resolveSex(value: String): String = when (value.firstOrNull()) {
+		'1' -> "M"
+		'2' -> "F"
+		'9' -> "X"
+		else -> value
+	}
+
+	private fun skipWhitespace(s: String, p: Int): Int {
+		var i = p
+		while (i < s.length && s[i].isWhitespace()) {
+			++i;
+		}
+		return i
+	}
+
+	private fun findSubType(s: String, idlInfo: IdlInfo): String {
+		val len = s.length
+		var p = skipWhitespace(s, 0)
+
+		if (p < len && s[p] == '@') {
+			while (p < len) {
+				if (!s[p].isDigit()) {
+					++p
+					continue
+				}
+				var d = p
+				while (d < len && s[d].isDigit()) {
+					++d
+				}
+				if (d - p < 8 || len - d < 3) {
+					p = d
+					continue
+				}
+
+				val code = s.substring(d, d + 2)
+				if (code != "DL" && code != "ID") {
+					p = d + 2
+					continue
+				}
+
+				idlInfo.elements["DL"] = code
+				d += 2
+
+				while (d < len) {
+					while (d < len && s[d] !in "DI") {
+						++d
+					}
+					if (len - d < 2) break
+
+					val sec = s.substring(d, d + 2)
+					if (sec == "DL" || sec == "ID") {
+						return s.substring(d + 2)
+					}
+					++d
+				}
+				break
+			}
+		}
+		return s
+	}
+
+	private fun findIIN(s: String): String? {
+		val ansi = s.indexOf("ANSI").takeIf { it >= 0 } ?: return null
+		var p = ansi + 4
+		val len = s.length
+		val whitespaceSkipped = skipWhitespace(s, p)
+		if (whitespaceSkipped == p) {
+			return null
+		}
+		p = whitespaceSkipped
+		val iinStart = p
+		var digits = 0
+		while (digits < 6 && p < len && s[p].isDigit()) {
+			++p
+			++digits
+		}
+		return s.substring(iinStart, p)
+	}
+
+	fun parse(s: String?): IdlInfo? {
+		if (s.isNullOrEmpty()) {
+			return null
+		}
+
+		val idlInfo = IdlInfo().apply {
+			iin = findIIN(s)
+		}
+		val data = findSubType(s, idlInfo)
+		val len = data.length
+		var start = 0
+
+		for (p in 0..len) {
+			if (p < len && data[p] > '\u001f') {
+				continue
+			}
+
+			if (p - start > 3) {
+				val vp = start + 3
+				val key = data.substring(start, vp)
+
+				if (key.matches(Regex("[DZ][A-Z]{2}"))) {
+					var value = data.substring(vp, p)
+					if (key == "DBC") {
+						value = resolveSex(value)
+					}
+					idlInfo.elements[key] = value.trim()
+				}
+			}
+			start = p + 1
+		}
+
+		return if (idlInfo.elements.isEmpty()) null else idlInfo
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/content/Share.kt

@@ -33,7 +33,7 @@ fun Context.startIntent(intent: Intent): Boolean = try {
 	// necessary.
 	startActivity(intent)
 	true
-} catch (e: ActivityNotFoundException) {
+} catch (_: ActivityNotFoundException) {
 	false
 }
 
@@ -91,7 +91,7 @@ fun <T> Context.shareAsFile(content: T, fileName: String) {
 		FileOutputStream(file).use {
 			it.write(bytes)
 		}
-	} catch (e: IOException) {
+	} catch (_: IOException) {
 		toast(R.string.error_saving_file)
 		return
 	}

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/CsvExport.kt

@@ -33,7 +33,7 @@ private fun exportCsv(
 		Database.SCANS_DATETIME,
 		Database.SCANS_FORMAT,
 		Database.SCANS_NAME,
-		Database.SCANS_CONTENT,
+		Database.SCANS_TEXT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
 		Database.SCANS_VERSION,
 		Database.SCANS_SEQUENCE_SIZE,
@@ -47,7 +47,7 @@ private fun exportCsv(
 	val indices = columns.map {
 		cursor.getColumnIndex(it)
 	}
-	val contentIndex = cursor.getColumnIndex(Database.SCANS_CONTENT)
+	val contentIndex = cursor.getColumnIndex(Database.SCANS_TEXT)
 	val rawIndex = cursor.getColumnIndex(Database.SCANS_RAW)
 	outputStream.write(
 		columns.joinToString(

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Cursor.kt

@@ -1,6 +1,7 @@
 package de.markusfisch.android.binaryeye.database
 
 import android.database.Cursor
+import de.markusfisch.android.zxingcpp.ZxingCpp
 
 // Overwrite Kotlin's ".use" function for Cursor because Cursor cannot
 // be cast to Closeable below API level 16. This should be removed when
@@ -30,3 +31,18 @@ fun Cursor.getBlob(name: String): ByteArray? {
 	val idx = getColumnIndex(name)
 	return if (idx < 0) null else getBlob(idx)
 }
+
+fun Cursor.getBitMatrix(
+	widthName: String,
+	heightName: String,
+	dataName: String
+): ZxingCpp.BitMatrix? {
+	val width = getInt(widthName)
+	val height = getInt(heightName)
+	val data = getBlob(dataName)
+	return if (width > 0 && height > 0 && data != null) {
+		ZxingCpp.BitMatrix(width, height, data)
+	} else {
+		null
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Database.kt

@@ -16,12 +16,12 @@ class Database {
 		db = OpenHelper(context).writableDatabase
 	}
 
-	fun getScans(query: String? = null): Cursor? = db.rawQuery(
+	fun getScans(query: String? = null): Cursor = db.rawQuery(
 		"""SELECT
 			$SCANS_ID,
 			$SCANS_DATETIME,
 			$SCANS_NAME,
-			$SCANS_CONTENT,
+			$SCANS_TEXT,
 			$SCANS_FORMAT
 			FROM $SCANS
 			${getWhereClause(query)}
@@ -29,12 +29,12 @@ class Database {
 		""".trimMargin(), getWhereArguments(query)
 	)
 
-	fun getScansDetailed(query: String? = null): Cursor? = db.rawQuery(
+	fun getScansDetailed(query: String? = null): Cursor = db.rawQuery(
 		"""SELECT
 			$SCANS_ID,
 			$SCANS_DATETIME,
 			$SCANS_NAME,
-			$SCANS_CONTENT,
+			$SCANS_TEXT,
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
@@ -56,7 +56,7 @@ class Database {
 		query: String?,
 		prefix: String = "WHERE"
 	) = if (query?.isNotEmpty() == true) {
-		"""$prefix $SCANS_CONTENT LIKE ?
+		"""$prefix $SCANS_TEXT LIKE ?
 			OR $SCANS_NAME LIKE ?"""
 	} else {
 		""
@@ -71,12 +71,12 @@ class Database {
 		null
 	}
 
-	fun getScansDetailed(ids: LongArray): Cursor? = db.rawQuery(
+	fun getScansDetailed(ids: LongArray): Cursor = db.rawQuery(
 		"""SELECT
 			$SCANS_ID,
 			$SCANS_DATETIME,
 			$SCANS_NAME,
-			$SCANS_CONTENT,
+			$SCANS_TEXT,
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
@@ -99,11 +99,15 @@ class Database {
 			$SCANS_ID,
 			$SCANS_DATETIME,
 			$SCANS_NAME,
-			$SCANS_CONTENT,
+			$SCANS_TEXT,
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
 			$SCANS_VERSION,
+			$SCANS_DATA_MASK,
+			$SCANS_SYMBOL_WIDTH,
+			$SCANS_SYMBOL_HEIGHT,
+			$SCANS_SYMBOL_DATA,
 			$SCANS_SEQUENCE_SIZE,
 			$SCANS_SEQUENCE_INDEX,
 			$SCANS_SEQUENCE_ID,
@@ -114,14 +118,20 @@ class Database {
 			FROM $SCANS
 			WHERE $SCANS_ID = ?
 		""".trimMargin(), arrayOf("$id")
-	)?.use {
+	).use {
 		if (it.moveToFirst()) {
 			Scan(
-				it.getString(SCANS_CONTENT),
+				it.getString(SCANS_TEXT),
 				it.getBlob(SCANS_RAW),
 				BarcodeFormat.valueOf(it.getString(SCANS_FORMAT)),
 				it.getString(SCANS_ERROR_CORRECTION_LEVEL),
 				it.getString(SCANS_VERSION),
+				it.getInt(SCANS_DATA_MASK),
+				it.getBitMatrix(
+					SCANS_SYMBOL_WIDTH,
+					SCANS_SYMBOL_HEIGHT,
+					SCANS_SYMBOL_DATA
+				),
 				it.getInt(SCANS_SEQUENCE_SIZE),
 				it.getInt(SCANS_SEQUENCE_INDEX),
 				it.getString(SCANS_SEQUENCE_ID),
@@ -142,7 +152,7 @@ class Database {
 		when (prefs.ignoreDuplicates()) {
 			Preferences.Companion.IgnoreDuplicates.Consecutive -> {
 				val id = getIdOfLastScan(
-					scan.content,
+					scan.text,
 					scan.raw,
 					scan.format
 				)
@@ -152,7 +162,7 @@ class Database {
 			}
 
 			Preferences.Companion.IgnoreDuplicates.Any -> {
-				val id = getIdOfScanByContent(scan.content, scan.format)
+				val id = getIdOfScanByContent(scan.text, scan.format)
 				if (id > 0L) {
 					return id
 				}
@@ -165,7 +175,7 @@ class Database {
 			null,
 			ContentValues().apply {
 				put(SCANS_DATETIME, scan.dateTime)
-				put(SCANS_CONTENT, scan.content)
+				put(SCANS_TEXT, scan.text)
 				if (scan.raw != null) {
 					put(SCANS_RAW, scan.raw)
 				}
@@ -174,6 +184,12 @@ class Database {
 					put(SCANS_ERROR_CORRECTION_LEVEL, it)
 				}
 				put(SCANS_VERSION, scan.version)
+				put(SCANS_DATA_MASK, scan.dataMask)
+				if (scan.symbol != null) {
+					put(SCANS_SYMBOL_WIDTH, scan.symbol.width)
+					put(SCANS_SYMBOL_HEIGHT, scan.symbol.height)
+					put(SCANS_SYMBOL_DATA, scan.symbol.data)
+				}
 				put(SCANS_SEQUENCE_SIZE, scan.sequenceSize)
 				put(SCANS_SEQUENCE_INDEX, scan.sequenceIndex)
 				put(SCANS_SEQUENCE_ID, scan.sequenceId)
@@ -192,17 +208,17 @@ class Database {
 	): Long = db.rawQuery(
 		"""SELECT
 				$SCANS_ID,
-				$SCANS_CONTENT,
+				$SCANS_TEXT,
 				$SCANS_RAW,
 				$SCANS_FORMAT
 				FROM $SCANS
 				ORDER BY $SCANS_ID DESC
 				LIMIT 1
 			""".trimMargin(), null
-	)?.use {
+	).use {
 		if (it.count > 0 &&
 			it.moveToFirst() &&
-			it.getString(SCANS_CONTENT) == content &&
+			it.getString(SCANS_TEXT) == content &&
 			(raw == null || it.getBlob(SCANS_RAW)
 				?.contentEquals(raw) == true) &&
 			it.getString(SCANS_FORMAT) == format.name
@@ -211,26 +227,26 @@ class Database {
 		} else {
 			0L
 		}
-	} ?: 0L
+	}
 
-	fun getIdOfScanByContent(
+	private fun getIdOfScanByContent(
 		content: String,
 		format: BarcodeFormat
 	): Long = db.rawQuery(
 		"""SELECT
 				$SCANS_ID
 				FROM $SCANS
-				WHERE $SCANS_CONTENT = ?
+				WHERE $SCANS_TEXT = ?
 					AND $SCANS_FORMAT = ?
 				LIMIT 1
 			""".trimMargin(), arrayOf(content, format.name)
-	)?.use {
+	).use {
 		if (it.moveToFirst()) {
 			it.getLong(SCANS_ID)
 		} else {
 			0L
 		}
-	} ?: 0L
+	}
 
 	fun removeScan(id: Long) {
 		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
@@ -247,7 +263,7 @@ class Database {
 	}
 
 	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, FILE_NAME, null, 6) {
+		SQLiteOpenHelper(context, FILE_NAME, null, 8) {
 		override fun onCreate(db: SQLiteDatabase) {
 			db.createScans()
 		}
@@ -272,6 +288,12 @@ class Database {
 			if (oldVersion < 6) {
 				db.migrateToVersionString()
 			}
+			if (oldVersion < 7) {
+				db.addDataMaskColumn()
+			}
+			if (oldVersion < 8) {
+				db.addSymbolColumns()
+			}
 		}
 	}
 
@@ -281,12 +303,16 @@ class Database {
 		const val SCANS_ID = "_id"
 		const val SCANS_DATETIME = "_datetime"
 		const val SCANS_NAME = "name"
-		const val SCANS_CONTENT = "content"
+		const val SCANS_TEXT = "content"
 		const val SCANS_RAW = "raw"
 		const val SCANS_FORMAT = "format"
 		const val SCANS_ERROR_CORRECTION_LEVEL = "error_correction_level"
 		const val SCANS_VERSION_NUMBER = "version_number"
 		const val SCANS_VERSION = "version"
+		const val SCANS_DATA_MASK = "data_mask"
+		const val SCANS_SYMBOL_WIDTH = "symbol_width"
+		const val SCANS_SYMBOL_HEIGHT = "symbol_height"
+		const val SCANS_SYMBOL_DATA = "symbol_data"
 		const val SCANS_ISSUE_NUMBER = "issue_number"
 		const val SCANS_ORIENTATION = "orientation"
 		const val SCANS_OTHER_META_DATA = "other_meta_data"
@@ -309,11 +335,15 @@ class Database {
 					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
 					$SCANS_DATETIME DATETIME NOT NULL,
 					$SCANS_NAME TEXT,
-					$SCANS_CONTENT TEXT NOT NULL,
+					$SCANS_TEXT TEXT NOT NULL,
 					$SCANS_RAW BLOB,
 					$SCANS_FORMAT TEXT NOT NULL,
 					$SCANS_ERROR_CORRECTION_LEVEL TEXT,
 					$SCANS_VERSION TEXT,
+					$SCANS_DATA_MASK INTEGER,
+					$SCANS_SYMBOL_WIDTH INTEGER,
+					$SCANS_SYMBOL_HEIGHT INTEGER,
+					$SCANS_SYMBOL_DATA BLOB,
 					$SCANS_SEQUENCE_SIZE INTEGER,
 					$SCANS_SEQUENCE_INDEX INTEGER,
 					$SCANS_SEQUENCE_ID TEXT,
@@ -341,7 +371,7 @@ class Database {
 		}
 
 		private fun SQLiteDatabase.addNameColumn() {
-			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT")
 		}
 
 		private fun SQLiteDatabase.migrateToZxingCpp() {
@@ -365,5 +395,16 @@ class Database {
 			execSQL("ALTER TABLE $SCANS ADD $SCANS_VERSION TEXT")
 			execSQL("UPDATE $SCANS SET $SCANS_VERSION = $SCANS_VERSION_NUMBER")
 		}
+
+		private fun SQLiteDatabase.addDataMaskColumn() {
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_DATA_MASK INTEGER")
+			execSQL("UPDATE $SCANS SET $SCANS_DATA_MASK = -1")
+		}
+
+		private fun SQLiteDatabase.addSymbolColumns() {
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_SYMBOL_WIDTH INTEGER")
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_SYMBOL_HEIGHT INTEGER")
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_SYMBOL_DATA BLOB")
+		}
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/JsonExport.kt

@@ -25,7 +25,7 @@ fun Cursor.exportJson(): String? {
 		Database.SCANS_DATETIME,
 		Database.SCANS_FORMAT,
 		Database.SCANS_NAME,
-		Database.SCANS_CONTENT,
+		Database.SCANS_TEXT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
 		Database.SCANS_VERSION,
 		Database.SCANS_SEQUENCE_SIZE,
@@ -39,7 +39,7 @@ fun Cursor.exportJson(): String? {
 	val indices = columns.map {
 		Pair(getColumnIndex(it), it)
 	}
-	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	val contentIndex = getColumnIndex(Database.SCANS_TEXT)
 	val rawIndex = getColumnIndex(Database.SCANS_RAW)
 	val root = JSONArray()
 	do {
@@ -70,7 +70,7 @@ private fun Cursor.toJsonObject(
 			obj.put(it.second, value ?: "")
 		}
 		obj
-	} catch (e: JSONException) {
+	} catch (_: JSONException) {
 		obj
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/database/Scan.kt

@@ -1,21 +1,23 @@
 package de.markusfisch.android.binaryeye.database
 
-import android.graphics.Bitmap
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
 import android.text.format.DateFormat
-import de.markusfisch.android.zxingcpp.ZxingCpp
 import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import de.markusfisch.android.zxingcpp.ZxingCpp.BitMatrix
 import de.markusfisch.android.zxingcpp.ZxingCpp.ContentType
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import java.util.Locale
 
 data class Scan(
-	val content: String,
+	val text: String,
 	val raw: ByteArray?,
 	val format: BarcodeFormat,
 	val errorCorrectionLevel: String? = null,
 	val version: String? = null,
+	val dataMask: Int = -1,
+	val symbol: BitMatrix? = null,
 	val sequenceSize: Int = -1,
 	val sequenceIndex: Int = -1,
 	val sequenceId: String = "",
@@ -41,12 +43,13 @@ data class Scan(
 
 		return id == other.id &&
 				dateTime == other.dateTime &&
-				content == other.content &&
+				text == other.text &&
 				((raw == null && other.raw == null) ||
 						(raw != null && other.raw != null && raw.contentEquals(other.raw))) &&
 				format == other.format &&
 				errorCorrectionLevel == other.errorCorrectionLevel &&
 				version == other.version &&
+				dataMask == other.dataMask &&
 				sequenceSize == other.sequenceSize &&
 				sequenceIndex == other.sequenceIndex &&
 				sequenceId == other.sequenceId &&
@@ -61,11 +64,12 @@ data class Scan(
 	override fun hashCode(): Int {
 		var result = id.hashCode()
 		result = 31 * result + dateTime.hashCode()
-		result = 31 * result + content.hashCode()
+		result = 31 * result + text.hashCode()
 		result = 31 * result + (raw?.contentHashCode() ?: 0)
 		result = 31 * result + format.hashCode()
 		result = 31 * result + (errorCorrectionLevel?.hashCode() ?: 0)
 		result = 31 * result + version.hashCode()
+		result = 31 * result + dataMask
 		result = 31 * result + sequenceSize
 		result = 31 * result + sequenceIndex
 		result = 31 * result + sequenceId.hashCode()
@@ -77,11 +81,13 @@ data class Scan(
 	}
 
 	private constructor(parcel: Parcel) : this(
-		content = parcel.readString() ?: "",
+		text = parcel.readString() ?: "",
 		raw = parcel.readSizedByteArray(),
 		format = BarcodeFormat.valueOf(parcel.readString() ?: ""),
 		errorCorrectionLevel = parcel.readString(),
 		version = parcel.readString(),
+		dataMask = parcel.readInt(),
+		symbol = parcel.readBitMatrix(),
 		sequenceSize = parcel.readInt(),
 		sequenceIndex = parcel.readInt(),
 		sequenceId = parcel.readString() ?: "",
@@ -96,11 +102,13 @@ data class Scan(
 
 	override fun writeToParcel(parcel: Parcel, flags: Int) {
 		parcel.apply {
-			writeString(content)
+			writeString(text)
 			writeSizedByteArray(raw)
 			writeString(format.name)
 			writeString(errorCorrectionLevel)
 			writeString(version)
+			writeInt(dataMask)
+			writeBitMatrix(symbol)
 			writeInt(sequenceSize)
 			writeInt(sequenceIndex)
 			writeString(sequenceId)
@@ -132,12 +140,14 @@ fun Result.toScan(): Scan {
 			ContentType.ISO15434,
 			ContentType.TEXT -> text
 
-			else -> ""
+			else -> "" // Show as binary.
 		},
 		rawBytes,
 		format,
 		ecLevel,
 		version,
+		dataMask,
+		symbol,
 		sequenceSize,
 		sequenceIndex,
 		sequenceId,
@@ -148,37 +158,6 @@ fun Result.toScan(): Scan {
 	)
 }
 
-data class Recreation(
-	val format: BarcodeFormat,
-	val ecLevel: Int,
-	val size: Int,
-	val margin: Int
-) {
-	fun <T> encode(content: T): Bitmap? = try {
-		ZxingCpp.encodeAsBitmap(
-			content, format, size, size, margin, ecLevel
-		)
-	} catch (_: RuntimeException) {
-		null
-	}
-}
-
-fun Scan.toRecreation(
-	size: Int = 128,
-	margin: Int = -1
-) = Recreation(
-	format,
-	when (errorCorrectionLevel) {
-		"L" -> 0
-		"M" -> 4
-		"Q" -> 6
-		"H" -> 8
-		else -> -1
-	},
-	size,
-	margin
-)
-
 private fun getDateTime(
 	time: Long = System.currentTimeMillis()
 ) = DateFormat.format(
@@ -190,7 +169,11 @@ private fun getDateTime(
 		"yyyy-MM-dd HH:mm:ss"
 	},
 	time
-).toString()
+).toString() + String.format(
+	Locale.getDefault(),
+	":%03d",
+	time % 1000
+)
 
 private fun Parcel.writeSizedByteArray(array: ByteArray?) {
 	val size = array?.size ?: 0
@@ -210,3 +193,21 @@ private fun Parcel.readSizedByteArray(): ByteArray? {
 		null
 	}
 }
+
+private fun Parcel.writeBitMatrix(bm: BitMatrix?) {
+	writeInt(bm?.width ?: 0)
+	bm?.let {
+		writeInt(bm.height)
+		writeSizedByteArray(bm.data)
+	}
+}
+
+private fun Parcel.readBitMatrix(): BitMatrix? {
+	val width = readInt()
+	if (width < 1) {
+		return null
+	}
+	val height = readInt()
+	val data = readSizedByteArray() ?: return null
+	return BitMatrix(width, height, data)
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/BarcodeFragment.kt

@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.app.AlertDialog
 import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.Matrix
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
@@ -14,19 +15,25 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.EditText
+import android.widget.ImageView
+import android.widget.SeekBar
+import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.db
 import de.markusfisch.android.binaryeye.app.hasWritePermission
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.content.Barcode
+import de.markusfisch.android.binaryeye.content.BarcodeColors
+import de.markusfisch.android.binaryeye.content.BitMatrixBarcode
+import de.markusfisch.android.binaryeye.content.ContentBarcode
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.shareFile
 import de.markusfisch.android.binaryeye.content.shareText
 import de.markusfisch.android.binaryeye.database.toScan
-import de.markusfisch.android.binaryeye.graphics.COLOR_BLACK
-import de.markusfisch.android.binaryeye.graphics.COLOR_WHITE
 import de.markusfisch.android.binaryeye.io.addSuffixIfNotGiven
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.io.writeExternalFile
+import de.markusfisch.android.binaryeye.net.createEncodeDeeplink
 import de.markusfisch.android.binaryeye.os.getScreenBrightness
 import de.markusfisch.android.binaryeye.os.setScreenBrightness
 import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets
@@ -45,6 +52,7 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.util.Locale
+import kotlin.math.max
 import kotlin.math.min
 
 class BarcodeFragment : Fragment() {
@@ -55,11 +63,12 @@ class BarcodeFragment : Fragment() {
 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
 
+	private lateinit var imageView: ConfinedScalingImageView
 	private lateinit var barcode: Barcode<*>
 	private lateinit var addToHistoryItem: MenuItem
 	private lateinit var brightenScreenItem: MenuItem
 
-	private var currentBrightness = -1f;
+	private var currentBrightness = -1f
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -80,6 +89,9 @@ class BarcodeFragment : Fragment() {
 			false
 		)
 
+		// Make `imageView` available for `onPause()`.
+		imageView = view.findViewById(R.id.barcode)
+
 		val bitmap: Bitmap
 		try {
 			barcode = arguments?.toBarcode() ?: throw IllegalArgumentException(
@@ -99,15 +111,20 @@ class BarcodeFragment : Fragment() {
 			return null
 		}
 
-		val imageView = view.findViewById<ConfinedScalingImageView>(
-			R.id.barcode
-		)
 		imageView.setImageBitmap(bitmap)
-		imageView.post {
-			// Make sure to invoke this after ScalingImageView.onLayout().
+		imageView.runAfterLayout = {
+			val scale = prefs.previewScale
+			if (scale > 0) {
+				imageView.setScale(
+					scale,
+					bitmap.width / 2f,
+					bitmap.height / 2f
+				)
+			}
+
 			imageView.minWidth = min(
 				imageView.minWidth / 2f,
-				barcode.size.toFloat()
+				max(bitmap.width, bitmap.height).toFloat()
 			)
 		}
 
@@ -119,28 +136,47 @@ class BarcodeFragment : Fragment() {
 			}
 		}
 
-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
-		imageView.doOnApplyWindowInsets { v, insets ->
-			(v as ConfinedScalingImageView).insets.set(insets)
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
+		imageView.doOnApplyWindowInsets { _, insets ->
+			imageView.insets.set(insets)
 		}
 
 		return view
 	}
 
-	private fun Bundle.toBarcode() = Barcode(
-		getString(CONTENT_TEXT) ?: getByteArray(CONTENT_RAW) ?: throw IllegalArgumentException(
-			"content cannot be null"
-		),
-		BarcodeFormat.valueOf(
+	private fun Bundle.toBarcode(): Barcode<*> {
+		val content =
+			getString(CONTENT_TEXT) ?: getByteArray(CONTENT_RAW) ?: throw IllegalArgumentException(
+				"content cannot be null"
+			)
+		val barcodeFormat = BarcodeFormat.valueOf(
 			getString(FORMAT) ?: throw IllegalArgumentException(
 				"format cannot be null"
 			)
-		),
-		getInt(SIZE),
-		getInt(MARGIN),
-		getInt(EC_LEVEL),
-		Colors.entries[getInt(COLORS)]
-	)
+		)
+		val colors = BarcodeColors.entries[getInt(COLORS)]
+		val data = getByteArray(BIT_MATRIX_DATA)
+		return if (data != null) {
+			BitMatrixBarcode(
+				ZxingCpp.BitMatrix(
+					getInt(BIT_MATRIX_WIDTH),
+					getInt(BIT_MATRIX_HEIGHT),
+					data
+				),
+				content,
+				barcodeFormat,
+				colors
+			)
+		} else {
+			ContentBarcode(
+				content,
+				barcodeFormat,
+				getInt(EC_LEVEL),
+				getInt(MARGIN),
+				colors
+			)
+		}
+	}
 
 	override fun onResume() {
 		super.onResume()
@@ -157,6 +193,9 @@ class BarcodeFragment : Fragment() {
 		if (currentBrightness > -1f) {
 			restoreScreenBrightness()
 		}
+		if (imageView.isInBounds()) {
+			prefs.previewScale = imageView.getScale()
+		}
 	}
 
 	override fun onDestroyView() {
@@ -173,23 +212,35 @@ class BarcodeFragment : Fragment() {
 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
 			R.id.add_to_history -> {
-				readAndAddToHistory(barcode.bitmap(), barcode.format)
+				readAndAddToHistory(
+					barcode.bitmap(),
+					barcode.format
+				)
 				addToHistoryItem.isVisible = false
 				context.toast(R.string.added_to_history)
 				true
 			}
 
 			R.id.copy_to_clipboard -> {
-				context.apply {
-					copyToClipboard(barcode.text())
-					toast(R.string.copied_to_clipboard)
-				}
+				copyToClipboard(barcode.text())
+				true
+			}
+
+			R.id.copy_as_deeplink -> {
+				copyToClipboard(deeplinkToCopy())
 				true
 			}
 
 			R.id.export_to_file -> {
-				context.pickFileType(R.string.export_as) {
-					askForFileNameAndSave(it)
+				context.pickFileType(R.string.export_as) { fileType ->
+					when (fileType) {
+						FileType.PNG,
+						FileType.JPG -> askForSize { size ->
+							askForFileNameAndSave(fileType, size)
+						}
+
+						else -> askForFileNameAndSave(fileType, 0)
+					}
 				}
 				true
 			}
@@ -209,6 +260,18 @@ class BarcodeFragment : Fragment() {
 		}
 	}
 
+	private fun copyToClipboard(text: String, isSensitive: Boolean = false) {
+		activity?.apply {
+			copyToClipboard(text, isSensitive)
+			toast(R.string.copied_to_clipboard)
+		}
+	}
+
+	private fun deeplinkToCopy() = createEncodeDeeplink(
+		format = barcode.format.name,
+		content = barcode.textOrHex(),
+	)
+
 	private fun Context.pickFileType(
 		title: Int,
 		action: (FileType) -> Unit
@@ -224,11 +287,13 @@ class BarcodeFragment : Fragment() {
 
 	// Dialogs do not have a parent view.
 	@SuppressLint("InflateParams")
-	private fun askForFileNameAndSave(fileType: FileType) {
+	private fun askForFileNameAndSave(fileType: FileType, bitmapSize: Int) {
 		val ac = activity ?: return
 		// Write permission is only required before Android Q.
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-			!ac.hasWritePermission { askForFileNameAndSave(fileType) }
+			!ac.hasWritePermission {
+				askForFileNameAndSave(fileType, bitmapSize)
+			}
 		) {
 			return
 		}
@@ -246,28 +311,28 @@ class BarcodeFragment : Fragment() {
 						addSuffixIfNotGiven(fileName, ".png"),
 						MIME_PNG
 					) {
-						barcode.bitmap().saveAsPng(it)
+						barcode.bitmap(bitmapSize).saveAsPng(it)
 					}
 
 					FileType.JPG -> saveAs(
 						addSuffixIfNotGiven(fileName, ".jpg"),
 						MIME_JPG
 					) {
-						barcode.bitmap().saveAsJpg(it)
+						barcode.bitmap(bitmapSize).saveAsJpg(it)
 					}
 
 					FileType.SVG -> saveAs(
 						addSuffixIfNotGiven(fileName, ".svg"),
 						MIME_SVG
-					) { outputStream ->
-						outputStream.write(barcode.svg().toByteArray())
+					) {
+						it.write(barcode.svg().toByteArray())
 					}
 
 					FileType.TXT -> saveAs(
 						addSuffixIfNotGiven(fileName, ".txt"),
 						MIME_TXT
-					) { outputStream ->
-						outputStream.write(barcode.text().toByteArray())
+					) {
+						it.write(barcode.text().toByteArray())
 					}
 				}
 			}
@@ -276,6 +341,52 @@ class BarcodeFragment : Fragment() {
 			.show()
 	}
 
+	// Dialogs do not have a parent view.
+	@SuppressLint("InflateParams")
+	private fun askForSize(write: (size: Int) -> Unit) {
+		val ac = activity ?: return
+		val view = ac.layoutInflater.inflate(R.layout.dialog_size, null)
+		val sizeView = view.findViewById<TextView>(R.id.size_display)
+		val sizeBarView = view.findViewById<SeekBar>(R.id.size_bar)
+		sizeBarView.initSizeBar(sizeView)
+		AlertDialog.Builder(ac)
+			.setView(view)
+			.setPositiveButton(android.R.string.ok) { _, _ ->
+				write(getSize(sizeBarView.progress))
+			}
+			.setNegativeButton(android.R.string.cancel) { _, _ ->
+			}
+			.show()
+	}
+
+	private fun SeekBar.initSizeBar(sizeView: TextView) {
+		sizeView.updateSize(progress)
+		setOnSeekBarChangeListener(
+			object : SeekBar.OnSeekBarChangeListener {
+				override fun onProgressChanged(
+					seekBar: SeekBar,
+					progressValue: Int,
+					fromUser: Boolean
+				) {
+					sizeView.updateSize(progressValue)
+				}
+
+				override fun onStartTrackingTouch(seekBar: SeekBar) {}
+
+				override fun onStopTrackingTouch(seekBar: SeekBar) {}
+			}
+		)
+	}
+
+	private fun TextView.updateSize(power: Int) {
+		val size = getSize(power)
+		text = if (size > 0) {
+			getString(R.string.size_width_by_height, size, size)
+		} else {
+			getString(R.string.size_no_magnification)
+		}
+	}
+
 	private fun saveAs(
 		fileName: String,
 		mimeType: String,
@@ -292,8 +403,14 @@ class BarcodeFragment : Fragment() {
 
 	private fun Context.shareAs(fileType: FileType) {
 		when (fileType) {
-			FileType.PNG -> share(barcode.bitmap(), MIME_PNG, "png")
-			FileType.JPG -> share(barcode.bitmap(), MIME_JPG, "jpg")
+			FileType.PNG -> askForSize {
+				share(barcode.bitmap(it), MIME_PNG, "png")
+			}
+
+			FileType.JPG -> askForSize {
+				share(barcode.bitmap(it), MIME_JPG, "jpg")
+			}
+
 			FileType.SVG -> shareText(barcode.svg(), MIME_SVG)
 			FileType.TXT -> shareText(barcode.text())
 		}
@@ -316,7 +433,7 @@ class BarcodeFragment : Fragment() {
 					}
 				}
 				true
-			} catch (e: IOException) {
+			} catch (_: IOException) {
 				false
 			}
 			withContext(Dispatchers.Main) {
@@ -332,48 +449,90 @@ class BarcodeFragment : Fragment() {
 	private fun brightenScreen() {
 		activity?.let {
 			currentBrightness = it.getScreenBrightness()
-			it.setScreenBrightness(1f);
+			it.setScreenBrightness(1f)
 			brightenScreenItem.isChecked = true
 		}
 	}
 
 	private fun restoreScreenBrightness() {
 		if (currentBrightness > -1f) {
-			activity?.setScreenBrightness(currentBrightness);
+			activity?.setScreenBrightness(currentBrightness)
 			currentBrightness = -1f
 			brightenScreenItem.isChecked = false
 		}
 	}
 
 	companion object {
+		private const val BIT_MATRIX_WIDTH = "bit_matrix_width"
+		private const val BIT_MATRIX_HEIGHT = "bit_matrix_height"
+		private const val BIT_MATRIX_DATA = "bit_matrix_data"
 		private const val CONTENT_TEXT = "content_text"
 		private const val CONTENT_RAW = "content_raw"
 		private const val FORMAT = "format"
-		private const val SIZE = "size"
-		private const val MARGIN = "margin"
 		private const val EC_LEVEL = "ec_level"
+		private const val MARGIN = "margin"
 		private const val COLORS = "colors"
 		private const val MIME_PNG = "image/png"
 		private const val MIME_JPG = "image/jpeg"
 		private const val MIME_SVG = "image/svg+xmg"
 		private const val MIME_TXT = "text/plain"
 
-		fun <T> newInstance(
-			content: T,
-			format: BarcodeFormat,
-			size: Int,
-			margin: Int,
-			ecLevel: Int = -1,
+		fun newInstance(
+			barcode: Barcode<*>,
 			colors: Int = 0
 		): Fragment {
 			val args = Bundle()
+			when (barcode) {
+				is ContentBarcode -> args.putEcLevelMargin(
+					barcode.ecLevel,
+					barcode.margin
+				)
+
+				is BitMatrixBarcode -> {
+					args.putInt(BIT_MATRIX_WIDTH, barcode.bitMatrix.width)
+					args.putInt(BIT_MATRIX_HEIGHT, barcode.bitMatrix.height)
+					args.putByteArray(BIT_MATRIX_DATA, barcode.bitMatrix.data)
+				}
+
+				else -> throw IllegalArgumentException("unknown barcode")
+			}
+			args.putContentFormatColors(
+				barcode.content,
+				barcode.format,
+				colors
+			)
+			val fragment = BarcodeFragment()
+			fragment.arguments = args
+			return fragment
+		}
+
+		fun <T> newInstance(
+			content: T,
+			format: BarcodeFormat,
+			ecLevel: Int = -1,
+			margin: Int = -1,
+			colors: Int = 0
+		): Fragment {
+			val args = Bundle()
+			args.putContentFormatColors(content, format, colors)
+			args.putEcLevelMargin(ecLevel, margin)
+			val fragment = BarcodeFragment()
+			fragment.arguments = args
+			return fragment
+		}
+
+		private fun <T> Bundle.putContentFormatColors(
+			content: T,
+			format: BarcodeFormat,
+			colors: Int
+		) {
 			when (content) {
 				is String -> {
-					args.putString(CONTENT_TEXT, content)
+					putString(CONTENT_TEXT, content)
 				}
 
 				is ByteArray -> {
-					args.putByteArray(CONTENT_RAW, content)
+					putByteArray(CONTENT_RAW, content)
 				}
 
 				else -> {
@@ -382,77 +541,32 @@ class BarcodeFragment : Fragment() {
 					)
 				}
 			}
-			args.putString(FORMAT, format.name)
-			args.putInt(SIZE, size)
-			args.putInt(MARGIN, margin)
-			args.putInt(EC_LEVEL, ecLevel)
-			args.putInt(COLORS, colors)
-			val fragment = BarcodeFragment()
-			fragment.arguments = args
-			return fragment
+			putString(FORMAT, format.name)
+			putInt(COLORS, colors)
+		}
+
+		private fun Bundle.putEcLevelMargin(
+			ecLevel: Int,
+			margin: Int
+		) {
+			putInt(EC_LEVEL, ecLevel)
+			putInt(MARGIN, margin)
 		}
 	}
 }
 
-private data class Barcode<T>(
-	val content: T,
-	val format: BarcodeFormat,
-	val size: Int,
-	val margin: Int,
-	val ecLevel: Int,
-	val colors: Colors
-) {
-	private var _bitmap: Bitmap? = null
-	fun bitmap(): Bitmap {
-		val b = _bitmap ?: ZxingCpp.encodeAsBitmap(
-			content, format, size, size, margin, ecLevel,
-			setColor = colors.foregroundColor(),
-			unsetColor = colors.backgroundColor()
-		)
-		_bitmap = b
-		return b
-	}
-
-	private var _svg: String? = null
-	fun svg(): String {
-		val s = _svg ?: ZxingCpp.encodeAsSvg(
-			content, format, margin, ecLevel
-		)
-		_svg = s
-		return s
-	}
-
-	private var _text: String? = null
-	fun text(): String {
-		val t = _text ?: ZxingCpp.encodeAsText(
-			content, format, margin, ecLevel,
-			inverted = colors == Colors.BLACK_ON_WHITE
-		)
-		_text = t
-		return t
+private fun ImageView.setScale(scale: Float, x: Float, y: Float) {
+	imageMatrix = Matrix().apply {
+		setTranslate(-x, -y)
+		postScale(scale, scale)
+		postTranslate(x, y)
 	}
 }
 
-private enum class Colors {
-	BLACK_ON_WHITE,
-	WHITE_ON_BLACK,
-	BLACK_ON_TRANSPARENT,
-	WHITE_ON_TRANSPARENT;
-
-	fun foregroundColor(): Int = when (this) {
-		BLACK_ON_WHITE,
-		BLACK_ON_TRANSPARENT -> COLOR_BLACK
-
-		WHITE_ON_BLACK,
-		WHITE_ON_TRANSPARENT -> COLOR_WHITE
-	}
-
-	fun backgroundColor(): Int = when (this) {
-		BLACK_ON_WHITE -> COLOR_WHITE
-		WHITE_ON_BLACK -> COLOR_BLACK
-		BLACK_ON_TRANSPARENT,
-		WHITE_ON_TRANSPARENT -> 0
-	}
+private fun ImageView.getScale(): Float {
+	val values = FloatArray(9)
+	imageMatrix.getValues(values)
+	return values[Matrix.MSCALE_X]
 }
 
 private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =
@@ -468,6 +582,11 @@ private fun encodeFileName(name: String): String = fileNameCharacters
 	.trim('_')
 	.lowercase(Locale.getDefault())
 
+private fun getSize(step: Int) = when (step) {
+	0 -> 0
+	else -> 128 shl (step - 1)
+}
+
 private fun readAndAddToHistory(
 	bitmap: Bitmap,
 	format: BarcodeFormat

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/DecodeFragment.kt

@@ -1,5 +1,6 @@
 package de.markusfisch.android.binaryeye.fragment
 
+import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.support.design.widget.FloatingActionButton
@@ -24,7 +25,12 @@ import android.widget.TableRow
 import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.ActionRegistry
-import de.markusfisch.android.binaryeye.actions.IAction
+import de.markusfisch.android.binaryeye.actions.mail.MatMsg
+import de.markusfisch.android.binaryeye.actions.mail.MatMsgAction
+import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
+import de.markusfisch.android.binaryeye.actions.vtype.vcard.VCardAction
+import de.markusfisch.android.binaryeye.actions.vtype.vevent.VEventAction
+import de.markusfisch.android.binaryeye.actions.web.WebAction
 import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
 import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
 import de.markusfisch.android.binaryeye.activity.MainActivity
@@ -34,19 +40,25 @@ import de.markusfisch.android.binaryeye.app.db
 import de.markusfisch.android.binaryeye.app.hasLocationPermission
 import de.markusfisch.android.binaryeye.app.hasWritePermission
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.content.ContentBarcode
+import de.markusfisch.android.binaryeye.content.IdlParser
 import de.markusfisch.android.binaryeye.content.copyToClipboard
+import de.markusfisch.android.binaryeye.content.idlToRes
 import de.markusfisch.android.binaryeye.content.shareAsFile
 import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.content.toBarcode
+import de.markusfisch.android.binaryeye.content.toErrorCorrectionInt
 import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.content.wipeLastShareFile
-import de.markusfisch.android.binaryeye.database.Recreation
 import de.markusfisch.android.binaryeye.database.Scan
-import de.markusfisch.android.binaryeye.database.toRecreation
 import de.markusfisch.android.binaryeye.io.askForFileName
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.io.writeExternalFile
+import de.markusfisch.android.binaryeye.net.createEncodeDeeplink
+import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.toast
+import de.markusfisch.android.zxingcpp.ZxingCpp
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -65,6 +77,7 @@ class DecodeFragment : Fragment() {
 	private lateinit var recreationView: ImageView
 	private lateinit var labelView: EditText
 	private lateinit var fab: FloatingActionButton
+	private lateinit var scan: Scan
 	private lateinit var format: String
 
 	private val parentJob = Job()
@@ -78,9 +91,8 @@ class DecodeFragment : Fragment() {
 	private var action = ActionRegistry.DEFAULT_ACTION
 	private var isBinary = false
 	private var originalBytes: ByteArray = ByteArray(0)
-	private var id = 0L
-	private var recreation: Recreation? = null
 	private var label: String? = null
+	private var recreationSize = 0
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -100,21 +112,20 @@ class DecodeFragment : Fragment() {
 			false
 		)
 
-		closeAutomatically = prefs.closeAutomatically &&
-				activity?.intent?.hasExtra(MainActivity.DECODED) == true
+		val justScanned = activity?.intent?.hasExtra(MainActivity.DECODED) == true
+		closeAutomatically = prefs.closeAutomatically && justScanned
 
-		val scan = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+		scan = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
 			arguments?.getParcelable(SCAN, Scan::class.java)
 		} else {
 			@Suppress("DEPRECATION")
-			arguments?.getParcelable(SCAN) as Scan?
+			arguments?.getParcelable(SCAN)
 		} ?: throw IllegalArgumentException("DecodeFragment needs a Scan")
 
-		val originalContent = scan.content
-		isBinary = scan.content.isEmpty()
-		originalBytes = scan.raw ?: originalContent.toByteArray()
+		isBinary = scan.text.isEmpty()
+		originalBytes = scan.raw ?: scan.text.toByteArray()
 		format = scan.format.name
-		id = scan.id
+		recreationSize = (200f * dp).roundToInt()
 
 		contentView = view.findViewById(R.id.content)
 		formatView = view.findViewById(R.id.format)
@@ -126,19 +137,13 @@ class DecodeFragment : Fragment() {
 		labelView = view.findViewById(R.id.label)
 		fab = view.findViewById(R.id.open)
 
-		initContentAndFab(originalContent)
-
 		if (prefs.showMetaData) {
 			metaView.fillMetaView(scan)
 		} else {
 			metaView.visibility = View.GONE
 		}
-		if (prefs.showRecreation) {
-			recreation = scan.toRecreation(
-				(200f * dp).roundToInt()
-			)
-		}
-		if (id > 0) {
+
+		if (scan.id > 0) {
 			scan.label?.let {
 				labelView.setText(it)
 				label = it
@@ -147,16 +152,18 @@ class DecodeFragment : Fragment() {
 			labelView.visibility = View.GONE
 		}
 
-		updateViewsAndFab(originalContent, originalBytes)
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.scroll_view).setPaddingFromWindowInsets()
 
-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
-		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
+		initContentAndFab(justScanned)
+		updateViewsAndFab(scan.text, originalBytes)
 
 		return view
 	}
 
 	override fun onPause() {
 		super.onPause()
+		val id = scan.id
 		if (id > 0) {
 			val newLabel = labelView.text.toString().trim()
 			if (newLabel != (label ?: "")) {
@@ -172,7 +179,7 @@ class DecodeFragment : Fragment() {
 		wipeLastShareFile()
 	}
 
-	private fun initContentAndFab(originalContent: String) {
+	private fun initContentAndFab(justScanned: Boolean) {
 		if (isBinary) {
 			contentView.setText(String(originalBytes).foldNonAlNum())
 			contentView.isEnabled = false
@@ -181,7 +188,7 @@ class DecodeFragment : Fragment() {
 				askForFileNameAndSave(originalBytes)
 			}
 		} else {
-			contentView.setText(originalContent)
+			contentView.setText(scan.text)
 			contentView.addTextChangedListener(object : TextWatcher {
 				override fun afterTextChanged(s: Editable?) {
 					updateViewsAndFab(s?.toString() ?: "")
@@ -202,10 +209,11 @@ class DecodeFragment : Fragment() {
 				) = Unit
 			})
 			fab.setOnClickListener {
-				executeAction(content)
+				executeAction(this.content)
 			}
-			if (prefs.openImmediately) {
-				executeAction(content)
+			if (justScanned && prefs.openImmediately) {
+				executeAction(this.content)
+				backOrFinish()
 			}
 		}
 	}
@@ -217,17 +225,16 @@ class DecodeFragment : Fragment() {
 	}
 
 	private fun resolveActionAndUpdateFab(bytes: ByteArray) {
-		val prevAction = action
-		if (!prevAction.canExecuteOn(bytes)) {
-			action = ActionRegistry.getAction(bytes)
+		if (!isBinary) {
+			val prevAction = action
+			if (!prevAction.canExecuteOn(bytes)) {
+				action = ActionRegistry.getAction(bytes)
+			}
+			if (prevAction !== action) {
+				fab.setImageResource(action.iconResId)
+			}
 		}
-		if (prevAction !== action) {
-			updateFab(action)
-		}
-	}
-
-	private fun updateFab(action: IAction) {
-		fab.setImageResource(action.iconResId)
+		// Run this for the initial action too.
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
 			fab.setOnLongClickListener { v ->
 				v.context.toast(action.titleResId)
@@ -249,27 +256,58 @@ class DecodeFragment : Fragment() {
 			v.text = hexDump(bytes)
 		}
 		recreationView.showIf(prefs.showRecreation) { v ->
-			val r = recreation ?: return@showIf
-			val content = if (isBinary) bytes else text
-			v.setImageBitmap(r.encode(content))
-			v.setOnClickListener {
-				fragmentManager?.addFragment(
-					BarcodeFragment.newInstance(
-						content,
-						r.format,
-						r.size,
-						r.margin,
-						r.ecLevel
-					)
+			val unmodified: Boolean
+			val content = if (isBinary) {
+				if (bytes.isEmpty()) {
+					clearRecreation()
+					return@showIf
+				}
+				unmodified = bytes.contentEquals(originalBytes)
+				bytes
+			} else {
+				if (text.isEmpty()) {
+					clearRecreation()
+					return@showIf
+				}
+				unmodified = text == scan.text
+				text
+			}
+			val barcode = if (unmodified) {
+				scan.toBarcode()
+			} else {
+				ContentBarcode(
+					content,
+					scan.format,
+					scan.errorCorrectionLevel.toErrorCorrectionInt()
 				)
 			}
+			try {
+				v.setImageBitmap(barcode.bitmap(recreationSize))
+				v.setOnClickListener {
+					v.context.hideSoftKeyboard(contentView)
+					v.post {
+						fragmentManager?.addFragment(
+							BarcodeFragment.newInstance(barcode)
+						)
+					}
+				}
+			} catch (_: RuntimeException) {
+				clearRecreation()
+			}
 		}
 		dataView.fillDataView(text, bytes)
 		stampView.setTrackingLink(bytes, format)
 	}
 
+	private fun clearRecreation() {
+		recreationView.apply {
+			setImageBitmap(null)
+			setOnClickListener(null)
+		}
+	}
+
 	private fun TableLayout.fillDataView(text: String, bytes: ByteArray) {
-		val items = LinkedHashMap<Int, CharSequence?>()
+		val items = LinkedHashMap<Any, CharSequence?>()
 		when (prefs.showChecksum) {
 			"CRC4" -> items[R.string.crc4] = String.format("%X", crc4(bytes))
 			"MD5" -> items[R.string.md5] = bytes.md5().toHexString().fold()
@@ -277,8 +315,51 @@ class DecodeFragment : Fragment() {
 			"SHA256" -> items[R.string.sha256] = bytes.sha256().toHexString().fold()
 			else -> Unit
 		}
-		if (action is WifiAction) {
-			WifiConnector.parseMap(text)?.let { wifiData ->
+		IdlParser.parse(String(bytes))?.let {
+			items.putAll(mapOf("IIN" to it.iin))
+			items.putAll(
+				it.elements.entries.associate { (id, value) ->
+					context.idlToRes(id) to value
+				}
+			)
+		}
+		when (action) {
+			is MatMsgAction -> items.putAll(
+				MatMsg(text).run {
+					mapOf(
+						R.string.email_to to to,
+						R.string.email_subject to sub,
+						R.string.email_body to body
+					)
+				}
+			)
+
+			is VCardAction,
+			is VEventAction -> VTypeParser.parseMap(text).let { vData ->
+				items.putAll(
+					vData.map { item ->
+						item.key to item.value.joinToString("\n") {
+							it.value
+						}
+					}.toMap()
+				)
+			}
+
+			is WebAction -> try {
+				items.putAll(
+					Uri.parse(text).run {
+						mapOf(
+							R.string.scheme to scheme,
+							R.string.host to host,
+							R.string.query to query
+						)
+					}
+				)
+			} catch (_: Exception) {
+				// Ignore
+			}
+
+			is WifiAction -> WifiConnector.parseMap(text)?.let { wifiData ->
 				items.putAll(
 					linkedMapOf(
 						R.string.entry_type to getString(R.string.wifi_network),
@@ -298,7 +379,7 @@ class DecodeFragment : Fragment() {
 	}
 
 	private fun TableLayout.fillMetaView(scan: Scan) {
-		val items = linkedMapOf<Int, CharSequence?>(
+		val items = linkedMapOf<Any, CharSequence?>(
 			R.string.error_correction_level to scan.errorCorrectionLevel,
 			R.string.sequence_size to scan.sequenceSize.positiveToString(),
 			R.string.sequence_index to scan.sequenceIndex.positiveToString(),
@@ -324,11 +405,20 @@ class DecodeFragment : Fragment() {
 				)
 			)
 		}
+		if (scan.format == ZxingCpp.BarcodeFormat.QR_CODE &&
+			scan.dataMask > -1
+		) {
+			items.putAll(
+				linkedMapOf(
+					R.string.qr_data_mask to scan.dataMask.toString()
+				)
+			)
+		}
 		fill(items)
 	}
 
 	private fun TableLayout.fill(
-		items: LinkedHashMap<Int, CharSequence?>
+		items: LinkedHashMap<Any, CharSequence?>
 	) {
 		removeAllViews()
 		visibility = if (items.isEmpty()) View.GONE else {
@@ -339,10 +429,18 @@ class DecodeFragment : Fragment() {
 				if (!text.isNullOrBlank()) {
 					val tr = TableRow(ctx)
 					val keyView = TextView(ctx)
-					keyView.setText(item.key)
-					val valueView = TextView(ctx)
-					valueView.setPadding(spaceBetween, 0, 0, 0)
-					valueView.text = text
+					when (val key = item.key) {
+						is Int -> keyView.setText(key)
+						is String -> keyView.text = key
+						else -> keyView.text = key.toString()
+					}
+					val valueView = TextView(ctx).apply {
+						setPadding(spaceBetween, 0, 0, 0)
+						this.text = text
+						setOnClickListener {
+							copyToClipboard(text.toString())
+						}
+					}
 					tr.addView(keyView)
 					tr.addView(valueView)
 					addView(tr)
@@ -376,6 +474,12 @@ class DecodeFragment : Fragment() {
 				true
 			}
 
+			R.id.copy_as_deeplink -> {
+				copyToClipboard(deeplinkToCopy())
+				maybeBackOrFinish()
+				true
+			}
+
 			R.id.share -> {
 				context?.apply {
 					shareText(textOrHex())
@@ -408,7 +512,7 @@ class DecodeFragment : Fragment() {
 			}
 
 			R.id.remove -> {
-				db.removeScan(id)
+				db.removeScan(scan.id)
 				backOrFinish()
 				true
 			}
@@ -423,14 +527,16 @@ class DecodeFragment : Fragment() {
 		content
 	}
 
+	private fun deeplinkToCopy() = createEncodeDeeplink(
+		format = format,
+		content = textOrHex(),
+	)
+
 	private fun copyPasswordToClipboard() {
 		val ac = action
 		if (ac is WifiAction) {
 			ac.password?.let { password ->
-				activity?.apply {
-					copyToClipboard(password, isSensitive = true)
-					toast(R.string.copied_password_to_clipboard)
-				}
+				copyToClipboard(password, isSensitive = true)
 			}
 		}
 	}
@@ -438,7 +544,10 @@ class DecodeFragment : Fragment() {
 	private fun copyToClipboard(text: String, isSensitive: Boolean = false) {
 		activity?.apply {
 			copyToClipboard(text, isSensitive)
-			toast(R.string.copied_to_clipboard)
+			// There's a clipboard popup from Android 13 on.
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+				toast(R.string.copied_to_clipboard)
+			}
 		}
 	}
 
@@ -459,17 +568,18 @@ class DecodeFragment : Fragment() {
 
 	private fun executeAction(content: String) {
 		val ac = activity ?: return
-		if (content.isNotEmpty()) {
-			if (action is WifiAction &&
-				Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
-				!ac.hasLocationPermission { executeAction(content) }
-			) {
-				return
-			}
-			scope.launch {
-				action.execute(ac, content.toByteArray())
-				maybeBackOrFinish()
-			}
+		if (content.isEmpty()) {
+			return
+		}
+		if (action is WifiAction &&
+			Build.VERSION.SDK_INT < Build.VERSION_CODES.Q &&
+			!ac.hasLocationPermission { executeAction(content) }
+		) {
+			return
+		}
+		scope.launch {
+			action.execute(ac, content.toByteArray())
+			maybeBackOrFinish()
 		}
 	}
 
@@ -523,7 +633,7 @@ private inline fun <T : View> T.showIf(
 }
 
 private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
-private val multipleDots = "[…]+".toRegex()
+private val multipleDots = "…+".toRegex()
 private fun String.foldNonAlNum() = replace(nonAlNum, "…")
 	.replace(multipleDots, "…")
 
@@ -619,7 +729,7 @@ private fun generateDpTrackingLink(bytes: ByteArray, format: String): String? {
 		"%X",
 		crc4(hexString.toByteArray(Charsets.ISO_8859_1))
 	)
-	return "<a href=\"https://www.deutschepost.de/de/s/sendungsverfolgung/verfolgen.html?piececode=$trackingNumber\">Deutsche Post: $trackingNumber</a>"
+	return "<a href=\"https://www.deutschepost.de/de/s/sendungsverfolgung.html?piececode=$trackingNumber\">Deutsche Post: $trackingNumber</a>"
 }
 
 // CRC-4 with polynomial x^4 + x + 1.

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/EncodeFragment.kt

@@ -3,9 +3,9 @@ package de.markusfisch.android.binaryeye.fragment
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
-import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
+import android.support.v7.widget.SwitchCompat
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
@@ -16,20 +16,19 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.CheckBox
 import android.widget.EditText
-import android.widget.SeekBar
 import android.widget.Spinner
 import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.addFragment
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.app.setFragment
 import de.markusfisch.android.binaryeye.text.unescape
 import de.markusfisch.android.binaryeye.view.hideSoftKeyboard
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 import java.io.InputStream
-import kotlin.math.max
 import kotlin.math.min
 
 class EncodeFragment : Fragment() {
@@ -38,11 +37,7 @@ class EncodeFragment : Fragment() {
 	private lateinit var ecSpinner: Spinner
 	private lateinit var colorsLabel: TextView
 	private lateinit var colorsSpinner: Spinner
-	private lateinit var sizeView: TextView
-	private lateinit var sizeBarView: SeekBar
-	private lateinit var marginLayout: View
-	private lateinit var marginView: TextView
-	private lateinit var marginBarView: SeekBar
+	private lateinit var addQuietZoneSwitch: SwitchCompat
 	private lateinit var contentView: EditText
 	private lateinit var unescapeCheckBox: CheckBox
 
@@ -60,7 +55,6 @@ class EncodeFragment : Fragment() {
 		BarcodeFormat.UPC_A
 	)
 
-	private var minMargin = 0
 	private var bytes: ByteArray? = null
 
 	override fun onActivityResult(
@@ -145,12 +139,13 @@ class EncodeFragment : Fragment() {
 					colorsLabel, colorsSpinner
 				)
 				when (format) {
-					BarcodeFormat.AZTEC -> setMarginBar(4, 4)
-					BarcodeFormat.DATA_MATRIX -> setMarginBar(1, 1)
-					BarcodeFormat.QR_CODE -> setMarginBar(4, 4)
-					BarcodeFormat.PDF_417 -> setMarginBar(0, 30)
+					BarcodeFormat.AZTEC,
+					BarcodeFormat.DATA_MATRIX,
+					BarcodeFormat.QR_CODE,
+					BarcodeFormat.PDF_417 -> true
+
 					else -> false
-				}.setVisibilityFor(marginLayout)
+				}.setVisibilityFor(addQuietZoneSwitch)
 			}
 
 			override fun onNothingSelected(parentView: AdapterView<*>?) {}
@@ -177,26 +172,22 @@ class EncodeFragment : Fragment() {
 
 		colorsLabel = view.findViewById(R.id.colors_label)
 		colorsSpinner = view.findViewById(R.id.colors)
-
-		sizeView = view.findViewById(R.id.size_display)
-		sizeBarView = view.findViewById(R.id.size_bar)
-		initSizeBar()
-
-		marginLayout = view.findViewById(R.id.margin)
-		marginView = view.findViewById(R.id.margin_display)
-		marginBarView = view.findViewById(R.id.margin_bar)
-		initMarginBar()
+		addQuietZoneSwitch = view.findViewById(R.id.add_quiet_zone)
+		addQuietZoneSwitch.isChecked = prefs.addQuietZone
 
 		contentView = view.findViewById(R.id.content)
 		unescapeCheckBox = view.findViewById(R.id.unescape)
 		unescapeCheckBox.isChecked = prefs.expandEscapeSequences
 
+		var complete = false
 		val args = arguments
 		args?.getString(CONTENT_TEXT)?.let {
 			contentView.setText(it)
+			complete = it.isNotEmpty()
 		}
 		args?.getByteArray(CONTENT_RAW)?.let {
 			bytes = it
+			complete = it.isNotEmpty()
 			setEncodeByteArray()
 		}
 
@@ -215,8 +206,17 @@ class EncodeFragment : Fragment() {
 			it.context.encode()
 		}
 
-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
-		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.scroll_view).setPaddingFromWindowInsets()
+
+		if (complete &&
+			args?.getBoolean(EXECUTE, false) == true
+		) {
+			view.post {
+				val content = view.context.getContent() ?: return@post
+				fragmentManager?.setFragment(newEncodeFragment(content))
+			}
+		}
 
 		return view
 	}
@@ -248,31 +248,36 @@ class EncodeFragment : Fragment() {
 		super.onPause()
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
 		prefs.expandEscapeSequences = unescapeCheckBox.isChecked
-		prefs.lastMargin = marginBarView.progress
+		prefs.addQuietZone = addQuietZoneSwitch.isChecked
 	}
 
 	private fun Context.encode() {
 		hideSoftKeyboard(contentView)
 		val content = getContent() ?: return
-		val format = formats[formatView.selectedItemPosition]
-		fragmentManager?.addFragment(
-			BarcodeFragment.newInstance(
-				content,
-				format,
-				getSize(sizeBarView.progress),
-				when (format) {
-					BarcodeFormat.AZTEC,
-					BarcodeFormat.DATA_MATRIX,
-					BarcodeFormat.QR_CODE,
-					BarcodeFormat.PDF_417 -> marginBarView.progress
+		contentView.post {
+			fragmentManager?.addFragment(newEncodeFragment(content))
+		}
+	}
 
-					else -> -1
-				},
-				format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
-				if (format.canBeInverted()) {
-					colorsSpinner.selectedItemPosition
-				} else 0
-			)
+	private fun newEncodeFragment(content: Any): Fragment {
+		val format = formats[formatView.selectedItemPosition]
+		return BarcodeFragment.newInstance(
+			content,
+			format,
+			format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
+			when (format) {
+				BarcodeFormat.AZTEC,
+				BarcodeFormat.DATA_MATRIX,
+				BarcodeFormat.QR_CODE,
+				BarcodeFormat.PDF_417 -> if (
+					addQuietZoneSwitch.isChecked
+				) 1 else 0
+
+				else -> -1
+			},
+			if (format.canBeInverted()) {
+				colorsSpinner.selectedItemPosition
+			} else 0
 		)
 	}
 
@@ -281,90 +286,27 @@ class EncodeFragment : Fragment() {
 			return bytes
 		}
 		var text = contentView.text.toString()
-		if (unescapeCheckBox.isChecked) {
-			try {
-				text = text.unescape()
-			} catch (e: IllegalArgumentException) {
-				toast(e.message ?: "Invalid escape sequence")
-				return null
-			}
-			// Return a ByteArray if there were escape sequences for
-			// non-printable characters (like `\0`). This means the content
-			// will be encoded in binary mode, what would be wrong for
-			// "something\nlike\tthüs".
-			if (text.any { it.code < 32 && it.code !in setOf(9, 10, 13) }) {
-				return text.toByteArray()
-			}
-		}
 		if (text.isEmpty()) {
 			toast(R.string.error_no_content)
 			return null
 		}
-		return text
-	}
-
-	private fun initSizeBar() {
-		updateSize(sizeBarView.progress)
-		sizeBarView.setOnSeekBarChangeListener(
-			object : SeekBar.OnSeekBarChangeListener {
-				override fun onProgressChanged(
-					seekBar: SeekBar,
-					progressValue: Int,
-					fromUser: Boolean
-				) {
-					updateSize(progressValue)
-				}
-
-				override fun onStartTrackingTouch(seekBar: SeekBar) {}
-
-				override fun onStopTrackingTouch(seekBar: SeekBar) {}
-			})
-	}
-
-	private fun updateSize(power: Int) {
-		val size = getSize(power)
-		sizeView.text = getString(R.string.size_width_by_height, size, size)
-	}
-
-	private fun initMarginBar() {
-		updateMargin(marginBarView.progress)
-		marginBarView.setOnSeekBarChangeListener(
-			object : SeekBar.OnSeekBarChangeListener {
-				override fun onProgressChanged(
-					seekBar: SeekBar,
-					progressValue: Int,
-					fromUser: Boolean
-				) {
-					if (progressValue >= minMargin) {
-						updateMargin(progressValue)
-					}
-				}
-
-				override fun onStartTrackingTouch(seekBar: SeekBar) {}
-
-				override fun onStopTrackingTouch(seekBar: SeekBar) {}
-			})
-	}
-
-	private fun updateMargin(margin: Int) {
-		marginView.text = getString(R.string.margin_size, margin)
-	}
-
-	private fun setMarginBar(minimum: Int, value: Int): Boolean {
-		minMargin = minimum
-		marginBarView.apply {
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-				min = minimum
-			}
-			progress = max(
-				minimum, if (prefs.lastMargin > -1) {
-					prefs.lastMargin
-				} else {
-					value
-				}
-			)
+		if (!unescapeCheckBox.isChecked) {
+			return text
+		}
+		try {
+			text = text.unescape()
+		} catch (e: IllegalArgumentException) {
+			toast(e.message ?: "Invalid escape sequence")
+			return null
+		}
+		// Return a ByteArray if there were escape sequences for
+		// non-printable characters.
+		return if (text.any { it.code < 32 && it.code !in setOf(9, 10, 13) }) {
+			// Do not expand UTF-8 sequences in binary data.
+			text.toByteArray(Charsets.ISO_8859_1)
+		} else {
+			text
 		}
-		return true
 	}
 
 	private fun setEncodeByteArray() {
@@ -378,11 +320,13 @@ class EncodeFragment : Fragment() {
 		private const val CONTENT_TEXT = "content_text"
 		private const val CONTENT_RAW = "content_raw"
 		private const val FORMAT = "format"
+		private const val EXECUTE = "execute"
 		private const val PICK_FILE_RESULT_CODE = 1
 
 		fun <T> newInstance(
 			content: T? = null,
-			format: String? = null
+			format: String? = null,
+			execute: Boolean = false
 		): Fragment {
 			val args = Bundle()
 			content?.let {
@@ -393,6 +337,7 @@ class EncodeFragment : Fragment() {
 						"content must be a String or a ByteArray"
 					)
 				}
+				args.putBoolean(EXECUTE, execute)
 			}
 			format?.let { args.putString(FORMAT, it) }
 			val fragment = EncodeFragment()
@@ -456,8 +401,6 @@ private fun Spinner.setEntries(resId: Int) = ArrayAdapter.createFromResource(
 	adapter = aa
 }
 
-private fun getSize(power: Int) = 128 * (power + 1)
-
 private fun InputStream.readBytesMax(max: Int): ByteArray {
 	var offset = 0
 	var remaining = min(available(), max)

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/HistoryFragment.kt

@@ -70,9 +70,13 @@ class HistoryFragment : Fragment() {
 				R.menu.fragment_history_edit,
 				menu
 			)
-			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+				// SDK35+ doesn't draw a status bar background anymore.
+				Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM
+			) {
 				lockStatusBarColor()
 				val ac = activity ?: return false
+				@Suppress("DEPRECATION")
 				ac.window.statusBarColor = ContextCompat.getColor(
 					ac,
 					R.color.accent_dark
@@ -163,7 +167,7 @@ class HistoryFragment : Fragment() {
 
 		useHistorySwitch = view.findViewById(
 			R.id.use_history
-		) as SwitchCompat
+		)
 		initHistorySwitch(useHistorySwitch)
 
 		listView = view.findViewById(R.id.scans)
@@ -192,7 +196,7 @@ class HistoryFragment : Fragment() {
 
 		progressView = view.findViewById(R.id.progress_view)
 
-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
 		listView.setPaddingFromWindowInsets()
 
 		update()
@@ -297,7 +301,7 @@ class HistoryFragment : Fragment() {
 			val cursor = db.getScans(filter)
 			withContext(Dispatchers.Main) {
 				val ac = activity ?: return@withContext
-				val hasScans = cursor != null && cursor.count > 0
+				val hasScans = cursor.count > 0
 				if (filter == null) {
 					if (!hasScans) {
 						listView.emptyView = useHistorySwitch
@@ -310,7 +314,7 @@ class HistoryFragment : Fragment() {
 				} else {
 					View.GONE
 				}
-				cursor?.let { cursor ->
+				cursor.let { cursor ->
 					// Close previous cursor.
 					scansAdapter?.also { it.changeCursor(null) }
 					scansAdapter = ScansAdapter(ac, cursor)
@@ -341,7 +345,7 @@ class HistoryFragment : Fragment() {
 		closeActionMode()
 		try {
 			fragmentManager?.addFragment(DecodeFragment.newInstance(scan))
-		} catch (e: IllegalArgumentException) {
+		} catch (_: IllegalArgumentException) {
 			// Ignore, can never happen.
 		}
 	}
@@ -442,12 +446,12 @@ class HistoryFragment : Fragment() {
 				} ?: return@useVisibility
 				val message = when (delimiter) {
 					"db" -> ac.exportDatabase(name)
-					else -> db.getScansDetailed(filter)?.use {
+					else -> db.getScansDetailed(filter).use {
 						when (delimiter) {
 							"json" -> ac.exportJson(name, it)
 							else -> ac.exportCsv(name, it, delimiter)
 						}
-					} ?: false
+					}
 				}.toSaveResult()
 				withContext(Dispatchers.Main) {
 					ac.toast(message)
@@ -475,14 +479,14 @@ class HistoryFragment : Fragment() {
 				db.getScansDetailed(selectedIds.toLongArray())
 			} else {
 				db.getScansDetailed(filter)
-			}?.use { cursor ->
+			}.use { cursor ->
 				val details = format.split(":")
 				when (details[0]) {
 					"text" -> Pair(cursor.exportText(details[1]), "txt")
 					"csv" -> Pair(cursor.exportCsv(details[1]), "csv")
 					else -> Pair(cursor.exportJson(), "json")
 				}
-			}?.let { (text, ext) ->
+			}.let { (text, ext) ->
 				text?.let {
 					withContext(Dispatchers.Main) {
 						if (asFile) {
@@ -502,7 +506,7 @@ class HistoryFragment : Fragment() {
 
 private fun Cursor.exportText(separator: String): String {
 	val sb = StringBuilder()
-	val contentIndex = getColumnIndex(Database.SCANS_CONTENT)
+	val contentIndex = getColumnIndex(Database.SCANS_TEXT)
 	if (contentIndex > -1 && moveToFirst()) {
 		do {
 			val content = getString(contentIndex)

app/src/main/kotlin/de/markusfisch/android/binaryeye/fragment/NetworkSuggestionsFragment.kt

@@ -51,7 +51,7 @@ class NetworkSuggestionsFragment : Fragment() {
 		listView.emptyView = view.findViewById(R.id.no_suggestions)
 		listView.adapter = suggestionArrayAdapter
 		listView.setOnScrollListener(systemBarListViewScrollListener)
-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
 		listView.setPaddingFromWindowInsets()
 
 		view.findViewById<View>(R.id.remove).setOnClickListener {

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/BitmapEditor.kt

@@ -25,7 +25,7 @@ fun ContentResolver.loadImageUri(uri: Uri): Bitmap? = try {
 	openInputStream(uri)?.use {
 		BitmapFactory.decodeStream(it, null, options)
 	}
-} catch (e: IOException) {
+} catch (_: IOException) {
 	null
 }
 

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/Mapping.kt

@@ -10,7 +10,9 @@ data class FrameMetrics(
 	var width: Int = 0,
 	var height: Int = 0,
 	var orientation: Int = 0
-)
+) {
+	fun isValid() = width > 0 && height > 0
+}
 
 fun Rect.setFrameRoi(
 	frameMetrics: FrameMetrics,

app/src/main/kotlin/de/markusfisch/android/binaryeye/graphics/Transparency.kt

@@ -5,11 +5,12 @@ import android.graphics.Canvas
 
 fun Bitmap.fixTransparency(): Bitmap {
 	val result = analyzeTransparency()
-	return if (result.hasTransparentPixels) {
+	val cfg = config
+	return if (cfg != null && result.hasTransparentPixels) {
 		val copy = Bitmap.createBitmap(
 			width,
 			height,
-			config
+			cfg
 		)
 		Canvas(copy).apply {
 			drawColor(result.backgroundColor)

app/src/main/kotlin/de/markusfisch/android/binaryeye/io/FileSaving.kt

@@ -53,7 +53,7 @@ fun Context.writeExternalFile(
 ): Boolean = try {
 	openExternalOutputStream(fileName, mimeType).use { write(it) }
 	true
-} catch (e: IOException) {
+} catch (_: IOException) {
 	false
 }
 

app/src/main/kotlin/de/markusfisch/android/binaryeye/net/Deeplink.kt

@@ -0,0 +1,30 @@
+package de.markusfisch.android.binaryeye.net
+
+import android.net.Uri
+
+private const val SCHEME = "binaryeye"
+private const val HOSTNAME = "markusfisch.de"
+private const val ENCODE_PATH = "encode"
+
+fun isScanDeeplink(text: String) = listOf(
+	"$SCHEME://scan",
+	"http://$HOSTNAME/BinaryEye",
+	"https://$HOSTNAME/BinaryEye"
+).any { text.startsWith(it) }
+
+fun isEncodeDeeplink(text: String) = listOf(
+	"$SCHEME://$ENCODE_PATH",
+	"http://$HOSTNAME/$ENCODE_PATH",
+	"https://$HOSTNAME/$ENCODE_PATH"
+).any { text.startsWith(it) }
+
+fun createEncodeDeeplink(format: String, content: String): String {
+	return Uri.Builder()
+		.scheme("https")
+		.authority(HOSTNAME)
+		.appendPath(ENCODE_PATH)
+		.appendQueryParameter("format", format)
+		.appendQueryParameter("content", content)
+		.build()
+		.toString()
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/net/ScanSender.kt

@@ -53,7 +53,7 @@ private fun Scan.send(url: String, type: String): Response {
 		}
 
 		else -> request(
-			url + content.urlEncode()
+			url + text.urlEncode()
 		)
 	}
 }
@@ -67,7 +67,7 @@ private fun Scan.asJson() = JSONObject().apply {
 }
 
 private fun Scan.getMap(): Map<String, String> = mapOf(
-	"content" to content,
+	"content" to text,
 	"raw" to raw?.toHexString(),
 	"format" to format.name,
 	"errorCorrectionLevel" to errorCorrectionLevel,

app/src/main/kotlin/de/markusfisch/android/binaryeye/net/Url.kt

@@ -5,6 +5,6 @@ import java.net.URLEncoder
 
 fun String.urlEncode(): String = try {
 	URLEncoder.encode(this, "UTF-8")
-} catch (e: UnsupportedEncodingException) {
+} catch (_: UnsupportedEncodingException) {
 	this
-}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/CropHandle.kt

@@ -0,0 +1,41 @@
+package de.markusfisch.android.binaryeye.preference
+
+import android.content.SharedPreferences
+import org.json.JSONObject
+
+data class CropHandle(
+	val x: Int = -2, // -2 means set default roi.
+	val y: Int = -2,
+	val orientation: Int = 0
+)
+
+fun SharedPreferences.storeCropHandle(
+	name: String,
+	cropHandle: CropHandle
+) {
+	edit().putString(
+		name,
+		JSONObject().apply {
+			put("x", cropHandle.x)
+			put("y", cropHandle.y)
+			put("orientation", cropHandle.orientation)
+		}.toString()
+	).apply()
+}
+
+fun SharedPreferences.restoreCropHandle(
+	name: String,
+	default: CropHandle = CropHandle()
+): CropHandle {
+	val s = getString(name, null) ?: return default
+	return try {
+		val json = JSONObject(s)
+		CropHandle(
+			json.getInt("x"),
+			json.getInt("y"),
+			json.getInt("orientation")
+		)
+	} catch (_: Exception) {
+		return default
+	}
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/preference/Preferences.kt

@@ -7,8 +7,10 @@ import android.media.ToneGenerator
 import android.os.Build
 import android.preference.PreferenceManager
 import android.support.annotation.RequiresApi
+import de.markusfisch.android.binaryeye.activity.CameraActivity
 import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 
+
 class Preferences {
 	lateinit var preferences: SharedPreferences
 
@@ -38,21 +40,6 @@ class Preferences {
 			apply(BARCODE_FORMATS, value)
 			field = value
 		}
-	var cropHandleX = -2 // -2 means set default roi.
-		set(value) {
-			apply(CROP_HANDLE_X, value)
-			field = value
-		}
-	var cropHandleY = -2
-		set(value) {
-			apply(CROP_HANDLE_Y, value)
-			field = value
-		}
-	var cropHandleOrientation = 0
-		set(value) {
-			apply(CROP_HANDLE_ORIENTATION, value)
-			field = value
-		}
 	var showCropHandle = true
 		set(value) {
 			apply(SHOW_CROP_HANDLE, value)
@@ -200,11 +187,6 @@ class Preferences {
 			apply(INDEX_OF_LAST_SELECTED_EC_LEVEL, value)
 			field = value
 		}
-	var lastMargin: Int = -1
-		set(value) {
-			apply(LAST_MARGIN, value)
-			field = value
-		}
 	var freeRotation = false
 		set(value) {
 			apply(FREE_ROTATION, value)
@@ -215,11 +197,21 @@ class Preferences {
 			apply(EXPAND_ESCAPE_SEQUENCES, value)
 			field = value
 		}
+	var addQuietZone = true
+		set(value) {
+			apply(ADD_QUIET_ZONE, value)
+			field = value
+		}
 	var brightenScreen = false
 		set(value) {
 			apply(BRIGHTEN_SCREEN, value)
 			field = value
 		}
+	var previewScale = 0f
+		set(value) {
+			apply(PREVIEW_SCALE, value)
+			field = value
+		}
 
 	fun init(context: Context) {
 		preferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -237,12 +229,8 @@ class Preferences {
 			}
 		}
 
-		cropHandleX = preferences.getInt(CROP_HANDLE_X, cropHandleX)
-		cropHandleY = preferences.getInt(CROP_HANDLE_Y, cropHandleY)
-		cropHandleOrientation = preferences.getInt(
-			CROP_HANDLE_ORIENTATION,
-			cropHandleOrientation
-		)
+		migrateCropHandle()
+
 		showCropHandle = preferences.getBoolean(
 			SHOW_CROP_HANDLE,
 			showCropHandle
@@ -331,19 +319,20 @@ class Preferences {
 			INDEX_OF_LAST_SELECTED_EC_LEVEL,
 			indexOfLastSelectedEcLevel
 		)
-		lastMargin = preferences.getInt(
-			LAST_MARGIN,
-			lastMargin
-		)
 		freeRotation = preferences.getBoolean(FREE_ROTATION, freeRotation)
 		expandEscapeSequences = preferences.getBoolean(
 			EXPAND_ESCAPE_SEQUENCES,
 			expandEscapeSequences
 		)
+		addQuietZone = preferences.getBoolean(ADD_QUIET_ZONE, addQuietZone)
 		brightenScreen = preferences.getBoolean(
 			BRIGHTEN_SCREEN,
 			brightenScreen
 		)
+		previewScale = preferences.getFloat(
+			PREVIEW_SCALE,
+			previewScale
+		)
 	}
 
 	private fun addFormatsOnUpdate(
@@ -359,6 +348,31 @@ class Preferences {
 		}
 	}
 
+	private fun migrateCropHandle() {
+		val cropHandleXName = "crop_handle_x"
+		val def = CropHandle()
+		if (preferences.getInt(cropHandleXName, def.x) == def.x) {
+			return;
+		}
+		storeCropHandle(
+			CameraActivity.CAMERA_CROP_HANDLE,
+			CropHandle(
+				preferences.getInt(cropHandleXName, def.x),
+				preferences.getInt("crop_handle_y", def.y),
+				preferences.getInt("crop_handle_orientation", def.orientation)
+			)
+		)
+		preferences.edit().putInt(cropHandleXName, def.x).apply()
+	}
+
+	fun restoreCropHandle(
+		name: String
+	) = preferences.restoreCropHandle(name)
+
+	fun storeCropHandle(name: String, cropHandle: CropHandle) {
+		preferences.storeCropHandle(name, cropHandle)
+	}
+
 	fun beepTone() = when (beepToneName) {
 		"tone_cdma_confirm" -> ToneGenerator.TONE_CDMA_CONFIRM
 		"tone_sup_radio_ack" -> ToneGenerator.TONE_SUP_RADIO_ACK
@@ -377,9 +391,6 @@ class Preferences {
 	private fun put(label: String, value: Boolean) =
 		preferences.edit().putBoolean(label, value)
 
-	private fun put(label: String, value: String) =
-		preferences.edit().putString(label, value)
-
 	private fun apply(label: String, value: Boolean) {
 		put(label, value).apply()
 	}
@@ -392,6 +403,10 @@ class Preferences {
 		preferences.edit().putInt(label, value).apply()
 	}
 
+	private fun apply(label: String, value: Float) {
+		preferences.edit().putFloat(label, value).apply()
+	}
+
 	@SuppressLint("ApplySharedPref")
 	private fun commit(label: String, value: String) {
 		preferences.edit().putString(label, value).commit()
@@ -408,9 +423,6 @@ class Preferences {
 		}
 
 		private const val BARCODE_FORMATS = "formats"
-		private const val CROP_HANDLE_X = "crop_handle_x"
-		private const val CROP_HANDLE_Y = "crop_handle_y"
-		private const val CROP_HANDLE_ORIENTATION = "crop_handle_orientation"
 		private const val SHOW_CROP_HANDLE = "show_crop_handle"
 		private const val ZOOM_BY_SWIPING = "zoom_by_swiping"
 		private const val AUTO_ROTATE = "auto_rotate"
@@ -440,9 +452,10 @@ class Preferences {
 		private const val CUSTOM_LOCALE = "custom_locale"
 		private const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
 		private const val INDEX_OF_LAST_SELECTED_EC_LEVEL = "index_of_last_selected_ec_level"
-		private const val LAST_MARGIN = "last_margin"
 		private const val FREE_ROTATION = "free_rotation"
 		private const val EXPAND_ESCAPE_SEQUENCES = "expand_escape_sequences"
+		private const val ADD_QUIET_ZONE = "add_quiet_zone"
 		private const val BRIGHTEN_SCREEN = "brighten_screen"
+		private const val PREVIEW_SCALE = "preview_scale"
 	}
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/text/Escape.kt

@@ -70,7 +70,13 @@ fun String.unescape(): String {
 	val sb = StringBuilder()
 	while (i < len) {
 		val ch = get(i++)
-		sb.append(if (ch == '\\' && i < len) expand() else ch)
+		sb.append(
+			if (ch == '\\' && i < len) {
+				expand()
+			} else {
+				ch
+			}
+		)
 	}
 	return sb.toString()
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/SystemBars.kt

@@ -8,6 +8,7 @@ import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
+import android.support.v7.widget.Toolbar
 import android.view.View
 import android.view.WindowManager
 import android.widget.AbsListView
@@ -57,10 +58,9 @@ private fun lastChildOutOfView(listView: AbsListView): Boolean {
 	return child != null && child.bottom >= listView.height
 }
 
-fun initSystemBars(activity: AppCompatActivity) {
+fun AppCompatActivity.initBars() {
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 		// Keeps the soft keyboard from repositioning the layout.
-		val window = activity.window
 		window.setSoftInputMode(
 			WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE
 		)
@@ -69,7 +69,16 @@ fun initSystemBars(activity: AppCompatActivity) {
 					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or
 					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
 	}
-	colorSystemAndToolBars(activity)
+	colorSystemAndToolBars(this)
+	setPaddingFromWindowInsets(
+		findViewById(R.id.main),
+		(findViewById(R.id.toolbar) as Toolbar).apply {
+			setSupportActionBar(this)
+		},
+		findViewById(R.id.navbar)?.apply {
+			setBackgroundColor(translucentPrimaryColor)
+		}
+	)
 }
 
 private var statusBarColorLocked = false
@@ -97,14 +106,27 @@ fun colorSystemAndToolBars(
 	val topColor = if (scrolled) translucentPrimaryColor else 0
 	val activity = getAppCompatActivity(context) ?: return
 	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-		val window = activity.window
-		if (!statusBarColorLocked) {
-			window.statusBarColor = topColor
-		}
-		window.navigationBarColor = if (scrolled || scrollable) {
-			translucentPrimaryColor
+		// System bars no longer have a background from SDK35+.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+			val window = activity.window
+			if (!statusBarColorLocked) {
+				@Suppress("DEPRECATION")
+				window.statusBarColor = topColor
+			}
+			@Suppress("DEPRECATION")
+			window.navigationBarColor = if (scrolled || scrollable) {
+				translucentPrimaryColor
+			} else {
+				0
+			}
 		} else {
-			0
+			activity.findViewById(R.id.navbar)?.apply {
+				visibility = if (scrolled || scrollable) {
+					View.VISIBLE
+				} else {
+					View.GONE
+				}
+			}
 		}
 	}
 	activity.supportActionBar?.setBackgroundDrawable(

app/src/main/kotlin/de/markusfisch/android/binaryeye/view/WindowInsets.kt

@@ -7,10 +7,37 @@ import android.support.v4.view.ViewCompat
 import android.support.v4.view.WindowInsetsCompat
 import android.support.v7.widget.Toolbar
 import android.view.View
+import android.view.WindowInsets
 
 private var toolbarHeight = 0
-fun recordToolbarHeight(toolbar: Toolbar) {
+fun setPaddingFromWindowInsets(mainLayout: View, toolbar: Toolbar, navbar: View?) {
 	toolbarHeight = toolbar.layoutParams.height
+	// SDK 35+ is edge-to-edge by default, so the toolbar needs to extend
+	// below the status bar.
+	if (Build.VERSION.SDK_INT < Build.VERSION_CODES.VANILLA_ICE_CREAM) {
+		return
+	}
+	mainLayout.setOnApplyWindowInsetsListener { _, insets ->
+		val systemBarInsets = insets.getInsets(
+			WindowInsets.Type.systemBars()
+		)
+
+		val statusBarTop = systemBarInsets.top
+		if (toolbar.paddingTop == 0 && statusBarTop > 0) {
+			toolbar.setPadding(0, statusBarTop, 0, 0)
+			toolbar.layoutParams.height += statusBarTop
+		}
+
+		val navBarBottom = systemBarInsets.bottom
+		if (navBarBottom > 0) {
+			mainLayout.setPadding(0, 0, 0, navBarBottom);
+			navbar?.apply {
+				layoutParams.height = navBarBottom
+			}
+		}
+
+		insets
+	}
 }
 
 fun View.setPaddingFromWindowInsets() {

app/src/main/kotlin/de/markusfisch/android/binaryeye/widget/ConfinedScalingImageView.kt

@@ -10,6 +10,8 @@ import de.markusfisch.android.scalingimageview.widget.ScalingImageView
 open class ConfinedScalingImageView : ScalingImageView {
 	val insets = Rect()
 
+	var runAfterLayout: (() -> Unit)? = null
+
 	constructor(context: Context, attrs: AttributeSet, defStyle: Int) :
 			super(context, attrs, defStyle)
 
@@ -37,5 +39,8 @@ open class ConfinedScalingImageView : ScalingImageView {
 			)
 		}
 		centerRemap()
+		runAfterLayout?.invoke()
 	}
+
+	fun isInBounds(): Boolean = inBounds()
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/widget/DetectorView.kt

@@ -19,6 +19,7 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.graphics.getBitmapFromDrawable
 import de.markusfisch.android.binaryeye.graphics.getDashedBorderPaint
+import de.markusfisch.android.binaryeye.preference.CropHandle
 import kotlin.math.abs
 import kotlin.math.max
 import kotlin.math.min
@@ -83,11 +84,16 @@ class DetectorView : View {
 	constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) :
 			super(context, attrs, defStyleAttr)
 
-	fun saveCropHandlePos() {
+	fun storeCropHandlePos(name: String) {
 		val pos = getCropHandlePos()
-		prefs.cropHandleX = pos.x
-		prefs.cropHandleY = pos.y
-		prefs.cropHandleOrientation = currentOrientation
+		prefs.storeCropHandle(
+			name,
+			CropHandle(
+				pos.x,
+				pos.y,
+				currentOrientation
+			)
+		)
 	}
 
 	private fun getCropHandlePos() = if (handleActive) {
@@ -96,11 +102,12 @@ class DetectorView : View {
 		Point(-1, -1)
 	}
 
-	fun restoreCropHandlePos() {
+	fun restoreCropHandlePos(name: String) {
+		val cropHandle = prefs.restoreCropHandle(name)
 		setCropHandlePos(
-			prefs.cropHandleX,
-			prefs.cropHandleY,
-			prefs.cropHandleOrientation
+			cropHandle.x,
+			cropHandle.y,
+			cropHandle.orientation
 		)
 	}
 

app/src/main/kotlin/de/markusfisch/android/binaryeye/widget/Toast.kt

@@ -3,19 +3,29 @@ package de.markusfisch.android.binaryeye.widget
 import android.content.Context
 import android.widget.Toast
 
-fun Context.toast(message: Int) = Toast.makeText(
-	applicationContext,
-	message,
-	Toast.LENGTH_LONG
-).show()
+private var lastToast: Toast? = null
 
-fun Context.toast(message: String) = Toast.makeText(
-	applicationContext,
-	message.ellipsize(128),
-	Toast.LENGTH_LONG
-).show()
+fun <T> Context.toast(message: T) {
+	lastToast?.cancel()
+	lastToast = when (message) {
+		is String -> Toast.makeText(
+			applicationContext,
+			message.ellipsize(),
+			Toast.LENGTH_LONG
+		)
 
-private fun String.ellipsize(max: Int) = if (length < max) {
+		is Int -> Toast.makeText(
+			applicationContext,
+			message,
+			Toast.LENGTH_LONG
+		)
+
+		else -> return
+	}
+	lastToast?.show()
+}
+
+private fun String.ellipsize(max: Int = 128) = if (length < max) {
 	this
 } else {
 	"${take(max)}…"

app/src/main/res/drawable/button_welcome.xml

@@ -0,0 +1,16 @@
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:constantSize="true">
+	<item android:state_pressed="false">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp"/>
+			<solid android:color="@color/selected_row"/>
+		</shape>
+	</item>
+	<item android:state_pressed="true">
+		<shape android:shape="rectangle">
+			<corners android:radius="2dp"/>
+			<solid android:color="@color/pressed_row"/>
+		</shape>
+	</item>
+</selector>

app/src/main/res/drawable/ic_action_bright.xml

@@ -1,5 +1,3 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
-      
-    <path android:fillColor="@android:color/white" android:pathData="M20,8.69L20,4h-4.69L12,0.69 8.69,4L4,4v4.69L0.69,12 4,15.31L4,20h4.69L12,23.31 15.31,20L20,20v-4.69L23.31,12 20,8.69zM12,18c-3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6 6,2.69 6,6 -2.69,6 -6,6zM12,8c-2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4z"/>
-    
+    <path android:fillColor="#fff" android:pathData="M20 8.69V4h-4.69L12 0.69 8.69 4H4v4.69L0.69 12 4 15.31V20h4.69L12 23.31 15.31 20H20v-4.69L23.31 12 20 8.69zM12 18c-3.31 0-6-2.69-6-6s2.69-6 6-6 6 2.69 6 6-2.69 6-6 6zm0-10c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z"/>
 </vector>

app/src/main/res/drawable/ic_action_history_add.xml

@@ -1,3 +1,3 @@
 <vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M14.54,18.49L14.54,16.51L17.51,16.51L17.51,13.54L19.49,13.54L19.49,16.51L22.46,16.51L22.46,18.49L19.508,18.508L19.49,21.46L17.51,21.46L17.492,18.508L14.54,18.49ZM13.35,14.75L11,12.4L11,7L13,7L13,11.6L14.4,13L13.35,14.75ZM3,10L3,4L5,4L5,6.35C5.85,5.283 6.888,4.458 8.113,3.875C9.338,3.292 10.633,3 12,3C14.5,3 16.625,3.875 18.375,5.625C20.125,7.375 21,9.5 21,12L19,12C19,10.05 18.321,8.396 16.963,7.037C15.604,5.679 13.95,5 12,5C10.85,5 9.775,5.267 8.775,5.8C7.775,6.333 6.933,7.067 6.25,8L9,8L9,10L3,10ZM12,21C9.7,21 7.696,20.237 5.988,18.712C4.279,17.187 3.3,15.283 3.05,13L5.1,13C5.333,14.733 6.104,16.167 7.413,17.3C8.721,18.433 10.25,19 12,19C12.183,19 12.354,18.996 12.513,18.987C12.671,18.979 12.833,18.958 13,18.925L13,20.95C12.833,20.967 12.671,20.979 12.513,20.987C12.354,20.996 12.183,21 12,21Z"/>
+    <path android:fillColor="#FF000000" android:pathData="M14.54 18.49v-1.98h2.97v-2.97h1.98v2.97h2.97v1.98l-2.952 0.018-0.018 2.952h-1.98l-0.018-2.952-2.952-0.018zm-1.19-3.74L11 12.4V7h2v4.6l1.4 1.4-1.05 1.75zM3 10V4h2v2.35c0.85-1.067 1.888-1.892 3.113-2.475C9.338 3.292 10.633 3 12 3c2.5 0 4.625 0.875 6.375 2.625S21 9.5 21 12h-2c0-1.95-0.679-3.604-2.037-4.963C15.604 5.679 13.95 5 12 5c-1.15 0-2.225 0.267-3.225 0.8S6.933 7.067 6.25 8H9v2H3zm9 11c-2.3 0-4.304-0.763-6.012-2.288C4.279 17.187 3.3 15.283 3.05 13H5.1c0.233 1.733 1.004 3.167 2.313 4.3C8.721 18.433 10.25 19 12 19c0.183 0 0.354-0.004 0.513-0.013 0.158-0.008 0.32-0.029 0.487-0.062v2.025c-0.167 0.017-0.329 0.029-0.487 0.037C12.354 20.996 12.183 21 12 21z"/>
 </vector>

app/src/main/res/drawable/ic_action_link.xml

@@ -0,0 +1,3 @@
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M3.9,12c0,-1.71 1.39,-3.1 3.1,-3.1h4L11,7L7,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1zM8,13h8v-2L8,11v2zM17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1s-1.39,3.1 -3.1,3.1h-4L13,17h4c2.76,0 5,-2.24 5,-5s-2.24,-5 -5,-5z"/>
+</vector>

app/src/main/res/drawable/ic_shortcut_history_foreground.xml

@@ -1,9 +1,3 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M54,72.9C49.17,72.9 44.96,71.3 41.37,68.1C37.78,64.89 35.73,60.9 35.2,56.1L39.51,56.1C40,59.74 41.62,62.75 44.37,65.13C47.11,67.51 50.32,68.7 54,68.7C58.1,68.7 61.57,67.28 64.42,64.42C67.28,61.57 68.7,58.1 68.7,54C68.7,49.9 67.28,46.43 64.42,43.58C61.57,40.72 58.1,39.3 54,39.3C51.58,39.3 49.33,39.86 47.23,40.98C45.13,42.1 43.36,43.64 41.92,45.6L47.7,45.6L47.7,49.8L35.1,49.8L35.1,37.2L39.3,37.2L39.3,42.13C41.08,39.89 43.26,38.16 45.84,36.94C48.41,35.71 51.13,35.1 54,35.1C56.63,35.1 59.08,35.6 61.38,36.59C63.67,37.59 65.67,38.94 67.36,40.64C69.06,42.33 70.41,44.33 71.41,46.62C72.4,48.92 72.9,51.37 72.9,54C72.9,56.63 72.4,59.08 71.41,61.38C70.41,63.67 69.06,65.67 67.36,67.36C65.67,69.06 63.67,70.41 61.38,71.41C59.08,72.4 56.63,72.9 54,72.9ZM59.88,62.82L51.9,54.84L51.9,43.5L56.1,43.5L56.1,53.16L62.82,59.88L59.88,62.82Z"
-      android:fillColor="#FFFFFF"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="108dp" android:height="108dp" android:viewportWidth="108" android:viewportHeight="108">
+    <path android:pathData="M54 72.9c-4.83 0-9.04-1.6-12.63-4.8-3.59-3.21-5.64-7.2-6.17-12h4.31c0.49 3.64 2.11 6.65 4.86 9.03 2.74 2.38 5.95 3.57 9.63 3.57 4.1 0 7.57-1.42 10.42-4.28C67.28 61.57 68.7 58.1 68.7 54s-1.42-7.57-4.28-10.42C61.57 40.72 58.1 39.3 54 39.3c-2.42 0-4.67 0.56-6.77 1.68-2.1 1.12-3.87 2.66-5.31 4.62h5.78v4.2H35.1V37.2h4.2v4.93c1.78-2.24 3.96-3.97 6.54-5.19 2.57-1.23 5.29-1.84 8.16-1.84 2.63 0 5.08 0.5 7.38 1.49 2.29 1 4.29 2.35 5.98 4.05 1.7 1.69 3.05 3.69 4.05 5.98 0.99 2.3 1.49 4.75 1.49 7.38s-0.5 5.08-1.49 7.38c-1 2.29-2.35 4.29-4.05 5.98-1.69 1.7-3.69 3.05-5.98 4.05-2.3 0.99-4.75 1.49-7.38 1.49zm5.88-10.08l-7.98-7.98V43.5h4.2v9.66l6.72 6.72-2.94 2.94z" android:fillColor="#FFFFFF"/>
 </vector>

app/src/main/res/layout/activity_camera.xml

@@ -8,9 +8,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
 	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/main"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:fitsSystemWindows="true">
+		android:fitsSystemWindows="@bool/fitsSystemWindows">
 		<include layout="@layout/toolbar"/>
 		<SeekBar
 			android:id="@+id/zoom"

app/src/main/res/layout/activity_main.xml

@@ -4,9 +4,11 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
 	<FrameLayout
+		android:id="@+id/main"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:fitsSystemWindows="true">
+		android:fitsSystemWindows="@bool/fitsSystemWindows">
 		<include layout="@layout/toolbar"/>
 	</FrameLayout>
+	<include layout="@layout/navbar"/>
 </merge>

app/src/main/res/layout/activity_pick.xml

@@ -9,9 +9,10 @@
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>
 	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/main"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
-		android:fitsSystemWindows="true">
+		android:fitsSystemWindows="@bool/fitsSystemWindows">
 		<include layout="@layout/toolbar"/>
 		<android.support.design.widget.FloatingActionButton
 			style="@style/FAB"
@@ -19,4 +20,5 @@
 			android:contentDescription="@string/scan_code"
 			android:src="@drawable/ic_action_next"/>
 	</android.support.design.widget.CoordinatorLayout>
+	<include layout="@layout/navbar"/>
 </merge>

app/src/main/res/layout/activity_welcome.xml

@@ -0,0 +1,57 @@
+<ScrollView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:fillViewport="true">
+	<FrameLayout
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:fitsSystemWindows="true">
+		<!-- The FrameLayout is necessary because this LinearLayout
+			should have a padding which would be reset by the window
+			insets from `fitsSystemWindows`. -->
+		<LinearLayout
+			android:layout_width="match_parent"
+			android:layout_height="match_parent"
+			android:gravity="bottom"
+			android:padding="24dp"
+			android:orientation="vertical"
+			tools:ignore="UselessParent">
+			<TextView
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="32dp"
+				android:drawableTop="@drawable/logo"
+				android:drawablePadding="16dp"
+				android:gravity="center"
+				android:textAppearance="?android:attr/textAppearanceLarge"
+				android:text="@string/welcome"/>
+
+			<LinearLayout
+				style="@style/WelcomeButton"
+				android:id="@+id/expert"
+				android:layout_marginBottom="16dp"
+				android:orientation="vertical">
+				<TextView
+					style="@style/WelcomeButtonText"
+					android:text="@string/mode_expert"/>
+				<TextView
+					style="@style/WelcomeButtonSubText"
+					android:text="@string/mode_expert_description"/>
+			</LinearLayout>
+
+			<LinearLayout
+				style="@style/WelcomeButton"
+				android:id="@+id/simple"
+				android:orientation="vertical">
+				<TextView
+					style="@style/WelcomeButtonText"
+					android:text="@string/mode_simple"/>
+				<TextView
+					style="@style/WelcomeButtonSubText"
+					android:text="@string/mode_simple_description"/>
+			</LinearLayout>
+		</LinearLayout>
+	</FrameLayout>
+</ScrollView>

app/src/main/res/layout/dialog_find_code.xml

@@ -0,0 +1,22 @@
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp">
+	<TextView
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:text="@string/find_code_with_content"/>
+	<EditText
+		android:id="@+id/term"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:inputType="textShortMessage"
+		android:imeOptions="actionDone"
+		android:hint="@string/find_code_hint"
+		android:maxLines="1"
+		android:maxLength="1024"
+		android:importantForAutofill="no"/>
+</LinearLayout>

app/src/main/res/layout/dialog_size.xml

@@ -0,0 +1,23 @@
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical"
+	android:padding="16dp">
+	<TextView
+		android:id="@+id/size_display"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:textAppearance="?android:attr/textAppearanceMedium"
+		android:layout_marginBottom="8dp"/>
+	<SeekBar
+		style="@style/Widget.AppCompat.SeekBar.Discrete"
+		android:id="@+id/size_bar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:layout_marginBottom="16dp"
+		android:paddingTop="16dp"
+		android:paddingBottom="16dp"
+		android:progress="2"
+		android:max="4"/>
+</LinearLayout>

app/src/main/res/layout/fragment_encode.xml

@@ -65,42 +65,12 @@
 				android:id="@+id/colors"
 				android:layout_marginBottom="16dp"
 				android:entries="@array/colors"/>
-			<TextView
-				android:id="@+id/size_display"
+			<android.support.v7.widget.SwitchCompat
+				android:visibility="gone"
+				android:id="@+id/add_quiet_zone"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
-				android:layout_marginBottom="8dp"/>
-			<SeekBar
-				style="@style/Widget.AppCompat.SeekBar.Discrete"
-				android:id="@+id/size_bar"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:layout_marginBottom="16dp"
-				android:paddingTop="16dp"
-				android:paddingBottom="16dp"
-				android:progress="4"
-				android:max="7"/>
-			<LinearLayout
-				android:id="@+id/margin"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:orientation="vertical"
-				android:visibility="gone">
-				<TextView
-					android:id="@+id/margin_display"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="8dp"/>
-				<SeekBar
-					style="@style/Widget.AppCompat.SeekBar.Discrete"
-					android:id="@+id/margin_bar"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginBottom="16dp"
-					android:paddingTop="16dp"
-					android:paddingBottom="16dp"
-					android:max="32"/>
-			</LinearLayout>
+				android:text="@string/add_quiet_zone"/>
 		</LinearLayout>
 	</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
 	<android.support.design.widget.CoordinatorLayout

app/src/main/res/layout/navbar.xml

@@ -0,0 +1,8 @@
+<!-- Navigation bar background from SDK35+ -->
+<View
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:id="@+id/navbar"
+	android:layout_width="match_parent"
+	android:layout_height="0dp"
+	android:layout_gravity="bottom"
+	android:visibility="gone"/>

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

@@ -32,6 +32,11 @@
 		android:title="@string/restrict_format"
 		android:icon="@drawable/ic_action_restrict_format"
 		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/find_code"
+		android:title="@string/find_code"
+		android:icon="@drawable/ic_action_search"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/preferences"
 		android:title="@string/preferences"

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

@@ -11,6 +11,11 @@
 		android:title="@string/copy_to_clipboard"
 		android:icon="@drawable/ic_action_copy"
 		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/copy_as_deeplink"
+		android:title="@string/copy_as_deeplink"
+		android:icon="@drawable/ic_action_link"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/export_to_file"
 		android:title="@string/export_to_file"

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

@@ -18,6 +18,11 @@
 		android:title="@string/copy_to_clipboard"
 		android:icon="@drawable/ic_action_copy"
 		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/copy_as_deeplink"
+		android:title="@string/copy_as_deeplink"
+		android:icon="@drawable/ic_action_link"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/share"
 		android:title="@string/share"
@@ -26,7 +31,7 @@
 	<item
 		android:id="@+id/share_file"
 		android:title="@string/share_file"
-		android:icon="@drawable/ic_action_share"
+		android:icon="@drawable/ic_action_pick_file"
 		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/create"

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

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+	<string name="welcome">مرحبًا!</string>
+	<string name="mode_expert">متقدم</string>
+	<string name="mode_expert_description">أود التحقق من المحتوى المقروء وفتحه يدويًا.</string>
+	<string name="mode_simple">بسيط</string>
+	<string name="mode_simple_description">أريد فقط قراءة الباركود وفتحه فورًا.</string>
+	<string name="camera_error">يتعذر الوصول إلى الكاميرا، يرجى المحاولة مرة أخرى</string>
+	<string name="scan_code">مسح الرمز</string>
+	<string name="compose_barcode">إنشاء رمز Bardcode</string>
+	<string name="decode_barcode">فك رمز Barcode</string>
+	<string name="content">المحتوى</string>
+	<string name="binary_data">(بيانات ثنائية)</string>
+	<plurals name="barcode_info">
+		<item quantity="zero">%2$d حروف، %1$s</item>
+		<item quantity="one">حرف واحد، %1$s</item>
+		<item quantity="two">حرفين، %1$s</item>
+		<item quantity="few">%2$d حروف، %1$s</item>
+		<item quantity="many">%2$d حرف، %1$s</item>
+		<item quantity="other">%2$d حرف، %1$s</item>
+	</plurals>
+	<string name="error_correction_level">مستوى تصحيح الأخطاء</string>
+	<string name="error_correction_level_l" formatted="false">منخفض (~7% تصحيح)</string>
+	<string name="error_correction_level_m" formatted="false">متوسط (~15% تصحيح)</string>
+	<string name="error_correction_level_q" formatted="false">ربع (~25% تصحيح)</string>
+	<string name="error_correction_level_h" formatted="false">مرتفع (~30% تصحيح)</string>
+	<string name="label">العنوان</string>
+	<string name="colors">المقدمة والخلفية</string>
+	<string name="colors_black_on_white">أسود على خلفية بيضاء</string>
+	<string name="colors_white_on_black">أبيض على خلفية سوداء</string>
+	<string name="colors_black_on_transparent">أسود على خلفية شفافة</string>
+	<string name="colors_white_on_transparent">أبيض على خلفية شفافة</string>
+	<string name="sequence_size">حجم التسلسل</string>
+	<string name="sequence_index">رقم التسلسل</string>
+	<string name="sequence_id">معرف التسلسل</string>
+	<string name="gtin_issue_number">رقم الإصدار</string>
+	<string name="gtin_country">بلد التصنيع المحتمل</string>
+	<string name="gtin_price">السعر المقترح</string>
+	<string name="gtin_add_on">إضافة UPC EAN</string>
+	<string name="barcode_version_number">الإصدار</string>
+	<string name="qr_version_and_modules" tools:ignore="PluralsCandidate">%1$s (%2$d وحدات)</string>
+	<string name="qr_data_mask">قناع البيانات</string>
+	<string name="toggle_flash">تشغيل/إيقاف الوميض</string>
+	<string name="error_flash">خطأ في تشغيل الوميض</string>
+	<string name="share">مشاركة</string>
+	<string name="share_file">مشاركة كملف</string>
+	<string name="share_as">مشاركة كـ؟</string>
+	<string name="copy_to_clipboard">نسخ إلى الحافظة</string>
+	<string name="copy_as_deeplink">نسخ كرابط عميق</string>
+	<string name="copied_to_clipboard">تم النسخ إلى الحافظة</string>
+	<string name="copy_password">نسخ كلمة المرور إلى الحافظة</string>
+	<string name="open_url">فتح الرابط</string>
+	<string name="cannot_resolve_action">لم يتم العثور على تطبيق يمكنه فتح ذلك</string>
+	<string name="pick_search_engine">اختر محرك البحث</string>
+	<string name="format">التنسيق</string>
+	<string name="size_width_by_height">الحجم بالبكسل: %1$d×%2$d</string>
+	<string name="size_no_magnification">بدون تكبير</string>
+	<string name="add_quiet_zone">إضافة منطقة هادئة</string>
+	<string name="input_content_here">أدخل المحتوى هنا</string>
+	<string name="unescape">توسيع رموز الهروب (escape sequences)</string>
+	<string name="encode">ترميز</string>
+	<string name="error_no_content">المحتوى مفقود</string>
+	<string name="error_encoding_barcode">لا يمكن إنشاء رمز Barcode</string>
+	<string name="view_barcode">عرض رمز Barcode</string>
+	<string name="info">معلومات</string>
+	<string name="switch_camera">تبديل الكاميرا</string>
+	<string name="bulk_mode">المسح بشكل مستمر</string>
+	<string name="bulk_mode_summary">ابدأ المسح دائمًا بشكل مستمر.</string>
+	<string name="bulk_mode_delay">الفارق الزمني بين عمليات المسح المستمرة</string>
+	<string name="restrict_format">تحديد التنسيق</string>
+	<string name="remove_restriction">إزالة التحديد</string>
+	<string name="find_code">العثور على الرمز</string>
+	<string name="find_code_with_content">ما المحتوى؟</string>
+	<string name="find_code_hint">أدخل مصطلحًا</string>
+	<string name="scan_format">مسح %s</string>
+	<string name="quarter_second">ربع ثانية</string>
+	<string name="half_second">نصف ثانية</string>
+	<string name="a_second">ثانية واحدة</string>
+	<string name="two_seconds">ثانيتان</string>
+	<string name="five_seconds">خمس ثوانٍ</string>
+	<string name="history">التاريخ</string>
+	<string name="preferences">الإعدادات</string>
+	<string name="scan_category">المسح</string>
+	<string name="content_category">المحتوى</string>
+	<string name="locale_category">اللغة</string>
+	<string name="custom_locale">تغيير اللغة</string>
+	<string name="follow_system_settings">اتبع إعدادات النظام</string>
+	<string name="show_crop_handle">عرض محدد الاقتصاص</string>
+	<string name="show_crop_handle_summary">حصر المسح في منطقة قابلة للتخصيص.</string>
+	<string name="barcode_formats">تنسيقات Barcode</string>
+	<string name="zoom_by_swiping">مرر لأعلى أو لأسفل للتكبير/التصغير</string>
+	<string name="zoom_by_swiping_summary">مرر لأعلى أو لأسفل على واجهة الكاميرا للتحكم في التكبير/التصغير لها.</string>
+	<string name="auto_rotate">التعرف على رموز Barcode العمودية أحادية الأبعاد</string>
+	<string name="auto_rotate_summary">تدوير إطار الكاميرا تلقائيًا للتعرف على رموز Barcode العمودية أحادية الأبعاد. بناءً على الجهاز المستخدم، قد يؤثر ذلك على الأداء.</string>
+	<string name="try_harder">تحسين دقة القارئ</string>
+	<string name="try_harder_summary">قم بتمكين هذا الخيار للرموز التي يصعب قراءتها. سيؤثر على الأداء.</string>
+	<string name="show_toast_in_bulk_mode">عرض البيانات في الوضع المستمر</string>
+	<string name="show_toast_in_bulk_mode_summary">عرض سريع للبيانات الممسوحة عند المسح المستمر.</string>
+	<string name="vibrate">الاهتزاز عند الكشف</string>
+	<string name="vibrate_summary">قم بتمكين هذا إذا كنت تريد أن يهتز جهازك عندما يتم التعرف على رمز.</string>
+	<string name="beep">صوت صفير عند الكشف</string>
+	<string name="beep_summary">قم بتمكين هذا إذا كنت تريد أن يصدر جهازك صوتًا عند التعرف على رمز.</string>
+	<string name="beep_tone">نغمة الصفير</string>
+	<string name="tone_cdma_confirm">تأكيد CDMA</string>
+	<string name="tone_sup_confirm">تأكيد الإشراف على الاتصال</string>
+    <string name="tone_sup_radio_ack">إقرار مسار الراديو الإشرافي على الاتصال</string>
+	<string name="tone_prop_ack">إقرار إيجابي</string>
+	<string name="tone_prop_beep">صوت صفير عام</string>
+	<string name="tone_prop_beep2">صوت صفير مزدوج عام</string>
+	<string name="use_history">حفظ تاريخ المسح</string>
+	<string name="use_history_summary">حفظ الرموز المتعرف عليها على جهازك.</string>
+	<string name="ignore_duplicates">تجاهل النسخ المكررة</string>
+	<string name="ignore_consecutive_duplicates">النسخ المكررة المتتالية</string>
+	<string name="ignore_any_duplicates">أي نسخ مكررة</string>
+	<string name="accept_duplicates">قبول النسخ المكررة</string>
+	<string name="open_immediately">فتح مباشرةً</string>
+	<string name="open_immediately_summary">تخطي الفحص وفتح المحتويات على الفور. قد يتم فتح محتويات ضارة إذا تم تمكينه.</string>
+	<string name="copy_immediately">نسخ تلقائي إلى الحافظة</string>
+	<string name="copy_immediately_summary">نسخ المحتويات الممسوحة إلى الحافظة تلقائيًا. يرجى ملاحظة أن التطبيقات الأخرى قد تتطفل على الحافظة الخاصة بك في الخلفية.</string>
+	<string name="show_meta_data">عرض البيانات الوصفية</string>
+	<string name="show_meta_data_summary">عرض بيانات إضافية حول رمز Barcode الممسوح.</string>
+	<string name="show_hex_dump">عرض التفريغ سداسي عشري</string>
+	<string name="show_hex_dump_summary">عرض تفريغ سداسي عشري للمحتويات الممسوحة.</string>
+	<string name="show_checksum">عرض الـ checksum</string>
+	<string name="no_checksum">الـ checksum غير متوفر</string>
+	<string name="show_recreation">إظهار رمز Barcode المعاد إنشاؤه</string>
+	<string name="show_recreation_summary">إعادة إنشاء وإظهار رمز Barcode من المحتوى الذي تمت قراءته إن أمكن.</string>
+	<string name="close_automatically">العودة للخلف بعد النسخ أو المشاركة</string>
+	<string name="close_automatically_summary">العودة تلقائيًا إلى شاشة المسح بعد نسخ أو مشاركة المحتويات المقروءة.</string>
+	<string name="default_search_engine">فتح البيانات المجهولة في</string>
+	<string name="always_ask">اسأل دائمًا</string>
+	<string name="open_with_url">فتح البيانات المجهولة باستخدام رابط</string>
+	<string name="clear_network_suggestions">إزالة الشبكات المقترحة</string>
+	<string name="clear_network_suggestions_summary">إزالة الشبكات المقترحة التي تمت إضافتها مسبقًا من خلال هذا التطبيق.</string>
+	<string name="really_remove_all_networks">هل تريد حقًا إزالة جميع الشبكات؟</string>
+	<string name="clear_network_suggestions_success">تم إزالة الشبكات المقترحة</string>
+	<string name="clear_network_suggestions_nothing_to_remove">لا يوجد أي شبكات المقترحة</string>
+	<string name="send_category">إعادة التوجيه</string>
+	<string name="send_scan_active">إعادة توجيه عمليات المسح</string>
+	<string name="send_scan_active_summary">قم بالتمكين لإعادة توجيه عمليات المسح إلى رابط معين.</string>
+	<string name="send_scan_url">الرابط المراد إعادة التوجيه إليه</string>
+	<string name="send_scan_type">نوع الطلب</string>
+    <string name="send_type_get_add_content">نوع GET وأضفه ببساطة</string>
+    <string name="send_type_get_query_string">نوع GET مع سلسلة الاستعلام الكاملة</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">فتح في متصفح خارجي</string>
+	<string name="test_url">رابط للاختبار</string>
+	<string name="send_scan_bluetooth">إرسال عمليات المسح عبر بلوتوث</string>
+	<string name="send_scan_bluetooth_summary">تمكين إرسال عمليات المسح إلى مضيف بلوتوث معين.</string>
+	<string name="send_scan_bluetooth_host">المضيف</string>
+	<string name="no_bluetooth_hosts_paired">لا يوجد اقتران مع مضيفين</string>
+	<string name="bluetooth_connect_fail">تعذر الاتصال بجهاز بلوتوث.</string>
+	<string name="bluetooth_send_fail">تعذر الإرسال إلى جهاز بلوتوث.</string>
+	<string name="bluetooth_send_success">نجح الإرسال إلى جهاز بلوتوث.</string>
+	<string name="generation_category">التوليد</string>
+	<string name="brighten_screen">شاشة ساطعة</string>
+	<string name="brighten_screen_summary">تعيين مستوى السطوع إلى الحد الأقصى لتحسين مسح الرمز من الشاشة.</string>
+	<string name="really_remove_scan">هل تريد حقًا إزالة المسح؟</string>
+	<string name="really_remove_all_scans">هل تريد حقًا إزالة كافة عمليات المسح؟</string>
+	<string name="really_remove_selected_scans">هل تريد حقًا إزالة عمليات المسح المحددة؟</string>
+	<string name="clear_history">مسح التاريخ</string>
+	<string name="copy_scan">نسخ عملية المسح</string>
+	<string name="edit_label">تعديل العنوان</string>
+	<string name="remove_scan">حذف عملية المسح</string>
+	<string name="enter_name">أدخل اسمًا لوصف عملية المسح</string>
+	<string name="enter_name_hint">اسم عملية المسح</string>
+	<string name="no_barcode_found">لا يوجد أي رمز Barcode</string>
+	<string name="pick_list_separator">الفاصل المستخدم لفصل عناصر القائمة؟</string>
+	<string name="separator_line_break">خط فاصل</string>
+	<string name="separator_ruler">المسطرة</string>
+	<string name="save_as_file_name">حفظ في مجلد التنزيلات؟</string>
+	<string name="file_name">اسم الملف</string>
+	<string name="error_saving_file">يتعذر حفظ الملف</string>
+	<string name="error_file_exists">الملف موجود بالفعل</string>
+	<string name="connect_to_wifi">الاتصال بشبكة Wi-Fi</string>
+	<string name="wifi_config_failed">تعذر تهيئة شبكة Wi-Fi</string>
+	<string name="wifi_added">تمت إضافة شبكة Wi-Fi</string>
+	<string name="sms_send">إرسال رسالة نصية قصيرة</string>
+	<string name="sms_error">تعذر إرسال رسالة نصية قصيرة</string>
+	<string name="tel_dial">الاتصال بالرقم</string>
+	<string name="tel_error">تعذر الاتصال بالرقم</string>
+	<string name="mail_send">إرسال بريد إلكتروني</string>
+	<string name="mail_error">تعذر إرسال البريد الإلكتروني</string>
+	<string name="vcard_add">إضافة إلى جهات الاتصال</string>
+	<string name="vcard_failed">تعذرت الإضافة إلى جهات الاتصال</string>
+	<string name="vevent_add">إضافة إلى التقويم</string>
+	<string name="vevent_failed">تعذرت الإضافة إلى التقويم</string>
+	<string name="otpauth_add">أضف المصادقة الثنائية (2FA)</string>
+	<string name="search_web">البحث عبر الإنترنت</string>
+	<string name="search_scan">البحث عن عملية مسح</string>
+	<string name="add_to_history">إضافة إلى التاريخ</string>
+	<string name="added_to_history">تمت الإضافة إلى التاريخ</string>
+	<string name="export_to_file">تصدير إلى ملف</string>
+	<string name="export_as">تصدير كـ؟</string>
+	<string name="export_csv_comma">ملف CSV مع فواصل</string>
+	<string name="export_csv_semicolon">ملف CSV مع فواصل منقوطة</string>
+	<string name="export_json">ملف JSON</string>
+	<string name="export_database">قاعدة بيانات SQLite</string>
+	<string name="saved_in_downloads">تم الحفظ في مجلد التنزيلات</string>
+	<string name="rotate_image_cw">تدوير الصورة باتجاه عقارب الساعة</string>
+	<string name="toggle_free_rotation">تبديل التدوير الحر</string>
+	<string name="pick_file">اختر ملف</string>
+	<string name="pick_image_file">اختر صورة</string>
+	<string name="pick_code_to_scan">اختر رمزًا لمسحه</string>
+	<string name="shortcut_decode">مسح رمز Barcode</string>
+	<string name="shortcut_encode">إنشاء رمز Barcode</string>
+	<string name="shortcut_history">التاريخ</string>
+	<string name="shortcut_preferences">الإعدادات</string>
+	<string name="background_request_failed">فشل الطلب للعمل في الخلفية</string>
+	<string name="entry_type">النوع</string>
+	<string name="wifi_network">شبكة Wi-Fi</string>
+	<string name="wifi_ssid">الاسم</string>
+	<string name="wifi_type">نوع المصادقة</string>
+	<string name="wifi_password">كلمة المرور</string>
+	<string name="wifi_hidden">شبكة مخفية</string>
+	<string name="wifi_eap">طريقة EAP</string>
+	<string name="wifi_anonymous_identity">هوية مجهولة</string>
+	<string name="wifi_identity">الهوية</string>
+	<string name="wifi_phase2">طريقة Phase 2</string>
+	<string name="network_suggestions">الشبكات المقترحة</string>
+	<string name="remove_suggestion">إزالة الاقتراحات</string>
+	<string name="email_to">المستلم</string>
+	<string name="email_subject">الموضوع</string>
+	<string name="email_body">النص</string>
+	<string name="scheme">المخطط</string>
+	<string name="host">المضيف</string>
+	<string name="query">استعلام</string>
+</resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Добре дошли!</string>
+	<string name="mode_expert">Разширен</string>
+	<string name="mode_expert_description">Искам да проверя прочетеното съдържание и да го отворя ръчно.</string>
+	<string name="mode_simple">Опростен</string>
+	<string name="mode_simple_description">Искам просто да сканирам баркодове и да ги отварям веднага.</string>
 	<string name="camera_error">Няма достъп до камерата, моля, опитайте отново</string>
 	<string name="scan_code">Сканирайте код</string>
 	<string name="compose_barcode">Създаване на баркод</string>
@@ -14,7 +19,7 @@
 	<string name="error_correction_level_m" formatted="false">Средно (~15&#37; корекция)</string>
 	<string name="error_correction_level_q" formatted="false">Четвъртично (~25&#37; корекция)</string>
 	<string name="error_correction_level_h" formatted="false">Високо (~30&#37; корекция)</string>
-	<string name="label">Label</string>
+	<string name="label">Етикет</string>
 	<string name="colors">Преден и заден план</string>
 	<string name="colors_black_on_white">Черно на бяло</string>
 	<string name="colors_white_on_black">Бяло на черно</string>
@@ -29,21 +34,23 @@
 	<string name="gtin_add_on">UPC EAN разширение</string>
 	<string name="barcode_version_number">Версия</string>
 	<string name="qr_version_and_modules">%1$s (%2$d модули)</string>
+	<string name="qr_data_mask">Маска за данни</string>
 	<string name="toggle_flash">Превключване на светкавицата</string>
 	<string name="error_flash">Грешка при превключването на светкавицата</string>
 	<string name="share">Сподели</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Споделяне като файл</string>
 	<string name="share_as">Сподели като?</string>
 	<string name="copy_to_clipboard">Копиране в клипборда</string>
+	<string name="copy_as_deeplink">Копиране като дийп линк</string>
 	<string name="copied_to_clipboard">Копирано в клипборда</string>
 	<string name="copy_password">Копиране на паролата в клипборда</string>
-	<string name="copied_password_to_clipboard">Паролата е копирана в клипборда</string>
 	<string name="open_url">Отворете URL(Линк)</string>
 	<string name="cannot_resolve_action">Няма приложение което може да отвори това</string>
 	<string name="pick_search_engine">Изберете търсачка</string>
 	<string name="format">Формат</string>
 	<string name="size_width_by_height">Размер в пиксели: %1$d×%2$d</string>
-	<string name="margin_size">Марж в пиксели: %1$d</string>
+	<string name="size_no_magnification">Без увеличение</string>
+	<string name="add_quiet_zone">Добавяне на тиха зона</string>
 	<string name="input_content_here">Въведете съдържание тук</string>
 	<string name="unescape">Разширете последователности за извеждане</string>
 	<string name="encode">КОДИРАНЕ</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Забавяне между непрекъснатите сканирания</string>
 	<string name="restrict_format">Ограничаване на формат</string>
 	<string name="remove_restriction">Премахване на ограничението</string>
+	<string name="find_code">Намерете кода</string>
+	<string name="find_code_with_content">Какво съдържание?</string>
+	<string name="find_code_hint">Въведете термин</string>
 	<string name="scan_format">Сканиране %s</string>
 	<string name="quarter_second">Червърт секунда</string>
 	<string name="half_second">Половин секунда</string>
@@ -94,10 +104,10 @@
 	<string name="tone_prop_beep2">Общ двоен звуков сигнал</string>
 	<string name="use_history">Хронология на сканирането</string>
 	<string name="use_history_summary">Запазва разпознатите кодове на вашето устройство.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Игнорирайте дубликати</string>
 	<string name="ignore_consecutive_duplicates">Игнориране на дубликатите</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Приемане на дубликати</string>
 	<string name="open_immediately">Отваряй внезапно</string>
 	<string name="open_immediately_summary">Пропуска проверката и внезапно отваря съдържанието. Може да отвори вредно съдържание, ако е активирано.</string>
 	<string name="copy_immediately">Поставяй в клипборда</string>
@@ -106,8 +116,8 @@
 	<string name="show_meta_data_summary">Показване на допълнителни данни за сканирания баркод.</string>
 	<string name="show_hex_dump">Показване на шестнадесетичен дъмп</string>
 	<string name="show_hex_dump_summary">Показване на шестнадесетичен дъмп на сканираното съдържание.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Покажи контролна сума</string>
+	<string name="no_checksum">Без контролна сума</string>
 	<string name="show_recreation">Показване на пресъздаден баркод</string>
 	<string name="show_recreation_summary">Създай и покажи баркод отново от прочетеното съдържание, ако е възможно.</string>
 	<string name="close_automatically">Върщане се след Копиране/Споделяне</string>
@@ -138,9 +148,9 @@
 	<string name="bluetooth_connect_fail">Неуспешно свързване с Bluetooth устройство.</string>
 	<string name="bluetooth_send_fail">Неуспешно изпращане до Bluetooth устройство.</string>
 	<string name="bluetooth_send_success">Успешно Bluetooth изпращане.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Поколение</string>
+	<string name="brighten_screen">Подсвети екрана</string>
+	<string name="brighten_screen_summary">Задайте яркостта на максимум, за да подобрите сканирането на баркод от екрана.</string>
 	<string name="really_remove_scan">Наистина ли искате да премахнете това сканиране?</string>
 	<string name="really_remove_all_scans">Наистина ли искате да премахнете всички сканирания?</string>
 	<string name="really_remove_selected_scans">Наистина ли искате да премахнете избраните сканирания?</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">Добави 2FA</string>
 	<string name="search_web">Търси в мрежата</string>
 	<string name="search_scan">Търсещо сканиране</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Добави към историята</string>
+	<string name="added_to_history">Добавено към историята</string>
 	<string name="export_to_file">Извеждане в файл</string>
 	<string name="export_as">Извеждане като?</string>
 	<string name="export_csv_comma">CSV файл със запетаи</string>
@@ -190,7 +200,7 @@
 	<string name="pick_code_to_scan">Изберете код за сканиране</string>
 	<string name="shortcut_decode">Сканирай баркод</string>
 	<string name="shortcut_encode">Създай баркод</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">История</string>
 	<string name="shortcut_preferences">Настройки</string>
 	<string name="background_request_failed">Неуспешна заявка в фонов режим</string>
 	<string name="entry_type">Тип</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Фаза 2 метод</string>
 	<string name="network_suggestions">Предложения за интернет мрежа</string>
 	<string name="remove_suggestion">Премахване на предложението</string>
+	<string name="email_to">Получател</string>
+	<string name="email_subject">Тема</string>
+	<string name="email_body">Съдържание</string>
+	<string name="scheme">Схема</string>
+	<string name="host">Домакин</string>
+	<string name="query">Заявка</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">স্বাগতম!</string>
+	<string name="mode_expert">উন্নত</string>
+	<string name="mode_expert_description">আমি পড়া বিষয়বস্তু যাচাই করতে চাই এবং এটি নিজে খুলতে চাই।</string>
+	<string name="mode_simple">সহজ</string>
+	<string name="mode_simple_description">আমি কেবল বারকোড স্ক্যান করতে চাই এবং তা সঙ্গে সঙ্গে খুলতে চাই।</string>
 	<string name="camera_error">ক্যামেরা পাওয়া যাচ্ছে না, পরে চেষ্টা করো</string>
 	<string name="scan_code">সংকেতের পাঠোদ্ধার</string>
 	<string name="compose_barcode">বারকোড বানাও</string>
@@ -14,38 +19,40 @@
 	<string name="error_correction_level_m" formatted="false">মধ্যম (~১৫&#37; ঠিককরণ)</string>
 	<string name="error_correction_level_q" formatted="false">বেশি (~২৫&#37; ঠিককরণ)</string>
 	<string name="error_correction_level_h" formatted="false">অনেক বেশি (~৩০&#37; ঠিককরণ)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">লেবেল</string>
+	<string name="colors">পূর্ববর্তী এবং সৃজনাধীন</string>
+	<string name="colors_black_on_white">সাদা উপরে কালো</string>
+	<string name="colors_white_on_black">কালো উপর সাদা</string>
+	<string name="colors_black_on_transparent">সাদা সহজ পারদার উপর</string>
+	<string name="colors_white_on_transparent">পারদার উপর সাদা</string>
+	<string name="sequence_size">ধারার আকার</string>
+	<string name="sequence_index">ক্রমিক সূচী</string>
+	<string name="sequence_id">ক্রম আইডি</string>
 	<string name="gtin_issue_number">সমস্যা ক্রম</string>
 	<string name="gtin_country">তৈরির সম্ভাব্য দেশ</string>
 	<string name="gtin_price">প্রস্তসবিত দাম</string>
 	<string name="gtin_add_on">ইউপিসি ইএএন বর্ধিত</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">সংস্করণ</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">ডেটা মাস্ক</string>
 	<string name="toggle_flash">আলো</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">ফ্ল্যাশ টগল করার সময় ত্রুটি</string>
 	<string name="share">ভাগ করো</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">ফাইল হিসেবে ভাগাভাগি</string>
 	<string name="share_as">ভাগ করার মাধ্যম</string>
 	<string name="copy_to_clipboard">ক্লিপবোর্ডে অনুলিপি</string>
+	<string name="copy_as_deeplink">ডিপলিংক হিসেবে কপি করুন</string>
 	<string name="copied_to_clipboard">ক্লিপবোর্ডে অনুলিপিত</string>
 	<string name="copy_password">ক্লিপবোর্ডে পাসওয়ার্ড অনুলিপি করো</string>
-	<string name="copied_password_to_clipboard">ক্লিপবোর্ডে পাসওয়ার্ড অনুলিপিত</string>
 	<string name="open_url">ইউআরএল খুলো</string>
 	<string name="cannot_resolve_action">খোলার মতো অ্যাপ নেই</string>
 	<string name="pick_search_engine">একটা সার্চ ইঞ্জিন নাও</string>
 	<string name="format">ধরণ</string>
 	<string name="size_width_by_height">পিক্সেলে আকা:%1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">কোনো বৃদ্ধি নেই</string>
+	<string name="add_quiet_zone">শান্তি জোন যোগ করুন</string>
 	<string name="input_content_here">এখানে তথ্য দাও</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">এস্কেপ সিকোয়েন্স প্রসারিত করুন</string>
 	<string name="encode">সংকেতকরণ</string>
 	<string name="error_no_content">তথ্য নেই</string>
 	<string name="error_encoding_barcode">বারকোড বানানো যায়নি</string>
@@ -54,15 +61,18 @@
 	<string name="switch_camera">ক্যামেরা পাল্টাও</string>
 	<string name="bulk_mode">ধারাবাহিকভাবে খুঁজো</string>
 	<string name="bulk_mode_summary">শুরুতে সবসময় ধারাবাহিকভাবে খুঁজো</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_delay">একটি অবিরত স্ক্যান মধ্যে বিলম্ব</string>
+	<string name="restrict_format">বিনিয়োগ বাধাগ্রস্ত ফরম্যাট</string>
+	<string name="remove_restriction">সীমাবদ্ধতা অপসারণ করুন</string>
+	<string name="find_code">কোড খুঁজুন</string>
+	<string name="find_code_with_content"> কী বিষয়টি? </string>
+	<string name="find_code_hint">একটি শব্দ লিখুন</string>
+	<string name="scan_format">স্ক্যান %s</string>
+	<string name="quarter_second">এক চতুর্থ সেকেন্ড</string>
+	<string name="half_second">আধা সেকেন্ড</string>
+	<string name="a_second">এক সেকেন্ড</string>
+	<string name="two_seconds">দুই সেকেন্ড</string>
+	<string name="five_seconds">পাঁচ সেকেন্ড</string>
 	<string name="history">ইতিহাস</string>
 	<string name="preferences">পছন্দসমূহ</string>
 	<string name="scan_category">খুঁজো</string>
@@ -72,7 +82,7 @@
 	<string name="follow_system_settings">ব্যবস্থার পছন্দসমূহ অনুসরণ করো</string>
 	<string name="show_crop_handle">ছাটার সীমা দেখাও</string>
 	<string name="show_crop_handle_summary">পরিবর্তনযোগ্য জায়গায়ই শুধু খুঁজো।</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">বারকোড বিন্যাস</string>
 	<string name="zoom_by_swiping">ওপরে/নিচে টানো বড়ো করার জন্য</string>
 	<string name="zoom_by_swiping_summary">ক্যামেরার ছোটো-বড় নিয়ন্ত্রণের জন্য উপরে-নিচে টানো।</string>
 	<string name="auto_rotate">খাড়া ১ডি বারকোড সনাক্ত করো</string>
@@ -83,21 +93,21 @@
 	<string name="show_toast_in_bulk_mode_summary">ধারাবাহিকভাবে তথ্য দেখানোর সময় মুহূর্তের জন্য তথ্য দেখাও।</string>
 	<string name="vibrate">চিনলে কাঁপো</string>
 	<string name="vibrate_summary">এটা সক্ষম রাখলে সংকেত চিনার সাথে সাথে কাঁপবে।</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">প্রকোপে বিপ দিন</string>
+	<string name="beep_summary">যদি আপনি চান যে আপনার ডিভাইসটি কোড প্রাপ্ত হলে বিপ শব্দ করে।</string>
+	<string name="beep_tone">বিপ টোন</string>
+	<string name="tone_cdma_confirm">সিডিএমএ নিশ্চিত করুন</string>
+	<string name="tone_sup_confirm">কল সুপারভাইজরী কনফার্ম</string>
+	<string name="tone_sup_radio_ack">কল সুপারভাইজরি রেডিও পাথ স্বীকৃতি</string>
+	<string name="tone_prop_ack">ধন্যবাদ</string>
+	<string name="tone_prop_beep">সাধারণ বিপ</string>
+	<string name="tone_prop_beep2">সাধারণ ডাবল বিপ</string>
 	<string name="use_history">ইতিহাস সংরক্ষণ করো।</string>
 	<string name="use_history_summary">সনাক্তকৃত সংকেত যন্ত্রে সংরক্ষণ করো।</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">নকল উপেক্ষা করুন</string>
 	<string name="ignore_consecutive_duplicates">দ্বিত্ব উপেক্ষা করো</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">ডুপ্লিকেট গ্রহণ করুন</string>
 	<string name="open_immediately">সাথে সাথে খুলো</string>
 	<string name="open_immediately_summary">না দেখে সাথে সাথে খুলো। সক্রিয় থাকলে ক্ষতিকারক তথ্য খুলতে পারে।</string>
 	<string name="copy_immediately">ক্লিপবোর্ডে রাখো</string>
@@ -106,22 +116,22 @@
 	<string name="show_meta_data_summary">সনাক্তকৃত বারকোড নিয়ে অতিরিক্ত তথ্য দেখাও।</string>
 	<string name="show_hex_dump">ষড়(hex) সংকেত দেখাও</string>
 	<string name="show_hex_dump_summary">পড়া তথ্যের ষড় সংকেত দেখাও</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_checksum">সামগ্রিক চেকসাম দেখান</string>
+	<string name="no_checksum">কোনো চেকসাম নেই</string>
+	<string name="show_recreation">পুনরায় তৈরি বারকোড দেখান</string>
+	<string name="show_recreation_summary">যদি সম্ভব হয়, পঠিত বিষয় থেকে পুনরায় সৃষ্টি করুন এবং বারকোড দেখান।</string>
 	<string name="close_automatically">অনুলিপি/ভাগ করার পরে পিছনে যাও</string>
 	<string name="close_automatically_summary">তথ্য অনুলিপি/ভাগ করার পরে স্বয়ংক্রিয়ভাবে পিছনে যাও।</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="default_search_engine">অজানা ডেটা খোলুন</string>
+	<string name="always_ask">সবসময় জিজ্ঞাসা করুন</string>
 	<string name="open_with_url">অজানা ইউআরএল খুলো</string>
 	<string name="clear_network_suggestions">Clear network suggestions</string>
 	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="really_remove_all_networks">সব নেটওয়ার্ক সত্যিই সরান?</string>
+	<string name="clear_network_suggestions_success">নেটওয়ার্ক পরামর্শ মোছা হয়েছে</string>
+	<string name="clear_network_suggestions_nothing_to_remove">মুছতে কিছু নেই</string>
 	<string name="send_category">অন্যকে পাঠাও</string>
-	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active">পুনরায় স্ক্যান পাঠান</string>
 	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">প্রতিটি পাঠোদ্ধার ইউআরএল-এ পাঠাও</string>
 	<string name="send_scan_type">প্রতি পাঠোদ্ধারের জন্য অনুরোধ</string>
@@ -129,18 +139,18 @@
 	<string name="send_type_get_query_string">সম্পূর্ণ কুয়েরি স্ট্রিং দিয়ে গেট(GET) করো</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="send_type_external_browser">বাহ্যিক ব্রাউজারে খোলুন</string>
 	<string name="test_url">পরীক্ষার জন্য ইউআরএল</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">ব্লুটুথ দিয়ে স্ক্যান ফরোয়ার্ড করুন</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">হোস্ট</string>
+	<string name="no_bluetooth_hosts_paired">কোন হোস্ট পেয়ার করা হয়নি</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">প্রজন্ম</string>
+	<string name="brighten_screen">স্ক্রিন উজ্জ্বল করুন</string>
+	<string name="brighten_screen_summary">স্ক্রিন থেকে বারকোড স্ক্যান করার জন্য উজ্জ্বলতা সর্বোচ্চ করুন।</string>
 	<string name="really_remove_scan">আসলেই এটা মুছবে?</string>
 	<string name="really_remove_all_scans">আসলেই সব মুছবে?</string>
 	<string name="really_remove_selected_scans">আসলেই নির্বাচিত সব মুছবে?</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">২এফএ যোগ করো</string>
 	<string name="search_web">ওয়েবে খুঁজো</string>
 	<string name="search_scan">আগেরগুলোতে খুঁজো</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">ইতিহাসে যোগ করুন</string>
+	<string name="added_to_history">ইতিহাসে যোগ করা হয়েছে</string>
 	<string name="export_to_file">নথিতে রপ্তানি করো</string>
 	<string name="export_as">রপ্তানির ধরণ?</string>
 	<string name="export_csv_comma">কমাসহ সিএসভি(.csv) নথি</string>
@@ -184,25 +194,31 @@
 	<string name="export_database">এসকিউলাইট তথ্যভিত্তি</string>
 	<string name="saved_in_downloads">ডাউনলোডে সংরক্ষিত</string>
 	<string name="rotate_image_cw">ছবি ঘড়ির দিকে ঘুরাও</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">মুক্ত ঘূর্ণন টগল করুন</string>
+	<string name="pick_file">একটি ফাইল চয়ন করুন</string>
 	<string name="pick_image_file">ছবি নাও</string>
 	<string name="pick_code_to_scan">খুঁজার জন্য কোড নাও</string>
 	<string name="shortcut_decode">বারকোড খুজো</string>
 	<string name="shortcut_encode">বারকোড বানাও</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">ইতিহাস</string>
 	<string name="shortcut_preferences">পছন্দসমূহ</string>
 	<string name="background_request_failed">পটভূমির অনুরোধ ব্যর্থ</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="entry_type">ধরণ</string>
+	<string name="wifi_network">ওয়াই-ফাই নেটওয়ার্ক</string>
+	<string name="wifi_ssid">নাম</string>
+	<string name="wifi_type">প্রমাণীকরণ ধরণ</string>
+	<string name="wifi_password">গুরুত্বপূর্ণ</string>
+	<string name="wifi_hidden">লুকানো নেটওয়ার্ক</string>
+	<string name="wifi_eap">EAP পদ্ধতি</string>
+	<string name="wifi_anonymous_identity">অজ্ঞাত পরিচিতি</string>
+	<string name="wifi_identity">পরিচয়</string>
+	<string name="wifi_phase2">ধাপ ২ পদ্ধতি</string>
+	<string name="network_suggestions">নেটওয়ার্ক সুপারিশ</string>
+	<string name="remove_suggestion">প্রস্তাব সরান</string>
+	<string name="email_to">প্রাপক</string>
+	<string name="email_subject">বিষয়</string>
+	<string name="email_body">বার্তা</string>
+	<string name="scheme">ব্যবস্থা</string>
+	<string name="host">হোস্ট</string>
+	<string name="query">অনুসন্ধান</string>
 </resources>

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

@@ -1,4 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="welcome">Vítejte!</string>
+	<string name="mode_expert">Pokročilý</string>
+	<string name="mode_expert_description">Chci zkontrolovat načtený obsah a otevřít jej ručně.</string>
+	<string name="mode_simple">Jednoduchý</string>
+	<string name="mode_simple_description">Chci jen skenovat čárové kódy a okamžitě je otevírat.</string>
 	<string name="camera_error">Nepodařilo se otevřít fotoaparát, prosím zkuste to znovu</string>
 	<string name="scan_code">Naskenovat kód</string>
 	<string name="compose_barcode">Vytvořit čárový kód</string>
@@ -12,11 +18,11 @@
 		<item quantity="other">%2$d znaků, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Stupeň korekce chyb</string>
-	<string name="error_correction_level_l" formatted="false">Nízký (~7&#37; korekce)</string>
-	<string name="error_correction_level_m" formatted="false">Střední (~15&#37; korekce)</string>
-	<string name="error_correction_level_q" formatted="false">Čtvrtinový (~25&#37; korekce)</string>
-	<string name="error_correction_level_h" formatted="false">Vysoký (~30&#37; korekce)</string>
-	<string name="label">Label</string>
+	<string name="error_correction_level_l" formatted="false">Nízký (~7% korekce)</string>
+	<string name="error_correction_level_m" formatted="false">Střední (~15% korekce)</string>
+	<string name="error_correction_level_q" formatted="false">Čtvrtinový (~25% korekce)</string>
+	<string name="error_correction_level_h" formatted="false">Vysoký (~30% korekce)</string>
+	<string name="label">Štítek</string>
 	<string name="colors">Popředí a pozadí</string>
 	<string name="colors_black_on_white">Černá na bílé</string>
 	<string name="colors_white_on_black">Bílá na černé</string>
@@ -31,21 +37,23 @@
 	<string name="gtin_add_on">rozšíření UPC EAN</string>
 	<string name="barcode_version_number">Verze</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modulů)</string>
+	<string name="qr_data_mask">Maska dat</string>
 	<string name="toggle_flash">Přepnout blesk</string>
 	<string name="error_flash">Zapnutí/vypnutí blesku selhalo</string>
 	<string name="share">Sdílet</string>
 	<string name="share_file">Sdílet jako soubor</string>
-	<string name="share_as">Sdílet jako</string>
+    <string name="share_as">Sdílet jako?</string>
 	<string name="copy_to_clipboard">Zkopírovat do schránky</string>
+	<string name="copy_as_deeplink">Kopírovat jako deeplink</string>
 	<string name="copied_to_clipboard">Zkopírováno do schránky</string>
 	<string name="copy_password">Zkopírovat heslo do schránky</string>
-	<string name="copied_password_to_clipboard">Heslo zkopírováno do schránky</string>
 	<string name="open_url">Otevřít URL</string>
 	<string name="cannot_resolve_action">Nemáte aplikaci, která by toto uměla otevřít</string>
 	<string name="pick_search_engine">Zvolte vyhledávač</string>
 	<string name="format">Formát</string>
 	<string name="size_width_by_height">Velikost v pixelech: %1$d×%2$d</string>
-	<string name="margin_size">Okraje v pixelech: %1$d</string>
+	<string name="size_no_magnification">Žádné zvětšení</string>
+	<string name="add_quiet_zone">Přidat tichou zónu</string>
 	<string name="input_content_here">Sem vložte obsah</string>
 	<string name="unescape">Rozšířit escape sekvence</string>
 	<string name="encode">ZAKÓDOVAT</string>
@@ -59,6 +67,9 @@
 	<string name="bulk_mode_delay">Prodleva mezi skeny</string>
 	<string name="restrict_format">Omezit na formát</string>
 	<string name="remove_restriction">Zrušit omezení formátu</string>
+	<string name="find_code">Najít kód</string>
+	<string name="find_code_with_content">Co obsah?</string>
+	<string name="find_code_hint">Zadejte termín</string>
 	<string name="scan_format">Naskenovat %s</string>
 	<string name="quarter_second">Čtvrt sekundy</string>
 	<string name="half_second">Půl sekundy</string>
@@ -89,17 +100,17 @@
 	<string name="beep_summary">Povolte, pokud chcete pípnutí při rozpoznání kódu.</string>
 	<string name="beep_tone">Tón pípnutí</string>
 	<string name="tone_cdma_confirm">Potvrzení CDMA</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_sup_confirm">Potvrzení dohledu volání</string>
+	<string name="tone_sup_radio_ack">Hovor na dohledové rádiové cestě potvrzení</string>
 	<string name="tone_prop_ack">Kladné potvrzení příjmu</string>
 	<string name="tone_prop_beep">Obecné pípnutí</string>
 	<string name="tone_prop_beep2">Dvojité obecné pípnutí</string>
 	<string name="use_history">Ukládat historii skenování</string>
 	<string name="use_history_summary">Rozpoznané kódy se uloží do zařízení.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Ignorovat duplicity</string>
 	<string name="ignore_consecutive_duplicates">Ignorovat duplikáty</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Přijmout duplicity</string>
 	<string name="open_immediately">Otevírat okamžitě</string>
 	<string name="open_immediately_summary">Přeskočí kontrolu a otevře obsah okamžitě. Může otevřít škodlivý obsah.</string>
 	<string name="copy_immediately">Vložit do schránky</string>
@@ -108,8 +119,8 @@
 	<string name="show_meta_data_summary">Zobrazí další data o naskenovaném čárovém kódu.</string>
 	<string name="show_hex_dump">Zobrazit hex dump</string>
 	<string name="show_hex_dump_summary">Zobrazí hex dump naskenovaného obsahu.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Zobrazit kontrolní součet</string>
+	<string name="no_checksum">Žádný kontrolní součet</string>
 	<string name="show_recreation">Zobrazit zrekonstruovaný kód</string>
 	<string name="show_recreation_summary">Zrekonstruovat a zobrazit čárový kód z přečteného obrazu, pokud je to možné.</string>
 	<string name="close_automatically">Vrátit se po zkopírování/sdílení</string>
@@ -124,11 +135,11 @@
 	<string name="clear_network_suggestions_nothing_to_remove">Nic ke smazání</string>
 	<string name="send_category">Předávání</string>
 	<string name="send_scan_active">Předávat skeny</string>
-	<string name="send_scan_active_summary">Zapnout předávání skenů na danou URL</string>
+    <string name="send_scan_active_summary">Zapnout předávání skenů na danou URL.</string>
 	<string name="send_scan_url">Posílat každý sken na URL</string>
 	<string name="send_scan_type">Typ požadavku pro každý sken</string>
 	<string name="send_type_get_add_content">GET a simply add content</string>
-	<string name="send_type_get_query_string">GET with complete query string</string>
+	<string name="send_type_get_query_string">GET s kompletním řetězcem dotazu</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Otevřít v prohlížeči</string>
@@ -140,9 +151,9 @@
 	<string name="bluetooth_connect_fail">Nelze se připojit k zařízení Bluetooth.</string>
 	<string name="bluetooth_send_fail">Nelze odesílat na zařízení Bluetooth.</string>
 	<string name="bluetooth_send_success">Odesílání přes Bluetooth se zdařilo.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Generace</string>
+	<string name="brighten_screen">Zvýšit jas obrazovky</string>
+	<string name="brighten_screen_summary">Nastavte jas na maximum pro zlepšení skenování čárového kódu ze obrazovky.</string>
 	<string name="really_remove_scan">Opravdu odstranit sken?</string>
 	<string name="really_remove_all_scans">Opravdu odstranit všechny skeny?</string>
 	<string name="really_remove_selected_scans">Opravdu odstranit zvolené skeny?</string>
@@ -156,7 +167,7 @@
 	<string name="pick_list_separator">Jak mají být odděleny položky?</string>
 	<string name="separator_line_break">Nový řádek</string>
 	<string name="separator_ruler">Svislice</string>
-	<string name="save_as_file_name">Uložit jako do složky Stahování</string>
+    <string name="save_as_file_name">Uložit do složky Stahování?</string>
 	<string name="file_name">Název souboru</string>
 	<string name="error_saving_file">Soubor se nepodařilo uložit</string>
 	<string name="error_file_exists">Soubor již existuje</string>
@@ -176,10 +187,10 @@
 	<string name="otpauth_add">Přidat 2FA</string>
 	<string name="search_web">Vyhledat na webu</string>
 	<string name="search_scan">Vyhledat sken</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Přidat do historie</string>
+	<string name="added_to_history">Přidáno do historie</string>
 	<string name="export_to_file">Exportovat do souboru</string>
-	<string name="export_as">Exportovat jako</string>
+    <string name="export_as">Exportovat jako?</string>
 	<string name="export_csv_comma">CSV oddělené čárkami</string>
 	<string name="export_csv_semicolon">CSV oddělené středníky</string>
 	<string name="export_json">soubor JSON</string>
@@ -192,7 +203,7 @@
 	<string name="pick_code_to_scan">Vyberte kód k naskenování</string>
 	<string name="shortcut_decode">Skenovat čárový kód</string>
 	<string name="shortcut_encode">Vytvořit čárový kód</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Historie</string>
 	<string name="shortcut_preferences">Nastavení</string>
 	<string name="background_request_failed">Požadavek na pozadí selhal</string>
 	<string name="entry_type">Typ</string>
@@ -207,4 +218,10 @@
 	<string name="wifi_phase2">Ověření Phase 2</string>
 	<string name="network_suggestions">Návrhy sítí</string>
 	<string name="remove_suggestion">Odebrat návrh</string>
+	<string name="email_to">Příjemce</string>
+	<string name="email_subject">Předmět</string>
+	<string name="email_body">Tělo zprávy</string>
+	<string name="scheme">Schéma</string>
+	<string name="host">Host</string>
+	<string name="query">Dotaz</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Velkommen!</string>
+	<string name="mode_expert">Avanceret</string>
+	<string name="mode_expert_description">Jeg vil kontrollere det læste indhold og åbne det manuelt.</string>
+	<string name="mode_simple">Simpel</string>
+	<string name="mode_simple_description">Jeg vil bare scanne stregkoder og få dem åbnet med det samme.</string>
 	<string name="camera_error">Kan ikke få adgang til kamera, prøv igen</string>
 	<string name="scan_code">Scan kode</string>
 	<string name="compose_barcode">Opret stregkode</string>
@@ -14,7 +19,7 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; korrigering)</string>
 	<string name="error_correction_level_q" formatted="false">Kvartil (~25&#37; korrigering)</string>
 	<string name="error_correction_level_h" formatted="false">Høj (~30&#37; korrigering)</string>
-	<string name="label">Label</string>
+	<string name="label">Mærke</string>
 	<string name="colors">For- og baggrund</string>
 	<string name="colors_black_on_white">Sort på hvidt</string>
 	<string name="colors_white_on_black">Hvid på sort</string>
@@ -29,23 +34,25 @@
 	<string name="gtin_add_on">UPC EAN udvidelse</string>
 	<string name="barcode_version_number">Version</string>
 	<string name="qr_version_and_modules">%1$s (%2$d moduler)</string>
+	<string name="qr_data_mask">Data mask</string>
 	<string name="toggle_flash">Slå blitz til/fra</string>
 	<string name="error_flash">Der opstod en fejl ved at slå blitz til/fra</string>
 	<string name="share">Del</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Del som fil</string>
 	<string name="share_as">Del som?</string>
 	<string name="copy_to_clipboard">Kopier til udklipsholder</string>
+	<string name="copy_as_deeplink">Kopiér som deeplink</string>
 	<string name="copied_to_clipboard">Kopieret til udklipsholder</string>
 	<string name="copy_password">Kopier adgangskode til udklipsholderen</string>
-	<string name="copied_password_to_clipboard">Adgangskode kopieret til udklipsholderen</string>
 	<string name="open_url">Åbn URL</string>
 	<string name="cannot_resolve_action">Inge applikation kan åbne det</string>
 	<string name="pick_search_engine">Vælg en søgemaskine</string>
 	<string name="format">Format</string>
 	<string name="size_width_by_height">Størrelse i pixels: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">Ingen forstørrelse</string>
+	<string name="add_quiet_zone">Tilføj stille zone</string>
 	<string name="input_content_here">Indtast indhold her</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Udvid escape-sekvenser</string>
 	<string name="encode">INDKOD</string>
 	<string name="error_no_content">Manglende indhold</string>
 	<string name="error_encoding_barcode">Stregkode kan ikke genereres</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Forsinkelse mellem kontinuerlige scanninger</string>
 	<string name="restrict_format">Begræns format</string>
 	<string name="remove_restriction">Fjern begrænsningen</string>
+	<string name="find_code">Find kode</string>
+	<string name="find_code_with_content">Hvad indhold?</string>
+	<string name="find_code_hint">Indtast en term</string>
 	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">Et kvart sekund</string>
 	<string name="half_second">Et halvt sekund</string>
@@ -87,14 +97,14 @@
 	<string name="beep_summary">Aktiver dette, hvis du vil have din enhed til at bippe, når en kode genkendes.</string>
 	<string name="beep_tone">Bip tone</string>
 	<string name="tone_cdma_confirm">CDMA bekræftelse</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_sup_confirm">Opkald tilsyn bekræft</string>
+	<string name="tone_sup_radio_ack">Opkald tilsynsradio sti anerkendelse</string>
 	<string name="tone_prop_ack">Positiv anerkendelse</string>
 	<string name="tone_prop_beep">Generelt bip</string>
 	<string name="tone_prop_beep2">Generelt dobbelt bip</string>
 	<string name="use_history">Gem scanningshistorik</string>
 	<string name="use_history_summary">Gem genkendte koder på din enhed.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Ignorer duplikater</string>
 	<string name="ignore_consecutive_duplicates">Ignorer dubletter</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
 	<string name="accept_duplicates">Accept duplicates</string>
@@ -106,8 +116,8 @@
 	<string name="show_meta_data_summary">Vis yderligere data om den scannede stregkode.</string>
 	<string name="show_hex_dump">Vis hex-dump</string>
 	<string name="show_hex_dump_summary">Vis et hex-dump af det scannede indhold.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Vis kontrolsum</string>
+	<string name="no_checksum">Ingen kontrolsum</string>
 	<string name="show_recreation">Vis genskabt stregkode</string>
 	<string name="show_recreation_summary">Genskab og vis stregkode fra læst indhold, hvis det er muligt.</string>
 	<string name="close_automatically">Gå tilbage efter Kopier/Del</string>
@@ -131,16 +141,16 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Åbn i ekstern browser</string>
 	<string name="test_url">Test URL</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Send scanninger med Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">Vært</string>
+	<string name="no_bluetooth_hosts_paired">Ingen værter parret</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
 	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="brighten_screen">Skærm lysere</string>
+	<string name="brighten_screen_summary">Indstil lysstyrken til maksimum for at forbedre scanning af en stregkode fra skærmen.</string>
 	<string name="really_remove_scan">Vil du virkelig fjerne scanningen?</string>
 	<string name="really_remove_all_scans">Vil du virkelig fjerne alle scanninger?</string>
 	<string name="really_remove_selected_scans">Vil du virkelig fjerne valgte scanninger?</string>
@@ -174,23 +184,23 @@
 	<string name="otpauth_add">Tilføj 2FA</string>
 	<string name="search_web">Søg på nettet</string>
 	<string name="search_scan">Søg scanning</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Tilføj til historik</string>
+	<string name="added_to_history">Tilføjet til historik</string>
 	<string name="export_to_file">Eksporter til fil</string>
 	<string name="export_as">Eksporter som?</string>
 	<string name="export_csv_comma">CSV-fil med kommaer</string>
 	<string name="export_csv_semicolon">CSV-fil med semikoloner</string>
 	<string name="export_json">JSON fil</string>
-	<string name="export_database">SQLite database</string>
+	<string name="export_database">SQLite-database</string>
 	<string name="saved_in_downloads">Gemt i downloads</string>
 	<string name="rotate_image_cw">Roter billedet med uret</string>
 	<string name="toggle_free_rotation">Slå fri rotation til/fra</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="pick_file">Vælg en fil</string>
 	<string name="pick_image_file">Vælg billedfil</string>
 	<string name="pick_code_to_scan">Vælg kode til at scanne</string>
 	<string name="shortcut_decode">Scan en stregkode</string>
 	<string name="shortcut_encode">Opret en stregkode</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Historik</string>
 	<string name="shortcut_preferences">Indstillinger</string>
 	<string name="background_request_failed">Baggrundsanmodning mislykkedes</string>
 	<string name="entry_type">Type</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Fase 2 metode</string>
 	<string name="network_suggestions">Netværksforslag</string>
 	<string name="remove_suggestion">Fjern forslag</string>
+	<string name="email_to">Modtager</string>
+	<string name="email_subject">Emne</string>
+	<string name="email_body">Brødtekst</string>
+	<string name="scheme">Ordning</string>
+	<string name="host">Vært</string>
+	<string name="query">Forespørgsel</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Willkommen!</string>
+	<string name="mode_expert">Erweitert</string>
+	<string name="mode_expert_description">Ich möchte den gelesenen Inhalt überprüfen und manuell öffnen.</string>
+	<string name="mode_simple">Einfach</string>
+	<string name="mode_simple_description">Ich möchte nur Barcodes scannen und sie sofort öffnen.</string>
 	<string name="camera_error">Auf die Kamera kann nicht zugegriffen werden, bitte versuche es nochmal</string>
 	<string name="scan_code">Code scannen</string>
 	<string name="compose_barcode">Barcode erstellen</string>
@@ -20,30 +25,32 @@
 	<string name="colors_white_on_black">Weiß auf Schwarz</string>
 	<string name="colors_black_on_transparent">Schwarz auf Transparent</string>
 	<string name="colors_white_on_transparent">Weiß auf Transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="sequence_size">Sequenzgröße</string>
+	<string name="sequence_index">Sequenzindex</string>
+	<string name="sequence_id">Sequenz-ID</string>
 	<string name="gtin_issue_number">Ausgabe Nummer</string>
 	<string name="gtin_country">Mögliches Ursprungsland</string>
 	<string name="gtin_price">Preisvorschlag</string>
 	<string name="gtin_add_on">UPC EAN Erweiterung</string>
 	<string name="barcode_version_number">Version</string>
 	<string name="qr_version_and_modules">%1$s (%2$d Module)</string>
+	<string name="qr_data_mask">Maske</string>
 	<string name="toggle_flash">Licht an/ausschalten</string>
 	<string name="error_flash">Fehler beim ein/ausschalten des Lichts</string>
 	<string name="share">Teilen</string>
 	<string name="share_file">Als Datei teilen</string>
 	<string name="share_as">Teilen als?</string>
 	<string name="copy_to_clipboard">In die Zwischenablage kopieren</string>
+	<string name="copy_as_deeplink">Als Deeplink kopieren</string>
 	<string name="copied_to_clipboard">Inhalt wurde in die Zwischenablage kopiert</string>
 	<string name="copy_password">Passwort in die Zwischenablage kopieren</string>
-	<string name="copied_password_to_clipboard">Passwort wurde in die Zwischenablage kopiert</string>
 	<string name="open_url">URL öffnen</string>
 	<string name="cannot_resolve_action">Keine App kann das öffnen</string>
 	<string name="pick_search_engine">Suchmaschine auswählen</string>
 	<string name="format">Format</string>
 	<string name="size_width_by_height">Größe in Pixel: %1$d×%2$d</string>
-	<string name="margin_size">Randgröße in Pixel: %1$d</string>
+	<string name="size_no_magnification">Keine Vergrößerung</string>
+	<string name="add_quiet_zone">Ruhezone hinzufügen</string>
 	<string name="input_content_here">Gib den Inhalt hier ein</string>
 	<string name="unescape">Escape-Sequenzen interpretieren</string>
 	<string name="encode">KODIEREN</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Pause zwischen fortlaufenden Scans</string>
 	<string name="restrict_format">Format eingrenzen</string>
 	<string name="remove_restriction">Einschränkung entfernen</string>
+	<string name="find_code">Barcode finden</string>
+	<string name="find_code_with_content">Mit welchem Inhalt?</string>
+	<string name="find_code_hint">Begriff eingeben</string>
 	<string name="scan_format">%s scannen</string>
 	<string name="quarter_second">Eine Viertelsekunde</string>
 	<string name="half_second">Eine halbe Sekunde</string>
@@ -86,12 +96,12 @@
 	<string name="beep">Signalton bei Erkennung</string>
 	<string name="beep_summary">Bei Erkennung eines Codes soll ein Signalton abgespielt werden.</string>
 	<string name="beep_tone">Signalton</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="tone_cdma_confirm">CDMA bestätigen</string>
+	<string name="tone_sup_confirm">Anrufaufsicht bestätigen</string>
+	<string name="tone_sup_radio_ack">Anrufüberwachungsfunkpfadbestätigung</string>
+	<string name="tone_prop_ack">Positive Bestätigung</string>
+	<string name="tone_prop_beep">Allgemeines Piepen</string>
+	<string name="tone_prop_beep2">Allgemeiner Doppelton</string>
 	<string name="use_history">Codes speichern</string>
 	<string name="use_history_summary">Eingelesene Barcodes auf dem Gerät speichern.</string>
 	<string name="ignore_duplicates">Ignoriere Duplikate</string>
@@ -139,7 +149,7 @@
 	<string name="bluetooth_send_fail">Senden zum Bluetooth-Gerät fehlgeschlagen</string>
 	<string name="bluetooth_send_success">Erfolgreich zum Bluetooth-Gerät gesendet</string>
 	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Bildschrim aufhellen</string>
+	<string name="brighten_screen">Bildschirm aufhellen</string>
 	<string name="brighten_screen_summary">Helligkeit auf Maximum stellen um das Scannen eines Barcodes vom Bildschirm zu verbessern.</string>
 	<string name="really_remove_scan">Code wirklich entfernen?</string>
 	<string name="really_remove_all_scans">Alle Codes entfernen?</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Phase 2 Methode</string>
 	<string name="network_suggestions">WiFi Netzwerkvorschläge</string>
 	<string name="remove_suggestion">Vorschlag entfernen</string>
+	<string name="email_to">Empfänger</string>
+	<string name="email_subject">Betreff</string>
+	<string name="email_body">Nachricht</string>
+	<string name="scheme">Schema</string>
+	<string name="host">Host</string>
+	<string name="query">Query</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">¡Bienvenido!</string>
+	<string name="mode_expert">Avanzado</string>
+	<string name="mode_expert_description">Quiero verificar el contenido leído y abrirlo manualmente.</string>
+	<string name="mode_simple">Sencillo</string>
+	<string name="mode_simple_description">Solo quiero escanear códigos de barras y abrirlos de inmediato.</string>
 	<string name="camera_error">No se puede acceder a la cámara, por favor, inténtelo de nuevo</string>
 	<string name="scan_code">Escanear código</string>
 	<string name="compose_barcode">Componer código</string>
@@ -14,7 +19,7 @@
 	<string name="error_correction_level_m" formatted="false">Medio (~15&#37; de correción)</string>
 	<string name="error_correction_level_q" formatted="false">Cuartil (~25&#37; de correción)</string>
 	<string name="error_correction_level_h" formatted="false">Alto (~30&#37; de correción)</string>
-	<string name="label">Label</string>
+	<string name="label">Etiqueta</string>
 	<string name="colors">Color frontal y fondo</string>
 	<string name="colors_black_on_white">Negro sobre blanco</string>
 	<string name="colors_white_on_black">Blanco sobre negro</string>
@@ -27,23 +32,25 @@
 	<string name="gtin_country">Posible país de fabricación</string>
 	<string name="gtin_price">Precio sugerido</string>
 	<string name="gtin_add_on">Extensión UPC EAN</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">Versión</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modulos)</string>
+	<string name="qr_data_mask">Máscara de datos</string>
 	<string name="toggle_flash">Activar el flash</string>
 	<string name="error_flash">Error activando flash</string>
 	<string name="share">Compartir</string>
 	<string name="share_file">Compartir como archivo</string>
 	<string name="share_as">¿Compartir como?</string>
 	<string name="copy_to_clipboard">Copiar al portapapeles</string>
+	<string name="copy_as_deeplink">Copiar como deeplink</string>
 	<string name="copied_to_clipboard">Copiado al portapapeles</string>
 	<string name="copy_password">Copiar contraseña al portapapeles</string>
-	<string name="copied_password_to_clipboard">Contraseña copiada al portapapeles</string>
 	<string name="open_url">Abrir URL</string>
 	<string name="cannot_resolve_action">Ninguna aplicación puede abrir eso</string>
 	<string name="pick_search_engine">Seleccionar motor de búsqueda</string>
 	<string name="format">Formato</string>
 	<string name="size_width_by_height">Tamaño en píxeles: %1$d×%2$d</string>
-	<string name="margin_size">Margen en pixeles: %1$d</string>
+	<string name="size_no_magnification">Sin aumento</string>
+	<string name="add_quiet_zone">Agregar zona tranquila</string>
 	<string name="input_content_here">Introduzca el contenido aquí</string>
 	<string name="unescape">Expandir secuencia de escape</string>
 	<string name="encode">CODIFICAR</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Demora entre escaneos continuos</string>
 	<string name="restrict_format">Restringir formato</string>
 	<string name="remove_restriction">Eliminar restricción</string>
+	<string name="find_code">Encuentra código</string>
+	<string name="find_code_with_content">¿Qué contenido?</string>
+	<string name="find_code_hint">Introduce un término</string>
 	<string name="scan_format">Escanear %s</string>
 	<string name="quarter_second">Un cuarto de segundo</string>
 	<string name="half_second">Medio segundo</string>
@@ -94,10 +104,10 @@
 	<string name="tone_prop_beep2">Sonido doble general</string>
 	<string name="use_history">Guardar historial de escaneo</string>
 	<string name="use_history_summary">Guarda los códigos reconocidos en su dispositivo.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Ignorar duplicados</string>
 	<string name="ignore_consecutive_duplicates">Ignorar duplicados</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Aceptar duplicados</string>
 	<string name="open_immediately">Abrir inmediatamente</string>
 	<string name="open_immediately_summary">Omite la inspección y abre el contenido inmediatamente. Podría abrir contenido dañino si está activado.</string>
 	<string name="copy_immediately">Copiar en el portapapeles</string>
@@ -106,8 +116,8 @@
 	<string name="show_meta_data_summary">Muestra datos adicionales del código escaneado.</string>
 	<string name="show_hex_dump">Mostrar volcado hexadecimal</string>
 	<string name="show_hex_dump_summary">Muestra un volcado hexadecimal del contenido escaneado.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Mostrar suma de comprobación</string>
+	<string name="no_checksum">Sin suma de comprobación</string>
 	<string name="show_recreation">Mostrar reconstrucción del código</string>
 	<string name="show_recreation_summary">Reconstruye y muestra el código de barras desde el contenido leído si es posible.</string>
 	<string name="close_automatically">Retroceder tras Copiar/Compartir</string>
@@ -133,14 +143,14 @@
 	<string name="test_url">URL de prueba</string>
 	<string name="send_scan_bluetooth">Enviar escaneos con Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Habilita el envío de escaneos a un host Bluetooth.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
+	<string name="send_scan_bluetooth_host">Anfitrión</string>
 	<string name="no_bluetooth_hosts_paired">Ningún host emparejado</string>
 	<string name="bluetooth_connect_fail">No se pudo conectar a un dispositivo bluetooth.</string>
 	<string name="bluetooth_send_fail">No se pudo enviar a un dispositivo bluetooth.</string>
 	<string name="bluetooth_send_success">Envío bluetooth completado.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Generación</string>
+	<string name="brighten_screen">Aumentar el brillo de la pantalla</string>
+	<string name="brighten_screen_summary">Establezca el brillo al máximo para mejorar la lectura de un código de barras desde la pantalla.</string>
 	<string name="really_remove_scan">¿Eliminar el escaneo seleccionado?</string>
 	<string name="really_remove_all_scans">¿Eliminar todos los escaneos?</string>
 	<string name="really_remove_selected_scans">¿Eliminar los escaneos seleccionados?</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">Añadir 2FA</string>
 	<string name="search_web">Buscar en la web</string>
 	<string name="search_scan">Buscar escaneo</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Añadir al historial</string>
+	<string name="added_to_history">Añadido a historial</string>
 	<string name="export_to_file">Exportar a archivo</string>
 	<string name="export_as">¿Exportar como?</string>
 	<string name="export_csv_comma">Archivo CSV con comas</string>
@@ -190,7 +200,7 @@
 	<string name="pick_code_to_scan">Seleccione el código a escanear</string>
 	<string name="shortcut_decode">Escanear un código</string>
 	<string name="shortcut_encode">Crear un código</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Historial</string>
 	<string name="shortcut_preferences">Ajustes</string>
 	<string name="background_request_failed">Solicitud de fondo fallida</string>
 	<string name="entry_type">Tipo</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Método Phase 2</string>
 	<string name="network_suggestions">Sugerencias de red</string>
 	<string name="remove_suggestion">Eliminar sugerencia</string>
+	<string name="email_to">Destinatario</string>
+	<string name="email_subject">Asunto</string>
+	<string name="email_body">Cuerpo</string>
+	<string name="scheme">Esquema</string>
+	<string name="host">Anfitrión</string>
+	<string name="query">Consulta</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">خوش آمدید!</string>
+	<string name="mode_expert">پیشرفته</string>
+	<string name="mode_expert_description">می‌خواهم محتوای خوانده شده را بررسی کرده و به صورت دستی باز کنم.</string>
+	<string name="mode_simple">ساده</string>
+	<string name="mode_simple_description">فقط می‌خواهم بارکدها را اسکن کنم و فوراً باز شوند.</string>
 	<string name="camera_error">نمی‌توان به دوربین دسترسی داشت، لطفاً دوباره تلاش کنید</string>
 	<string name="scan_code">پویش کد</string>
 	<string name="compose_barcode">ایجاد بارکد</string>
@@ -14,38 +19,40 @@
 	<string name="error_correction_level_m" formatted="false">متوسط (⁦~۱۵٪⁩ تصحیح)</string>
 	<string name="error_correction_level_q" formatted="false">یک‌چهارم (⁦~۲۵٪⁩ تصحیح)</string>
 	<string name="error_correction_level_h" formatted="false">زیاد (⁦~۳۰٪⁩ تصحیح)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">برچسب</string>
+	<string name="colors">پس زمینه و پیش زمینه</string>
+	<string name="colors_black_on_white">سیاه روی سفید</string>
+	<string name="colors_white_on_black">سفید روی سیاه</string>
+	<string name="colors_black_on_transparent">سیاه روی شفاف</string>
+	<string name="colors_white_on_transparent">سفید روی شفاف</string>
+	<string name="sequence_size">اندازه دنباله</string>
+	<string name="sequence_index">اندیکس دنباله</string>
+	<string name="sequence_id">شناسه دنباله</string>
 	<string name="gtin_issue_number">شمارهٔ اشکال</string>
 	<string name="gtin_country">کشور احتمالی سازنده</string>
 	<string name="gtin_price">قیمت پیشنهادی</string>
-	<string name="gtin_add_on">UPC EAN extension</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="gtin_add_on">تمدید UPC EAN</string>
+	<string name="barcode_version_number">نسخه</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">ماسک داده</string>
 	<string name="toggle_flash">روشن/خاموش کردن چراغ</string>
 	<string name="error_flash">خطا هنگام روشن/خاموش کردن چراغ</string>
 	<string name="share">هم‌رسانی</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">اشتراک گذاری به عنوان فایل</string>
 	<string name="share_as">هم‌رسانی به عنوان؟</string>
 	<string name="copy_to_clipboard">رونوشت به تخه‌گیره</string>
+	<string name="copy_as_deeplink">کپی به صورت پیوند عمیق</string>
 	<string name="copied_to_clipboard">به تخته‌گیره رونوشت شد</string>
 	<string name="copy_password">رونوشت گذرواژه به تخته‌گیره</string>
-	<string name="copied_password_to_clipboard">گذرواژه به تخته‌گیره رونوشت شد</string>
 	<string name="open_url">گشودن نشانی</string>
 	<string name="cannot_resolve_action">هیچ برنامه‌ای نمی‌تواند آن را بگشاید</string>
 	<string name="pick_search_engine">یک موتور جست‌وجو برگزینید</string>
 	<string name="format">قالب</string>
 	<string name="size_width_by_height">اندازه به پیکسل: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">بدون بزرگنمایی</string>
+	<string name="add_quiet_zone">اضافه کردن حوزه ساکت</string>
 	<string name="input_content_here">محتویات ورودی را اینجا بنویسید</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">توسیع دنباله‌های فراری</string>
 	<string name="encode">رمزگذاری</string>
 	<string name="error_no_content">محتویاتی نیست</string>
 	<string name="error_encoding_barcode">بارکد نمی‌تواند ایجاد شود</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">تأخیر بین پویش‌های مداوم</string>
 	<string name="restrict_format">محدود کردن قالب</string>
 	<string name="remove_restriction">برداشتن محدودیت</string>
+	<string name="find_code">کد را پیدا کنید</string>
+	<string name="find_code_with_content">چه محتوا؟</string>
+	<string name="find_code_hint">یک عبارت وارد کنید</string>
 	<string name="scan_format">پویش %s</string>
 	<string name="quarter_second">یک‌چهارم ثانیه</string>
 	<string name="half_second">نیم ثانیه</string>
@@ -83,21 +93,21 @@
 	<string name="show_toast_in_bulk_mode_summary">هنگام پویش مداوم، داده‌های پویش شده را به طور خلاصه نشان می‌دهید.</string>
 	<string name="vibrate">لرزش هنگام تشخیص</string>
 	<string name="vibrate_summary">اگر می‌خواهید دستگاهتان هنگام شناسایی کد بلرزد، این را فعال کنید.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">صدای بیپ در شناسایی</string>
+	<string name="beep_summary">اگر می‌خواهید دستگاه شما هنگام شناسایی یک کد صدا کند، این را فعال کنید.</string>
+	<string name="beep_tone">صدای بیپ</string>
+	<string name="tone_cdma_confirm">تأیید CDMA</string>
+	<string name="tone_sup_confirm">تماس نظارتی تأیید کنید</string>
+	<string name="tone_sup_radio_ack">تائید مسیر رادیویی نظارت تماس</string>
+	<string name="tone_prop_ack">تایید مثبت</string>
+	<string name="tone_prop_beep">صدای عمومی</string>
+	<string name="tone_prop_beep2">صدای دو بیپ عمومی</string>
 	<string name="use_history">ذخیرهٔ تاریخچهٔ پویش</string>
 	<string name="use_history_summary">کدهای شناسایی شده را در همین دستگاه ذخیره می‌کند.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">نادیده گرفتن تکراری ها</string>
 	<string name="ignore_consecutive_duplicates">نادیده گرفتن موارد تکراری</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">تکراری‌ها را پذیرا باش</string>
 	<string name="open_immediately">گشودن بلافاصله</string>
 	<string name="open_immediately_summary">بازرسی را رها کنید و محتویات را فورا باز کنید. در صورت فعال بودن ممکن است محتوای مضر را باز کند.</string>
 	<string name="copy_immediately">قرار دادن در تخته‌گیره</string>
@@ -106,10 +116,10 @@
 	<string name="show_meta_data_summary">نمایش داده‌های اضافی در مورد بارکد پویش شده.</string>
 	<string name="show_hex_dump">نمایش کد هگز استخراج شده</string>
 	<string name="show_hex_dump_summary">نمایش کد هگز استخراج شده از محتویات پویش شده.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_checksum">نمایش مجموعه کنترلی</string>
+	<string name="no_checksum">بدون چک‌سام</string>
+	<string name="show_recreation">نمایش بارکد بازسازی شده</string>
+	<string name="show_recreation_summary">دوباره ایجاد کرده و بارکد را از محتوای خوانده شده نشان دهید اگر امکان دارد.</string>
 	<string name="close_automatically">بازگشت پس از رونوشت یا هم‌رسانی</string>
 	<string name="close_automatically_summary">پس از رونوشت یا هم‌رسانی مطالب خوانده شده، به طور خودکار به صفحهٔ پویش بازگردید.</string>
 	<string name="default_search_engine">گشودن دادهٔ نامشخص در</string>
@@ -127,20 +137,20 @@
 	<string name="send_scan_type">گونهٔ درخواست</string>
 	<string name="send_type_get_add_content">GET و به سادگی محتوا را اضافه کنید</string>
 	<string name="send_type_get_query_string">GET با رشته پرس‌وجو کامل</string>
-	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded ارسال</string>
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">گشودن در مرورگر خارجی</string>
 	<string name="test_url">آزمودن نشانی</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">انتقال اسکن ها با بلوتوث</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">میزبان</string>
+	<string name="no_bluetooth_hosts_paired">میزبان های جفت نشده</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">نسل</string>
+	<string name="brighten_screen">روشن کردن صفحه نمایش</string>
+	<string name="brighten_screen_summary">تنظیم روشنایی به حداکثر برای افزایش اسکن کردن بارکد از صفحه نمایش.</string>
 	<string name="really_remove_scan">برای برداشتن پویش مطمئنید؟</string>
 	<string name="really_remove_all_scans">برای برداشتن همهٔ پویش‌ها مطمئنید؟</string>
 	<string name="really_remove_selected_scans">برای برداشتن پویش‌های برگزیده شده مطمئنید؟</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">افزودن احراز هویت چندعاملی(2FA)</string>
 	<string name="search_web">جست‌وجوی وب</string>
 	<string name="search_scan">جست‌وجوی پویش</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">اضافه به تاریخچه</string>
+	<string name="added_to_history">اضافه شد به تاریخچه</string>
 	<string name="export_to_file">برون‌ریزی به پرونده</string>
 	<string name="export_as">برون‌ریزی به عنوان؟</string>
 	<string name="export_csv_comma">پروندهٔ سی‌اس‌وی با ویرگول</string>
@@ -184,13 +194,13 @@
 	<string name="export_database">پایگاه‌دادهٔ اس‌کیولایت</string>
 	<string name="saved_in_downloads">در بارگیری‌ها ذخیره شد</string>
 	<string name="rotate_image_cw">تصویر را در جهت ساعتگرد بچرخانید</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">تغییر چرخش آزاد</string>
+	<string name="pick_file">یک فایل را انتخاب کنید</string>
 	<string name="pick_image_file">پروندهٔ تصویری را برگزینید</string>
 	<string name="pick_code_to_scan">کدی را برای پویش برگزینید</string>
 	<string name="shortcut_decode">پویش یک بارکد</string>
 	<string name="shortcut_encode">ایجاد یک بارکد</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">تاریخچه</string>
 	<string name="shortcut_preferences">تنظیمات</string>
 	<string name="background_request_failed">درخواست پس‌زمینه انجام نشد</string>
 	<string name="entry_type">گونه</string>
@@ -203,6 +213,12 @@
 	<string name="wifi_anonymous_identity">هویت ناشناس</string>
 	<string name="wifi_identity">هویت</string>
 	<string name="wifi_phase2">روش دو مرحله‌ای</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="network_suggestions">پیشنهادهای شبکه</string>
+	<string name="remove_suggestion">حذف پیشنهاد</string>
+	<string name="email_to">گیرنده</string>
+	<string name="email_subject">موضوع</string>
+	<string name="email_body">متن</string>
+	<string name="scheme">برنامه</string>
+	<string name="host">میزبان</string>
+	<string name="query">پرس و جو</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Bienvenue !</string>
+	<string name="mode_expert">Avancé</string>
+	<string name="mode_expert_description">Je souhaite vérifier le contenu lu et l\'ouvrir manuellement.</string>
+	<string name="mode_simple">Simple</string>
+	<string name="mode_simple_description">Je veux simplement scanner les codes-barres et les ouvrir immédiatement.</string>
 	<string name="camera_error">Impossible d\'accéder à la caméra, veuillez réessayer</string>
 	<string name="scan_code">Scanner un code</string>
 	<string name="compose_barcode">Créer un code-barres</string>
@@ -14,7 +19,7 @@
 	<string name="error_correction_level_m" formatted="false">Moyen (~15% de correction)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25% de correction)</string>
 	<string name="error_correction_level_h" formatted="false">Élevé (~30% de correction)</string>
-	<string name="label">Label</string>
+	<string name="label">Étiquette</string>
 	<string name="colors">Premier plan et arrière-plan</string>
 	<string name="colors_black_on_white">Noir sur blanc</string>
 	<string name="colors_white_on_black">Blanc sur noir</string>
@@ -29,21 +34,23 @@
 	<string name="gtin_add_on">Extension UPC EAN</string>
 	<string name="barcode_version_number">Version</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Masquage</string>
 	<string name="toggle_flash">Activer/Désactiver le flash</string>
 	<string name="error_flash">Erreur de changement d\'état du flash</string>
 	<string name="share">Partager</string>
 	<string name="share_file">Partager en tant que fichier</string>
 	<string name="share_as">Partager en tant que ?</string>
 	<string name="copy_to_clipboard">Copier dans le presse-papiers</string>
+	<string name="copy_as_deeplink">Copier sous forme de lien profond</string>
 	<string name="copied_to_clipboard">Copié dans le presse-papiers</string>
 	<string name="copy_password">Copier le mot de passe dans le presse-papiers</string>
-	<string name="copied_password_to_clipboard">Mot de passe copié dans le presse-papiers</string>
 	<string name="open_url">Ouvrir l\'URL</string>
 	<string name="cannot_resolve_action">Aucune application ne peut ouvrir cela</string>
 	<string name="pick_search_engine">Choisir un moteur de recherche</string>
 	<string name="format">Format</string>
 	<string name="size_width_by_height">Taille en pixels : %1$d×%2$d</string>
-	<string name="margin_size">Marge en pixels : %1$d</string>
+	<string name="size_no_magnification">Pas de grossissement</string>
+	<string name="add_quiet_zone">Ajouter une zone blanche</string>
 	<string name="input_content_here">Insérer le contenu ici</string>
 	<string name="unescape">Étendre les caractères d\'échappement</string>
 	<string name="encode">ENCODER</string>
@@ -57,7 +64,10 @@
 	<string name="bulk_mode_delay">Délai entre les scans continus</string>
 	<string name="restrict_format">Restreindre le format</string>
 	<string name="remove_restriction">Supprimer la restriction</string>
-	<string name="scan_format">Scan %s</string>
+	<string name="find_code">Trouver un code</string>
+	<string name="find_code_with_content">Quel contenu ?</string>
+	<string name="find_code_hint">Entrer un terme</string>
+	<string name="scan_format">Numériser %s</string>
 	<string name="quarter_second">Un quart de seconde</string>
 	<string name="half_second">Une demi-seconde</string>
 	<string name="a_second">Une seconde</string>
@@ -65,7 +75,7 @@
 	<string name="five_seconds">Cinq secondes</string>
 	<string name="history">Historique</string>
 	<string name="preferences">Préférences</string>
-	<string name="scan_category">Scan</string>
+	<string name="scan_category">Numériser</string>
 	<string name="content_category">Contenu</string>
 	<string name="locale_category">Langue</string>
 	<string name="custom_locale">Langue personnalisée</string>
@@ -86,12 +96,12 @@
 	<string name="beep">Biper à la détection</string>
 	<string name="beep_summary">Émettre un son lorsqu\'un code est détecté.</string>
 	<string name="beep_tone">Tonalité du signal sonore</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="tone_cdma_confirm">Confirmation CDMA</string>
+	<string name="tone_sup_confirm">Confirmation de la supervision de l\'appel</string>
+	<string name="tone_sup_radio_ack">Accusé de réception du chemin radio de supervision d\'appel</string>
+	<string name="tone_prop_ack">Accusé de réception positif</string>
+	<string name="tone_prop_beep">Bip simple</string>
+	<string name="tone_prop_beep2">Bip double</string>
 	<string name="use_history">Sauvegarder l\'historique des scans</string>
 	<string name="use_history_summary">Sauvegarder les codes reconnus sur votre appareil.</string>
 	<string name="ignore_duplicates">Ignorer les doublons</string>
@@ -106,8 +116,8 @@
 	<string name="show_meta_data_summary">Afficher des informations supplémentaires sur le code-barres scanné.</string>
 	<string name="show_hex_dump">Afficher le dump hexadécimal</string>
 	<string name="show_hex_dump_summary">Afficher le dump hexadécimal du contenu scanné.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Afficher la somme de contrôle</string>
+	<string name="no_checksum">Pas de somme de contrôle</string>
 	<string name="show_recreation">Afficher le code-barres recréé</string>
 	<string name="show_recreation_summary">Recréer et afficher, si possible, le code-barres à partir du contenu scanné.</string>
 	<string name="close_automatically">Revenir après une copie/partage</string>
@@ -138,9 +148,9 @@
 	<string name="bluetooth_connect_fail">Impossible de se connecter à l\'appareil Bluetooth.</string>
 	<string name="bluetooth_send_fail">Impossible d\'envoyer à l\'appareil Bluetooth.</string>
 	<string name="bluetooth_send_success">Envoi Bluetooth réussi.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Génération</string>
+	<string name="brighten_screen">Augmenter la luminosité de l\'écran</string>
+	<string name="brighten_screen_summary">Régler la luminosité au maximum pour améliorer la lecture d\'un code-barres à l\'écran.</string>
 	<string name="really_remove_scan">Supprimer le scan ?</string>
 	<string name="really_remove_all_scans">Supprimer tous les scans ?</string>
 	<string name="really_remove_selected_scans">Supprimer les scans sélectionnés ?</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Méthode de la phase 2</string>
 	<string name="network_suggestions">Suggestions de réseaux</string>
 	<string name="remove_suggestion">Supprimer les suggestions</string>
+	<string name="email_to">Destinataire</string>
+	<string name="email_subject">Sujet</string>
+	<string name="email_body">Corps du message</string>
+	<string name="scheme">Schéma</string>
+	<string name="host">Hôte</string>
+	<string name="query">Requête</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Üdvözöljük!</string>
+	<string name="mode_expert">Haladó</string>
+	<string name="mode_expert_description">Szeretném ellenőrizni az olvasott tartalmat és kézzel megnyitni.</string>
+	<string name="mode_simple">Egyszerű</string>
+	<string name="mode_simple_description">Csak be akarom olvasni a vonalkódokat, és azonnal megnyitni őket.</string>
 	<string name="camera_error">Nem lehet hozzáférni a kamerához, próbálja meg újra</string>
 	<string name="scan_code">Kód beolvasása</string>
 	<string name="compose_barcode">Vonalkód létrehozása</string>
@@ -14,38 +19,40 @@
 	<string name="error_correction_level_m" formatted="false">Közepes (~15&#37; javítás)</string>
 	<string name="error_correction_level_q" formatted="false">Kvartilis (~25&#37; javítás)</string>
 	<string name="error_correction_level_h" formatted="false">Magas (~30&#37; javítás)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">Címke</string>
+	<string name="colors">Háttér és előtér</string>
+	<string name="colors_black_on_white">Fekete fehér háttéren</string>
+	<string name="colors_white_on_black">Fehér fekete hátteren</string>
+	<string name="colors_black_on_transparent">Fekete átlátszó háttéren</string>
+	<string name="colors_white_on_transparent">Fehér átlátszó hátteren</string>
+	<string name="sequence_size">Sorozat mérete</string>
+	<string name="sequence_index">Sorrend index</string>
+	<string name="sequence_id">Sorozat azonosító</string>
 	<string name="gtin_issue_number">Hibaszám</string>
 	<string name="gtin_country">Gyártó lehetséges országa</string>
 	<string name="gtin_price">Ajánlott ár</string>
 	<string name="gtin_add_on">UPC EAN kiterjesztés</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">Verzió</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Adatmaszk</string>
 	<string name="toggle_flash">Vaku be- vagy kikapcsolása</string>
 	<string name="error_flash">Hiba a vaku be- vagy kikapcsolásakor</string>
 	<string name="share">Megosztás</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Fájlként megosztás</string>
 	<string name="share_as">Megosztja másként?</string>
 	<string name="copy_to_clipboard">Másolás a vágólapra</string>
+	<string name="copy_as_deeplink">Másolás mélyhivatkozásként</string>
 	<string name="copied_to_clipboard">Vágólapra helyezés</string>
 	<string name="copy_password">Jelszó másolása a vágólapra</string>
-	<string name="copied_password_to_clipboard">Jelszó kimásolva a vágólapra</string>
 	<string name="open_url">URL megnyitása</string>
 	<string name="cannot_resolve_action">Nincs alkalmazás, amely meg tudná nyitni azt</string>
 	<string name="pick_search_engine">Válasszon keresőmotort</string>
 	<string name="format">Formátum</string>
 	<string name="size_width_by_height">Méret képpontban: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">Nincs nagyítás</string>
+	<string name="add_quiet_zone">Nyugodt övezet hozzáadása</string>
 	<string name="input_content_here">Itt adja meg a tartalmat</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Kibontja a menekülési sorokat</string>
 	<string name="encode">KÓDOLÁS</string>
 	<string name="error_no_content">Hiányzó tartalom</string>
 	<string name="error_encoding_barcode">A vonalkódot nem lehet előállítani</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Folyamatos beolvasások közti késleltetés</string>
 	<string name="restrict_format">Formátum korlátozása</string>
 	<string name="remove_restriction">Korlátozás eltávolítása</string>
+	<string name="find_code">Kód keresése</string>
+	<string name="find_code_with_content">Mi a tartalom?</string>
+	<string name="find_code_hint">Írjon be egy kifejezést</string>
 	<string name="scan_format">%s beolvasása</string>
 	<string name="quarter_second">Negyed másodperc</string>
 	<string name="half_second">Fél másodperc</string>
@@ -83,21 +93,21 @@
 	<string name="show_toast_in_bulk_mode_summary">A beolvasott adatok gyors megjelenítése folyamatos beolvasáskor.</string>
 	<string name="vibrate">Rezgetés felismeréskor</string>
 	<string name="vibrate_summary">Akkor engedélyezze ezt, ha rezgetni szeretné az eszközét egy kód felismerésekor.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">Jelzés hanggal</string>
+	<string name="beep_summary">Engedélyezze ezt, ha azt szeretné, hogy eszköze pittyegjen, amikor egy kód felismerésre kerül.</string>
+	<string name="beep_tone">Hangjelzés</string>
+	<string name="tone_cdma_confirm">CDMA megerősítés</string>
+	<string name="tone_sup_confirm">Hívás felügyeleti megerősítés</string>
+	<string name="tone_sup_radio_ack">Hívás felügyeleti rádió útvonal megerősítés</string>
+	<string name="tone_prop_ack">Pozitív visszaigazolás</string>
+	<string name="tone_prop_beep">Általános csipogás</string>
+	<string name="tone_prop_beep2">Általános dupla sípolás</string>
 	<string name="use_history">Beolvasási előzmények mentése</string>
 	<string name="use_history_summary">Felismert kódok mentése a saját eszközén.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Ismétlések figyelmen kívül hagyása</string>
 	<string name="ignore_consecutive_duplicates">Ne mentsen egymást követő azonos adatokat</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Ismétlődések elfogadása</string>
 	<string name="open_immediately">Vizsgálat kihagyása és a tartalom azonnali megnyitása</string>
 	<string name="open_immediately_summary">Vizsgálat kihagyása és a tartalom azonnali megnyitása. Ártalmas tartalmat is megnyithat, ha engedélyezve van.</string>
 	<string name="copy_immediately">Tartalom automatikus másolása a vágólapra</string>
@@ -106,10 +116,10 @@
 	<string name="show_meta_data_summary">További adatok megjelenítése a beolvasott vonalkódokról.</string>
 	<string name="show_hex_dump">Hexakiírás megjelenítése</string>
 	<string name="show_hex_dump_summary">A beolvasott tartalom hexakiírásának megjelenítése.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_checksum">Mutassa meg az ellenőrző összeget</string>
+	<string name="no_checksum">Nincs ellenőrző összeg</string>
+	<string name="show_recreation">Mutasd az újrateremtett vonalkódot</string>
+	<string name="show_recreation_summary">Ha lehetséges, újra létrehoz és mutasson vonalkódot az olvasott tartalomból.</string>
 	<string name="close_automatically">Ugrás vissza másolás vagy megosztás után</string>
 	<string name="close_automatically_summary">Automatikus visszatérés a beolvasási képernyőre a beolvasott tartalom másolása vagy megosztása után.</string>
 	<string name="default_search_engine">Ismeretlen adatok megnyitása ebben</string>
@@ -131,16 +141,16 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Megnyitás külső böngészőben</string>
 	<string name="test_url">Teszt URL</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Bluetooth segítségével továbbítás</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
 	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="no_bluetooth_hosts_paired">Nincsenek párosított hosztok</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Generáció</string>
+	<string name="brighten_screen">Képernyő világosítása</string>
+	<string name="brighten_screen_summary">Állítsa a fényerőt maximumra a vonalkód olvasásának érdekében a képernyőről.</string>
 	<string name="really_remove_scan">Valóban eltávolítja a beolvasást?</string>
 	<string name="really_remove_all_scans">Valóban eltávolítja az összes beolvasását?</string>
 	<string name="really_remove_selected_scans">Valóban eltávolítja a kijelölt beolvasásokat?</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">Kétlépcsős hitelesítés hozzáadása</string>
 	<string name="search_web">Keresés a weben</string>
 	<string name="search_scan">Beolvasás keresése</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Hozzáadás a történethez</string>
+	<string name="added_to_history">Hozzáadva a történethez</string>
 	<string name="export_to_file">Exportálás fájlba</string>
 	<string name="export_as">Exportálja másként?</string>
 	<string name="export_csv_comma">CSV-fájl vesszővel</string>
@@ -184,13 +194,13 @@
 	<string name="export_database">SQLite adatbázis</string>
 	<string name="saved_in_downloads">Elmentve a letöltésekbe</string>
 	<string name="rotate_image_cw">Kép forgatása jobbra</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">Szabad forgatás váltása</string>
+	<string name="pick_file">Válasszon egy fájlt</string>
 	<string name="pick_image_file">Képfájl kiválasztása</string>
 	<string name="pick_code_to_scan">Kód kiválasztása a beolvasáshoz</string>
 	<string name="shortcut_decode">Vonalkód beolvasása</string>
 	<string name="shortcut_encode">Vonalkód létrehozása</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Előzmények</string>
 	<string name="shortcut_preferences">Beállítások</string>
 	<string name="background_request_failed">A háttérkérés sikertelen</string>
 	<string name="entry_type">Típus</string>
@@ -203,6 +213,12 @@
 	<string name="wifi_anonymous_identity">Névtelen személyazonosság</string>
 	<string name="wifi_identity">Személyazonosság</string>
 	<string name="wifi_phase2">Phase 2 módszer</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="network_suggestions">Hálózati javaslatok</string>
+	<string name="remove_suggestion">Javaslat eltávolítása</string>
+	<string name="email_to">Címzett</string>
+	<string name="email_subject">Tárgy</string>
+	<string name="email_body">Törzs</string>
+	<string name="scheme">Terv</string>
+	<string name="host">Házigazda</string>
+	<string name="query">Lekérdezés</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Selamat datang!</string>
+	<string name="mode_expert">Lanjutan</string>
+	<string name="mode_expert_description">Saya ingin memeriksa konten yang dibaca dan membukanya secara manual.</string>
+	<string name="mode_simple">Sederhana</string>
+	<string name="mode_simple_description">Saya hanya ingin memindai kode batang dan langsung membukanya.</string>
 	<string name="camera_error">Tidak bisa mengakses kamera, silakan coba lagi</string>
 	<string name="scan_code">Pindai kode</string>
 	<string name="compose_barcode">Buat barcode</string>
@@ -13,7 +18,7 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; koreksi)</string>
 	<string name="error_correction_level_q" formatted="false">Kuartil (~25&#37; koreksi)</string>
 	<string name="error_correction_level_h" formatted="false">Tinggi (~30&#37; koreksi)</string>
-	<string name="label">Label</string>
+	<string name="label">Etiqueta</string>
 	<string name="colors">Muka dan latar belakang</string>
 	<string name="colors_black_on_white">Hitam di atas putih</string>
 	<string name="colors_white_on_black">Putih di atas hitam</string>
@@ -28,34 +33,39 @@
 	<string name="gtin_add_on">Ekstensi UPC EAN</string>
 	<string name="barcode_version_number">Versi</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modul)</string>
+	<string name="qr_data_mask">Maschera dati</string>
 	<string name="toggle_flash">Nyala/matikan blitz</string>
 	<string name="error_flash">Galat nyala/matikan blitz</string>
 	<string name="share">Bagikan</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Dijeli kao datoteku</string>
 	<string name="share_as">Bagikan sebagai?</string>
 	<string name="copy_to_clipboard">Salin ke clipboard</string>
+	<string name="copy_as_deeplink">Salin sebagai tautan langsung</string>
 	<string name="copied_to_clipboard">Disalin ke clipboard</string>
 	<string name="copy_password">Salin sandi ke clipboard</string>
-	<string name="copied_password_to_clipboard">Sandi disalin ke clipboard</string>
 	<string name="open_url">Buka url</string>
 	<string name="cannot_resolve_action">Tidak ada aplikasi yang bisa membukanya</string>
 	<string name="pick_search_engine">Pilih mesin pencari</string>
 	<string name="format">Format</string>
 	<string name="size_width_by_height">Ukuran dalam piksel: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">無放大</string>
+	<string name="add_quiet_zone">Dodaj cichą strefę</string>
 	<string name="input_content_here">Masukkan konten di sini</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Escapar secuencias de escape</string>
 	<string name="encode">ENKODE</string>
 	<string name="error_no_content">Tidak ada konten</string>
 	<string name="error_encoding_barcode">Barcode tidak bisa dibuat</string>
 	<string name="view_barcode">Lihat barcode</string>
-	<string name="info">Info</string>
+	<string name="info">Informazioni</string>
 	<string name="switch_camera">Ganti kamera</string>
 	<string name="bulk_mode">Pindai tanpa henti</string>
 	<string name="bulk_mode_summary">Selalu mulai pemindaian tanpa henti.</string>
 	<string name="bulk_mode_delay">Tundaan antara pemindaian tanpa henti</string>
 	<string name="restrict_format">Batasi format</string>
 	<string name="remove_restriction">Hapus pembatasan</string>
+	<string name="find_code">Trouver le code</string>
+	<string name="find_code_with_content">Quel contenu?</string>
+	<string name="find_code_hint">Ingresa un término</string>
 	<string name="scan_format">Pindai %s</string>
 	<string name="quarter_second">Seperempat detik</string>
 	<string name="half_second">Setengah detik</string>
@@ -85,12 +95,12 @@
 	<string name="beep">Beep on detection</string>
 	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
 	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_cdma_confirm">CDMA 확인</string>
+	<string name="tone_sup_confirm">تأكيد الإشراف على المكالمة</string>
+	<string name="tone_sup_radio_ack">Llamada de supervisión de la ruta de radio de confirmación</string>
 	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="tone_prop_beep">Generale segnale acustico</string>
+	<string name="tone_prop_beep2">Generelle Doppelton</string>
 	<string name="use_history">Simpan riwayat pemindaian</string>
 	<string name="use_history_summary">Simpan kode yang berhasil dipindai pada perangkat anda.</string>
 	<string name="ignore_duplicates">Ignore duplicates</string>
@@ -105,8 +115,8 @@
 	<string name="show_meta_data_summary">Tampilkan data tambahan tentang barcode yang dipindai.</string>
 	<string name="show_hex_dump">Tampilkan hex dump</string>
 	<string name="show_hex_dump_summary">Tampilkan hex dump dari konten hasil pemindaian.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Mostrar suma de verificación</string>
+	<string name="no_checksum">Ingen kontrollsiffer</string>
 	<string name="show_recreation">Tampilkan barcode yang dibuat ulang</string>
 	<string name="show_recreation_summary">Buat ulang dan tampilkan barcode dari isi konten jika memungkinkan.</string>
 	<string name="close_automatically">Kembali setelah Salin/Berbagi</string>
@@ -130,15 +140,15 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Buka di peramban eksternal</string>
 	<string name="test_url">URL Tes</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Reenviar exploraciones con Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
+	<string name="send_scan_bluetooth_host">مضيف</string>
 	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
+	<string name="generation_category">Generasi</string>
+	<string name="brighten_screen">明るさを強調する</string>
 	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
 	<string name="really_remove_scan">Yakin menghapus pindaian?</string>
 	<string name="really_remove_all_scans">Yakin menghapus semua pindaian?</string>
@@ -173,8 +183,8 @@
 	<string name="otpauth_add">Tambahkan 2FA</string>
 	<string name="search_web">Cari secara daring</string>
 	<string name="search_scan">Cari pindaian</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Aggiungi alla cronologia</string>
+	<string name="added_to_history">Dodano do historii</string>
 	<string name="export_to_file">Ekspor ke berkas</string>
 	<string name="export_as">Ekspor sebagai?</string>
 	<string name="export_csv_comma">CSV dengan koma</string>
@@ -184,12 +194,12 @@
 	<string name="saved_in_downloads">Simpan di dalam unduhan</string>
 	<string name="rotate_image_cw">Putar gambar searah jarum jam</string>
 	<string name="toggle_free_rotation">Nyala/matikan rotasi bebas</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="pick_file">Vælg en fil</string>
 	<string name="pick_image_file">Pilih berkas gambar</string>
 	<string name="pick_code_to_scan">Pilih kode untuk dipindai</string>
 	<string name="shortcut_decode">Pindai barcode</string>
 	<string name="shortcut_encode">Buat barcode</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Istoric</string>
 	<string name="shortcut_preferences">Pengaturan</string>
 	<string name="background_request_failed">Permintaan latar belakang gagal</string>
 	<string name="entry_type">Tipe</string>
@@ -202,6 +212,12 @@
 	<string name="wifi_anonymous_identity">Identitas anonim</string>
 	<string name="wifi_identity">Identitas</string>
 	<string name="wifi_phase2">Metode fase 2</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="network_suggestions">Suggerimenti di rete</string>
+	<string name="remove_suggestion">Elimina sugerencia</string>
+	<string name="email_to">Penerima</string>
+	<string name="email_subject">Subjek</string>
+	<string name="email_body">Isi</string>
+	<string name="scheme">Schema</string>
+	<string name="host">Anfitrión</string>
+	<string name="query">Consulta</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Benvenuto!</string>
+	<string name="mode_expert">Avanzato</string>
+	<string name="mode_expert_description">Voglio controllare il contenuto letto e aprirlo manualmente.</string>
+	<string name="mode_simple">Semplice</string>
+	<string name="mode_simple_description">Voglio solo scansionare codici a barre e aprirli immediatamente.</string>
 	<string name="camera_error">Impossibile accedere alla fotocamera. Riprova</string>
 	<string name="scan_code">Scansione codice</string>
 	<string name="compose_barcode">Crea codice a barre</string>
@@ -29,21 +34,23 @@
 	<string name="gtin_add_on">Estensione UPC EAN</string>
 	<string name="barcode_version_number">Versione</string>
 	<string name="qr_version_and_modules">%1$s (%2$d moduli)</string>
+	<string name="qr_data_mask">Maschera dati</string>
 	<string name="toggle_flash">Attiva/disattiva flash</string>
 	<string name="error_flash">Errore durante attivazione/disattivazione flash</string>
 	<string name="share">Condividi</string>
 	<string name="share_file">Condividi come file</string>
 	<string name="share_as">Condividi come?</string>
 	<string name="copy_to_clipboard">Copia negli Appunti</string>
+	<string name="copy_as_deeplink">Copia come deeplink</string>
 	<string name="copied_to_clipboard">Copiato negli Appunti</string>
 	<string name="copy_password">Copia password negli Appunti</string>
-	<string name="copied_password_to_clipboard">Password copiata negli Appunti</string>
 	<string name="open_url">Apri URL</string>
 	<string name="cannot_resolve_action">Nessuna app può aprirlo</string>
 	<string name="pick_search_engine">Scegli motore di ricerca</string>
 	<string name="format">Formato</string>
 	<string name="size_width_by_height">Dimensioni (pixel): %1$d×%2$d</string>
-	<string name="margin_size">Margine (pixel): %1$d</string>
+	<string name="size_no_magnification">Nessun ingrandimento</string>
+	<string name="add_quiet_zone">Aggiungi zona tranquilla</string>
 	<string name="input_content_here">Inserisci qui il contenuto</string>
 	<string name="unescape">Espandi sequenze escape</string>
 	<string name="encode">CODIFICA</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Ritardo tra scansioni continue</string>
 	<string name="restrict_format">Limita formato</string>
 	<string name="remove_restriction">Rimuovi limitazione</string>
+	<string name="find_code">Trova codice</string>
+	<string name="find_code_with_content">Quale contenuto?</string>
+	<string name="find_code_hint">Inserisci un termine</string>
 	<string name="scan_format">Scansiona %s</string>
 	<string name="quarter_second">Un quarto di secondo</string>
 	<string name="half_second">Mezzo secondo</string>
@@ -105,7 +115,7 @@
 	<string name="show_meta_data">Visualizza metadati</string>
 	<string name="show_meta_data_summary">Visualizza dati aggiuntivi codice a barre scansionato.</string>
 	<string name="show_hex_dump">Visualizza dump esadecimale</string>
-	<string name="show_hex_dump_summary">Visualizza un dump esadecimale dei contenuti scansionati.</string>
+	<string name="show_hex_dump_summary">Visualizza dump esadecimale contenuti scansionati.</string>
 	<string name="show_checksum">Visualizza checksum</string>
 	<string name="no_checksum">Nessuna checksum</string>
 	<string name="show_recreation">Visualizza codice a barre ricreato</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Metodo fase 2</string>
 	<string name="network_suggestions">Suggerimenti rete</string>
 	<string name="remove_suggestion">Elimina suggerimento</string>
+	<string name="email_to">Destinatario</string>
+	<string name="email_subject">Oggetto</string>
+	<string name="email_body">Corpo</string>
+	<string name="scheme">Schema</string>
+	<string name="host">Host</string>
+	<string name="query">Query</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">ようこそ！</string>
+	<string name="mode_expert">上級</string>
+	<string name="mode_expert_description">読み取った内容を確認し、手動で開きたい。</string>
+	<string name="mode_simple">簡単</string>
+	<string name="mode_simple_description">バーコードをスキャンしてすぐに開きたい。</string>
 	<string name="camera_error">カメラに接続できませんでした。再試行してください。</string>
 	<string name="scan_code">バーコードをスキャン</string>
 	<string name="compose_barcode">バーコードを作成</string>
@@ -13,7 +18,7 @@
 	<string name="error_correction_level_m" formatted="false">中 (~15&#37; の正確性)</string>
 	<string name="error_correction_level_q" formatted="false">高 (~25&#37; の正確性)</string>
 	<string name="error_correction_level_h" formatted="false">最高 (~30&#37; の正確性)</string>
-	<string name="label">Label</string>
+	<string name="label">ラベル</string>
 	<string name="colors">背面と前面</string>
 	<string name="colors_black_on_white">白地に黒色</string>
 	<string name="colors_white_on_black">黒地に白色</string>
@@ -28,23 +33,25 @@
 	<string name="gtin_add_on">UPC/EAN 拡張型</string>
 	<string name="barcode_version_number">バージョン</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">データマスク</string>
 	<string name="toggle_flash">フラッシュの切り替え</string>
 	<string name="error_flash">フラッシュの切り替えエラー</string>
 	<string name="share">共有</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">ファイルとして共有</string>
 	<string name="share_as">画像形式を選択</string>
 	<string name="copy_to_clipboard">クリップボードにコピー</string>
+	<string name="copy_as_deeplink">ディープリンクとしてコピー</string>
 	<string name="copied_to_clipboard">クリップボードにコピーされました</string>
 	<string name="copy_password">クリップボードにパスワードをコピー</string>
-	<string name="copied_password_to_clipboard">パスワードがクリップボードにコピーされました</string>
 	<string name="open_url">URLを開く</string>
 	<string name="cannot_resolve_action">開くためのアプリがありません！</string>
 	<string name="pick_search_engine">検索エンジンを選択</string>
 	<string name="format">フォーマット</string>
 	<string name="size_width_by_height">大きさ（ピクセル): %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">拡大なし</string>
+	<string name="add_quiet_zone">静かなゾーンを追加する</string>
 	<string name="input_content_here">ここに内容を入力</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">エスケープシーケンスを展開する</string>
 	<string name="encode">エンコード</string>
 	<string name="error_no_content">内容が指定されていません</string>
 	<string name="error_encoding_barcode">バーコードを作成できませんでした</string>
@@ -56,6 +63,9 @@
 	<string name="bulk_mode_delay">連続スキャンの間隔</string>
 	<string name="restrict_format">フォーマットの制限</string>
 	<string name="remove_restriction">制限を解除</string>
+	<string name="find_code">コードを検索</string>
+	<string name="find_code_with_content">何の内容ですか？</string>
+	<string name="find_code_hint">検索ワードを入力してください</string>
 	<string name="scan_format">%sをスキャン</string>
 	<string name="quarter_second">0.25秒</string>
 	<string name="half_second">0.5秒</string>
@@ -83,20 +93,20 @@
 	<string name="vibrate">認識時に振動する</string>
 	<string name="vibrate_summary">バーコードが認識されたときにバイブレーションを行います。</string>
 	<string name="beep">検出時にビープ音を鳴らす</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_summary">コードが認識されたときにデバイスがビープする場合は、これを有効にしてください。</string>
 	<string name="beep_tone">ビープ音</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_cdma_confirm">CDMA 確認</string>
+	<string name="tone_sup_confirm">コール監督確認</string>
+	<string name="tone_sup_radio_ack">コール監督ラジオ経路確認</string>
+	<string name="tone_prop_ack">ポジティブな承認</string>
 	<string name="tone_prop_beep">一般的なビープ音</string>
 	<string name="tone_prop_beep2">一般的なダブルビープ音</string>
 	<string name="use_history">スキャン履歴を保存する</string>
 	<string name="use_history_summary">認識されたバーコードを端末に保存しておきます。</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">重複を無視する</string>
 	<string name="ignore_consecutive_duplicates">重複を破棄する</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">重複を許可</string>
 	<string name="open_immediately">すぐにコンテンツを開く</string>
 	<string name="open_immediately_summary">確認画面なしでコンテンツをすぐに開くようにします。有害なコンテンツを開いてしまうリスクがあります。</string>
 	<string name="copy_immediately">自動的にクリップボードにコピー</string>
@@ -105,8 +115,8 @@
 	<string name="show_meta_data_summary">スキャンされたバーコードの追加データを確認できるようにします。</string>
 	<string name="show_hex_dump">16進数を表示</string>
 	<string name="show_hex_dump_summary">スキャンされたコンテンツの16進数データを確認できるようにします。</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">チェックサムを表示</string>
+	<string name="no_checksum">チェックサムなし</string>
 	<string name="show_recreation">再生成したバーコードを表示</string>
 	<string name="show_recreation_summary">可能であれば、読み取ったコンテンツからバーコードを再生成して表示します。</string>
 	<string name="close_automatically">コピー/共有後に戻る</string>
@@ -130,16 +140,16 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">外部ブラウザで開く</string>
 	<string name="test_url">URLをテスト</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Bluetooth でスキャンを転送</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">ホスト</string>
+	<string name="no_bluetooth_hosts_paired">ホストがペアリングされていません</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">世代</string>
+	<string name="brighten_screen">画面を明るくする</string>
+	<string name="brighten_screen_summary">画面からバーコードをスキャンするために、明るさを最大に設定します。</string>
 	<string name="really_remove_scan">このスキャン履歴を削除しても宜しいですか？</string>
 	<string name="really_remove_all_scans">全てのスキャン履歴を削除しても宜しいですか？</string>
 	<string name="really_remove_selected_scans">選択されたスキャン履歴を削除しても宜しいですか？</string>
@@ -173,8 +183,8 @@
 	<string name="otpauth_add">二段階認証を追加</string>
 	<string name="search_web">ウェブで検索</string>
 	<string name="search_scan">スキャン結果を検索</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">履歴に追加</string>
+	<string name="added_to_history">履歴に追加されました</string>
 	<string name="export_to_file">ファイルにエクスポート</string>
 	<string name="export_as">ファイル形式を選択</string>
 	<string name="export_csv_comma">コンマ区切りのCSVファイル</string>
@@ -183,13 +193,13 @@
 	<string name="export_database">SQLiteデータベース</string>
 	<string name="saved_in_downloads">ダウンロードフォルダに保存されました</string>
 	<string name="rotate_image_cw">時計回りに回転</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">自由回転を切り替える</string>
+	<string name="pick_file">ファイルを選択</string>
 	<string name="pick_image_file">画像を選択して読み込み</string>
 	<string name="pick_code_to_scan">スキャンするバーコードを選択</string>
 	<string name="shortcut_decode">バーコードをスキャン</string>
 	<string name="shortcut_encode">バーコードを作成</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">履歴</string>
 	<string name="shortcut_preferences">設定</string>
 	<string name="background_request_failed">バックグラウンド要求に失敗しました</string>
 	<string name="entry_type">種類</string>
@@ -199,9 +209,15 @@
 	<string name="wifi_password">パスワード</string>
 	<string name="wifi_hidden">非表示のネットワーク</string>
 	<string name="wifi_eap">EAP方式</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
+	<string name="wifi_anonymous_identity">匿名ID</string>
+	<string name="wifi_identity">アイデンティティ</string>
 	<string name="wifi_phase2">フェーズ2方式</string>
 	<string name="network_suggestions">ネットワークに関する提案</string>
 	<string name="remove_suggestion">提案の削除</string>
+	<string name="email_to">宛先</string>
+	<string name="email_subject">件名</string>
+	<string name="email_body">本文</string>
+	<string name="scheme">スキーム</string>
+	<string name="host">ホスト</string>
+	<string name="query">クエリ</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">მოგესალმებით!</string>
+	<string name="mode_expert">გაფართოებული</string>
+	<string name="mode_expert_description">მინდა გადავამოწმო წაკითხული შინაარსი და გავხსნა ხელით.</string>
+	<string name="mode_simple">მარტივი</string>
+	<string name="mode_simple_description">მხოლოდ მინდა დავასკანერო ბარკოდი და გავხსნა დაუყოვნებლივ.</string>
 	<string name="camera_error">კამერაზე წვდომის მოპოვება ვერ ხერხდება, გთხოვთ, კიდევ სცადეთ</string>
 	<string name="scan_code">შტრიხ-კოდის სკანირება</string>
 	<string name="compose_barcode">შტრიხ-კოდის შექმნა</string>
@@ -14,38 +19,40 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; correction)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; correction)</string>
 	<string name="error_correction_level_h" formatted="false">High (~30&#37; correction)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">წარწერა</string>
+	<string name="colors">წინა და ფონი</string>
+	<string name="colors_black_on_white">შავი თეთრზე</string>
+	<string name="colors_white_on_black">თეთრი შავ ფონზე</string>
+	<string name="colors_black_on_transparent">შავი გაუსრული</string>
+	<string name="colors_white_on_transparent">თეთრი სატრანსპარენტო</string>
+	<string name="sequence_size">სიას ზომა</string>
+	<string name="sequence_index">სამიზეისის ინდექსი</string>
+	<string name="sequence_id">მიმდინარე ნამდვილი ID</string>
 	<string name="gtin_issue_number">გამოშვების ნომერი</string>
 	<string name="gtin_country">შესაძლო მწარმოებელი ქვეყანა</string>
 	<string name="gtin_price">დაახლოებითი ფასი</string>
 	<string name="gtin_add_on">UPC EAN გაფართოება</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">ვერსია</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">მონაცემთა მასკა</string>
 	<string name="toggle_flash">განათების ჩართვა</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">შეცდომა ფლეშის ჩართვისას</string>
 	<string name="share">გაზიარება</string>
-	<string name="share_file">Share as file</string>
-	<string name="share_as">Share as?</string>
+	<string name="share_file">გაზიარეთ ფაილის სახით</string>
+	<string name="share_as">გაზიარე როგორ?</string>
 	<string name="copy_to_clipboard">გაცვლის ბუფერში კოპირება</string>
+	<string name="copy_as_deeplink">კოპირება deeplink-ის სახით</string>
 	<string name="copied_to_clipboard">კოპირებულია გაცვლის ბუფერში</string>
 	<string name="copy_password">პაროლის გაცვლით ბუფერში კოპირება</string>
-	<string name="copied_password_to_clipboard">პაროლი კოპირებულია გაცვლის ბუფერში</string>
 	<string name="open_url">ბმულის გახსნა</string>
 	<string name="cannot_resolve_action">ამ მოქმედებისთვის აპლიკაცია ნაპოვნი არაა</string>
 	<string name="pick_search_engine">აირჩიეთ საძიებო სისტემა</string>
 	<string name="format">ფორმატი</string>
 	<string name="size_width_by_height">ზომა პიქსელებში: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">არ არის დიდება</string>
+	<string name="add_quiet_zone">დაამატეთ შესული ზონა</string>
 	<string name="input_content_here">შეიყვანეთ ტექსტი აქ</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">ექსპანდირების გასადარები სიმბოლოები</string>
 	<string name="encode">შექმნა"</string>
 	<string name="error_no_content">მონაცემები არაა</string>
 	<string name="error_encoding_barcode">შტრიხ-კოდის შექმნა შეუძლებელია</string>
@@ -53,51 +60,54 @@
 	<string name="info">ინფორმაცია</string>
 	<string name="switch_camera">კამერის გადართვა</string>
 	<string name="bulk_mode">სკანირება უწყვეტად</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_summary">ყოველთვის დაიწყეთ სკანირება უწყვეტად.</string>
+	<string name="bulk_mode_delay">განაგრძეთ გადანომრვას შორის შეზღუდვა</string>
+	<string name="restrict_format">ფორმატის შეზღუდვა</string>
+	<string name="remove_restriction">შეასწორე შეზღუდვა</string>
+	<string name="find_code">კოდის პოვნა</string>
+	<string name="find_code_with_content">რა შინაა?</string>
+	<string name="find_code_hint">შეიყვანეთ ტერმინი</string>
+	<string name="scan_format">სკანირე %s</string>
+	<string name="quarter_second">ერთი კვარტალი წამი</string>
+	<string name="half_second">ნახე წამში</string>
+	<string name="a_second">ერთი წამი</string>
+	<string name="two_seconds">ორი წამი</string>
+	<string name="five_seconds">ხუთი წამი</string>
 	<string name="history">ისტორია</string>
 	<string name="preferences">პარამეტრები</string>
 	<string name="scan_category">სკანირება</string>
 	<string name="content_category">კონტენტი</string>
-	<string name="locale_category">Language</string>
-	<string name="custom_locale">Custom language</string>
-	<string name="follow_system_settings">Follow system settings</string>
+	<string name="locale_category">ენა</string>
+	<string name="custom_locale">შერჩეული ენა</string>
+	<string name="follow_system_settings">სისტემის პარამეტრების მინიჭება</string>
 	<string name="show_crop_handle">სკანირების არეალის ჩვენება</string>
 	<string name="show_crop_handle_summary">სკანირების შეზღუდვა შერჩეული არეალით.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">შტრიხ-კოდის ფორმატები</string>
 	<string name="zoom_by_swiping">მასშტაბირება თითის მოძრაობით მაღლა/დაბლა</string>
 	<string name="zoom_by_swiping_summary">გაატარეთ თითი მაღლა ან დაბლა კამერის მასშტაბირების სამართავად.</string>
 	<string name="auto_rotate">1D ვერტიკალური შტრიხ-კოდების ამოცნობა</string>
 	<string name="auto_rotate_summary">კამერის ავტომატური შეტრიალება  ვერტიკალური 1D შტრიხ-კოდების ამოსაცნობად. მოწყობილობიდან გამომდინარე, შესაძლოა იმოქმედოს წარმადობაზე.</string>
 	<string name="try_harder">წაკითხვის ოპტიმიზირება სიზუსტეზე და არა სისწრაფეზე</string>
 	<string name="try_harder_summary">ეს პარამეტრი ჩართეთ იმ შტრიხ-კოდებისთვის, რომელთა ამოცნობაც ძალიან ძნელია. მოქმედებს წარმადობაზე.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="show_toast_in_bulk_mode">მონაცემების ჩვენება მუდმივ რეჟიმში</string>
+	<string name="show_toast_in_bulk_mode_summary">ჩანაწერების მთხოვნელი ნაჩვენე განსხვავებულ რეჟიმში სკანირების დროს.</string>
 	<string name="vibrate">ვიბრირება პოვნისას</string>
 	<string name="vibrate_summary">ჩართეთ ეს პარამეტრი, თუ გსურთ მოწყობილობის ვიბრირება,როდესაც შტრიხ-კოდი ამოცნობილი იქნება.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">ამოხსნაზე სიჩქარე</string>
+	<string name="beep_summary">აქტივირებეთ ეს, თუ გსურთ, რომ თქვენი მოწყობილობა შემირჩიეთ კოდის აღცილების დროს.</string>
+	<string name="beep_tone">ბიპ ტონი</string>
+	<string name="tone_cdma_confirm">CDMA დადასტუდება</string>
+	<string name="tone_sup_confirm">ზარის წესის დადასტურება</string>
+	<string name="tone_sup_radio_ack">ზარის სუპერვიზორების რადიო გზის დადასტურება</string>
+	<string name="tone_prop_ack">დადებითი მიღწევა</string>
+	<string name="tone_prop_beep">ზოგადი ბიპი</string>
+	<string name="tone_prop_beep2">ზოგადი ორმხრივი ბიპი</string>
 	<string name="use_history">სკანირების ისტორიის შენახვა</string>
 	<string name="use_history_summary">ამოცნობილი შტრიხ-კოდების მოწყობილობაზე შენახვა.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">გაუმხავად დუბლირებები</string>
 	<string name="ignore_consecutive_duplicates">არ შევინახოთ შემდგომი ასლები</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">დუპლიკატების მიღება</string>
 	<string name="open_immediately">შემოწმების გამოტოვება და მყისიერი გახსნა</string>
 	<string name="open_immediately_summary">შემოწმების გამოტოვება და მყისიერი გახსნა. შესაძლოა გამოიწვიოს არასასარგებლო კონტენტის ჩვენება.</string>
 	<string name="copy_immediately">გაცვლის ბუფერში ავტომატური კოპირება</string>
@@ -106,20 +116,20 @@
 	<string name="show_meta_data_summary">სკანირებულ შტრიხ-კოდებზე დამატებითი ინფორმაციის ჩვენება.</string>
 	<string name="show_hex_dump">თექვსმეტობითი dump-ის ჩვენება</string>
 	<string name="show_hex_dump_summary">სკანირებული შტრიხ-კოდის კონტენტის თექვსმეტობითი dump-ის ჩვენება.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="show_checksum">ჩვენება შემოწმება</string>
+	<string name="no_checksum">გადამოსაშვები კოდი არ არის</string>
+	<string name="show_recreation">აჩვენეთ აღდგენილი შტრიხკოდი</string>
+	<string name="show_recreation_summary">ახელმძღვანე და გამოჩნდეს ბარკოდი წაკითხული შიგთავსიდან, თუ შესაძლებელია.</string>
+	<string name="close_automatically">დაბრუნება შემდეგ დაკოპი/გაზიარებისას</string>
+	<string name="close_automatically_summary">ავტომატურად დაბრუნება სკანირების ეკრანზე კოპირების ან გაზის შემთხვევაში.</string>
+	<string name="default_search_engine">გახსნის უცნობი მონაცემები</string>
+	<string name="always_ask">ყოველთვის კითხვა</string>
 	<string name="open_with_url">უცნობი მონაცემების ამ ბმულის საშუალებით გახსნა</string>
-	<string name="clear_network_suggestions">Remove network suggestions</string>
+	<string name="clear_network_suggestions">ქსელის შეთანხმებების წაშლა</string>
 	<string name="clear_network_suggestions_summary">Remove network suggestions that were previously added with this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
+	<string name="really_remove_all_networks">ნამდვილად ამოიღოს ყველა ქსელი?</string>
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="clear_network_suggestions_nothing_to_remove">არაფერი წასაშლელი არ არის</string>
 	<string name="send_category">გადაგზავნა</string>
 	<string name="send_scan_active">Forward scans</string>
 	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
@@ -133,14 +143,14 @@
 	<string name="test_url">Test URL</string>
 	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">ჰოსტი</string>
+	<string name="no_bluetooth_hosts_paired">პარიები არ არის შემერთებული</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">თანამედროვე</string>
+	<string name="brighten_screen">ეკრანის განანახლება</string>
+	<string name="brighten_screen_summary">დააყენეთ სიკანის სკრინის სკანირების გაუმარტივებისთვის სიკანის სიმაღლე მაქსიმალურ დონეზე.</string>
 	<string name="really_remove_scan">ნამდვილად გსურთ სკანირების წაშლა?</string>
 	<string name="really_remove_all_scans">ნამდვილად გსურთ ყველაფრის წაშლა?</string>
 	<string name="really_remove_selected_scans">ნამდვილად გსურთ შერჩეული შტრიხ-კოდების წაშლა?</string>
@@ -174,8 +184,8 @@
 	<string name="otpauth_add">დავამატოთ 2FA</string>
 	<string name="search_web">ქსელში მოძებნა</string>
 	<string name="search_scan">სკანირების ძიება</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">დაამატე ისტორიაში</string>
+	<string name="added_to_history">დაემატა ისტორიაში</string>
 	<string name="export_to_file">ექსპორტი ფაილში</string>
 	<string name="export_as">შესანახი ფაილის ფორმატი</string>
 	<string name="export_csv_comma">CSV (გამყოფი - მძიმე)</string>
@@ -184,25 +194,31 @@
 	<string name="export_database">SQLite მონაცემთა ბაზა</string>
 	<string name="saved_in_downloads">შენახულია გადმოწერებში</string>
 	<string name="rotate_image_cw">გამოსახულების შემობრუნება საათის ისრის მიხედვით</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">გადართეთ თავისუფლებითი როტაცია</string>
+	<string name="pick_file">აირჩიეთ ფაილი</string>
 	<string name="pick_image_file">აირჩიეთ ფაილი გამოსახულებით</string>
 	<string name="pick_code_to_scan">აირჩიეთ შტრიხ-კოდი სკანირებისთვის</string>
 	<string name="shortcut_decode">შტრიხ-კოდის სკანირება</string>
 	<string name="shortcut_encode">შტრიხ-კოდის შექმნა</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">ისტორია</string>
 	<string name="shortcut_preferences">პარამეტრები</string>
 	<string name="background_request_failed">ფონური მოთხოვნა ვერ მოხერხდა</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="entry_type">ტიპი</string>
+	<string name="wifi_network">Wi-Fi ქსელი</string>
+	<string name="wifi_ssid">სახელი</string>
+	<string name="wifi_type">აუტენტიკაციის ტიპი</string>
+	<string name="wifi_password">პაროლი</string>
+	<string name="wifi_hidden">მაღალი ქსელი</string>
+	<string name="wifi_eap">EAP მეთოდი</string>
+	<string name="wifi_anonymous_identity">ანონიმური იდენტიფიკაცია</string>
+	<string name="wifi_identity">იდენტიფიკაცია</string>
+	<string name="wifi_phase2">Phase 2 მეთოდი</string>
+	<string name="network_suggestions">ქსელის რჩევები</string>
+	<string name="remove_suggestion">წაშალე წერილი</string>
+	<string name="email_to">მიმღები</string>
+	<string name="email_subject">თემა</string>
+	<string name="email_body">შინაარსი</string>
+	<string name="scheme">სქემა</string>
+	<string name="host">ჰოსტი</string>
+	<string name="query">კითხვა</string>
 </resources>

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

@@ -1,10 +1,15 @@
 <resources>
+	<string name="welcome">환영합니다!</string>
+	<string name="mode_expert">고급</string>
+	<string name="mode_expert_description">읽은 내용을 확인하고 수동으로 열고 싶습니다.</string>
+	<string name="mode_simple">간단</string>
+	<string name="mode_simple_description">바코드를 스캔하고 즉시 열고 싶습니다.</string>
 	<string name="camera_error">카메라를 접근할 수 없습니다. 다시 시도하세요</string>
-	<string name="scan_code">Scan code</string>
-	<string name="compose_barcode">Compose barcode</string>
-	<string name="decode_barcode">Decode barcode</string>
-	<string name="content">Content</string>
-	<string name="binary_data">(binary data)</string>
+	<string name="scan_code">코드 스캔</string>
+	<string name="compose_barcode">바코드 작성</string>
+	<string name="decode_barcode">바코드 디코딩</string>
+	<string name="content">내용</string>
+	<string name="binary_data">(이진 데이터)</string>
 	<plurals name="barcode_info">
 		<item quantity="other">%2$d characters, %1$s</item>
 	</plurals>
@@ -13,195 +18,206 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; correction)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; correction)</string>
 	<string name="error_correction_level_h" formatted="false">High (~30&#37; correction)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">라벨</string>
+	<string name="colors">전경과 배경</string>
+	<string name="colors_black_on_white">흰색에 검정색</string>
+	<string name="colors_white_on_black">흰색 글자 검정색 배경</string>
+	<string name="colors_black_on_transparent">투명한 배경 위의 검정색</string>
+	<string name="colors_white_on_transparent">투명한 배경에 흰색</string>
+	<string name="sequence_size">시퀀스 크기</string>
+	<string name="sequence_index">시퀀스 인덱스</string>
+	<string name="sequence_id">시퀀스 ID</string>
 	<string name="gtin_issue_number">이슈번호</string>
-	<string name="gtin_country">Possible country of manufacture</string>
-	<string name="gtin_price">Suggested price</string>
-	<string name="gtin_add_on">UPC EAN extension</string>
+	<string name="gtin_country">제조 국가 가능성</string>
+	<string name="gtin_price">제안 가격</string>
+	<string name="gtin_add_on">UPC EAN 확장</string>
 	<string name="barcode_version_number">버전</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
-	<string name="toggle_flash">Toggle flash</string>
-	<string name="error_flash">Error toggling flash</string>
-	<string name="share">Share</string>
-	<string name="share_file">Share as file</string>
-	<string name="share_as">Share as?</string>
-	<string name="copy_to_clipboard">Copy to clipboard</string>
-	<string name="copied_to_clipboard">Copied to clipboard</string>
-	<string name="copy_password">Copy password into clipboard</string>
-	<string name="copied_password_to_clipboard">Password copied to clipboard</string>
+	<string name="qr_data_mask">데이터 마스크</string>
+	<string name="toggle_flash">플래시 전환</string>
+	<string name="error_flash">플래시 전환 오류</string>
+	<string name="share">공유</string>
+	<string name="share_file">파일로 공유</string>
+	<string name="share_as">공유할까요?</string>
+	<string name="copy_to_clipboard">클립보드에 복사</string>
+	<string name="copy_as_deeplink">딥링크로 복사</string>
+	<string name="copied_to_clipboard">클립보드에 복사되었습니다</string>
+	<string name="copy_password">클립보드에 비밀번호 복사</string>
 	<string name="open_url">Open url</string>
-	<string name="cannot_resolve_action">No application can open that</string>
-	<string name="pick_search_engine">Pick a search engine</string>
-	<string name="format">Format</string>
-	<string name="size_width_by_height">Size in pixels: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
-	<string name="input_content_here">Input content here</string>
-	<string name="unescape">Expand escape sequences</string>
-	<string name="encode">ENCODE</string>
-	<string name="error_no_content">Missing content</string>
-	<string name="error_encoding_barcode">Barcode cannot be generated</string>
-	<string name="view_barcode">View barcode</string>
-	<string name="info">Info</string>
-	<string name="switch_camera">Switch camera</string>
-	<string name="bulk_mode">Scan continuously</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
-	<string name="history">History</string>
+	<string name="cannot_resolve_action">어떤 앱도 열 수 없습니다</string>
+	<string name="pick_search_engine">검색 엔진을 선택하세요</string>
+	<string name="format">형식</string>
+	<string name="size_width_by_height">크기(픽셀): %1$d×%2$d</string>
+	<string name="size_no_magnification">확대하지 않음</string>
+	<string name="add_quiet_zone">조용한 지역 추가</string>
+	<string name="input_content_here">여기에 내용을 입력하세요</string>
+	<string name="unescape">이스케이프 시퀀스 확장</string>
+	<string name="encode">인코딩</string>
+	<string name="error_no_content">내용이 없습니다</string>
+	<string name="error_encoding_barcode">바코드를 생성할 수 없습니다</string>
+	<string name="view_barcode">보기 바코드</string>
+	<string name="info">정보</string>
+	<string name="switch_camera">카메라 전환</string>
+	<string name="bulk_mode">지속적으로 스캔</string>
+	<string name="bulk_mode_summary">항상 지속적으로 스캔을 시작합니다.</string>
+	<string name="bulk_mode_delay">연속 스캔 간의 지연</string>
+	<string name="restrict_format">형식 제한</string>
+	<string name="remove_restriction">제한 해제</string>
+	<string name="find_code">코드 찾기</string>
+	<string name="find_code_with_content">무슨 내용?</string>
+	<string name="find_code_hint">용어를 입력하세요</string>
+	<string name="scan_format">스캔 %s</string>
+	<string name="quarter_second">0.25초</string>
+	<string name="half_second">반초</string>
+	<string name="a_second">일 초</string>
+	<string name="two_seconds">두 초</string>
+	<string name="five_seconds">다섯 초</string>
+	<string name="history">역사</string>
 	<string name="preferences">Preferences</string>
-	<string name="scan_category">Scan</string>
-	<string name="content_category">Content</string>
-	<string name="locale_category">Language</string>
-	<string name="custom_locale">Custom language</string>
-	<string name="follow_system_settings">Follow system settings</string>
-	<string name="show_crop_handle">Show cropping limiter</string>
-	<string name="show_crop_handle_summary">Restrict scanning to a customizable region.</string>
-	<string name="barcode_formats">Barcode formats</string>
-	<string name="zoom_by_swiping">Swipe up/down to zoom</string>
-	<string name="zoom_by_swiping_summary">Swipe up or down in camera screen to control the camera zoom.</string>
-	<string name="auto_rotate">Recognize vertical 1D barcodes</string>
-	<string name="auto_rotate_summary">Automatically rotate the camera frame to recognize vertical 1D barcodes. Depending on the device, this may affect performance.</string>
-	<string name="try_harder">Optimize reader for accuracy</string>
-	<string name="try_harder_summary">Enable this option for very hard to read codes. Will affect performance.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
-	<string name="vibrate">Vibrate on detection</string>
-	<string name="vibrate_summary">Enable this if you want your device to vibrate when a code is recognized.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
-	<string name="use_history">Save scan history</string>
-	<string name="use_history_summary">Save recognized codes on your device.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="scan_category">스캔</string>
+	<string name="content_category">콘텐츠</string>
+	<string name="locale_category">언어</string>
+	<string name="custom_locale">사용자 정의 언어</string>
+	<string name="follow_system_settings">시스템 설정 따르기</string>
+	<string name="show_crop_handle">크롭 제한기 표시</string>
+	<string name="show_crop_handle_summary">사용자 지정 가능한 영역으로 스캔을 제한합니다.</string>
+	<string name="barcode_formats">바코드 형식</string>
+	<string name="zoom_by_swiping">위아래로 스와이프하여 확대/축소</string>
+	<string name="zoom_by_swiping_summary">카메라 화면에서 위 또는 아래로 스와이프하여 카메라 줌을 제어합니다.</string>
+	<string name="auto_rotate">수직 1D 바코드를 인식합니다</string>
+	<string name="auto_rotate_summary">카메라 프레임을 자동으로 회전하여 수직 1D 바코드를 인식합니다. 장치에 따라 성능에 영향을 줄 수 있습니다.</string>
+	<string name="try_harder">정확성을 위해 리더를 최적화하십시오</string>
+	<string name="try_harder_summary">이 옵션을 활성화하면 매우 읽기 어려운 코드에 영향을 미칠 수 있습니다. 성능에 영향을 줄 수 있습니다.</string>
+	<string name="show_toast_in_bulk_mode">연속 모드로 데이터 표시</string>
+	<string name="show_toast_in_bulk_mode_summary">연속 스캔시 스캔된 데이터를 간단히 표시합니다.</string>
+	<string name="vibrate">감지시 진동</string>
+	<string name="vibrate_summary">코드가 인식될 때 기기가 진동하도록 하려면이 옵션을 활성화하십시오.</string>
+	<string name="beep">감지 시 비프음</string>
+	<string name="beep_summary">코드가 인식되면 장치에서 소리가 나게 하려면 이 기능을 활성화하세요.</string>
+	<string name="beep_tone">소리</string>
+	<string name="tone_cdma_confirm">CDMA 확인</string>
+	<string name="tone_sup_confirm">통화 감독 확인</string>
+	<string name="tone_sup_radio_ack">통화 감독 무선 경로 응답</string>
+	<string name="tone_prop_ack">긍정적인 인식</string>
+	<string name="tone_prop_beep">일반적인 비프음</string>
+	<string name="tone_prop_beep2">일반 이중 비프음</string>
+	<string name="use_history">스캔 기록 저장</string>
+	<string name="use_history_summary">기기에 인식된 코드를 저장합니다.</string>
+	<string name="ignore_duplicates">중복 무시</string>
 	<string name="ignore_consecutive_duplicates">Ignore duplicates</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
-	<string name="open_immediately">Open immediately</string>
-	<string name="open_immediately_summary">Skip inspection and open contents immediately. May open harmful content if enabled.</string>
-	<string name="copy_immediately">Put into clipboard</string>
-	<string name="copy_immediately_summary">Automatically copy scanned contents into clipboard. Please note that other apps may snoop on your clipboard in the background.</string>
-	<string name="show_meta_data">Show metadata</string>
-	<string name="show_meta_data_summary">Show additional data about the scanned barcode.</string>
-	<string name="show_hex_dump">Show hex dump</string>
-	<string name="show_hex_dump_summary">Show a hex dump of the scanned contents.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
-	<string name="open_with_url">Open unknown data with URL</string>
-	<string name="clear_network_suggestions">Remove network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove network suggestions that were previously added with this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
-	<string name="send_category">Forwarding</string>
-	<string name="send_scan_active">Forward scans</string>
+	<string name="accept_duplicates">중복 허용</string>
+	<string name="open_immediately">즉시 열기</string>
+	<string name="open_immediately_summary">검사를 건너뛰고 즉시 내용물을 엽니다. 활성화된 경우 유해한 내용물을 열 수 있습니다.</string>
+	<string name="copy_immediately">클립보드에 복사하기</string>
+	<string name="copy_immediately_summary">스캔한 내용을 자동으로 클립보드에 복사합니다. 다른 앱들이 백그라운드에서 당신의 클립보드를 엿볼 수도 있음을 주의하세요.</string>
+	<string name="show_meta_data">메타데이터 표시</string>
+	<string name="show_meta_data_summary">스캔된 바코드에 대한 추가 데이터를 표시합니다.</string>
+	<string name="show_hex_dump">16진 덤프 보기</string>
+	<string name="show_hex_dump_summary">스캔된 내용의 16진 덤프를 표시합니다.</string>
+	<string name="show_checksum">체크섬 표시</string>
+	<string name="no_checksum">체크섬 없음</string>
+	<string name="show_recreation">재생된 바코드 보기</string>
+	<string name="show_recreation_summary">가능한 경우 읽은 내용에서 바코드를 재생성하고 표시합니다.</string>
+	<string name="close_automatically">복사/공유 후로 돌아가기</string>
+	<string name="close_automatically_summary">읽은 내용을 복사하거나 공유한 후 스캔 화면으로 자동으로 돌아갑니다.</string>
+	<string name="default_search_engine">알 수 없는 데이터 열기:</string>
+	<string name="always_ask">항상 물어보기</string>
+	<string name="open_with_url">URL로 알려지지 않은 데이터 열기</string>
+	<string name="clear_network_suggestions">네트워크 제안 사항 제거</string>
+	<string name="clear_network_suggestions_summary">이 앱을 통해 이전에 추가된 네트워크 제안을 제거합니다.</string>
+	<string name="really_remove_all_networks">모든 네트워크를 정말로 삭제하시겠습니까?</string>
+	<string name="clear_network_suggestions_success">네트워크 제안이 지워졌습니다</string>
+	<string name="clear_network_suggestions_nothing_to_remove">삭제할 항목이 없습니다</string>
+	<string name="send_category">전달</string>
+	<string name="send_scan_active">전달 스캔</string>
 	<string name="send_scan_active_summary">Enable to forward scans to a the given URL.</string>
-	<string name="send_scan_url">URL to forward to</string>
-	<string name="send_scan_type">Request type</string>
-	<string name="send_type_get_add_content">GET and simply add content</string>
-	<string name="send_type_get_query_string">GET with complete query string</string>
+	<string name="send_scan_url">전달 할 URL</string>
+	<string name="send_scan_type">요청 유형</string>
+	<string name="send_type_get_add_content">GET 및 간단히 콘텐츠 추가</string>
+	<string name="send_type_get_query_string">전체 쿼리 문자열이 포함된 GET</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
-	<string name="test_url">Test URL</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_type_external_browser">외부 브라우저에서 열기</string>
+	<string name="test_url">테스트 URL</string>
+	<string name="send_scan_bluetooth">블루투스로 스캔 전송</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">호스트</string>
+	<string name="no_bluetooth_hosts_paired">연결된 호스트가 없습니다</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
-	<string name="really_remove_scan">Really remove scan?</string>
-	<string name="really_remove_all_scans">Really remove all scans?</string>
-	<string name="really_remove_selected_scans">Really remove selected scans?</string>
-	<string name="clear_history">Clear history</string>
-	<string name="copy_scan">Copy scan</string>
-	<string name="edit_label">Edit label</string>
-	<string name="remove_scan">Remove scan</string>
-	<string name="enter_name">Enter a name to describe the scan</string>
-	<string name="enter_name_hint">Name of the scan</string>
-	<string name="no_barcode_found">No barcode found</string>
-	<string name="pick_list_separator">How to separate list items?</string>
-	<string name="separator_line_break">Line break</string>
-	<string name="separator_ruler">Ruler</string>
+	<string name="generation_category">세대</string>
+	<string name="brighten_screen">화면 밝기 높이기</string>
+	<string name="brighten_screen_summary">화면에서 바코드를 스캔하기 위해 밝기를 최대로 설정합니다.</string>
+	<string name="really_remove_scan">정말 스캔을 삭제 하시겠습니까?</string>
+	<string name="really_remove_all_scans">모든 스캔을 정말로 삭제 하시겠습니까?</string>
+	<string name="really_remove_selected_scans">선택한 스캔을 정말로 삭제 하시겠습니까?</string>
+	<string name="clear_history">기록 지우기</string>
+	<string name="copy_scan">복사 스캔</string>
+	<string name="edit_label">레이블 편집</string>
+	<string name="remove_scan">스캔 제거</string>
+	<string name="enter_name">스캔을 설명할 이름을 입력하세요</string>
+	<string name="enter_name_hint">스캔 이름</string>
+	<string name="no_barcode_found">바코드를 찾을 수 없습니다</string>
+	<string name="pick_list_separator">리스트 항목을 어떻게 구분하시겠습니까?</string>
+	<string name="separator_line_break">줄 바꿈</string>
+	<string name="separator_ruler">자</string>
 	<string name="save_as_file_name">Save as in Downloads file?</string>
-	<string name="file_name">File name</string>
-	<string name="error_saving_file">Cannot save file</string>
-	<string name="error_file_exists">File already exists</string>
+	<string name="file_name">파일 이름</string>
+	<string name="error_saving_file">파일을 저장할 수 없습니다</string>
+	<string name="error_file_exists">파일이 이미 존재합니다</string>
 	<string name="connect_to_wifi">Connect to WiFi</string>
 	<string name="wifi_config_failed">Could not configure WiFi</string>
 	<string name="wifi_added">WiFi added</string>
-	<string name="sms_send">Send SMS</string>
-	<string name="sms_error">Could not send SMS</string>
-	<string name="tel_dial">Dial number</string>
-	<string name="tel_error">Could not dial number</string>
-	<string name="mail_send">Send mail</string>
-	<string name="mail_error">Could not send mail</string>
-	<string name="vcard_add">Add to contacts</string>
-	<string name="vcard_failed">Could not add to contacts</string>
-	<string name="vevent_add">Add to calendar</string>
-	<string name="vevent_failed">Could not add to calendar</string>
-	<string name="otpauth_add">Add 2FA</string>
-	<string name="search_web">Search the web</string>
-	<string name="search_scan">Search scan</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
-	<string name="export_to_file">Export to file</string>
-	<string name="export_as">Export as?</string>
-	<string name="export_csv_comma">CSV file with commas</string>
-	<string name="export_csv_semicolon">CSV file with semicolons</string>
-	<string name="export_json">JSON file</string>
-	<string name="export_database">SQLite database</string>
-	<string name="saved_in_downloads">Saved in downloads</string>
-	<string name="rotate_image_cw">Rotate image clockwise</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
-	<string name="pick_image_file">Pick image file</string>
+	<string name="sms_send">문자 보내기</string>
+	<string name="sms_error">문자 메시지를 보낼 수 없습니다</string>
+	<string name="tel_dial">번호 누르기</string>
+	<string name="tel_error">번호를 다이얼할 수 없습니다</string>
+	<string name="mail_send">이메일 보내기</string>
+	<string name="mail_error">메일을 보낼 수 없습니다</string>
+	<string name="vcard_add">연락처에 추가</string>
+	<string name="vcard_failed">주소록에 추가할 수 없습니다</string>
+	<string name="vevent_add">일정에 추가</string>
+	<string name="vevent_failed">캘린더에 추가할 수 없습니다</string>
+	<string name="otpauth_add">2FA 추가</string>
+	<string name="search_web">웹 검색</string>
+	<string name="search_scan">검색 스캔</string>
+	<string name="add_to_history">히스토리에 추가</string>
+	<string name="added_to_history">역사에 추가되었습니다</string>
+	<string name="export_to_file">파일로 내보내기</string>
+	<string name="export_as">내보내기?</string>
+	<string name="export_csv_comma">쉼표가 있는 CSV 파일</string>
+	<string name="export_csv_semicolon">세미콜론으로 구분된 CSV 파일</string>
+	<string name="export_json">JSON 파일</string>
+	<string name="export_database">SQLite 데이터베이스</string>
+	<string name="saved_in_downloads">다운로드에 저장되었습니다</string>
+	<string name="rotate_image_cw">이미지를 시계 방향으로 회전</string>
+	<string name="toggle_free_rotation">자유 회전 전환</string>
+	<string name="pick_file">파일 선택</string>
+	<string name="pick_image_file">이미지 파일 선택</string>
 	<string name="pick_code_to_scan">Pick code to scan</string>
-	<string name="shortcut_decode">Scan a barcode</string>
-	<string name="shortcut_encode">Create a barcode</string>
-	<string name="shortcut_history">History</string>
-	<string name="shortcut_preferences">Settings</string>
-	<string name="background_request_failed">Background request failed</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="shortcut_decode">바코드를 스캔합니다</string>
+	<string name="shortcut_encode">바코드 만들기</string>
+	<string name="shortcut_history">연혁</string>
+	<string name="shortcut_preferences">설정</string>
+	<string name="background_request_failed">백그라운드 요청 실패</string>
+	<string name="entry_type">유형</string>
+	<string name="wifi_network">무선 네트워크</string>
+	<string name="wifi_ssid">이름</string>
+	<string name="wifi_type">인증 유형</string>
+	<string name="wifi_password">암호</string>
+	<string name="wifi_hidden">숨겨진 네트워크</string>
+	<string name="wifi_eap">EAP 방식</string>
+	<string name="wifi_anonymous_identity">익명 신분</string>
+	<string name="wifi_identity">정체성</string>
+	<string name="wifi_phase2">단계 2 방법</string>
+	<string name="network_suggestions">네트워크 제안</string>
+	<string name="remove_suggestion">건의 사항 삭제</string>
+	<string name="email_to">받는 사람</string>
+	<string name="email_subject">제목</string>
+	<string name="email_body">본문</string>
+	<string name="scheme">스키마</string>
+	<string name="host">호스트</string>
+	<string name="query">쿼리</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Welkom!</string>
+	<string name="mode_expert">Geavanceerd</string>
+	<string name="mode_expert_description">Ik wil de gelezen inhoud controleren en handmatig openen.</string>
+	<string name="mode_simple">Eenvoudig</string>
+	<string name="mode_simple_description">Ik wil gewoon barcodes scannen en direct openen.</string>
 	<string name="camera_error">Geen toegang tot camera, probeer opnieuw.</string>
 	<string name="scan_code">Scan een code</string>
 	<string name="compose_barcode">Barcode scannen</string>
@@ -15,48 +20,53 @@
 	<string name="error_correction_level_q" formatted="false">Kwartiel (~25&#37; correction)</string>
 	<string name="error_correction_level_h" formatted="false">Hoog (~30&#37; correction)</string>
 	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">Voor- en achtergrond</string>
+	<string name="colors_black_on_white">Zwart op wit</string>
+	<string name="colors_white_on_black">Wit op zwart</string>
+	<string name="colors_black_on_transparent">Zwart op transparant</string>
+	<string name="colors_white_on_transparent">Wit op transparant</string>
+	<string name="sequence_size">Sequentiegrootte</string>
+	<string name="sequence_index">Volgorde index</string>
+	<string name="sequence_id">Sequentie-ID</string>
 	<string name="gtin_issue_number">Uitgiftenummer</string>
 	<string name="gtin_country">Mogelijk land van fabricage</string>
 	<string name="gtin_price">Adviesprijs</string>
 	<string name="gtin_add_on">UPC EAN extensie</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">Versie</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Gegevensmasker</string>
 	<string name="toggle_flash">Zaklamp aan/uit</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Fout bij het wisselen van flits</string>
 	<string name="share">Delen</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Delen als bestand</string>
 	<string name="share_as">Delen als?</string>
 	<string name="copy_to_clipboard">Naar klembord kopiëren</string>
+	<string name="copy_as_deeplink">Kopieer als deeplink</string>
 	<string name="copied_to_clipboard">Naar klembord gekopieerd</string>
 	<string name="copy_password">Kopieer wachtwoord naar klembord</string>
-	<string name="copied_password_to_clipboard">Wachtwoord gekopieerd naar klembord</string>
 	<string name="open_url">URL openen</string>
 	<string name="cannot_resolve_action">Geen enkele toepassing kan dat openen</string>
 	<string name="pick_search_engine">Zoekmachine kiezen</string>
-	<string name="format">Format</string>
+	<string name="format">Formaat</string>
 	<string name="size_width_by_height">Afmeting in pixels: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">Geen vergroting</string>
+	<string name="add_quiet_zone">Voeg stille zone toe</string>
 	<string name="input_content_here">Voer hier de inhoud in</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Escape-reeksen uitbreiden</string>
 	<string name="encode">Coderen</string>
 	<string name="error_no_content">Inhoud ontbreekt</string>
 	<string name="error_encoding_barcode">Kan geen barcode aanmaken</string>
 	<string name="view_barcode">Barcode bekijken</string>
-	<string name="info">Info</string>
+	<string name="info">Informatie</string>
 	<string name="switch_camera">Camera wisselen</string>
 	<string name="bulk_mode">Continu scannen</string>
 	<string name="bulk_mode_summary">Begin altijd continu te scannen</string>
 	<string name="bulk_mode_delay">Vertraging tussen ononderbroken scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
+	<string name="restrict_format">Beperk formaat</string>
+	<string name="remove_restriction">Verwijder beperking</string>
+	<string name="find_code">Vind code</string>
+	<string name="find_code_with_content">Wat voor inhoud?</string>
+	<string name="find_code_hint">Voer een zoekterm in</string>
 	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">¼ seconde</string>
 	<string name="half_second">½ seconde</string>
@@ -72,7 +82,7 @@
 	<string name="follow_system_settings">Systeeminstellingen volgen</string>
 	<string name="show_crop_handle">Bijsnijd-begrenzer tonen</string>
 	<string name="show_crop_handle_summary">Scannen beperken tot een aanpasbaar gebied</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Barcode formaten</string>
 	<string name="zoom_by_swiping">Camera zoomen door omhoog/omlaag te vegen</string>
 	<string name="zoom_by_swiping_summary">De zoom van de camera bedienen door in het camerascherm omhoog of omlaag te vegen.</string>
 	<string name="auto_rotate">1D-barcodes verticaal herkennen</string>
@@ -83,21 +93,21 @@
 	<string name="show_toast_in_bulk_mode_summary">Kort de gescande gegevens tonen bij continu scannen.</string>
 	<string name="vibrate">Trillen bij herkennen</string>
 	<string name="vibrate_summary">Schakel dit in als u wilt dat uw toestel trilt wanneer een code wordt herkend.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">Piep bij detectie</string>
+	<string name="beep_summary">Schakel dit in als je wilt dat je apparaat piept wanneer een code wordt herkend.</string>
+	<string name="beep_tone">Pieptoon</string>
+	<string name="tone_cdma_confirm">CDMA bevestigen</string>
+	<string name="tone_sup_confirm">Beltoezicht bevestigen</string>
+	<string name="tone_sup_radio_ack">Oproep toezichtradio pad bevestiging</string>
+	<string name="tone_prop_ack">Positieve bevestiging</string>
+	<string name="tone_prop_beep">Algemene piep</string>
+	<string name="tone_prop_beep2">Algemene dubbele piep</string>
 	<string name="use_history">Scancodes bewaren</string>
 	<string name="use_history_summary">Bewaar herkende codes op je toestel.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Negeer duplicaten</string>
 	<string name="ignore_consecutive_duplicates">Duplicaten negeren</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Accepteer duplicaten</string>
 	<string name="open_immediately">Inhoud direct tonen, zonder inspectie</string>
 	<string name="open_immediately_summary">Sla inspectie over en open meteen de inhoud. Indien geactiveerd, kan schadelijke inhoud worden geopend.</string>
 	<string name="copy_immediately">Meteen op klembord zetten</string>
@@ -106,10 +116,10 @@
 	<string name="show_meta_data_summary">Toon extra gegevens over de gescande barcode.</string>
 	<string name="show_hex_dump">Hex-dump tonen</string>
 	<string name="show_hex_dump_summary">Hex-dump van de gescande inhoud tonen.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_checksum">Toon checksum</string>
+	<string name="no_checksum">Geen checksum</string>
+	<string name="show_recreation">Toon gereconstrueerde barcode</string>
+	<string name="show_recreation_summary">Recreëren en de barcode tonen van de gelezen inhoud indien mogelijk.</string>
 	<string name="close_automatically">Teruggaan na kopiëren/delen</string>
 	<string name="close_automatically_summary">Automatisch terugkeren naar het scanscherm na het kopiëren of delen van de gelezen inhoud.</string>
 	<string name="default_search_engine">Onbekende data openen in</string>
@@ -121,26 +131,26 @@
 	<string name="clear_network_suggestions_success">Netwerksuggesties gewist</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Niets te wissen</string>
 	<string name="send_category">Doorsturen</string>
-	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active">Stuur scans door</string>
 	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Stuur elke scan naar URL</string>
 	<string name="send_scan_type">Type aanvraag voor elke scan</string>
 	<string name="send_type_get_add_content">GET en gewoon inhoud toevoegen</string>
 	<string name="send_type_get_query_string">GET met volledige query string</string>
-	<string name="send_type_post_form">POST toepassing/x-www-form-urlencoded</string>
-	<string name="send_type_post_json">POST toepassing/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Openen in externe browser</string>
 	<string name="test_url">Test URL</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Stuur scans door met Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
 	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="no_bluetooth_hosts_paired">Geen hosts gekoppeld</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Generatie</string>
+	<string name="brighten_screen">Helderheid scherm verhogen</string>
+	<string name="brighten_screen_summary">Stel de helderheid in op maximaal om het scannen van een streepjescode van het scherm te verbeteren.</string>
 	<string name="really_remove_scan">Scan echt verwijderen?</string>
 	<string name="really_remove_all_scans">Alle scans echt verwijderen?</string>
 	<string name="really_remove_selected_scans">Geselecteerde scans verwijderen?</string>
@@ -174,23 +184,23 @@
 	<string name="otpauth_add">2FA toevoegen</string>
 	<string name="search_web">Zoeken op internet</string>
 	<string name="search_scan">Scan op internet zoeken</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Toevoegen aan geschiedenis</string>
+	<string name="added_to_history">Toegevoegd aan geschiedenis</string>
 	<string name="export_to_file">Uitvoer naar bestand</string>
 	<string name="export_as">Exporteren als?</string>
 	<string name="export_csv_comma">CSV bestand met komma\'s</string>
 	<string name="export_csv_semicolon">CSV bestand met puntkomma\'s</string>
 	<string name="export_json">JSON bestand</string>
-	<string name="export_database">SQLite database</string>
+	<string name="export_database">SQLite-database</string>
 	<string name="saved_in_downloads">Opgeslagen in downloads</string>
 	<string name="rotate_image_cw">Afbeelding rechtsom draaien</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">Schakel vrije rotatie in/uit</string>
+	<string name="pick_file">Kies een bestand</string>
 	<string name="pick_image_file">Beeldbestand kiezen</string>
 	<string name="pick_code_to_scan">Kies code om te scannen</string>
 	<string name="shortcut_decode">Een barcode scannen</string>
 	<string name="shortcut_encode">Een barcode aanmaken</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Geschiedenis</string>
 	<string name="shortcut_preferences">Voorkeuren</string>
 	<string name="background_request_failed">Achtergrondverzoek mislukt</string>
 	<string name="entry_type">Type</string>
@@ -203,6 +213,12 @@
 	<string name="wifi_anonymous_identity">Anonieme identiteit</string>
 	<string name="wifi_identity">Identiteit</string>
 	<string name="wifi_phase2">Phase 2 methode</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="network_suggestions">Netwerksuggesties</string>
+	<string name="remove_suggestion">Verwijder suggestie</string>
+	<string name="email_to">Ontvanger</string>
+	<string name="email_subject">Onderwerp</string>
+	<string name="email_body">Bericht</string>
+	<string name="scheme">Regeling</string>
+	<string name="host">Host</string>
+	<string name="query">Query</string>
 </resources>

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

@@ -1,8 +1,14 @@
 <resources>
+	<string name="welcome">Witamy!</string>
+	<string name="mode_expert">Zaawansowany</string>
+	<string name="mode_expert_description">Chcę sprawdzić odczytaną treść i otworzyć ją ręcznie.</string>
+	<string name="mode_simple">Prosty</string>
+	<string name="mode_simple_description">Chcę tylko skanować kody kreskowe i otwierać je natychmiast.</string>
 	<string name="open_url">Otwórz URL</string>
 	<string name="content">Zawartość</string>
 	<string name="copied_to_clipboard">Skopiowano do schowka</string>
 	<string name="copy_to_clipboard">Skopiuj do schowka</string>
+	<string name="copy_as_deeplink">Kopiuj jako link bezpośredni</string>
 	<string name="info">Informacje</string>
 	<string name="vcard_add">Dodaj do kontaktów</string>
 	<string name="vevent_add">Dodaj do kalendarza</string>
@@ -90,6 +96,9 @@
 	<string name="bulk_mode_delay">Opóźnienie między kolejnymi skanami</string>
 	<string name="restrict_format">Ogranicz format</string>
 	<string name="remove_restriction">Usuń ograniczenie</string>
+	<string name="find_code">Znajdź kod</string>
+	<string name="find_code_with_content">Jaki treść?</string>
+	<string name="find_code_hint">Wprowadź termin</string>
 	<string name="scan_format">Skan %s</string>
 	<string name="quarter_second">Ćwierć sekundy</string>
 	<string name="half_second">Pół sekundy</string>
@@ -155,16 +164,15 @@
 	<string name="test_url">Testuj URL</string>
 	<string name="send_scan_bluetooth">Przekazuj skany za pomocą Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
+	<string name="send_scan_bluetooth_host">Gospodarz</string>
 	<string name="no_bluetooth_hosts_paired">Brak sparowanych hostów</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Pokolenie</string>
+	<string name="brighten_screen">Rozjaśnić ekran</string>
+	<string name="brighten_screen_summary">Ustaw jasność na maksimum, aby ułatwić skanowanie kodu kreskowego z ekranu.</string>
 	<string name="copy_password">Skopiuj hasło do schowka</string>
-	<string name="copied_password_to_clipboard">Hasło skopiowane do schowka</string>
 	<string name="gtin_price">Sugerowana cena</string>
 	<string name="preferences">Ustawienia</string>
 	<string name="scan_category">Skanowanie</string>
@@ -176,6 +184,7 @@
 	<string name="gtin_add_on">Dodatek UPC EAN</string>
 	<string name="barcode_version_number">Wersja</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Maska danych</string>
 	<string name="gtin_country">Możliwy kraj produkcji</string>
 	<string name="encode">ZAKODUJ</string>
 	<string name="error_no_content">Brak zawartości</string>
@@ -185,7 +194,8 @@
 	<string name="show_toast_in_bulk_mode_summary">Zwięźle pokazuje zeskanowane dane podczas skanowania ciągłego.</string>
 	<string name="cannot_resolve_action">Żadna aplikacja nie może tego otworzyć</string>
 	<string name="size_width_by_height">Rozmiar w pikselach: %1$d×%2$d</string>
-	<string name="margin_size">Margines w pikselach: %1$d</string>
+	<string name="size_no_magnification">Bez powiększenia</string>
+	<string name="add_quiet_zone">Dodaj strefę cichą</string>
 	<string name="input_content_here">Wprowadź zawartość tutaj</string>
 	<string name="unescape">Rozwiń sekwencje ucieczki</string>
 	<string name="pick_list_separator">Jak oddzielić elementy listy?</string>
@@ -205,6 +215,12 @@
 	<string name="wifi_anonymous_identity">Anonimowa tożsamość</string>
 	<string name="wifi_identity">Tożsamość</string>
 	<string name="wifi_phase2">Metoda fazy 2</string>
-	<string name="network_suggestions">Network suggestions</string>
+	<string name="network_suggestions">Sugestie sieci</string>
 	<string name="remove_suggestion">Usuń sugestię</string>
+	<string name="email_to">Odbiorca</string>
+	<string name="email_subject">Temat</string>
+	<string name="email_body">Treść</string>
+	<string name="scheme">Schemat</string>
+	<string name="host">Gospodarz</string>
+	<string name="query">Zapytanie</string>
 </resources>

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

@@ -1,13 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="welcome">Bem-vindo!</string>
+	<string name="mode_expert">Avançado</string>
+	<string name="mode_expert_description">Quero verificar o conteúdo lido e abri-lo manualmente.</string>
+	<string name="mode_simple">Simples</string>
+	<string name="mode_simple_description">Quero apenas ler códigos de barras e abri-los imediatamente.</string>
 	<string name="camera_error">Não foi possível acessar a câmera, tente novamente</string>
-	<string name="scan_code">Leia o código</string>
+	<string name="scan_code">Escanear código</string>
 	<string name="compose_barcode">Compor código de barras</string>
 	<string name="decode_barcode">Decodificar código de barras</string>
 	<string name="content">Conteúdo</string>
 	<string name="binary_data">(dados em binário)</string>
 	<plurals name="barcode_info">
 		<item quantity="one">%2$d caractere, %1$s</item>
-		<item quantity="many">%2$d caracteres, %1$s</item>
+		<item quantity="many">%2$d de characters, %1$s</item>
 		<item quantity="other">%2$d caracteres, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Nível de correção de erro</string>
@@ -30,21 +36,23 @@
 	<string name="gtin_add_on">Extensão UPC EAN</string>
 	<string name="barcode_version_number">Versão</string>
 	<string name="qr_version_and_modules">%1$s (%2$d módulos)</string>
+	<string name="qr_data_mask">Máscara de dados</string>
 	<string name="toggle_flash">Ligar lanterna</string>
 	<string name="error_flash">Falha ao ligar a lanterna</string>
 	<string name="share">Compartilhar</string>
 	<string name="share_file">Compartilhar como arquivo</string>
 	<string name="share_as">Compartilhar como?</string>
 	<string name="copy_to_clipboard">Copiar para a área de transferência</string>
+	<string name="copy_as_deeplink">Copiar como link direto</string>
 	<string name="copied_to_clipboard">Copiado para a área de transferência</string>
 	<string name="copy_password">Copiar senha para a área de transferência</string>
-	<string name="copied_password_to_clipboard">Senha copiada para a área de transferência</string>
 	<string name="open_url">Abrir URL</string>
 	<string name="cannot_resolve_action">Nenhum app pode abrir isto</string>
 	<string name="pick_search_engine">Escolha um motor de pesquisa</string>
 	<string name="format">Formato</string>
 	<string name="size_width_by_height">Tamanho em pixels: %1$d×%2$d</string>
-	<string name="margin_size">Margem em pixels: %1$d</string>
+	<string name="size_no_magnification">Sem magnificação</string>
+	<string name="add_quiet_zone">Adicionar zona tranquila</string>
 	<string name="input_content_here">Digite algum conteúdo aqui</string>
 	<string name="unescape">Expandir sequências de escape</string>
 	<string name="encode">CODIFICAR</string>
@@ -52,12 +60,15 @@
 	<string name="error_encoding_barcode">Código de barras não pode ser gerado</string>
 	<string name="view_barcode">Ver código de barras</string>
 	<string name="info">Informações</string>
-	<string name="switch_camera">Alterar câmera</string>
+	<string name="switch_camera">Trocar câmera</string>
 	<string name="bulk_mode">Digitalizar continuamente</string>
 	<string name="bulk_mode_summary">Sempre iniciar digitalizando continuamente.</string>
-	<string name="bulk_mode_delay">Delay entre digitalizações contínuas</string>
+	<string name="bulk_mode_delay">Espera entre digitalizações contínuas</string>
 	<string name="restrict_format">Restringir formato</string>
 	<string name="remove_restriction">Remover restrição</string>
+	<string name="find_code">Encontrar código</string>
+	<string name="find_code_with_content">Qual conteúdo?</string>
+	<string name="find_code_hint">Insira um termo</string>
 	<string name="scan_format">Digitalizar %s</string>
 	<string name="quarter_second">Um quarto de segundo</string>
 	<string name="half_second">Meio segundo</string>
@@ -84,8 +95,8 @@
 	<string name="show_toast_in_bulk_mode_summary">Mostrar brevemente os dados durante digitalização contínua.</string>
 	<string name="vibrate">Vibrar ao detectar</string>
 	<string name="vibrate_summary">Ative esta opção se quiser que seu dispositivo vibre ao reconhecer um código.</string>
-	<string name="beep">Fazer um \'beep\' ao reconhecer</string>
-	<string name="beep_summary">Ative esta opção se quiser se quer que seu dispositivo faça um \'beep\' ao reconhecer um código.</string>
+	<string name="beep">Tocar um \'beep\' ao reconhecer</string>
+	<string name="beep_summary">Ative esta opção se quiser se quer que seu dispositivo faça um som de \'beep\' ao reconhecer um código.</string>
 	<string name="beep_tone">Tom do beep</string>
 	<string name="tone_cdma_confirm">Confirmação CDMA</string>
 	<string name="tone_sup_confirm">Confirmação de supervisão de chamada</string>
@@ -95,12 +106,12 @@
 	<string name="tone_prop_beep2">Duplo beep comum</string>
 	<string name="use_history">Salvar histórico de digitalizações</string>
 	<string name="use_history_summary">Salve códigos reconhecidos em seu dispositivo.</string>
-	<string name="ignore_duplicates">Ignorar duplicaçõe</string>
-	<string name="ignore_consecutive_duplicates">Duplicações consecutivas</string>
-	<string name="ignore_any_duplicates">Qualquer duplicação</string>
-	<string name="accept_duplicates">Aceitar duplicações</string>
+	<string name="ignore_duplicates">Ignorar duplicata</string>
+	<string name="ignore_consecutive_duplicates">Duplicatas consecutivas</string>
+	<string name="ignore_any_duplicates">Quaisquer duplicatas</string>
+	<string name="accept_duplicates">Aceitar duplicatas</string>
 	<string name="open_immediately">Abrir imediatamente</string>
-	<string name="open_immediately_summary">Pular a inspeção e abrir um conteúdo instantaneamente. Quando ativado, pode abrir conteúdo malicioso.</string>
+	<string name="open_immediately_summary">Pular a inspeção e abrir um conteúdo instantaneamente. Pode abrir conteúdo malicioso se ativado.</string>
 	<string name="copy_immediately">Botar na área de transferência</string>
 	<string name="copy_immediately_summary">Copiar automaticamente para a área de transferência o conteúdo digitalizado. Note que outros apps podem examinar sua área de transferência em segundo plano.</string>
 	<string name="show_meta_data">Mostrar metadados</string>
@@ -134,14 +145,14 @@
 	<string name="test_url">Testar a URL</string>
 	<string name="send_scan_bluetooth">Encaminhar digitalizações com Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Ative para encaminhar digitalizações a um determinado host Bluetooth.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
+	<string name="send_scan_bluetooth_host">Anfitrião</string>
 	<string name="no_bluetooth_hosts_paired">Nenhum Host Pareado</string>
 	<string name="bluetooth_connect_fail">Não foi possível conectar com o dispositivo Bluetooth.</string>
 	<string name="bluetooth_send_fail">Não foi possível enviar para o dispositivo Bluetooth.</string>
 	<string name="bluetooth_send_success">Envio Bluetooth com sucesso.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Geração</string>
+	<string name="brighten_screen">Clarear tela</string>
+	<string name="brighten_screen_summary">Aumente o brilho do monitor para melhorar a leitura do código de barras.</string>
 	<string name="really_remove_scan">Deseja excluir esta digitalização?</string>
 	<string name="really_remove_all_scans">Deseja excluir todas as digitalizações?</string>
 	<string name="really_remove_selected_scans">Deseja excluir as digitalizações selecionadas?</string>
@@ -206,4 +217,10 @@
 	<string name="wifi_phase2">Método Phase 2</string>
 	<string name="network_suggestions">Sugestões de rede</string>
 	<string name="remove_suggestion">Apagar sugestão</string>
+	<string name="email_to">Destinatário</string>
+	<string name="email_subject">Assunto</string>
+	<string name="email_body">Corpo</string>
+	<string name="scheme">Esquema</string>
+	<string name="host">Host</string>
+	<string name="query">Consulta</string>
 </resources>

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

@@ -1,4 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
+	<string name="welcome">Добро пожаловать!</string>
+	<string name="mode_expert">Расширенный</string>
+	<string name="mode_expert_description">Я хочу проверять считанные данные и открывать их вручную.</string>
+	<string name="mode_simple">Простой</string>
+	<string name="mode_simple_description">Я просто хочу сканировать штрих-коды и сразу их открывать.</string>
 	<string name="camera_error">Невозможно получить доступ к камере, попробуйте ещё раз</string>
 	<string name="scan_code">Сканировать штрих-код</string>
 	<string name="compose_barcode">Создать штрих-код</string>
@@ -12,10 +18,10 @@
 		<item quantity="other">%2$d символов, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Уровень коррекции ошибок</string>
-	<string name="error_correction_level_l" formatted="false">Низкий (≈7&#37; исправлений)</string>
-	<string name="error_correction_level_m" formatted="false">Средний (≈15&#37; исправлений)</string>
-	<string name="error_correction_level_q" formatted="false">Квартиль (≈25&#37; исправлений)</string>
-	<string name="error_correction_level_h" formatted="false">Высокий (≈30&#37; исправлений)</string>
+	<string name="error_correction_level_l" formatted="false">Низкий (≈7% исправлений)</string>
+	<string name="error_correction_level_m" formatted="false">Средний (≈15% исправлений)</string>
+	<string name="error_correction_level_q" formatted="false">Квартиль (≈25% исправлений)</string>
+	<string name="error_correction_level_h" formatted="false">Высокий (≈30% исправлений)</string>
 	<string name="label">Метка</string>
 	<string name="colors">Цвета</string>
 	<string name="colors_black_on_white">Чёрный на белом</string>
@@ -31,21 +37,23 @@
 	<string name="gtin_add_on">Расширение UPC EAN</string>
 	<string name="barcode_version_number">Версия</string>
 	<string name="qr_version_and_modules">%1$s (модули: %2$d)</string>
+	<string name="qr_data_mask">Маска данных</string>
 	<string name="toggle_flash">Включить вспышку</string>
 	<string name="error_flash">Ошибка при переключении вспышки</string>
 	<string name="share">Поделиться</string>
 	<string name="share_file">Поделиться файлом</string>
 	<string name="share_as">Поделиться как?</string>
 	<string name="copy_to_clipboard">Скопировать в буфер обмена</string>
+	<string name="copy_as_deeplink">Копировать как диплинк</string>
 	<string name="copied_to_clipboard">Скопировано в буфер обмена</string>
 	<string name="copy_password">Скопировать пароль в буфер обмена</string>
-	<string name="copied_password_to_clipboard">Пароль скопирован в буфер обмена</string>
 	<string name="open_url">Открыть URL</string>
 	<string name="cannot_resolve_action">Не найдено приложение для этого действия</string>
 	<string name="pick_search_engine">Выберите поисковую систему</string>
 	<string name="format">Формат</string>
 	<string name="size_width_by_height">Размер в пикселях: %1$d×%2$d</string>
-	<string name="margin_size">Отступ в пикселях: %1$d</string>
+	<string name="size_no_magnification">Без увеличения</string>
+	<string name="add_quiet_zone">Добавить отступы</string>
 	<string name="input_content_here">Введите текст здесь</string>
 	<string name="unescape">Раскрывать управляющие последовательности</string>
 	<string name="encode">Создать</string>
@@ -59,6 +67,9 @@
 	<string name="bulk_mode_delay">Задержка непрерывного сканирования</string>
 	<string name="restrict_format">Исключить формат</string>
 	<string name="remove_restriction">Включить формат</string>
+	<string name="find_code">Поиск кода</string>
+	<string name="find_code_with_content">Что искать?</string>
+	<string name="find_code_hint">Введите поисковый запрос</string>
 	<string name="scan_format">Сканировать %s</string>
 	<string name="quarter_second">Четверть секунды</string>
 	<string name="half_second">Полсекунды</string>
@@ -129,8 +140,8 @@
 	<string name="send_scan_type">Тип запроса для отправки штрих-кодов</string>
 	<string name="send_type_get_add_content">GET с добавлением содержимого</string>
 	<string name="send_type_get_query_string">GET с полной строкой параметров запроса</string>
-	<string name="send_type_post_form">POST-приложение/x-www-form-urlencoded</string>
-	<string name="send_type_post_json">POST-приложение/json</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Открыть во внешнем браузере</string>
 	<string name="test_url">Проверка URL</string>
 	<string name="send_scan_bluetooth">Отправлять сканирования по bluetooth</string>
@@ -153,10 +164,10 @@
 	<string name="enter_name">Укажите название сканирования</string>
 	<string name="enter_name_hint">Название сканирования</string>
 	<string name="no_barcode_found">Штрих-код не найден</string>
-	<string name="pick_list_separator">Разделение элементов списка</string>
+    <string name="pick_list_separator">Как разделять пункты списка?</string>
 	<string name="separator_line_break">Разрыв строки</string>
 	<string name="separator_ruler">Горизонтальная линия</string>
-	<string name="save_as_file_name">Сохранить файл как</string>
+    <string name="save_as_file_name">Сохранить в папке скачиваний Downloads?</string>
 	<string name="file_name">Имя файла</string>
 	<string name="error_saving_file">Невозможно сохранить файл</string>
 	<string name="error_file_exists">Файл уже существует</string>
@@ -179,7 +190,7 @@
 	<string name="add_to_history">Добавить в историю</string>
 	<string name="added_to_history">Добавлено в историю</string>
 	<string name="export_to_file">Экспортировать в файл</string>
-	<string name="export_as">Формат файла экспорта</string>
+    <string name="export_as">Экспортировать как?</string>
 	<string name="export_csv_comma">CSV (разделитель – запятая)</string>
 	<string name="export_csv_semicolon">CSV (разделитель – точка с запятой)</string>
 	<string name="export_json">JSON</string>
@@ -207,4 +218,10 @@
 	<string name="wifi_phase2">Двухэтапный метод</string>
 	<string name="network_suggestions">Сетевые предложения</string>
 	<string name="remove_suggestion">Удалить предложение</string>
+	<string name="email_to">Получатель</string>
+	<string name="email_subject">Тема</string>
+	<string name="email_body">Текст</string>
+	<string name="scheme">Схема</string>
+	<string name="host">Хост</string>
+	<string name="query">Запрос</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Hoş geldiniz!</string>
+	<string name="mode_expert">Gelişmiş</string>
+	<string name="mode_expert_description">Okunan içeriği kontrol etmek ve manuel olarak açmak istiyorum.</string>
+	<string name="mode_simple">Basit</string>
+	<string name="mode_simple_description">Barkodları taramak ve hemen açmak istiyorum.</string>
 	<string name="camera_error">Kameraya erişilemiyor, lütfen yeniden deneyin</string>
 	<string name="scan_code">Kod tara</string>
 	<string name="compose_barcode">Barkod oluştur</string>
@@ -29,21 +34,23 @@
 	<string name="gtin_add_on">UPC EAN eklentisi</string>
 	<string name="barcode_version_number">Sürüm</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modül)</string>
+	<string name="qr_data_mask">Veri maskesi</string>
 	<string name="toggle_flash">Flaşı aç</string>
 	<string name="error_flash">Flaş açılırken hata oluştu</string>
 	<string name="share">Paylaş</string>
 	<string name="share_file">Dosya olarak paylaş</string>
 	<string name="share_as">Şöyle paylaş:</string>
 	<string name="copy_to_clipboard">Panoya kopyala</string>
+	<string name="copy_as_deeplink">Derin bağlantı olarak kopyala</string>
 	<string name="copied_to_clipboard">Panoya kopyalandı</string>
 	<string name="copy_password">Parolayı panoya kopyala</string>
-	<string name="copied_password_to_clipboard">Parola panoya kopyalandı</string>
 	<string name="open_url">URL\'yi aç</string>
 	<string name="cannot_resolve_action">Bunu açacak uygulama yok</string>
 	<string name="pick_search_engine">Arama motoru seç</string>
 	<string name="format">Biçim</string>
 	<string name="size_width_by_height">Piksel türünde boyut: %1$d×%2$d</string>
-	<string name="margin_size">Piksel türünde kenar boşluğu: %1$d</string>
+	<string name="size_no_magnification">Büyütme Yok</string>
+	<string name="add_quiet_zone">Sessiz bölge ekle</string>
 	<string name="input_content_here">İçeriği buraya gir</string>
 	<string name="unescape">Kaçış dizilerini genişlet</string>
 	<string name="encode">KODLA</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Sürekli taramalar arasındaki gecikme</string>
 	<string name="restrict_format">Biçimi kısıtla</string>
 	<string name="remove_restriction">Kısıtlamayı kaldır</string>
+	<string name="find_code">Kod bul</string>
+	<string name="find_code_with_content">Ne içerik?</string>
+	<string name="find_code_hint">Terim girin</string>
 	<string name="scan_format">%s tara</string>
 	<string name="quarter_second">Çeyrek saniye</string>
 	<string name="half_second">Yarım saniye</string>
@@ -94,10 +104,10 @@
 	<string name="tone_prop_beep2">Genel çift bip sesi</string>
 	<string name="use_history">Tarama geçmişini kaydet</string>
 	<string name="use_history_summary">Tanınan kodları aygıtınızda saklayın.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Yinelenenleri Yoksay</string>
 	<string name="ignore_consecutive_duplicates">Yinelemeleri göz ardı et</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Yinelenenleri kabul et</string>
 	<string name="open_immediately">Hemen aç</string>
 	<string name="open_immediately_summary">İncelemeyi atla ve içeriği hemen aç. Eğer etkinse zararlı içerik açılabilir.</string>
 	<string name="copy_immediately">Panoya koy</string>
@@ -106,8 +116,8 @@
 	<string name="show_meta_data_summary">Taranan barkod ile ilgili ek veriyi göster</string>
 	<string name="show_hex_dump">Hex yığınını göster</string>
 	<string name="show_hex_dump_summary">Taranan içeriklerin hex yığınını göster.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">Özet göster</string>
+	<string name="no_checksum">Özet yok</string>
 	<string name="show_recreation">Yeniden oluşturulan barkodu göster</string>
 	<string name="show_recreation_summary">Mümkünse okunan içerikten barkodu yeniden oluştur ve göster.</string>
 	<string name="close_automatically">Kopyala/Paylaş\'tan sonra geri dön</string>
@@ -138,9 +148,9 @@
 	<string name="bluetooth_connect_fail">Bluetooth aygıtına bağlanılamadı.</string>
 	<string name="bluetooth_send_fail">Bluetooth aygıtına gönderilemedi.</string>
 	<string name="bluetooth_send_success">Bluetooth aygıtına gönderildi.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Nesil</string>
+	<string name="brighten_screen">Ekranı parlaklaştır</string>
+	<string name="brighten_screen_summary">Ekran parlaklığını maksimuma ayarlayarak ekrandan barkod okumayı iyileştirin.</string>
 	<string name="really_remove_scan">Tarama gerçekten silinsin mi?</string>
 	<string name="really_remove_all_scans">Tüm taramalar gerçekten silinsin mi?</string>
 	<string name="really_remove_selected_scans">Seçili taramalar gerçekten silinsin mi?</string>
@@ -190,7 +200,7 @@
 	<string name="pick_code_to_scan">Taranacak kod seç</string>
 	<string name="shortcut_decode">Barkod tara</string>
 	<string name="shortcut_encode">Barkod oluştur</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Tarih</string>
 	<string name="shortcut_preferences">Ayarlar</string>
 	<string name="background_request_failed">Arka plan isteği başarısız</string>
 	<string name="entry_type">Tür</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">2. aşama yöntemi</string>
 	<string name="network_suggestions">Ağ önerileri</string>
 	<string name="remove_suggestion">Öneriyi kaldır</string>
+	<string name="email_to">Alıcı</string>
+	<string name="email_subject">Konu</string>
+	<string name="email_body">İçerik</string>
+	<string name="scheme">Düzen</string>
+	<string name="host">Ana Bilgisayar</string>
+	<string name="query">Sorgu</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Ласкаво просимо!</string>
+	<string name="mode_expert">Розширений</string>
+	<string name="mode_expert_description">Я хочу перевірити прочитаний вміст і відкрити його вручну.</string>
+	<string name="mode_simple">Простий</string>
+	<string name="mode_simple_description">Я просто хочу сканувати штрих-коди і відкривати їх одразу.</string>
 	<string name="camera_error">Неможливо отримати доступ до камери, будь ласка, спробуйте ще раз</string>
 	<string name="scan_code">Сканування коду</string>
 	<string name="compose_barcode">Створити штрих-код</string>
@@ -30,21 +35,23 @@
 	<string name="gtin_add_on">Розширення UPC EAN</string>
 	<string name="barcode_version_number">Версія</string>
 	<string name="qr_version_and_modules">%1$s (%2$d модулі)</string>
+	<string name="qr_data_mask">Маска даних</string>
 	<string name="toggle_flash">Увімкнути спалах</string>
 	<string name="error_flash">Помилка під час увімкнення спалаху</string>
 	<string name="share">Поділитися</string>
 	<string name="share_file">Поділитися файлом</string>
 	<string name="share_as">Поділитися як?</string>
 	<string name="copy_to_clipboard">Копіювати у буфер обміну</string>
+	<string name="copy_as_deeplink">Копіювати як диплінк</string>
 	<string name="copied_to_clipboard">Скопійовано у буфер обміну</string>
 	<string name="copy_password">Копіювати пароль у буфер обміну</string>
-	<string name="copied_password_to_clipboard">Пароль скопійовано у буфер обміну</string>
 	<string name="open_url">Відкрити URL-адресу</string>
 	<string name="cannot_resolve_action">Жодey додаток не може цього відкрити</string>
 	<string name="pick_search_engine">Вибрати пошукову систему</string>
 	<string name="format">Формат</string>
 	<string name="size_width_by_height">Розмір у пікселях: %1$d×%2$d</string>
-	<string name="margin_size">Відступ у пікселях: %1$d</string>
+	<string name="size_no_magnification">Без збільшення</string>
+	<string name="add_quiet_zone">Додати тиху зону</string>
 	<string name="input_content_here">Введіть вміст сюди</string>
 	<string name="unescape">Розгорнути спеціальні послідовності</string>
 	<string name="encode">КОДУВАТИ</string>
@@ -58,6 +65,9 @@
 	<string name="bulk_mode_delay">Затримка між безперервним скануванням</string>
 	<string name="restrict_format">Обмежити формат</string>
 	<string name="remove_restriction">Скасувати обмеження</string>
+	<string name="find_code">Знайти код</string>
+	<string name="find_code_with_content">Що саме вміст?</string>
+	<string name="find_code_hint">Введіть термін</string>
 	<string name="scan_format">Сканувати %s</string>
 	<string name="quarter_second">Чверть секунди</string>
 	<string name="half_second">Півсекунди</string>
@@ -206,4 +216,10 @@
 	<string name="wifi_phase2">Phase 2 метод</string>
 	<string name="network_suggestions">Мережеві пропозиції</string>
 	<string name="remove_suggestion">Видалити пропозицію</string>
+	<string name="email_to">Одержувач</string>
+	<string name="email_subject">Тема</string>
+	<string name="email_body">Тіло листа</string>
+	<string name="scheme">Схема</string>
+	<string name="host">Хост</string>
+	<string name="query">Запит</string>
 </resources>

app/src/main/res/values-v35/bools.xml

@@ -0,0 +1,3 @@
+<resources>
+	<bool name="fitsSystemWindows">false</bool>
+</resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">Chào mừng!</string>
+	<string name="mode_expert">Nâng cao</string>
+	<string name="mode_expert_description">Tôi muốn kiểm tra nội dung đã đọc và mở nó theo cách thủ công.</string>
+	<string name="mode_simple">Đơn giản</string>
+	<string name="mode_simple_description">Tôi chỉ muốn quét mã vạch và mở ngay lập tức.</string>
 	<string name="camera_error">Không thể mở camera, hãy thử lại</string>
 	<string name="scan_code">Quét mã</string>
 	<string name="compose_barcode">Tạo mã vạch</string>
@@ -13,38 +18,40 @@
 	<string name="error_correction_level_m" formatted="false">Trung bình (sửa ~15&#37;)</string>
 	<string name="error_correction_level_q" formatted="false">Một phần tư (sửa ~25&#37;)</string>
 	<string name="error_correction_level_h" formatted="false">Cao (sửa ~30&#37;)</string>
-	<string name="label">Label</string>
-	<string name="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="label">Nhãn</string>
+	<string name="colors">Màu nền và màu chữ</string>
+	<string name="colors_black_on_white">Đen trên trắng</string>
+	<string name="colors_white_on_black">Trắng trên đen</string>
+	<string name="colors_black_on_transparent">Đen trên trong suốt</string>
+	<string name="colors_white_on_transparent">Trắng trên trong suốt</string>
+	<string name="sequence_size">Kích thước chuỗi</string>
+	<string name="sequence_index">Chỉ mục chuỗi</string>
+	<string name="sequence_id">ID chuỗi</string>
 	<string name="gtin_issue_number">Số</string>
 	<string name="gtin_country">Có thể được sản xuất ở nước</string>
 	<string name="gtin_price">Giá được gợi ý</string>
 	<string name="gtin_add_on">Phần mở rộng UPC EAN</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">Phiên bản</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Mặt nạ dữ liệu</string>
 	<string name="toggle_flash">Bật/tắt đèn</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Lỗi khi chuyển đổi đèn flash</string>
 	<string name="share">Chia sẻ</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Chia sẻ dưới dạng tập tin</string>
 	<string name="share_as">Chia sẻ dưới định dạng?</string>
 	<string name="copy_to_clipboard">Sao chép</string>
+	<string name="copy_as_deeplink">Sao chép dưới dạng liên kết sâu</string>
 	<string name="copied_to_clipboard">Đã sao chép</string>
 	<string name="copy_password">Sao chép mật khẩu</string>
-	<string name="copied_password_to_clipboard">Đã sao chép mật khẩu</string>
 	<string name="open_url">Mở đường dẫn</string>
 	<string name="cannot_resolve_action">Không có ứng dụng nào mở được nội dung này</string>
 	<string name="pick_search_engine">Chọn một trình tìm kiếm</string>
 	<string name="format">Định dạng</string>
 	<string name="size_width_by_height">Kích cỡ theo pixel: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">Không phóng to</string>
+	<string name="add_quiet_zone">Thêm vùng yên tĩnh</string>
 	<string name="input_content_here">Nhập nội dung vào đây</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Mở rộng chuỗi thoát</string>
 	<string name="encode">MÃ HOÁ</string>
 	<string name="error_no_content">Thiếu nội dung</string>
 	<string name="error_encoding_barcode">Không thể tạo ra mã vạch</string>
@@ -54,9 +61,12 @@
 	<string name="bulk_mode">Quét liên tục</string>
 	<string name="bulk_mode_summary">Luôn quét liên tục.</string>
 	<string name="bulk_mode_delay">Thời gian giữa các lần quét</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
+	<string name="restrict_format">Hạn chế định dạng</string>
+	<string name="remove_restriction">Xóa hạn chế</string>
+	<string name="find_code">Tìm mã</string>
+	<string name="find_code_with_content">Nội dung là gì?</string>
+	<string name="find_code_hint">Nhập một thuật ngữ</string>
+	<string name="scan_format">Quét %s</string>
 	<string name="quarter_second">Một phần tư giây</string>
 	<string name="half_second">Nửa giây</string>
 	<string name="a_second">Một giây</string>
@@ -82,21 +92,21 @@
 	<string name="show_toast_in_bulk_mode_summary">Hiện nhanh dữ liệu trong khi quét liên tục.</string>
 	<string name="vibrate">Rung khi xác định được mã</string>
 	<string name="vibrate_summary">Kích hoạt nếu bạn muốn máy của bạn rung khi nhận dạng được mã.</string>
-	<string name="beep">Beep on detection</string>
-	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
-	<string name="beep_tone">Beep tone</string>
-	<string name="tone_cdma_confirm">CDMA confirm</string>
-	<string name="tone_sup_confirm">Call supervisory confirm</string>
-	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
-	<string name="tone_prop_ack">Positive acknowledgment</string>
-	<string name="tone_prop_beep">General beep</string>
-	<string name="tone_prop_beep2">General double beep</string>
+	<string name="beep">Âm thanh khi phát hiện</string>
+	<string name="beep_summary">Bật tính năng này nếu bạn muốn thiết bị phát ra tiếng beep khi một mã được nhận diện.</string>
+	<string name="beep_tone">Âm thanh bíp</string>
+	<string name="tone_cdma_confirm">Xác nhận CDMA</string>
+	<string name="tone_sup_confirm">Xác nhận giám sát cuộc gọi</string>
+	<string name="tone_sup_radio_ack">Xác nhận đường truyền radio giám sát cuộc gọi</string>
+	<string name="tone_prop_ack">Phản hồi tích cực</string>
+	<string name="tone_prop_beep">Âm thanh chung</string>
+	<string name="tone_prop_beep2">Âm thanh chung kép beep</string>
 	<string name="use_history">Lưu lịch sử quét</string>
 	<string name="use_history_summary">Lưu mã đã nhận dạng được trên máy của bạn.</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">Bỏ qua bản sao</string>
 	<string name="ignore_consecutive_duplicates">Bỏ qua trùng lặp</string>
 	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="accept_duplicates">Chấp nhận bản sao</string>
 	<string name="open_immediately">Mở ngay</string>
 	<string name="open_immediately_summary">Bỏ qua kiểm tra và mở ngay nội dung. Có thể mở nội dung nguy hiểm nếu kích hoạt.</string>
 	<string name="copy_immediately">Sao chép kết quả</string>
@@ -105,10 +115,10 @@
 	<string name="show_meta_data_summary">Hiện thêm thông tin về mã vạch quét được.</string>
 	<string name="show_hex_dump">Hiện mã thập lục phân</string>
 	<string name="show_hex_dump_summary">Hiện mã thập lục phân từ mã quét được.</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
-	<string name="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_checksum">Hiển thị checksum</string>
+	<string name="no_checksum">Không có bản kiểm tra</string>
+	<string name="show_recreation">Hiển thị mã vạch tái tạo</string>
+	<string name="show_recreation_summary">Tạo lại và hiển thị mã vạch từ nội dung đã đọc nếu có thể.</string>
 	<string name="close_automatically">Quay lại sau khi Sao chép/Chia sẻ</string>
 	<string name="close_automatically_summary">Tự động quay trở về màn hình quét sao khi sao chép hoặc chia sẻ nội dung đọc được.</string>
 	<string name="default_search_engine">Mở dữ liệu không xác định bằng</string>
@@ -120,7 +130,7 @@
 	<string name="clear_network_suggestions_success">Gợi ý mạng đã xoá</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Không còn gì để xoá</string>
 	<string name="send_category">Chuyển tới</string>
-	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active">Chuyển tiếp quét</string>
 	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
 	<string name="send_scan_url">Gửi tất cả mã quét được đến URL</string>
 	<string name="send_scan_type">Kiểu yêu cầu đối với mỗi lần quét</string>
@@ -128,18 +138,18 @@
 	<string name="send_type_get_query_string">GET với xâu truy vấn đầy đủ</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="send_type_external_browser">Mở trong trình duyệt bên ngoài</string>
 	<string name="test_url">URL thử</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</string>
+	<string name="send_scan_bluetooth">Chuyển tiếp quét với Bluetooth</string>
 	<string name="send_scan_bluetooth_summary">Enable to forwards scans to a given Bluetooth host.</string>
-	<string name="send_scan_bluetooth_host">Host</string>
-	<string name="no_bluetooth_hosts_paired">No Hosts Paired</string>
+	<string name="send_scan_bluetooth_host">Máy chủ</string>
+	<string name="no_bluetooth_hosts_paired">Không có Host nào được kết nối</string>
 	<string name="bluetooth_connect_fail">Could not connect to bluetooth device.</string>
 	<string name="bluetooth_send_fail">Could not send to bluetooth device.</string>
 	<string name="bluetooth_send_success">Successful bluetooth send.</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">Thế hệ</string>
+	<string name="brighten_screen">Tăng độ sáng màn hình</string>
+	<string name="brighten_screen_summary">Đặt độ sáng tối đa để tăng cường quét mã vạch từ màn hình.</string>
 	<string name="really_remove_scan">Thật sự xoá lần quét này?</string>
 	<string name="really_remove_all_scans">Thật sự xoá tất cả các lần quét?</string>
 	<string name="really_remove_selected_scans">Thật sự xoá các lần quét được chọn?</string>
@@ -173,8 +183,8 @@
 	<string name="otpauth_add">Thêm xác thực hai bước</string>
 	<string name="search_web">Tìm kiếm web</string>
 	<string name="search_scan">Tìm kiếm lần quét</string>
-	<string name="add_to_history">Add to history</string>
-	<string name="added_to_history">Added to history</string>
+	<string name="add_to_history">Thêm vào lịch sử</string>
+	<string name="added_to_history">Đã thêm vào lịch sử</string>
 	<string name="export_to_file">Xuất thành tệp</string>
 	<string name="export_as">Xuất dưói dạng?</string>
 	<string name="export_csv_comma">Tệp CSV với dấu phẩy</string>
@@ -183,25 +193,31 @@
 	<string name="export_database">Cơ sở dữ liệu SQLite</string>
 	<string name="saved_in_downloads">Lưu vào Downloads</string>
 	<string name="rotate_image_cw">Quay ảnh theo chiều kim đồng hồ</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">Chuyển đổi quay tự do</string>
+	<string name="pick_file">Chọn một tập tin</string>
 	<string name="pick_image_file">Chọn tệp ảnh</string>
 	<string name="pick_code_to_scan">Chọn mã để quét</string>
 	<string name="shortcut_decode">Quét mã vạch</string>
 	<string name="shortcut_encode">Tạo mã vạch</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">Lịch sử</string>
 	<string name="shortcut_preferences">Cài đặt</string>
 	<string name="background_request_failed">Yêu cầu nền thất bại</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="entry_type">Loại</string>
+	<string name="wifi_network">Mạng Wi-Fi</string>
+	<string name="wifi_ssid">Tên</string>
+	<string name="wifi_type">Loại xác thực</string>
+	<string name="wifi_password">Mật khẩu</string>
+	<string name="wifi_hidden">Mạng ẩn</string>
+	<string name="wifi_eap">Phương pháp EAP</string>
+	<string name="wifi_anonymous_identity">Danh tính ẩn danh</string>
+	<string name="wifi_identity">Nhận diện</string>
+	<string name="wifi_phase2">Phương pháp giai đoạn 2</string>
+	<string name="network_suggestions">Đề xuất mạng</string>
+	<string name="remove_suggestion">Xóa gợi ý</string>
+	<string name="email_to">Người nhận</string>
+	<string name="email_subject">Chủ đề</string>
+	<string name="email_body">Nội dung</string>
+	<string name="scheme">Kế hoạch</string>
+	<string name="host">Chủ nhà</string>
+	<string name="query">Truy vấn</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">欢迎！</string>
+	<string name="mode_expert">高级</string>
+	<string name="mode_expert_description">我想检查读取的内容并手动打开。</string>
+	<string name="mode_simple">简单</string>
+	<string name="mode_simple_description">我只想扫描条形码并立即打开。</string>
 	<string name="camera_error">无法访问相机，请重试</string>
 	<string name="scan_code">扫码</string>
 	<string name="compose_barcode">生成条码</string>
@@ -13,7 +18,7 @@
 	<string name="error_correction_level_m" formatted="false">中 (~15% 准确度)</string>
 	<string name="error_correction_level_q" formatted="false">较高 (~25% 准确度)</string>
 	<string name="error_correction_level_h" formatted="false">高 (~30% 准确度)</string>
-	<string name="label">Label</string>
+	<string name="label">标签</string>
 	<string name="colors">前景和背景</string>
 	<string name="colors_black_on_white">白底黑字</string>
 	<string name="colors_white_on_black">黑底白字</string>
@@ -28,21 +33,23 @@
 	<string name="gtin_add_on">UPC EAN 扩展</string>
 	<string name="barcode_version_number">版本</string>
 	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">数据蒙版</string>
 	<string name="toggle_flash">开关闪光灯</string>
 	<string name="error_flash">开关闪光灯出错</string>
 	<string name="share">分享</string>
 	<string name="share_file">以文件形式分享</string>
 	<string name="share_as">以何种方式分享？</string>
 	<string name="copy_to_clipboard">复制到剪贴板</string>
+	<string name="copy_as_deeplink">复制为深层链接</string>
 	<string name="copied_to_clipboard">已复制到剪贴板</string>
 	<string name="copy_password">复制密码到剪贴板</string>
-	<string name="copied_password_to_clipboard">已复制密码到剪贴板</string>
 	<string name="open_url">打开链接</string>
 	<string name="cannot_resolve_action">没有应用可以打开它</string>
 	<string name="pick_search_engine">选择一个搜索引擎</string>
 	<string name="format">编码格式</string>
 	<string name="size_width_by_height">图片尺寸: %1$d×%2$d</string>
-	<string name="margin_size">边距（像素）：%1$d</string>
+	<string name="size_no_magnification">无放大</string>
+	<string name="add_quiet_zone">添加安静区</string>
 	<string name="input_content_here">在这里输入内容</string>
 	<string name="unescape">展开转义字符</string>
 	<string name="encode">编码</string>
@@ -56,6 +63,9 @@
 	<string name="bulk_mode_delay">连续扫描之间的延迟</string>
 	<string name="restrict_format">严格模式（扫描指定编码格式）</string>
 	<string name="remove_restriction">解除限制</string>
+	<string name="find_code">找码</string>
+	<string name="find_code_with_content">什么内容？</string>
+	<string name="find_code_hint">输入一个术语</string>
 	<string name="scan_format">扫描 %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
@@ -137,9 +147,9 @@
 	<string name="bluetooth_connect_fail">无法连接蓝牙设备。</string>
 	<string name="bluetooth_send_fail">无法将结果发送至蓝牙设备。</string>
 	<string name="bluetooth_send_success">已通过蓝牙发送。</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">生成</string>
+	<string name="brighten_screen">点亮屏幕</string>
+	<string name="brighten_screen_summary">将屏幕亮度设为最大，以增强从屏幕扫描的效果。</string>
 	<string name="really_remove_scan">确定删除记录？</string>
 	<string name="really_remove_all_scans">确定删除全部记录？</string>
 	<string name="really_remove_selected_scans">确定删除所选记录？</string>
@@ -204,4 +214,10 @@
 	<string name="wifi_phase2">阶段 2 方法</string>
 	<string name="network_suggestions">网络建议</string>
 	<string name="remove_suggestion">删除建议</string>
+	<string name="email_to">收件人</string>
+	<string name="email_subject">主题</string>
+	<string name="email_body">正文</string>
+	<string name="scheme">方案</string>
+	<string name="host">主机</string>
+	<string name="query">查询</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources>
+	<string name="welcome">歡迎！</string>
+	<string name="mode_expert">進階</string>
+	<string name="mode_expert_description">我想檢查讀取的內容並手動開啟。</string>
+	<string name="mode_simple">簡單</string>
+	<string name="mode_simple_description">我只想掃描條碼並立即開啟。</string>
 	<string name="camera_error">無法開啟相機，請再試一次</string>
 	<string name="scan_code">掃描條碼</string>
 	<string name="compose_barcode">製作條碼</string>
@@ -28,21 +33,23 @@
 	<string name="gtin_add_on">UPC EAN 擴充</string>
 	<string name="barcode_version_number">版本</string>
 	<string name="qr_version_and_modules">%1$s (%2$d 模組)</string>
+	<string name="qr_data_mask">資料遮罩</string>
 	<string name="toggle_flash">控制閃光燈</string>
 	<string name="error_flash">控制閃光燈時發生錯誤</string>
 	<string name="share">分享</string>
 	<string name="share_file">分享檔案</string>
 	<string name="share_as">您要以何種方式分享？</string>
 	<string name="copy_to_clipboard">複製到剪貼簿</string>
+	<string name="copy_as_deeplink">複製為深層連結</string>
 	<string name="copied_to_clipboard">已複製到剪貼簿</string>
 	<string name="copy_password">複製密碼到剪貼簿</string>
-	<string name="copied_password_to_clipboard">已複製密碼到剪貼簿</string>
 	<string name="open_url">開啟連結</string>
 	<string name="cannot_resolve_action">沒有可開啟這個項目的應用程式</string>
 	<string name="pick_search_engine">選擇一個搜尋引擎</string>
 	<string name="format">格式</string>
 	<string name="size_width_by_height">圖片尺寸: %1$d×%2$d</string>
-	<string name="margin_size">間距大小: %1$d</string>
+	<string name="size_no_magnification">不擴大</string>
+	<string name="add_quiet_zone">新增空白邊界</string>
 	<string name="input_content_here">請在這裡輸入內容</string>
 	<string name="unescape">展開逸出序列</string>
 	<string name="encode">編碼</string>
@@ -55,7 +62,10 @@
 	<string name="bulk_mode_summary">始終開啟連續掃描</string>
 	<string name="bulk_mode_delay">連續掃描間的延遲</string>
 	<string name="restrict_format">限制格式</string>
-	<string name="remove_restriction">刪除限制</string>
+	<string name="remove_restriction">移除限制</string>
+	<string name="find_code">尋找代碼</string>
+	<string name="find_code_with_content">什麼內容？</string>
+	<string name="find_code_hint">輸入一個術語</string>
 	<string name="scan_format">掃描 %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
@@ -93,10 +103,10 @@
 	<string name="tone_prop_beep2">標準連續嗶聲</string>
 	<string name="use_history">儲存掃描記錄</string>
 	<string name="use_history_summary">在本機儲存掃描記錄</string>
-	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_duplicates">略過重複項目</string>
 	<string name="ignore_consecutive_duplicates">不儲存重複歷史記錄</string>
-	<string name="ignore_any_duplicates">Ignore any duplicates</string>
-	<string name="accept_duplicates">Accept duplicates</string>
+	<string name="ignore_any_duplicates">略過任何重複項目</string>
+	<string name="accept_duplicates">接受重複</string>
 	<string name="open_immediately">立即開啟</string>
 	<string name="open_immediately_summary">跳過檢查並立即開啟。可能會開啟有害內容</string>
 	<string name="copy_immediately">自動複製掃描結果到剪貼簿</string>
@@ -105,10 +115,10 @@
 	<string name="show_meta_data_summary">顯示已掃描條碼的額外資訊</string>
 	<string name="show_hex_dump">顯示 Hex dump</string>
 	<string name="show_hex_dump_summary">顯示已掃描條碼的十六進位轉儲資訊</string>
-	<string name="show_checksum">Show checksum</string>
-	<string name="no_checksum">No checksum</string>
+	<string name="show_checksum">顯示校驗和</string>
+	<string name="no_checksum">無檢查碼</string>
 	<string name="show_recreation">顯示重新產生的條碼</string>
-	<string name="show_recreation_summary">如果可以，從讀取內容中重新建立並顯示條碼</string>
+	<string name="show_recreation_summary">盡可能從讀取內容中重新建立並顯示條碼</string>
 	<string name="close_automatically">複製 / 分享後自動返回</string>
 	<string name="close_automatically_summary">複製或分享讀取的內容後自動返回掃描畫面</string>
 	<string name="default_search_engine">開啟未知資料的方式</string>
@@ -137,9 +147,9 @@
 	<string name="bluetooth_connect_fail">無法連線到藍牙裝置</string>
 	<string name="bluetooth_send_fail">無法傳送到藍牙裝置</string>
 	<string name="bluetooth_send_success">藍牙傳送完成</string>
-	<string name="generation_category">Generation</string>
-	<string name="brighten_screen">Brighten screen</string>
-	<string name="brighten_screen_summary">Set brightness to maximum to enhance scanning a barcode from the screen.</string>
+	<string name="generation_category">世代</string>
+	<string name="brighten_screen">亮螢幕</string>
+	<string name="brighten_screen_summary">將亮度調至最大以增強從螢幕掃描條碼。</string>
 	<string name="really_remove_scan">確定刪除記錄？</string>
 	<string name="really_remove_all_scans">確定要刪除所有掃描記錄？</string>
 	<string name="really_remove_selected_scans">確定要刪除選擇的掃描記錄？</string>
@@ -189,7 +199,7 @@
 	<string name="pick_code_to_scan">選擇要掃描的條碼</string>
 	<string name="shortcut_decode">掃描條碼</string>
 	<string name="shortcut_encode">建立條碼</string>
-	<string name="shortcut_history">History</string>
+	<string name="shortcut_history">歷史</string>
 	<string name="shortcut_preferences">設定</string>
 	<string name="background_request_failed">背景請求失敗</string>
 	<string name="entry_type">類型</string>
@@ -204,4 +214,10 @@
 	<string name="wifi_phase2">Phase 2 方式</string>
 	<string name="network_suggestions">網路建議</string>
 	<string name="remove_suggestion">移除建議</string>
+	<string name="email_to">收件者</string>
+	<string name="email_subject">主旨</string>
+	<string name="email_body">內文</string>
+	<string name="scheme">方案</string>
+	<string name="host">主機</string>
+	<string name="query">查詢</string>
 </resources>

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

@@ -0,0 +1,3 @@
+<resources>
+	<bool name="fitsSystemWindows">true</bool>
+</resources>

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

@@ -8,4 +8,55 @@
 	<string name="md5" translatable="false">MD5</string>
 	<string name="sha1" translatable="false">SHA1</string>
 	<string name="sha256" translatable="false">SHA256</string>
+	<string name="idl_vehicle_class">Vehicle Class</string>
+	<string name="idl_restriction_codes">Restriction Codes</string>
+	<string name="idl_endorsement_codes">Endorsement Codes</string>
+	<string name="idl_date_of_expiry">Date of Expiry</string>
+	<string name="idl_customer_family_name">Customer Family Name</string>
+	<string name="idl_customer_first_name">Customer First Name</string>
+	<string name="idl_customer_first_name_alt">Customer First Name Alt</string>
+	<string name="idl_customer_middle_name">Customer Middle Name</string>
+	<string name="idl_date_of_issue">Date of Issue</string>
+	<string name="idl_date_of_birth">Date of Birth</string>
+	<string name="idl_sex">Sex</string>
+	<string name="idl_eye_color">Eye Color</string>
+	<string name="idl_body_height">Body Height</string>
+	<string name="idl_address_street">Address Street</string>
+	<string name="idl_address_city">Address City</string>
+	<string name="idl_address_jurisdiction_code">Address Jurisdiction Code</string>
+	<string name="idl_address_postal_code">Address Postal Code</string>
+	<string name="idl_customer_id_number">Customer ID Number</string>
+	<string name="idl_document_discriminator">Document Discriminator</string>
+	<string name="idl_country">Country</string>
+	<string name="idl_family_name_truncation">Family Name Truncation</string>
+	<string name="idl_first_name_truncation">First Name Truncation</string>
+	<string name="idl_middle_name_truncation">Middle Name Truncation</string>
+	<string name="idl_address_street_2">Address Street 2</string>
+	<string name="idl_hair_color">Hair Color</string>
+	<string name="idl_place_of_birth">Place of Birth</string>
+	<string name="idl_audit_information">Audit Information</string>
+	<string name="idl_inventory_control_number">Inventory Control Number</string>
+	<string name="idl_alias_family_name">Alias Family Name</string>
+	<string name="idl_alias_given_name">Alias Given Name</string>
+	<string name="idl_alias_suffix_name">Alias Suffix Name</string>
+	<string name="idl_name_suffix">Name Suffix</string>
+	<string name="idl_weight_range">Weight Range</string>
+	<string name="idl_ethnicity">Ethnicity</string>
+	<string name="idl_standard_vehicle_classification">Standard Vehicle Classification</string>
+	<string name="idl_standard_endorsement_code">Standard Endorsement Code</string>
+	<string name="idl_standard_restriction_code">Standard Restriction Code</string>
+	<string name="idl_vehicle_classification_description">Vehicle Classification Description</string>
+	<string name="idl_endorsement_code_description">Endorsement Code Description</string>
+	<string name="idl_restriction_code_description">Restriction Code Description</string>
+	<string name="idl_compliance_type">Compliance Type</string>
+	<string name="idl_card_revision_date">Card Revision Date</string>
+	<string name="idl_hazmat_endorsement_expiration_date">Hazmat Endorsement Expiration Date</string>
+	<string name="idl_limited_duration_document_indicator">Limited Duration Document Indicator</string>
+	<string name="idl_weight_pounds">Weight (Pounds)</string>
+	<string name="idl_weight_kilograms">Weight (Kilograms)</string>
+	<string name="idl_under_18_until_date">Under 18 Until Date</string>
+	<string name="idl_under_19_until_date">Under 19 Until Date</string>
+	<string name="idl_under_21_until_date">Under 21 Until Date</string>
+	<string name="idl_organ_donor_indicator">Organ Donor Indicator</string>
+	<string name="idl_veteran_indicator">Veteran Indicator</string>
 </resources>

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

@@ -1,4 +1,9 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
+	<string name="welcome">Welcome!</string>
+	<string name="mode_expert">Advanced</string>
+	<string name="mode_expert_description">I would like to check the read content and open it manually.</string>
+	<string name="mode_simple">Simple</string>
+	<string name="mode_simple_description">I just want to read barcodes and have them opened immediately.</string>
 	<string name="camera_error">Can\'t access camera, please try again</string>
 	<string name="scan_code">Scan code</string>
 	<string name="compose_barcode">Compose barcode</string>
@@ -29,21 +34,23 @@
 	<string name="gtin_add_on">UPC EAN extension</string>
 	<string name="barcode_version_number">Version</string>
 	<string name="qr_version_and_modules" tools:ignore="PluralsCandidate">%1$s (%2$d modules)</string>
+	<string name="qr_data_mask">Data mask</string>
 	<string name="toggle_flash">Toggle flash</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Share</string>
 	<string name="share_file">Share as file</string>
 	<string name="share_as">Share as?</string>
 	<string name="copy_to_clipboard">Copy to clipboard</string>
+	<string name="copy_as_deeplink">Copy as deeplink</string>
 	<string name="copied_to_clipboard">Copied to clipboard</string>
 	<string name="copy_password">Copy password into clipboard</string>
-	<string name="copied_password_to_clipboard">Password copied to clipboard</string>
 	<string name="open_url">Open URL</string>
 	<string name="cannot_resolve_action">No application can open that</string>
 	<string name="pick_search_engine">Pick a search engine</string>
 	<string name="format">Format</string>
 	<string name="size_width_by_height">Size in pixels: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Input content here</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">ENCODE</string>
@@ -57,6 +64,9 @@
 	<string name="bulk_mode_delay">Delay between continuous scans</string>
 	<string name="restrict_format">Restrict format</string>
 	<string name="remove_restriction">Remove restriction</string>
+	<string name="find_code">Find code</string>
+	<string name="find_code_with_content">What content?</string>
+	<string name="find_code_hint">Enter a term</string>
 	<string name="scan_format">Scan %s</string>
 	<string name="quarter_second">A quarter second</string>
 	<string name="half_second">Half a second</string>
@@ -205,4 +215,10 @@
 	<string name="wifi_phase2">Phase 2 method</string>
 	<string name="network_suggestions">Network suggestions</string>
 	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="email_to">Recipient</string>
+	<string name="email_subject">Subject</string>
+	<string name="email_body">Body</string>
+	<string name="scheme">Scheme</string>
+	<string name="host">Host</string>
+	<string name="query">Query</string>
 </resources>

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

@@ -26,6 +26,26 @@
 		<item name="android:paddingRight">@dimen/button_padding</item>
 		<item name="android:maxLines">1</item>
 	</style>
+	<style name="WelcomeButton" parent="Button">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:background">@drawable/button_welcome</item>
+		<item name="android:padding">24dp</item>
+	</style>
+	<style name="WelcomeButtonText">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:layout_marginBottom">8dp</item>
+		<item name="android:gravity">center</item>
+		<item name="android:textStyle">bold</item>
+		<item name="android:textAppearance">?android:attr/textAppearanceLarge</item>
+	</style>
+	<style name="WelcomeButtonSubText">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">wrap_content</item>
+		<item name="android:gravity">center</item>
+		<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
+	</style>
 	<style name="Spinner">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>

app/src/test/kotlin/de/markusfisch/android/binaryeye/actions/wifi/WifiConnectorTest.kt

@@ -97,6 +97,17 @@ class WifiConnectorTest {
 		assertFalse(info.hidden)
 	}
 
+	@Test
+	fun escapingEmojis() {
+		val info = simpleDataAccessor(
+			"""WIFI:S: ⚡ "Quick-Test, 3.141 @_'🥝/🍉:|:🍉\🥝'_@"\; + })]>!<[({ ⚓ ;;"""
+		)
+		assertEquals(
+			" ⚡ \"Quick-Test, 3.141 @_'🥝/🍉:|:🍉\\🥝'_@\"; + })]>!<[({ ⚓ ",
+			info.ssid
+		)
+	}
+
 	private fun simpleDataAccessor(wifiString: String): WifiConnector.SimpleDataAccessor {
 		val map = WifiConnector.parseMap(wifiString)
 			?: simpleFail("parsing map of valid string fails ($wifiString)")

app/src/test/kotlin/de/markusfisch/android/binaryeye/net/BinaryEyeDeeplinkTest.kt

@@ -0,0 +1,75 @@
+package de.markusfisch.android.binaryeye.net
+
+import junit.framework.TestCase.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.robolectric.RobolectricTestRunner
+
+@RunWith(RobolectricTestRunner::class)
+class BinaryEyeDeeplinkTest {
+
+    @Test
+    fun isScanDeeplinkTests() {
+        // Test for binaryeye://scan
+        assertEquals(true, isScanDeeplink("binaryeye://scan"))
+        assertEquals(true, isScanDeeplink("binaryeye://scan?param=value"))
+        
+        // Test for http://markusfisch.de/BinaryEye
+        assertEquals(true, isScanDeeplink("http://markusfisch.de/BinaryEye"))
+        assertEquals(true, isScanDeeplink("http://markusfisch.de/BinaryEye?param=value"))
+        
+        // Test for https://markusfisch.de/BinaryEye
+        assertEquals(true, isScanDeeplink("https://markusfisch.de/BinaryEye"))
+        assertEquals(true, isScanDeeplink("https://markusfisch.de/BinaryEye?param=value"))
+        
+        // Negative tests
+        assertEquals(false, isScanDeeplink("binaryeye://encode"))
+        assertEquals(false, isScanDeeplink("http://markusfisch.de/encode"))
+        assertEquals(false, isScanDeeplink("https://markusfisch.de/encode"))
+        assertEquals(false, isScanDeeplink("http://example.com"))
+        assertEquals(false, isScanDeeplink(""))
+    }
+
+    @Test
+    fun isEncodeDeeplinkTests() {
+        // Test for binaryeye://encode
+        assertEquals(true, isEncodeDeeplink("binaryeye://encode"))
+        assertEquals(true, isEncodeDeeplink("binaryeye://encode?param=value"))
+        
+        // Test for http://markusfisch.de/encode
+        assertEquals(true, isEncodeDeeplink("http://markusfisch.de/encode"))
+        assertEquals(true, isEncodeDeeplink("http://markusfisch.de/encode?param=value"))
+        
+        // Test for https://markusfisch.de/encode
+        assertEquals(true, isEncodeDeeplink("https://markusfisch.de/encode"))
+        assertEquals(true, isEncodeDeeplink("https://markusfisch.de/encode?param=value"))
+        
+        // Negative tests
+        assertEquals(false, isEncodeDeeplink("binaryeye://scan"))
+        assertEquals(false, isEncodeDeeplink("http://markusfisch.de/BinaryEye"))
+        assertEquals(false, isEncodeDeeplink("https://markusfisch.de/BinaryEye"))
+        assertEquals(false, isEncodeDeeplink("http://example.com"))
+        assertEquals(false, isEncodeDeeplink(""))
+    }
+
+    @Test
+    fun createEncodeDeeplinkTests() {
+        // Basic test
+        assertEquals(
+            "https://markusfisch.de/encode?format=QR_CODE&content=test",
+            createEncodeDeeplink("QR_CODE", "test")
+        )
+        
+        // Test with special characters in content
+        assertEquals(
+            "https://markusfisch.de/encode?format=QR_CODE&content=test%20with%20spaces",
+            createEncodeDeeplink("QR_CODE", "test with spaces")
+        )
+        
+        // Test with different barcode format
+        assertEquals(
+            "https://markusfisch.de/encode?format=CODE_128&content=123456",
+            createEncodeDeeplink("CODE_128", "123456")
+        )
+    }
+}

app/src/test/kotlin/de/markusfisch/android/binaryeye/text/EscapeTest.kt

@@ -6,25 +6,25 @@ import org.junit.Test
 class EscapeTest {
 	@Test
 	fun oneLetter() {
-		assertEquals("foo\\nbar".unescape(), "foo\nbar")
-		assertEquals("foo\\tbar".unescape(), "foo\tbar")
-		assertEquals("\\tfoo\\tbar\\n".unescape(), "\tfoo\tbar\n")
+		assertEquals("foo\nbar", "foo\\nbar".unescape())
+		assertEquals("foo\tbar", "foo\\tbar".unescape())
+		assertEquals("\tfoo\tbar\n", "\\tfoo\\tbar\\n".unescape())
 	}
 
 	@Test
 	fun specialChars() {
-		assertEquals("foo\\\\bar".unescape(), "foo\\bar")
-		assertEquals("foo\\\"bar".unescape(), "foo\"bar")
+		assertEquals("foo\\bar", "foo\\\\bar".unescape())
+		assertEquals("foo\"bar", "foo\\\"bar".unescape())
 	}
 
 	@Test
 	fun hexCode() {
-		assertEquals("\\x48\\x65\\x78".unescape(), "Hex")
-		assertEquals("\\u263A".unescape(), "☺")
+		assertEquals("Hex", "\\x48\\x65\\x78".unescape())
+		assertEquals("☺", "\\u263A".unescape())
 	}
 
 	@Test
 	fun incomplete() {
-		assertEquals("foo\\".unescape(), "foo\\")
+		assertEquals("foo\\", "foo\\".unescape())
 	}
 }

build.gradle

@@ -1,8 +1,8 @@
 buildscript {
 	ext {
-		kotlin_version = '1.9.22'
-		tools_version = '8.4.1'
-		sdk_version = 34
+		kotlin_version = '2.1.0'
+		tools_version = '8.10.0'
+		sdk_version = 35
 		support_version = '25.3.1'
 	}
 

fastlane/metadata/android/ar/changelogs/10.txt

@@ -0,0 +1,2 @@
+* إصلاح المعالجة المسبقة لنظام أندرويد 7+
+* إصلاح الأيقونات التكيفية لنظام أندرويد 8+

fastlane/metadata/android/ar/changelogs/100.txt

@@ -0,0 +1,2 @@
+* إصلاح تحليل المنطقة الزمنية في تواريخ التقويم
+* تحديث الترجمة الفرنسية

fastlane/metadata/android/ar/changelogs/101.txt

@@ -0,0 +1,11 @@
+* الترحيل إلى ZXing-C++ وإضافة دعم لرموز الاستجابة السريعة الصغيرة
+* عمليات مسح متعددة التحديد في قائمة المحفوظات
+* إزالة المحتوى المحدد مسبقًا لاختصار التشفير
+* إظهار إصدار رمز الاستجابة السريعة دائمًا وإزالة الإعدادات
+* إصلاح ترميز النص PDF-417 UTF-8
+* إخفاء المحتوى الحساس من الحافظة
+* إزالة إعداد لغة مخصصة على نظام أندرويد 13+
+* تكثيف إخراج نص الرموز الشريطية التي تم إنشاؤها
+* تحديث الترجمة الروسية
+* تحديث الترجمة الإسبانية
+* إضافة ترجمة فارسية

fastlane/metadata/android/ar/changelogs/102.txt

@@ -0,0 +1 @@
+* إصلاح تكوين برو جارد