Advance version number to 1.64.0

Add a menu item to find a specific barcode
The searched barcode needs to include the given term. Solves #516.
2025-03-09 19:43:00 +01:00 · 2025-03-09 19:09:19 +01:00 · 2025-03-09 14:19:27 +01:00 · 2025-03-09 12:57:23 +01:00 · 2025-03-09 12:56:48 +01:00 · 2025-03-09 12:55:55 +01:00
137 changed files with 3014 additions and 1146 deletions
@@ -1,5 +1,101 @@
 # Change Log

+## 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
+* Update multiple translations
+
+## 1.63.9
+* Export/share as JPEG
+* Ignore "URL:" before URLs in barcode content
+* Fix exporting/sharing multiple history items
+* Update multiple translations
+
+## 1.63.8
+* Add an option to show a checksum for the decoded content
+* Add support for encoding escape sequences for non-printable characters
+* Update Italian translation
+
+## 1.63.7
+* Update ZXingCpp for Aztec Runes
+* Update Italian translation
+
+## 1.63.6
+* Add history shortcut
+* Return Codabar start/stop codes
+* Update French, Russian, Spanish and Ukrainian translations
+
+## 1.63.5
+* Add an option to ignore any duplicates
+* Fix invalid bluetooth connection
+* Update Russian translation
+* Update Ukrainian translation
+
+## 1.63.4
+* Update Chinese translation
+* Improve support for old devices
+
+## 1.63.3
+* Fix SCAN Intent
+
+## 1.63.2
+* Add DX Film Edge barcode format
+* Update Turkish translation
+* Update Ukrainian translation
+
+## 1.63.1
+* Include scan label in exports/shares
+* Update Russian translation
+
+## 1.63.0
+* Edit scan label in decoding screen
+* Add a button to add generated codes to the history
+* Improve scanning from images
+* Improve asking for camera permission
+* Fix margin for recreated barcodes
+* Limit duration of error beep to 1s
+* Update Ukrainian translation
+* Update Spanish translation
+
+## 1.62.3
+* Extend selection with single taps in history listing
+* Update Brazilian Portuguese translation
+
+## 1.62.2
+* Include rMQR Code for updates
+
+## 1.62.1
+* Make rMQR Code selectable
+
+## 1.62.0
+* Add support for rMQR (rectangular Micro QR) Code
+* Share history as a file
+* Only share selected scans from history
+
 ## 1.61.2
 * Fix quick settings tile for Android 14
 * Fix Xiaomi MIUI lockscreen barcode shortcut
@@ -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/
@@ -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]

@@ -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.
@@ -10,6 +10,23 @@ comes in Material Design and can also generate barcodes.
 Binary Eye uses the [ZXing-C++][zxing_cpp] ("Zebra Crossing") barcode
 scanning library.

+If you find this app useful and wish to support its continued development,
+you can [buy me a coffee](https://www.buymeacoffee.com/markusfisch) or
+send some Bitcoin decimals to `bc1q2guk2rpll587aymrfadkdtpq32448x5khk5j8z`.
+
+<a href="https://www.buymeacoffee.com/markusfisch" target="_blank"><img
+	src="https://cdn.buymeacoffee.com/buttons/v2/default-yellow.png"
+	alt="Buy Me A Coffee"
+	style="height: 60px !important;width: 217px !important;"/></a>&nbsp;<a
+	href="https://liberapay.com/markusfisch/" target="_blank"><img
+	src="https://liberapay.com/assets/widgets/donate.svg"
+	alt="Liberapay"
+	style="height: 60px !important"/></a>&nbsp;<a
+	href="https://ko-fi.com/markusfisch" target="_blank"><img
+	src="https://storage.ko-fi.com/cdn/brandasset/kofi_s_tag_dark.png"
+	alt="Ko-fi"
+	style="height: 60px !important"/></a>
+
 ## Screenshots

 <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/screencap-scanning.png"
@@ -36,6 +53,7 @@ ZXing can read the following barcode formats:
 * [CODE 93][code_93]
 * [CODE 128][code_128]
 * [DATA MATRIX][data_matrix]
+* [DX FILM EDGE][dx_film_edge]
 * [EAN 8][ean_8]
 * [EAN 13][ean_13]
 * [ITF][itf]
@@ -43,6 +61,7 @@ ZXing can read the following barcode formats:
 * [PDF417][pdf417]
 * [QR CODE][qr_code]
 * [Micro QR Code][micro_qr_code]
+* [rMQR Code][rmqr_code]
 * [RSS 14][rss]
 * [RSS EXPANDED][rss]
 * [UPC A][upc_a]
@@ -71,7 +90,7 @@ ZXing can generate the following barcode formats:
 You can invoke Binary Eye with a web URI intent from anything that can
 open URIs. There are two options:

-1. [binaryeye://scan](binaryeye://scan)
+1. [binaryeye://scan](binaryeye://scan)       (note: Github Markdown 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
@@ -120,10 +139,12 @@ If you're using AndroidX, this would be the new,
 [recommended way][intent_result]:

 ```kotlin
-class YourActivity : Activity() {
-	private val resultLauncher = registerForActivityResult(StartActivityForResult()) { result ->
-		if (result.resultCode == Activity.RESULT_OK) {
-			val scan = result.data?.getStringExtra("SCAN_RESULT")
+class YourActivity : AppCompatActivity() {
+	private val resultLauncher = registerForActivityResult(
+		ActivityResultContracts.StartActivityForResult()
+	) { result ->
+		if (result.resultCode == RESULT_OK) {
+			val content = result.data?.getStringExtra("SCAN_RESULT")
 			…
 		}
 	}
@@ -143,6 +164,7 @@ class YourActivity : Activity() {
 [code_93]: https://en.wikipedia.org/wiki/Code_93
 [code_128]: https://en.wikipedia.org/wiki/Code_128
 [data_matrix]: https://en.wikipedia.org/wiki/Data_Matrix
+[dx_film_edge]: https://en.wikipedia.org/wiki/DX_encoding
 [ean_8]: https://en.wikipedia.org/wiki/EAN-8
 [ean_13]: https://en.wikipedia.org/wiki/International_Article_Number
 [itf]: https://en.wikipedia.org/wiki/Interleaved_2_of_5
@@ -150,6 +172,7 @@ class YourActivity : Activity() {
 [pdf417]: https://en.wikipedia.org/wiki/PDF417
 [qr_code]: https://en.wikipedia.org/wiki/QR_code
 [micro_qr_code]: https://en.wikipedia.org/wiki/QR_code#Micro_QR_code
+[rmqr_code]: https://www.qrcode.com/en/codes/rmqr.html
 [rss]: https://en.wikipedia.org/wiki/GS1_DataBar
 [upc_a]: https://en.wikipedia.org/wiki/Universal_Product_Code
 [upc_e]: https://en.wikipedia.org/wiki/Universal_Product_Code#UPC-E
@@ -2,14 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'

 android {
-	namespace 'de.markusfisch.android.binaryeye'
-	compileSdkVersion sdk_version
-	defaultConfig {
-		minSdkVersion 9
-		targetSdkVersion sdk_version
+	namespace "de.markusfisch.android.binaryeye"
+	compileSdk sdk_version

-		versionCode 123
-		versionName '1.61.2'
+	defaultConfig {
+		minSdk 9
+		targetSdk sdk_version
+
+		versionCode 142
+		versionName '1.64.0'
 	}

 	signingConfigs {
@@ -41,6 +42,10 @@ android {
 		}
 	}

+	buildFeatures {
+		buildConfig true
+	}
+
 	bundle {
 		language {
 			// To make the app bundle contain all language resources
@@ -52,18 +57,33 @@ android {
 			enableSplit = false
 		}
 	}
+
+	// Required since Gradle 8.
+	compileOptions {
+		sourceCompatibility = JavaVersion.VERSION_1_8
+		targetCompatibility = JavaVersion.VERSION_1_8
+	}
+	kotlinOptions {
+		jvmTarget = "1.8"
+	}
 }

 dependencies {
-	testImplementation 'junit:junit:4.13.2'
-
+	// 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"
 	implementation "com.android.support:design:$support_version"
 	implementation "com.android.support:preference-v7:$support_version"
 	implementation "com.android.support:preference-v14:$support_version"
-	implementation 'com.github.markusfisch:CameraView:1.9.2'
+
+	// External
+	implementation 'com.github.markusfisch:CameraView:1.10.0'
 	implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
-	implementation 'com.github.markusfisch:zxing-cpp:v2.1.0.2'
+	implementation 'com.github.markusfisch:zxing-cpp:v2.3.0.2'
+
+	// Testing
+	testImplementation 'junit:junit:4.13.2'
 }
@@ -3,5 +3,3 @@
 -dontwarn android.support.v8.**

 -keep class android.support.v7.widget.SearchView { *; }
-
-keep class de.markusfisch.android.zxingcpp.** { *; }
@@ -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>
@@ -62,7 +63,7 @@
 			<intent-filter android:label="@string/compose_barcode">
 				<action android:name="android.intent.action.SEND"/>
 				<category android:name="android.intent.category.DEFAULT"/>
-				<data android:mimeType="text/plain"/>
+				<data android:mimeType="text/*"/>
 			</intent-filter>
 			<intent-filter>
 				<action android:name="com.google.zxing.client.android.SCAN"/>
@@ -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"/>
@@ -106,7 +116,8 @@
 			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>
@@ -46,8 +46,8 @@ object OpenOrSearchAction : IAction {
 		).toMutableList()
 		// Remove the "Always ask" entry. The arrays search_engines_*
 		// are used in the preferences too.
-		names.removeFirst()
-		urls.removeFirst()
+		names.removeAt(0)
+		urls.removeAt(0)
 		if (prefs.openWithUrl.isNotEmpty()) {
 			names.add(prefs.openWithUrl)
 			urls.add(prefs.openWithUrl)
@@ -9,7 +9,8 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
 import de.markusfisch.android.binaryeye.actions.vtype.VTypeParser
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale

 object VEventAction : IntentAction() {
 	override val iconResId: Int
@@ -7,7 +7,7 @@ import de.markusfisch.android.binaryeye.content.openUrl

 object WebAction : IAction {
 	private val colloquialRegex =
-		"^(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
@@ -18,6 +18,9 @@ object WebAction : IAction {

 	override suspend fun execute(context: Context, data: ByteArray) {
 		var url = String(data).trim()
+		if (url.startsWith("URL:")) {
+			url = url.substring(4).trim()
+		}
 		if (!url.startsWith("http") && !url.startsWith("ftp")) {
 			url = "http://${url}"
 		}
@@ -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
@@ -9,18 +10,24 @@ import android.graphics.Matrix
 import android.graphics.Rect
 import android.hardware.Camera
 import android.net.Uri
+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
-import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.app.PERMISSION_CAMERA
+import de.markusfisch.android.binaryeye.app.applyLocale
+import de.markusfisch.android.binaryeye.app.db
+import de.markusfisch.android.binaryeye.app.hasBluetoothPermission
+import de.markusfisch.android.binaryeye.app.hasCameraPermission
+import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.bluetooth.sendBluetoothAsync
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.execShareIntent
@@ -34,17 +41,21 @@ import de.markusfisch.android.binaryeye.graphics.setFrameToView
 import de.markusfisch.android.binaryeye.media.releaseToneGenerators
 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
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.cameraview.widget.CameraView
 import de.markusfisch.android.zxingcpp.ZxingCpp
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 import de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer
-import de.markusfisch.android.zxingcpp.ZxingCpp.DecodeHints
+import de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import java.io.FileInputStream
+import java.util.Scanner
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -58,7 +69,7 @@ class CameraActivity : AppCompatActivity() {
 	private lateinit var zoomBar: SeekBar
 	private lateinit var flashFab: FloatingActionButton

-	private var formatsToRead = setOf<String>()
+	private var formatsToRead = setOf<BarcodeFormat>()
 	private var frameMetrics = FrameMetrics()
 	private var decoding = true
 	private var returnResult = false
@@ -67,8 +78,10 @@ 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

 	override fun onRequestPermissionsResult(
 		requestCode: Int,
@@ -114,8 +127,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
@@ -127,7 +139,7 @@ class CameraActivity : AppCompatActivity() {
 		initDetectorView()

 		if (intent?.action == Intent.ACTION_SEND &&
-			intent.type == "text/plain"
+			intent.type?.startsWith("text/") == true
 		) {
 			handleSendText(intent)
 		}
@@ -144,29 +156,45 @@ class CameraActivity : AppCompatActivity() {
 	override fun onResume() {
 		super.onResume()
 		System.gc()
-		updateHints()
+		updateHintsAndTitle()
 		if (prefs.bulkMode && bulkMode != prefs.bulkMode) {
 			bulkMode = prefs.bulkMode
 			invalidateOptionsMenu()
 			ignoreNext = null
 		}
 		setReturnTarget(intent)
-		if (hasCameraPermission()) {
+		// Avoid asking multiple times when the user has denied access
+		// for this session. Otherwise ActivityCompat.requestPermissions()
+		// will trigger onResume() again and again.
+		if (hasCameraPermission(requestCameraPermission)) {
 			openCamera()
 		}
+		requestCameraPermission = false
 	}

-	private fun updateHints() {
+	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)
 		}
 	}

@@ -212,6 +240,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) {
@@ -220,6 +249,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)
 	}

@@ -280,6 +310,11 @@ class CameraActivity : AppCompatActivity() {
 				true
 			}

+			R.id.find_code -> {
+				askForCode()
+				true
+			}
+
 			R.id.preferences -> {
 				startActivity(MainActivity.getPreferencesIntent(this))
 				true
@@ -319,12 +354,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,
@@ -335,9 +394,34 @@ class CameraActivity : AppCompatActivity() {

 	private fun handleSendText(intent: Intent) {
 		val text = intent.getStringExtra(Intent.EXTRA_TEXT)
+
 		if (text?.isEmpty() == false) {
 			startActivity(MainActivity.getEncodeIntent(this, text, true))
 			finish()
+			return
+		}
+
+		// Read text from file.
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+			@Suppress("DEPRECATION")
+			intent.getParcelableExtra(Intent.EXTRA_STREAM) as Uri?
+		} else {
+			intent.getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
+		}?.let { textUri ->
+			val file = contentResolver.openFileDescriptor(textUri, "r")
+			if (file != null) {
+				val fs = FileInputStream(file.fileDescriptor)
+				val scn = Scanner(fs).useDelimiter("\\A")
+				if (scn.hasNext()) {
+					startActivity(
+						MainActivity.getEncodeIntent(
+							this, scn.next(), true
+						)
+					)
+					finish()
+				}
+				file.close()
+			}
 		}
 	}

@@ -432,11 +516,12 @@ class CameraActivity : AppCompatActivity() {
 				ignoreNext = null
 				decoding = true
 				// These settings can't change while the camera is open.
-				val decodeHints = DecodeHints(
+				val options = ReaderOptions(
 					tryHarder = prefs.tryHarder,
 					tryRotate = prefs.autoRotate,
 					tryInvert = true,
 					tryDownscale = true,
+					returnCodabarStartEnd = true,
 					maxNumberOfSymbols = 1
 				)
 				var useLocalAverage = false
@@ -449,7 +534,7 @@ class CameraActivity : AppCompatActivity() {
 							frameRoi.left, frameRoi.top,
 							frameRoi.width(), frameRoi.height(),
 							frameMetrics.orientation,
-							decodeHints.apply {
+							options.apply {
 								// By default, ZXing uses LOCAL_AVERAGE, but
 								// this does not work well with inverted
 								// barcodes on low-contrast backgrounds.
@@ -458,11 +543,15 @@ class CameraActivity : AppCompatActivity() {
 								} else {
 									Binarizer.GLOBAL_HISTOGRAM
 								}
-								formats = formatsToRead.joinToString()
+								formats = formatsToRead
 							}
 						)?.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
 							}
@@ -615,8 +704,12 @@ class CameraActivity : AppCompatActivity() {
 				}
 			}
 			if (bulkMode) {
-				if (prefs.ignoreConsecutiveDuplicates) {
-					ignoreNext = result.text
+				when (prefs.ignoreDuplicates()) {
+					Preferences.Companion.IgnoreDuplicates.Consecutive,
+					Preferences.Companion.IgnoreDuplicates.Any ->
+						ignoreNext = result.text
+
+					else -> Unit
 				}
 				if (prefs.showToastInBulkMode) {
 					toast(result.text)
@@ -635,9 +728,14 @@ class CameraActivity : AppCompatActivity() {
 		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"
 	}
 }

+fun Set<String>.toFormatSet(): Set<BarcodeFormat> = map {
+	BarcodeFormat.valueOf(it)
+}.toSet()
+
 fun Activity.showResult(
 	result: Result,
 	bulkMode: Boolean = false,
@@ -663,7 +761,7 @@ fun Activity.showResult(
 			if (code == null || code < 200 || code > 299) {
 				errorFeedback()
 			}
-			if (body != null && body.isNotEmpty()) {
+			if (!body.isNullOrEmpty()) {
 				toast(body)
 			} else if (code == null || code > 299) {
 				toast(R.string.background_request_failed)
@@ -703,7 +801,7 @@ fun Activity.showResult(

 private fun getReturnIntent(result: Result) = Intent().apply {
 	putExtra("SCAN_RESULT", result.text)
-	putExtra("SCAN_RESULT_FORMAT", result.format)
+	putExtra("SCAN_RESULT_FORMAT", result.format.toString())
 	putExtra("SCAN_RESULT_ORIENTATION", result.orientation)
 	putExtra("SCAN_RESULT_ERROR_CORRECTION_LEVEL", result.ecLevel)
 	if (result.rawBytes.isNotEmpty()) {
@@ -721,9 +819,7 @@ private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
 	urlTemplate
 		.replace("{RESULT}", result.text.urlEncode())
 		.replace("{RESULT_BYTES}", result.rawBytes.toHexString())
-		.replace(
-			"{FORMAT}", result.format.urlEncode()
-		)
+		.replace("{FORMAT}", result.format.name.urlEncode())
 		// And support {CODE} from the old ZXing app, too.
 		.replace("{CODE}", result.text.urlEncode())
 )
@@ -7,7 +7,6 @@ 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
@@ -21,8 +20,7 @@ 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.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 +57,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 {
@@ -89,9 +84,9 @@ class MainActivity : AppCompatActivity() {
 					intent.getStringExtra(ENCODE)
 				)

-				intent.hasExtra(DECODED) -> DecodeFragment.newInstance(
-					intent.getParcelableExtra(DECODED)!!
-				)
+				intent.hasExtra(DECODED) -> intent.getScanExtra(DECODED)?.let {
+					DecodeFragment.newInstance(it)
+				} ?: DecodeFragment()

 				else -> PreferencesFragment()
 			}
@@ -137,3 +132,12 @@ class MainActivity : AppCompatActivity() {
 		}
 	}
 }
+
+private fun Intent.getScanExtra(name: String): Scan? = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+) {
+	@Suppress("DEPRECATION")
+	getParcelableExtra(name)
+} else {
+	getParcelableExtra(name, Scan::class.java)
+}
@@ -7,10 +7,9 @@ import android.graphics.Matrix
 import android.graphics.Rect
 import android.graphics.RectF
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
-import android.os.Parcelable
 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
@@ -31,7 +29,7 @@ import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.zxingcpp.ZxingCpp
 import de.markusfisch.android.zxingcpp.ZxingCpp.Binarizer
-import de.markusfisch.android.zxingcpp.ZxingCpp.DecodeHints
+import de.markusfisch.android.zxingcpp.ZxingCpp.ReaderOptions
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -46,13 +44,14 @@ class PickActivity : AppCompatActivity() {
 	private val matrix = Matrix()
 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
-	private val decodeHints = DecodeHints(
+	private val options = ReaderOptions(
 		tryHarder = true,
 		tryRotate = true,
 		tryInvert = true,
 		tryDownscale = true,
+		returnCodabarStartEnd = true,
 		maxNumberOfSymbols = 1,
-		formats = prefs.barcodeFormats.joinToString()
+		formats = prefs.barcodeFormats.toFormatSet()
 	)

 	private lateinit var cropImageView: CropImageView
@@ -74,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)
@@ -125,35 +121,40 @@ class PickActivity : AppCompatActivity() {
 	}

 	private fun scanWithinBounds(bitmap: Bitmap) {
-		val viewRoi = if (detectorView.roi.width() < 1) {
-			cropImageView.getBoundsRect()
-		} else {
-			detectorView.roi
-		}
-		val mappedRect = cropImageView.mappedRect
-		val cropped = bitmap.crop(
-			getNormalizedRoi(mappedRect, viewRoi),
-			cropImageView.imageRotation,
-			cropImageView.pivotX,
-			cropImageView.pivotY
-		) ?: return
-		val croppedInView = Rect(
-			max(viewRoi.left, mappedRect.left.roundToInt()),
-			max(viewRoi.top, mappedRect.top.roundToInt()),
-			min(viewRoi.right, mappedRect.right.roundToInt()),
-			min(viewRoi.bottom, mappedRect.bottom.roundToInt())
+		val viewRoi = Rect(
+			if (detectorView.roi.width() < 1) {
+				cropImageView.getBoundsRect()
+			} else {
+				detectorView.roi
+			}
 		)
-		matrix.apply {
-			setScale(
-				croppedInView.width().toFloat() / cropped.width,
-				croppedInView.height().toFloat() / cropped.height
-			)
-			postTranslate(
-				croppedInView.left.toFloat(),
-				croppedInView.top.toFloat()
-			)
-		}
+		val mappedRect = RectF(cropImageView.mappedRect)
+		val imageRotation = cropImageView.imageRotation
+		val pivotX = cropImageView.pivotX
+		val pivotY = cropImageView.pivotY
 		scope.launch {
+			val cropped = bitmap.crop(
+				getNormalizedRoi(mappedRect, viewRoi),
+				imageRotation,
+				pivotX,
+				pivotY
+			) ?: return@launch
+			val croppedInView = Rect(
+				max(viewRoi.left, mappedRect.left.roundToInt()),
+				max(viewRoi.top, mappedRect.top.roundToInt()),
+				min(viewRoi.right, mappedRect.right.roundToInt()),
+				min(viewRoi.bottom, mappedRect.bottom.roundToInt())
+			)
+			matrix.apply {
+				setScale(
+					croppedInView.width().toFloat() / cropped.width,
+					croppedInView.height().toFloat() / cropped.height
+				)
+				postTranslate(
+					croppedInView.left.toFloat(),
+					croppedInView.top.toFloat()
+				)
+			}
 			cropped.decode()?.first()?.let {
 				withContext(Dispatchers.Main) {
 					if (isFinishing) {
@@ -179,7 +180,7 @@ class PickActivity : AppCompatActivity() {
 		0, 0,
 		width, height,
 		0,
-		decodeHints.apply {
+		options.apply {
 			binarizer = Binarizer.LOCAL_AVERAGE
 		}
 	) ?: ZxingCpp.readBitmap(
@@ -187,7 +188,7 @@ class PickActivity : AppCompatActivity() {
 		0, 0,
 		width, height,
 		0,
-		decodeHints.apply {
+		options.apply {
 			binarizer = Binarizer.GLOBAL_HISTOGRAM
 		}
 	)
@@ -236,13 +237,11 @@ class PickActivity : AppCompatActivity() {
 	}

 	private fun rotateClockwise() {
-		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
+		cropImageView.imageRotation = (cropImageView.imageRotation + 90) % 360
 	}

 	private fun loadSentImage(intent: Intent): Bitmap? {
-		val uri = intent.getParcelableExtra<Parcelable>(
-			Intent.EXTRA_STREAM
-		) as? Uri ?: return null
+		val uri = intent.getUriExtra() ?: return null
 		return contentResolver.loadImageUri(uri)
 	}

@@ -272,3 +271,12 @@ private fun getNormalizedRoi(imageRect: RectF, roi: Rect): RectF {
 		(roi.bottom - imageRect.top) / h
 	)
 }
+
+private fun Intent.getUriExtra(): Uri? = if (
+	Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU
+) {
+	@Suppress("DEPRECATION")
+	getParcelableExtra(Intent.EXTRA_STREAM)
+} else {
+	getParcelableExtra(Intent.EXTRA_STREAM, Uri::class.java)
+}
@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.app

 import android.content.Context
 import android.os.Build
-import java.util.*
+import java.util.Locale

 fun Context.applyLocale(localeName: String) {
 	if (localeName.isEmpty()) {
@@ -10,9 +10,9 @@ import android.support.v4.content.ContextCompat
 var permissionGrantedCallback: (() -> Any)? = null

 const val PERMISSION_CAMERA = 1
-fun Activity.hasCameraPermission() = hasPermission(
+fun Activity.hasCameraPermission(request: Boolean = true) = hasPermission(
 	Manifest.permission.CAMERA,
-	PERMISSION_CAMERA
+	if (request) PERMISSION_CAMERA else 0
 )

 const val PERMISSION_WRITE = 2
@@ -53,11 +53,13 @@ private fun Activity.hasPermission(
 		permission
 	) != PackageManager.PERMISSION_GRANTED
 ) {
-	ActivityCompat.requestPermissions(
-		this,
-		arrayOf(permission),
-		requestCode
-	)
+	if (requestCode > 0) {
+		ActivityCompat.requestPermissions(
+			this,
+			arrayOf(permission),
+			requestCode
+		)
+	}
 	false
 } else {
 	true
@@ -21,10 +21,10 @@ fun Scan.sendBluetoothAsync(
 		val connected = if (isConnected) {
 			true
 		} else {
-			connect(host)
+			connect(host, true)
 		}
 		val sent = if (connected) {
-			send(content)
+			send(content, host, true)
 		} else {
 			false
 		}
@@ -62,7 +62,7 @@ private val uuid = UUID.fromString(

 private var isConnected = false

-private fun connect(deviceName: String): Boolean = try {
+private fun connect(deviceName: String, onceMore: Boolean): Boolean = try {
 	val device = findByName(deviceName) ?: throw RuntimeException(
 		"Bluetooth device not found"
 	)
@@ -72,11 +72,14 @@ private fun connect(deviceName: String): Boolean = try {
 	isConnected = true
 	true
 } catch (e: Exception) {
-	close()
+	if (onceMore)
+		connect(deviceName, false)
+	else
+		close()
 	false
 }

-private fun send(message: String): Boolean = try {
+private fun send(message: String, host: String, onceMore: Boolean): Boolean = try {
 	writer?.apply {
 		write(message)
 		write("\n")
@@ -85,7 +88,11 @@ private fun send(message: String): Boolean = try {
 	true
 } catch (e: Exception) {
 	close()
-	false
+
+	if (connect(host, false))
+		send(message, host, false)
+	else
+		false
 }

 private fun close() {
@@ -0,0 +1,174 @@
+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() = 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
+}
+
+abstract 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
+}
+
+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, 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
+}
@@ -61,12 +61,15 @@ fun Context.shareText(text: String, mimeType: String = "text/plain") {
 	})
 }

-private const val SHARE_AS_TEXT_FILE_NAME = "barcode_content"
-fun Context.wipeShareFile() {
-	File(externalCacheDir, SHARE_AS_TEXT_FILE_NAME).delete()
+private var lastShareFile: File? = null
+fun wipeLastShareFile() {
+	lastShareFile?.let {
+		it.delete()
+		lastShareFile = null
+	}
 }

-fun <T> Context.shareAsFile(content: T) {
+fun <T> Context.shareAsFile(content: T, fileName: String) {
 	val (bytes, mimeType) = when (content) {
 		is ByteArray -> Pair(
 			content,
@@ -82,7 +85,8 @@ fun <T> Context.shareAsFile(content: T) {
 			"Unsupported content text for shareAsFile()"
 		)
 	}
-	val file = File(externalCacheDir, SHARE_AS_TEXT_FILE_NAME)
+	wipeLastShareFile()
+	val file = File(externalCacheDir, fileName)
 	try {
 		FileOutputStream(file).use {
 			it.write(bytes)
@@ -91,6 +95,7 @@ fun <T> Context.shareAsFile(content: T) {
 		toast(R.string.error_saving_file)
 		return
 	}
+	lastShareFile = file
 	shareFile(file, mimeType)
 }

@@ -32,6 +32,7 @@ private fun exportCsv(
 	val columns = arrayOf(
 		Database.SCANS_DATETIME,
 		Database.SCANS_FORMAT,
+		Database.SCANS_NAME,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
 		Database.SCANS_VERSION,
@@ -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
+	}
+}
@@ -6,6 +6,8 @@ import android.database.Cursor
 import android.database.sqlite.SQLiteDatabase
 import android.database.sqlite.SQLiteOpenHelper
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.preference.Preferences
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat

 class Database {
 	private lateinit var db: SQLiteDatabase
@@ -14,7 +16,7 @@ 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,
@@ -27,7 +29,7 @@ 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,
@@ -69,7 +71,7 @@ class Database {
 		null
 	}

-	fun getScan(id: Long): Scan? = db.rawQuery(
+	fun getScansDetailed(ids: LongArray): Cursor = db.rawQuery(
 		"""SELECT
 			$SCANS_ID,
 			$SCANS_DATETIME,
@@ -87,16 +89,49 @@ class Database {
 			$SCANS_GTIN_PRICE,
 			$SCANS_GTIN_ISSUE_NUMBER
 			FROM $SCANS
+			WHERE $SCANS_ID IN (${ids.joinToString(",")})
+			ORDER BY $SCANS_DATETIME DESC
+		""".trimMargin(), null
+	)
+
+	fun getScan(id: Long): Scan? = db.rawQuery(
+		"""SELECT
+			$SCANS_ID,
+			$SCANS_DATETIME,
+			$SCANS_NAME,
+			$SCANS_CONTENT,
+			$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,
+			$SCANS_GTIN_COUNTRY,
+			$SCANS_GTIN_ADD_ON,
+			$SCANS_GTIN_PRICE,
+			$SCANS_GTIN_ISSUE_NUMBER
+			FROM $SCANS
 			WHERE $SCANS_ID = ?
 		""".trimMargin(), arrayOf("$id")
-	)?.use {
+	).use {
 		if (it.moveToFirst()) {
 			Scan(
 				it.getString(SCANS_CONTENT),
 				it.getBlob(SCANS_RAW),
-				it.getString(SCANS_FORMAT),
+				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),
@@ -105,51 +140,71 @@ class Database {
 				it.getString(SCANS_GTIN_PRICE),
 				it.getString(SCANS_GTIN_ISSUE_NUMBER),
 				it.getString(SCANS_DATETIME),
-				it.getLong(SCANS_ID)
+				it.getLong(SCANS_ID),
+				it.getString(SCANS_NAME),
 			)
 		} else {
 			null
 		}
 	}

-	fun insertScan(scan: Scan): Long = db.insert(
-		SCANS,
-		null,
-		ContentValues().apply {
-			put(SCANS_DATETIME, scan.dateTime)
-			put(SCANS_CONTENT, scan.content)
-			if (scan.raw != null) {
-				put(SCANS_RAW, scan.raw)
-			}
-			put(SCANS_FORMAT, scan.format)
-			scan.errorCorrectionLevel?.let {
-				put(SCANS_ERROR_CORRECTION_LEVEL, it)
-			}
-			put(SCANS_VERSION, scan.version)
-			put(SCANS_SEQUENCE_SIZE, scan.sequenceSize)
-			put(SCANS_SEQUENCE_INDEX, scan.sequenceIndex)
-			put(SCANS_SEQUENCE_ID, scan.sequenceId)
-			scan.country?.let { put(SCANS_GTIN_COUNTRY, it) }
-			scan.addOn?.let { put(SCANS_GTIN_ADD_ON, it) }
-			scan.price?.let { put(SCANS_GTIN_PRICE, it) }
-			scan.issueNumber?.let { put(SCANS_GTIN_ISSUE_NUMBER, it) }
-			if (prefs.ignoreConsecutiveDuplicates) {
+	fun insertScan(scan: Scan): Long {
+		when (prefs.ignoreDuplicates()) {
+			Preferences.Companion.IgnoreDuplicates.Consecutive -> {
 				val id = getIdOfLastScan(
-					get(SCANS_CONTENT) as String,
-					get(SCANS_RAW) as ByteArray?,
+					scan.content,
+					scan.raw,
 					scan.format
 				)
 				if (id > 0L) {
 					return id
 				}
 			}
+
+			Preferences.Companion.IgnoreDuplicates.Any -> {
+				val id = getIdOfScanByContent(scan.content, scan.format)
+				if (id > 0L) {
+					return id
+				}
+			}
+
+			else -> Unit
 		}
-	)
+		return db.insert(
+			SCANS,
+			null,
+			ContentValues().apply {
+				put(SCANS_DATETIME, scan.dateTime)
+				put(SCANS_CONTENT, scan.content)
+				if (scan.raw != null) {
+					put(SCANS_RAW, scan.raw)
+				}
+				put(SCANS_FORMAT, scan.format.name)
+				scan.errorCorrectionLevel?.let {
+					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)
+				scan.country?.let { put(SCANS_GTIN_COUNTRY, it) }
+				scan.addOn?.let { put(SCANS_GTIN_ADD_ON, it) }
+				scan.price?.let { put(SCANS_GTIN_PRICE, it) }
+				scan.issueNumber?.let { put(SCANS_GTIN_ISSUE_NUMBER, it) }
+			}
+		)
+	}

 	private fun getIdOfLastScan(
 		content: String,
 		raw: ByteArray?,
-		format: String
+		format: BarcodeFormat
 	): Long = db.rawQuery(
 		"""SELECT
 				$SCANS_ID,
@@ -160,19 +215,38 @@ class Database {
 				ORDER BY $SCANS_ID DESC
 				LIMIT 1
 			""".trimMargin(), null
-	)?.use {
+	).use {
 		if (it.count > 0 &&
 			it.moveToFirst() &&
 			it.getString(SCANS_CONTENT) == content &&
 			(raw == null || it.getBlob(SCANS_RAW)
 				?.contentEquals(raw) == true) &&
-			it.getString(SCANS_FORMAT) == format
+			it.getString(SCANS_FORMAT) == format.name
 		) {
 			it.getLong(SCANS_ID)
 		} else {
 			0L
 		}
-	} ?: 0L
+	}
+
+	private fun getIdOfScanByContent(
+		content: String,
+		format: BarcodeFormat
+	): Long = db.rawQuery(
+		"""SELECT
+				$SCANS_ID
+				FROM $SCANS
+				WHERE $SCANS_CONTENT = ?
+					AND $SCANS_FORMAT = ?
+				LIMIT 1
+			""".trimMargin(), arrayOf(content, format.name)
+	).use {
+		if (it.moveToFirst()) {
+			it.getLong(SCANS_ID)
+		} else {
+			0L
+		}
+	}

 	fun removeScan(id: Long) {
 		db.delete(SCANS, "$SCANS_ID = ?", arrayOf("$id"))
@@ -189,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()
 		}
@@ -214,6 +288,12 @@ class Database {
 			if (oldVersion < 6) {
 				db.migrateToVersionString()
 			}
+			if (oldVersion < 7) {
+				db.addDataMaskColumn()
+			}
+			if (oldVersion < 8) {
+				db.addSymbolColumns()
+			}
 		}
 	}

@@ -229,6 +309,10 @@ class Database {
 		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"
@@ -256,6 +340,7 @@ class Database {
 					$SCANS_FORMAT TEXT NOT NULL,
 					$SCANS_ERROR_CORRECTION_LEVEL TEXT,
 					$SCANS_VERSION TEXT,
+					$SCANS_DATA_MASK INTEGER,
 					$SCANS_SEQUENCE_SIZE INTEGER,
 					$SCANS_SEQUENCE_INDEX INTEGER,
 					$SCANS_SEQUENCE_ID TEXT,
@@ -283,7 +368,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() {
@@ -307,5 +392,15 @@ 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")
+		}
+
+		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")
+		}
 	}
 }
@@ -24,6 +24,7 @@ fun Cursor.exportJson(): String? {
 	val columns = arrayOf(
 		Database.SCANS_DATETIME,
 		Database.SCANS_FORMAT,
+		Database.SCANS_NAME,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
 		Database.SCANS_VERSION,
@@ -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.Format
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
+import java.util.Locale

 data class Scan(
 	val content: String,
 	val raw: ByteArray?,
-	val format: String,
+	val format: BarcodeFormat,
 	val errorCorrectionLevel: String? = null,
 	val version: String? = null,
+	val dataMask: Int = 0,
+	val symbol: BitMatrix? = null,
 	val sequenceSize: Int = -1,
 	val sequenceIndex: Int = -1,
 	val sequenceId: String = "",
@@ -24,7 +26,8 @@ data class Scan(
 	val price: String? = null,
 	val issueNumber: String? = null,
 	val dateTime: String = getDateTime(),
-	var id: Long = 0L
+	var id: Long = 0L,
+	val label: String? = null
 ) : Parcelable {
 	// Needs to be overwritten manually, as ByteArray is an array and
 	// this isn't handled well by Kotlin.
@@ -46,6 +49,7 @@ data class Scan(
 				format == other.format &&
 				errorCorrectionLevel == other.errorCorrectionLevel &&
 				version == other.version &&
+				dataMask == other.dataMask &&
 				sequenceSize == other.sequenceSize &&
 				sequenceIndex == other.sequenceIndex &&
 				sequenceId == other.sequenceId &&
@@ -65,6 +69,7 @@ data class Scan(
 		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()
@@ -78,9 +83,11 @@ data class Scan(
 	private constructor(parcel: Parcel) : this(
 		content = parcel.readString() ?: "",
 		raw = parcel.readSizedByteArray(),
-		format = parcel.readString() ?: "",
+		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() ?: "",
@@ -89,16 +96,19 @@ data class Scan(
 		price = parcel.readString(),
 		issueNumber = parcel.readString(),
 		dateTime = parcel.readString() ?: "",
-		id = parcel.readLong()
+		id = parcel.readLong(),
+		label = parcel.readString()
 	)

 	override fun writeToParcel(parcel: Parcel, flags: Int) {
 		parcel.apply {
 			writeString(content)
 			writeSizedByteArray(raw)
-			writeString(format)
+			writeString(format.name)
 			writeString(errorCorrectionLevel)
 			writeString(version)
+			writeInt(dataMask)
+			writeBitMatrix(symbol)
 			writeInt(sequenceSize)
 			writeInt(sequenceIndex)
 			writeString(sequenceId)
@@ -108,6 +118,7 @@ data class Scan(
 			writeString(issueNumber)
 			writeString(dateTime)
 			writeLong(id)
+			writeString(label)
 		}
 	}

@@ -135,6 +146,8 @@ fun Result.toScan(): Scan {
 		format,
 		ecLevel,
 		version,
+		dataMask,
+		symbol,
 		sequenceSize,
 		sequenceIndex,
 		sequenceId,
@@ -145,37 +158,6 @@ fun Result.toScan(): Scan {
 	)
 }

-data class Recreation(
-	val format: Format,
-	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.valueOf(format),
-	when (errorCorrectionLevel) {
-		"L" -> 0
-		"M" -> 4
-		"Q" -> 6
-		"H" -> 8
-		else -> -1
-	},
-	size,
-	margin
-)
-
 private fun getDateTime(
 	time: Long = System.currentTimeMillis()
 ) = DateFormat.format(
@@ -187,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
@@ -207,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)
+}
@@ -7,41 +7,64 @@ import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.widget.EditText
+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.BitMatrixBarcode
+import de.markusfisch.android.binaryeye.content.BarcodeColors
+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.graphics.COLOR_BLACK
-import de.markusfisch.android.binaryeye.graphics.COLOR_WHITE
+import de.markusfisch.android.binaryeye.database.toScan
 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.os.getScreenBrightness
+import de.markusfisch.android.binaryeye.os.setScreenBrightness
 import de.markusfisch.android.binaryeye.view.doOnApplyWindowInsets
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.ConfinedScalingImageView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.zxingcpp.ZxingCpp
-import de.markusfisch.android.zxingcpp.ZxingCpp.Format
-import kotlinx.coroutines.*
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
-import java.util.*
+import java.util.Locale
+import kotlin.math.max
 import kotlin.math.min

 class BarcodeFragment : Fragment() {
 	private enum class FileType {
-		PNG, SVG, TXT
+		PNG, JPG, SVG, TXT
 	}

 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)

 	private lateinit var barcode: Barcode<*>
+	private lateinit var addToHistoryItem: MenuItem
+	private lateinit var brightenScreenItem: MenuItem
+
+	private var currentBrightness = -1f

 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -89,7 +112,7 @@ class BarcodeFragment : Fragment() {
 			// Make sure to invoke this after ScalingImageView.onLayout().
 			imageView.minWidth = min(
 				imageView.minWidth / 2f,
-				barcode.size.toFloat()
+				max(bitmap.width, bitmap.height).toFloat()
 			)
 		}

@@ -101,7 +124,7 @@ class BarcodeFragment : Fragment() {
 			}
 		}

-		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		view.findViewById<View>(R.id.inset_layout).setPaddingFromWindowInsets()
 		imageView.doOnApplyWindowInsets { v, insets ->
 			(v as ConfinedScalingImageView).insets.set(insets)
 		}
@@ -109,20 +132,56 @@ class BarcodeFragment : Fragment() {
 		return view
 	}

-	private fun Bundle.toBarcode() = Barcode(
-		getString(CONTENT_TEXT) ?: getByteArray(CONTENT_RAW) ?: throw IllegalArgumentException(
-			"content cannot be null"
-		),
-		Format.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.values()[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()
+		if (prefs.brightenScreen) {
+			// Post to make sure brightenScreenItem is initialized.
+			view?.post {
+				brightenScreen()
+			}
+		}
+	}
+
+	override fun onPause() {
+		super.onPause()
+		if (currentBrightness > -1f) {
+			restoreScreenBrightness()
+		}
+	}

 	override fun onDestroyView() {
 		super.onDestroyView()
@@ -131,10 +190,22 @@ class BarcodeFragment : Fragment() {

 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_barcode, menu)
+		addToHistoryItem = menu.findItem(R.id.add_to_history)
+		brightenScreenItem = menu.findItem(R.id.brighten_screen)
 	}

 	override fun onOptionsItemSelected(item: MenuItem): Boolean {
 		return when (item.itemId) {
+			R.id.add_to_history -> {
+				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())
@@ -144,8 +215,26 @@ class BarcodeFragment : Fragment() {
 			}

 			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
+			}
+
+			R.id.brighten_screen -> {
+				prefs.brightenScreen = if (currentBrightness > -1f) {
+					restoreScreenBrightness()
+					false
+				} else {
+					brightenScreen()
+					true
 				}
 				true
 			}
@@ -158,7 +247,7 @@ class BarcodeFragment : Fragment() {
 		title: Int,
 		action: (FileType) -> Unit
 	) {
-		val fileTypes = FileType.values()
+		val fileTypes = FileType.entries.toTypedArray()
 		AlertDialog.Builder(this)
 			.setTitle(title)
 			.setItems(fileTypes.map { it.name }.toTypedArray()) { _, which ->
@@ -169,11 +258,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
 		}
@@ -191,21 +282,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(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())
 					}
 				}
 			}
@@ -214,6 +312,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,
@@ -230,21 +374,34 @@ class BarcodeFragment : Fragment() {

 	private fun Context.shareAs(fileType: FileType) {
 		when (fileType) {
-			FileType.PNG -> share(barcode.bitmap())
+			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())
 		}
 	}

-	private fun Context.share(bitmap: Bitmap) {
+	private fun Context.share(bitmap: Bitmap, mimeType: String, ext: String) {
 		scope.launch(Dispatchers.IO) {
 			val file = File(
 				externalCacheDir,
-				"shared_barcode.png"
+				"shared_barcode.$ext"
 			)
 			val success = try {
 				FileOutputStream(file).use {
-					bitmap.saveAsPng(it)
+					when (mimeType) {
+						MIME_PNG -> bitmap.saveAsPng(it)
+						MIME_JPG -> bitmap.saveAsJpg(it)
+						else -> throw IllegalArgumentException(
+							"Invalid mime type"
+						)
+					}
 				}
 				true
 			} catch (e: IOException) {
@@ -252,7 +409,7 @@ class BarcodeFragment : Fragment() {
 			}
 			withContext(Dispatchers.Main) {
 				if (success) {
-					shareFile(file, "image/png")
+					shareFile(file, mimeType)
 				} else {
 					toast(R.string.error_saving_file)
 				}
@@ -260,34 +417,93 @@ class BarcodeFragment : Fragment() {
 		}
 	}

+	private fun brightenScreen() {
+		activity?.let {
+			currentBrightness = it.getScreenBrightness()
+			it.setScreenBrightness(1f)
+			brightenScreenItem.isChecked = true
+		}
+	}
+
+	private fun restoreScreenBrightness() {
+		if (currentBrightness > -1f) {
+			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: Format,
-			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 -> {
@@ -296,82 +512,57 @@ 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 data class Barcode<T>(
-	val content: T,
-	val format: Format,
-	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 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 Bundle.putEcLevelMargin(
+			ecLevel: Int,
+			margin: Int
+		) {
+			putInt(EC_LEVEL, ecLevel)
+			putInt(MARGIN, margin)
+		}
 	}
 }

 private fun Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =
 	compress(Bitmap.CompressFormat.PNG, quality, outputStream)

+private fun Bitmap.saveAsJpg(outputStream: OutputStream, quality: Int = 90) =
+	compress(Bitmap.CompressFormat.JPEG, quality, outputStream)
+
 private val fileNameCharacters = "[^A-Za-z0-9]".toRegex()
-private fun encodeFileName(name: String): String =
-	fileNameCharacters.replace(name, "_").take(16).trim('_').lowercase(Locale.getDefault())
+private fun encodeFileName(name: String): String = fileNameCharacters
+	.replace(name, "_")
+	.take(16)
+	.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
+) {
+	ZxingCpp.readBitmap(
+		bitmap,
+		0, 0,
+		bitmap.width, bitmap.height,
+		0,
+		ZxingCpp.ReaderOptions(
+			tryHarder = true,
+			tryRotate = true,
+			tryInvert = true,
+			tryDownscale = true,
+			maxNumberOfSymbols = 1,
+			formats = setOf(format)
+		)
+	)?.first {
+		db.insertScan(it.toScan())
+		true
+	}
+}
@@ -6,32 +6,53 @@ import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.text.Editable
 import android.text.Html
+import android.text.Spannable
+import android.text.SpannableString
 import android.text.TextWatcher
 import android.text.method.LinkMovementMethod
-import android.view.*
-import android.widget.*
+import android.text.style.TypefaceSpan
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.EditText
+import android.widget.ImageView
+import android.widget.TableLayout
+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.wifi.WifiAction
 import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
 import de.markusfisch.android.binaryeye.activity.MainActivity
 import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
-import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.app.addFragment
+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.copyToClipboard
 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.wipeShareFile
-import de.markusfisch.android.binaryeye.database.Recreation
+import de.markusfisch.android.binaryeye.content.wipeLastShareFile
 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.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.toast
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.security.MessageDigest
 import kotlin.math.roundToInt

 class DecodeFragment : Fragment() {
@@ -42,7 +63,9 @@ class DecodeFragment : Fragment() {
 	private lateinit var hexView: TextView
 	private lateinit var stampView: TextView
 	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()
@@ -57,7 +80,8 @@ class DecodeFragment : Fragment() {
 	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)
@@ -80,18 +104,18 @@ class DecodeFragment : Fragment() {
 		closeAutomatically = prefs.closeAutomatically &&
 				activity?.intent?.hasExtra(MainActivity.DECODED) == true

-		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?
 		} ?: throw IllegalArgumentException("DecodeFragment needs a Scan")

-		val originalContent = scan.content
 		isBinary = scan.content.isEmpty()
-		originalBytes = scan.raw ?: originalContent.toByteArray()
-		format = scan.format
+		originalBytes = scan.raw ?: scan.content.toByteArray()
+		format = scan.format.name
 		id = scan.id
+		recreationSize = (200f * dp).roundToInt()

 		contentView = view.findViewById(R.id.content)
 		formatView = view.findViewById(R.id.format)
@@ -100,36 +124,51 @@ class DecodeFragment : Fragment() {
 		hexView = view.findViewById(R.id.hex)
 		stampView = view.findViewById(R.id.stamp)
 		recreationView = view.findViewById(R.id.recreation)
+		labelView = view.findViewById(R.id.label)
 		fab = view.findViewById(R.id.open)

-		initContentAndFab(originalContent)
+		initContentAndFab()

 		if (prefs.showMetaData) {
 			metaView.fillMetaView(scan)
 		} else {
 			metaView.visibility = View.GONE
 		}
-		if (prefs.showRecreation) {
-			recreation = scan.toRecreation(
-				(200f * dp).roundToInt()
-			)
+		if (id > 0) {
+			scan.label?.let {
+				labelView.setText(it)
+				label = it
+			}
+		} else {
+			labelView.visibility = View.GONE
 		}

-		updateViewsAndFab(originalContent, originalBytes)
+		updateViewsAndFab(scan.content, originalBytes)

-		(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()

 		return view
 	}

+	override fun onPause() {
+		super.onPause()
+		if (id > 0) {
+			val newLabel = labelView.text.toString().trim()
+			if (newLabel != (label ?: "")) {
+				db.renameScan(id, newLabel)
+				label = newLabel
+			}
+		}
+	}
+
 	override fun onDestroy() {
 		super.onDestroy()
 		parentJob.cancel()
-		activity?.wipeShareFile()
+		wipeLastShareFile()
 	}

-	private fun initContentAndFab(originalContent: String) {
+	private fun initContentAndFab() {
 		if (isBinary) {
 			contentView.setText(String(originalBytes).foldNonAlNum())
 			contentView.isEnabled = false
@@ -138,7 +177,7 @@ class DecodeFragment : Fragment() {
 				askForFileNameAndSave(originalBytes)
 			}
 		} else {
-			contentView.setText(originalContent)
+			contentView.setText(scan.content)
 			contentView.addTextChangedListener(object : TextWatcher {
 				override fun afterTextChanged(s: Editable?) {
 					updateViewsAndFab(s?.toString() ?: "")
@@ -159,10 +198,10 @@ class DecodeFragment : Fragment() {
 				) = Unit
 			})
 			fab.setOnClickListener {
-				executeAction(content)
+				executeAction(this.content)
 			}
 			if (prefs.openImmediately) {
-				executeAction(content)
+				executeAction(this.content)
 			}
 		}
 	}
@@ -179,12 +218,9 @@ class DecodeFragment : Fragment() {
 			action = ActionRegistry.getAction(bytes)
 		}
 		if (prevAction !== action) {
-			updateFab(action)
+			fab.setImageResource(action.iconResId)
 		}
-	}
-
-	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)
@@ -206,26 +242,43 @@ 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))
+			val unmodified: Boolean
+			val content = if (isBinary) {
+				unmodified = bytes.contentEquals(originalBytes)
+				bytes
+			} else {
+				unmodified = text == scan.content
+				text
+			}
+			val barcode = if (unmodified) {
+				scan.toBarcode()
+			} else {
+				ContentBarcode(
+					content,
+					scan.format,
+					scan.errorCorrectionLevel.toErrorCorrectionInt()
+				)
+			}
+			v.setImageBitmap(barcode.bitmap(recreationSize))
 			v.setOnClickListener {
 				fragmentManager?.addFragment(
-					BarcodeFragment.newInstance(
-						content,
-						r.format,
-						r.size,
-						r.ecLevel
-					)
+					BarcodeFragment.newInstance(barcode)
 				)
 			}
 		}
-		dataView.fillDataView(text)
+		dataView.fillDataView(text, bytes)
 		stampView.setTrackingLink(bytes, format)
 	}

-	private fun TableLayout.fillDataView(text: String) {
-		val items = LinkedHashMap<Int, String?>()
+	private fun TableLayout.fillDataView(text: String, bytes: ByteArray) {
+		val items = LinkedHashMap<Int, CharSequence?>()
+		when (prefs.showChecksum) {
+			"CRC4" -> items[R.string.crc4] = String.format("%X", crc4(bytes))
+			"MD5" -> items[R.string.md5] = bytes.md5().toHexString().fold()
+			"SHA1" -> items[R.string.sha1] = bytes.sha1().toHexString().fold()
+			"SHA256" -> items[R.string.sha256] = bytes.sha256().toHexString().fold()
+			else -> Unit
+		}
 		if (action is WifiAction) {
 			WifiConnector.parseMap(text)?.let { wifiData ->
 				items.putAll(
@@ -247,7 +300,7 @@ class DecodeFragment : Fragment() {
 	}

 	private fun TableLayout.fillMetaView(scan: Scan) {
-		val items = linkedMapOf(
+		val items = linkedMapOf<Int, 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(),
@@ -258,7 +311,7 @@ class DecodeFragment : Fragment() {
 			R.string.gtin_issue_number to scan.issueNumber,
 		)
 		if (!scan.version.isNullOrBlank()) {
-			val versionString = if (scan.format == "QR_CODE") {
+			val versionString = if (scan.format.name == "QR_CODE") {
 				getString(
 					R.string.qr_version_and_modules,
 					scan.version,
@@ -273,11 +326,18 @@ class DecodeFragment : Fragment() {
 				)
 			)
 		}
+		if (scan.dataMask > -1) {
+			items.putAll(
+				linkedMapOf(
+					R.string.qr_data_mask to scan.dataMask.toString()
+				)
+			)
+		}
 		fill(items)
 	}

 	private fun TableLayout.fill(
-		items: LinkedHashMap<Int, String?>
+		items: LinkedHashMap<Int, CharSequence?>
 	) {
 		removeAllViews()
 		visibility = if (items.isEmpty()) View.GONE else {
@@ -335,7 +395,12 @@ class DecodeFragment : Fragment() {

 			R.id.share_file -> {
 				context?.apply {
-					shareAsFile(if (isBinary) originalBytes else content)
+					val (data, name) = if (isBinary) {
+						Pair(originalBytes, "barcode_content.bin")
+					} else {
+						Pair(content, "barcode_content.txt")
+					}
+					shareAsFile(data, name)
 					maybeBackOrFinish()
 				}
 				true
@@ -467,7 +532,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, "…")

@@ -563,7 +628,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.
@@ -598,3 +663,35 @@ private fun String.fromHtml() = if (
 	@Suppress("DEPRECATION")
 	Html.fromHtml(this)
 }
+
+private fun ByteArray.md5(): ByteArray = MessageDigest.getInstance("MD5").run {
+	update(this@md5)
+	digest()
+}
+
+private fun ByteArray.sha1(): ByteArray = MessageDigest.getInstance("SHA-1").run {
+	update(this@sha1)
+	digest()
+}
+
+private fun ByteArray.sha256(): ByteArray = MessageDigest.getInstance("SHA-256").run {
+	update(this@sha256)
+	digest()
+}
+
+private fun String.fold(): CharSequence {
+	val l = length
+	return if (l > 10) {
+		val half = l / 2
+		val s = substring(0, half) + "\n" + substring(half)
+		SpannableString(s).apply {
+			setSpan(
+				TypefaceSpan("monospace"),
+				0, s.length,
+				Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
+			)
+		}
+	} else {
+		this
+	}
+}
@@ -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,7 +16,6 @@ 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
@@ -27,9 +26,8 @@ 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.Format
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat
 import java.io.InputStream
-import kotlin.math.max
 import kotlin.math.min

 class EncodeFragment : Fragment() {
@@ -38,26 +36,22 @@ 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

 	private val formats = arrayListOf(
-		Format.AZTEC,
-		Format.CODABAR,
-		Format.CODE_39,
-		Format.CODE_128,
-		Format.DATA_MATRIX,
-		Format.EAN_8,
-		Format.EAN_13,
-		Format.ITF,
-		Format.PDF_417,
-		Format.QR_CODE,
-		Format.UPC_A
+		BarcodeFormat.AZTEC,
+		BarcodeFormat.CODABAR,
+		BarcodeFormat.CODE_39,
+		BarcodeFormat.CODE_128,
+		BarcodeFormat.DATA_MATRIX,
+		BarcodeFormat.EAN_8,
+		BarcodeFormat.EAN_13,
+		BarcodeFormat.ITF,
+		BarcodeFormat.PDF_417,
+		BarcodeFormat.QR_CODE,
+		BarcodeFormat.UPC_A
 	)

 	private var minMargin = 0
@@ -124,9 +118,9 @@ class EncodeFragment : Fragment() {
 			) {
 				val format = formats[position]
 				val arrayId = when (format) {
-					Format.AZTEC -> R.array.aztec_error_correction_levels
-					Format.QR_CODE -> R.array.qr_error_correction_levels
-					Format.PDF_417 -> R.array.pdf417_error_correction_levels
+					BarcodeFormat.AZTEC -> R.array.aztec_error_correction_levels
+					BarcodeFormat.QR_CODE -> R.array.qr_error_correction_levels
+					BarcodeFormat.PDF_417 -> R.array.pdf417_error_correction_levels
 					else -> 0
 				}
 				if (arrayId > 0) {
@@ -145,12 +139,13 @@ class EncodeFragment : Fragment() {
 					colorsLabel, colorsSpinner
 				)
 				when (format) {
-					Format.AZTEC -> setMarginBar(4, 4)
-					Format.DATA_MATRIX -> setMarginBar(1, 1)
-					Format.QR_CODE -> setMarginBar(4, 4)
-					Format.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,15 +172,7 @@ 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)

 		contentView = view.findViewById(R.id.content)
 		unescapeCheckBox = view.findViewById(R.id.unescape)
@@ -215,8 +202,8 @@ 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()

 		return view
 	}
@@ -248,44 +235,27 @@ class EncodeFragment : Fragment() {
 		super.onPause()
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
 		prefs.expandEscapeSequences = unescapeCheckBox.isChecked
-		prefs.lastMargin = marginBarView.progress
 	}

 	private fun Context.encode() {
 		hideSoftKeyboard(contentView)
-		val content = if (bytes != null) {
-			bytes
-		} else {
-			var text = contentView.text.toString()
-			if (unescapeCheckBox.isChecked) {
-				try {
-					text = text.unescape()
-				} catch (e: IllegalArgumentException) {
-					toast(e.message ?: "Invalid escape sequence")
-					return
-				}
-			}
-			if (text.isEmpty()) {
-				toast(R.string.error_no_content)
-				return
-			}
-			text
-		}
+		val content = getContent() ?: return
 		val format = formats[formatView.selectedItemPosition]
 		fragmentManager?.addFragment(
 			BarcodeFragment.newInstance(
 				content,
 				format,
-				getSize(sizeBarView.progress),
+				format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
 				when (format) {
-					Format.AZTEC,
-					Format.DATA_MATRIX,
-					Format.QR_CODE,
-					Format.PDF_417 -> marginBarView.progress
+					BarcodeFormat.AZTEC,
+					BarcodeFormat.DATA_MATRIX,
+					BarcodeFormat.QR_CODE,
+					BarcodeFormat.PDF_417 -> if (
+						addQuietZoneSwitch.isChecked
+					) 1 else 0

 					else -> -1
 				},
-				format.getErrorCorrectionLevel(ecSpinner.selectedItemPosition),
 				if (format.canBeInverted()) {
 					colorsSpinner.selectedItemPosition
 				} else 0
@@ -293,68 +263,32 @@ class EncodeFragment : Fragment() {
 		)
 	}

-	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
-				}
-			)
+	private fun Context.getContent(): Any? {
+		if (bytes != null) {
+			return bytes
+		}
+		var text = contentView.text.toString()
+		if (text.isEmpty()) {
+			toast(R.string.error_no_content)
+			return null
+		}
+		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() {
@@ -399,39 +333,39 @@ private fun Boolean.setVisibilityFor(vararg views: View) {
 	}
 }

-private fun Format.packEcLevel(packed: Int, level: Int): Int {
+private fun BarcodeFormat.packEcLevel(packed: Int, level: Int): Int {
 	val s = ecLevelShift()
 	return (level shl s) or (packed and (15 shl s).inv())
 }

-private fun Format.unpackEcLevel(packed: Int) =
+private fun BarcodeFormat.unpackEcLevel(packed: Int) =
 	(packed shr ecLevelShift()) and 15

-private fun Format.ecLevelShift() = when (this) {
-	Format.AZTEC -> 0
-	Format.QR_CODE -> 4
-	Format.PDF_417 -> 8
+private fun BarcodeFormat.ecLevelShift() = when (this) {
+	BarcodeFormat.AZTEC -> 0
+	BarcodeFormat.QR_CODE -> 4
+	BarcodeFormat.PDF_417 -> 8
 	else -> throw IllegalArgumentException("$this does not have error levels")
 }

-private fun Format.canBeInverted() = when (this) {
-	Format.AZTEC,
-	Format.DATA_MATRIX,
-	Format.QR_CODE -> true
+private fun BarcodeFormat.canBeInverted() = when (this) {
+	BarcodeFormat.AZTEC,
+	BarcodeFormat.DATA_MATRIX,
+	BarcodeFormat.QR_CODE -> true

 	else -> false
 }

-private fun String.toFormat(default: Format = Format.QR_CODE): Format = try {
-	Format.valueOf(this)
+private fun String.toFormat(default: BarcodeFormat = BarcodeFormat.QR_CODE): BarcodeFormat = try {
+	BarcodeFormat.valueOf(this)
 } catch (_: IllegalArgumentException) {
 	default
 }

-private fun Format.getErrorCorrectionLevel(position: Int) = when (this) {
-	Format.AZTEC -> position
-	Format.QR_CODE -> (position + 1) * 2
-	Format.PDF_417 -> position
+private fun BarcodeFormat.getErrorCorrectionLevel(position: Int) = when (this) {
+	BarcodeFormat.AZTEC -> position
+	BarcodeFormat.QR_CODE -> (position + 1) * 2
+	BarcodeFormat.PDF_417 -> position
 	else -> 0
 }.coerceIn(0, 8)

@@ -446,8 +380,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)
@@ -461,4 +393,4 @@ private fun InputStream.readBytesMax(max: Int): ByteArray {
 		offset += read
 	}
 	return result
-}
+}
@@ -15,20 +15,43 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.view.ActionMode
 import android.support.v7.widget.SearchView
 import android.support.v7.widget.SwitchCompat
-import android.view.*
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
 import android.widget.EditText
 import android.widget.ListView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.adapter.ScansAdapter
-import de.markusfisch.android.binaryeye.app.*
+import de.markusfisch.android.binaryeye.app.addFragment
+import de.markusfisch.android.binaryeye.app.alertDialog
+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.copyToClipboard
+import de.markusfisch.android.binaryeye.content.shareAsFile
 import de.markusfisch.android.binaryeye.content.shareText
-import de.markusfisch.android.binaryeye.database.*
+import de.markusfisch.android.binaryeye.content.wipeLastShareFile
+import de.markusfisch.android.binaryeye.database.Database
+import de.markusfisch.android.binaryeye.database.exportCsv
+import de.markusfisch.android.binaryeye.database.exportDatabase
+import de.markusfisch.android.binaryeye.database.exportJson
+import de.markusfisch.android.binaryeye.database.use
 import de.markusfisch.android.binaryeye.io.askForFileName
 import de.markusfisch.android.binaryeye.io.toSaveResult
-import de.markusfisch.android.binaryeye.view.*
+import de.markusfisch.android.binaryeye.view.lockStatusBarColor
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
+import de.markusfisch.android.binaryeye.view.unlockStatusBarColor
+import de.markusfisch.android.binaryeye.view.useVisibility
 import de.markusfisch.android.binaryeye.widget.toast
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext

 class HistoryFragment : Fragment() {
 	private lateinit var useHistorySwitch: SwitchCompat
@@ -47,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
@@ -80,7 +107,7 @@ class HistoryFragment : Fragment() {
 					true
 				}

-				R.id.edit_scan -> {
+				R.id.edit_label -> {
 					scansAdapter?.forSelection { id, position ->
 						ac.askForName(
 							id,
@@ -117,6 +144,7 @@ class HistoryFragment : Fragment() {
 	private var filter: String? = null
 	private var clearListMenuItem: MenuItem? = null
 	private var exportHistoryMenuItem: MenuItem? = null
+	private var shareAsFileMenuItem: MenuItem? = null

 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -139,12 +167,16 @@ class HistoryFragment : Fragment() {

 		useHistorySwitch = view.findViewById(
 			R.id.use_history
-		) as SwitchCompat
+		)
 		initHistorySwitch(useHistorySwitch)

 		listView = view.findViewById(R.id.scans)
-		listView.setOnItemClickListener { _, _, _, id ->
-			showScan(id)
+		listView.setOnItemClickListener { _, v, position, id ->
+			if (actionMode != null) {
+				scansAdapter?.select(v, id, position)
+			} else {
+				showScan(id)
+			}
 		}
 		listView.setOnItemLongClickListener { _, v, position, id ->
 			scansAdapter?.select(v, id, position)
@@ -159,12 +191,12 @@ class HistoryFragment : Fragment() {

 		fab = view.findViewById(R.id.share)
 		fab.setOnClickListener { v ->
-			v.context.pickListSeparatorAndShare()
+			v.context.pickListSeparatorAndShare(false)
 		}

 		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()
@@ -176,6 +208,7 @@ class HistoryFragment : Fragment() {
 		super.onDestroy()
 		scansAdapter?.changeCursor(null)
 		parentJob.cancel()
+		wipeLastShareFile()
 	}

 	override fun onPause() {
@@ -185,10 +218,19 @@ class HistoryFragment : Fragment() {

 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_history, menu)
-		initSearchView(menu.findItem(R.id.search))
-		menu.setGroupVisible(R.id.scans_available, scansAdapter?.count != 0)
-		clearListMenuItem = menu.findItem(R.id.clear)
-		exportHistoryMenuItem = menu.findItem(R.id.export_history)
+		val searchMenuItem = menu.findItem(R.id.search)
+		initSearchView(searchMenuItem)
+		val visible = scansAdapter?.count != 0
+		searchMenuItem?.isVisible = visible
+		exportHistoryMenuItem = menu.findItem(R.id.export_history)?.apply {
+			isVisible = visible
+		}
+		shareAsFileMenuItem = menu.findItem(R.id.share_as_file)?.apply {
+			isVisible = visible
+		}
+		clearListMenuItem = menu.findItem(R.id.clear)?.apply {
+			isVisible = visible
+		}
 	}

 	private fun initSearchView(item: MenuItem?) {
@@ -230,6 +272,11 @@ class HistoryFragment : Fragment() {
 				true
 			}

+			R.id.share_as_file -> {
+				context.pickListSeparatorAndShare(true)
+				true
+			}
+
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
@@ -254,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
@@ -267,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)
@@ -283,6 +330,7 @@ class HistoryFragment : Fragment() {
 	private fun enableMenuItems(enabled: Boolean) {
 		clearListMenuItem?.isEnabled = enabled
 		exportHistoryMenuItem?.isEnabled = enabled
+		shareAsFileMenuItem?.isEnabled = enabled
 	}

 	private fun closeActionMode() {
@@ -398,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)
@@ -412,32 +460,44 @@ class HistoryFragment : Fragment() {
 		}
 	}

-	private fun Context.pickListSeparatorAndShare() {
+	private fun Context.pickListSeparatorAndShare(asFile: Boolean) {
 		val separators = resources.getStringArray(
 			R.array.list_separators_values
 		)
 		AlertDialog.Builder(this)
 			.setTitle(R.string.pick_list_separator)
 			.setItems(R.array.list_separators_names) { _, which ->
-				shareScans(separators[which])
+				shareScans(separators[which], asFile)
 			}
 			.show()
 	}

-	private fun shareScans(format: String) = scope.launch {
+	private fun shareScans(format: String, asFile: Boolean) = scope.launch {
 		progressView.useVisibility {
-			var text: String? = null
-			db.getScansDetailed(filter)?.use { cursor ->
+			val selectedIds = scansAdapter?.getSelectedIds()
+			if (selectedIds?.isNotEmpty() == true) {
+				db.getScansDetailed(selectedIds.toLongArray())
+			} else {
+				db.getScansDetailed(filter)
+			}.use { cursor ->
 				val details = format.split(":")
-				text = when (details[0]) {
-					"text" -> cursor.exportText(details[1])
-					"csv" -> cursor.exportCsv(details[1])
-					else -> cursor.exportJson()
+				when (details[0]) {
+					"text" -> Pair(cursor.exportText(details[1]), "txt")
+					"csv" -> Pair(cursor.exportCsv(details[1]), "csv")
+					else -> Pair(cursor.exportJson(), "json")
 				}
-			}
-			text?.let {
-				withContext(Dispatchers.Main) {
-					context.shareText(it)
+			}.let { (text, ext) ->
+				text?.let {
+					withContext(Dispatchers.Main) {
+						if (asFile) {
+							context.shareAsFile(
+								it,
+								String.format("scans.%s", ext)
+							)
+						} else {
+							context.shareText(it)
+						}
+					}
 				}
 			}
 		}
@@ -7,7 +7,9 @@ import android.os.Build
 import android.os.Bundle
 import android.support.annotation.RequiresApi
 import android.support.v4.app.Fragment
-import android.view.*
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
 import android.widget.ArrayAdapter
 import android.widget.ListView
 import de.markusfisch.android.binaryeye.R
@@ -49,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 {
@@ -9,6 +9,7 @@ import de.markusfisch.android.binaryeye.app.prefs
 import de.markusfisch.android.binaryeye.database.Scan
 import de.markusfisch.android.binaryeye.net.sendAsync
 import de.markusfisch.android.binaryeye.preference.UrlPreference
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat

 class UrlDialogFragment : PreferenceDialogFragmentCompat() {
 	private var urlView: TextView? = null
@@ -50,7 +51,7 @@ class UrlDialogFragment : PreferenceDialogFragmentCompat() {
 		Scan(
 			"test",
 			null,
-			"none"
+			BarcodeFormat.NONE
 		).sendAsync(url, prefs.sendScanType) { code, body ->
 			textView.text = when {
 				code != null -> "$code"
@@ -55,17 +55,17 @@ fun Bitmap.crop(
 	pivotX: Float,
 	pivotY: Float
 ) = try {
-	val erected = erect(rotation, pivotX, pivotY)
-	val w = erected.width
-	val h = erected.height
+	val b = rotate(rotation, pivotX, pivotY)
+	val w = b.width
+	val h = b.height
 	val x = max(0, (rect.left * w).roundToInt())
 	val y = max(0, (rect.top * h).roundToInt())
 	Bitmap.createBitmap(
-		erected,
+		b,
 		x,
 		y,
-		min(w - x, (rect.right * w).roundToInt() - x),
-		min(h - y, (rect.bottom * h).roundToInt() - y)
+		min(w, (rect.right * w).roundToInt()) - x,
+		min(h, (rect.bottom * h).roundToInt()) - y
 	)
 } catch (e: OutOfMemoryError) {
 	null
@@ -73,13 +73,11 @@ fun Bitmap.crop(
 	null
 }

-private fun Bitmap.erect(
+private fun Bitmap.rotate(
 	rotation: Float,
 	pivotX: Float,
 	pivotY: Float
-): Bitmap = if (
-	rotation % 360f != 0f
-) {
+): Bitmap = if (rotation % 360f != 0f) {
 	Bitmap.createBitmap(
 		this,
 		0,
@@ -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)
@@ -61,7 +61,6 @@ private fun Context.openExternalOutputStream(
 	fileName: String,
 	mimeType: String
 ): OutputStream = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-	@Suppress("DEPRECATION")
 	val file = File(
 		Environment.getExternalStoragePublicDirectory(
 			Environment.DIRECTORY_DOWNLOADS
@@ -22,7 +22,7 @@ fun beepError() {
 		ToneGenerator.MAX_VOLUME
 	)
 	errorToneGenerator = tg
-	tg.startTone(ToneGenerator.TONE_SUP_ERROR)
+	tg.startTone(ToneGenerator.TONE_SUP_ERROR, 1000)
 }

 fun releaseToneGenerators() {
@@ -69,7 +69,7 @@ private fun Scan.asJson() = JSONObject().apply {
 private fun Scan.getMap(): Map<String, String> = mapOf(
 	"content" to content,
 	"raw" to raw?.toHexString(),
-	"format" to format,
+	"format" to format.name,
 	"errorCorrectionLevel" to errorCorrectionLevel,
 	"version" to version,
 	"sequenceSize" to sequenceSize.toString(),
@@ -0,0 +1,22 @@
+package de.markusfisch.android.binaryeye.os
+
+import android.app.Activity
+import android.view.WindowManager
+
+fun Activity.getScreenBrightness(): Float {
+	val layoutParams = window.attributes
+	return if (layoutParams.screenBrightness == WindowManager.LayoutParams.BRIGHTNESS_OVERRIDE_NONE) {
+		android.provider.Settings.System.getInt(
+			contentResolver,
+			android.provider.Settings.System.SCREEN_BRIGHTNESS
+		) / 255.0f
+	} else {
+		layoutParams.screenBrightness
+	}
+}
+
+fun Activity.setScreenBrightness(brightness: Float) {
+	val layoutParams = window.attributes
+	layoutParams.screenBrightness = brightness
+	window.attributes = layoutParams
+}
@@ -1,34 +1,37 @@
 package de.markusfisch.android.binaryeye.preference

+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.media.ToneGenerator
 import android.os.Build
 import android.preference.PreferenceManager
 import android.support.annotation.RequiresApi
-import de.markusfisch.android.zxingcpp.ZxingCpp.Format
+import de.markusfisch.android.zxingcpp.ZxingCpp.BarcodeFormat

 class Preferences {
 	lateinit var preferences: SharedPreferences

 	var barcodeFormats = setOf(
-		Format.AZTEC.name,
-		Format.CODABAR.name,
-		Format.CODE_39.name,
-		Format.CODE_93.name,
-		Format.CODE_128.name,
-		Format.DATA_BAR.name,
-		Format.DATA_BAR_EXPANDED.name,
-		Format.DATA_MATRIX.name,
-		Format.EAN_8.name,
-		Format.EAN_13.name,
-		Format.ITF.name,
-		Format.MAXICODE.name,
-		Format.PDF_417.name,
-		Format.QR_CODE.name,
-		Format.MICRO_QR_CODE.name,
-		Format.UPC_A.name,
-		Format.UPC_E.name,
+		BarcodeFormat.AZTEC.name,
+		BarcodeFormat.CODABAR.name,
+		BarcodeFormat.CODE_39.name,
+		BarcodeFormat.CODE_93.name,
+		BarcodeFormat.CODE_128.name,
+		BarcodeFormat.DATA_BAR.name,
+		BarcodeFormat.DATA_BAR_EXPANDED.name,
+		BarcodeFormat.DATA_MATRIX.name,
+		BarcodeFormat.DX_FILM_EDGE.name,
+		BarcodeFormat.EAN_8.name,
+		BarcodeFormat.EAN_13.name,
+		BarcodeFormat.ITF.name,
+		BarcodeFormat.MAXICODE.name,
+		BarcodeFormat.PDF_417.name,
+		BarcodeFormat.QR_CODE.name,
+		BarcodeFormat.MICRO_QR_CODE.name,
+		BarcodeFormat.RMQR_CODE.name,
+		BarcodeFormat.UPC_A.name,
+		BarcodeFormat.UPC_E.name,
 	)
 		@RequiresApi(Build.VERSION_CODES.HONEYCOMB)
 		set(value) {
@@ -105,9 +108,9 @@ class Preferences {
 			apply(USE_HISTORY, value)
 			field = value
 		}
-	var ignoreConsecutiveDuplicates = true
+	var ignoreDuplicatesName = "ignore_consecutive_duplicates"
 		set(value) {
-			apply(IGNORE_CONSECUTIVE_DUPLICATES, value)
+			apply(IGNORE_DUPLICATES_NAME, value)
 			field = value
 		}
 	var copyImmediately = false
@@ -130,6 +133,11 @@ class Preferences {
 			apply(SHOW_HEX_DUMP, value)
 			field = value
 		}
+	var showChecksum = ""
+		set(value) {
+			apply(SHOW_CHECKSUM, value)
+			field = value
+		}
 	var showRecreation = true
 		set(value) {
 			apply(SHOW_RECREATION, value)
@@ -150,7 +158,7 @@ class Preferences {
 			apply(OPEN_WITH_URL, value)
 			field = value
 		}
-	var sendScanActive = true
+	var sendScanActive = false
 		set(value) {
 			apply(SEND_SCAN_ACTIVE, value)
 			field = value
@@ -192,12 +200,7 @@ 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 = true
+	var freeRotation = false
 		set(value) {
 			apply(FREE_ROTATION, value)
 			field = value
@@ -207,6 +210,11 @@ class Preferences {
 			apply(EXPAND_ESCAPE_SEQUENCES, value)
 			field = value
 		}
+	var brightenScreen = false
+		set(value) {
+			apply(BRIGHTEN_SCREEN, value)
+			field = value
+		}

 	fun init(context: Context) {
 		preferences = PreferenceManager.getDefaultSharedPreferences(context)
@@ -216,9 +224,14 @@ class Preferences {
 	fun update() {
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
 			preferences.getStringSet(BARCODE_FORMATS, barcodeFormats)?.let {
-				barcodeFormats = it
+				barcodeFormats = addFormatsOnUpdate(
+					it,
+					BarcodeFormat.RMQR_CODE,
+					BarcodeFormat.DX_FILM_EDGE
+				)
 			}
 		}
+
 		cropHandleX = preferences.getInt(CROP_HANDLE_X, cropHandleX)
 		cropHandleY = preferences.getInt(CROP_HANDLE_Y, cropHandleY)
 		cropHandleOrientation = preferences.getInt(
@@ -247,10 +260,17 @@ class Preferences {
 			beepToneName = it
 		}
 		useHistory = preferences.getBoolean(USE_HISTORY, useHistory)
-		ignoreConsecutiveDuplicates = preferences.getBoolean(
-			IGNORE_CONSECUTIVE_DUPLICATES,
-			ignoreConsecutiveDuplicates
-		)
+
+		// Map old setting to new one if it wasn't on default value.
+		val ignoreConsecutiveDuplicates = "ignore_consecutive_duplicates"
+		if (!preferences.getBoolean(ignoreConsecutiveDuplicates, true)) {
+			preferences.edit().remove(ignoreConsecutiveDuplicates).apply()
+			ignoreDuplicatesName = "accept_duplicates"
+		}
+
+		preferences.getString(IGNORE_DUPLICATES_NAME, ignoreDuplicatesName)?.also {
+			ignoreDuplicatesName = it
+		}
 		copyImmediately = preferences.getBoolean(
 			COPY_IMMEDIATELY,
 			copyImmediately
@@ -261,6 +281,9 @@ class Preferences {
 		)
 		showMetaData = preferences.getBoolean(SHOW_META_DATA, showMetaData)
 		showHexDump = preferences.getBoolean(SHOW_HEX_DUMP, showHexDump)
+		preferences.getString(SHOW_CHECKSUM, showChecksum)?.also {
+			showChecksum = it
+		}
 		showRecreation = preferences.getBoolean(SHOW_RECREATION, showRecreation)
 		closeAutomatically = preferences.getBoolean(
 			CLOSE_AUTOMATICALLY,
@@ -303,15 +326,28 @@ 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
 		)
+		brightenScreen = preferences.getBoolean(
+			BRIGHTEN_SCREEN,
+			brightenScreen
+		)
+	}
+
+	private fun addFormatsOnUpdate(
+		restored: Set<String>,
+		vararg formats: BarcodeFormat
+	) = restored.toMutableSet().apply {
+		for (format in formats) {
+			val name = "${format.name}_added"
+			if (!preferences.getBoolean(name, false)) {
+				preferences.edit().putBoolean(name, true).apply()
+				add(format.name)
+			}
+		}
 	}

 	fun beepTone() = when (beepToneName) {
@@ -323,6 +359,12 @@ class Preferences {
 		else -> ToneGenerator.TONE_PROP_BEEP
 	}

+	fun ignoreDuplicates() = when (ignoreDuplicatesName) {
+		"ignore_consecutive_duplicates" -> IgnoreDuplicates.Consecutive
+		"ignore_any_duplicates" -> IgnoreDuplicates.Any
+		else -> IgnoreDuplicates.Never
+	}
+
 	private fun put(label: String, value: Boolean) =
 		preferences.edit().putBoolean(label, value)

@@ -341,6 +383,7 @@ class Preferences {
 		preferences.edit().putInt(label, value).apply()
 	}

+	@SuppressLint("ApplySharedPref")
 	private fun commit(label: String, value: String) {
 		preferences.edit().putString(label, value).commit()
 	}
@@ -351,6 +394,10 @@ class Preferences {
 	}

 	companion object {
+		enum class IgnoreDuplicates {
+			Consecutive, Any, Never
+		}
+
 		private const val BARCODE_FORMATS = "formats"
 		private const val CROP_HANDLE_X = "crop_handle_x"
 		private const val CROP_HANDLE_Y = "crop_handle_y"
@@ -366,11 +413,12 @@ class Preferences {
 		private const val BEEP = "beep"
 		private const val BEEP_TONE_NAME = "beep_tone_name"
 		private const val USE_HISTORY = "use_history"
-		private const val IGNORE_CONSECUTIVE_DUPLICATES = "ignore_consecutive_duplicates"
+		private const val IGNORE_DUPLICATES_NAME = "ignore_duplicates_name"
 		private const val OPEN_IMMEDIATELY = "open_immediately"
 		private const val COPY_IMMEDIATELY = "copy_immediately"
 		private const val SHOW_META_DATA = "show_meta_data"
 		private const val SHOW_HEX_DUMP = "show_hex_dump"
+		private const val SHOW_CHECKSUM = "show_checksum"
 		private const val SHOW_RECREATION = "show_recreation"
 		private const val CLOSE_AUTOMATICALLY = "close_automatically"
 		private const val DEFAULT_SEARCH_URL = "default_search_url"
@@ -383,8 +431,8 @@ 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 BRIGHTEN_SCREEN = "brighten_screen"
 	}
 }
@@ -1,5 +1,6 @@
 package de.markusfisch.android.binaryeye.service

+import android.annotation.SuppressLint
 import android.app.PendingIntent
 import android.content.Intent
 import android.os.Build
@@ -13,17 +14,21 @@ class ScanTileService : TileService() {
 		super.onClick()
 		val intent = Intent(applicationContext, CameraActivity::class.java)
 		intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+		// TileService#startActivityAndCollapse(Intent) is only ever run
+		// below UpsideDownCake, but Lint doesn't understand this yet.
+		@SuppressLint("StartActivityAndCollapseDeprecated")
 		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
 			@Suppress("DEPRECATION")
 			startActivityAndCollapse(intent)
 		} else {
-			val pendingIntent = PendingIntent.getActivity(
-				this,
-				0,
-				intent,
-				PendingIntent.FLAG_IMMUTABLE
+			startActivityAndCollapse(
+				PendingIntent.getActivity(
+					this,
+					0,
+					intent,
+					PendingIntent.FLAG_IMMUTABLE
+				)
 			)
-			startActivityAndCollapse(pendingIntent)
 		}
 	}
 }
@@ -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()
 }
@@ -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(
@@ -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() {
@@ -2,7 +2,12 @@ package de.markusfisch.android.binaryeye.widget

 import android.annotation.SuppressLint
 import android.content.Context
-import android.graphics.*
+import android.graphics.Canvas
+import android.graphics.Paint
+import android.graphics.Path
+import android.graphics.Point
+import android.graphics.Rect
+import android.graphics.Region
 import android.os.Build
 import android.os.Parcel
 import android.os.Parcelable
@@ -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)}…"
@@ -0,0 +1,4 @@
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+	<background android:drawable="@color/accent"/>
+	<foreground android:drawable="@drawable/ic_shortcut_history_foreground"/>
+</adaptive-icon>
@@ -0,0 +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="#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>
@@ -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="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>
@@ -0,0 +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.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>
@@ -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"
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -13,6 +13,17 @@
 			android:layout_height="wrap_content"
 			android:orientation="vertical"
 			android:padding="16dp">
+			<EditText
+				android:id="@+id/label"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:gravity="start|top"
+				android:hint="@string/label"
+				android:imeOptions="flagNoExtractUi"
+				android:importantForAutofill="no"
+				android:inputType="text"
+				tools:ignore="UnusedAttribute"/>
 			<EditText
 				android:id="@+id/content"
 				android:layout_width="match_parent"
@@ -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
@@ -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"/>
@@ -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"
@@ -1,6 +1,11 @@
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:material="http://schemas.android.com/apk/res-auto">
+	<item
+		android:id="@+id/add_to_history"
+		android:title="@string/add_to_history"
+		android:icon="@drawable/ic_action_history_add"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/copy_to_clipboard"
 		android:title="@string/copy_to_clipboard"
@@ -11,4 +16,10 @@
 		android:title="@string/export_to_file"
 		android:icon="@drawable/ic_action_save"
 		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/brighten_screen"
+		android:title="@string/brighten_screen"
+		android:icon="@drawable/ic_action_bright"
+		android:checkable="true"
+		material:showAsAction="ifRoom"/>
 </menu>
@@ -1,23 +1,25 @@
 <menu
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:material="http://schemas.android.com/apk/res-auto">
-	<group android:id="@+id/scans_available"
-		android:visible="false">
-		<item
-			android:id="@+id/search"
-			android:icon="@drawable/ic_action_search"
-			android:title="@string/search_scan"
-			material:actionViewClass="android.support.v7.widget.SearchView"
-			material:showAsAction="collapseActionView|always"/>
-		<item
-			android:id="@+id/export_history"
-			android:icon="@drawable/ic_action_export"
-			android:title="@string/export_to_file"
-			material:showAsAction="ifRoom"/>
-		<item
-			android:id="@+id/clear"
-			android:icon="@drawable/ic_action_remove"
-			android:title="@string/clear_history"
-			material:showAsAction="ifRoom"/>
-	</group>
+	<item
+		android:id="@+id/search"
+		android:icon="@drawable/ic_action_search"
+		android:title="@string/search_scan"
+		material:actionViewClass="android.support.v7.widget.SearchView"
+		material:showAsAction="collapseActionView|always"/>
+	<item
+		android:id="@+id/export_history"
+		android:icon="@drawable/ic_action_export"
+		android:title="@string/export_to_file"
+		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/share_as_file"
+		android:icon="@drawable/ic_action_share"
+		android:title="@string/share_file"
+		material:showAsAction="ifRoom"/>
+	<item
+		android:id="@+id/clear"
+		android:icon="@drawable/ic_action_remove"
+		android:title="@string/clear_history"
+		material:showAsAction="ifRoom"/>
 </menu>
@@ -7,8 +7,8 @@
 		android:icon="@drawable/ic_action_copy"
 		material:showAsAction="ifRoom"/>
 	<item
-		android:id="@+id/edit_scan"
-		android:title="@string/edit_scan"
+		android:id="@+id/edit_label"
+		android:title="@string/edit_label"
 		android:icon="@drawable/ic_action_edit"
 		material:showAsAction="ifRoom"/>
 	<item
@@ -0,0 +1,217 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+	<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&#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="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">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="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="size_no_magnification">بدون تكبير</string>
+	<string name="add_quiet_zone">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">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">مسح %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 and simply add content</string>
+	<string name="send_type_get_query_string">GET with complete query string</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>
+</resources>
@@ -14,6 +14,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="colors">Преден и заден план</string>
 	<string name="colors_black_on_white">Черно на бяло</string>
 	<string name="colors_white_on_black">Бяло на черно</string>
@@ -28,6 +29,7 @@
 	<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">Data mask</string>
 	<string name="toggle_flash">Превключване на светкавицата</string>
 	<string name="error_flash">Грешка при превключването на светкавицата</string>
 	<string name="share">Сподели</string>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Въведете съдържание тук</string>
 	<string name="unescape">Разширете последователности за извеждане</string>
 	<string name="encode">КОДИРАНЕ</string>
@@ -56,6 +59,9 @@
 	<string name="bulk_mode_delay">Забавяне между непрекъснатите сканирания</string>
 	<string name="restrict_format">Ограничаване на формат</string>
 	<string name="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">Сканиране %s</string>
 	<string name="quarter_second">Червърт секунда</string>
 	<string name="half_second">Половин секунда</string>
@@ -93,8 +99,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_consecutive_duplicates">Игнориране на дубликатите</string>
-	<string name="ignore_consecutive_duplicates_summary">Не запазва последователни дубликати в хронологията на сканирането.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">Отваряй внезапно</string>
 	<string name="open_immediately_summary">Пропуска проверката и внезапно отваря съдържанието. Може да отвори вредно съдържание, ако е активирано.</string>
 	<string name="copy_immediately">Поставяй в клипборда</string>
@@ -103,6 +111,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_recreation">Показване на пресъздаден баркод</string>
 	<string name="show_recreation_summary">Създай и покажи баркод отново от прочетеното съдържание, ако е възможно.</string>
 	<string name="close_automatically">Върщане се след Копиране/Споделяне</string>
@@ -133,12 +143,15 @@
 	<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="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_scan">Редактиране на етикет</string>
+	<string name="edit_label">Редактиране на етикет</string>
 	<string name="remove_scan">Премахване на сканиране</string>
 	<string name="enter_name">Въведете име, за да опишете сканирането</string>
 	<string name="enter_name_hint">Име на сканирането</string>
@@ -166,6 +179,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="export_to_file">Извеждане в файл</string>
 	<string name="export_as">Извеждане като?</string>
 	<string name="export_csv_comma">CSV файл със запетаи</string>
@@ -180,6 +195,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_preferences">Настройки</string>
 	<string name="background_request_failed">Неуспешна заявка в фонов режим</string>
 	<string name="entry_type">Тип</string>
@@ -14,6 +14,7 @@
 	<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>
@@ -28,6 +29,7 @@
 	<string name="gtin_add_on">ইউপিসি ইএএন বর্ধিত</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">Data mask</string>
 	<string name="toggle_flash">আলো</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">ভাগ করো</string>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">এখানে তথ্য দাও</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">সংকেতকরণ</string>
@@ -56,6 +59,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>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">ইতিহাস সংরক্ষণ করো।</string>
 	<string name="use_history_summary">সনাক্তকৃত সংকেত যন্ত্রে সংরক্ষণ করো।</string>
+	<string name="ignore_duplicates">Ignore duplicates</string>
 	<string name="ignore_consecutive_duplicates">দ্বিত্ব উপেক্ষা করো</string>
-	<string name="ignore_consecutive_duplicates_summary">দুইটা ইতিহাস সংরক্ষণ করবে না।</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">সাথে সাথে খুলো</string>
 	<string name="open_immediately_summary">না দেখে সাথে সাথে খুলো। সক্রিয় থাকলে ক্ষতিকারক তথ্য খুলতে পারে।</string>
 	<string name="copy_immediately">ক্লিপবোর্ডে রাখো</string>
@@ -103,6 +111,8 @@
 	<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="close_automatically">অনুলিপি/ভাগ করার পরে পিছনে যাও</string>
@@ -133,12 +143,15 @@
 	<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">আসলেই এটা মুছবে?</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_scan">চিহ্ন সম্পাদনা করো</string>
+	<string name="edit_label">চিহ্ন সম্পাদনা করো</string>
 	<string name="remove_scan">পাঠোদ্ধার মুছো</string>
 	<string name="enter_name">পাঠোদ্ধার ব্যাখ্যা করতে একটা নাম দাও</string>
 	<string name="enter_name_hint">পাঠোদ্ধারের নাম</string>
@@ -166,6 +179,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="export_to_file">নথিতে রপ্তানি করো</string>
 	<string name="export_as">রপ্তানির ধরণ?</string>
 	<string name="export_csv_comma">কমাসহ সিএসভি(.csv) নথি</string>
@@ -180,6 +195,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_preferences">পছন্দসমূহ</string>
 	<string name="background_request_failed">পটভূমির অনুরোধ ব্যর্থ</string>
 	<string name="entry_type">Type</string>
@@ -16,6 +16,7 @@
 	<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="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>
@@ -30,6 +31,7 @@
 	<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">Data mask</string>
 	<string name="toggle_flash">Přepnout blesk</string>
 	<string name="error_flash">Zapnutí/vypnutí blesku selhalo</string>
 	<string name="share">Sdílet</string>
@@ -44,7 +46,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</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>
@@ -58,6 +61,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">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">Naskenovat %s</string>
 	<string name="quarter_second">Čtvrt sekundy</string>
 	<string name="half_second">Půl sekundy</string>
@@ -95,8 +101,10 @@
 	<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_consecutive_duplicates">Ignorovat duplikáty</string>
-	<string name="ignore_consecutive_duplicates_summary">Další skeny stejného kódu se nebudou ukládat.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</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>
@@ -105,6 +113,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_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>
@@ -135,12 +145,15 @@
 	<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="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>
 	<string name="clear_history">Vymazat historii</string>
 	<string name="copy_scan">Zkopírovat sken</string>
-	<string name="edit_scan">Upravit popisek</string>
+	<string name="edit_label">Upravit popisek</string>
 	<string name="remove_scan">Odstranit sken</string>
 	<string name="enter_name">Napište název popisující sken</string>
 	<string name="enter_name_hint">Název skenu</string>
@@ -168,6 +181,8 @@
 	<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="export_to_file">Exportovat do souboru</string>
 	<string name="export_as">Exportovat jako</string>
 	<string name="export_csv_comma">CSV oddělené čárkami</string>
@@ -182,6 +197,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_preferences">Nastavení</string>
 	<string name="background_request_failed">Požadavek na pozadí selhal</string>
 	<string name="entry_type">Typ</string>
@@ -14,6 +14,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="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>
@@ -28,6 +29,7 @@
 	<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>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Indtast indhold her</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">INDKOD</string>
@@ -56,6 +59,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 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">Et kvart sekund</string>
 	<string name="half_second">Et halvt sekund</string>
@@ -93,8 +99,10 @@
 	<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_consecutive_duplicates">Ignorer dubletter</string>
-	<string name="ignore_consecutive_duplicates_summary">Gem ikke fortløbende dubletter i scanningshistorikken.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">Åbn straks</string>
 	<string name="open_immediately_summary">Spring inspektion over og åbn indholdet med det samme. Kan åbne skadeligt indhold, hvis det er aktiveret.</string>
 	<string name="copy_immediately">Læg i udklipsholderen</string>
@@ -103,6 +111,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_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>
@@ -133,12 +143,15 @@
 	<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">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>
 	<string name="clear_history">Ryd historik</string>
 	<string name="copy_scan">Kopier scanning</string>
-	<string name="edit_scan">Rediger etiket</string>
+	<string name="edit_label">Rediger etiket</string>
 	<string name="remove_scan">Fjern scanning</string>
 	<string name="enter_name">Indtast et navn for at beskrive scanningen</string>
 	<string name="enter_name_hint">Navn på scanningen</string>
@@ -166,6 +179,8 @@
 	<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="export_to_file">Eksporter til fil</string>
 	<string name="export_as">Eksporter som?</string>
 	<string name="export_csv_comma">CSV-fil med kommaer</string>
@@ -180,6 +195,7 @@
 	<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_preferences">Indstillinger</string>
 	<string name="background_request_failed">Baggrundsanmodning mislykkedes</string>
 	<string name="entry_type">Type</string>
@@ -2,6 +2,7 @@
 	<string-array name="search_engines_names">
 		<item>@string/always_ask</item>
 		<item>Google</item>
+		<item>Brave Search</item>
 		<item>DuckDuckGo</item>
 		<item>Qwant</item>
 		<item>Bing</item>
@@ -16,6 +17,7 @@
 	<string-array name="search_engines_values">
 		<item></item>
 		<item>https://www.google.de/search?q=</item>
+		<item>https://search.brave.com/search?q=</item>
 		<item>https://duckduckgo.com/?q=</item>
 		<item>https://www.qwant.com/?q=</item>
 		<item>https://bing.com/?q=</item>
@@ -14,6 +14,7 @@
 	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; wiederherstellbar)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; wiederherstellbar)</string>
 	<string name="error_correction_level_h" formatted="false">High (~30&#37; wiederherstellbar)</string>
+	<string name="label">Bezeichnung</string>
 	<string name="colors">Vor und Hintergrund</string>
 	<string name="colors_black_on_white">Schwarz auf Weiß</string>
 	<string name="colors_white_on_black">Weiß auf Schwarz</string>
@@ -28,6 +29,7 @@
 	<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>
@@ -42,7 +44,8 @@
 	<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>
@@ -56,6 +59,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>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Codes speichern</string>
 	<string name="use_history_summary">Eingelesene Barcodes auf dem Gerät speichern.</string>
-	<string name="ignore_consecutive_duplicates">Duplikate ignorieren</string>
-	<string name="ignore_consecutive_duplicates_summary">Aufeinanderfolgende Duplikate werden nicht in der Scan-Historie gespeichert.</string>
+	<string name="ignore_duplicates">Ignoriere Duplikate</string>
+	<string name="ignore_consecutive_duplicates">Aufeinanderfolgende Duplikate</string>
+	<string name="ignore_any_duplicates">Jedes Duplicat</string>
+	<string name="accept_duplicates">Akzeptiere Duplikate</string>
 	<string name="open_immediately">Inhalte sofort öffnen</string>
 	<string name="open_immediately_summary">Inspektion überspringen und Inhalt sofort öffnen. Kann schädliche Inhalte öffnen, wenn aktiviert.</string>
 	<string name="copy_immediately">Automatisch in Zwischenablage</string>
@@ -103,6 +111,8 @@
 	<string name="show_meta_data_summary">Zusätzliche Daten über den eingelesenen Barcode anzeigen.</string>
 	<string name="show_hex_dump">Hex Dump anzeigen</string>
 	<string name="show_hex_dump_summary">Zeigt einen Hexdump des eingelesenen Inhalts an.</string>
+	<string name="show_checksum">Prüfsumme anzeigen</string>
+	<string name="no_checksum">Keine Prüfsumme anzeigen</string>
 	<string name="show_recreation">Wiederhergestellten Barcode anzeigen</string>
 	<string name="show_recreation_summary">Barcode aus dem gelesenen Inhalt wiederherstellen und anzeigen, wenn möglich.</string>
 	<string name="close_automatically">Automatisch zurückkehren</string>
@@ -133,12 +143,15 @@
 	<string name="bluetooth_connect_fail">Es kann leider keine Verbindung zum Bluetooth-Gerät hergestellt werden</string>
 	<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">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>
 	<string name="really_remove_selected_scans">Alle ausgewählten Codes entfernen?</string>
 	<string name="clear_history">Gespeicherte Codes löschen</string>
 	<string name="copy_scan">Code kopieren</string>
-	<string name="edit_scan">Bezeichnung ändern</string>
+	<string name="edit_label">Bezeichnung ändern</string>
 	<string name="remove_scan">Code löschen</string>
 	<string name="enter_name">Geben Sie eine Bezeichnung für den Code ein</string>
 	<string name="enter_name_hint">Bezeichung des Codes</string>
@@ -166,6 +179,8 @@
 	<string name="otpauth_add">2FA hinzufügen</string>
 	<string name="search_web">Suche im Internet</string>
 	<string name="search_scan">Code suchen</string>
+	<string name="add_to_history">Zu gespeicherten Codes hinzufügen</string>
+	<string name="added_to_history">Zu den gespeicherten Codes hinzugefügt</string>
 	<string name="export_to_file">In Datei exportieren</string>
 	<string name="export_as">Exportieren als?</string>
 	<string name="export_csv_comma">CSV Datei mit Kommas</string>
@@ -180,6 +195,7 @@
 	<string name="pick_code_to_scan">Code im Bild auswählen</string>
 	<string name="shortcut_decode">Barcode lesen</string>
 	<string name="shortcut_encode">Barcode erstellen</string>
+	<string name="shortcut_history">Verlauf</string>
 	<string name="shortcut_preferences">Einstellungen</string>
 	<string name="background_request_failed">Hintergrundanfrage fehlgeschlagen</string>
 	<string name="entry_type">Typ</string>
@@ -1,7 +1,7 @@
 <resources>
 	<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 de barras</string>
-	<string name="compose_barcode">Componer código de barras</string>
+	<string name="scan_code">Escanear código</string>
+	<string name="compose_barcode">Componer código</string>
 	<string name="decode_barcode">Decodificar código de barras</string>
 	<string name="content">Contenido</string>
 	<string name="binary_data">(datos binarios)</string>
@@ -14,24 +14,26 @@
 	<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="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">Label</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>
+	<string name="colors_black_on_transparent">Negro sobre transparente</string>
+	<string name="colors_white_on_transparent">Blanco sobre transparente</string>
+	<string name="sequence_size">Tamaño secuencia</string>
+	<string name="sequence_index">Índice secuencia</string>
+	<string name="sequence_id">ID secuencia</string>
 	<string name="gtin_issue_number">Número de emisión</string>
 	<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="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modulos)</string>
+	<string name="qr_data_mask">Data mask</string>
 	<string name="toggle_flash">Activar el flash</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Error activando flash</string>
 	<string name="share">Compartir</string>
-	<string name="share_file">Share as file</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="copied_to_clipboard">Copiado al portapapeles</string>
@@ -39,23 +41,27 @@
 	<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">Elija un motor de búsqueda</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">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">Introduzca el contenido aquí</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Expandir secuencia de escape</string>
 	<string name="encode">CODIFICAR</string>
 	<string name="error_no_content">Contenido no disponible</string>
 	<string name="error_encoding_barcode">No se pudo generar el código de barras</string>
 	<string name="view_barcode">Ver código de barras</string>
 	<string name="info">Información</string>
 	<string name="switch_camera">Cambiar cámara</string>
-	<string name="bulk_mode">Escanear constantemente</string>
-	<string name="bulk_mode_summary">Siempre iniciar escaneando constantemente</string>
+	<string name="bulk_mode">Escaneo continuo</string>
+	<string name="bulk_mode_summary">Iniciar siempre en modo de escaneo continuo</string>
 	<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">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">Escanear %s</string>
 	<string name="quarter_second">Un cuarto de segundo</string>
 	<string name="half_second">Medio segundo</string>
@@ -69,55 +75,59 @@
 	<string name="locale_category">Idioma</string>
 	<string name="custom_locale">Idioma personalizado</string>
 	<string name="follow_system_settings">Seguir los ajustes del sistema</string>
-	<string name="show_crop_handle">Mostrar el delimitador de recorte</string>
-	<string name="show_crop_handle_summary">Restringir el escaneo a una región personalizable.</string>
+	<string name="show_crop_handle">Mostrar delimitador de recorte</string>
+	<string name="show_crop_handle_summary">Permite personalizar la región a escanear.</string>
 	<string name="barcode_formats">Formatos de códigos de barras</string>
-	<string name="zoom_by_swiping">Deslice hacia arriba/abajo para ampliar</string>
-	<string name="zoom_by_swiping_summary">Deslice su dedo hacia arriba o abajo en la pantalla para controlar el aumento de la cámara.</string>
-	<string name="auto_rotate">Reconocer los códigos de barras 1D verticalmente</string>
-	<string name="auto_rotate_summary">Rotar automáticamente el marco de la cámara para reconocer los códigos de barras 1D verticales. Dependiendo del dispositivo, esto puede afectar al rendimiento.</string>
+	<string name="zoom_by_swiping">Ampliar deslizando arriba/abajo</string>
+	<string name="zoom_by_swiping_summary">Deslice el dedo hacia arriba o abajo sobre la pantalla para controlar el zoom de la cámara.</string>
+	<string name="auto_rotate">Reconocer códigos 1D verticales</string>
+	<string name="auto_rotate_summary">Rota automáticamente el marco de la cámara para reconocer los códigos de barras 1D verticales. Dependiendo del dispositivo, podría afectar al rendimiento.</string>
 	<string name="try_harder">Optimizar la precisión del lector</string>
 	<string name="try_harder_summary">Active esta opción para códigos muy difíciles de leer. Esto afectará al rendimiento.</string>
 	<string name="show_toast_in_bulk_mode">Mostrar datos en el modo constante</string>
 	<string name="show_toast_in_bulk_mode_summary">Mostrar brevemente los datos escaneados al escanear constantemente. </string>
-	<string name="vibrate">Vibrar al detectar</string>
-	<string name="vibrate_summary">Active esta opción si desea que su dispositivo vibre cuando se reconozca un código.</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="vibrate">Vibración al detectar</string>
+	<string name="vibrate_summary">El dispositivo vibra cuando se reconoce un código.</string>
+	<string name="beep">Sonido al detectar</string>
+	<string name="beep_summary">El dispositivo emite un sonido cuando se reconoce un código.</string>
+	<string name="beep_tone">Sonido</string>
+	<string name="tone_cdma_confirm">Confirmar CDMA</string>
+	<string name="tone_sup_confirm">Confirmar llamada de supervisión</string>
+	<string name="tone_sup_radio_ack">Reconocer ruta de radio de llamada de supervisión</string>
+	<string name="tone_prop_ack">Reconocimiento positivo</string>
+	<string name="tone_prop_beep">Sonido general</string>
+	<string name="tone_prop_beep2">Sonido doble general</string>
 	<string name="use_history">Guardar historial de escaneo</string>
-	<string name="use_history_summary">Guardar códigos reconocidos en su dispositivo.</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_consecutive_duplicates">Ignorar duplicados</string>
-	<string name="ignore_consecutive_duplicates_summary">No guarde duplicados consecutivos en el historial de escaneo.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">Abrir inmediatamente</string>
-	<string name="open_immediately_summary">Omite la inspección y abre el contenido inmediatamente. Puede abrir contenido dañino si está activado.</string>
-	<string name="copy_immediately">Poner en el portapapeles</string>
-	<string name="copy_immediately_summary">Copiar contenido al portapapeles automáticamente. Ten en cuenta que otras aplicaciones pueden husmear en tu portapapeles en segundo plano.</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>
+	<string name="copy_immediately_summary">Copia automáticamente el contenido al portapapeles. Ten en cuenta que otras aplicaciones pueden husmear en tu portapapeles en segundo plano.</string>
 	<string name="show_meta_data">Mostrar metadatos</string>
-	<string name="show_meta_data_summary">Mostrar datos adicionales del código escaneado.</string>
-	<string name="show_hex_dump">Mostrar dump hexadecimal</string>
-	<string name="show_hex_dump_summary">Mostrar un dump hexadecimal del contenido escaneado.</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">Retroceder luego de Copiar/Compartir</string>
-	<string name="close_automatically_summary">Regresar automáticamente a la pantalla de escaneo luego de copiar o compartir el contenido leído.</string>
+	<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_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>
+	<string name="close_automatically_summary">Retrocede automáticamente a la pantalla de escaneo después de copiar o compartir el contenido leído.</string>
 	<string name="default_search_engine">Abrir datos desconocidos en</string>
 	<string name="always_ask">Preguntar siempre</string>
-	<string name="open_with_url">Abrir datos desconocidos con la URL</string>
-	<string name="clear_network_suggestions">Borrar las sugerencias de red</string>
-	<string name="clear_network_suggestions_summary">Elimina todas las sugerencias de red previamente proporcionadas por esta aplicación.</string>
+	<string name="open_with_url">Abrir datos desconocidos en la URL</string>
+	<string name="clear_network_suggestions">Eliminar sugerencias de red</string>
+	<string name="clear_network_suggestions_summary">Elimina todas las sugerencias de red proporcionadas por esta aplicación.</string>
 	<string name="really_remove_all_networks">¿Realmente eliminar todas las redes?</string>
 	<string name="clear_network_suggestions_success">Sugerencias de red eliminadas</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nada que eliminar</string>
 	<string name="send_category">Reenvío</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>
+	<string name="send_scan_active">Enviar escaneos</string>
+	<string name="send_scan_active_summary">Habilita el envío de escaneos a una URL</string>
 	<string name="send_scan_url">Enviar todo escaneo a la URL</string>
 	<string name="send_scan_type">Tipo de solicitud para cada escaneo</string>
 	<string name="send_type_get_add_content">GET y solo añadir contenido</string>
@@ -126,20 +136,23 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Abrir en el navegador</string>
 	<string name="test_url">URL de prueba</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">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="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="really_remove_scan">¿Realmente desea borrar el escaneo seleccionado?</string>
-	<string name="really_remove_all_scans">¿Realmente desea borrar todo lo escaneado?</string>
-	<string name="really_remove_selected_scans">¿Realmente desea borrar los escaneos seleccionados?</string>
-	<string name="clear_history">Borrar el historial</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="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>
+	<string name="clear_history">Eliminar el historial</string>
 	<string name="copy_scan">Copiar escaneo</string>
-	<string name="edit_scan">Editar etiqueta</string>
-	<string name="remove_scan">Borrar escaneo</string>
+	<string name="edit_label">Editar etiqueta</string>
+	<string name="remove_scan">Eliminar escaneo</string>
 	<string name="enter_name">Introduzca un nombre para describir el escaneo</string>
 	<string name="enter_name_hint">Nombre del escaneo</string>
 	<string name="no_barcode_found">No se encontró ningún código de barras</string>
@@ -154,7 +167,7 @@
 	<string name="wifi_config_failed">No se pudo configurar el Wifi</string>
 	<string name="wifi_added">Wifi añadido</string>
 	<string name="sms_send">Enviar SMS</string>
-	<string name="sms_error">No se puedo enviar SMS</string>
+	<string name="sms_error">No se pudo enviar SMS</string>
 	<string name="tel_dial">Marcar número</string>
 	<string name="tel_error">No se pudo marcar el número</string>
 	<string name="mail_send">Enviar correo</string>
@@ -166,6 +179,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="export_to_file">Exportar a archivo</string>
 	<string name="export_as">¿Exportar como?</string>
 	<string name="export_csv_comma">Archivo CSV con comas</string>
@@ -174,16 +189,17 @@
 	<string name="export_database">Base de datos SQLite</string>
 	<string name="saved_in_downloads">Guardado en Descargas</string>
 	<string name="rotate_image_cw">Rotar la imagen en sentido horario</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="toggle_free_rotation">Activar rotación libre</string>
+	<string name="pick_file">Seleccionar archivo</string>
 	<string name="pick_image_file">Seleccionar imagen</string>
 	<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_preferences">Ajustes</string>
 	<string name="background_request_failed">Solicitud de fondo fallida</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Red wi-fi</string>
+	<string name="entry_type">Tipo</string>
+	<string name="wifi_network">Red WiFi</string>
 	<string name="wifi_ssid">Nombre</string>
 	<string name="wifi_type">Tipo de autenticación</string>
 	<string name="wifi_password">Contraseña</string>
@@ -191,7 +207,7 @@
 	<string name="wifi_eap">Método EAP</string>
 	<string name="wifi_anonymous_identity">Identidad anónima</string>
 	<string name="wifi_identity">Identidad</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="wifi_phase2">Método Phase 2</string>
+	<string name="network_suggestions">Sugerencias de red</string>
+	<string name="remove_suggestion">Eliminar sugerencia</string>
 </resources>
@@ -2,6 +2,7 @@
 	<string-array name="search_engines_names">
 		<item>@string/always_ask</item>
 		<item>گوگل</item>
+		<item>Brave Search</item>
 		<item>داک‌داک‌گو</item>
 		<item>Qwant</item>
 		<item>بینگ</item>
@@ -16,6 +17,7 @@
 	<string-array name="search_engines_values">
 		<item></item>
 		<item>https://www.google.com/search?q=</item>
+		<item>https://search.brave.com/search?q=</item>
 		<item>https://duckduckgo.com/?q=</item>
 		<item>https://www.qwant.com/?q=</item>
 		<item>https://bing.com/?q=</item>
@@ -14,6 +14,7 @@
 	<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>
@@ -28,6 +29,7 @@
 	<string name="gtin_add_on">UPC EAN extension</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">Data mask</string>
 	<string name="toggle_flash">روشن/خاموش کردن چراغ</string>
 	<string name="error_flash">خطا هنگام روشن/خاموش کردن چراغ</string>
 	<string name="share">هم‌رسانی</string>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">محتویات ورودی را اینجا بنویسید</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">رمزگذاری</string>
@@ -56,6 +59,9 @@
 	<string name="bulk_mode_delay">تأخیر بین پویش‌های مداوم</string>
 	<string name="restrict_format">محدود کردن قالب</string>
 	<string name="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">پویش %s</string>
 	<string name="quarter_second">یک‌چهارم ثانیه</string>
 	<string name="half_second">نیم ثانیه</string>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">ذخیرهٔ تاریخچهٔ پویش</string>
 	<string name="use_history_summary">کدهای شناسایی شده را در همین دستگاه ذخیره می‌کند.</string>
+	<string name="ignore_duplicates">Ignore duplicates</string>
 	<string name="ignore_consecutive_duplicates">نادیده گرفتن موارد تکراری</string>
-	<string name="ignore_consecutive_duplicates_summary">موارد تکراری متوالی را در تاریخچهٔ پویش ذخیره نمی‌کند.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">گشودن بلافاصله</string>
 	<string name="open_immediately_summary">بازرسی را رها کنید و محتویات را فورا باز کنید. در صورت فعال بودن ممکن است محتوای مضر را باز کند.</string>
 	<string name="copy_immediately">قرار دادن در تخته‌گیره</string>
@@ -103,6 +111,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_recreation">Show recreated barcode</string>
 	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">بازگشت پس از رونوشت یا هم‌رسانی</string>
@@ -133,12 +143,15 @@
 	<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">برای برداشتن پویش مطمئنید؟</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_scan">ویرایش عنوان</string>
+	<string name="edit_label">ویرایش عنوان</string>
 	<string name="remove_scan">برداشتن پویش</string>
 	<string name="enter_name">یک نام برای توضیح پویش وارد کنید</string>
 	<string name="enter_name_hint">نام پویش</string>
@@ -166,6 +179,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="export_to_file">برون‌ریزی به پرونده</string>
 	<string name="export_as">برون‌ریزی به عنوان؟</string>
 	<string name="export_csv_comma">پروندهٔ سی‌اس‌وی با ویرگول</string>
@@ -180,6 +195,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_preferences">تنظیمات</string>
 	<string name="background_request_failed">درخواست پس‌زمینه انجام نشد</string>
 	<string name="entry_type">گونه</string>
@@ -7,7 +7,6 @@
 	<string name="binary_data">(données binaires)</string>
 	<plurals name="barcode_info">
 		<item quantity="one">%2$d caractère, %1$s</item>
-		<item quantity="many">%2$d caractères, %1$s</item>
 		<item quantity="other">%2$d caractères, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Niveau de correction d\'erreur</string>
@@ -15,6 +14,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="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,6 +29,7 @@
 	<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">Data mask</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>
@@ -43,7 +44,8 @@
 	<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">Add quiet zone</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,6 +59,9 @@
 	<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="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">Un quart de seconde</string>
 	<string name="half_second">Une demi-seconde</string>
@@ -74,7 +79,7 @@
 	<string name="show_crop_handle_summary">Restreindre le scan à une zone personnalisée.</string>
 	<string name="barcode_formats">Formats de codes-barres</string>
 	<string name="zoom_by_swiping">Balayage haut/bas pour zoomer</string>
-	<string name="zoom_by_swiping_summary">Balayer vers le haut ou vers le bas de l’écran pour contrôler le niveau de zoom de la caméra.</string>
+	<string name="zoom_by_swiping_summary">Balayer vers le haut ou vers le bas de l\'écran pour contrôler le niveau de zoom de la caméra.</string>
 	<string name="auto_rotate">Reconnaître les codes-barres 1D verticaux</string>
 	<string name="auto_rotate_summary">Tourner automatiquement le cadre de la caméra pour reconnaître les codes-barres 1D verticaux. En fonction de l\'appareil, cela peut affecter les performances.</string>
 	<string name="try_harder">Optimiser la précision du lecteur</string>
@@ -94,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</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_consecutive_duplicates">Ignorer les doublons</string>
-	<string name="ignore_consecutive_duplicates_summary">Ne pas sauvegarder les doublons dans l\'historique des scans.</string>
+	<string name="ignore_duplicates">Ignorer les doublons</string>
+	<string name="ignore_consecutive_duplicates">Ignorer les doublons consécutifs</string>
+	<string name="ignore_any_duplicates">Ignorer tous les doublons</string>
+	<string name="accept_duplicates">Autoriser les doublons</string>
 	<string name="open_immediately">Ouvrir immédiatement</string>
 	<string name="open_immediately_summary">Ignorer l\'inspection et ouvrir le contenu immédiatement. Si cette option est activée, cela peut ouvrir un contenu nocif.</string>
 	<string name="copy_immediately">Copier dans le presse-papiers</string>
@@ -104,13 +111,15 @@
 	<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">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>
 	<string name="close_automatically_summary">Revenir automatiquement sur l\'écran de scan après avoir copié ou partagé le contenu scanné.</string>
 	<string name="default_search_engine">Ouvrir les données inconnues dans</string>
 	<string name="always_ask">Toujours demander</string>
-	<string name="open_with_url">Ouvrir les données inconnues avec l’URL</string>
+	<string name="open_with_url">Ouvrir les données inconnues avec l\'URL</string>
 	<string name="clear_network_suggestions">Supprimer les suggestions de réseau</string>
 	<string name="clear_network_suggestions_summary">Supprimer toutes les suggestions de réseau précédemment fournies par cette application.</string>
 	<string name="really_remove_all_networks">Vraiment supprimer tous les réseaux ?</string>
@@ -134,12 +143,15 @@
 	<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">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>
 	<string name="clear_history">Supprimer l\'historique</string>
 	<string name="copy_scan">Copier le scan</string>
-	<string name="edit_scan">Modifier l\'étiquette</string>
+	<string name="edit_label">Modifier l\'étiquette</string>
 	<string name="remove_scan">Supprimer le scan</string>
 	<string name="enter_name">Saisir un nom décrivant le scan</string>
 	<string name="enter_name_hint">Nom du scan</string>
@@ -167,6 +179,8 @@
 	<string name="otpauth_add">Ajouter l\'authentification à deux facteurs</string>
 	<string name="search_web">Rechercher sur internet</string>
 	<string name="search_scan">Rechercher un scan</string>
+	<string name="add_to_history">Ajouter à l\'historique</string>
+	<string name="added_to_history">Ajouté à l\'historique</string>
 	<string name="export_to_file">Exporter en tant que fichier</string>
 	<string name="export_as">Exporter en tant que ?</string>
 	<string name="export_csv_comma">CSV avec virgules</string>
@@ -181,6 +195,7 @@
 	<string name="pick_code_to_scan">Choisir le code à scanner</string>
 	<string name="shortcut_decode">Scanner un code-barres</string>
 	<string name="shortcut_encode">Créer un code-barres</string>
+	<string name="shortcut_history">Historique</string>
 	<string name="shortcut_preferences">Réglages</string>
 	<string name="background_request_failed">Échec de la requête d\'arrière-plan</string>
 	<string name="entry_type">Type</string>
@@ -14,6 +14,7 @@
 	<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>
@@ -28,6 +29,7 @@
 	<string name="gtin_add_on">UPC EAN kiterjesztés</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">Data mask</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>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Itt adja meg a tartalmat</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">KÓDOLÁS</string>
@@ -56,6 +59,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">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">%s beolvasása</string>
 	<string name="quarter_second">Negyed másodperc</string>
 	<string name="half_second">Fél másodperc</string>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</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_consecutive_duplicates">Ne mentsen egymást követő azonos adatokat</string>
-	<string name="ignore_consecutive_duplicates_summary">Ne mentse az egymást követő azonos adatokat a beolvasási előzményekbe.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</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>
@@ -103,6 +111,8 @@
 	<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="close_automatically">Ugrás vissza másolás vagy megosztás után</string>
@@ -133,12 +143,15 @@
 	<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">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>
 	<string name="clear_history">Előzmények törlése</string>
 	<string name="copy_scan">Beolvasás másolása</string>
-	<string name="edit_scan">Címke szerkesztése</string>
+	<string name="edit_label">Címke szerkesztése</string>
 	<string name="remove_scan">Beolvasás eltávolítása</string>
 	<string name="enter_name">Adjon meg egy nevet a beolvasás leírásához</string>
 	<string name="enter_name_hint">A beolvasás neve</string>
@@ -166,6 +179,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="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>
@@ -180,6 +195,7 @@
 	<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_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>
@@ -13,6 +13,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="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>
@@ -27,6 +28,7 @@
 	<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">Data mask</string>
 	<string name="toggle_flash">Nyala/matikan blitz</string>
 	<string name="error_flash">Galat nyala/matikan blitz</string>
 	<string name="share">Bagikan</string>
@@ -41,7 +43,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Masukkan konten di sini</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">ENKODE</string>
@@ -55,6 +58,9 @@
 	<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">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">Pindai %s</string>
 	<string name="quarter_second">Seperempat detik</string>
 	<string name="half_second">Setengah detik</string>
@@ -92,8 +98,10 @@
 	<string name="tone_prop_beep2">General double beep</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>
 	<string name="ignore_consecutive_duplicates">Abaikan duplikat</string>
-	<string name="ignore_consecutive_duplicates_summary">Jangan simpan duplikat yang berturutan di dalam riwayat pemindaian.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">Buka segera</string>
 	<string name="open_immediately_summary">Lewati inspeksi dan segera buka konten. Mungkin membuka konten berbahaya jika diaktifkan.</string>
 	<string name="copy_immediately">Simpan ke dalam clipboard</string>
@@ -102,6 +110,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_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>
@@ -132,12 +142,15 @@
 	<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">Yakin menghapus pindaian?</string>
 	<string name="really_remove_all_scans">Yakin menghapus semua pindaian?</string>
 	<string name="really_remove_selected_scans">Yakin menghapus pindaian yang dipilih?</string>
 	<string name="clear_history">Hapus riwayat</string>
 	<string name="copy_scan">Salin pindaian</string>
-	<string name="edit_scan">Sunting label</string>
+	<string name="edit_label">Sunting label</string>
 	<string name="remove_scan">Buang pindaian</string>
 	<string name="enter_name">Masukkan keterangan pindaian</string>
 	<string name="enter_name_hint">Nama pindaian</string>
@@ -165,6 +178,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="export_to_file">Ekspor ke berkas</string>
 	<string name="export_as">Ekspor sebagai?</string>
 	<string name="export_csv_comma">CSV dengan koma</string>
@@ -179,6 +194,7 @@
 	<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_preferences">Pengaturan</string>
 	<string name="background_request_failed">Permintaan latar belakang gagal</string>
 	<string name="entry_type">Tipe</string>
@@ -1,6 +1,6 @@
 <resources>
 	<string name="camera_error">Impossibile accedere alla fotocamera. Riprova</string>
-	<string name="scan_code">Scansiona codice</string>
+	<string name="scan_code">Scansione codice</string>
 	<string name="compose_barcode">Crea codice a barre</string>
 	<string name="decode_barcode">Decodifica codice a barre</string>
 	<string name="content">Contenuto</string>
@@ -14,6 +14,7 @@
 	<string name="error_correction_level_m" formatted="false">Medio (correzione ~15&#37;)</string>
 	<string name="error_correction_level_q" formatted="false">Quartile (correzione ~25&#37;)</string>
 	<string name="error_correction_level_h" formatted="false">Alto (correzione ~30&#37;)</string>
+	<string name="label">Etichetta</string>
 	<string name="colors">Colore primo piano/sfondo</string>
 	<string name="colors_black_on_white">Nero su bianco</string>
 	<string name="colors_white_on_black">Bianco su nero</string>
@@ -28,10 +29,11 @@
 	<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">Data mask</string>
 	<string name="toggle_flash">Attiva/disattiva flash</string>
-	<string name="error_flash">Errore durante l\'attivazione/disattivazione del flash</string>
+	<string name="error_flash">Errore durante attivazione/disattivazione flash</string>
 	<string name="share">Condividi</string>
-	<string name="share_file">Share as file</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="copied_to_clipboard">Copiato negli Appunti</string>
@@ -42,20 +44,24 @@
 	<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">Margin in pixels: %1$d</string>
+	<string name="size_no_magnification">Nessun ingrandimento</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Inserisci qui il contenuto</string>
 	<string name="unescape">Espandi sequenze escape</string>
 	<string name="encode">CODIFICA</string>
 	<string name="error_no_content">Contenuto mancante</string>
 	<string name="error_encoding_barcode">Il codice a barre non può essere generato</string>
-	<string name="view_barcode">Vedi codice a barre</string>
+	<string name="view_barcode">Visualizza codice a barre</string>
 	<string name="info">Info</string>
 	<string name="switch_camera">Cambia fotocamera</string>
 	<string name="bulk_mode">Scansione continua</string>
 	<string name="bulk_mode_summary">Avvia sempre la scansione in modo continuo.</string>
 	<string name="bulk_mode_delay">Ritardo tra scansioni continue</string>
 	<string name="restrict_format">Limita formato</string>
-	<string name="remove_restriction">Rimuovi la limitazione</string>
+	<string name="remove_restriction">Rimuovi limitazione</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">Scansiona %s</string>
 	<string name="quarter_second">Un quarto di secondo</string>
 	<string name="half_second">Mezzo secondo</string>
@@ -63,25 +69,25 @@
 	<string name="two_seconds">Due secondi</string>
 	<string name="five_seconds">Cinque secondi</string>
 	<string name="history">Cronologia</string>
-	<string name="preferences">Preferenze</string>
+	<string name="preferences">Impostazioni</string>
 	<string name="scan_category">Scansione</string>
 	<string name="content_category">Contenuto</string>
 	<string name="locale_category">Lingua</string>
 	<string name="custom_locale">Lingua personalizzata</string>
-	<string name="follow_system_settings">Usa le impostazioni di sistema</string>
+	<string name="follow_system_settings">Usa impostazioni di sistema</string>
 	<string name="show_crop_handle">Visualizza riquadro limite</string>
-	<string name="show_crop_handle_summary">Limita la scansione ad una regione personalizzata.</string>
+	<string name="show_crop_handle_summary">Limita scansione ad una regione personalizzata.</string>
 	<string name="barcode_formats">Formati codici a barre</string>
 	<string name="zoom_by_swiping">Zoom fotocamera scorrendo su/giù</string>
 	<string name="zoom_by_swiping_summary">Scorri su o giù per controllare lo zoom della fotocamera.</string>
 	<string name="auto_rotate">Riconosci codici a barre verticali</string>
 	<string name="auto_rotate_summary">Ruota automaticamente la fotocamera per riconoscere i codici a barre verticali. In base al dispositivo, potrebbe ridurre le prestazioni.</string>
-	<string name="try_harder">Ottimizza il lettore per accuratezza</string>
+	<string name="try_harder">Ottimizza lettore per accuratezza</string>
 	<string name="try_harder_summary">Attiva questa opzione per codici molto difficili da leggere. Riduce le prestazioni.</string>
-	<string name="show_toast_in_bulk_mode">Visualizza i dati in modalità continua</string>
+	<string name="show_toast_in_bulk_mode">Visualizza dati in modalità continua</string>
 	<string name="show_toast_in_bulk_mode_summary">Durante la scansione continua visualizza brevemente i dati scansionati.</string>
-	<string name="vibrate">Vibra quando rilevato</string>
-	<string name="vibrate_summary">Attivalo se vuoi che il dispositivo vibri quando viene riconosciuto un codice.</string>
+	<string name="vibrate">Vibra al rilevamento</string>
+	<string name="vibrate_summary">Attiva questa opzione se vuoi che il dispositivo vibri quando viene riconosciuto un codice.</string>
 	<string name="beep">Beep al rilevamento</string>
 	<string name="beep_summary">Abilita questa opzione se vuoi che il dispositivo emetta un beep quando viene riconosciuto un codice.</string>
 	<string name="beep_tone">Tono beep</string>
@@ -92,22 +98,26 @@
 	<string name="tone_prop_beep">Beep generale</string>
 	<string name="tone_prop_beep2">Doppio beep generale</string>
 	<string name="use_history">Salva cronologia scansioni</string>
-	<string name="use_history_summary">Salva i codici riconosciuti nel dispositivo.</string>
-	<string name="ignore_consecutive_duplicates">Ignora i duplicati</string>
-	<string name="ignore_consecutive_duplicates_summary">Non salvare duplicati consecutivi nella cronologia di scansione.</string>
+	<string name="use_history_summary">Salva nel dispositivo codici riconosciuti.</string>
+	<string name="ignore_duplicates">Ignora duplicati</string>
+	<string name="ignore_consecutive_duplicates">Duplicati consecutivi</string>
+	<string name="ignore_any_duplicates">Qualsiasi duplicato</string>
+	<string name="accept_duplicates">Accetta duplicati</string>
 	<string name="open_immediately">Apri subito</string>
 	<string name="open_immediately_summary">Salta l\'ispezione e apri i contenuti immediatamente. Se abilitato può aprire contenuti dannosi.</string>
 	<string name="copy_immediately">Copia negli Appunti</string>
 	<string name="copy_immediately_summary">Copia automaticamente i contenuti scansionati negli Appunti. Nota che altre app potrebbero leggere gli Appunti in secondo piano.</string>
 	<string name="show_meta_data">Visualizza metadati</string>
-	<string name="show_meta_data_summary">Visualizza dati aggiuntivi sul codice a barre scansionato.</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_recreation">Visualizza il codice a barre ricreato</string>
-	<string name="show_recreation_summary">Ricrea e visualizza, se possibile, il codice a barre dal contenuto letto.</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>
+	<string name="show_recreation_summary">Ricrea e visualizza, se possibile, il codice a barre, dal contenuto letto.</string>
 	<string name="close_automatically">Vai indietro dopo la copia/condivisione</string>
 	<string name="close_automatically_summary">Dopo aver copiato o condiviso i contenuti letti torna automaticamente alla schermata di scansione.</string>
-	<string name="default_search_engine">Apri dati sconosciuti in</string>
+	<string name="default_search_engine">Apri dati sconosciuti con</string>
 	<string name="always_ask">Chiedi sempre</string>
 	<string name="open_with_url">Apri dati sconosciuti con URL</string>
 	<string name="clear_network_suggestions">Cancella suggerimenti di rete</string>
@@ -120,8 +130,8 @@
 	<string name="send_scan_active_summary">Abilita per inoltrare le scansioni a un URL specificato</string>
 	<string name="send_scan_url">URL a cui inoltrare</string>
 	<string name="send_scan_type">Tipo di richiesta</string>
-	<string name="send_type_get_add_content">OTTIENI e aggiungi il contenuto</string>
-	<string name="send_type_get_query_string">OTTIENI con stringa completa della richiesta</string>
+	<string name="send_type_get_add_content">GET e aggiungi contenuto</string>
+	<string name="send_type_get_query_string">GET con stringa completa richiesta</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">Apri nel browser esterno</string>
@@ -133,12 +143,15 @@
 	<string name="bluetooth_connect_fail">Impossibile connettersi al dispositivo Bluetooth.</string>
 	<string name="bluetooth_send_fail">Impossibile inviare al dispositivo Bluetooth.</string>
 	<string name="bluetooth_send_success">Invio via Bluetooth riuscito.</string>
+	<string name="generation_category">Generazione</string>
+	<string name="brighten_screen">Schiarisci schermo</string>
+	<string name="brighten_screen_summary">Imposta luminosità al massimo per migliorare la scansione di un codice a barre dallo schermo.</string>
 	<string name="really_remove_scan">Vuoi rimuovere la scansione?</string>
 	<string name="really_remove_all_scans">Vuoi rimuovere tutte le scansioni?</string>
 	<string name="really_remove_selected_scans">Vuoi rimuovere le scansioni selezionate?</string>
 	<string name="clear_history">Azzera cronologia</string>
 	<string name="copy_scan">Copia scansione</string>
-	<string name="edit_scan">Modifica etichetta</string>
+	<string name="edit_label">Modifica etichetta</string>
 	<string name="remove_scan">Rimuovi scansione</string>
 	<string name="enter_name">Inserisci un nome per descrivere la scansione</string>
 	<string name="enter_name_hint">Nome scansione</string>
@@ -146,7 +159,7 @@
 	<string name="pick_list_separator">Come separare elementi della lista?</string>
 	<string name="separator_line_break">Interruzione di linea</string>
 	<string name="separator_ruler">Righello</string>
-	<string name="save_as_file_name">Salva come file nei Download?</string>
+	<string name="save_as_file_name">Salva come file nei download?</string>
 	<string name="file_name">Nome file</string>
 	<string name="error_saving_file">Impossibile salvare il file</string>
 	<string name="error_file_exists">Il file esiste già</string>
@@ -166,8 +179,10 @@
 	<string name="otpauth_add">Aggiungi 2FA</string>
 	<string name="search_web">Cerca nel web</string>
 	<string name="search_scan">Cerca scansione</string>
-	<string name="export_to_file">Esporta su file</string>
-	<string name="export_as">Come esportare?</string>
+	<string name="add_to_history">Aggiungi alla cronologia</string>
+	<string name="added_to_history">Aggiunto alla cronologia</string>
+	<string name="export_to_file">Esporta in un file</string>
+	<string name="export_as">Esportare come?</string>
 	<string name="export_csv_comma">CSV con virgole</string>
 	<string name="export_csv_semicolon">CSV con punti e virgola</string>
 	<string name="export_json">File JSON</string>
@@ -175,11 +190,12 @@
 	<string name="saved_in_downloads">Salvato nei download</string>
 	<string name="rotate_image_cw">Ruota immagine in senso orario</string>
 	<string name="toggle_free_rotation">Abilita/disabilita rotazione libera</string>
-	<string name="pick_file">Pick a file</string>
-	<string name="pick_image_file">Scegli file immagine</string>
-	<string name="pick_code_to_scan">Scegli codice da scansionare</string>
-	<string name="shortcut_decode">Scansiona un codice a barre</string>
-	<string name="shortcut_encode">Crea un codice a barre</string>
+	<string name="pick_file">Seleziona file</string>
+	<string name="pick_image_file">Apri file immagine</string>
+	<string name="pick_code_to_scan">Seleziona codice da scansionare</string>
+	<string name="shortcut_decode">Scansiona codice a barre</string>
+	<string name="shortcut_encode">Crea codice a barre</string>
+	<string name="shortcut_history">Cronologia</string>
 	<string name="shortcut_preferences">Impostazioni</string>
 	<string name="background_request_failed">Richiesta in secondo piano fallita</string>
 	<string name="entry_type">Tipo</string>
@@ -13,6 +13,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="colors">背面と前面</string>
 	<string name="colors_black_on_white">白地に黒色</string>
 	<string name="colors_white_on_black">黒地に白色</string>
@@ -27,6 +28,7 @@
 	<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">Data mask</string>
 	<string name="toggle_flash">フラッシュの切り替え</string>
 	<string name="error_flash">フラッシュの切り替えエラー</string>
 	<string name="share">共有</string>
@@ -41,7 +43,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">ここに内容を入力</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">エンコード</string>
@@ -55,6 +58,9 @@
 	<string name="bulk_mode_delay">連続スキャンの間隔</string>
 	<string name="restrict_format">フォーマットの制限</string>
 	<string name="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">%sをスキャン</string>
 	<string name="quarter_second">0.25秒</string>
 	<string name="half_second">0.5秒</string>
@@ -92,8 +98,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_consecutive_duplicates">重複を破棄する</string>
-	<string name="ignore_consecutive_duplicates_summary">重複したスキャン履歴を保存しないようにします。</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">すぐにコンテンツを開く</string>
 	<string name="open_immediately_summary">確認画面なしでコンテンツをすぐに開くようにします。有害なコンテンツを開いてしまうリスクがあります。</string>
 	<string name="copy_immediately">自動的にクリップボードにコピー</string>
@@ -102,6 +110,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_recreation">再生成したバーコードを表示</string>
 	<string name="show_recreation_summary">可能であれば、読み取ったコンテンツからバーコードを再生成して表示します。</string>
 	<string name="close_automatically">コピー/共有後に戻る</string>
@@ -132,12 +142,15 @@
 	<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">このスキャン履歴を削除しても宜しいですか？</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_scan">ラベルを編集</string>
+	<string name="edit_label">ラベルを編集</string>
 	<string name="remove_scan">スキャン結果を削除</string>
 	<string name="enter_name">スキャン結果を識別できる名前を入力してください</string>
 	<string name="enter_name_hint">ここに名前を入力</string>
@@ -165,6 +178,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="export_to_file">ファイルにエクスポート</string>
 	<string name="export_as">ファイル形式を選択</string>
 	<string name="export_csv_comma">コンマ区切りのCSVファイル</string>
@@ -179,6 +194,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_preferences">設定</string>
 	<string name="background_request_failed">バックグラウンド要求に失敗しました</string>
 	<string name="entry_type">種類</string>
@@ -14,6 +14,7 @@
 	<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>
@@ -28,6 +29,7 @@
 	<string name="gtin_add_on">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">Data mask</string>
 	<string name="toggle_flash">განათების ჩართვა</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">გაზიარება</string>
@@ -42,7 +44,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">შეიყვანეთ ტექსტი აქ</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">შექმნა"</string>
@@ -56,6 +59,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>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">სკანირების ისტორიის შენახვა</string>
 	<string name="use_history_summary">ამოცნობილი შტრიხ-კოდების მოწყობილობაზე შენახვა.</string>
+	<string name="ignore_duplicates">Ignore duplicates</string>
 	<string name="ignore_consecutive_duplicates">არ შევინახოთ შემდგომი ასლები</string>
-	<string name="ignore_consecutive_duplicates_summary">არ შევინახოთ შემდგომი ასლები სკანირების ისტორიაში.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">შემოწმების გამოტოვება და მყისიერი გახსნა</string>
 	<string name="open_immediately_summary">შემოწმების გამოტოვება და მყისიერი გახსნა. შესაძლოა გამოიწვიოს არასასარგებლო კონტენტის ჩვენება.</string>
 	<string name="copy_immediately">გაცვლის ბუფერში ავტომატური კოპირება</string>
@@ -103,6 +111,8 @@
 	<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>
@@ -133,12 +143,15 @@
 	<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">ნამდვილად გსურთ სკანირების წაშლა?</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_scan">რედაქტირება</string>
+	<string name="edit_label">რედაქტირება</string>
 	<string name="remove_scan">სკანირების წაშლა</string>
 	<string name="enter_name">მიანიჭეთ სახელი სკანირებას</string>
 	<string name="enter_name_hint">სკანირების სახელი</string>
@@ -166,6 +179,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="export_to_file">ექსპორტი ფაილში</string>
 	<string name="export_as">შესანახი ფაილის ფორმატი</string>
 	<string name="export_csv_comma">CSV (გამყოფი - მძიმე)</string>
@@ -180,6 +195,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_preferences">პარამეტრები</string>
 	<string name="background_request_failed">ფონური მოთხოვნა ვერ მოხერხდა</string>
 	<string name="entry_type">Type</string>
@@ -13,6 +13,7 @@
 	<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>
@@ -27,6 +28,7 @@
 	<string name="gtin_add_on">UPC EAN extension</string>
 	<string name="barcode_version_number">버전</string>
 	<string name="qr_version_and_modules">%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>
@@ -41,7 +43,8 @@
 	<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>
@@ -55,6 +58,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>
@@ -92,8 +98,10 @@
 	<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="ignore_consecutive_duplicates">Ignore duplicates</string>
-	<string name="ignore_consecutive_duplicates_summary">Do not save consecutive duplicates in the scan history.</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>
@@ -102,6 +110,8 @@
 	<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>
@@ -132,12 +142,15 @@
 	<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_scan">Edit label</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>
@@ -165,6 +178,8 @@
 	<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>
@@ -179,6 +194,7 @@
 	<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>
@@ -14,6 +14,7 @@
 	<string name="error_correction_level_m" formatted="false">Middelhoog (~15&#37; correction)</string>
 	<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>
@@ -28,6 +29,7 @@
 	<string name="gtin_add_on">UPC EAN extensie</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">Data mask</string>
 	<string name="toggle_flash">Zaklamp aan/uit</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Delen</string>
@@ -42,7 +44,8 @@
 	<string name="pick_search_engine">Zoekmachine kiezen</string>
 	<string name="format">Format</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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Voer hier de inhoud in</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">Coderen</string>
@@ -56,6 +59,9 @@
 	<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="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">¼ seconde</string>
 	<string name="half_second">½ seconde</string>
@@ -93,8 +99,10 @@
 	<string name="tone_prop_beep2">General double beep</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_consecutive_duplicates">Duplicaten negeren</string>
-	<string name="ignore_consecutive_duplicates_summary">Bewaar geen opeenvolgende duplicaten in de scangeschiedenis.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</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>
@@ -103,6 +111,8 @@
 	<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="close_automatically">Teruggaan na kopiëren/delen</string>
@@ -133,12 +143,15 @@
 	<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">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>
 	<string name="clear_history">Wis opgeslagen codes</string>
 	<string name="copy_scan">Scan kopiëren</string>
-	<string name="edit_scan">Label bewerken</string>
+	<string name="edit_label">Label bewerken</string>
 	<string name="remove_scan">Scan verwijderen</string>
 	<string name="enter_name">Naam van de scan</string>
 	<string name="enter_name_hint">Voer een naam in om de scan te beschrijven</string>
@@ -166,6 +179,8 @@
 	<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="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>
@@ -180,6 +195,7 @@
 	<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_preferences">Voorkeuren</string>
 	<string name="background_request_failed">Achtergrondverzoek mislukt</string>
 	<string name="entry_type">Type</string>
@@ -1,25 +1,28 @@
 <resources>
-	<string name="open_url">Otwórz url</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="info">Informacje</string>
 	<string name="vcard_add">Dodaj do kontaktów</string>
 	<string name="vevent_add">Dodaj do kalendarza</string>
+	<string name="shortcut_history">Historia</string>
 	<string name="shortcut_preferences">Ustawienia</string>
 	<string name="share">Udostępnij</string>
-	<string name="share_file">Share as file</string>
+	<string name="share_file">Udostępnij jako plik</string>
 	<string name="share_as">Udostępnij jako?</string>
 	<string name="error_saving_file">Nie można zapisać pliku</string>
 	<string name="clear_history">Wyczyść historię</string>
 	<string name="compose_barcode">Utwórz kod kreskowy</string>
 	<string name="history">Historia</string>
 	<string name="format">Format</string>
+	<string name="add_to_history">Dodaj do historii</string>
+	<string name="added_to_history">Dodano do historii</string>
 	<string name="export_to_file">Eksportuj do pliku</string>
 	<string name="file_name">Nazwa pliku</string>
 	<string name="export_json">Eksportuj jako JSON</string>
 	<string name="pick_search_engine">Wybierz wyszukiwarkę</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="pick_file">Wybierz plik</string>
 	<string name="pick_image_file">Wybierz plik obrazu</string>
 	<string name="pick_code_to_scan">Wybierz kod do zeskanowania</string>
 	<string name="sms_send">Wyślij SMS</string>
@@ -28,18 +31,19 @@
 	<string name="separator_ruler">Linijka</string>
 	<string name="scan_code">Skanuj kod</string>
 	<string name="error_correction_level">Poziom korekcji błędów</string>
-	<string name="error_correction_level_l" formatted="false">Niski (~7&#37; korekcji)</string>
-	<string name="error_correction_level_m" formatted="false">Średni (~15&#37; korekcji)</string>
-	<string name="error_correction_level_q" formatted="false">Kwartyl (~25&#37; korekcji)</string>
-	<string name="error_correction_level_h" formatted="false">Wysoki (~30&#37; korekcji)</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="error_correction_level_l" formatted="false">Niski (~7% korekcji)</string>
+	<string name="error_correction_level_m" formatted="false">Średni (~15% korekcji)</string>
+	<string name="error_correction_level_q" formatted="false">Kwartyl (~25% korekcji)</string>
+	<string name="error_correction_level_h" formatted="false">Wysoki (~30% korekcji)</string>
+	<string name="label">Etykieta</string>
+	<string name="colors">Przód i tło</string>
+	<string name="colors_black_on_white">Czarny na białym</string>
+	<string name="colors_white_on_black">Biały na czarnym</string>
+	<string name="colors_black_on_transparent">Czarny na przezroczystym</string>
+	<string name="colors_white_on_transparent">Biały na przezroczystym</string>
+	<string name="sequence_size">Rozmiar sekwencji</string>
+	<string name="sequence_index">Indeks sekwencji</string>
+	<string name="sequence_id">Identyfikator sekwencji</string>
 	<string name="export_csv_comma">CSV z przecinkami</string>
 	<string name="export_csv_semicolon">CSV ze średnikami</string>
 	<string name="shortcut_encode">Stwórz kod kreskowy</string>
@@ -52,8 +56,8 @@
 	<string name="sms_error">Nie można wysłać SMS-a</string>
 	<string name="mail_error">Nie można wysłać e-maila</string>
 	<string name="rotate_image_cw">Obróć obraz zgodnie z ruchem wskazówek zegara</string>
-	<string name="toggle_free_rotation">Toggle free rotation</string>
-	<string name="edit_scan">Edytuj etykietę</string>
+	<string name="toggle_free_rotation">Przełącz swobodny obrót</string>
+	<string name="edit_label">Edytuj etykietę</string>
 	<string name="enter_name_hint">Nazwa skanu</string>
 	<string name="camera_error">Nie można uzyskać dostępu do kamery, spróbuj ponownie</string>
 	<string name="copy_scan">Skopiuj skan</string>
@@ -65,15 +69,17 @@
 	<string name="really_remove_selected_scans">Czy naprawdę usunąć wybrane skany?</string>
 	<string name="binary_data">(dane binarne)</string>
 	<plurals name="barcode_info">
-		<item quantity="one">%2$d character, %1$s</item>
-		<item quantity="few">%2$d characters, %1$s</item>
-		<item quantity="many">%2$d characters, %1$s</item>
-		<item quantity="other">%2$d characters, %1$s</item>
+		<item quantity="one">%2$d znak, %1$s</item>
+		<item quantity="few">%2$d znaki, %1$s</item>
+		<item quantity="many">%2$d znaków, %1$s</item>
+		<item quantity="other">%2$d znaków, %1$s</item>
 	</plurals>
 	<string name="show_hex_dump">Pokazuj zrzut szesnastkowy</string>
-	<string name="show_hex_dump_summary">Pokaż zeskanowaną zawartośc w postaci szesnastkowej</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_hex_dump_summary">Pokaż zeskanowaną zawartość w postaci szesnastkowej.</string>
+	<string name="show_checksum">Pokaż sumę kontrolną</string>
+	<string name="no_checksum">Brak sumy kontrolnej</string>
+	<string name="show_recreation">Pokaż odtworzony kod kreskowy</string>
+	<string name="show_recreation_summary">Jeśli to możliwe, odtwórz i pokaż kod kreskowy z odczytanej zawartości.</string>
 	<string name="close_automatically">Wróć po skopiowaniu/udostępnieniu</string>
 	<string name="close_automatically_summary">Automatycznie powracaj do ekranu skanowania po skopiowaniu lub udostępnieniu przeczytanej zawartości.</string>
 	<string name="show_meta_data">Pokazuj metadane</string>
@@ -82,16 +88,19 @@
 	<string name="bulk_mode">Skanuj w sposób ciągły</string>
 	<string name="bulk_mode_summary">Zawsze rozpoczynaj skanowanie w sposób ciągły.</string>
 	<string name="bulk_mode_delay">Opóźnienie między kolejnymi skanami</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">Ogranicz format</string>
+	<string name="remove_restriction">Usuń ograniczenie</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">Skan %s</string>
 	<string name="quarter_second">Ćwierć sekundy</string>
 	<string name="half_second">Pół sekundy</string>
 	<string name="a_second">Sekunda</string>
 	<string name="two_seconds">Dwie sekundy</string>
 	<string name="five_seconds">Pięć sekund</string>
 	<string name="toggle_flash">Przełącz lampę błyskową</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Błąd przełączania lampy błyskowej</string>
 	<string name="wifi_added">Wi-Fi dodane</string>
 	<string name="zoom_by_swiping">Przybliżaj kamerę, przesuwając w górę/dół</string>
 	<string name="zoom_by_swiping_summary">Przesuń palcem w górę lub w dół na ekranie aparatu, aby sterować powiększeniem aparatu.</string>
@@ -105,15 +114,15 @@
 	<string name="use_history_summary">Zapisz rozpoznane kody na swoim urządzeniu.</string>
 	<string name="vibrate">Wibruj po wykryciu</string>
 	<string name="vibrate_summary">Włącz tę opcję, jeśli chcesz, aby urządzenie wibrowało po rozpoznaniu kodu.</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">Sygnał dźwiękowy po wykryciu</string>
+	<string name="beep_summary">Włącz tę opcję, jeśli chcesz, aby urządzenie emitowało sygnał dźwiękowy po rozpoznaniu kodu.</string>
+	<string name="beep_tone">Sygnał dźwiękowy</string>
+	<string name="tone_cdma_confirm">Potwierdzenie CDMA</string>
+	<string name="tone_sup_confirm">Potwierdzenie odbioru połączenia</string>
+	<string name="tone_sup_radio_ack">Potwierdzenie ścieżki radiowej nadzoru połączenia</string>
+	<string name="tone_prop_ack">Pozytywne potwierdzenie</string>
+	<string name="tone_prop_beep">Ogólny sygnał dźwiękowy</string>
+	<string name="tone_prop_beep2">Ogólny podwójny sygnał dźwiękowy</string>
 	<string name="open_immediately">Pomiń kontrolę i natychmiast otwórz zawartość</string>
 	<string name="open_immediately_summary">Pomiń kontrolę i natychmiast otwórz zawartość. Może otwierać szkodliwą zawartość, jeśli jest włączona.</string>
 	<string name="copy_immediately">Automatycznie skopiuj zawartość do schowka</string>
@@ -124,8 +133,10 @@
 	<string name="search_web">Szukaj w sieci</string>
 	<string name="search_scan">Szukaj skanu</string>
 	<string name="export_database">Eksportuj do bazy danych SQLite</string>
+	<string name="ignore_duplicates">Ignoruj duplikaty</string>
 	<string name="ignore_consecutive_duplicates">Nie zapisuj kolejnych duplikatów</string>
-	<string name="ignore_consecutive_duplicates_summary">Nie zapisuj kolejnych duplikatów w historii skanowania.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Akceptuj duplikaty</string>
 	<string name="default_search_engine">Otwórz nieznane dane w</string>
 	<string name="always_ask">Zawsze pytaj</string>
 	<string name="open_with_url">Otwieraj nieznane dane za pomocą adresu URL</string>
@@ -135,8 +146,8 @@
 	<string name="clear_network_suggestions_success">Sugestie dotyczące sieci zostały usunięte</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nie ma nic do usunięcia</string>
 	<string name="send_category">Przekazywanie</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>
+	<string name="send_scan_active">Przekazuj skany</string>
+	<string name="send_scan_active_summary">Umożliwia przekazywanie skanów na podany adres URL.</string>
 	<string name="send_scan_url">Wyślij każdy skan na adres URL</string>
 	<string name="send_scan_type">Rodzaj requestu dla każdego skanu</string>
 	<string name="send_type_get_add_content">GET i po prostu dodaj zawartość</string>
@@ -145,13 +156,16 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Otwórz w zewnętrznej przeglądarce</string>
 	<string name="test_url">Testuj URL</string>
-	<string name="send_scan_bluetooth">Forward scans with Bluetooth</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="no_bluetooth_hosts_paired">No Hosts Paired</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="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>
@@ -163,8 +177,9 @@
 	<string name="follow_system_settings">Zgodny z ustawieniami systemu</string>
 	<string name="decode_barcode">Dekoduj kod kreskowy</string>
 	<string name="gtin_add_on">Dodatek UPC EAN</string>
-	<string name="barcode_version_number">Version</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">Data mask</string>
 	<string name="gtin_country">Możliwy kraj produkcji</string>
 	<string name="encode">ZAKODUJ</string>
 	<string name="error_no_content">Brak zawartości</string>
@@ -174,9 +189,10 @@
 	<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">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">Wprowadź zawartość tutaj</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Rozwiń sekwencje ucieczki</string>
 	<string name="pick_list_separator">Jak oddzielić elementy listy?</string>
 	<string name="enter_name">Wprowadź nazwę opisującą skan</string>
 	<string name="auto_rotate">Rozpoznawaj kody kreskowe 1D pionowo</string>
@@ -195,5 +211,5 @@
 	<string name="wifi_identity">Tożsamość</string>
 	<string name="wifi_phase2">Metoda fazy 2</string>
 	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="remove_suggestion">Usuń sugestię</string>
 </resources>
@@ -1,189 +1,205 @@
 <resources>
-	<string name="camera_error">Não foi possível acessar a câmera, por favor tente novamente</string>
-	<string name="scan_code">Aponte ao código</string>
-	<string name="compose_barcode">Criar código</string>
-	<string name="decode_barcode">Reconhecer código</string>
+	<string name="camera_error">Não foi possível acessar a câmera, tente novamente</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 binários)</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="other">%2$d caracteres, %1$s</item>
 	</plurals>
 	<string name="error_correction_level">Nível de correção de erro</string>
-	<string name="error_correction_level_l" formatted="false">Baixo (~7&#37; correção)</string>
-	<string name="error_correction_level_m" formatted="false">Médio (~15&#37; correção)</string>
-	<string name="error_correction_level_q" formatted="false">Quartil (~25&#37; correção)</string>
-	<string name="error_correction_level_h" formatted="false">Alto (~30&#37; correção)</string>
-	<string name="colors">Modo de exibição</string>
-	<string name="colors_black_on_white">Preto sobre fundo branco</string>
-	<string name="colors_white_on_black">Branco sobre fundo preto</string>
-	<string name="colors_black_on_transparent">Preto sobre fundo transparente</string>
-	<string name="colors_white_on_transparent">Branco sobre fundo transparente</string>
-	<string name="sequence_size">Tamanho de sequência</string>
-	<string name="sequence_index">Índice de sequência</string>
-	<string name="sequence_id">ID de sequência</string>
-	<string name="gtin_issue_number">Número de emissão</string>
+	<string name="error_correction_level_l" formatted="false">Baixo (~7% de correção)</string>
+	<string name="error_correction_level_m" formatted="false">Médio (~15% de correção)</string>
+	<string name="error_correction_level_q" formatted="false">Quarto (~25% de correção)</string>
+	<string name="error_correction_level_h" formatted="false">Alto (~30% de correção)</string>
+	<string name="label">Etiqueta</string>
+	<string name="colors">Primeiro e segundo plano</string>
+	<string name="colors_black_on_white">Preto no branco</string>
+	<string name="colors_white_on_black">Branco no preto</string>
+	<string name="colors_black_on_transparent">Preto no transparente</string>
+	<string name="colors_white_on_transparent">Branco no transparente</string>
+	<string name="sequence_size">Tamanho da sequência</string>
+	<string name="sequence_index">Índice da sequência</string>
+	<string name="sequence_id">ID da sequência</string>
+	<string name="gtin_issue_number">Número do issue</string>
 	<string name="gtin_country">Possível país de fabricação</string>
 	<string name="gtin_price">Preço sugerido</string>
 	<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">Data mask</string>
 	<string name="toggle_flash">Ligar lanterna</string>
 	<string name="error_flash">Falha ao ligar a lanterna</string>
-	<string name="share">Compartilhe</string>
-	<string name="share_file">Share as file</string>
-	<string name="share_as">Compartilhar em qual formato?</string>
-	<string name="copy_to_clipboard">Copiar ao clipboard</string>
-	<string name="copied_to_clipboard">Copiado ao clipboard</string>
-	<string name="copy_password">Copiar a senha ao clipboard</string>
-	<string name="copied_password_to_clipboard">Senha copiada ao clipboard</string>
-	<string name="open_url">Abrir a URL</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="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 site de busca</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 píxeis: %1$d×%2$d</string>
-	<string name="margin_size">Margin in pixels: %1$d</string>
+	<string name="size_width_by_height">Tamanho em pixels: %1$d×%2$d</string>
+	<string name="size_no_magnification">Sem magnificação</string>
+	<string name="add_quiet_zone">Add quiet zone</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>
-	<string name="error_no_content">Digite algum conteúdo acima</string>
-	<string name="error_encoding_barcode">Não foi possível gerar este código</string>
-	<string name="view_barcode">Ver código</string>
-	<string name="info">Detalhes</string>
-	<string name="switch_camera">Alterar câmera</string>
-	<string name="bulk_mode">Digitalização contínua</string>
-	<string name="bulk_mode_summary">Sempre iniciar em modo contínuo.</string>
-	<string name="bulk_mode_delay">Adiar durante digitalização contínua</string>
-	<string name="restrict_format">Limitar formato</string>
-	<string name="remove_restriction">Remover limitação</string>
+	<string name="error_no_content">Conteúdo faltando</string>
+	<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">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">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">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">Digitalizar %s</string>
 	<string name="quarter_second">Um quarto de segundo</string>
 	<string name="half_second">Meio segundo</string>
-	<string name="a_second">1 segundo</string>
-	<string name="two_seconds">2 segundos</string>
-	<string name="five_seconds">5 segundos</string>
+	<string name="a_second">Um segundo</string>
+	<string name="two_seconds">Dois segundos</string>
+	<string name="five_seconds">Cinco segundos</string>
 	<string name="history">Histórico</string>
 	<string name="preferences">Configurações</string>
 	<string name="scan_category">Digitalização</string>
 	<string name="content_category">Conteúdo</string>
 	<string name="locale_category">Idioma</string>
-	<string name="custom_locale">Idioma da interface</string>
-	<string name="follow_system_settings">Adaptar do sistema</string>
+	<string name="custom_locale">Idioma customizado</string>
+	<string name="follow_system_settings">Seguir configurações do sistema</string>
 	<string name="show_crop_handle">Mostrar limitador customizável</string>
-	<string name="show_crop_handle_summary">Permite limitar a uma área específica.</string>
-	<string name="barcode_formats">Tipo de código</string>
-	<string name="zoom_by_swiping">Deslize para ajustar zoom</string>
+	<string name="show_crop_handle_summary">Permite limitar a digitalização à uma área específica.</string>
+	<string name="barcode_formats">Formatos de código de barras</string>
+	<string name="zoom_by_swiping">Deslize para ajustar o zoom</string>
 	<string name="zoom_by_swiping_summary">Deslize para baixo/cima na tela para ajustar zoom da câmera.</string>
-	<string name="auto_rotate">Reconhecer códigos 1D verticais</string>
-	<string name="auto_rotate_summary">Girar automaticamente a câmera para reconhecer códigos 1D verticais. Dependendo do dispositivo, isto pode afetar o desempenho.</string>
+	<string name="auto_rotate">Reconhecer códigos de barras 1D verticais</string>
+	<string name="auto_rotate_summary">Gire automaticamente a câmera para reconhecer códigos 1D verticais. Dependendo do dispositivo, isto pode afetar o desempenho.</string>
 	<string name="try_harder">Otimizar leitor para precisão</string>
 	<string name="try_harder_summary">Ative esta opção para códigos muito difíceis de ler. Isto afetará o desempenho.</string>
 	<string name="show_toast_in_bulk_mode">Mostrar dados em modo contínuo</string>
 	<string name="show_toast_in_bulk_mode_summary">Mostrar brevemente os dados durante digitalização contínua.</string>
-	<string name="vibrate">Vibrar ao reconhecer</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">Bipar ao reconhecer</string>
-	<string name="beep_summary">Ative esta opção se quiser ouvir um bipe ao reconhecer um código.</string>
-	<string name="beep_tone">Tipo do bipe</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 controle</string>
-	<string name="tone_sup_radio_ack">Reconhecimento de caminho de rádio</string>
+	<string name="tone_sup_confirm">Confirmação de supervisão de chamada</string>
+	<string name="tone_sup_radio_ack">Reconhecimento de caminho de rádio de supervisão de chamada</string>
 	<string name="tone_prop_ack">Reconhecimento positivo</string>
-	<string name="tone_prop_beep">Bipe comum</string>
-	<string name="tone_prop_beep2">Bipe duplo comum</string>
-	<string name="use_history">Ativar histórico de digitalizações</string>
-	<string name="use_history_summary">Salve códigos reconhecidos no dispositivo.</string>
-	<string name="ignore_consecutive_duplicates">Ignorar duplicações</string>
-	<string name="ignore_consecutive_duplicates_summary">Não salvar duplicações consecutivas no histórico de digitalizações.</string>
+	<string name="tone_prop_beep">Beep comum</string>
+	<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 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 no mesmo instante. Quando ativado, pode abrir conteúdo perigoso.</string>
-	<string name="copy_immediately">Copiar ao clipboard</string>
-	<string name="copy_immediately_summary">Copiar automaticamente ao clipboard um conteúdo digitalizado. Tem cuidado porque outros apps podem examinar seu clipboard em segundo plano.</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>
-	<string name="show_meta_data_summary">Mostrar dados adicionais de código digitalizado.</string>
-	<string name="show_hex_dump">Mostrar impressão hexadecimal</string>
-	<string name="show_hex_dump_summary">Mostrar impressão hexadecimal de conteúdo digitalizado.</string>
-	<string name="show_recreation">Mostrar código recuperado</string>
-	<string name="show_recreation_summary">Se possível, recupere e mostre código do conteúdo lido.</string>
-	<string name="close_automatically">Voltar após copiar/compartilhar</string>
-	<string name="close_automatically_summary">Voltar automaticamente à tela de digitalização após copiar ou compartilhar um código examinado.</string>
+	<string name="show_meta_data_summary">Mostrar dados adicionais sobre o código digitalizado.</string>
+	<string name="show_hex_dump">Mostrar dump em hex</string>
+	<string name="show_hex_dump_summary">Mostrar um dump em hex do conteúdo digitalizado.</string>
+	<string name="show_checksum">Mostrar checksum</string>
+	<string name="no_checksum">Nenhum checksum</string>
+	<string name="show_recreation">Mostrar código recriado</string>
+	<string name="show_recreation_summary">Recrie e mostre o código do conteúdo digitalizado quando possível.</string>
+	<string name="close_automatically">Voltar após Copiar/Compartilhar</string>
+	<string name="close_automatically_summary">Voltar automaticamente à tela de digitalização após copiar ou compartilhar o conteúdo de uma digitalização.</string>
 	<string name="default_search_engine">Abrir dados desconhecidos em</string>
 	<string name="always_ask">Sempre perguntar</string>
-	<string name="open_with_url">Abrir dados desconhecidos via URL</string>
-	<string name="clear_network_suggestions">Excluir sugestões de redes</string>
-	<string name="clear_network_suggestions_summary">Excluir todas as sugestões de redes que foram anteriormente adicionadas ao app.</string>
+	<string name="open_with_url">Abrir dados desconhecidos com URL</string>
+	<string name="clear_network_suggestions">Excluir sugestões de rede</string>
+	<string name="clear_network_suggestions_summary">Excluir todas as sugestões de rede que foram anteriormente adicionadas com este app.</string>
 	<string name="really_remove_all_networks">Deseja excluir todas as redes?</string>
-	<string name="clear_network_suggestions_success">Sugestões de redes foram excluidas</string>
+	<string name="clear_network_suggestions_success">Sugestões de rede foram excluídas</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nada para excluir</string>
 	<string name="send_category">Encaminhamento</string>
-	<string name="send_scan_active">Encaminhar conteúdo digitalizado</string>
-	<string name="send_scan_active_summary">Ative para encaminhar conteúdo digitalizado à URL definida</string>
+	<string name="send_scan_active">Encaminhar digitalizações</string>
+	<string name="send_scan_active_summary">Ative para encaminhar conteúdo digitalizado à URL definida.</string>
 	<string name="send_scan_url">Defina a URL para qual encaminhar</string>
 	<string name="send_scan_type">Tipo de solicitação</string>
-	<string name="send_type_get_add_content">GET e somente adicionar um conteúdo</string>
+	<string name="send_type_get_add_content">GET e somente adicionar o conteúdo</string>
 	<string name="send_type_get_query_string">GET com sequência completa de consulta</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">Abrir em navegador externo</string>
 	<string name="test_url">Testar a URL</string>
-	<string name="send_scan_bluetooth">Encaminhar para Bluetooth</string>
-	<string name="send_scan_bluetooth_summary">Ativar isto para encaminhar digitalizações ao determinado host de Bluetooth.</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="no_bluetooth_hosts_paired">Não emparelhado com host</string>
-	<string name="bluetooth_connect_fail">Não foi possível conectar com dispositivo Bluetooth.</string>
-	<string name="bluetooth_send_fail">Não foi possível encaminhar para dispositivo Bluetooth.</string>
-	<string name="bluetooth_send_success">Envio ao Bluetooth concluído com sucesso.</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">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>
 	<string name="clear_history">Apagar histórico</string>
 	<string name="copy_scan">Copiar digitalização</string>
-	<string name="edit_scan">Editar identificação</string>
+	<string name="edit_label">Editar etiqueta</string>
 	<string name="remove_scan">Excluir digitalização</string>
 	<string name="enter_name">Digite um nome para identificar esta digitalização</string>
-	<string name="enter_name_hint">Nome de digitalização</string>
-	<string name="no_barcode_found">Nenhum código encontrado</string>
-	<string name="pick_list_separator">Como separar itens da lista?</string>
+	<string name="enter_name_hint">Nome da digitalização</string>
+	<string name="no_barcode_found">Nenhum código de barras encontrado</string>
+	<string name="pick_list_separator">Como separar os itens da lista?</string>
 	<string name="separator_line_break">Quebra de linha</string>
-	<string name="separator_ruler">Hífen</string>
+	<string name="separator_ruler">Régua</string>
 	<string name="save_as_file_name">Salvar na pasta de Downloads?</string>
 	<string name="file_name">Nome do arquivo</string>
-	<string name="error_saving_file">Não foi possível salvar este arquivo</string>
+	<string name="error_saving_file">Não é possível salvar este arquivo</string>
 	<string name="error_file_exists">Arquivo já existe</string>
-	<string name="connect_to_wifi">Conectar a WiFi</string>
-	<string name="wifi_config_failed">Não foi possível configurar a WiFi</string>
-	<string name="wifi_added">WiFi adicionado</string>
-	<string name="sms_send">Envie SMS</string>
+	<string name="connect_to_wifi">Conectar à rede Wi-Fi</string>
+	<string name="wifi_config_failed">Não foi possível configurar a rede Wi-Fi</string>
+	<string name="wifi_added">Rede Wi-Fi adicionada</string>
+	<string name="sms_send">Enviar SMS</string>
 	<string name="sms_error">Não foi possível enviar SMS</string>
-	<string name="tel_dial">Disque número</string>
+	<string name="tel_dial">Discar número</string>
 	<string name="tel_error">Não foi possível discar este número</string>
-	<string name="mail_send">Envie e-mail</string>
-	<string name="mail_error">Não foi possível enviar este e-mail</string>
+	<string name="mail_send">Enviar e-mail</string>
+	<string name="mail_error">Não foi possível enviar e-mail</string>
 	<string name="vcard_add">Adicionar aos contatos</string>
 	<string name="vcard_failed">Não foi possível adicionar aos contatos</string>
 	<string name="vevent_add">Adicionar ao calendário</string>
 	<string name="vevent_failed">Não foi possível adicionar ao calendário</string>
 	<string name="otpauth_add">Adicionar 2FA</string>
-	<string name="search_web">Buscar na internet</string>
-	<string name="search_scan">Buscar nas digitalizações salvas</string>
+	<string name="search_web">Buscar na web</string>
+	<string name="search_scan">Buscar digitalização</string>
+	<string name="add_to_history">Adicionar ao histórico</string>
+	<string name="added_to_history">Adicionado ao histórico</string>
 	<string name="export_to_file">Exportar para arquivo</string>
-	<string name="export_as">Exportar em qual formato?</string>
+	<string name="export_as">Exportar como?</string>
 	<string name="export_csv_comma">Arquivo CSV com vírgulas</string>
-	<string name="export_csv_semicolon">Arquivo CSV com ponto e vírgula</string>
+	<string name="export_csv_semicolon">Arquivo CSV com ponto-e-vírgula</string>
 	<string name="export_json">Arquivo JSON</string>
 	<string name="export_database">Base de dados SQLite</string>
-	<string name="saved_in_downloads">Salvo em Downloads</string>
+	<string name="saved_in_downloads">Salvo nos Downloads</string>
 	<string name="rotate_image_cw">Girar a imagem no sentido horário</string>
-	<string name="toggle_free_rotation">Ativar rotação livre</string>
-	<string name="pick_file">Pick a file</string>
-	<string name="pick_image_file">Escolha imagem</string>
+	<string name="toggle_free_rotation">Girar livremente</string>
+	<string name="pick_file">Escolha um arquivo</string>
+	<string name="pick_image_file">Escolha um arquivo de imagem</string>
 	<string name="pick_code_to_scan">Escolha código para digitalizar</string>
-	<string name="shortcut_decode">Digitalizar código</string>
-	<string name="shortcut_encode">Criar código</string>
+	<string name="shortcut_decode">Digitalizar um código de barras</string>
+	<string name="shortcut_encode">Criar um código de barras</string>
+	<string name="shortcut_history">Histórico</string>
 	<string name="shortcut_preferences">Configurações</string>
-	<string name="background_request_failed">A solicitação em segundo plano falhou</string>
+	<string name="background_request_failed">Solicitação em segundo plano falhou</string>
 	<string name="entry_type">Tipo</string>
-	<string name="wifi_network">Rede de Wi-Fi</string>
+	<string name="wifi_network">Rede Wi-Fi</string>
 	<string name="wifi_ssid">Nome</string>
 	<string name="wifi_type">Tipo de autenticação</string>
 	<string name="wifi_password">Senha</string>
@@ -192,6 +208,6 @@
 	<string name="wifi_anonymous_identity">Identidade anônima</string>
 	<string name="wifi_identity">Identidade</string>
 	<string name="wifi_phase2">Método Phase 2</string>
-	<string name="network_suggestions">Sugestões de redes</string>
+	<string name="network_suggestions">Sugestões de rede</string>
 	<string name="remove_suggestion">Apagar sugestão</string>
 </resources>
@@ -16,6 +16,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">Метка</string>
 	<string name="colors">Цвета</string>
 	<string name="colors_black_on_white">Чёрный на белом</string>
 	<string name="colors_white_on_black">Белый на чёрном</string>
@@ -30,6 +31,7 @@
 	<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>
@@ -44,7 +46,8 @@
 	<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 +61,9 @@
 	<string name="bulk_mode_delay">Задержка непрерывного сканирования</string>
 	<string name="restrict_format">Исключить формат</string>
 	<string name="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">Сканировать %s</string>
 	<string name="quarter_second">Четверть секунды</string>
 	<string name="half_second">Полсекунды</string>
@@ -95,8 +101,10 @@
 	<string name="tone_prop_beep2">Обычный двойной сигнал</string>
 	<string name="use_history">Сохранять историю сканирования</string>
 	<string name="use_history_summary">Сохранять распознанные штрих-коды на устройстве.</string>
-	<string name="ignore_consecutive_duplicates">Не хранить дубликаты</string>
-	<string name="ignore_consecutive_duplicates_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>
@@ -105,11 +113,13 @@
 	<string name="show_meta_data_summary">Показывать дополнительную информацию о считанных штрих-кодах.</string>
 	<string name="show_hex_dump">Показывать шестнадцатеричный дамп</string>
 	<string name="show_hex_dump_summary">Показывать шестнадцатеричный дамп содержимого считанного штрих-кода.</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="default_search_engine">Поиск неизвестных данных</string>
 	<string name="always_ask">Всегда спрашивать</string>
 	<string name="open_with_url">Открывать неизвестные данные по URL</string>
 	<string name="clear_network_suggestions">Удалить сетевые предложения</string>
@@ -135,12 +145,15 @@
 	<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">Создание</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_scan">Редактировать</string>
+	<string name="edit_label">Редактировать</string>
 	<string name="remove_scan">Удалить сканирование</string>
 	<string name="enter_name">Укажите название сканирования</string>
 	<string name="enter_name_hint">Название сканирования</string>
@@ -168,6 +181,8 @@
 	<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>
@@ -182,6 +197,7 @@
 	<string name="pick_code_to_scan">Выберите штрих-код для сканирования</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>
@@ -2,6 +2,7 @@
 	<string-array name="search_engines_names">
 		<item>@string/always_ask</item>
 		<item>Google</item>
+		<item>Brave Search</item>
 		<item>DuckDuckGo</item>
 		<item>Qwant</item>
 		<item>Bing</item>
@@ -16,6 +17,7 @@
 	<string-array name="search_engines_values">
 		<item></item>
 		<item>https://www.google.com.tr/search?q=</item>
+		<item>https://search.brave.com/search?q=</item>
 		<item>https://duckduckgo.com/?q=</item>
 		<item>https://www.qwant.com/?q=</item>
 		<item>https://bing.com/?q=</item>
@@ -1,7 +1,7 @@
 <resources>
 	<string name="camera_error">Kameraya erişilemiyor, lütfen yeniden deneyin</string>
 	<string name="scan_code">Kod tara</string>
-	<string name="compose_barcode">Barkod yarat</string>
+	<string name="compose_barcode">Barkod oluştur</string>
 	<string name="decode_barcode">Barkod çöz</string>
 	<string name="content">İçerik</string>
 	<string name="binary_data">(ikili veri)</string>
@@ -14,6 +14,7 @@
 	<string name="error_correction_level_m" formatted="false">Orta (~&#37;15 düzeltim)</string>
 	<string name="error_correction_level_q" formatted="false">Dörtte Bir (~&#37;25 düzeltim)</string>
 	<string name="error_correction_level_h" formatted="false">Yüksek (~&#37;30 düzeltim)</string>
+	<string name="label">Etiket</string>
 	<string name="colors">Ön ve arka plan</string>
 	<string name="colors_black_on_white">Beyaz üzerine siyah</string>
 	<string name="colors_white_on_black">Siyah üzerine beyaz</string>
@@ -28,10 +29,11 @@
 	<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">Data mask</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">Share as file</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="copied_to_clipboard">Panoya kopyalandı</string>
@@ -42,12 +44,13 @@
 	<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">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">İçeriği buraya gir</string>
-	<string name="unescape">Expand escape sequences</string>
+	<string name="unescape">Kaçış dizilerini genişlet</string>
 	<string name="encode">KODLA</string>
 	<string name="error_no_content">İçerik eksik</string>
-	<string name="error_encoding_barcode">Barkod yaratılamadı</string>
+	<string name="error_encoding_barcode">Barkod oluşturulamadı</string>
 	<string name="view_barcode">Barkodu gör</string>
 	<string name="info">Bilgi</string>
 	<string name="switch_camera">Kamerayı değiştir</string>
@@ -56,6 +59,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">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">%s tara</string>
 	<string name="quarter_second">Çeyrek saniye</string>
 	<string name="half_second">Yarım saniye</string>
@@ -82,19 +88,21 @@
 	<string name="show_toast_in_bulk_mode_summary">Sürekli tarama yaparken taranan verileri kısaca göster.</string>
 	<string name="vibrate">Tanıyınca titre</string>
 	<string name="vibrate_summary">Kod tanındığında aygıtınızın titremesini istiyorsanız bunu etkinleştirin.</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">Tanıyınca ses çal</string>
+	<string name="beep_summary">Kod tanındığında aygıtınızın bip sesi çıkarmasını istiyorsanız bunu etkinleştirin.</string>
+	<string name="beep_tone">Ses tonu</string>
+	<string name="tone_cdma_confirm">CDMA onaylaması</string>
+	<string name="tone_sup_confirm">Çağrı denetleme onayı</string>
+	<string name="tone_sup_radio_ack">Çağrı denetleme radyo yolu onayı</string>
+	<string name="tone_prop_ack">Olumlu onay</string>
+	<string name="tone_prop_beep">Genel bip sesi</string>
+	<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_consecutive_duplicates">Yinelemeleri göz ardı et</string>
-	<string name="ignore_consecutive_duplicates_summary">Ardışık yinelemeleri tarama geçmişine kaydetme.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</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>
@@ -103,6 +111,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_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>
@@ -126,19 +136,22 @@
 	<string name="send_type_post_json">POST application/json</string>
 	<string name="send_type_external_browser">Harici tarayıcıda aç</string>
 	<string name="test_url">URL\'yi sına</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="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="send_scan_bluetooth">Taramaları Bluetooth ile ilet</string>
+	<string name="send_scan_bluetooth_summary">Taramaları belirtilen bir Bluetooth aygıtına iletmeyi etkinleştirin</string>
+	<string name="send_scan_bluetooth_host">Aygıt</string>
+	<string name="no_bluetooth_hosts_paired">Eşleştirilen Aygıt Yok</string>
+	<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="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>
 	<string name="clear_history">Geçmişi temizle</string>
 	<string name="copy_scan">Taramayı kopyala</string>
-	<string name="edit_scan">Etiketi düzenle</string>
+	<string name="edit_label">Etiketi düzenle</string>
 	<string name="remove_scan">Taramayı sil</string>
 	<string name="enter_name">Taramayı açıklayacak ad gir</string>
 	<string name="enter_name_hint">Taramanın adı</string>
@@ -166,6 +179,8 @@
 	<string name="otpauth_add">2FA\'ya ekle</string>
 	<string name="search_web">Web\'i ara</string>
 	<string name="search_scan">Taramayı ara</string>
+	<string name="add_to_history">Geçmişe ekle</string>
+	<string name="added_to_history">Geçmişe eklendi</string>
 	<string name="export_to_file">Dosyaya dışa aktar</string>
 	<string name="export_as">Ne olarak dışa aktarılsın?</string>
 	<string name="export_csv_comma">Virgüller ile CSV</string>
@@ -175,11 +190,12 @@
 	<string name="saved_in_downloads">İndirilenlere kaydedildi</string>
 	<string name="rotate_image_cw">Görüntüyü saat yönünde döndür</string>
 	<string name="toggle_free_rotation">Serbest dönüşü değiştir</string>
-	<string name="pick_file">Pick a file</string>
+	<string name="pick_file">Dosya seç</string>
 	<string name="pick_image_file">Görüntü dosyası seç</string>
 	<string name="pick_code_to_scan">Taranacak kod seç</string>
 	<string name="shortcut_decode">Barkod tara</string>
-	<string name="shortcut_encode">Barkod yarat</string>
+	<string name="shortcut_encode">Barkod oluştur</string>
+	<string name="shortcut_history">History</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>
@@ -192,6 +208,6 @@
 	<string name="wifi_anonymous_identity">Anonim kimlik</string>
 	<string name="wifi_identity">Kimlik</string>
 	<string name="wifi_phase2">2. aşama yöntemi</string>
-	<string name="network_suggestions">Network suggestions</string>
-	<string name="remove_suggestion">Remove suggestion</string>
+	<string name="network_suggestions">Ağ önerileri</string>
+	<string name="remove_suggestion">Öneriyi kaldır</string>
 </resources>
@@ -15,6 +15,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">Мітка</string>
 	<string name="colors">Кольори</string>
 	<string name="colors_black_on_white">Чорний на білому</string>
 	<string name="colors_white_on_black">Білий на чорному</string>
@@ -29,10 +30,11 @@
 	<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">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="copied_to_clipboard">Скопійовано у буфер обміну</string>
@@ -43,7 +45,8 @@
 	<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">Add quiet zone</string>
 	<string name="input_content_here">Введіть вміст сюди</string>
 	<string name="unescape">Розгорнути спеціальні послідовності</string>
 	<string name="encode">КОДУВАТИ</string>
@@ -57,6 +60,9 @@
 	<string name="bulk_mode_delay">Затримка між безперервним скануванням</string>
 	<string name="restrict_format">Обмежити формат</string>
 	<string name="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">Сканувати %s</string>
 	<string name="quarter_second">Чверть секунди</string>
 	<string name="half_second">Півсекунди</string>
@@ -84,7 +90,7 @@
 	<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</string>
 	<string name="tone_sup_confirm">Підтвердження диспетчерського виклику</string>
@@ -94,8 +100,10 @@
 	<string name="tone_prop_beep2">Звичайний подвійний сигнал</string>
 	<string name="use_history">Зберігати історію сканування</string>
 	<string name="use_history_summary">Збережіть розпізнані коди на своєму пристрої.</string>
-	<string name="ignore_consecutive_duplicates">Ігнорувати дублікати</string>
-	<string name="ignore_consecutive_duplicates_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>
@@ -104,6 +112,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">Показати контрольну суму</string>
+	<string name="no_checksum">Немає контрольної суми</string>
 	<string name="show_recreation">Показати відновлений штрих-код</string>
 	<string name="show_recreation_summary">Відтворити і показати штрих-код із прочитаного вмісту, якщо це можливо.</string>
 	<string name="close_automatically">Повернутися після копіювання/поширення</string>
@@ -134,12 +144,15 @@
 	<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">Генерація</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_scan">Редагувати мітку</string>
+	<string name="edit_label">Редагувати мітку</string>
 	<string name="remove_scan">Видалити сканування</string>
 	<string name="enter_name">Введіть ім\'я щоб описати сканування</string>
 	<string name="enter_name_hint">Ім\'я сканування</string>
@@ -167,6 +180,8 @@
 	<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>
@@ -176,11 +191,12 @@
 	<string name="saved_in_downloads">Збережено в Завантаженнях</string>
 	<string name="rotate_image_cw">Повернути зображення за годинниковою стрілкою</string>
 	<string name="toggle_free_rotation">Увімкнути вільне обертання</string>
-	<string name="pick_file">Pick a file</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">Історія</string>
 	<string name="shortcut_preferences">Налаштування</string>
 	<string name="background_request_failed">Помилка фонового запиту</string>
 	<string name="entry_type">Тип</string>
@@ -0,0 +1,3 @@
+<resources>
+	<bool name="fitsSystemWindows">false</bool>
+</resources>
@@ -13,6 +13,7 @@
 	<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>
@@ -27,6 +28,7 @@
 	<string name="gtin_add_on">Phần mở rộng 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">Data mask</string>
 	<string name="toggle_flash">Bật/tắt đèn</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Chia sẻ</string>
@@ -41,7 +43,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">Nhập nội dung vào đây</string>
 	<string name="unescape">Expand escape sequences</string>
 	<string name="encode">MÃ HOÁ</string>
@@ -55,6 +58,9 @@
 	<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="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">Một phần tư giây</string>
 	<string name="half_second">Nửa giây</string>
@@ -92,8 +98,10 @@
 	<string name="tone_prop_beep2">General double 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_consecutive_duplicates">Bỏ qua trùng lặp</string>
-	<string name="ignore_consecutive_duplicates_summary">Không lưu các kết quả quét trùng lặp liên tục vào lịch sử.</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</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>
@@ -102,6 +110,8 @@
 	<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="close_automatically">Quay lại sau khi Sao chép/Chia sẻ</string>
@@ -132,12 +142,15 @@
 	<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">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>
 	<string name="clear_history">Xoá lịch sử</string>
 	<string name="copy_scan">Sao chép lần quét</string>
-	<string name="edit_scan">Sửa nhãn</string>
+	<string name="edit_label">Sửa nhãn</string>
 	<string name="remove_scan">Xoá lần quét</string>
 	<string name="enter_name">Nhập tên để miêu tả lần quét</string>
 	<string name="enter_name_hint">Tên lần quét</string>
@@ -165,6 +178,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="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>
@@ -179,6 +194,7 @@
 	<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_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>
@@ -1,5 +1,5 @@
 <resources>
-	<string name="camera_error">无法访问相机，请重试。</string>
+	<string name="camera_error">无法访问相机，请重试</string>
 	<string name="scan_code">扫码</string>
 	<string name="compose_barcode">生成条码</string>
 	<string name="decode_barcode">解析条码</string>
@@ -9,10 +9,11 @@
 		<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">Label</string>
 	<string name="colors">前景和背景</string>
 	<string name="colors_black_on_white">白底黑字</string>
 	<string name="colors_white_on_black">黑底白字</string>
@@ -27,10 +28,11 @@
 	<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">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="copied_to_clipboard">已复制到剪贴板</string>
@@ -41,7 +43,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">在这里输入内容</string>
 	<string name="unescape">展开转义字符</string>
 	<string name="encode">编码</string>
@@ -51,10 +54,13 @@
 	<string name="info">关于</string>
 	<string name="switch_camera">切换摄像头</string>
 	<string name="bulk_mode">连续扫描</string>
-	<string name="bulk_mode_summary">始终开启连续扫描</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">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">扫描 %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
@@ -69,39 +75,43 @@
 	<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="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="zoom_by_swiping_summary">在扫描界面上下滑动以控制相机缩放。</string>
 	<string name="auto_rotate">识别竖直的 1D 条形码</string>
-	<string name="auto_rotate_summary">自动旋转相机以识别竖直的 1D 条形码（可能会影响一些设备的扫描性能）</string>
+	<string name="auto_rotate_summary">自动旋转相机以识别竖直的 1D 条形码（可能会影响一些设备的扫描性能）。</string>
 	<string name="try_harder">提高扫描精度</string>
-	<string name="try_harder_summary">扫描很难识别的条码时可启用该选项！会影响性能</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 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="use_history_summary">在本地保存扫描历史。</string>
+	<string name="ignore_duplicates">忽略重复项</string>
 	<string name="ignore_consecutive_duplicates">不保存重复历史</string>
-	<string name="ignore_consecutive_duplicates_summary">在扫描历史中不保存重复项</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">接受重复项</string>
 	<string name="open_immediately">不检查内容立即打开链接</string>
-	<string name="open_immediately_summary">可能会打开有害内容</string>
+	<string name="open_immediately_summary">跳过检查并立即打开内容。如果启用，可能会打开有害内容。</string>
 	<string name="copy_immediately">自动复制扫描结果到剪贴板</string>
-	<string name="copy_immediately_summary">注意其他 APP 可能会在后台监控剪贴板</string>
+	<string name="copy_immediately_summary">注意其他 APP 可能会在后台监控剪贴板。</string>
 	<string name="show_meta_data">显示元数据</string>
-	<string name="show_meta_data_summary">显示已扫描条码的额外数据</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_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>
@@ -116,7 +126,7 @@
 	<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">启用以转发扫描结果至指定的 URL</string>
+	<string name="send_scan_active_summary">启用以转发扫描结果至指定的 URL。</string>
 	<string name="send_scan_url">转发 URL</string>
 	<string name="send_scan_type">请求类型</string>
 	<string name="send_type_get_add_content">GET 简单附加数据</string>
@@ -126,18 +136,21 @@
 	<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">启用以转发扫描结果至指定的蓝牙服务设备</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="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_scan">编辑名称</string>
+	<string name="edit_label">编辑名称</string>
 	<string name="remove_scan">删除所选记录</string>
 	<string name="enter_name">输入名称</string>
 	<string name="enter_name_hint">扫描描述</string>
@@ -165,6 +178,8 @@
 	<string name="otpauth_add">添加两步验证</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>
@@ -174,11 +189,12 @@
 	<string name="saved_in_downloads">已保存到下载目录</string>
 	<string name="rotate_image_cw">顺时针旋转图片</string>
 	<string name="toggle_free_rotation">切换自由旋转</string>
-	<string name="pick_file">Pick a file</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">历史</string>
 	<string name="shortcut_preferences">设置</string>
 	<string name="background_request_failed">后台请求失败</string>
 	<string name="entry_type">类型</string>
@@ -1,25 +0,0 @@
-<resources>
-	<string-array name="locale_names">
-		<item>@string/follow_system_settings</item>
-		<item>英文</item>
-		<item>德文</item>
-		<item>西班牙</item>
-		<item>法文</item>
-		<item>匈牙利</item>
-		<item>印尼</item>
-		<item>義大利</item>
-		<item>喬治亞</item>
-		<item>荷蘭</item>
-		<item>波斯</item>
-		<item>波蘭</item>
-		<item>巴西 (葡萄牙)</item>
-		<item>俄羅斯</item>
-		<item>土耳其</item>
-		<item>烏克蘭</item>
-		<item>中文</item>
-		<item>繁體中文</item>
-		<item>簡體中文</item>
-		<item>日文</item>
-		<item>捷克</item>
-	</string-array>
-</resources>
@@ -13,6 +13,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">名稱</string>
 	<string name="colors">前景與背景</string>
 	<string name="colors_black_on_white">白底黑字</string>
 	<string name="colors_white_on_black">黑底白字</string>
@@ -27,10 +28,11 @@
 	<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">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="copied_to_clipboard">已複製到剪貼簿</string>
@@ -41,7 +43,8 @@
 	<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">No magnification</string>
+	<string name="add_quiet_zone">Add quiet zone</string>
 	<string name="input_content_here">請在這裡輸入內容</string>
 	<string name="unescape">展開逸出序列</string>
 	<string name="encode">編碼</string>
@@ -55,6 +58,9 @@
 	<string name="bulk_mode_delay">連續掃描間的延遲</string>
 	<string name="restrict_format">限制格式</string>
 	<string name="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">掃描 %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
@@ -92,8 +98,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_consecutive_duplicates">不儲存重複歷史記錄</string>
-	<string name="ignore_consecutive_duplicates_summary">掃描記錄中不儲存連續的重複項目</string>
+	<string name="ignore_any_duplicates">Ignore any duplicates</string>
+	<string name="accept_duplicates">Accept duplicates</string>
 	<string name="open_immediately">立即開啟</string>
 	<string name="open_immediately_summary">跳過檢查並立即開啟。可能會開啟有害內容</string>
 	<string name="copy_immediately">自動複製掃描結果到剪貼簿</string>
@@ -102,6 +110,8 @@
 	<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_recreation">顯示重新產生的條碼</string>
 	<string name="show_recreation_summary">如果可以，從讀取內容中重新建立並顯示條碼</string>
 	<string name="close_automatically">複製 / 分享後自動返回</string>
@@ -132,12 +142,15 @@
 	<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="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_scan">編輯名稱</string>
+	<string name="edit_label">編輯名稱</string>
 	<string name="remove_scan">刪除所選記錄</string>
 	<string name="enter_name">輸入名稱</string>
 	<string name="enter_name_hint">掃描描述</string>
@@ -165,6 +178,8 @@
 	<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>
@@ -174,11 +189,12 @@
 	<string name="saved_in_downloads">已儲存至下載資料夾</string>
 	<string name="rotate_image_cw">順時針旋轉圖片</string>
 	<string name="toggle_free_rotation">切換自由旋轉</string>
-	<string name="pick_file">Pick a file</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_preferences">設定</string>
 	<string name="background_request_failed">背景請求失敗</string>
 	<string name="entry_type">類型</string>
@@ -8,6 +8,7 @@
 		<item>DATA BAR</item>
 		<item>DATA BAR EXPANDED</item>
 		<item>DATA MATRIX</item>
+		<item>DX FILM EDGE</item>
 		<item>EAN 8</item>
 		<item>EAN 13</item>
 		<item>ITF</item>
@@ -15,6 +16,7 @@
 		<item>PDF 417</item>
 		<item>QR CODE</item>
 		<item>MICRO QR CODE</item>
+		<item>rMQR CODE</item>
 		<item>UPC A</item>
 		<item>UPC E</item>
 	</string-array>
@@ -27,6 +29,7 @@
 		<item>DATA_BAR</item>
 		<item>DATA_BAR_EXPANDED</item>
 		<item>DATA_MATRIX</item>
+		<item>DX_FILM_EDGE</item>
 		<item>EAN_8</item>
 		<item>EAN_13</item>
 		<item>ITF</item>
@@ -34,6 +37,7 @@
 		<item>PDF_417</item>
 		<item>QR_CODE</item>
 		<item>MICRO_QR_CODE</item>
+		<item>RMQR_CODE</item>
 		<item>UPC_A</item>
 		<item>UPC_E</item>
 	</string-array>
@@ -0,0 +1,3 @@
+<resources>
+	<bool name="fitsSystemWindows">true</bool>
+</resources>
@@ -4,4 +4,8 @@
 	<string name="url_hint_add_content" translatable="false">http://example.com/?content=</string>
 	<string name="project_url" translatable="false">https://github.com/markusfisch/BinaryEye</string>
 	<string name="no_bluetooth_hosts_paired_value" translatable="false" />
+	<string name="crc4" translatable="false">CRC4</string>
+	<string name="md5" translatable="false">MD5</string>
+	<string name="sha1" translatable="false">SHA1</string>
+	<string name="sha256" translatable="false">SHA256</string>
 </resources>
@@ -0,0 +1,12 @@
+<resources>
+	<string-array name="ignore_duplicates_names">
+		<item>@string/ignore_consecutive_duplicates</item>
+		<item>@string/ignore_any_duplicates</item>
+		<item>@string/accept_duplicates</item>
+	</string-array>
+	<string-array name="ignore_duplicates_values">
+		<item>ignore_consecutive_duplicates</item>
+		<item>ignore_any_duplicates</item>
+		<item>accept_duplicates</item>
+	</string-array>
+</resources>
@@ -0,0 +1,16 @@
+<resources>
+	<string-array name="checksum_names">
+		<item>@string/no_checksum</item>
+		<item>@string/crc4</item>
+		<item>@string/md5</item>
+		<item>@string/sha1</item>
+		<item>@string/sha256</item>
+	</string-array>
+	<string-array name="checksum_values">
+		<item></item>
+		<item>CRC4</item>
+		<item>MD5</item>
+		<item>SHA1</item>
+		<item>SHA256</item>
+	</string-array>
+</resources>
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 	<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>
@@ -14,6 +14,7 @@
 	<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>
@@ -27,7 +28,8 @@
 	<string name="gtin_price">Suggested price</string>
 	<string name="gtin_add_on">UPC EAN extension</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$s (%2$d modules)</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>
@@ -42,7 +44,8 @@
 	<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>
@@ -56,6 +59,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>
@@ -93,8 +99,10 @@
 	<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_consecutive_duplicates">Ignore duplicates</string>
-	<string name="ignore_consecutive_duplicates_summary">Do not save consecutive duplicates in the scan history.</string>
+	<string name="ignore_duplicates">Ignore duplicates</string>
+	<string name="ignore_consecutive_duplicates">Consecutive duplicates</string>
+	<string name="ignore_any_duplicates">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>
@@ -103,6 +111,8 @@
 	<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>
@@ -133,12 +143,15 @@
 	<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_scan">Edit label</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>
@@ -166,6 +179,8 @@
 	<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>
@@ -180,6 +195,7 @@
 	<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>
@@ -65,11 +65,12 @@
 			android:key="use_history"
 			android:title="@string/use_history"
 			android:summary="@string/use_history_summary"/>
-		<android.support.v7.preference.SwitchPreferenceCompat
-			android:defaultValue="true"
-			android:key="ignore_consecutive_duplicates"
-			android:title="@string/ignore_consecutive_duplicates"
-			android:summary="@string/ignore_consecutive_duplicates_summary"/>
+		<ListPreference
+			android:key="ignore_duplicates_name"
+			android:title="@string/ignore_duplicates"
+			android:entries="@array/ignore_duplicates_names"
+			android:entryValues="@array/ignore_duplicates_values"
+			android:defaultValue="ignore_consecutive_duplicates"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="false"
 			android:key="copy_immediately"
@@ -119,6 +120,12 @@
 			android:key="show_hex_dump"
 			android:title="@string/show_hex_dump"
 			android:summary="@string/show_hex_dump_summary"/>
+		<ListPreference
+			android:key="show_checksum"
+			android:title="@string/show_checksum"
+			android:entries="@array/checksum_names"
+			android:entryValues="@array/checksum_values"
+			android:defaultValue="@string/no_checksum"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="show_recreation"
@@ -143,6 +150,13 @@
 			android:title="@string/clear_network_suggestions"
 			android:summary="@string/clear_network_suggestions_summary"/>
 	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/generation_category">
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="false"
+			android:key="brighten_screen"
+			android:title="@string/brighten_screen"
+			android:summary="@string/brighten_screen_summary"/>
+	</PreferenceCategory>
 	<PreferenceCategory android:title="@string/locale_category">
 		<ListPreference
 			android:key="custom_locale"
--- a/Show More
+++ b/Show More