Advance version number to 1.58.2

Because `String.last()` will throw a NoSuchElementException when
the string is empty.

CHANGELOG.md

@@ -1,5 +1,67 @@
 # Change Log
 
+## 1.58.2
+* Fix parsing WiFi network suggestions
+
+## 1.58.1
+* Update zh-rCn translation
+* Fix monochrome launcher icon
+
+## 1.58.0
+* Improve detection of inverted barcodes
+* Optionally allow duplicates in bulk scan
+* Add Danish translation
+* Update Italian translation
+* Update Japanese translation
+* Update Russian translation
+* Fix charset decoding for PDF 417
+* Fix monochrome icon
+
+## 1.57.0
+* Add optional audio feedback for scanning
+* Allow removing individual WiFi network suggestions
+* Recognize incomplete and malformed WiFi barcodes
+* Fix using shared text for encoding
+* Add Korean language
+* Update Chinese translation
+* Update Português/Brasil translation
+* Update Russian translation
+
+## 1.56.3
+* Fix parsing URLs in barcodes
+* Update French, Portuguese, Turkish and Taiwan translation
+
+## 1.56.2
+* Fix generating 1D barcode text output
+
+## 1.56.1
+* Allow pinching a barcode to its generated size
+* Fix view/frame transformation matrix
+* Fix handling of tab characters
+* Update Indonesian translation
+* Update Russian translation
+
+## 1.56.0
+* Add an action item to lock/unlock free rotation
+* Support setting fore and background colors when creating barcodes
+* Fix creating barcodes with UTF-8 content
+
+## 1.55.0
+* Make recreated barcode interactive
+* Update to latest ZXing C++
+* Update Italian translation
+
+## 1.54.1
+* Update Russian translation
+* Update Turkish translation
+* Update Italian translation
+* Fix handling GS1 and ISO15434 content types
+* Fix VerifyError on Android 4
+
+## 1.54.0
+* Recreate and show barcode from read contents if possible
+* Add ebay, Amazon and barcodelookup.com to search engines
+
 ## 1.53.1
 * Fix proguard configuration
 

CONTRIBUTING.md

@@ -17,4 +17,4 @@ Then write a [good commit message][commit_messages] to keep the history
 meaningful and useful. One feature, one commit.
 
 [android_best_practices]: https://developer.android.com/distribute/best-practices/develop/
-[commit_messages]: https://juffalow.com/other/write-good-git-commit-message
+[commit_messages]: https://git-scm.com/book/en/v2/Distributed-Git-Contributing-to-a-Project#_commit_guidelines

PRIVACY.md

@@ -12,7 +12,7 @@ hesitate to contact me.
 Required to add a WiFi network from a barcode (usually a QR Code).
 
 Before Android Q, this feature requires using
-[WifiManager.getConfiguredNetworks][configuredNetworks]
+[WifiManager.getConfiguredNetworks][getConfiguredNetworks]
 which requires `ACCESS_FINE_LOCATION`.
 
 On Android Q an better, this permission is not requested nor required.
@@ -46,9 +46,13 @@ which requires `CHANGE_WIFI_STATE`.
 Required to add a WiFi network from a barcode (usually a QR Code).
 
 Before Android Q, this feature requires using
-[WifiManager.getConfiguredNetworks][configuredNetworks]
+[WifiManager.getConfiguredNetworks][getConfiguredNetworks]
 which requires `ACCESS_WIFI_STATE`.
 
+From Android R, `ACCESS_WIFI_STATE` is required for
+[WifiManager.getNetworkSuggestions][getNetworkSuggestions]
+which is used to remove individual network suggestions.
+
 [ACCESS_FINE_LOCATION]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
 [CAMERA]: https://developer.android.com/reference/android/Manifest.permission#CAMERA
 [INTERNET]: https://developer.android.com/reference/android/Manifest.permission#INTERNET
@@ -56,5 +60,6 @@ which requires `ACCESS_WIFI_STATE`.
 [WRITE_EXTERNAL_STORAGE]: https://developer.android.com/reference/android/Manifest.permission#WRITE_EXTERNAL_STORAGE
 [CHANGE_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#CHANGE_WIFI_STATE
 [ACCESS_WIFI_STATE]: https://developer.android.com/reference/android/Manifest.permission#ACCESS_FINE_LOCATION
-[configuredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
+[getConfiguredNetworks]: https://developer.android.com/reference/android/net/wifi/WifiManager#getConfiguredNetworks()
 [addNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#addNetworkSuggestions(java.util.List%3Candroid.net.wifi.WifiNetworkSuggestion%3E)
+[getNetworkSuggestions]: https://developer.android.com/reference/android/net/wifi/WifiManager#getNetworkSuggestions()

README.md

@@ -84,7 +84,6 @@ Supported symbols are:
 * `RESULT` - scanned content
 * `RESULT_BYTES` - raw result as a hex string
 * `FORMAT` - barcode format
-* `META` - the meta data, if available
 
 ### SCAN Intent
 

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 102
-		versionName '1.53.1'
+		versionCode 115
+		versionName '1.58.2'
 	}
 
 	signingConfigs {
@@ -65,6 +65,6 @@ dependencies {
 	implementation "com.android.support:preference-v7:$support_version"
 	implementation "com.android.support:preference-v14:$support_version"
 	implementation 'com.github.markusfisch:CameraView:1.9.1'
-	implementation 'com.github.markusfisch:ScalingImageView:1.4.0'
-	implementation 'com.github.markusfisch:zxing-cpp:v1.4.0.4'
+	implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
+	implementation 'com.github.markusfisch:zxing-cpp:v2.0.0.0'
 }

app/src/main/AndroidManifest.xml

@@ -12,8 +12,7 @@
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
 		android:maxSdkVersion="28"/>
 	<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
-	<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"
-		android:maxSdkVersion="28"/>
+	<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-sdk tools:overrideLibrary="android.support.v14.preference"/>
@@ -64,15 +63,6 @@
 				<action android:name="com.google.zxing.client.android.SCAN"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW"/>
-				<category android:name="android.intent.category.DEFAULT"/>
-				<category android:name="android.intent.category.BROWSABLE"/>
-				<data android: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"/>

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

@@ -5,8 +5,8 @@ import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IAction
 import de.markusfisch.android.binaryeye.app.alertDialog
 import de.markusfisch.android.binaryeye.app.prefs
-import de.markusfisch.android.binaryeye.app.urlEncode
 import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.net.urlEncode
 
 object OpenOrSearchAction : IAction {
 	override val iconResId: Int = R.drawable.ic_action_search
@@ -23,7 +23,7 @@ object OpenOrSearchAction : IAction {
 		url: String,
 		search: Boolean
 	) {
-		if (!context.openUrl(url) && search) {
+		if (!context.openUrl(url, silent = true) && search) {
 			openSearch(context, url)
 		}
 	}

app/src/main/kotlin/de/markusfisch/android/binaryeye/actions/tel/TelAction.kt

@@ -4,7 +4,7 @@ import android.content.Context
 import android.content.Intent
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.IntentAction
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
+import de.markusfisch.android.binaryeye.content.parseAndNormalizeUri
 
 object TelAction : IntentAction() {
 	private val telRegex = """^tel:(\+?[0-9]+)$""".toRegex(

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

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

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

@@ -10,12 +10,6 @@ import android.support.annotation.RequiresApi
 import de.markusfisch.android.binaryeye.R
 import java.util.*
 
-@RequiresApi(Build.VERSION_CODES.Q)
-fun removeNetworkSuggestions(context: Context): Int =
-	(context.applicationContext.getSystemService(
-		Context.WIFI_SERVICE
-	) as WifiManager).removeNetworkSuggestions(listOf())
-
 /**
  * Normal:
  * WIFI:S:[network SSID];T:<WPA|WEP|nopass|>;P:[network password];H:<true|false|>;;
@@ -50,8 +44,10 @@ object WifiConnector {
 		passwordBlock?.apply {
 			invoke(parsedData.password)
 		}
-		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q.
+		return if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+			// WifiConfiguration is deprecated in Android Q but
+			// because it's only possible in R to query network
+			// suggestions, we still use the deprecated API on Q.
 			@Suppress("DEPRECATION")
 			WifiConfiguration().apply(parsedData)
 		} else {
@@ -63,33 +59,23 @@ object WifiConnector {
 		val wifiManager = context.applicationContext.getSystemService(
 			Context.WIFI_SERVICE
 		) as WifiManager
-		return if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			// WifiConfiguration is deprecated in Android Q.
-			@Suppress("DEPRECATION")
-			val wifiConfig = config as WifiConfiguration
-			if (wifiManager.enableWifi() &&
-				wifiManager.removeOldNetwork(wifiConfig) &&
-				wifiManager.enableNewNetwork(wifiConfig)
-			) {
-				R.string.wifi_added
-			} else {
-				R.string.wifi_config_failed
-			}
+		// WifiConfiguration is deprecated in Android Q.
+		@Suppress("DEPRECATION")
+		return if ((config is WifiConfiguration &&
+					wifiManager.enableWifi() &&
+					wifiManager.removeOldNetwork(config) &&
+					wifiManager.enableNewNetwork(config)) ||
+			(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q &&
+					config is WifiNetworkSuggestion.Builder &&
+					wifiManager.addNetworkFromBuilder(config))
+		) {
+			R.string.wifi_added
 		} else {
-			val suggestion = (config as WifiNetworkSuggestion.Builder).build()
-			val suggestions = listOf(suggestion)
-			// Remove previous conflicting network suggestion.
-			wifiManager.removeNetworkSuggestions(suggestions)
-			val result = wifiManager.addNetworkSuggestions(suggestions)
-			if (result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS) {
-				R.string.wifi_added
-			} else {
-				R.string.wifi_config_failed
-			}
+			R.string.wifi_config_failed
 		}
 	}
 
-	internal fun parseMap(string: String): Map<String, String>? {
+	internal fun parseMap(input: String): Map<String, String>? {
 		// Normally those codes should have the last semicolon, but many
 		// generators don't add it.
 		val wifiRegex = """^WIFI:((?:.+?:(?:[^\\;]|\\.)*;)+);?$""".toRegex()
@@ -97,7 +83,7 @@ object WifiConnector {
 		// and : because many QR Code creators don't escape properly.
 		val pairRegex = """(.+?):((?:[^\\;]|\\.)*);""".toRegex()
 		return wifiRegex.matchEntire(
-			string
+			input.trimAndTerminate()
 		)?.groupValues?.get(1)?.let { pairs ->
 			pairRegex.findAll(pairs).map { pair ->
 				pair.groupValues[1].uppercase(Locale.US) to pair.groupValues[2]
@@ -126,7 +112,7 @@ object WifiConnector {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
 					WifiEnterpriseConfig.Eap.NONE
 				}
-			} else when (inputMap["E"]) {
+			} else when (inputMap["E"]?.uppercase()) {
 				"AKA" -> requireSdk(Build.VERSION_CODES.LOLLIPOP) { WifiEnterpriseConfig.Eap.AKA }
 				"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.M) { WifiEnterpriseConfig.Eap.AKA_PRIME }
 				"NONE" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Eap.NONE }
@@ -143,7 +129,7 @@ object WifiConnector {
 				requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) {
 					WifiEnterpriseConfig.Phase2.NONE
 				}
-			} else when (inputMap["PH2"]) {
+			} else when (inputMap["PH2"]?.uppercase()) {
 				"AKA" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA }
 				"AKA_PRIME" -> requireSdk(Build.VERSION_CODES.O) { WifiEnterpriseConfig.Phase2.AKA_PRIME }
 				"GTC" -> requireSdk(Build.VERSION_CODES.JELLY_BEAN_MR2) { WifiEnterpriseConfig.Phase2.GTC }
@@ -179,7 +165,7 @@ object WifiConnector {
 			data: SimpleDataAccessor
 		): WifiNetworkSuggestion.Builder? {
 			try {
-				when (data.securityType) {
+				when (data.securityType.uppercase()) {
 					"WPA", "WPA2" -> {
 						data.password?.let { setWpa2Passphrase(it) }
 					}
@@ -240,8 +226,8 @@ object WifiConnector {
 		fun WifiConfiguration.applySecurity(
 			data: SimpleDataAccessor
 		): WifiConfiguration? {
-			when (data.securityType) {
-				"", "nopass" -> allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
+			when (data.securityType.uppercase()) {
+				"", "NOPASS" -> allowedKeyManagement.set(WifiConfiguration.KeyMgmt.NONE)
 				"WEP" -> @Suppress("DEPRECATION") /* WEP as insecure */ {
 					passwordWithQuotes?.let {
 						wepKeys[0] = it
@@ -303,6 +289,27 @@ object WifiConnector {
 	}
 }
 
+@RequiresApi(Build.VERSION_CODES.Q)
+private fun WifiManager.addNetworkFromBuilder(
+	builder: WifiNetworkSuggestion.Builder
+): Boolean {
+	val suggestion = builder.build()
+	val suggestions = listOf(suggestion)
+	// Remove previous conflicting network suggestion.
+	removeNetworkSuggestions(suggestions)
+	val result = addNetworkSuggestions(suggestions)
+	return result == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+}
+
+// Make sure the string ends with a semicolon.
+private fun String.trimAndTerminate(): String {
+	var trimmed = trim()
+	if (trimmed.isNotEmpty() && trimmed.last() != ';') {
+		trimmed += ";"
+	}
+	return trimmed
+}
+
 // Keep possibility of wrongly unescaped \ by explicitly searching
 // for special chars.
 private val escapedRegex = """\\([\\;,":])""".toRegex()

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

@@ -8,11 +8,8 @@ import android.content.pm.PackageManager
 import android.graphics.Matrix
 import android.graphics.Rect
 import android.hardware.Camera
-import android.media.AudioManager
-import android.media.ToneGenerator
 import android.net.Uri
 import android.os.Bundle
-import android.os.Vibrator
 import android.support.design.widget.FloatingActionButton
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
@@ -27,21 +24,25 @@ import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.execShareIntent
 import de.markusfisch.android.binaryeye.content.openUrl
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.database.toScan
 import de.markusfisch.android.binaryeye.graphics.FrameMetrics
 import de.markusfisch.android.binaryeye.graphics.mapPosition
 import de.markusfisch.android.binaryeye.graphics.setFrameRoi
 import de.markusfisch.android.binaryeye.graphics.setFrameToView
+import de.markusfisch.android.binaryeye.media.releaseToneGenerators
 import de.markusfisch.android.binaryeye.net.sendAsync
-import de.markusfisch.android.binaryeye.os.error
-import de.markusfisch.android.binaryeye.os.getVibrator
-import de.markusfisch.android.binaryeye.os.vibrate
+import de.markusfisch.android.binaryeye.net.urlEncode
+import de.markusfisch.android.binaryeye.view.errorFeedback
 import de.markusfisch.android.binaryeye.view.initSystemBars
+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.Binarizer
+import de.markusfisch.android.zxingcpp.ZxingCpp.DecodeHints
 import de.markusfisch.android.zxingcpp.ZxingCpp.Format
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 import java.nio.charset.Charset
@@ -53,13 +54,12 @@ class CameraActivity : AppCompatActivity() {
 	private val frameRoi = Rect()
 	private val matrix = Matrix()
 
-	private lateinit var vibrator: Vibrator
 	private lateinit var cameraView: CameraView
 	private lateinit var detectorView: DetectorView
 	private lateinit var zoomBar: SeekBar
 	private lateinit var flashFab: FloatingActionButton
 
-	private var formats = setOf<String>()
+	private var formatsToRead = setOf<String>()
 	private var frameMetrics = FrameMetrics()
 	private var decoding = true
 	private var returnResult = false
@@ -116,8 +116,6 @@ class CameraActivity : AppCompatActivity() {
 		// custom locale.
 		setTitle(R.string.scan_code)
 
-		vibrator = getVibrator()
-
 		initSystemBars(this)
 		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
 
@@ -142,6 +140,7 @@ class CameraActivity : AppCompatActivity() {
 		fallbackBuffer = null
 		saveZoom()
 		detectorView.saveCropHandlePos()
+		releaseToneGenerators()
 	}
 
 	override fun onResume() {
@@ -161,7 +160,7 @@ class CameraActivity : AppCompatActivity() {
 
 	private fun updateHints() {
 		val restriction = restrictFormat
-		formats = if (restriction != null) {
+		formatsToRead = if (restriction != null) {
 			title = getString(
 				R.string.scan_format,
 				prettifyFormatName(restriction)
@@ -424,22 +423,37 @@ class CameraActivity : AppCompatActivity() {
 				updateFrameRoiAndMappingMatrix()
 				ignoreNext = null
 				decoding = true
+				// These settings can't change while the camera is open.
+				val decodeHints = DecodeHints(
+					tryHarder = prefs.tryHarder,
+					tryRotate = prefs.autoRotate,
+					tryInvert = true,
+					tryDownscale = true
+				)
+				var useLocalAverage = false
 				camera.setPreviewCallback { frameData, _ ->
 					if (decoding) {
+						useLocalAverage = useLocalAverage xor true
 						ZxingCpp.readByteArray(
 							frameData,
 							frameMetrics.width,
 							frameRoi.left, frameRoi.top,
 							frameRoi.width(), frameRoi.height(),
 							frameMetrics.orientation,
-							formats.joinToString(),
-							prefs.tryHarder,
-							prefs.autoRotate,
-							tryInvert = true,
-							tryDownscale = true
+							decodeHints.apply {
+								// By default, ZXing uses LOCAL_AVERAGE, but
+								// this does not work well with inverted
+								// barcodes on low-contrast backgrounds.
+								binarizer = if (useLocalAverage) {
+									Binarizer.LOCAL_AVERAGE
+								} else {
+									Binarizer.GLOBAL_HISTOGRAM
+								}
+								formats = formatsToRead.joinToString()
+							}
 						)?.let { result ->
 							if (result.text != ignoreNext) {
-								postResult(result.redact())
+								postResult(result)
 								decoding = false
 							}
 						}
@@ -559,7 +573,7 @@ class CameraActivity : AppCompatActivity() {
 					detectorView.coordinates
 				)
 			)
-			vibrator.vibrate()
+			scanFeedback()
 			val returnUri = returnUrlTemplate?.let {
 				try {
 					completeUrl(it, result)
@@ -582,7 +596,6 @@ class CameraActivity : AppCompatActivity() {
 					showResult(
 						this@CameraActivity,
 						result,
-						vibrator,
 						bulkMode
 					)
 					// If this app was invoked via a deep link but without
@@ -594,7 +607,9 @@ class CameraActivity : AppCompatActivity() {
 				}
 			}
 			if (bulkMode) {
-				ignoreNext = result.text
+				if (prefs.ignoreConsecutiveDuplicates) {
+					ignoreNext = result.text
+				}
 				if (prefs.showToastInBulkMode) {
 					toast(result.text)
 				}
@@ -615,38 +630,9 @@ class CameraActivity : AppCompatActivity() {
 	}
 }
 
-fun Result.redact() = if (
-	format == Format.PDF_417.name &&
-	text.isNotEmpty()
-) {
-	Result(
-		format,
-		contentType,
-		String(
-			text.toByteArray(Charset.forName("ISO-8859-1")),
-			Charset.forName("UTF-8")
-		),
-		position,
-		orientation,
-		rawBytes,
-		ecLevel,
-		symbologyIdentifier,
-		sequenceSize,
-		sequenceIndex,
-		sequenceId,
-		readerInit,
-		lineCount,
-		versionNumber,
-		gtin
-	)
-} else {
-	this
-}
-
 fun showResult(
 	activity: Activity,
 	result: Result,
-	vibrator: Vibrator,
 	bulkMode: Boolean = false,
 ) {
 	if (prefs.copyImmediately) {
@@ -668,10 +654,7 @@ fun showResult(
 			prefs.sendScanType
 		) { code, body ->
 			if (code == null || code < 200 || code > 299) {
-				vibrator.error()
-				if (!activity.isSilent()) {
-					beepBeepBeep()
-				}
+				activity.errorFeedback()
 			}
 			if (body != null && body.isNotEmpty()) {
 				activity.toast(body)
@@ -713,19 +696,3 @@ private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
 		// And support {CODE} from the old ZXing app, too.
 		.replace("{CODE}", result.text.urlEncode())
 )
-
-private fun Context.isSilent(): Boolean {
-	val am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
-	return when (am.ringerMode) {
-		AudioManager.RINGER_MODE_SILENT,
-		AudioManager.RINGER_MODE_VIBRATE -> true
-		else -> false
-	}
-}
-
-private fun beepBeepBeep() {
-	ToneGenerator(AudioManager.STREAM_ALARM, 100).startTone(
-		ToneGenerator.TONE_CDMA_CONFIRM,
-		1000
-	)
-}

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

@@ -80,7 +80,9 @@ class MainActivity : AppCompatActivity() {
 			return when {
 				intent.hasExtra(PREFERENCES) -> PreferencesFragment()
 				intent.hasExtra(HISTORY) -> HistoryFragment()
-				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance()
+				intent.hasExtra(ENCODE) -> EncodeFragment.newInstance(
+					intent.getStringExtra(ENCODE)
+				)
 				intent.hasExtra(DECODED) -> DecodeFragment.newInstance(
 					intent.getParcelableExtra(DECODED)!!
 				)

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

@@ -9,7 +9,6 @@ import android.graphics.RectF
 import android.net.Uri
 import android.os.Bundle
 import android.os.Parcelable
-import android.os.Vibrator
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.Toolbar
 import android.view.Menu
@@ -21,16 +20,14 @@ import de.markusfisch.android.binaryeye.graphics.crop
 import de.markusfisch.android.binaryeye.graphics.fixTransparency
 import de.markusfisch.android.binaryeye.graphics.loadImageUri
 import de.markusfisch.android.binaryeye.graphics.mapPosition
-import de.markusfisch.android.binaryeye.os.getVibrator
-import de.markusfisch.android.binaryeye.os.vibrate
-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.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.media.releaseToneGenerators
+import de.markusfisch.android.binaryeye.view.*
 import de.markusfisch.android.binaryeye.widget.CropImageView
 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.Result
 import kotlinx.coroutines.*
 import kotlin.math.max
@@ -41,10 +38,17 @@ class PickActivity : AppCompatActivity() {
 	private val matrix = Matrix()
 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
+	private val decodeHints = DecodeHints(
+		tryHarder = true,
+		tryRotate = true,
+		tryInvert = true,
+		tryDownscale = true,
+		formats = prefs.barcodeFormats.joinToString()
+	)
 
-	private lateinit var vibrator: Vibrator
 	private lateinit var cropImageView: CropImageView
 	private lateinit var detectorView: DetectorView
+	private lateinit var freeRotationItem: MenuItem
 
 	private var result: Result? = null
 
@@ -61,8 +65,6 @@ class PickActivity : AppCompatActivity() {
 		// locale.
 		setTitle(R.string.pick_code_to_scan)
 
-		vibrator = getVibrator()
-
 		initSystemBars(this)
 		val toolbar = findViewById(R.id.toolbar) as Toolbar
 		recordToolbarHeight(toolbar)
@@ -81,7 +83,7 @@ class PickActivity : AppCompatActivity() {
 
 		cropImageView = findViewById(R.id.image) as CropImageView
 		cropImageView.restrictTranslation = false
-		cropImageView.freeRotation = true
+		cropImageView.freeRotation = prefs.freeRotation
 		cropImageView.setImageBitmap(bitmap)
 		cropImageView.onScan = {
 			scanWithinBounds(bitmap)
@@ -143,23 +145,13 @@ class PickActivity : AppCompatActivity() {
 			)
 		}
 		scope.launch {
-			ZxingCpp.readBitmap(
-				cropped,
-				0, 0,
-				cropped.width, cropped.height,
-				0,
-				prefs.barcodeFormats.joinToString(),
-				tryHarder = true,
-				tryRotate = true,
-				tryInvert = true,
-				tryDownscale = true
-			)?.let {
+			cropped.decode()?.let {
 				withContext(Dispatchers.Main) {
 					if (isFinishing) {
 						return@withContext
 					}
 					result = it
-					vibrator.vibrate()
+					scanFeedback()
 					detectorView.update(
 						matrix.mapPosition(
 							it.position,
@@ -171,14 +163,38 @@ class PickActivity : AppCompatActivity() {
 		}
 	}
 
+	// By default, ZXing uses LOCAL_AVERAGE, but this does not work
+	// well with inverted barcodes on low-contrast backgrounds.
+	private fun Bitmap.decode() = ZxingCpp.readBitmap(
+		this,
+		0, 0,
+		width, height,
+		0,
+		decodeHints.apply {
+			binarizer = Binarizer.LOCAL_AVERAGE
+		}
+	) ?: ZxingCpp.readBitmap(
+		this,
+		0, 0,
+		width, height,
+		0,
+		decodeHints.apply {
+			binarizer = Binarizer.GLOBAL_HISTOGRAM
+		}
+	)
+
 	override fun onDestroy() {
 		super.onDestroy()
 		detectorView.saveCropHandlePos()
 		parentJob.cancel()
+		releaseToneGenerators()
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
 		menuInflater.inflate(R.menu.activity_pick, menu)
+		freeRotationItem = menu.findItem(R.id.toggle_free).apply {
+			updateFreeRotationIcon()
+		}
 		return true
 	}
 
@@ -188,10 +204,26 @@ class PickActivity : AppCompatActivity() {
 				rotateClockwise()
 				true
 			}
+			R.id.toggle_free -> {
+				prefs.freeRotation = prefs.freeRotation xor true
+				cropImageView.freeRotation = prefs.freeRotation
+				freeRotationItem.updateFreeRotationIcon()
+				true
+			}
 			else -> super.onOptionsItemSelected(item)
 		}
 	}
 
+	private fun MenuItem.updateFreeRotationIcon() {
+		setIcon(
+			if (prefs.freeRotation) {
+				R.drawable.ic_action_rotation_unlocked
+			} else {
+				R.drawable.ic_action_rotation_locked
+			}
+		)
+	}
+
 	private fun rotateClockwise() {
 		cropImageView.imageRotation = cropImageView.imageRotation + 90 % 360
 	}
@@ -211,7 +243,7 @@ class PickActivity : AppCompatActivity() {
 	private fun showResult() {
 		val r = result
 		if (r != null) {
-			showResult(this, r.redact(), vibrator)
+			showResult(this, r)
 			finish()
 		} else {
 			applicationContext.toast(R.string.no_barcode_found)

app/src/main/kotlin/de/markusfisch/android/binaryeye/app/Data.kt

@@ -1,27 +0,0 @@
-package de.markusfisch.android.binaryeye.app
-
-import android.net.Uri
-import android.os.Build
-import java.io.UnsupportedEncodingException
-import java.net.URLEncoder
-
-private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
-private val multipleDots = "[…]+".toRegex()
-fun String.foldNonAlNum() = replace(nonAlNum, "…")
-	.replace(multipleDots, "…")
-
-fun String.urlEncode(): String = try {
-	URLEncoder.encode(this, "UTF-8")
-} catch (e: UnsupportedEncodingException) {
-	this
-}
-
-fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
-	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-		it.normalizeScheme()
-	} else {
-		it
-	}
-}
-
-fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }

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

@@ -14,15 +14,24 @@ fun Context.copyToClipboard(text: String, isSensitive: Boolean = false) {
 	} else {
 		(service as android.content.ClipboardManager).setPrimaryClip(
 			ClipData.newPlainText("plain text", text).apply {
-				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-					description.extras = PersistableBundle().apply {
-						putBoolean(
-							ClipDescription.EXTRA_IS_SENSITIVE,
-							isSensitive
-						)
-					}
-				}
+				setSensitive(isSensitive)
 			}
 		)
 	}
 }
+
+private fun ClipData.setSensitive(isSensitive: Boolean) {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+		description.extras = PersistableBundle().apply {
+			putBoolean(EXTRA_IS_SENSITIVE, isSensitive)
+		}
+	}
+}
+
+private val EXTRA_IS_SENSITIVE = if (
+	Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
+) {
+	ClipDescription.EXTRA_IS_SENSITIVE
+} else {
+	"android.content.extra.IS_SENSITIVE"
+}

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

@@ -0,0 +1,3 @@
+package de.markusfisch.android.binaryeye.content
+
+fun ByteArray.toHexString() = joinToString("") { "%02X".format(it) }

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

@@ -8,7 +8,6 @@ import android.os.Build
 import android.support.v4.content.FileProvider
 import de.markusfisch.android.binaryeye.BuildConfig
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.app.parseAndNormalizeUri
 import de.markusfisch.android.binaryeye.widget.toast
 import java.io.File
 
@@ -36,11 +35,22 @@ fun Context.startIntent(intent: Intent): Boolean = try {
 	false
 }
 
-fun Context.openUrl(url: String): Boolean = openUri(url.parseAndNormalizeUri())
+fun Context.openUrl(url: String, silent: Boolean = false): Boolean {
+	val intent = Intent(Intent.ACTION_VIEW, url.parseAndNormalizeUri())
+	return if (silent) {
+		startIntent(intent)
+	} else {
+		execShareIntent(intent)
+	}
+}
 
-fun Context.openUri(uri: Uri): Boolean = execShareIntent(
-	Intent(Intent.ACTION_VIEW, uri)
-)
+fun String.parseAndNormalizeUri(): Uri = Uri.parse(this).let {
+	if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+		it.normalizeScheme()
+	} else {
+		it
+	}
+}
 
 fun Context.shareText(text: String, mimeType: String = "text/plain") {
 	execShareIntent(Intent(Intent.ACTION_SEND).apply {

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

@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.database
 
 import android.content.Context
 import android.database.Cursor
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import java.io.ByteArrayOutputStream
 import java.io.OutputStream
@@ -34,7 +34,7 @@ private fun exportCsv(
 		Database.SCANS_FORMAT,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
-		Database.SCANS_VERSION_NUMBER,
+		Database.SCANS_VERSION,
 		Database.SCANS_SEQUENCE_SIZE,
 		Database.SCANS_SEQUENCE_INDEX,
 		Database.SCANS_SEQUENCE_ID,

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

@@ -36,7 +36,7 @@ class Database {
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
-			$SCANS_VERSION_NUMBER,
+			$SCANS_VERSION,
 			$SCANS_SEQUENCE_SIZE,
 			$SCANS_SEQUENCE_INDEX,
 			$SCANS_SEQUENCE_ID,
@@ -78,7 +78,7 @@ class Database {
 			$SCANS_RAW,
 			$SCANS_FORMAT,
 			$SCANS_ERROR_CORRECTION_LEVEL,
-			$SCANS_VERSION_NUMBER,
+			$SCANS_VERSION,
 			$SCANS_SEQUENCE_SIZE,
 			$SCANS_SEQUENCE_INDEX,
 			$SCANS_SEQUENCE_ID,
@@ -96,7 +96,7 @@ class Database {
 				it.getBlob(SCANS_RAW),
 				it.getString(SCANS_FORMAT),
 				it.getString(SCANS_ERROR_CORRECTION_LEVEL),
-				it.getInt(SCANS_VERSION_NUMBER),
+				it.getString(SCANS_VERSION),
 				it.getInt(SCANS_SEQUENCE_SIZE),
 				it.getInt(SCANS_SEQUENCE_INDEX),
 				it.getString(SCANS_SEQUENCE_ID),
@@ -128,7 +128,7 @@ class Database {
 			scan.errorCorrectionLevel?.let {
 				put(SCANS_ERROR_CORRECTION_LEVEL, it)
 			}
-			put(SCANS_VERSION_NUMBER, scan.versionNumber)
+			put(SCANS_VERSION, scan.version)
 			put(SCANS_SEQUENCE_SIZE, scan.sequenceSize)
 			put(SCANS_SEQUENCE_INDEX, scan.sequenceIndex)
 			put(SCANS_SEQUENCE_ID, scan.sequenceId)
@@ -192,9 +192,9 @@ class Database {
 	}
 
 	private class OpenHelper(context: Context) :
-		SQLiteOpenHelper(context, FILE_NAME, null, 5) {
+		SQLiteOpenHelper(context, FILE_NAME, null, 6) {
 		override fun onCreate(db: SQLiteDatabase) {
-			createScans(db)
+			db.createScans()
 		}
 
 		override fun onUpgrade(
@@ -203,16 +203,19 @@ class Database {
 			newVersion: Int
 		) {
 			if (oldVersion < 2) {
-				addRawColumn(db)
+				db.addRawColumn()
 			}
 			if (oldVersion < 3) {
-				addMetaDataColumns(db)
+				db.addMetaDataColumns()
 			}
 			if (oldVersion < 4) {
-				addNameColumn(db)
+				db.addNameColumn()
 			}
 			if (oldVersion < 5) {
-				migrateToZxingCpp(db)
+				db.migrateToZxingCpp()
+			}
+			if (oldVersion < 6) {
+				db.migrateToVersionString()
 			}
 		}
 	}
@@ -228,6 +231,7 @@ class Database {
 		const val SCANS_FORMAT = "format"
 		const val SCANS_ERROR_CORRECTION_LEVEL = "error_correction_level"
 		const val SCANS_VERSION_NUMBER = "version_number"
+		const val SCANS_VERSION = "version"
 		const val SCANS_ISSUE_NUMBER = "issue_number"
 		const val SCANS_ORIENTATION = "orientation"
 		const val SCANS_OTHER_META_DATA = "other_meta_data"
@@ -243,9 +247,9 @@ class Database {
 		const val SCANS_GTIN_PRICE = "gtin_price"
 		const val SCANS_GTIN_ISSUE_NUMBER = "gtin_issue_number"
 
-		private fun createScans(db: SQLiteDatabase) {
-			db.execSQL("DROP TABLE IF EXISTS $SCANS".trimMargin())
-			db.execSQL(
+		private fun SQLiteDatabase.createScans() {
+			execSQL("DROP TABLE IF EXISTS $SCANS".trimMargin())
+			execSQL(
 				"""CREATE TABLE $SCANS (
 					$SCANS_ID INTEGER PRIMARY KEY AUTOINCREMENT,
 					$SCANS_DATETIME DATETIME NOT NULL,
@@ -254,7 +258,7 @@ class Database {
 					$SCANS_RAW BLOB,
 					$SCANS_FORMAT TEXT NOT NULL,
 					$SCANS_ERROR_CORRECTION_LEVEL TEXT,
-					$SCANS_VERSION_NUMBER INTEGER,
+					$SCANS_VERSION TEXT,
 					$SCANS_SEQUENCE_SIZE INTEGER,
 					$SCANS_SEQUENCE_INDEX INTEGER,
 					$SCANS_SEQUENCE_ID TEXT,
@@ -266,44 +270,45 @@ class Database {
 			)
 		}
 
-		private fun addRawColumn(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB".trimMargin())
+		private fun SQLiteDatabase.addRawColumn() {
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_RAW BLOB".trimMargin())
 		}
 
-		private fun addMetaDataColumns(db: SQLiteDatabase) {
-			db.apply {
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ERROR_CORRECTION_LEVEL TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ISSUE_NUMBER INT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ORIENTATION INT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_OTHER_META_DATA TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_PDF417_EXTRA_METADATA TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_POSSIBLE_COUNTRY TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SUGGESTED_PRICE TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_UPC_EAN_EXTENSION TEXT".trimMargin())
-			}
+		private fun SQLiteDatabase.addMetaDataColumns() {
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ERROR_CORRECTION_LEVEL TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ISSUE_NUMBER INT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_ORIENTATION INT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_OTHER_META_DATA TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_PDF417_EXTRA_METADATA TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_POSSIBLE_COUNTRY TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SUGGESTED_PRICE TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_UPC_EAN_EXTENSION TEXT".trimMargin())
 		}
 
-		private fun addNameColumn(db: SQLiteDatabase) {
-			db.execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
+		private fun SQLiteDatabase.addNameColumn() {
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_NAME TEXT".trimMargin())
 		}
 
-		private fun migrateToZxingCpp(db: SQLiteDatabase) {
-			db.apply {
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_VERSION_NUMBER INTEGER".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_SIZE INTEGER".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_INDEX INTEGER".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_ID TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_COUNTRY TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ADD_ON TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_PRICE TEXT".trimMargin())
-				execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ISSUE_NUMBER TEXT".trimMargin())
-				execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_SIZE = -1")
-				execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_INDEX = -1")
-				execSQL("UPDATE $SCANS SET $SCANS_GTIN_COUNTRY = $SCANS_POSSIBLE_COUNTRY")
-				execSQL("UPDATE $SCANS SET $SCANS_GTIN_ADD_ON = $SCANS_UPC_EAN_EXTENSION")
-				execSQL("UPDATE $SCANS SET $SCANS_GTIN_PRICE = $SCANS_SUGGESTED_PRICE")
-				execSQL("UPDATE $SCANS SET $SCANS_GTIN_ISSUE_NUMBER = $SCANS_ISSUE_NUMBER")
-			}
+		private fun SQLiteDatabase.migrateToZxingCpp() {
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_VERSION_NUMBER INTEGER".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_SIZE INTEGER".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_INDEX INTEGER".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_SEQUENCE_ID TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_COUNTRY TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ADD_ON TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_PRICE TEXT".trimMargin())
+			execSQL("ALTER TABLE $SCANS ADD COLUMN $SCANS_GTIN_ISSUE_NUMBER TEXT".trimMargin())
+			execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_SIZE = -1")
+			execSQL("UPDATE $SCANS SET $SCANS_SEQUENCE_INDEX = -1")
+			execSQL("UPDATE $SCANS SET $SCANS_GTIN_COUNTRY = $SCANS_POSSIBLE_COUNTRY")
+			execSQL("UPDATE $SCANS SET $SCANS_GTIN_ADD_ON = $SCANS_UPC_EAN_EXTENSION")
+			execSQL("UPDATE $SCANS SET $SCANS_GTIN_PRICE = $SCANS_SUGGESTED_PRICE")
+			execSQL("UPDATE $SCANS SET $SCANS_GTIN_ISSUE_NUMBER = $SCANS_ISSUE_NUMBER")
+		}
+
+		private fun SQLiteDatabase.migrateToVersionString() {
+			execSQL("ALTER TABLE $SCANS ADD $SCANS_VERSION TEXT")
+			execSQL("UPDATE $SCANS SET $SCANS_VERSION = $SCANS_VERSION_NUMBER")
 		}
 	}
 }

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

@@ -2,7 +2,7 @@ package de.markusfisch.android.binaryeye.database
 
 import android.content.Context
 import android.database.Cursor
-import de.markusfisch.android.binaryeye.app.toHexString
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import org.json.JSONArray
 import org.json.JSONException
@@ -26,7 +26,7 @@ fun Cursor.exportJson(): String? {
 		Database.SCANS_FORMAT,
 		Database.SCANS_CONTENT,
 		Database.SCANS_ERROR_CORRECTION_LEVEL,
-		Database.SCANS_VERSION_NUMBER,
+		Database.SCANS_VERSION,
 		Database.SCANS_SEQUENCE_SIZE,
 		Database.SCANS_SEQUENCE_INDEX,
 		Database.SCANS_SEQUENCE_ID,

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

@@ -1,10 +1,13 @@
 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.ContentType
+import de.markusfisch.android.zxingcpp.ZxingCpp.Format
 import de.markusfisch.android.zxingcpp.ZxingCpp.Result
 
 data class Scan(
@@ -12,7 +15,7 @@ data class Scan(
 	val raw: ByteArray?,
 	val format: String,
 	val errorCorrectionLevel: String? = null,
-	val versionNumber: Int = 0,
+	val version: String? = null,
 	val sequenceSize: Int = -1,
 	val sequenceIndex: Int = -1,
 	val sequenceId: String = "",
@@ -42,7 +45,7 @@ data class Scan(
 						(raw != null && other.raw != null && raw.contentEquals(other.raw))) &&
 				format == other.format &&
 				errorCorrectionLevel == other.errorCorrectionLevel &&
-				versionNumber == other.versionNumber &&
+				version == other.version &&
 				sequenceSize == other.sequenceSize &&
 				sequenceIndex == other.sequenceIndex &&
 				sequenceId == other.sequenceId &&
@@ -61,7 +64,7 @@ data class Scan(
 		result = 31 * result + (raw?.contentHashCode() ?: 0)
 		result = 31 * result + format.hashCode()
 		result = 31 * result + (errorCorrectionLevel?.hashCode() ?: 0)
-		result = 31 * result + versionNumber
+		result = 31 * result + version.hashCode()
 		result = 31 * result + sequenceSize
 		result = 31 * result + sequenceIndex
 		result = 31 * result + sequenceId.hashCode()
@@ -77,7 +80,7 @@ data class Scan(
 		raw = parcel.readSizedByteArray(),
 		format = parcel.readString() ?: "",
 		errorCorrectionLevel = parcel.readString(),
-		versionNumber = parcel.readInt(),
+		version = parcel.readString(),
 		sequenceSize = parcel.readInt(),
 		sequenceIndex = parcel.readInt(),
 		sequenceId = parcel.readString() ?: "",
@@ -95,7 +98,7 @@ data class Scan(
 			writeSizedByteArray(raw)
 			writeString(format)
 			writeString(errorCorrectionLevel)
-			writeInt(versionNumber)
+			writeString(version)
 			writeInt(sequenceSize)
 			writeInt(sequenceIndex)
 			writeString(sequenceId)
@@ -119,6 +122,72 @@ data class Scan(
 	}
 }
 
+fun Result.toScan(): Scan {
+	val content: String
+	val raw: ByteArray?
+	when (contentType) {
+		ContentType.GS1,
+		ContentType.ISO15434,
+		ContentType.TEXT -> {
+			content = text
+			raw = null
+		}
+		else -> {
+			content = ""
+			raw = rawBytes
+		}
+	}
+	return Scan(
+		content,
+		raw,
+		format,
+		ecLevel,
+		version,
+		sequenceSize,
+		sequenceIndex,
+		sequenceId,
+		gtin?.country,
+		gtin?.addOn,
+		gtin?.price,
+		gtin?.issueNumber
+	)
+}
+
+data class Recreation(
+	val format: Format,
+	val ecLevel: Int,
+	val size: Int,
+	val margin: Int
+) {
+	fun encode(content: String): Bitmap? = try {
+		ZxingCpp.encodeAsBitmap(
+			content, format, size, size, margin, ecLevel
+		)
+	} catch (_: RuntimeException) {
+		null
+	}
+}
+
+fun Scan.toRecreation(
+	size: Int = 128,
+	margin: Int = -1
+) = if (content.isEmpty()) {
+	null
+} else {
+	Recreation(
+		Format.valueOf(format),
+		when (errorCorrectionLevel) {
+			"L" -> 0
+			"M" -> 1
+			"Q" -> 2
+			"H" -> 3
+			else -> -1
+		},
+		size,
+		margin
+	)
+}
+
 private fun getDateTime(
 	time: Long = System.currentTimeMillis()
 ) = DateFormat.format(
@@ -150,32 +219,3 @@ private fun Parcel.readSizedByteArray(): ByteArray? {
 		null
 	}
 }
-
-fun Result.toScan(): Scan {
-	val content: String
-	val raw: ByteArray?
-	when (contentType) {
-		ContentType.TEXT -> {
-			content = text
-			raw = null
-		}
-		else -> {
-			content = ""
-			raw = rawBytes
-		}
-	}
-	return Scan(
-		content,
-		raw,
-		format,
-		ecLevel,
-		versionNumber,
-		sequenceSize,
-		sequenceIndex,
-		sequenceId,
-		gtin?.country,
-		gtin?.addOn,
-		gtin?.price,
-		gtin?.issueNumber
-	)
-}

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

@@ -14,6 +14,8 @@ import de.markusfisch.android.binaryeye.app.hasWritePermission
 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.io.addSuffixIfNotGiven
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.io.writeExternalFile
@@ -29,6 +31,7 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.util.*
+import kotlin.math.min
 
 class BarcodeFragment : Fragment() {
 	private enum class FileType {
@@ -61,11 +64,11 @@ class BarcodeFragment : Fragment() {
 
 		val bitmap: Bitmap
 		try {
-			barcode = arguments?.toProperties() ?: throw IllegalArgumentException(
+			barcode = arguments?.toBarcode() ?: throw IllegalArgumentException(
 				"Illegal arguments"
 			)
 			// Catch exceptions from encoding.
-			bitmap = barcode.bitmap
+			bitmap = barcode.bitmap()
 		} catch (e: Exception) {
 			var message = e.message
 			if (message == null || message.isEmpty()) {
@@ -84,7 +87,10 @@ class BarcodeFragment : Fragment() {
 		imageView.setImageBitmap(bitmap)
 		imageView.post {
 			// Make sure to invoke this after ScalingImageView.onLayout().
-			imageView.minWidth /= 2f
+			imageView.minWidth = min(
+				imageView.minWidth / 2f,
+				barcode.size.toFloat()
+			)
 		}
 
 		view.findViewById<View>(R.id.share).setOnClickListener {
@@ -103,7 +109,7 @@ class BarcodeFragment : Fragment() {
 		return view
 	}
 
-	private fun Bundle.toProperties() = Barcode(
+	private fun Bundle.toBarcode() = Barcode(
 		getString(CONTENT) ?: throw IllegalArgumentException(
 			"content cannot be null"
 		),
@@ -113,7 +119,8 @@ class BarcodeFragment : Fragment() {
 			)
 		),
 		getInt(SIZE),
-		getInt(EC_LEVEL)
+		getInt(EC_LEVEL),
+		Colors.values()[getInt(COLORS)]
 	)
 
 	override fun onDestroyView() {
@@ -129,7 +136,7 @@ class BarcodeFragment : Fragment() {
 		return when (item.itemId) {
 			R.id.copy_to_clipboard -> {
 				context.apply {
-					copyToClipboard(barcode.text)
+					copyToClipboard(barcode.text())
 					toast(R.string.copied_to_clipboard)
 				}
 				true
@@ -181,19 +188,19 @@ class BarcodeFragment : Fragment() {
 						addSuffixIfNotGiven(fileName, ".png"),
 						MIME_PNG
 					) {
-						barcode.bitmap.saveAsPng(it)
+						barcode.bitmap().saveAsPng(it)
 					}
 					FileType.SVG -> saveAs(
 						addSuffixIfNotGiven(fileName, ".svg"),
 						MIME_SVG
 					) { outputStream ->
-						outputStream.write(barcode.svg.toByteArray())
+						outputStream.write(barcode.svg().toByteArray())
 					}
 					FileType.TXT -> saveAs(
 						addSuffixIfNotGiven(fileName, ".txt"),
 						MIME_TXT
 					) { outputStream ->
-						outputStream.write(barcode.text.toByteArray())
+						outputStream.write(barcode.text().toByteArray())
 					}
 				}
 			}
@@ -218,9 +225,9 @@ class BarcodeFragment : Fragment() {
 
 	private fun Context.shareAs(fileType: FileType) {
 		when (fileType) {
-			FileType.PNG -> share(barcode.bitmap)
-			FileType.SVG -> shareText(barcode.svg, MIME_SVG)
-			FileType.TXT -> shareText(barcode.text)
+			FileType.PNG -> share(barcode.bitmap())
+			FileType.SVG -> shareText(barcode.svg(), MIME_SVG)
+			FileType.TXT -> shareText(barcode.text())
 		}
 	}
 
@@ -253,6 +260,7 @@ class BarcodeFragment : Fragment() {
 		private const val FORMAT = "format"
 		private const val SIZE = "size"
 		private const val EC_LEVEL = "ec_level"
+		private const val COLORS = "colors"
 		private const val MIME_PNG = "image/png"
 		private const val MIME_SVG = "image/svg+xmg"
 		private const val MIME_TXT = "text/plain"
@@ -261,13 +269,15 @@ class BarcodeFragment : Fragment() {
 			content: String,
 			format: Format,
 			size: Int,
-			ecLevel: Int = -1
+			ecLevel: Int = -1,
+			colors: Int = 0
 		): Fragment {
 			val args = Bundle()
 			args.putString(CONTENT, content)
 			args.putString(FORMAT, format.name)
 			args.putInt(SIZE, size)
 			args.putInt(EC_LEVEL, ecLevel)
+			args.putInt(COLORS, colors)
 			val fragment = BarcodeFragment()
 			fragment.arguments = args
 			return fragment
@@ -279,20 +289,59 @@ private data class Barcode(
 	val content: String,
 	val format: Format,
 	val size: Int,
-	val ecLevel: Int
+	val ecLevel: Int,
+	val colors: Colors
 ) {
-	val bitmap: Bitmap
-		get() = ZxingCpp.encodeAsBitmap(
-			content, format, size, size, -1, ecLevel
+	private var _bitmap: Bitmap? = null
+	fun bitmap(): Bitmap {
+		val b = _bitmap ?: ZxingCpp.encodeAsBitmap(
+			content, format, size, size, -1, ecLevel,
+			setColor = colors.foregroundColor(),
+			unsetColor = colors.backgroundColor()
 		)
-	val svg: String
-		get() = ZxingCpp.encodeAsSvg(
+		_bitmap = b
+		return b
+	}
+
+	private var _svg: String? = null
+	fun svg(): String {
+		val s = _svg ?: ZxingCpp.encodeAsSvg(
 			content, format, -1, ecLevel
 		)
-	val text: String
-		get() = ZxingCpp.encodeAsText(
-			content, format, -1, ecLevel
+		_svg = s
+		return s
+	}
+
+	private var _text: String? = null
+	fun text(): String {
+		val t = _text ?: ZxingCpp.encodeAsText(
+			content, format, -1, 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 Bitmap.saveAsPng(outputStream: OutputStream, quality: Int = 90) =

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

@@ -9,12 +9,10 @@ import android.text.Html
 import android.text.TextWatcher
 import android.text.method.LinkMovementMethod
 import android.view.*
-import android.widget.EditText
-import android.widget.TableLayout
-import android.widget.TableRow
-import android.widget.TextView
+import android.widget.*
 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
@@ -22,16 +20,17 @@ import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.shareText
+import de.markusfisch.android.binaryeye.content.toHexString
+import de.markusfisch.android.binaryeye.database.Recreation
 import de.markusfisch.android.binaryeye.database.Scan
+import de.markusfisch.android.binaryeye.database.toRecreation
 import de.markusfisch.android.binaryeye.io.askForFileName
 import de.markusfisch.android.binaryeye.io.toSaveResult
 import de.markusfisch.android.binaryeye.io.writeExternalFile
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.widget.toast
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.*
+import kotlin.math.roundToInt
 
 class DecodeFragment : Fragment() {
 	private lateinit var contentView: EditText
@@ -39,20 +38,24 @@ class DecodeFragment : Fragment() {
 	private lateinit var dataView: TableLayout
 	private lateinit var metaView: TableLayout
 	private lateinit var hexView: TextView
-	private lateinit var format: String
 	private lateinit var stampView: TextView
+	private lateinit var recreationView: ImageView
 	private lateinit var fab: FloatingActionButton
+	private lateinit var format: String
 
 	private val parentJob = Job()
 	private val scope: CoroutineScope = CoroutineScope(Dispatchers.Main + parentJob)
+	private val dp: Float
+		get() = resources.displayMetrics.density
 	private val content: String
 		get() = contentView.text.toString()
 
 	private var closeAutomatically = false
 	private var action = ActionRegistry.DEFAULT_ACTION
 	private var isBinary = false
-	private var raw: ByteArray = ByteArray(0)
+	private var originalBytes: ByteArray = ByteArray(0)
 	private var id = 0L
+	private var recreation: Recreation? = null
 
 	override fun onCreate(state: Bundle?) {
 		super.onCreate(state)
@@ -75,82 +78,42 @@ class DecodeFragment : Fragment() {
 		closeAutomatically = prefs.closeAutomatically &&
 				activity?.intent?.hasExtra(MainActivity.DECODED) == true
 
-		val scan = arguments?.getParcelable(SCAN) as Scan?
-			?: throw IllegalArgumentException("DecodeFragment needs a Scan")
+		val 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.raw != null
+		originalBytes = scan.raw ?: originalContent.toByteArray()
+		format = scan.format
 		id = scan.id
 
-		val inputContent = scan.content
-		isBinary = scan.raw != null
-		raw = scan.raw ?: inputContent.toByteArray()
-		format = scan.format
-
 		contentView = view.findViewById(R.id.content)
-		stampView = view.findViewById(R.id.stamp)
-		fab = view.findViewById(R.id.open)
-
-		if (!isBinary) {
-			contentView.setText(inputContent)
-			contentView.addTextChangedListener(object : TextWatcher {
-				override fun afterTextChanged(s: Editable?) {
-					updateViewsAndAction(content.toByteArray())
-				}
-
-				override fun beforeTextChanged(
-					s: CharSequence?,
-					start: Int,
-					count: Int,
-					after: Int
-				) {
-				}
-
-				override fun onTextChanged(
-					s: CharSequence?,
-					start: Int,
-					before: Int,
-					count: Int
-				) {
-				}
-			})
-			fab.setOnClickListener {
-				executeAction(content.toByteArray())
-			}
-			if (prefs.openImmediately) {
-				executeAction(content.toByteArray())
-			}
-		} else {
-			contentView.setText(String(raw).foldNonAlNum())
-			contentView.isEnabled = false
-			fab.setImageResource(R.drawable.ic_action_save)
-			fab.setOnClickListener {
-				askForFileNameAndSave(raw)
-			}
-		}
-
-		val trackingLink = generateDpTrackingLink(raw, scan.format)
-		if (trackingLink != null) {
-			stampView.apply {
-				text = Html.fromHtml(trackingLink)
-				isClickable = true
-				movementMethod = LinkMovementMethod.getInstance()
-			}
-		} else {
-			stampView.visibility = View.GONE
-		}
-
 		formatView = view.findViewById(R.id.format)
 		dataView = view.findViewById(R.id.data)
 		metaView = view.findViewById(R.id.meta)
 		hexView = view.findViewById(R.id.hex)
+		stampView = view.findViewById(R.id.stamp)
+		recreationView = view.findViewById(R.id.recreation)
+		fab = view.findViewById(R.id.open)
 
-		updateViewsAndAction(raw)
-
-		if (!isBinary) {
-			fillDataView(dataView, inputContent)
-		}
+		initContentAndFab(originalContent)
 
 		if (prefs.showMetaData) {
-			fillMetaView(metaView, scan)
+			metaView.fillMetaView(scan)
+		} else {
+			metaView.visibility = View.GONE
 		}
+		if (prefs.showRecreation) {
+			recreation = scan.toRecreation(
+				(200f * dp).roundToInt()
+			)
+		}
+
+		updateViewsAndFab(originalContent, originalBytes)
 
 		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
 		(view.findViewById(R.id.scroll_view) as View).setPaddingFromWindowInsets()
@@ -163,35 +126,104 @@ class DecodeFragment : Fragment() {
 		parentJob.cancel()
 	}
 
-	private fun updateViewsAndAction(bytes: ByteArray) {
+	private fun initContentAndFab(originalContent: String) {
+		if (isBinary) {
+			contentView.setText(String(originalBytes).foldNonAlNum())
+			contentView.isEnabled = false
+			fab.setImageResource(R.drawable.ic_action_save)
+			fab.setOnClickListener {
+				askForFileNameAndSave(originalBytes)
+			}
+		} else {
+			contentView.setText(originalContent)
+			contentView.addTextChangedListener(object : TextWatcher {
+				override fun afterTextChanged(s: Editable?) {
+					updateViewsAndFab(s?.toString() ?: "")
+				}
+
+				override fun beforeTextChanged(
+					s: CharSequence?,
+					start: Int,
+					count: Int,
+					after: Int
+				) = Unit
+
+				override fun onTextChanged(
+					s: CharSequence?,
+					start: Int,
+					before: Int,
+					count: Int
+				) = Unit
+			})
+			fab.setOnClickListener {
+				executeAction(content)
+			}
+			if (prefs.openImmediately) {
+				executeAction(content)
+			}
+		}
+	}
+
+	private fun updateViewsAndFab(text: String, bytes: ByteArray? = null) {
+		val b = bytes ?: text.toByteArray()
+		resolveActionAndUpdateFab(b)
+		updateViews(text, b)
+	}
+
+	private fun resolveActionAndUpdateFab(bytes: ByteArray) {
 		val prevAction = action
 		if (!prevAction.canExecuteOn(bytes)) {
 			action = ActionRegistry.getAction(bytes)
 		}
+		if (prevAction !== action) {
+			updateFab(action)
+		}
+	}
+
+	private fun updateFab(action: IAction) {
+		fab.setImageResource(action.iconResId)
+		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+			fab.setOnLongClickListener { v ->
+				v.context.toast(action.titleResId)
+				true
+			}
+		} else {
+			fab.tooltipText = getString(action.titleResId)
+		}
+	}
+
+	private fun updateViews(text: String, bytes: ByteArray) {
 		formatView.text = resources.getQuantityString(
 			R.plurals.barcode_info,
 			bytes.size,
 			prettifyFormatName(format),
 			bytes.size
 		)
-		hexView.text = if (prefs.showHexDump) hexDump(bytes) else ""
-		if (prevAction !== action) {
-			fab.setImageResource(action.iconResId)
-			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-				fab.setOnLongClickListener { v ->
-					v.context.toast(action.titleResId)
-					true
-				}
-			} else {
-				fab.tooltipText = getString(action.titleResId)
+		hexView.showIf(prefs.showHexDump) { v ->
+			v.text = hexDump(bytes)
+		}
+		recreationView.showIf(prefs.showRecreation) { v ->
+			val r = recreation ?: return@showIf
+			v.setImageBitmap(r.encode(text))
+			v.setOnClickListener {
+				fragmentManager?.addFragment(
+					BarcodeFragment.newInstance(
+						text,
+						r.format,
+						r.size,
+						r.ecLevel
+					)
+				)
 			}
 		}
+		dataView.fillDataView(text)
+		stampView.setTrackingLink(bytes, format)
 	}
 
-	private fun fillDataView(tableLayout: TableLayout, content: String) {
+	private fun TableLayout.fillDataView(text: String) {
 		val items = LinkedHashMap<Int, String?>()
 		if (action is WifiAction) {
-			WifiConnector.parseMap(content)?.let { wifiData ->
+			WifiConnector.parseMap(text)?.let { wifiData ->
 				items.putAll(
 					linkedMapOf(
 						R.string.entry_type to getString(R.string.wifi_network),
@@ -207,10 +239,10 @@ class DecodeFragment : Fragment() {
 				)
 			}
 		}
-		fillDataTable(tableLayout, items)
+		fill(items)
 	}
 
-	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+	private fun TableLayout.fillMetaView(scan: Scan) {
 		val items = linkedMapOf(
 			R.string.error_correction_level to scan.errorCorrectionLevel,
 			R.string.sequence_size to scan.sequenceSize.positiveToString(),
@@ -221,15 +253,15 @@ class DecodeFragment : Fragment() {
 			R.string.gtin_price to scan.price,
 			R.string.gtin_issue_number to scan.issueNumber,
 		)
-		if (scan.versionNumber > 0) {
+		if (!scan.version.isNullOrBlank()) {
 			val versionString = if (scan.format == "QR_CODE") {
 				getString(
 					R.string.qr_version_and_modules,
-					scan.versionNumber,
-					scan.versionNumber * 4 + 17
+					scan.version,
+					(scan.version.toIntOrNull() ?: 0) * 4 + 17
 				)
 			} else {
-				scan.versionNumber.toString()
+				scan.version
 			}
 			items.putAll(
 				linkedMapOf(
@@ -237,32 +269,31 @@ class DecodeFragment : Fragment() {
 				)
 			)
 		}
-		fillDataTable(tableLayout, items)
+		fill(items)
 	}
 
-	private fun fillDataTable(
-		tableLayout: TableLayout,
+	private fun TableLayout.fill(
 		items: LinkedHashMap<Int, String?>
 	) {
-		if (items.isEmpty()) {
-			tableLayout.visibility = View.GONE
-			return
-		}
-		val ctx = tableLayout.context
-		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
-		items.forEach { item ->
-			val text = item.value
-			if (!text.isNullOrBlank()) {
-				val tr = TableRow(ctx)
-				val keyView = TextView(ctx)
-				keyView.setText(item.key)
-				val valueView = TextView(ctx)
-				valueView.setPadding(spaceBetween, 0, 0, 0)
-				valueView.text = text
-				tr.addView(keyView)
-				tr.addView(valueView)
-				tableLayout.addView(tr)
+		removeAllViews()
+		visibility = if (items.isEmpty()) View.GONE else {
+			val ctx = context
+			val spaceBetween = (16f * dp).roundToInt()
+			items.forEach { item ->
+				val text = item.value
+				if (!text.isNullOrBlank()) {
+					val tr = TableRow(ctx)
+					val keyView = TextView(ctx)
+					keyView.setText(item.key)
+					val valueView = TextView(ctx)
+					valueView.setPadding(spaceBetween, 0, 0, 0)
+					valueView.text = text
+					tr.addView(keyView)
+					tr.addView(valueView)
+					addView(tr)
+				}
 			}
+			View.VISIBLE
 		}
 	}
 
@@ -315,7 +346,7 @@ class DecodeFragment : Fragment() {
 	}
 
 	private fun textOrHex() = if (isBinary) {
-		raw.toHexString()
+		originalBytes.toHexString()
 	} else {
 		content
 	}
@@ -354,7 +385,7 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
-	private fun executeAction(content: ByteArray) {
+	private fun executeAction(content: String) {
 		val ac = activity ?: return
 		if (content.isNotEmpty()) {
 			if (action is WifiAction &&
@@ -364,7 +395,7 @@ class DecodeFragment : Fragment() {
 				return
 			}
 			scope.launch {
-				action.execute(ac, content)
+				action.execute(ac, content.toByteArray())
 				maybeBackOrFinish()
 			}
 		}
@@ -380,13 +411,17 @@ class DecodeFragment : Fragment() {
 		}
 		scope.launch(Dispatchers.Main) {
 			val name = ac.askForFileName() ?: return@launch
-			val message = ac.writeExternalFile(
-				name,
-				"application/octet-stream"
-			) {
-				it.write(raw)
-			}.toSaveResult()
-			ac.toast(message)
+			withContext(Dispatchers.IO) {
+				val message = ac.writeExternalFile(
+					name,
+					"application/octet-stream"
+				) {
+					it.write(raw)
+				}.toSaveResult()
+				withContext(Dispatchers.Main) {
+					ac.toast(message)
+				}
+			}
 		}
 	}
 
@@ -403,7 +438,22 @@ class DecodeFragment : Fragment() {
 	}
 }
 
-private fun Int.positiveToString() = if (this > -1) this.toString() else ""
+private inline fun <T : View> T.showIf(
+	visible: Boolean,
+	block: (T) -> Unit
+) {
+	visibility = if (visible) {
+		block.invoke(this)
+		View.VISIBLE
+	} else {
+		View.GONE
+	}
+}
+
+private val nonAlNum = "[^a-zA-Z0-9]".toRegex()
+private val multipleDots = "[…]+".toRegex()
+private fun String.foldNonAlNum() = replace(nonAlNum, "…")
+	.replace(multipleDots, "…")
 
 private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	if (charsPerLine < 4 || bytes.isEmpty()) {
@@ -444,18 +494,31 @@ private fun hexDump(bytes: ByteArray, charsPerLine: Int = 33): String {
 	return dump.toString()
 }
 
-private fun generateDpTrackingLink(raw: ByteArray, format: String): String? {
+private fun Int.positiveToString() = if (this > -1) this.toString() else ""
+
+private fun TextView.setTrackingLink(bytes: ByteArray, format: String) {
+	val trackingLink = generateDpTrackingLink(bytes, format)
+	if (trackingLink != null) {
+		text = trackingLink.fromHtml()
+		isClickable = true
+		movementMethod = LinkMovementMethod.getInstance()
+	} else {
+		visibility = View.GONE
+	}
+}
+
+private fun generateDpTrackingLink(bytes: ByteArray, format: String): String? {
 	// Check for Deutsche Post Matrixcode stamp.
 	var isStamp = false
-	var rawData = raw
+	var rawData = bytes
 	if (format == "DATA_MATRIX" &&
-		raw.toString(Charsets.ISO_8859_1).startsWith("DEA5")
+		bytes.toString(Charsets.ISO_8859_1).startsWith("DEA5")
 	) {
-		if (raw.size == 47) {
+		if (bytes.size == 47) {
 			isStamp = true
-		} else if (raw.size > 47) {
+		} else if (bytes.size > 47) {
 			// Transform back to original data.
-			rawData = raw.toString(Charsets.UTF_8).toByteArray(
+			rawData = bytes.toString(Charsets.UTF_8).toByteArray(
 				Charsets.ISO_8859_1
 			)
 			if (rawData.size == 47) {
@@ -510,3 +573,12 @@ private fun crc4(input: ByteArray): Int {
 	crc = crc and 0xF
 	return crc
 }
+
+private fun String.fromHtml() = if (
+	Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
+) {
+	Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
+} else {
+	@Suppress("DEPRECATION")
+	Html.fromHtml(this)
+}

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

@@ -1,5 +1,6 @@
 package de.markusfisch.android.binaryeye.fragment
 
+import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
 import android.view.LayoutInflater
@@ -12,12 +13,15 @@ import de.markusfisch.android.binaryeye.app.addFragment
 import de.markusfisch.android.binaryeye.app.prefs
 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
 
 class EncodeFragment : Fragment() {
 	private lateinit var formatView: Spinner
-	private lateinit var errorCorrectionLabel: TextView
-	private lateinit var errorCorrectionLevel: Spinner
+	private lateinit var ecLabel: TextView
+	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 contentView: EditText
@@ -67,22 +71,26 @@ class EncodeFragment : Fragment() {
 				position: Int,
 				id: Long
 			) {
-				val visibility = if (
+				val ecVisibility = if (
 					writers[position] == Format.QR_CODE
-				) {
-					View.VISIBLE
-				} else {
-					View.GONE
-				}
-				errorCorrectionLabel.visibility = visibility
-				errorCorrectionLevel.visibility = visibility
+				) View.VISIBLE else View.GONE
+				ecLabel.visibility = ecVisibility
+				ecSpinner.visibility = ecVisibility
+				val colorsVisibility = if (
+					writers[position].canBeInverted()
+				) View.VISIBLE else View.GONE
+				colorsLabel.visibility = colorsVisibility
+				colorsSpinner.visibility = colorsVisibility
 			}
 
 			override fun onNothingSelected(parentView: AdapterView<*>?) {}
 		}
 
-		errorCorrectionLabel = view.findViewById(R.id.error_correction_label)
-		errorCorrectionLevel = view.findViewById(R.id.error_correction_level)
+		ecLabel = view.findViewById(R.id.error_correction_label)
+		ecSpinner = view.findViewById(R.id.error_correction_level)
+
+		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)
@@ -107,7 +115,7 @@ class EncodeFragment : Fragment() {
 		}
 
 		view.findViewById<View>(R.id.encode).setOnClickListener {
-			encode()
+			it.context.encode()
 		}
 
 		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
@@ -121,25 +129,25 @@ class EncodeFragment : Fragment() {
 		prefs.indexOfLastSelectedFormat = formatView.selectedItemPosition
 	}
 
-	private fun encode() {
+	private fun Context.encode() {
 		val content = contentView.text.toString()
 		if (content.isEmpty()) {
-			Toast.makeText(
-				context,
-				R.string.error_no_content,
-				Toast.LENGTH_SHORT
-			).show()
-		} else {
-			activity?.hideSoftKeyboard(contentView)
-			fragmentManager?.addFragment(
-				BarcodeFragment.newInstance(
-					content,
-					writers[formatView.selectedItemPosition],
-					getSize(sizeBarView.progress),
-					errorCorrectionLevel.selectedItemPosition
-				)
-			)
+			toast(R.string.error_no_content)
+			return
 		}
+		hideSoftKeyboard(contentView)
+		val writer = writers[formatView.selectedItemPosition]
+		fragmentManager?.addFragment(
+			BarcodeFragment.newInstance(
+				content,
+				writer,
+				getSize(sizeBarView.progress),
+				ecSpinner.selectedItemPosition,
+				if (writer.canBeInverted()) {
+					colorsSpinner.selectedItemPosition
+				} else 0
+			)
+		)
 	}
 
 	private fun initSizeBar() {
@@ -185,6 +193,13 @@ class EncodeFragment : Fragment() {
 	}
 }
 
+private fun Format.canBeInverted() = when (this) {
+	Format.AZTEC,
+	Format.DATA_MATRIX,
+	Format.QR_CODE -> true
+	else -> false
+}
+
 private fun String.toFormat(default: Format = Format.QR_CODE): Format = try {
 	Format.valueOf(this)
 } catch (_: IllegalArgumentException) {

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

@@ -23,15 +23,10 @@ import de.markusfisch.android.binaryeye.adapter.ScansAdapter
 import de.markusfisch.android.binaryeye.app.*
 import de.markusfisch.android.binaryeye.content.copyToClipboard
 import de.markusfisch.android.binaryeye.content.shareText
-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.database.*
 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.widget.ellipsize
 import de.markusfisch.android.binaryeye.widget.toast
 import kotlinx.coroutines.*
 
@@ -315,7 +310,7 @@ class HistoryFragment : Fragment() {
 				if (content.isNullOrEmpty()) {
 					getString(R.string.binary_data)
 				} else {
-					content.ellipsize(64)
+					content
 				}
 			)
 			.setView(view)

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

@@ -0,0 +1,92 @@
+package de.markusfisch.android.binaryeye.fragment
+
+import android.content.Context
+import android.net.wifi.WifiManager
+import android.net.wifi.WifiNetworkSuggestion
+import android.os.Build
+import android.os.Bundle
+import android.support.annotation.RequiresApi
+import android.support.v4.app.Fragment
+import android.view.*
+import android.widget.ArrayAdapter
+import android.widget.ListView
+import de.markusfisch.android.binaryeye.R
+import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
+import de.markusfisch.android.binaryeye.view.systemBarListViewScrollListener
+import de.markusfisch.android.binaryeye.widget.toast
+
+class NetworkSuggestionsFragment : Fragment() {
+	@RequiresApi(Build.VERSION_CODES.R)
+	override fun onCreateView(
+		inflater: LayoutInflater,
+		container: ViewGroup?,
+		state: Bundle?
+	): View? {
+		val ac = activity ?: return null
+		ac.setTitle(R.string.network_suggestions)
+
+		val view = inflater.inflate(
+			R.layout.fragment_network_suggestions,
+			container,
+			false
+		)
+
+		val wm = ac.applicationContext.getSystemService(
+			Context.WIFI_SERVICE
+		) as WifiManager
+		val suggestionArrayAdapter = ArrayAdapter(
+			ac,
+			android.R.layout.simple_list_item_checked,
+			wm.networkSuggestions.map {
+				Suggestion(
+					it.ssid ?: it.toString(),
+					it
+				)
+			}
+		)
+
+		val listView = view.findViewById<ListView>(R.id.suggestions)
+		listView.emptyView = view.findViewById(R.id.no_suggestions)
+		listView.adapter = suggestionArrayAdapter
+		listView.setOnScrollListener(systemBarListViewScrollListener)
+		(view.findViewById(R.id.inset_layout) as View).setPaddingFromWindowInsets()
+		listView.setPaddingFromWindowInsets()
+
+		view.findViewById<View>(R.id.remove).setOnClickListener {
+			val removeList = ArrayList<WifiNetworkSuggestion>()
+			val removeFromAdapter = ArrayList<Suggestion>()
+			val checked = listView.checkedItemPositions
+			val size = checked.size()
+			for (i in 0 until size) {
+				if (checked.valueAt(i)) {
+					val pos = checked.keyAt(i)
+					listView.setItemChecked(pos, false)
+					val suggestion = listView.getItemAtPosition(
+						pos
+					) as Suggestion
+					removeList.add(suggestion.suggestion)
+					removeFromAdapter.add(suggestion)
+				}
+			}
+			if (removeList.isNotEmpty()) {
+				removeFromAdapter.forEach {
+					suggestionArrayAdapter.remove(it)
+				}
+				wm.removeNetworkSuggestions(removeList)
+			} else {
+				ac.toast(
+					R.string.clear_network_suggestions_nothing_to_remove
+				)
+			}
+		}
+
+		return view
+	}
+}
+
+private data class Suggestion(
+	val label: String,
+	val suggestion: WifiNetworkSuggestion
+) {
+	override fun toString() = label
+}

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

@@ -16,9 +16,10 @@ import android.support.v7.preference.Preference
 import android.support.v7.preference.PreferenceFragmentCompat
 import android.support.v7.preference.PreferenceGroup
 import de.markusfisch.android.binaryeye.R
-import de.markusfisch.android.binaryeye.actions.wifi.removeNetworkSuggestions
 import de.markusfisch.android.binaryeye.activity.SplashActivity
+import de.markusfisch.android.binaryeye.app.addFragment
 import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.media.beepConfirm
 import de.markusfisch.android.binaryeye.preference.UrlPreference
 import de.markusfisch.android.binaryeye.view.setPaddingFromWindowInsets
 import de.markusfisch.android.binaryeye.view.systemBarRecyclerViewScrollListener
@@ -32,28 +33,43 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 		) {
 			val preference = findPreference(key) ?: return
 			prefs.update()
-			if (preference.key == "custom_locale") {
-				activity?.restartApp()
-			} else {
-				setSummary(preference)
+			when (preference.key) {
+				"custom_locale" -> activity?.restartApp()
+				"beep_tone_name" -> {
+					beepConfirm()
+					setSummary(preference)
+				}
+				else -> setSummary(preference)
 			}
 		}
 	}
 
 	override fun onCreatePreferences(state: Bundle?, rootKey: String?) {
 		addPreferencesFromResource(R.xml.preferences)
-		activity?.setTitle(R.string.preferences)
 		wireClearNetworkPreferences()
 	}
 
 	private fun wireClearNetworkPreferences() {
-		val pref = findPreference("clear_network_suggestions") ?: return
-		if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) {
-			pref.isVisible = false
-		} else {
-			pref.setOnPreferenceClickListener {
-				context.askToClearNetworkSuggestions()
-				true
+		findPreference("clear_network_suggestions").apply {
+			if (Build.VERSION.SDK_INT > Build.VERSION_CODES.Q) {
+				// From R+ we can query past network suggestions and
+				// make them editable.
+				setOnPreferenceClickListener {
+					fragmentManager.addFragment(NetworkSuggestionsFragment())
+					true
+				}
+			} else if (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q) {
+				// On Q, we can only clear *all* suggestions.
+				// Note that previous versions of this app allowed
+				// adding network suggestions on Q as well, so we
+				// need to keep this option.
+				setOnPreferenceClickListener {
+					context.askToClearNetworkSuggestions()
+					true
+				}
+			} else {
+				// There are no network suggestions below Q.
+				isVisible = false
 			}
 		}
 	}
@@ -72,8 +88,8 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 	@RequiresApi(Build.VERSION_CODES.Q)
 	private fun Context.clearNetworkSuggestions() {
 		toast(
-			if (
-				removeNetworkSuggestions(this) == WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
+			if (removeAllNetworkSuggestions() ==
+				WifiManager.STATUS_NETWORK_SUGGESTIONS_SUCCESS
 			) {
 				R.string.clear_network_suggestions_success
 			} else {
@@ -84,6 +100,7 @@ class PreferencesFragment : PreferenceFragmentCompat() {
 
 	override fun onResume() {
 		super.onResume()
+		activity?.setTitle(R.string.preferences)
 		listView.setPaddingFromWindowInsets()
 		listView.removeOnScrollListener(systemBarRecyclerViewScrollListener)
 		listView.addOnScrollListener(systemBarRecyclerViewScrollListener)
@@ -152,3 +169,9 @@ private fun Activity.restartApp() {
 	// Restart to begin with an unmodified Locale to follow system settings.
 	Runtime.getRuntime().exit(0)
 }
+
+@RequiresApi(Build.VERSION_CODES.Q)
+private fun Context.removeAllNetworkSuggestions(): Int =
+	(applicationContext.getSystemService(
+		Context.WIFI_SERVICE
+	) as WifiManager).removeNetworkSuggestions(listOf())

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

@@ -0,0 +1,4 @@
+package de.markusfisch.android.binaryeye.graphics
+
+const val COLOR_BLACK = 0xff000000.toInt()
+const val COLOR_WHITE = 0xffffffff.toInt()

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

@@ -19,10 +19,10 @@ fun Rect.setFrameRoi(
 ) {
 	Matrix().apply {
 		// Map ROI from view coordinates to frame coordinates.
-		setScale(1f / viewRect.width(), 1f / viewRect.height())
+		setTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
+		postScale(1f / viewRect.width(), 1f / viewRect.height())
 		postRotate(-frameMetrics.orientation.toFloat(), .5f, .5f)
 		postScale(frameMetrics.width.toFloat(), frameMetrics.height.toFloat())
-		postTranslate(-viewRect.left.toFloat(), -viewRect.top.toFloat())
 		val frameRoiF = RectF()
 		val viewRoiF = RectF(
 			viewRoi.left.toFloat(),

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

@@ -44,9 +44,9 @@ private fun Bitmap.analyzeTransparency(): Result {
 	return Result(
 		transparent > 0,
 		if (bright > 0 && visible / bright < 2) {
-			0xff000000.toInt()
+			COLOR_BLACK
 		} else {
-			0xffffffff.toInt()
+			COLOR_WHITE
 		}
 	)
 }

app/src/main/kotlin/de/markusfisch/android/binaryeye/media/Beeps.kt

@@ -0,0 +1,33 @@
+package de.markusfisch.android.binaryeye.media
+
+import android.media.AudioManager
+import android.media.ToneGenerator
+import de.markusfisch.android.binaryeye.app.prefs
+
+private var confirmToneGenerator: ToneGenerator? = null
+private var errorToneGenerator: ToneGenerator? = null
+
+fun beepConfirm() {
+	val tg = confirmToneGenerator ?: ToneGenerator(
+		AudioManager.STREAM_NOTIFICATION,
+		ToneGenerator.MAX_VOLUME
+	)
+	confirmToneGenerator = tg
+	tg.startTone(prefs.beepTone())
+}
+
+fun beepError() {
+	val tg = errorToneGenerator ?: ToneGenerator(
+		AudioManager.STREAM_ALARM,
+		ToneGenerator.MAX_VOLUME
+	)
+	errorToneGenerator = tg
+	tg.startTone(ToneGenerator.TONE_SUP_ERROR)
+}
+
+fun releaseToneGenerators() {
+	confirmToneGenerator?.release()
+	confirmToneGenerator = null
+	errorToneGenerator?.release()
+	errorToneGenerator = null
+}

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

@@ -1,7 +1,6 @@
 package de.markusfisch.android.binaryeye.net
 
-import de.markusfisch.android.binaryeye.app.toHexString
-import de.markusfisch.android.binaryeye.app.urlEncode
+import de.markusfisch.android.binaryeye.content.toHexString
 import de.markusfisch.android.binaryeye.database.Scan
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -69,7 +68,7 @@ private fun Scan.getMap(): Map<String, String> = mapOf(
 	"raw" to raw?.toHexString(),
 	"format" to format,
 	"errorCorrectionLevel" to errorCorrectionLevel,
-	"versionNumber" to versionNumber.toString(),
+	"version" to version,
 	"sequenceSize" to sequenceSize.toString(),
 	"sequenceIndex" to sequenceIndex.toString(),
 	"sequenceId" to sequenceId,

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

@@ -0,0 +1,10 @@
+package de.markusfisch.android.binaryeye.net
+
+import java.io.UnsupportedEncodingException
+import java.net.URLEncoder
+
+fun String.urlEncode(): String = try {
+	URLEncoder.encode(this, "UTF-8")
+} catch (e: UnsupportedEncodingException) {
+	this
+}

app/src/main/kotlin/de/markusfisch/android/binaryeye/os/Vibrator.kt

@@ -4,10 +4,8 @@ import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
-import android.os.VibratorManager
-import de.markusfisch.android.binaryeye.app.prefs
 
-private const val DURATION_IN_MS = 100L
+private const val DURATION_IN_MS = 250L
 
 private val beforeO = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
 private val errorPatternTimings = longArrayOf(
@@ -17,7 +15,9 @@ private val errorPatternAmplitudes = intArrayOf(
 	255, 0, 255, 0, 255
 )
 
-fun Context.getVibrator(): Vibrator = if (
+// On SDK 31 and better, we should ask the `VIBRATOR_MANAGER_SERVICE`
+// for the default vibrator. This was implemented here before:
+/*fun Context.getVibrator(): Vibrator = if (
 	Build.VERSION.SDK_INT < Build.VERSION_CODES.S
 ) {
 	@Suppress("DEPRECATION")
@@ -26,12 +26,18 @@ fun Context.getVibrator(): Vibrator = if (
 	(getSystemService(
 		Context.VIBRATOR_MANAGER_SERVICE
 	) as VibratorManager).defaultVibrator
-}
+}*/
+// But for reasons beyond my interests, using `VIBRATOR_MANAGER_SERVICE`
+// leads to a very cryptic `java.lang.VerifyError: r0/b` on Android 4.
+// This is probably a Proguard/R8 issue, but I don't want to waste more
+// time just to get rid of the deprecation warning. So let's use the old
+// `VIBRATOR_SERVICE` and wait for Google to fix their stuff.
+fun Context.getVibrator(): Vibrator = getSystemService(
+	Context.VIBRATOR_SERVICE
+) as Vibrator
 
 fun Vibrator.vibrate() {
-	if (!prefs.vibrate) {
-		return
-	} else if (beforeO) {
+	if (beforeO) {
 		@Suppress("DEPRECATION")
 		vibrate(DURATION_IN_MS)
 	} else {
@@ -45,9 +51,7 @@ fun Vibrator.vibrate() {
 }
 
 fun Vibrator.error() {
-	if (!prefs.vibrate) {
-		return
-	} else if (beforeO) {
+	if (beforeO) {
 		@Suppress("DEPRECATION")
 		vibrate(errorPatternTimings, -1)
 	} else {

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

@@ -2,6 +2,7 @@ package de.markusfisch.android.binaryeye.preference
 
 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
@@ -59,39 +60,29 @@ class Preferences {
 			apply(ZOOM_BY_SWIPING, value)
 			field = value
 		}
-	var autoRotate = false
+	var autoRotate = true
 		set(value) {
-			// Immediately save this setting before it shouldn't change
-			// on the fly while scanning.
-			commit(AUTO_ROTATE, value)
+			apply(AUTO_ROTATE, value)
 			field = value
 		}
 	var tryHarder = false
 		set(value) {
-			// Immediately save this setting because it's only ever read
-			// before the camera is opened.
-			commit(TRY_HARDER, value)
+			apply(TRY_HARDER, value)
 			field = value
 		}
 	var bulkMode = false
 		set(value) {
-			// Immediately save this setting because it's only ever read
-			// before the camera is opened.
-			commit(BULK_MODE, value)
+			apply(BULK_MODE, value)
 			field = value
 		}
 	var bulkModeDelay = "500"
 		set(value) {
-			// Immediately save this setting because it's only ever read
-			// before the camera is opened.
-			commit(BULK_MODE_DELAY, value)
+			apply(BULK_MODE_DELAY, value)
 			field = value
 		}
 	var showToastInBulkMode = true
 		set(value) {
-			// Immediately save this setting because it's only ever read
-			// before the camera is opened.
-			commit(SHOW_TOAST_IN_BULK_MODE, value)
+			apply(SHOW_TOAST_IN_BULK_MODE, value)
 			field = value
 		}
 	var vibrate = true
@@ -99,6 +90,16 @@ class Preferences {
 			apply(VIBRATE, value)
 			field = value
 		}
+	var beep = false
+		set(value) {
+			apply(BEEP, value)
+			field = value
+		}
+	var beepToneName = "tone_prop_beep"
+		set(value) {
+			apply(BEEP_TONE_NAME, value)
+			field = value
+		}
 	var useHistory = false
 		set(value) {
 			apply(USE_HISTORY, value)
@@ -129,6 +130,11 @@ class Preferences {
 			apply(SHOW_HEX_DUMP, value)
 			field = value
 		}
+	var showRecreation = true
+		set(value) {
+			apply(SHOW_RECREATION, value)
+			field = value
+		}
 	var closeAutomatically = false
 		set(value) {
 			apply(CLOSE_AUTOMATICALLY, value)
@@ -169,11 +175,9 @@ class Preferences {
 			apply(INDEX_OF_LAST_SELECTED_FORMAT, value)
 			field = value
 		}
-	var forceCompat = false
+	var freeRotation = true
 		set(value) {
-			// Since the app may be about to crash when forceCompat is set,
-			// it's necessary to `commit()` this synchronously.
-			commit(FORCE_COMPAT, value)
+			apply(FREE_ROTATION, value)
 			field = value
 		}
 
@@ -211,6 +215,10 @@ class Preferences {
 			showToastInBulkMode
 		)
 		vibrate = preferences.getBoolean(VIBRATE, vibrate)
+		beep = preferences.getBoolean(BEEP, beep)
+		preferences.getString(BEEP_TONE_NAME, beepToneName)?.also {
+			beepToneName = it
+		}
 		useHistory = preferences.getBoolean(USE_HISTORY, useHistory)
 		ignoreConsecutiveDuplicates = preferences.getBoolean(
 			IGNORE_CONSECUTIVE_DUPLICATES,
@@ -226,6 +234,7 @@ class Preferences {
 		)
 		showMetaData = preferences.getBoolean(SHOW_META_DATA, showMetaData)
 		showHexDump = preferences.getBoolean(SHOW_HEX_DUMP, showHexDump)
+		showRecreation = preferences.getBoolean(SHOW_RECREATION, showRecreation)
 		closeAutomatically = preferences.getBoolean(
 			CLOSE_AUTOMATICALLY,
 			closeAutomatically
@@ -253,7 +262,16 @@ class Preferences {
 			INDEX_OF_LAST_SELECTED_FORMAT,
 			indexOfLastSelectedFormat
 		)
-		forceCompat = preferences.getBoolean(FORCE_COMPAT, forceCompat)
+		freeRotation = preferences.getBoolean(FREE_ROTATION, freeRotation)
+	}
+
+	fun beepTone() = when (beepToneName) {
+		"tone_cdma_confirm" -> ToneGenerator.TONE_CDMA_CONFIRM
+		"tone_sup_radio_ack" -> ToneGenerator.TONE_SUP_RADIO_ACK
+		"tone_prop_ack" -> ToneGenerator.TONE_PROP_ACK
+		"tone_prop_beep" -> ToneGenerator.TONE_PROP_BEEP
+		"tone_prop_beep2" -> ToneGenerator.TONE_PROP_BEEP2
+		else -> ToneGenerator.TONE_PROP_BEEP
 	}
 
 	private fun put(label: String, value: Boolean) =
@@ -262,14 +280,6 @@ class Preferences {
 	private fun put(label: String, value: String) =
 		preferences.edit().putString(label, value)
 
-	private fun commit(label: String, value: Boolean) {
-		put(label, value).commit()
-	}
-
-	private fun commit(label: String, value: String) {
-		put(label, value).commit()
-	}
-
 	private fun apply(label: String, value: Boolean) {
 		put(label, value).apply()
 	}
@@ -300,12 +310,15 @@ class Preferences {
 		private const val BULK_MODE_DELAY = "bulk_mode_delay"
 		private const val SHOW_TOAST_IN_BULK_MODE = "show_toast_in_bulk_mode"
 		private const val VIBRATE = "vibrate"
+		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 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_RECREATION = "show_recreation"
 		private const val CLOSE_AUTOMATICALLY = "close_automatically"
 		private const val DEFAULT_SEARCH_URL = "default_search_url"
 		private const val OPEN_WITH_URL = "open_with_url"
@@ -314,6 +327,6 @@ class Preferences {
 		private const val SEND_SCAN_TYPE = "send_scan_type"
 		private const val CUSTOM_LOCALE = "custom_locale"
 		private const val INDEX_OF_LAST_SELECTED_FORMAT = "index_of_last_selected_format"
-		private const val FORCE_COMPAT = "force_compat"
+		private const val FREE_ROTATION = "free_rotation"
 	}
 }

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

@@ -0,0 +1,37 @@
+package de.markusfisch.android.binaryeye.view
+
+import android.content.Context
+import android.media.AudioManager
+import de.markusfisch.android.binaryeye.app.prefs
+import de.markusfisch.android.binaryeye.media.beepConfirm
+import de.markusfisch.android.binaryeye.media.beepError
+import de.markusfisch.android.binaryeye.os.error
+import de.markusfisch.android.binaryeye.os.getVibrator
+import de.markusfisch.android.binaryeye.os.vibrate
+
+fun Context.scanFeedback() {
+	if (prefs.vibrate) {
+		getVibrator().vibrate()
+	}
+	if (prefs.beep && !isSilent()) {
+		beepConfirm()
+	}
+}
+
+fun Context.errorFeedback() {
+	if (prefs.vibrate) {
+		getVibrator().error()
+	}
+	if (!isSilent()) {
+		beepError()
+	}
+}
+
+private fun Context.isSilent(): Boolean {
+	val am = getSystemService(Context.AUDIO_SERVICE) as AudioManager
+	return when (am.ringerMode) {
+		AudioManager.RINGER_MODE_SILENT,
+		AudioManager.RINGER_MODE_VIBRATE -> true
+		else -> false
+	}
+}

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

@@ -15,7 +15,7 @@ fun Context.toast(message: String) = Toast.makeText(
 	Toast.LENGTH_LONG
 ).show()
 
-fun String.ellipsize(max: Int) = if (length < max) {
+private fun String.ellipsize(max: Int) = if (length < max) {
 	this
 } else {
 	"${take(max)}…"

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

@@ -0,0 +1,3 @@
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 0.9-2 2v10c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V10c0-1.1-0.9-2-2-2zm-6 9c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
+</vector>

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

@@ -0,0 +1,3 @@
+<vector android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M12 17c1.1 0 2-0.9 2-2s-0.9-2-2-2-2 0.9-2 2 0.9 2 2 2zm6-9h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6h1.9c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2H6c-1.1 0-2 0.9-2 2v10c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V10c0-1.1-0.9-2-2-2zm0 12H6V10h12v10z"/>
+</vector>

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

@@ -1,5 +1,20 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="90dp" android:height="90dp" android:viewportWidth="90" android:viewportHeight="90">
-    <path android:fillColor="#FF000000" android:pathData="M27 45a18 18 0 1 1 36 0 18 18 0 1 1-36 0" android:strokeWidth="4"/>
-    <path android:pathData="M31.738 45a13.262 13.262 0 1 1 26.524 0 13.262 13.262 0 1 1-26.524 0" android:strokeWidth="4" android:fillColor="#ffffff"/>
-    <path android:pathData="M54.41 45c0 2.303-0.827 4.412-2.201 6.048V38.952c1.374 1.636 2.201 3.745 2.201 6.048zM45 54.41c-0.27 0-0.537-0.012-0.801-0.034V35.624C44.463 35.602 44.73 35.59 45 35.59s0.537 0.012 0.801 0.034v18.752C45.537 54.398 45.27 54.41 45 54.41zM35.59 45c0-2.303 0.827-4.412 2.201-6.048v12.096C36.417 49.412 35.59 47.303 35.59 45zm13.415 8.517c-0.511 0.241-1.046 0.437-1.602 0.583V35.9c0.556 0.146 1.091 0.342 1.602 0.583v17.034zM42.597 54.1c-1.173-0.309-2.257-0.839-3.204-1.542V37.442c0.947-0.703 2.031-1.233 3.204-1.542v18.2z" android:strokeWidth="4" android:fillColor="#000000"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+	android:width="90dp"
+	android:height="90dp"
+	android:viewportWidth="90"
+	android:viewportHeight="90">
+	<path
+		android:fillColor="#FF000000"
+		android:pathData="M58.262,45C58.262,52.324 52.324,58.262 45,58.262C37.676,58.262 31.738,52.324 31.738,45C31.738,37.676 37.676,31.738 45,31.738C52.324,31.738 58.262,37.676 58.262,45ZM45,27C35.059,27 27,35.059 27,45C27,54.941 35.059,63 45,63C54.941,63 63,54.941 63,45C63,35.059 54.941,27 45,27Z"
+		android:strokeLineJoin="miter"
+		android:strokeWidth="4"
+		android:strokeColor="#00000000"
+		android:strokeLineCap="butt"/>
+	<path
+		android:pathData="M54.41,45C54.41,47.303 53.583,49.412 52.209,51.048L52.209,38.952C53.583,40.588 54.41,42.697 54.41,45ZM45,54.41C44.73,54.41 44.463,54.398 44.199,54.376L44.199,35.624C44.463,35.602 44.73,35.59 45,35.59C45.27,35.59 45.537,35.602 45.801,35.624L45.801,54.376C45.537,54.398 45.27,54.41 45,54.41ZM35.59,45C35.59,42.697 36.417,40.588 37.791,38.952L37.791,51.048C36.417,49.412 35.59,47.303 35.59,45ZM49.005,53.517C48.494,53.758 47.959,53.954 47.403,54.1L47.403,35.9C47.959,36.046 48.494,36.242 49.005,36.483L49.005,53.517ZM42.597,54.1C41.424,53.791 40.34,53.261 39.393,52.558L39.393,37.442C40.34,36.739 41.424,36.209 42.597,35.9L42.597,54.1Z"
+		android:strokeLineJoin="miter"
+		android:strokeWidth="4"
+		android:fillColor="#000000"
+		android:strokeColor="#00000000"
+		android:strokeLineCap="butt"/>
 </vector>

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

@@ -17,6 +17,6 @@
 			style="@style/FAB"
 			android:id="@+id/scan"
 			android:contentDescription="@string/scan_code"
-			android:src="@drawable/ic_action_search"/>
+			android:src="@drawable/ic_action_next"/>
 	</android.support.design.widget.CoordinatorLayout>
 </merge>

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

@@ -56,6 +56,14 @@
 				android:layout_marginBottom="16dp"
 				android:textSize="12sp"
 				android:typeface="monospace"/>
+			<ImageView
+				android:id="@+id/recreation"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:layout_gravity="center"
+				android:adjustViewBounds="true"
+				android:contentDescription="@string/view_barcode"/>
 		</LinearLayout>
 	</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
 	<android.support.design.widget.CoordinatorLayout

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

@@ -35,6 +35,18 @@
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="16dp"
 				android:entries="@array/error_correction_levels"/>
+			<TextView
+				android:id="@+id/colors_label"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="8dp"
+				android:text="@string/colors"/>
+			<Spinner
+				android:id="@+id/colors"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_marginBottom="16dp"
+				android:entries="@array/colors"/>
 			<TextView
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"

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

@@ -0,0 +1,32 @@
+<FrameLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+	<ListView
+		android:id="@+id/suggestions"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:choiceMode="multipleChoice"
+		android:clipToPadding="false"
+		android:divider="@color/separator"
+		android:dividerHeight="1px"/>
+	<android.support.design.widget.CoordinatorLayout
+		android:id="@+id/inset_layout"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent">
+		<TextView
+			android:visibility="gone"
+			android:id="@+id/no_suggestions"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			android:gravity="center"
+			android:padding="32dp"
+			android:text="@string/clear_network_suggestions_nothing_to_remove"/>
+		<android.support.design.widget.FloatingActionButton
+			style="@style/FAB"
+			android:id="@+id/remove"
+			android:contentDescription="@string/remove_suggestion"
+			android:src="@drawable/ic_action_remove"/>
+	</android.support.design.widget.CoordinatorLayout>
+</FrameLayout>

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

@@ -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/toggle_free"
+		android:title="@string/toggle_free_rotation"
+		android:icon="@drawable/ic_action_rotation_unlocked"
+		material:showAsAction="ifRoom"/>
 	<item
 		android:id="@+id/rotate"
 		android:title="@string/rotate_image_cw"

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

@@ -15,6 +15,11 @@
 	<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="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>
@@ -23,7 +28,7 @@
 	<string name="gtin_price">প্রস্তসবিত দাম</string>
 	<string name="gtin_add_on">ইউপিসি ইএএন বর্ধিত</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">আলো</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">ভাগ করো</string>
@@ -76,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">ধারাবাহিকভাবে তথ্য দেখানোর সময় মুহূর্তের জন্য তথ্য দেখাও।</string>
 	<string name="vibrate">চিনলে কাঁপো</string>
 	<string name="vibrate_summary">এটা সক্ষম রাখলে সংকেত চিনার সাথে সাথে কাঁপবে।</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">ইতিহাস সংরক্ষণ করো।</string>
 	<string name="use_history_summary">সনাক্তকৃত সংকেত যন্ত্রে সংরক্ষণ করো।</string>
 	<string name="ignore_consecutive_duplicates">দ্বিত্ব উপেক্ষা করো</string>
@@ -88,6 +102,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_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>
 	<string name="close_automatically_summary">তথ্য অনুলিপি/ভাগ করার পরে স্বয়ংক্রিয়ভাবে পিছনে যাও।</string>
 	<string name="default_search_engine">Open unknown data in</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">এসকিউলাইট তথ্যভিত্তি</string>
 	<string name="saved_in_downloads">ডাউনলোডে সংরক্ষিত</string>
 	<string name="rotate_image_cw">ছবি ঘড়ির দিকে ঘুরাও</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">ছবি নাও</string>
 	<string name="pick_code_to_scan">খুঁজার জন্য কোড নাও</string>
 	<string name="shortcut_decode">বারকোড খুজো</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">Anonymous identity</string>
 	<string name="wifi_identity">Identity</string>
 	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -17,6 +17,11 @@
 	<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="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>
@@ -25,7 +30,7 @@
 	<string name="gtin_price">Doporučená cena</string>
 	<string name="gtin_add_on">rozšíření UPC EAN</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Zap/vyp blesk</string>
 	<string name="error_flash">Zapnutí/vypnutí blesku selhalo</string>
 	<string name="share">Sdílet</string>
@@ -78,6 +83,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Krátce zobrazit data v módu nepřetržitého skenování.</string>
 	<string name="vibrate">Zavibrovat při detekování</string>
 	<string name="vibrate_summary">Zařízení zavibruje, když rozpozná čárový kód.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Ukládat historii skenování</string>
 	<string name="use_history_summary">Rozpoznané kódy se uloží do zařízení.</string>
 	<string name="ignore_consecutive_duplicates">Ignorovat duplikáty</string>
@@ -90,6 +104,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_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">Vrátit se po zkopírování/sdílení</string>
 	<string name="close_automatically_summary">Po zkopírovaní či sdílení se automaticky vrátí na skenovací obrazovku.</string>
 	<string name="default_search_engine">Nerozpoznaná data otevřít v</string>
@@ -152,6 +168,7 @@
 	<string name="export_database">SQLite databáze</string>
 	<string name="saved_in_downloads">Uloženo do složky Stahování</string>
 	<string name="rotate_image_cw">Otočit obrázek po směru hodinových ručiček</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Vybrat obrázek</string>
 	<string name="pick_code_to_scan">Vyberte kód k naskenování</string>
 	<string name="shortcut_decode">Skenovat čárový kód</string>
@@ -168,4 +185,6 @@
 	<string name="wifi_anonymous_identity">Anonymní identita</string>
 	<string name="wifi_identity">Identita</string>
 	<string name="wifi_phase2">Ověření Phase 2</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -0,0 +1,188 @@
+<resources>
+	<string name="no_camera_no_fun">Denne app giver ingen mening uden adgang til kameraet. Farvel.</string>
+	<string name="camera_error">Kan ikke få adgang til kamera, prøv igen</string>
+	<string name="scan_code">Scan kode</string>
+	<string name="compose_barcode">Opret stregkode</string>
+	<string name="decode_barcode">Afkod stregkode</string>
+	<string name="content">Indhold</string>
+	<string name="binary_data">(binære data)</string>
+	<plurals name="barcode_info">
+		<item quantity="one">%2$d karakter, %1$s</item>
+		<item quantity="other">%2$d karakterer, %1$s</item>
+	</plurals>
+	<string name="error_correction_level">Fejlkorrektionsniveau</string>
+	<string name="error_correction_level_l" formatted="false">Lav (~7&#37; korrigering)</string>
+	<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="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>
+	<string name="colors_black_on_transparent">Sort på gennemsigtig</string>
+	<string name="colors_white_on_transparent">Hvid på gennemsigtig</string>
+	<string name="sequence_size">Sekvens størrelse</string>
+	<string name="sequence_index">Sekvens indeks</string>
+	<string name="sequence_id">Sekvens ID</string>
+	<string name="gtin_issue_number">Udstedelsesnummer</string>
+	<string name="gtin_country">Muligt fremstillingsland</string>
+	<string name="gtin_price">Vejledende pris</string>
+	<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="toggle_flash">Slå blitz til/fra</string>
+	<string name="error_flash">Der opstod en fejl ved at slå blitz til/fra</string>
+	<string name="share">Del</string>
+	<string name="share_as">Del som?</string>
+	<string name="copy_to_clipboard">Kopier til udklipsholder</string>
+	<string name="copied_to_clipboard">Kopieret til udklipsholder</string>
+	<string name="copy_password">Kopier adgangskode til udklipsholderen</string>
+	<string name="copied_password_to_clipboard">Adgangskode kopieret til udklipsholderen</string>
+	<string name="open_url">Åbn URL</string>
+	<string name="cannot_resolve_action">Inge applikation kan åbne det</string>
+	<string name="pick_search_engine">Vælg en søgemaskine</string>
+	<string name="format">Format</string>
+	<string name="size">Størrelse i pixels</string>
+	<string name="width_by_height">%1$d×%2$d</string>
+	<string name="input_content_here">Indtast indhold her</string>
+	<string name="encode">INDKOD</string>
+	<string name="error_no_content">Manglende indhold</string>
+	<string name="error_encoding_barcode">Stregkode kan ikke genereres</string>
+	<string name="view_barcode">Vis stregkode</string>
+	<string name="info">Info</string>
+	<string name="switch_camera">Skift kamera</string>
+	<string name="bulk_mode">Scan kontinuerligt</string>
+	<string name="bulk_mode_summary">Begynd altid ved at scanne kontinuerligt.</string>
+	<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="scan_format">Scan %s</string>
+	<string name="quarter_second">Et kvart sekund</string>
+	<string name="half_second">Et halvt sekund</string>
+	<string name="a_second">Et sekund</string>
+	<string name="two_seconds">To sekunder</string>
+	<string name="five_seconds">Fem sekunder</string>
+	<string name="history">Historik</string>
+	<string name="preferences">Præferencer</string>
+	<string name="scan_category">Scan</string>
+	<string name="content_category">Indhold</string>
+	<string name="locale_category">Sprog</string>
+	<string name="custom_locale">Brugerdefineret sprog</string>
+	<string name="follow_system_settings">Følg systemindstillingerne</string>
+	<string name="show_crop_handle">Vis beskæringsbegrænser</string>
+	<string name="show_crop_handle_summary">Begræns scanning til et område, der kan tilpasses.</string>
+	<string name="barcode_formats">Stregkode formater</string>
+	<string name="zoom_by_swiping">Stryg op/ned for at zoome</string>
+	<string name="zoom_by_swiping_summary">Stryg op eller ned på kameraskærmen for at styre kameraets zoom.</string>
+	<string name="auto_rotate">Genkend lodrette 1D stregkoder</string>
+	<string name="auto_rotate_summary">Roter automatisk kamerarammen for at genkende lodrette 1D stregkoder. Afhængigt af enheden kan dette påvirke ydeevnen.</string>
+	<string name="try_harder">Optimer læseren for nøjagtighed</string>
+	<string name="try_harder_summary">Aktiver denne mulighed for koder som er meget svære at læse. Vil påvirke ydeevnen.</string>
+	<string name="show_toast_in_bulk_mode">Vis data i kontinuerlig tilstand</string>
+	<string name="show_toast_in_bulk_mode_summary">Vis kort de scannede data, når du scanner kontinuerligt.</string>
+	<string name="vibrate">Vibrer ved registrering</string>
+	<string name="vibrate_summary">Aktiver dette, hvis du vil have din enhed til at vibrere, når en kode genkendes.</string>
+	<string name="beep">Bip ved registrering</string>
+	<string name="beep_summary">Aktiver dette, hvis du vil have din enhed til at bippe, når en kode genkendes.</string>
+	<string name="beep_tone">Bip tone</string>
+	<string name="tone_cdma_confirm">CDMA bekræftelse</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positiv anerkendelse</string>
+	<string name="tone_prop_beep">Generelt bip</string>
+	<string name="tone_prop_beep2">Generelt dobbelt bip</string>
+	<string name="use_history">Gem scanningshistorik</string>
+	<string name="use_history_summary">Gem genkendte koder på din enhed.</string>
+	<string name="ignore_consecutive_duplicates">Ignorer dubletter</string>
+	<string name="ignore_consecutive_duplicates_summary">Gem ikke fortløbende dubletter i scanningshistorikken.</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>
+	<string name="copy_immediately_summary">Kopier automatisk scannet indhold til udklipsholder. Bemærk at andre apps kan holde øje med din udklipsholder i baggrunden.</string>
+	<string name="show_meta_data">Vis metadata</string>
+	<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_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>
+	<string name="close_automatically_summary">Vend automatisk tilbage til scanningsskærmen efter kopiering eller deling af det læste indhold.</string>
+	<string name="default_search_engine">Åbn ukendte data i</string>
+	<string name="always_ask">Spørg altid</string>
+	<string name="open_with_url">Åbn ukendte data med URL</string>
+	<string name="clear_network_suggestions">Fjern netværksforslag</string>
+	<string name="clear_network_suggestions_summary">Fjern netværksforslag, der tidligere blev tilføjet med denne app.</string>
+	<string name="really_remove_all_networks">Vil du virkelig fjerne alle netværk?</string>
+	<string name="clear_network_suggestions_success">Netværksforslag ryddet</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Der er intet at fjerne</string>
+	<string name="send_category">Videresendelse</string>
+	<string name="send_scan_active">Videresend scanninger</string>
+	<string name="send_scan_active_summary">Aktiver for at videresende scanninger til en given URL.</string>
+	<string name="send_scan_url">URL at videresende til</string>
+	<string name="send_scan_type">Forespørgsels type</string>
+	<string name="send_type_get_add_content">GET og tilføj blot indhold</string>
+	<string name="send_type_get_query_string">GET med komplet forespørgselsstreng</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">Åbn i ekstern browser</string>
+	<string name="test_url">Test URL</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="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>
+	<string name="no_barcode_found">Ingen stregkode fundet</string>
+	<string name="pick_list_separator">Hvordan adskiller man listeelementer?</string>
+	<string name="separator_line_break">Linjeskift</string>
+	<string name="separator_ruler">Lineal</string>
+	<string name="save_as_file_name">Vil du gemme som i downloads?</string>
+	<string name="file_name">Filnavn</string>
+	<string name="error_saving_file">Kan ikke gemme filen</string>
+	<string name="error_file_exists">Filen findes allerede</string>
+	<string name="connect_to_wifi">Opret forbindelse til WiFi</string>
+	<string name="wifi_config_failed">Kunne ikke konfigurere WiFi</string>
+	<string name="wifi_added">WiFi tilføjet</string>
+	<string name="sms_send">Send SMS</string>
+	<string name="sms_error">Kunne ikke sende SMS</string>
+	<string name="tel_dial">Ring til nummer</string>
+	<string name="tel_error">Kunne ikke ringe til nummeret</string>
+	<string name="mail_send">Send mail</string>
+	<string name="mail_error">Kunne ikke sende mail</string>
+	<string name="vcard_add">Tilføj til kontakter</string>
+	<string name="vcard_failed">Kunne ikke føje til kontakter</string>
+	<string name="vevent_add">Tilføj til kalender</string>
+	<string name="vevent_failed">Kunne ikke føje til kalenderen</string>
+	<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="export_to_file">Eksporter til fil</string>
+	<string name="export_as">Eksporter som?</string>
+	<string name="export_csv_comma">CSV-fil med kommaer</string>
+	<string name="export_csv_semicolon">CSV-fil med semikoloner</string>
+	<string name="export_json">JSON fil</string>
+	<string name="export_database">SQLite database</string>
+	<string name="saved_in_downloads">Gemt i downloads</string>
+	<string name="rotate_image_cw">Roter billedet med uret</string>
+	<string name="toggle_free_rotation">Slå fri rotation til/fra</string>
+	<string name="pick_file">Vælg billedfil</string>
+	<string name="pick_code_to_scan">Vælg kode til at scanne</string>
+	<string name="shortcut_decode">Scan en stregkode</string>
+	<string name="shortcut_encode">Opret en stregkode</string>
+	<string name="shortcut_preferences">Indstillinger</string>
+	<string name="background_request_failed">Baggrundsanmodning mislykkedes</string>
+	<string name="entry_type">Type</string>
+	<string name="wifi_network">WiFi netværk</string>
+	<string name="wifi_ssid">Navn</string>
+	<string name="wifi_type">Godkendelsestype</string>
+	<string name="wifi_password">Adgangskode</string>
+	<string name="wifi_hidden">Skjult netværk</string>
+	<string name="wifi_eap">EAP metode</string>
+	<string name="wifi_anonymous_identity">Anonym identitet</string>
+	<string name="wifi_identity">Identitet</string>
+	<string name="wifi_phase2">Fase 2 metode</string>
+	<string name="network_suggestions">Netværksforslag</string>
+	<string name="remove_suggestion">Fjern forslag</string>
+</resources>

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

@@ -0,0 +1,30 @@
+<resources>
+	<string-array name="search_engines_names">
+		<item>@string/always_ask</item>
+		<item>Google</item>
+		<item>DuckDuckGo</item>
+		<item>Qwant</item>
+		<item>Bing</item>
+		<item>Yandex</item>
+		<item>ebay</item>
+		<item>Amazon</item>
+		<item>OpenFoodFacts.org</item>
+		<item>OpenBeautyFacts.org</item>
+		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
+	</string-array>
+	<string-array name="search_engines_values">
+		<item></item>
+		<item>https://www.google.de/search?q=</item>
+		<item>https://duckduckgo.com/?q=</item>
+		<item>https://www.qwant.com/?q=</item>
+		<item>https://bing.com/?q=</item>
+		<item>https://yandex.com/?q=</item>
+		<item>https://www.ebay.de/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.de/s?k=</item>
+		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
+	</string-array>
+</resources>

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

@@ -15,6 +15,11 @@
 	<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="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>
+	<string name="colors_black_on_transparent">Schwarz auf Transparent</string>
+	<string name="colors_white_on_transparent">Weiß auf Transparent</string>
 	<string name="sequence_size">Sequence size</string>
 	<string name="sequence_index">Sequence index</string>
 	<string name="sequence_id">Sequence ID</string>
@@ -23,7 +28,7 @@
 	<string name="gtin_price">Preisvorschlag</string>
 	<string name="gtin_add_on">UPC EAN Erweiterung</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d Module)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d Module)</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>
@@ -74,8 +79,17 @@
 	<string name="try_harder_summary">Aktivieren Sie diese Option für sehr schwer lesbare Codes. Beeinträchtigt die Leistung.</string>
 	<string name="show_toast_in_bulk_mode">Daten einblenden</string>
 	<string name="show_toast_in_bulk_mode_summary">Die gescannten Daten werden kurz eingeblendet, wenn fortlaufend gescannt wird.</string>
-	<string name="vibrate">Bei Erkennung vibrieren</string>
-	<string name="vibrate_summary">Das Gerät soll vibrieren wenn ein Code erkannt wird.</string>
+	<string name="vibrate">Vibration bei Erkennung</string>
+	<string name="vibrate_summary">Bei Erkennung eines Codes soll das Gerät vibrieren.</string>
+	<string name="beep">Signalton bei Erkennung</string>
+	<string name="beep_summary">Bei Erkennung eines Codes soll ein Signalton abgespielt werden.</string>
+	<string name="beep_tone">Signalton</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="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>
@@ -88,13 +102,15 @@
 	<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_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>
 	<string name="close_automatically_summary">Nach dem Kopieren/Teilen automatisch zum Scanbildschirm zurückkehren.</string>
 	<string name="default_search_engine">Unbekannte Daten öffnen mit</string>
 	<string name="always_ask">Immer fragen</string>
 	<string name="open_with_url">URL zum Öffnen unbekannter Daten</string>
 	<string name="clear_network_suggestions">WiFi Netzwerkvorschläge entfernen</string>
-	<string name="clear_network_suggestions_summary">Betrifft alle WiFi Netzwerke, die zuvor mit dieser App bereitgestellt wurden.</string>
+	<string name="clear_network_suggestions_summary">Betrifft nur Netzwerke, die zuvor mit dieser App bereitgestellt wurden.</string>
 	<string name="really_remove_all_networks">Alle Netzwerkvorschläge entfernen?</string>
 	<string name="clear_network_suggestions_success">Netzwerkvorschläge entfernt</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nichts zu entfernen</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">SQLite Datenbank</string>
 	<string name="saved_in_downloads">In den Downloads gespeichert</string>
 	<string name="rotate_image_cw">Bild im Uhrzeigersinn rotieren</string>
+	<string name="toggle_free_rotation">Freie Rotation ein/ausschalten</string>
 	<string name="pick_file">Bilddatei auswählen</string>
 	<string name="pick_code_to_scan">Code im Bild auswählen</string>
 	<string name="shortcut_decode">Barcode lesen</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">Anonyme Identität</string>
 	<string name="wifi_identity">Identität</string>
 	<string name="wifi_phase2">Phase 2 Methode</string>
+	<string name="network_suggestions">WiFi Netzwerkvorschläge</string>
+	<string name="remove_suggestion">Vorschlag entfernen</string>
 </resources>

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

@@ -15,6 +15,11 @@
 	<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>
@@ -23,7 +28,7 @@
 	<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$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Activar el flash</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Compartir</string>
@@ -76,6 +81,15 @@
 	<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="use_history">Guardar historial de escaneo</string>
 	<string name="use_history_summary">Guardar códigos reconocidos en su dispositivo.</string>
 	<string name="ignore_consecutive_duplicates">Ignorar duplicados</string>
@@ -88,6 +102,8 @@
 	<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="default_search_engine">Abrir datos desconocidos en</string>
@@ -150,6 +166,7 @@
 	<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">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>
@@ -166,4 +183,6 @@
 	<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>
 </resources>

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

@@ -6,9 +6,12 @@
 		<item>Qwant</item>
 		<item>بینگ</item>
 		<item>یاندکس</item>
+		<item>ebay</item>
+		<item>Amazon</item>
 		<item>OpenFoodFacts.org</item>
 		<item>OpenBeautyFacts.org</item>
 		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
 	</string-array>
 	<string-array name="search_engines_values">
 		<item></item>
@@ -17,8 +20,11 @@
 		<item>https://www.qwant.com/?q=</item>
 		<item>https://bing.com/?q=</item>
 		<item>https://yandex.com/?q=</item>
+		<item>https://www.ebay.com/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.com/s?k=</item>
 		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
 		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
 		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
 	</string-array>
 </resources>

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

@@ -15,6 +15,11 @@
 	<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="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>
@@ -23,7 +28,7 @@
 	<string name="gtin_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$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">روشن/خاموش کردن چراغ</string>
 	<string name="error_flash">خطا هنگام روشن/خاموش کردن چراغ</string>
 	<string name="share">هم‌رسانی</string>
@@ -76,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">هنگام پویش مداوم، داده‌های پویش شده را به طور خلاصه نشان می‌دهید.</string>
 	<string name="vibrate">لرزش هنگام تشخیص</string>
 	<string name="vibrate_summary">اگر می‌خواهید دستگاهتان هنگام شناسایی کد بلرزد، این را فعال کنید.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">ذخیرهٔ تاریخچهٔ پویش</string>
 	<string name="use_history_summary">کدهای شناسایی شده را در همین دستگاه ذخیره می‌کند.</string>
 	<string name="ignore_consecutive_duplicates">نادیده گرفتن موارد تکراری</string>
@@ -88,6 +102,8 @@
 	<string name="show_meta_data_summary">نمایش داده‌های اضافی در مورد بارکد پویش شده.</string>
 	<string name="show_hex_dump">نمایش کد هگز استخراج شده</string>
 	<string name="show_hex_dump_summary">نمایش کد هگز استخراج شده از محتویات پویش شده.</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>
 	<string name="close_automatically_summary">پس از رونوشت یا هم‌رسانی مطالب خوانده شده، به طور خودکار به صفحهٔ پویش بازگردید.</string>
 	<string name="default_search_engine">گشودن دادهٔ نامشخص در</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">پایگاه‌دادهٔ اس‌کیولایت</string>
 	<string name="saved_in_downloads">در بارگیری‌ها ذخیره شد</string>
 	<string name="rotate_image_cw">تصویر را در جهت ساعتگرد بچرخانید</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">پروندهٔ تصویری را برگزینید</string>
 	<string name="pick_code_to_scan">کدی را برای پویش برگزینید</string>
 	<string name="shortcut_decode">پویش یک بارکد</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">هویت ناشناس</string>
 	<string name="wifi_identity">هویت</string>
 	<string name="wifi_phase2">روش دو مرحله‌ای</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -16,15 +16,20 @@
 	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</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>
+	<string name="colors_black_on_transparent">Noir sur transparent</string>
+	<string name="colors_white_on_transparent">Blanc sur transparent</string>
+	<string name="sequence_size">Taille de la séquence</string>
+	<string name="sequence_index">Index de la séquence</string>
+	<string name="sequence_id">ID de la séquence</string>
 	<string name="gtin_issue_number">Numéro du problème</string>
 	<string name="gtin_country">Pays de fabrication possible</string>
 	<string name="gtin_price">Prix suggéré</string>
 	<string name="gtin_add_on">Extension UPC EAN</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Activer le flash</string>
 	<string name="error_flash">Erreur de basculement du flash</string>
 	<string name="share">Partager</string>
@@ -77,6 +82,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Afficher brièvement les données lors d\'un scan en continu.</string>
 	<string name="vibrate">Vibrer à la détection</string>
 	<string name="vibrate_summary">Fait vibrer l\'appareil lorsqu\'un code est reconnu.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Sauvegarder l\'historique des scans</string>
 	<string name="use_history_summary">Sauvegarde les codes reconnus sur votre appareil.</string>
 	<string name="ignore_consecutive_duplicates">Ignorer les doublons</string>
@@ -89,6 +103,8 @@
 	<string name="show_meta_data_summary">Affiche les données supplémentaires sur le code-barres scanné.</string>
 	<string name="show_hex_dump">Afficher le dump hexa</string>
 	<string name="show_hex_dump_summary">Affiche le dump hexadécimal du contenu scanné.</string>
+	<string name="show_recreation">Afficher le code-barres recréé</string>
+	<string name="show_recreation_summary">Recrée et affiche, si possible, le code-barres à partir du contenu lu.</string>
 	<string name="close_automatically">Revenir après une copie/partage</string>
 	<string name="close_automatically_summary">Revient automatiquement sur l\'écran de scan après avoir copié ou partagé le contenu lu.</string>
 	<string name="default_search_engine">Ouvrir les données inconnues dans</string>
@@ -151,6 +167,7 @@
 	<string name="export_database">Exporter la base de données SQLite</string>
 	<string name="saved_in_downloads">Sauvegardé dans les Téléchargements</string>
 	<string name="rotate_image_cw">Tourner l\'image dans le sens horaire</string>
+	<string name="toggle_free_rotation">Activer la rotation libre</string>
 	<string name="pick_file">Choisir un fichier image</string>
 	<string name="pick_code_to_scan">Choisissez le code à scanner</string>
 	<string name="shortcut_decode">Scanner un code-barres</string>
@@ -167,4 +184,6 @@
 	<string name="wifi_anonymous_identity">Identité anonyme</string>
 	<string name="wifi_identity">Identité</string>
 	<string name="wifi_phase2">Méthode de la phase 2</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -15,6 +15,11 @@
 	<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="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>
@@ -23,7 +28,7 @@
 	<string name="gtin_price">Ajánlott ár</string>
 	<string name="gtin_add_on">UPC EAN kiterjesztés</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</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>
@@ -76,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">A beolvasott adatok gyors megjelenítése folyamatos beolvasáskor.</string>
 	<string name="vibrate">Rezgetés felismeréskor</string>
 	<string name="vibrate_summary">Akkor engedélyezze ezt, ha rezgetni szeretné az eszközét egy kód felismerésekor.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="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_consecutive_duplicates">Ne mentsen egymást követő azonos adatokat</string>
@@ -88,6 +102,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_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>
 	<string name="close_automatically_summary">Automatikus visszatérés a beolvasási képernyőre a beolvasott tartalom másolása vagy megosztása után.</string>
 	<string name="default_search_engine">Ismeretlen adatok megnyitása ebben</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">SQLite adatbázis</string>
 	<string name="saved_in_downloads">Elmentve a letöltésekbe</string>
 	<string name="rotate_image_cw">Kép forgatása jobbra</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Képfájl kiválasztása</string>
 	<string name="pick_code_to_scan">Kód kiválasztása a beolvasáshoz</string>
 	<string name="shortcut_decode">Vonalkód beolvasása</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">Névtelen személyazonosság</string>
 	<string name="wifi_identity">Személyazonosság</string>
 	<string name="wifi_phase2">Phase 2 módszer</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -14,17 +14,22 @@
 	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</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>
+	<string name="colors_black_on_transparent">Hitam di atas tansparan</string>
+	<string name="colors_white_on_transparent">Putih di atas tansparan</string>
+	<string name="sequence_size">Ukuran sekuens</string>
+	<string name="sequence_index">Indeks sekuens</string>
+	<string name="sequence_id">ID Sekuens</string>
 	<string name="gtin_issue_number">Nomor pindaian</string>
 	<string name="gtin_country">Kemungkinan negara pembuat</string>
 	<string name="gtin_price">Harga yang disarankan</string>
 	<string name="gtin_add_on">Ekstensi UPC EAN</string>
-	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="barcode_version_number">Versi</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modul)</string>
 	<string name="toggle_flash">Nyala/matikan blitz</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Galat nyala/matikan blitz</string>
 	<string name="share">Bagikan</string>
 	<string name="share_as">Bagikan sebagai?</string>
 	<string name="copy_to_clipboard">Salin ke clipboard</string>
@@ -45,16 +50,16 @@
 	<string name="info">Info</string>
 	<string name="switch_camera">Ganti kamera</string>
 	<string name="bulk_mode">Pindai tanpa henti</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_summary">Selalu mulai pemindaian tanpa henti.</string>
+	<string name="bulk_mode_delay">Tundaan antara pemindaian tanpa henti</string>
+	<string name="restrict_format">Batasi format</string>
+	<string name="remove_restriction">Hapus pembatasan</string>
+	<string name="scan_format">Pindai %s</string>
+	<string name="quarter_second">Seperempat detik</string>
+	<string name="half_second">Setengah detik</string>
+	<string name="a_second">Satu detik</string>
+	<string name="two_seconds">Dua detik</string>
+	<string name="five_seconds">Lima detik</string>
 	<string name="history">Riwayat</string>
 	<string name="preferences">Preferensi</string>
 	<string name="scan_category">Pemindaian</string>
@@ -64,17 +69,26 @@
 	<string name="follow_system_settings">Ikuti pengaturan sistem</string>
 	<string name="show_crop_handle">Tampilkan pembatas pemotongan</string>
 	<string name="show_crop_handle_summary">Batasi pemindaian ke batas area tertentu.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Format barcode</string>
 	<string name="zoom_by_swiping">Geser ke atas/bawah untuk memperbesar</string>
 	<string name="zoom_by_swiping_summary">Geser layar kamera ke atas atau ke bawah untuk mengontrol perbesaran gambar.</string>
 	<string name="auto_rotate">Kenali barcode vertikal 1D</string>
 	<string name="auto_rotate_summary">Otomatis putar frame kamera mengenali barcode vertikal 1D. Tergantung pada perangkat, mungkin akan berpengaruh pada performa.</string>
 	<string name="try_harder">Optimalkan akurasi pembaca</string>
 	<string name="try_harder_summary">Aktifkan opsi ini untuk kode yang susah dibaca. Akan berpengaruh pada performa.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="show_toast_in_bulk_mode">Tampilkan data dalam mode tanpa henti</string>
+	<string name="show_toast_in_bulk_mode_summary">Tampilkan data secara singkat saat memindai tanpa henti.</string>
 	<string name="vibrate">Bergetar saat mendeteksi</string>
 	<string name="vibrate_summary">Aktifkan opsi ini jika anda ingin perangkat anda bergetar ketika kode berhasil dipindai.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Simpan riwayat pemindaian</string>
 	<string name="use_history_summary">Simpan kode yang berhasil dipindai pada perangkat anda.</string>
 	<string name="ignore_consecutive_duplicates">Abaikan duplikat</string>
@@ -87,27 +101,29 @@
 	<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="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="show_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>
+	<string name="close_automatically_summary">Otomatis kembali ke layar pemindaian setelah menyalin atau berbagi isi konten.</string>
+	<string name="default_search_engine">Buka data tak dikenal di</string>
+	<string name="always_ask">Selalu tanya</string>
 	<string name="open_with_url">Buka data tak dikenal dengan URL</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="clear_network_suggestions">Hapus saran jaringan</string>
+	<string name="clear_network_suggestions_summary">Hapus semua saran jaringan yang sebelumnya disediakan oleh aplikasi ini.</string>
+	<string name="really_remove_all_networks">Yakin menghapus semua jaringan?</string>
+	<string name="clear_network_suggestions_success">Saran jaringan dihapus</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Tidak ada yang perlu dihapus</string>
 	<string name="send_category">Penerusan</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">Teruskan pemindaian</string>
+	<string name="send_scan_active_summary">Aktifkan penerusan pemindaian ke URL berikut</string>
 	<string name="send_scan_url">Kirim setiap pindaian ke URL</string>
 	<string name="send_scan_type">Tipe permintaan untuk setiap pindaian</string>
 	<string name="send_type_get_add_content">GET dan tambahkan konten</string>
 	<string name="send_type_get_query_string">GET dengan kueri lema lengkap</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
-	<string name="test_url">Test URL</string>
+	<string name="send_type_external_browser">Buka di peramban eksternal</string>
+	<string name="test_url">URL Tes</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>
@@ -149,20 +165,23 @@
 	<string name="export_database">Ekspor basis data SQLite</string>
 	<string name="saved_in_downloads">Simpan di dalam unduhan</string>
 	<string name="rotate_image_cw">Putar gambar searah jarum jam</string>
+	<string name="toggle_free_rotation">Nyala/matikan rotasi bebas</string>
 	<string name="pick_file">Pilih berkas gambar</string>
 	<string name="pick_code_to_scan">Pilih kode untuk dipindai</string>
 	<string name="shortcut_decode">Pindai barcode</string>
 	<string name="shortcut_encode">Buat barcode</string>
 	<string name="shortcut_preferences">Pengaturan</string>
 	<string name="background_request_failed">Permintaan latar belakang gagal</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="entry_type">Tipe</string>
+	<string name="wifi_network">Jaringan Wi-Fi</string>
+	<string name="wifi_ssid">Nama</string>
+	<string name="wifi_type">Tipe otentikasi</string>
+	<string name="wifi_password">Sandi</string>
+	<string name="wifi_hidden">Jaringan tersembunyi</string>
+	<string name="wifi_eap">Metode EAP</string>
+	<string name="wifi_anonymous_identity">Identitas anonim</string>
+	<string name="wifi_identity">Identitas</string>
+	<string name="wifi_phase2">Metode fase 2</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -1,6 +1,6 @@
 <resources>
 	<string name="no_camera_no_fun">Quest\'app non ha alcun senso senza l\'accesso alla fotocamera. Ciao.</string>
-	<string name="camera_error">Impossibile accedere alla fotocamera, riprova</string>
+	<string name="camera_error">Impossibile accedere alla fotocamera. Riprova</string>
 	<string name="scan_code">Scansiona codice</string>
 	<string name="compose_barcode">Crea codice a barre</string>
 	<string name="decode_barcode">Decodifica codice a barre</string>
@@ -10,35 +10,40 @@
 		<item quantity="one">%2$d carattere, %1$s</item>
 		<item quantity="other">%2$d caratteri, %1$s</item>
 	</plurals>
-	<string name="error_correction_level">Livello di correzione degli errori</string>
-	<string name="error_correction_level_l" formatted="false">Basso (Correzione del ~7&#37;)</string>
-	<string name="error_correction_level_m" formatted="false">Medio (Correzione del ~15&#37;)</string>
-	<string name="error_correction_level_q" formatted="false">Quartile (Correzione del ~25&#37;)</string>
-	<string name="error_correction_level_h" formatted="false">Alto (Correzione del ~30&#37;)</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
-	<string name="gtin_issue_number">Numero di edizione</string>
-	<string name="gtin_country">Probabile Paese di fabbricazione</string>
+	<string name="error_correction_level">Livello correzione errori</string>
+	<string name="error_correction_level_l" formatted="false">Basso (correzione del ~7&#37;)</string>
+	<string name="error_correction_level_m" formatted="false">Medio (correzione del ~15&#37;)</string>
+	<string name="error_correction_level_q" formatted="false">Quartile (correzione del ~25&#37;)</string>
+	<string name="error_correction_level_h" formatted="false">Alto (correzione del ~30&#37;)</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>
+	<string name="colors_black_on_transparent">Nero su trasparente</string>
+	<string name="colors_white_on_transparent">Bianco su trasparente</string>
+	<string name="sequence_size">Dimensione sequenza</string>
+	<string name="sequence_index">Indice sequenza</string>
+	<string name="sequence_id">ID sequenza</string>
+	<string name="gtin_issue_number">Numero edizione</string>
+	<string name="gtin_country">Probabile nazione fabbricazione</string>
 	<string name="gtin_price">Prezzo consigliato</string>
 	<string name="gtin_add_on">Estensione UPC EAN</string>
 	<string name="barcode_version_number">Versione</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
-	<string name="toggle_flash">Attiva/Disattiva flash</string>
+	<string name="qr_version_and_modules">%1$s (%2$d moduli)</string>
+	<string name="toggle_flash">Attiva/disattiva flash</string>
 	<string name="error_flash">Errore durante l\'attivazione/disattivazione del flash</string>
 	<string name="share">Condividi</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>
-	<string name="copy_password">Copia password negli appunti</string>
-	<string name="copied_password_to_clipboard">Password copiata negli appunti</string>
+	<string name="copy_to_clipboard">Copia negli Appunti</string>
+	<string name="copied_to_clipboard">Copiato negli Appunti</string>
+	<string name="copy_password">Copia password negli Appunti</string>
+	<string name="copied_password_to_clipboard">Password copiata negli Appunti</string>
 	<string name="open_url">Apri URL</string>
 	<string name="cannot_resolve_action">Nessuna app può aprirlo</string>
-	<string name="pick_search_engine">Scegli un motore di ricerca</string>
+	<string name="pick_search_engine">Scegli motore di ricerca</string>
 	<string name="format">Formato</string>
-	<string name="size">Dimensioni in pixel</string>
+	<string name="size">Dimensioni (pixel)</string>
 	<string name="width_by_height">%1$d×%2$d</string>
-	<string name="input_content_here">Inserisci il contenuto qui</string>
+	<string name="input_content_here">Inserisci qui il contenuto</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>
@@ -62,40 +67,51 @@
 	<string name="content_category">Contenuto</string>
 	<string name="locale_category">Lingua</string>
 	<string name="custom_locale">Lingua personalizzata</string>
-	<string name="follow_system_settings">Segui le impostazioni di sistema</string>
-	<string name="show_crop_handle">Mostra riquadro di limite</string>
+	<string name="follow_system_settings">Usa le 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="barcode_formats">Formati di codici a barre</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 i codici a barre 1D verticalmente</string>
-	<string name="auto_rotate_summary">Ruota automaticamente la fotocamera per riconoscere i codici a barre 1D verticali. In base al dispositivo, potrebbe ridurre le prestazioni.</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_summary">Attiva questa opzione per codici molto difficili da leggere. Riduce le prestazioni.</string>
-	<string name="show_toast_in_bulk_mode">Mostra i dati in modalità continua</string>
-	<string name="show_toast_in_bulk_mode_summary">Mostra brevemente i dati scansionati durante la scansione continua.</string>
+	<string name="show_toast_in_bulk_mode">Visualizza i dati in modalità continua</string>
+	<string name="show_toast_in_bulk_mode_summary">Durante la scansione continua vsualizza 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="use_history">Salva cronologia delle scansioni</string>
-	<string name="use_history_summary">Salva i codici riconosciuti sul dispositivo.</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>
+	<string name="tone_cdma_confirm">Conferma CDMA</string>
+	<string name="tone_sup_confirm">Conferma supervisione chiamata</string>
+	<string name="tone_sup_radio_ack">Riconoscimento percorso radio supervisione chiamata</string>
+	<string name="tone_prop_ack">Riconoscimento positivo</string>
+	<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="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">Mostra metadati</string>
-	<string name="show_meta_data_summary">Mostra dati aggiuntivi sul codice a barre scansionato.</string>
-	<string name="show_hex_dump">Mostra dump esadecimale</string>
-	<string name="show_hex_dump_summary">Mostra un dump esadecimale dei contenuti scansionati.</string>
-	<string name="close_automatically">Vai indietro dopo la Copia/Condivisione</string>
-	<string name="close_automatically_summary">Ritorna automaticamente alla schermata di scansione dopo aver copiato o condiviso i contenuti letti.</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_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="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="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>
-	<string name="clear_network_suggestions_summary">Rimuovi tutti i suggerimenti di rete precedentemente forniti da questa app.</string>
-	<string name="really_remove_all_networks">Rimuovere davvero tutte le reti?</string>
+	<string name="clear_network_suggestions_summary">Cancella tutti i suggerimenti di rete precedentemente forniti da questa app.</string>
+	<string name="really_remove_all_networks">Vuoi rimuovere tutte le reti?</string>
 	<string name="clear_network_suggestions_success">Suggerimenti di rete cancellati</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Niente da rimuovere</string>
 	<string name="send_category">Inoltro</string>
@@ -103,27 +119,27 @@
 	<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">GET e aggiungi il contenuto</string>
-	<string name="send_type_get_query_string">GET con stringa completa della 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_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>
-	<string name="test_url">Test URL</string>
-	<string name="really_remove_scan">Vuoi veramente rimuovere la scansione?</string>
-	<string name="really_remove_all_scans">Vuoi veramente rimuovere tutte le scansioni?</string>
-	<string name="really_remove_selected_scans">Vuoi veramente rimuovere le scansioni selezionate?</string>
-	<string name="clear_history">Pulisci cronologia</string>
+	<string name="test_url">Prova URL</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="remove_scan">Rimuovi scansione</string>
 	<string name="enter_name">Inserisci un nome per descrivere la scansione</string>
-	<string name="enter_name_hint">Nome della scansione</string>
+	<string name="enter_name_hint">Nome scansione</string>
 	<string name="no_barcode_found">Nessun codice a barre trovato</string>
 	<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">Salvare come file nei Download?</string>
-	<string name="file_name">Nome del file</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>
 	<string name="connect_to_wifi">Connetti al WiFi</string>
@@ -143,13 +159,14 @@
 	<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">Esportare come?</string>
+	<string name="export_as">Come esportare?</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>
 	<string name="export_database">Database SQLite</string>
 	<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">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>
@@ -157,13 +174,15 @@
 	<string name="shortcut_preferences">Impostazioni</string>
 	<string name="background_request_failed">Richiesta in secondo piano fallita</string>
 	<string name="entry_type">Tipo</string>
-	<string name="wifi_network">Rete Wi-Fi</string>
+	<string name="wifi_network">Rete WiFi</string>
 	<string name="wifi_ssid">Nome</string>
 	<string name="wifi_type">Tipo di autenticazione</string>
 	<string name="wifi_password">Password</string>
 	<string name="wifi_hidden">Rete nascosta</string>
-	<string name="wifi_eap">EAP method</string>
+	<string name="wifi_eap">Metodo EAP</string>
 	<string name="wifi_anonymous_identity">Identità anonima</string>
 	<string name="wifi_identity">Identità</string>
-	<string name="wifi_phase2">Metodo di fase 2</string>
+	<string name="wifi_phase2">Metodo fase 2</string>
+	<string name="network_suggestions">Suggerimenti di rete</string>
+	<string name="remove_suggestion">Cancella suggerimento</string>
 </resources>

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

@@ -14,15 +14,20 @@
 	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">背面と前面</string>
+	<string name="colors_black_on_white">白地に黒色</string>
+	<string name="colors_white_on_black">黒地に白色</string>
+	<string name="colors_black_on_transparent">透明に黒色</string>
+	<string name="colors_white_on_transparent">透明に白色</string>
+	<string name="sequence_size">配列寸法</string>
+	<string name="sequence_index">配列番号</string>
+	<string name="sequence_id">配列ID</string>
 	<string name="gtin_issue_number">発行番号</string>
 	<string name="gtin_country">製造国</string>
 	<string name="gtin_price">価格</string>
 	<string name="gtin_add_on">UPC/EAN 拡張型</string>
-	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="barcode_version_number">バージョン</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">フラッシュの切り替え</string>
 	<string name="error_flash">フラッシュの切り替えエラー</string>
 	<string name="share">共有</string>
@@ -75,6 +80,15 @@
 	<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">Enable this if you want your device to beep when a code is recognized.</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">一般的なビープ音</string>
+	<string name="tone_prop_beep2">一般的なダブルビープ音</string>
 	<string name="use_history">スキャン履歴を保存する</string>
 	<string name="use_history_summary">認識されたバーコードを端末に保存しておきます。</string>
 	<string name="ignore_consecutive_duplicates">重複を破棄する</string>
@@ -87,6 +101,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_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>
@@ -149,6 +165,7 @@
 	<string name="export_database">SQLiteデータベース</string>
 	<string name="saved_in_downloads">ダウンロードフォルダに保存されました</string>
 	<string name="rotate_image_cw">時計回りに回転</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">画像を選択して読み込み</string>
 	<string name="pick_code_to_scan">スキャンするバーコードを選択</string>
 	<string name="shortcut_decode">バーコードをスキャン</string>
@@ -161,8 +178,10 @@
 	<string name="wifi_type">認証方式</string>
 	<string name="wifi_password">パスワード</string>
 	<string name="wifi_hidden">非表示のネットワーク</string>
-	<string name="wifi_eap">EAP method</string>
+	<string name="wifi_eap">EAP方式</string>
 	<string name="wifi_anonymous_identity">Anonymous identity</string>
 	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="wifi_phase2">フェーズ2方式</string>
+	<string name="network_suggestions">ネットワークに関する提案</string>
+	<string name="remove_suggestion">提案の削除</string>
 </resources>

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

@@ -1,169 +1,188 @@
-<resources>
-	<string name="no_camera_no_fun">ამ აპლიკაციის გამოყენება შეუძლებელია კამერაზე ნებართვის მინიჭების გარეშე</string>
-	<string name="camera_error">კამერაზე წვდომის მოპოვება ვერ ხერხდება, გთხოვთ, კიდევ სცადეთ</string>
-	<string name="scan_code">შტრიხ-კოდის სკანირება</string>
-	<string name="compose_barcode">შტრიხ-კოდის შექმნა</string>
-	<string name="decode_barcode">შტრიხ-კოდის დეკოდირება</string>
-	<string name="content">ტექსტი</string>
-	<string name="binary_data">(ორობითი მონაცემები)</string>
-	<plurals name="barcode_info">
-		<item quantity="one">%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">Low (~7&#37; correction)</string>
-	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">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">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
-	<string name="toggle_flash">განათების ჩართვა</string>
-	<string name="error_flash">Error toggling flash</string>
-	<string name="share">გაზიარება</string>
-	<string name="share_as">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">ზომა პიქსელებში</string>
-	<string name="width_by_height">%1$d×%2$d</string>
-	<string name="input_content_here">შეიყვანეთ ტექსტი აქ</string>
-	<string name="encode">შექმნა"</string>
-	<string name="error_no_content">მონაცემები არაა</string>
-	<string name="error_encoding_barcode">შტრიხ-კოდის შექმნა შეუძლებელია</string>
-	<string name="view_barcode">შტრიხ-კოდის ნახვა</string>
-	<string name="info">ინფორმაცია</string>
-	<string name="switch_camera">კამერის გადართვა</string>
-	<string name="bulk_mode">სკანირება უწყვეტად</string>
-	<string name="bulk_mode_summary">Always start scanning continuously.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="restrict_format">Restrict format</string>
-	<string name="remove_restriction">Remove restriction</string>
-	<string name="scan_format">Scan %s</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
-	<string name="history">ისტორია</string>
-	<string name="preferences">პარამეტრები</string>
-	<string name="scan_category">სკანირება</string>
-	<string name="content_category">კონტენტი</string>
-	<string name="locale_category">Language</string>
-	<string name="custom_locale">Custom language</string>
-	<string name="follow_system_settings">Follow system settings</string>
-	<string name="show_crop_handle">სკანირების არეალის ჩვენება</string>
-	<string name="show_crop_handle_summary">სკანირების შეზღუდვა შერჩეული არეალით.</string>
-	<string name="barcode_formats">Barcode formats</string>
-	<string name="zoom_by_swiping">მასშტაბირება თითის მოძრაობით მაღლა/დაბლა</string>
-	<string name="zoom_by_swiping_summary">გაატარეთ თითი მაღლა ან დაბლა კამერის მასშტაბირების სამართავად.</string>
-	<string name="auto_rotate">1D ვერტიკალური შტრიხ-კოდების ამოცნობა</string>
-	<string name="auto_rotate_summary">კამერის ავტომატური შეტრიალება  ვერტიკალური 1D შტრიხ-კოდების ამოსაცნობად. მოწყობილობიდან გამომდინარე, შესაძლოა იმოქმედოს წარმადობაზე.</string>
-	<string name="try_harder">წაკითხვის ოპტიმიზირება სიზუსტეზე და არა სისწრაფეზე</string>
-	<string name="try_harder_summary">ეს პარამეტრი ჩართეთ იმ შტრიხ-კოდებისთვის, რომელთა ამოცნობაც ძალიან ძნელია. მოქმედებს წარმადობაზე.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
-	<string name="vibrate">ვიბრირება პოვნისას</string>
-	<string name="vibrate_summary">ჩართეთ ეს პარამეტრი, თუ გსურთ მოწყობილობის ვიბრირება,როდესაც შტრიხ-კოდი ამოცნობილი იქნება.</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="open_immediately">შემოწმების გამოტოვება და მყისიერი გახსნა</string>
-	<string name="open_immediately_summary">შემოწმების გამოტოვება და მყისიერი გახსნა. შესაძლოა გამოიწვიოს არასასარგებლო კონტენტის ჩვენება.</string>
-	<string name="copy_immediately">გაცვლის ბუფერში ავტომატური კოპირება</string>
-	<string name="copy_immediately_summary">სკანირებული შტრიხ-კოდის კონტენტის ავტომატური კოპირება გაცვლის ბუფერში. გთხოვთ გაითვალისწინოთ,ზოგიერთ პროგრამას შესაძლოა ჰქონდეს ფონური წვდომა გაცვლის ბუფერთან.</string>
-	<string name="show_meta_data">მეტამონაცემების ჩვენება</string>
-	<string name="show_meta_data_summary">სკანირებულ შტრიხ-კოდებზე დამატებითი ინფორმაციის ჩვენება.</string>
-	<string name="show_hex_dump">თექვსმეტობითი dump-ის ჩვენება</string>
-	<string name="show_hex_dump_summary">სკანირებული შტრიხ-კოდის კონტენტის თექვსმეტობითი dump-ის ჩვენება.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
-	<string name="open_with_url">უცნობი მონაცემების ამ ბმულის საშუალებით გახსნა</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
-	<string name="really_remove_all_networks">Really remove all networks?</string>
-	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
-	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
-	<string name="send_category">გადაგზავნა</string>
-	<string name="send_scan_active">Forward scans</string>
-	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
-	<string name="send_scan_url">ყოველი სკანირებული შტრიხ-კოდის ბმულის საშუალებით გახსნა</string>
-	<string name="send_scan_type">მოთხოვნის ტიპი ყოველი სკანირებული შტრიხ-კოდისთვის</string>
-	<string name="send_type_get_add_content">GET კონტენტის დამატებით</string>
-	<string name="send_type_get_query_string">GET მოთხოვნის სრული პარამეტრებით</string>
-	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
-	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
-	<string name="test_url">Test URL</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="remove_scan">სკანირების წაშლა</string>
-	<string name="enter_name">მიანიჭეთ სახელი სკანირებას</string>
-	<string name="enter_name_hint">სკანირების სახელი</string>
-	<string name="no_barcode_found">შტრიხ-კოდი ვერ მოიძებნა</string>
-	<string name="pick_list_separator">რითი გავყოთ სიის ელემენტები?</string>
-	<string name="separator_line_break">ხაზის გამყოფი</string>
-	<string name="separator_ruler">ჰორიზონტალური ხაზი</string>
-	<string name="save_as_file_name">ფაილის შენახვა როგორც</string>
-	<string name="file_name">ფაილის სახელი</string>
-	<string name="error_saving_file">ფაილის შენახვა ვერ ხერხდება</string>
-	<string name="error_file_exists">ფაილი უკვე არსებობს</string>
-	<string name="connect_to_wifi">დაკავშირება WiFi-სთან</string>
-	<string name="wifi_config_failed">WiFi კონფიგურაცია ვერ მოხერხდა</string>
-	<string name="wifi_added">WiFi დამატებულია</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="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="pick_file">აირჩიეთ ფაილი გამოსახულებით</string>
-	<string name="pick_code_to_scan">აირჩიეთ შტრიხ-კოდი სკანირებისთვის</string>
-	<string name="shortcut_decode">შტრიხ-კოდის სკანირება</string>
-	<string name="shortcut_encode">შტრიხ-კოდის შექმნა</string>
-	<string name="shortcut_preferences">პარამეტრები</string>
-	<string name="background_request_failed">ფონური მოთხოვნა ვერ მოხერხდა</string>
-	<string name="entry_type">Type</string>
-	<string name="wifi_network">Wi-Fi network</string>
-	<string name="wifi_ssid">Name</string>
-	<string name="wifi_type">Authentication type</string>
-	<string name="wifi_password">Password</string>
-	<string name="wifi_hidden">Hidden network</string>
-	<string name="wifi_eap">EAP method</string>
-	<string name="wifi_anonymous_identity">Anonymous identity</string>
-	<string name="wifi_identity">Identity</string>
-	<string name="wifi_phase2">Phase 2 method</string>
-</resources>
+<resources>
+	<string name="no_camera_no_fun">ამ აპლიკაციის გამოყენება შეუძლებელია კამერაზე ნებართვის მინიჭების გარეშე</string>
+	<string name="camera_error">კამერაზე წვდომის მოპოვება ვერ ხერხდება, გთხოვთ, კიდევ სცადეთ</string>
+	<string name="scan_code">შტრიხ-კოდის სკანირება</string>
+	<string name="compose_barcode">შტრიხ-კოდის შექმნა</string>
+	<string name="decode_barcode">შტრიხ-კოდის დეკოდირება</string>
+	<string name="content">ტექსტი</string>
+	<string name="binary_data">(ორობითი მონაცემები)</string>
+	<plurals name="barcode_info">
+		<item quantity="one">%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">Low (~7&#37; correction)</string>
+	<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="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="gtin_issue_number">გამოშვების ნომერი</string>
+	<string name="gtin_country">შესაძლო მწარმოებელი ქვეყანა</string>
+	<string name="gtin_price">დაახლოებითი ფასი</string>
+	<string name="gtin_add_on">UPC EAN გაფართოება</string>
+	<string name="barcode_version_number">Version</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="toggle_flash">განათების ჩართვა</string>
+	<string name="error_flash">Error toggling flash</string>
+	<string name="share">გაზიარება</string>
+	<string name="share_as">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">ზომა პიქსელებში</string>
+	<string name="width_by_height">%1$d×%2$d</string>
+	<string name="input_content_here">შეიყვანეთ ტექსტი აქ</string>
+	<string name="encode">შექმნა"</string>
+	<string name="error_no_content">მონაცემები არაა</string>
+	<string name="error_encoding_barcode">შტრიხ-კოდის შექმნა შეუძლებელია</string>
+	<string name="view_barcode">შტრიხ-კოდის ნახვა</string>
+	<string name="info">ინფორმაცია</string>
+	<string name="switch_camera">კამერის გადართვა</string>
+	<string name="bulk_mode">სკანირება უწყვეტად</string>
+	<string name="bulk_mode_summary">Always start scanning continuously.</string>
+	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
+	<string name="quarter_second">A quarter second</string>
+	<string name="half_second">Half a second</string>
+	<string name="a_second">One second</string>
+	<string name="two_seconds">Two seconds</string>
+	<string name="five_seconds">Five seconds</string>
+	<string name="history">ისტორია</string>
+	<string name="preferences">პარამეტრები</string>
+	<string name="scan_category">სკანირება</string>
+	<string name="content_category">კონტენტი</string>
+	<string name="locale_category">Language</string>
+	<string name="custom_locale">Custom language</string>
+	<string name="follow_system_settings">Follow system settings</string>
+	<string name="show_crop_handle">სკანირების არეალის ჩვენება</string>
+	<string name="show_crop_handle_summary">სკანირების შეზღუდვა შერჩეული არეალით.</string>
+	<string name="barcode_formats">Barcode formats</string>
+	<string name="zoom_by_swiping">მასშტაბირება თითის მოძრაობით მაღლა/დაბლა</string>
+	<string name="zoom_by_swiping_summary">გაატარეთ თითი მაღლა ან დაბლა კამერის მასშტაბირების სამართავად.</string>
+	<string name="auto_rotate">1D ვერტიკალური შტრიხ-კოდების ამოცნობა</string>
+	<string name="auto_rotate_summary">კამერის ავტომატური შეტრიალება  ვერტიკალური 1D შტრიხ-კოდების ამოსაცნობად. მოწყობილობიდან გამომდინარე, შესაძლოა იმოქმედოს წარმადობაზე.</string>
+	<string name="try_harder">წაკითხვის ოპტიმიზირება სიზუსტეზე და არა სისწრაფეზე</string>
+	<string name="try_harder_summary">ეს პარამეტრი ჩართეთ იმ შტრიხ-კოდებისთვის, რომელთა ამოცნობაც ძალიან ძნელია. მოქმედებს წარმადობაზე.</string>
+	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
+	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="vibrate">ვიბრირება პოვნისას</string>
+	<string name="vibrate_summary">ჩართეთ ეს პარამეტრი, თუ გსურთ მოწყობილობის ვიბრირება,როდესაც შტრიხ-კოდი ამოცნობილი იქნება.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
+	<string name="use_history">სკანირების ისტორიის შენახვა</string>
+	<string name="use_history_summary">ამოცნობილი შტრიხ-კოდების მოწყობილობაზე შენახვა.</string>
+	<string name="ignore_consecutive_duplicates">არ შევინახოთ შემდგომი ასლები</string>
+	<string name="ignore_consecutive_duplicates_summary">არ შევინახოთ შემდგომი ასლები სკანირების ისტორიაში.</string>
+	<string name="open_immediately">შემოწმების გამოტოვება და მყისიერი გახსნა</string>
+	<string name="open_immediately_summary">შემოწმების გამოტოვება და მყისიერი გახსნა. შესაძლოა გამოიწვიოს არასასარგებლო კონტენტის ჩვენება.</string>
+	<string name="copy_immediately">გაცვლის ბუფერში ავტომატური კოპირება</string>
+	<string name="copy_immediately_summary">სკანირებული შტრიხ-კოდის კონტენტის ავტომატური კოპირება გაცვლის ბუფერში. გთხოვთ გაითვალისწინოთ,ზოგიერთ პროგრამას შესაძლოა ჰქონდეს ფონური წვდომა გაცვლის ბუფერთან.</string>
+	<string name="show_meta_data">მეტამონაცემების ჩვენება</string>
+	<string name="show_meta_data_summary">სკანირებულ შტრიხ-კოდებზე დამატებითი ინფორმაციის ჩვენება.</string>
+	<string name="show_hex_dump">თექვსმეტობითი dump-ის ჩვენება</string>
+	<string name="show_hex_dump_summary">სკანირებული შტრიხ-კოდის კონტენტის თექვსმეტობითი dump-ის ჩვენება.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="close_automatically">Go back after Copy/Share</string>
+	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
+	<string name="default_search_engine">Open unknown data in</string>
+	<string name="always_ask">Always ask</string>
+	<string name="open_with_url">უცნობი მონაცემების ამ ბმულის საშუალებით გახსნა</string>
+	<string name="clear_network_suggestions">Remove network suggestions</string>
+	<string name="clear_network_suggestions_summary">Remove network suggestions that were previously added with this app.</string>
+	<string name="really_remove_all_networks">Really remove all networks?</string>
+	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="send_category">გადაგზავნა</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_url">ყოველი სკანირებული შტრიხ-კოდის ბმულის საშუალებით გახსნა</string>
+	<string name="send_scan_type">მოთხოვნის ტიპი ყოველი სკანირებული შტრიხ-კოდისთვის</string>
+	<string name="send_type_get_add_content">GET კონტენტის დამატებით</string>
+	<string name="send_type_get_query_string">GET მოთხოვნის სრული პარამეტრებით</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="test_url">Test URL</string>
+	<string name="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="remove_scan">სკანირების წაშლა</string>
+	<string name="enter_name">მიანიჭეთ სახელი სკანირებას</string>
+	<string name="enter_name_hint">სკანირების სახელი</string>
+	<string name="no_barcode_found">შტრიხ-კოდი ვერ მოიძებნა</string>
+	<string name="pick_list_separator">რითი გავყოთ სიის ელემენტები?</string>
+	<string name="separator_line_break">ხაზის გამყოფი</string>
+	<string name="separator_ruler">ჰორიზონტალური ხაზი</string>
+	<string name="save_as_file_name">ფაილის შენახვა როგორც</string>
+	<string name="file_name">ფაილის სახელი</string>
+	<string name="error_saving_file">ფაილის შენახვა ვერ ხერხდება</string>
+	<string name="error_file_exists">ფაილი უკვე არსებობს</string>
+	<string name="connect_to_wifi">დაკავშირება WiFi-სთან</string>
+	<string name="wifi_config_failed">WiFi კონფიგურაცია ვერ მოხერხდა</string>
+	<string name="wifi_added">WiFi დამატებულია</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="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">Toggle free rotation</string>
+	<string name="pick_file">აირჩიეთ ფაილი გამოსახულებით</string>
+	<string name="pick_code_to_scan">აირჩიეთ შტრიხ-კოდი სკანირებისთვის</string>
+	<string name="shortcut_decode">შტრიხ-კოდის სკანირება</string>
+	<string name="shortcut_encode">შტრიხ-კოდის შექმნა</string>
+	<string name="shortcut_preferences">პარამეტრები</string>
+	<string name="background_request_failed">ფონური მოთხოვნა ვერ მოხერხდა</string>
+	<string name="entry_type">Type</string>
+	<string name="wifi_network">Wi-Fi network</string>
+	<string name="wifi_ssid">Name</string>
+	<string name="wifi_type">Authentication type</string>
+	<string name="wifi_password">Password</string>
+	<string name="wifi_hidden">Hidden network</string>
+	<string name="wifi_eap">EAP method</string>
+	<string name="wifi_anonymous_identity">Anonymous identity</string>
+	<string name="wifi_identity">Identity</string>
+	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
+</resources>

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

@@ -0,0 +1,188 @@
+<resources>
+	<string name="no_camera_no_fun">This app does not make any sense without camera access. Good bye.</string>
+	<string name="camera_error">카메라를 접근할 수 없습니다. 다시 시도하세요</string>
+	<string name="scan_code">Scan code</string>
+	<string name="compose_barcode">Compose barcode</string>
+	<string name="decode_barcode">Decode barcode</string>
+	<string name="content">Content</string>
+	<string name="binary_data">(binary data)</string>
+	<plurals name="barcode_info">
+		<item quantity="one">%2$d character, %1$s</item>
+		<item quantity="other">%2$d characters, %1$s</item>
+	</plurals>
+	<string name="error_correction_level">Error correction level</string>
+	<string name="error_correction_level_l" formatted="false">Low (~7&#37; correction)</string>
+	<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="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="gtin_issue_number">이슈번호</string>
+	<string name="gtin_country">Possible country of manufacture</string>
+	<string name="gtin_price">Suggested price</string>
+	<string name="gtin_add_on">UPC EAN extension</string>
+	<string name="barcode_version_number">버전</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="toggle_flash">Toggle flash</string>
+	<string name="error_flash">Error toggling flash</string>
+	<string name="share">Share</string>
+	<string name="share_as">Share as?</string>
+	<string name="copy_to_clipboard">Copy to clipboard</string>
+	<string name="copied_to_clipboard">Copied to clipboard</string>
+	<string name="copy_password">Copy password into clipboard</string>
+	<string name="copied_password_to_clipboard">Password copied to clipboard</string>
+	<string name="open_url">Open url</string>
+	<string name="cannot_resolve_action">No application can open that</string>
+	<string name="pick_search_engine">Pick a search engine</string>
+	<string name="format">Format</string>
+	<string name="size">Size in pixels</string>
+	<string name="width_by_height">%1$d×%2$d</string>
+	<string name="input_content_here">Input content here</string>
+	<string name="encode">ENCODE</string>
+	<string name="error_no_content">Missing content</string>
+	<string name="error_encoding_barcode">Barcode cannot be generated</string>
+	<string name="view_barcode">View barcode</string>
+	<string name="info">Info</string>
+	<string name="switch_camera">Switch camera</string>
+	<string name="bulk_mode">Scan continuously</string>
+	<string name="bulk_mode_summary">Always start scanning continuously.</string>
+	<string name="bulk_mode_delay">Delay between continuous scans</string>
+	<string name="restrict_format">Restrict format</string>
+	<string name="remove_restriction">Remove restriction</string>
+	<string name="scan_format">Scan %s</string>
+	<string name="quarter_second">A quarter second</string>
+	<string name="half_second">Half a second</string>
+	<string name="a_second">One second</string>
+	<string name="two_seconds">Two seconds</string>
+	<string name="five_seconds">Five seconds</string>
+	<string name="history">History</string>
+	<string name="preferences">Preferences</string>
+	<string name="scan_category">Scan</string>
+	<string name="content_category">Content</string>
+	<string name="locale_category">Language</string>
+	<string name="custom_locale">Custom language</string>
+	<string name="follow_system_settings">Follow system settings</string>
+	<string name="show_crop_handle">Show cropping limiter</string>
+	<string name="show_crop_handle_summary">Restrict scanning to a customizable region.</string>
+	<string name="barcode_formats">Barcode formats</string>
+	<string name="zoom_by_swiping">Swipe up/down to zoom</string>
+	<string name="zoom_by_swiping_summary">Swipe up or down in camera screen to control the camera zoom.</string>
+	<string name="auto_rotate">Recognize vertical 1D barcodes</string>
+	<string name="auto_rotate_summary">Automatically rotate the camera frame to recognize vertical 1D barcodes. Depending on the device, this may affect performance.</string>
+	<string name="try_harder">Optimize reader for accuracy</string>
+	<string name="try_harder_summary">Enable this option for very hard to read codes. Will affect performance.</string>
+	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
+	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="vibrate">Vibrate on detection</string>
+	<string name="vibrate_summary">Enable this if you want your device to vibrate when a code is recognized.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
+	<string name="use_history">Save scan history</string>
+	<string name="use_history_summary">Save recognized codes on your device.</string>
+	<string name="ignore_consecutive_duplicates">Ignore duplicates</string>
+	<string name="ignore_consecutive_duplicates_summary">Do not save consecutive duplicates in the scan history.</string>
+	<string name="open_immediately">Open immediately</string>
+	<string name="open_immediately_summary">Skip inspection and open contents immediately. May open harmful content if enabled.</string>
+	<string name="copy_immediately">Put into clipboard</string>
+	<string name="copy_immediately_summary">Automatically copy scanned contents into clipboard. Please note that other apps may snoop on your clipboard in the background.</string>
+	<string name="show_meta_data">Show metadata</string>
+	<string name="show_meta_data_summary">Show additional data about the scanned barcode.</string>
+	<string name="show_hex_dump">Show hex dump</string>
+	<string name="show_hex_dump_summary">Show a hex dump of the scanned contents.</string>
+	<string name="show_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="close_automatically">Go back after Copy/Share</string>
+	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
+	<string name="default_search_engine">Open unknown data in</string>
+	<string name="always_ask">Always ask</string>
+	<string name="open_with_url">Open unknown data with URL</string>
+	<string name="clear_network_suggestions">Remove network suggestions</string>
+	<string name="clear_network_suggestions_summary">Remove network suggestions that were previously added with this app.</string>
+	<string name="really_remove_all_networks">Really remove all networks?</string>
+	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
+	<string name="send_category">Forwarding</string>
+	<string name="send_scan_active">Forward scans</string>
+	<string name="send_scan_active_summary">Enable to forward scans to a the given URL.</string>
+	<string name="send_scan_url">URL to forward to</string>
+	<string name="send_scan_type">Request type</string>
+	<string name="send_type_get_add_content">GET and simply add content</string>
+	<string name="send_type_get_query_string">GET with complete query string</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
+	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="test_url">Test URL</string>
+	<string name="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="remove_scan">Remove scan</string>
+	<string name="enter_name">Enter a name to describe the scan</string>
+	<string name="enter_name_hint">Name of the scan</string>
+	<string name="no_barcode_found">No barcode found</string>
+	<string name="pick_list_separator">How to separate list items?</string>
+	<string name="separator_line_break">Line break</string>
+	<string name="separator_ruler">Ruler</string>
+	<string name="save_as_file_name">Save as in Downloads file?</string>
+	<string name="file_name">File name</string>
+	<string name="error_saving_file">Cannot save file</string>
+	<string name="error_file_exists">File already exists</string>
+	<string name="connect_to_wifi">Connect to WiFi</string>
+	<string name="wifi_config_failed">Could not configure WiFi</string>
+	<string name="wifi_added">WiFi added</string>
+	<string name="sms_send">Send SMS</string>
+	<string name="sms_error">Could not send SMS</string>
+	<string name="tel_dial">Dial number</string>
+	<string name="tel_error">Could not dial number</string>
+	<string name="mail_send">Send mail</string>
+	<string name="mail_error">Could not send mail</string>
+	<string name="vcard_add">Add to contacts</string>
+	<string name="vcard_failed">Could not add to contacts</string>
+	<string name="vevent_add">Add to calendar</string>
+	<string name="vevent_failed">Could not add to calendar</string>
+	<string name="otpauth_add">Add 2FA</string>
+	<string name="search_web">Search the web</string>
+	<string name="search_scan">Search scan</string>
+	<string name="export_to_file">Export to file</string>
+	<string name="export_as">Export as?</string>
+	<string name="export_csv_comma">CSV file with commas</string>
+	<string name="export_csv_semicolon">CSV file with semicolons</string>
+	<string name="export_json">JSON file</string>
+	<string name="export_database">SQLite database</string>
+	<string name="saved_in_downloads">Saved in downloads</string>
+	<string name="rotate_image_cw">Rotate image clockwise</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
+	<string name="pick_file">Pick image file</string>
+	<string name="pick_code_to_scan">Pick code to scan</string>
+	<string name="shortcut_decode">Scan a barcode</string>
+	<string name="shortcut_encode">Create a barcode</string>
+	<string name="shortcut_preferences">Settings</string>
+	<string name="background_request_failed">Background request failed</string>
+	<string name="entry_type">Type</string>
+	<string name="wifi_network">Wi-Fi network</string>
+	<string name="wifi_ssid">Name</string>
+	<string name="wifi_type">Authentication type</string>
+	<string name="wifi_password">Password</string>
+	<string name="wifi_hidden">Hidden network</string>
+	<string name="wifi_eap">EAP method</string>
+	<string name="wifi_anonymous_identity">Anonymous identity</string>
+	<string name="wifi_identity">Identity</string>
+	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
+</resources>

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

@@ -15,6 +15,11 @@
 	<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="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>
@@ -23,7 +28,7 @@
 	<string name="gtin_price">Adviesprijs</string>
 	<string name="gtin_add_on">UPC EAN extensie</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Zaklamp aan/uit</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Delen</string>
@@ -76,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Kort de gescande gegevens tonen bij continu scannen.</string>
 	<string name="vibrate">Trillen bij herkennen</string>
 	<string name="vibrate_summary">Schakel dit in als u wilt dat uw toestel trilt wanneer een code wordt herkend.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Scancodes bewaren</string>
 	<string name="use_history_summary">Bewaar herkende codes op je toestel.</string>
 	<string name="ignore_consecutive_duplicates">Duplicaten negeren</string>
@@ -88,6 +102,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_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>
 	<string name="close_automatically_summary">Automatisch terugkeren naar het scanscherm na het kopiëren of delen van de gelezen inhoud.</string>
 	<string name="default_search_engine">Onbekende data openen in</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">SQLite database</string>
 	<string name="saved_in_downloads">Opgeslagen in downloads</string>
 	<string name="rotate_image_cw">Afbeelding rechtsom draaien</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Beeldbestand kiezen</string>
 	<string name="pick_code_to_scan">Kies code om te scannen</string>
 	<string name="shortcut_decode">Een barcode scannen</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">Anonieme identiteit</string>
 	<string name="wifi_identity">Identiteit</string>
 	<string name="wifi_phase2">Phase 2 methode</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -30,6 +30,11 @@
 	<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>
@@ -46,6 +51,7 @@
 	<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="enter_name_hint">Nazwa skanu</string>
 	<string name="camera_error">Nie można uzyskać dostępu do kamery, spróbuj ponownie</string>
@@ -60,6 +66,8 @@
 	<string name="binary_data">(dane binarne)</string>
 	<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="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>
@@ -91,6 +99,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="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>
@@ -134,7 +151,7 @@
 	<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="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="gtin_country">Możliwy kraj produkcji</string>
 	<string name="encode">ZAKODUJ</string>
 	<string name="error_no_content">Brak zawartości</string>
@@ -162,4 +179,6 @@
 	<string name="wifi_anonymous_identity">Anonimowa tożsamość</string>
 	<string name="wifi_identity">Tożsamość</string>
 	<string name="wifi_phase2">Metoda fazy 2</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -1,7 +1,7 @@
 <resources>
-	<string name="no_camera_no_fun">Infelizmente você não poderá usar este app sem conceder o acesso à câmera.</string>
+	<string name="no_camera_no_fun">Infelizmente você não poderá usar este app sem conceder acesso à câmera.</string>
 	<string name="camera_error">Não foi possível acessar a câmera, por favor tente novamente</string>
-	<string name="scan_code">Escaneie código</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="content">Conteúdo</string>
@@ -15,33 +15,38 @@
 	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</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="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$d (%2$d modules)</string>
-	<string name="toggle_flash">Ativar lanterna</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
+	<string name="toggle_flash">Ligar lanterna</string>
 	<string name="error_flash">Falha ao ligar a lanterna</string>
-	<string name="share">Compartilhar</string>
+	<string name="share">Compartilhe</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 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="cannot_resolve_action">Nenhum app pode abrir isto</string>
+	<string name="cannot_resolve_action">Nenhum app consegue abrir isto</string>
 	<string name="pick_search_engine">Escolha site de busca</string>
 	<string name="format">Formato</string>
 	<string name="size">Tamanho em píxeis</string>
 	<string name="width_by_height">%1$d×%2$d</string>
-	<string name="input_content_here">Digite conteúdo aqui</string>
+	<string name="input_content_here">Digite algum conteúdo aqui</string>
 	<string name="encode">CODIFICAR</string>
-	<string name="error_no_content">Conteúdo indisponível</string>
-	<string name="error_encoding_barcode">Não foi possível gerar o código</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>
@@ -53,9 +58,9 @@
 	<string name="scan_format">Escanear %s</string>
 	<string name="quarter_second">Um quarto de segundo</string>
 	<string name="half_second">Meio segundo</string>
-	<string name="a_second">Um segundo</string>
-	<string name="two_seconds">Dois segundos</string>
-	<string name="five_seconds">Cinco segundos</string>
+	<string name="a_second">1 segundo</string>
+	<string name="two_seconds">2 segundos</string>
+	<string name="five_seconds">5 segundos</string>
 	<string name="history">Histórico</string>
 	<string name="preferences">Preferências</string>
 	<string name="scan_category">Digitalização</string>
@@ -65,37 +70,48 @@
 	<string name="follow_system_settings">Adaptar 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">Tipos de código</string>
+	<string name="barcode_formats">Tipo de código</string>
 	<string name="zoom_by_swiping">Deslize para ajustar 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="try_harder">Otimizar o leitor para precisão</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_summary">Ative esta opção se quiser que seu dispositivo vibre quando um código for reconhecido.</string>
-	<string name="use_history">Salvar histórico de digitalizações</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 bip ao reconhecer um código.</string>
+	<string name="beep_tone">Sinal sonoro</string>
+	<string name="tone_cdma_confirm">Confirmação do CDMA</string>
+	<string name="tone_sup_confirm">Solicitar confirmação de controle</string>
+	<string name="tone_sup_radio_ack">Solicitar confirmação do caminho de rádio</string>
+	<string name="tone_prop_ack">Reconhecimento positivo</string>
+	<string name="tone_prop_beep">Bip geral</string>
+	<string name="tone_prop_beep2">Bip duplo geral</string>
+	<string name="use_history">Ativar histórico de digitalizações</string>
 	<string name="use_history_summary">Salve códigos reconhecidos no seu 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="open_immediately">Abrir imediatamente</string>
-	<string name="open_immediately_summary">Pular a inspeção e abrir o conteúdo no mesmo instante. Quando ativado, pode abrir conteúdo perigoso.</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 o conteúdo digitalizado. Tem cuidado porque outros apps podem examinar seu clipboard em segundo plano.</string>
+	<string name="copy_immediately_summary">Copiar automaticamente um conteúdo digitalizado ao clipboard. Tem cuidado porque outros apps podem examinar seu clipboard 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 a impressão hexadecimal do conteúdo digitalizado.</string>
+	<string name="show_hex_dump_summary">Mostrar impressão hexadecimal de conteúdo digitalizado.</string>
+	<string name="show_recreation">Mostrar código recriado</string>
+	<string name="show_recreation_summary">Se possível, recriar e mostrar código de 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 o código examinado.</string>
+	<string name="close_automatically_summary">Voltar automaticamente à tela de digitalização após copiar ou compartilhar um código examinado.</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">Remover sugestões da rede</string>
 	<string name="clear_network_suggestions_summary">Remover todas as sugestões da rede que foram anteriormente fornecidas pelo app.</string>
-	<string name="really_remove_all_networks">Realmente remover todas as redes?</string>
+	<string name="really_remove_all_networks">Deseja remover todas as redes?</string>
 	<string name="clear_network_suggestions_success">Sugestões da rede foram removidas</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nada para remover</string>
 	<string name="send_category">Encaminhamento</string>
@@ -103,20 +119,20 @@
 	<string name="send_scan_active_summary">Ative para encaminhar conteúdo digitalizado à URL definida</string>
 	<string name="send_scan_url">URL à qual encaminhar</string>
 	<string name="send_scan_type">Tipo de solicitação</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 da consulta</string>
+	<string name="send_type_get_add_content">GET e somente adicionar um 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="really_remove_scan">Realmente quer remover esta digitalização?</string>
-	<string name="really_remove_all_scans">Realmente quer remover todas as digitalizações?</string>
-	<string name="really_remove_selected_scans">Realmente remover digitalizações selecionados?</string>
+	<string name="really_remove_scan">Deseja remover esta digitalização?</string>
+	<string name="really_remove_all_scans">Deseja remover todas as digitalizações?</string>
+	<string name="really_remove_selected_scans">Deseja remover digitalizações selecionados?</string>
 	<string name="clear_history">Limpar histórico</string>
 	<string name="copy_scan">Copiar digitalização</string>
 	<string name="edit_scan">Editar identificação</string>
 	<string name="remove_scan">Remover digitalização</string>
-	<string name="enter_name">Digite nome para identificar a digitalização</string>
+	<string name="enter_name">Digite nome para identificar esta digitalização</string>
 	<string name="enter_name_hint">Nome da digitalização</string>
 	<string name="no_barcode_found">Nenhum código encontrado</string>
 	<string name="pick_list_separator">Como separar itens da lista?</string>
@@ -124,24 +140,24 @@
 	<string name="separator_ruler">Régua</string>
 	<string name="save_as_file_name">Salvar para Downloads?</string>
 	<string name="file_name">Nome do arquivo</string>
-	<string name="error_saving_file">Não foi possível salvar o arquivo</string>
+	<string name="error_saving_file">Não foi possível salvar este arquivo</string>
 	<string name="error_file_exists">Arquivo já existe</string>
-	<string name="connect_to_wifi">Conectar via WiFi</string>
+	<string name="connect_to_wifi">Conectar a WiFi</string>
 	<string name="wifi_config_failed">Não foi possível configurar WiFi</string>
 	<string name="wifi_added">WiFi adicionado</string>
 	<string name="sms_send">Envie 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_error">Não foi possível discar o 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 o e-mail</string>
+	<string name="mail_error">Não foi possível enviar este 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">Pesquisar na internet</string>
-	<string name="search_scan">Pesquisar em conteúdo já digitalizado</string>
+	<string name="search_web">Buscar na internet</string>
+	<string name="search_scan">Buscar em digitalizações feitas</string>
 	<string name="export_to_file">Exportar para arquivo</string>
 	<string name="export_as">Exportar em qual formato?</string>
 	<string name="export_csv_comma">Arquivo CSV com vírgulas</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">Base de dados SQLite</string>
 	<string name="saved_in_downloads">Salvo em 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">Escolha imagem</string>
 	<string name="pick_code_to_scan">Escolha código para digitalizar</string>
 	<string name="shortcut_decode">Escaneie código</string>
@@ -166,4 +183,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">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -17,6 +17,11 @@
 	<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="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>
@@ -25,7 +30,7 @@
 	<string name="gtin_price">Предположительная цена</string>
 	<string name="gtin_add_on">Расширение UPC EAN</string>
 	<string name="barcode_version_number">Версия</string>
-	<string name="qr_version_and_modules">%1$d (модули: %2$d)</string>
+	<string name="qr_version_and_modules">%1$s (модули: %2$d)</string>
 	<string name="toggle_flash">Включить вспышку</string>
 	<string name="error_flash">Ошибка при переключении вспышки</string>
 	<string name="share">Поделиться</string>
@@ -69,15 +74,24 @@
 	<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="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="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_consecutive_duplicates">Не хранить дубликаты</string>
@@ -90,13 +104,15 @@
 	<string name="show_meta_data_summary">Показывать дополнительную информацию о считанных штрих-кодах.</string>
 	<string name="show_hex_dump">Показывать шестнадцатеричный дамп</string>
 	<string name="show_hex_dump_summary">Показывать шестнадцатеричный дамп содержимого считанного штрих-кода.</string>
+	<string name="show_recreation">Показывать восстановленный штрих-код</string>
+	<string name="show_recreation_summary">Показывать штрих-код, восстановленный из считанного содержимого.</string>
 	<string name="close_automatically">Возврат после копирования/обмена</string>
 	<string name="close_automatically_summary">Автоматически возвращаться к экрану сканирования после копирования или передачу через функцию «Поделиться» считанного содержимого.</string>
 	<string name="default_search_engine">Поиск неизвестных данных в</string>
 	<string name="always_ask">Всегда спрашивать</string>
 	<string name="open_with_url">Открывать неизвестные данные по URL</string>
-	<string name="clear_network_suggestions">Очистить сетевые предложения</string>
-	<string name="clear_network_suggestions_summary">Удалить все сетевые предложения, ранее предложенные этим приложением.</string>
+	<string name="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>
@@ -152,6 +168,7 @@
 	<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_code_to_scan">Выберите штрих-код для сканирования</string>
 	<string name="shortcut_decode">Сканировать штрих-код</string>
@@ -168,4 +185,6 @@
 	<string name="wifi_anonymous_identity">Аноним</string>
 	<string name="wifi_identity">Пользователь</string>
 	<string name="wifi_phase2">Двухэтапный метод</string>
+	<string name="network_suggestions">Сетевые предложения</string>
+	<string name="remove_suggestion">Удалить предложение</string>
 </resources>

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

@@ -0,0 +1,30 @@
+<resources>
+	<string-array name="search_engines_names">
+		<item>@string/always_ask</item>
+		<item>Google</item>
+		<item>DuckDuckGo</item>
+		<item>Qwant</item>
+		<item>Bing</item>
+		<item>Yandex</item>
+		<item>ebay</item>
+		<item>Amazon</item>
+		<item>OpenFoodFacts.org</item>
+		<item>OpenBeautyFacts.org</item>
+		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
+	</string-array>
+	<string-array name="search_engines_values">
+		<item></item>
+		<item>https://www.google.com.tr/search?q=</item>
+		<item>https://duckduckgo.com/?q=</item>
+		<item>https://www.qwant.com/?q=</item>
+		<item>https://bing.com/?q=</item>
+		<item>https://yandex.com.tr/search/?text=</item>
+		<item>https://www.ebay.com/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.com.tr/s?k=</item>
+		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
+	</string-array>
+</resources>

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

@@ -15,17 +15,22 @@
 	<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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</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>
+	<string name="colors_black_on_transparent">Şeffaf üzerine siyah</string>
+	<string name="colors_white_on_transparent">Şeffaf üzerine beyaz</string>
+	<string name="sequence_size">Dizi boyutu</string>
+	<string name="sequence_index">Dizi indeksi</string>
+	<string name="sequence_id">Dizi kimliği</string>
 	<string name="gtin_issue_number">Basım sayısı</string>
 	<string name="gtin_country">Olası üretim yeri</string>
 	<string name="gtin_price">Önerilen fiyat</string>
 	<string name="gtin_add_on">UPC EAN eklentisi</string>
-	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</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="toggle_flash">Flaşı aç</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">Flaş açılırken hata oluştu</string>
 	<string name="share">Paylaş</string>
 	<string name="share_as">Şöyle paylaş:</string>
 	<string name="copy_to_clipboard">Panoya kopyala</string>
@@ -48,9 +53,9 @@
 	<string name="bulk_mode">Sürekli tara</string>
 	<string name="bulk_mode_summary">Her zaman sürekli taramaya başla.</string>
 	<string name="bulk_mode_delay">Sürekli taramalar arasındaki gecikme</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">Biçimi kısıtla</string>
+	<string name="remove_restriction">Kısıtlamayı kaldır</string>
+	<string name="scan_format">%s tara</string>
 	<string name="quarter_second">Çeyrek saniye</string>
 	<string name="half_second">Yarım saniye</string>
 	<string name="a_second">Bir saniye</string>
@@ -76,6 +81,15 @@
 	<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="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_consecutive_duplicates">Yinelemeleri göz ardı et</string>
@@ -88,6 +102,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_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>
 	<string name="close_automatically_summary">Okunan içeriği kopyaladıktan veya paylaştıktan sonra kendiliğinden tarama ekranına dön.</string>
 	<string name="default_search_engine">Bilinmeyen verileri şurada aç</string>
@@ -99,8 +115,8 @@
 	<string name="clear_network_suggestions_success">Ağ önerileri temizlendi</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Kaldırılacak bir şey yok</string>
 	<string name="send_category">Yönlendirme</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">Taramaları gönder</string>
+	<string name="send_scan_active_summary">Taramaları belirtilen URL\'ye göndermeyi etkinleştir</string>
 	<string name="send_scan_url">Her taramayı URL\'ye gönder</string>
 	<string name="send_scan_type">Her tarama için isteğin türü</string>
 	<string name="send_type_get_add_content">GET ve basitçe içeriği ekle</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">SQLite veri tabanı olarak dışa aktar</string>
 	<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">Görüntü dosyası seç</string>
 	<string name="pick_code_to_scan">Taranacak kod seç</string>
 	<string name="shortcut_decode">Barkod tara</string>
@@ -166,4 +183,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>
 </resources>

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

@@ -16,6 +16,11 @@
 	<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="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>
@@ -24,7 +29,7 @@
 	<string name="gtin_price">Рекомендована ціна</string>
 	<string name="gtin_add_on">Розширення UPC EAN</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Увімкнути спалах</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Поділитися</string>
@@ -77,6 +82,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Коротко показати відскановані дані під час безперервного сканування.</string>
 	<string name="vibrate">Вібрувати при виявленні</string>
 	<string name="vibrate_summary">Увімкніть це, якщо хочете, щоб пристрій вібрував, коли код розпізнано.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Зберігати історію сканування</string>
 	<string name="use_history_summary">Збережіть розпізнані коди на своєму пристрої.</string>
 	<string name="ignore_consecutive_duplicates">Ігнорувати дублікати</string>
@@ -89,6 +103,8 @@
 	<string name="show_meta_data_summary">Показувати додаткові дані про відскановані штрих-коди.</string>
 	<string name="show_hex_dump">Показувати шістнадцятковий дамп</string>
 	<string name="show_hex_dump_summary">Показувати шістнадцятковий дамп відсканованого вмісту.</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>
 	<string name="close_automatically_summary">Автоматично повернутися на екран сканування після копіювання або поширення прочитаного вмісту.</string>
 	<string name="default_search_engine">Відкривати невідомі дані в</string>
@@ -151,6 +167,7 @@
 	<string name="export_database">Експортувати базу даних SQLite</string>
 	<string name="saved_in_downloads">Збережено в Завантаженнях</string>
 	<string name="rotate_image_cw">Повернути зображення за годинниковою стрілкою</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Вибрати файл зображення</string>
 	<string name="pick_code_to_scan">Вибрати код для сканування</string>
 	<string name="shortcut_decode">Сканувати штрих-код</string>
@@ -167,4 +184,6 @@
 	<string name="wifi_anonymous_identity">Анонімна особа</string>
 	<string name="wifi_identity">Користувач</string>
 	<string name="wifi_phase2">Phase 2 метод</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -14,6 +14,11 @@
 	<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="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>
@@ -22,7 +27,7 @@
 	<string name="gtin_price">Giá được gợi ý</string>
 	<string name="gtin_add_on">Phần mở rộng UPC EAN</string>
 	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</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>
@@ -75,6 +80,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Hiện nhanh dữ liệu trong khi quét liên tục.</string>
 	<string name="vibrate">Rung khi xác định được mã</string>
 	<string name="vibrate_summary">Kích hoạt nếu bạn muốn máy của bạn rung khi nhận dạng được mã.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="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_consecutive_duplicates">Bỏ qua trùng lặp</string>
@@ -87,6 +101,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_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>
 	<string name="close_automatically_summary">Tự động quay trở về màn hình quét sao khi sao chép hoặc chia sẻ nội dung đọc được.</string>
 	<string name="default_search_engine">Mở dữ liệu không xác định bằng</string>
@@ -149,6 +165,7 @@
 	<string name="export_database">Cơ sở dữ liệu SQLite</string>
 	<string name="saved_in_downloads">Lưu vào Downloads</string>
 	<string name="rotate_image_cw">Quay ảnh theo chiều kim đồng hồ</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Chọn tệp ảnh</string>
 	<string name="pick_code_to_scan">Chọn mã để quét</string>
 	<string name="shortcut_decode">Quét mã vạch</string>
@@ -165,4 +182,6 @@
 	<string name="wifi_anonymous_identity">Anonymous identity</string>
 	<string name="wifi_identity">Identity</string>
 	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -10,19 +10,24 @@
 		<item quantity="other">%2$d 字符， %1$s</item>
 	</plurals>
 	<string name="error_correction_level">纠错级别</string>
-	<string name="error_correction_level_l" formatted="false">Low (~7&#37; 准确度)</string>
-	<string name="error_correction_level_m" formatted="false">Medium (~15&#37; 准确度)</string>
-	<string name="error_correction_level_q" formatted="false">Quartile (~25&#37; 准确度)</string>
-	<string name="error_correction_level_h" formatted="false">High (~30&#37; 准确度)</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">低 (~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="colors">前景和背景</string>
+	<string name="colors_black_on_white">白底黑字</string>
+	<string name="colors_white_on_black">黑底白字</string>
+	<string name="colors_black_on_transparent">透明底黑字</string>
+	<string name="colors_white_on_transparent">透明底白字</string>
+	<string name="sequence_size">序列大小</string>
+	<string name="sequence_index">序列索引</string>
+	<string name="sequence_id">序列 ID</string>
 	<string name="gtin_issue_number">发行编号</string>
 	<string name="gtin_country">可能产地</string>
 	<string name="gtin_price">建议价格</string>
 	<string name="gtin_add_on">UPC EAN 扩展</string>
 	<string name="barcode_version_number">版本</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">开关闪光灯</string>
 	<string name="error_flash">开关闪光灯出错</string>
 	<string name="share">分享</string>
@@ -75,6 +80,15 @@
 	<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="use_history">保存扫描历史</string>
 	<string name="use_history_summary">在本地保存扫描历史</string>
 	<string name="ignore_consecutive_duplicates">不保存重复历史</string>
@@ -87,6 +101,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_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>
@@ -148,7 +164,8 @@
 	<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="rotate_image_cw">顺时针旋转图片</string>
+	<string name="toggle_free_rotation">切换自由旋转</string>
 	<string name="pick_file">选择图片文件</string>
 	<string name="pick_code_to_scan">选择扫描编码</string>
 	<string name="shortcut_decode">扫描条码</string>
@@ -165,4 +182,6 @@
 	<string name="wifi_anonymous_identity">匿名身份</string>
 	<string name="wifi_identity">身份</string>
 	<string name="wifi_phase2">阶段 2 方法</string>
+	<string name="network_suggestions">网络建议</string>
+	<string name="remove_suggestion">删除建议</string>
 </resources>

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

@@ -12,19 +12,24 @@
 	<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">Quartile (~25&#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="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">前景和背景</string>
+	<string name="colors_black_on_white">白底黑字</string>
+	<string name="colors_white_on_black">黑底白字</string>
+	<string name="colors_black_on_transparent">透明底黑字</string>
+	<string name="colors_white_on_transparent">透明底白字</string>
+	<string name="sequence_size">序列大小</string>
+	<string name="sequence_index">序列索引</string>
+	<string name="sequence_id">序列 ID</string>
 	<string name="gtin_issue_number">發行編號</string>
 	<string name="gtin_country">可能製作國家</string>
 	<string name="gtin_price">建議價格</string>
 	<string name="gtin_add_on">UPC EAN 擴充</string>
-	<string name="barcode_version_number">Version</string>
-	<string name="qr_version_and_modules">%1$d (%2$d modules)</string>
+	<string name="barcode_version_number">版本</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">開關閃光燈</string>
-	<string name="error_flash">Error toggling flash</string>
+	<string name="error_flash">開關閃光燈時發生錯誤</string>
 	<string name="share">分享</string>
 	<string name="share_as">以何種方式分享?</string>
 	<string name="copy_to_clipboard">複製到剪貼簿</string>
@@ -47,9 +52,9 @@
 	<string name="bulk_mode">連續掃描</string>
 	<string name="bulk_mode_summary">始終開啟連續掃描。</string>
 	<string name="bulk_mode_delay">連續掃描間的延遲</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">限制格式</string>
+	<string name="remove_restriction">刪除限制</string>
+	<string name="scan_format">掃描 %s</string>
 	<string name="quarter_second">四分之一秒</string>
 	<string name="half_second">半秒</string>
 	<string name="a_second">一秒</string>
@@ -59,7 +64,7 @@
 	<string name="preferences">偏好設定</string>
 	<string name="scan_category">掃描</string>
 	<string name="content_category">內容</string>
-  <string name="locale_category">語言</string>
+	<string name="locale_category">語言</string>
 	<string name="custom_locale">設定語言</string>
 	<string name="follow_system_settings">跟隨系統設定</string>
 	<string name="show_crop_handle">顯示裁切範圍選擇器</string>
@@ -75,6 +80,15 @@
 	<string name="show_toast_in_bulk_mode_summary">連續掃描時簡要顯示掃描資料。</string>
 	<string name="vibrate">振動提示</string>
 	<string name="vibrate_summary">識別條碼時振動提示。</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">儲存掃描記錄</string>
 	<string name="use_history_summary">在本機儲存掃描記錄。</string>
 	<string name="ignore_consecutive_duplicates">不儲存重複歷史記錄</string>
@@ -87,6 +101,8 @@
 	<string name="show_meta_data_summary">顯示已掃描條碼的額外資訊。</string>
 	<string name="show_hex_dump">顯示 Hex dump</string>
 	<string name="show_hex_dump_summary">顯示已掃描條碼的 Hex dump。</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>
@@ -98,15 +114,15 @@
 	<string name="clear_network_suggestions_success">網路建議已清除</string>
 	<string name="clear_network_suggestions_nothing_to_remove">沒有什麼可以移除的</string>
 	<string name="send_category">轉發</string>
-	<string name="send_scan_active">Forward scans</string>
-	<string name="send_scan_active_summary">Enable to forward scans to a the given URL</string>
+	<string name="send_scan_active">轉發掃描</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>
 	<string name="send_type_get_query_string">GET 完整查詢資料</string>
 	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
 	<string name="send_type_post_json">POST application/json</string>
-	<string name="send_type_external_browser">Open in external browser</string>
+	<string name="send_type_external_browser">在外部瀏覽器中開啟</string>
 	<string name="test_url">測試 URL</string>
 	<string name="really_remove_scan">確定刪除記錄?</string>
 	<string name="really_remove_all_scans">確定刪除全部掃描記錄?</string>
@@ -146,9 +162,10 @@
 	<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="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_code_to_scan">選擇要掃描的條碼</string>
 	<string name="shortcut_decode">掃描條碼</string>
@@ -165,4 +182,6 @@
 	<string name="wifi_anonymous_identity">匿名身分</string>
 	<string name="wifi_identity">身分</string>
 	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -0,0 +1,8 @@
+<resources>
+	<string-array name="colors">
+		<item>@string/colors_black_on_white</item>
+		<item>@string/colors_white_on_black</item>
+		<item>@string/colors_black_on_transparent</item>
+		<item>@string/colors_white_on_transparent</item>
+	</string-array>
+</resources>

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

@@ -0,0 +1,16 @@
+<resources>
+	<string-array name="beep_tones_names">
+		<item>@string/tone_cdma_confirm</item>
+		<item>@string/tone_sup_radio_ack</item>
+		<item>@string/tone_prop_ack</item>
+		<item>@string/tone_prop_beep</item>
+		<item>@string/tone_prop_beep2</item>
+	</string-array>
+	<string-array name="beep_tones_values">
+		<item>tone_cdma_confirm</item>
+		<item>tone_sup_radio_ack</item>
+		<item>tone_prop_ack</item>
+		<item>tone_prop_beep</item>
+		<item>tone_prop_beep2</item>
+	</string-array>
+</resources>

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

@@ -6,9 +6,12 @@
 		<item>Qwant</item>
 		<item>Bing</item>
 		<item>Yandex</item>
+		<item>ebay</item>
+		<item>Amazon</item>
 		<item>OpenFoodFacts.org</item>
 		<item>OpenBeautyFacts.org</item>
 		<item>OpenPetFoodFacts.org</item>
+		<item>Barcode Lookup</item>
 	</string-array>
 	<string-array name="search_engines_values">
 		<item></item>
@@ -17,8 +20,11 @@
 		<item>https://www.qwant.com/?q=</item>
 		<item>https://bing.com/?q=</item>
 		<item>https://yandex.com/?q=</item>
+		<item>https://www.ebay.com/sch/i.html?_nkw=</item>
+		<item>https://www.amazon.com/s?k=</item>
 		<item>https://world.openfoodfacts.org/cgi/search.pl?search_terms=</item>
 		<item>https://world.openbeautyfacts.org/cgi/search.pl?search_terms=</item>
 		<item>https://world.openpetfoodfacts.org/cgi/search.pl?search_terms=</item>
+		<item>https://www.barcodelookup.com/</item>
 	</string-array>
 </resources>

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

@@ -15,6 +15,11 @@
 	<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="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>
@@ -23,7 +28,7 @@
 	<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$d (%2$d modules)</string>
+	<string name="qr_version_and_modules">%1$s (%2$d modules)</string>
 	<string name="toggle_flash">Toggle flash</string>
 	<string name="error_flash">Error toggling flash</string>
 	<string name="share">Share</string>
@@ -76,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
 	<string name="vibrate">Vibrate on detection</string>
 	<string name="vibrate_summary">Enable this if you want your device to vibrate when a code is recognized.</string>
+	<string name="beep">Beep on detection</string>
+	<string name="beep_summary">Enable this if you want your device to beep when a code is recognized.</string>
+	<string name="beep_tone">Beep tone</string>
+	<string name="tone_cdma_confirm">CDMA confirm</string>
+	<string name="tone_sup_confirm">Call supervisory confirm</string>
+	<string name="tone_sup_radio_ack">Call supervisory radio path acknowledgment</string>
+	<string name="tone_prop_ack">Positive acknowledgment</string>
+	<string name="tone_prop_beep">General beep</string>
+	<string name="tone_prop_beep2">General double beep</string>
 	<string name="use_history">Save scan history</string>
 	<string name="use_history_summary">Save recognized codes on your device.</string>
 	<string name="ignore_consecutive_duplicates">Ignore duplicates</string>
@@ -88,13 +102,15 @@
 	<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_recreation">Show recreated barcode</string>
+	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
 	<string name="close_automatically">Go back after Copy/Share</string>
 	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
 	<string name="default_search_engine">Open unknown data in</string>
 	<string name="always_ask">Always ask</string>
 	<string name="open_with_url">Open unknown data with URL</string>
-	<string name="clear_network_suggestions">Clear network suggestions</string>
-	<string name="clear_network_suggestions_summary">Remove all of the network suggestions that were previously provided by this app.</string>
+	<string name="clear_network_suggestions">Remove network suggestions</string>
+	<string name="clear_network_suggestions_summary">Remove network suggestions that were previously added with this app.</string>
 	<string name="really_remove_all_networks">Really remove all networks?</string>
 	<string name="clear_network_suggestions_success">Network suggestions cleared</string>
 	<string name="clear_network_suggestions_nothing_to_remove">Nothing to remove</string>
@@ -150,6 +166,7 @@
 	<string name="export_database">SQLite database</string>
 	<string name="saved_in_downloads">Saved in downloads</string>
 	<string name="rotate_image_cw">Rotate image clockwise</string>
+	<string name="toggle_free_rotation">Toggle free rotation</string>
 	<string name="pick_file">Pick image file</string>
 	<string name="pick_code_to_scan">Pick code to scan</string>
 	<string name="shortcut_decode">Scan a barcode</string>
@@ -166,4 +183,6 @@
 	<string name="wifi_anonymous_identity">Anonymous identity</string>
 	<string name="wifi_identity">Identity</string>
 	<string name="wifi_phase2">Phase 2 method</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -27,6 +27,8 @@
 		<item name="android:maxLines">1</item>
 	</style>
 	<style name="FAB" parent="Widget.Design.FloatingActionButton">
+		<!-- Silence nonsense warning about setting a custom background. -->
+		<item name="android:background">@null</item>
 		<item name="android:layout_width">wrap_content</item>
 		<item name="android:layout_height">wrap_content</item>
 		<item name="android:layout_margin">20dp</item>

app/src/main/res/xml-v11/preferences.xml

@@ -49,6 +49,17 @@
 			android:key="vibrate"
 			android:title="@string/vibrate"
 			android:summary="@string/vibrate_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="false"
+			android:key="beep"
+			android:title="@string/beep"
+			android:summary="@string/beep_summary"/>
+		<ListPreference
+			android:key="beep_tone_name"
+			android:title="@string/beep_tone"
+			android:entries="@array/beep_tones_names"
+			android:entryValues="@array/beep_tones_values"
+			android:defaultValue="tone_prop_beep"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="use_history"
@@ -97,6 +108,11 @@
 			android:key="show_hex_dump"
 			android:title="@string/show_hex_dump"
 			android:summary="@string/show_hex_dump_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="show_recreation"
+			android:title="@string/show_recreation"
+			android:summary="@string/show_recreation_summary"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="close_automatically"

app/src/main/res/xml-v33/preferences.xml

@@ -49,6 +49,17 @@
 			android:key="vibrate"
 			android:title="@string/vibrate"
 			android:summary="@string/vibrate_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="false"
+			android:key="beep"
+			android:title="@string/beep"
+			android:summary="@string/beep_summary"/>
+		<ListPreference
+			android:key="beep_tone_name"
+			android:title="@string/beep_tone"
+			android:entries="@array/beep_tones_names"
+			android:entryValues="@array/beep_tones_values"
+			android:defaultValue="tone_prop_beep"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="use_history"
@@ -97,6 +108,11 @@
 			android:key="show_hex_dump"
 			android:title="@string/show_hex_dump"
 			android:summary="@string/show_hex_dump_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="show_recreation"
+			android:title="@string/show_recreation"
+			android:summary="@string/show_recreation_summary"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="close_automatically"

app/src/main/res/xml/preferences.xml

@@ -44,6 +44,17 @@
 			android:key="vibrate"
 			android:title="@string/vibrate"
 			android:summary="@string/vibrate_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="false"
+			android:key="beep"
+			android:title="@string/beep"
+			android:summary="@string/beep_summary"/>
+		<ListPreference
+			android:key="beep_tone_name"
+			android:title="@string/beep_tone"
+			android:entries="@array/beep_tones_names"
+			android:entryValues="@array/beep_tones_values"
+			android:defaultValue="tone_prop_beep"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="use_history"
@@ -92,6 +103,11 @@
 			android:key="show_hex_dump"
 			android:title="@string/show_hex_dump"
 			android:summary="@string/show_hex_dump_summary"/>
+		<android.support.v7.preference.SwitchPreferenceCompat
+			android:defaultValue="true"
+			android:key="show_recreation"
+			android:title="@string/show_recreation"
+			android:summary="@string/show_recreation_summary"/>
 		<android.support.v7.preference.SwitchPreferenceCompat
 			android:defaultValue="true"
 			android:key="close_automatically"

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
 	ext {
-		kotlin_version = '1.7.10'
-		tools_version = '7.3.0'
+		kotlin_version = '1.7.20'
+		tools_version = '7.3.1'
 		sdk_version = 33
 		support_version = '25.3.1'
 	}

fastlane/metadata/android/en-US/changelogs/100.txt

@@ -0,0 +1,3 @@
+* Fix parsing timezone in calendar dates
+* Update French translation
+

fastlane/metadata/android/en-US/changelogs/101.txt

@@ -0,0 +1,12 @@
+* Migrate to ZXing-C++ and add support for Micro QR Codes
+* Multi-select scans in history listing
+* Remove preset content for Encode shortcut
+* Always show QR Code version and remove setting
+* Fix PDF-417 UTF-8 text encoding
+* Hide sensitive content from clipboard
+* Remove setting a custom language on Android 13+
+* Condense text output of generated barcodes
+* Update Russian translation
+* Update Spanish translation
+* Add Persian translation
+

fastlane/metadata/android/en-US/changelogs/102.txt

@@ -0,0 +1,2 @@
+* Fix proguard configuration
+

fastlane/metadata/android/en-US/changelogs/103.txt

@@ -0,0 +1,3 @@
+* Recreate and show barcode from read contents if possible
+* Add ebay, Amazon and barcodelookup.com to search engines
+

fastlane/metadata/android/en-US/changelogs/104.txt

@@ -0,0 +1,6 @@
+* Update Russian translation
+* Update Turkish translation
+* Update Italian translation
+* Fix handling GS1 and ISO15434 content types
+* Fix VerifyError on Android 4
+

fastlane/metadata/android/en-US/changelogs/105.txt

@@ -0,0 +1,4 @@
+* Make recreated barcode interactive
+* Update to latest ZXing C++
+* Update Italian translation
+

fastlane/metadata/android/en-US/changelogs/106.txt

@@ -0,0 +1,4 @@
+* Add an action item to lock/unlock free rotation
+* Support setting fore and background colors when creating barcodes
+* Fix creating barcodes with UTF-8 content
+

fastlane/metadata/android/en-US/changelogs/98.txt

@@ -0,0 +1,7 @@
+* Add support for Deutsche Post Matrixcode stamp
+* Allow free image rotation for scanning from images
+* Fix setting TO field in MATMSG format
+* Update Italian translation
+* Update zh-rCN translation
+* Update pt-br translation
+

fastlane/metadata/android/en-US/changelogs/99.txt

@@ -0,0 +1,2 @@
+* Fix extraction of raw bytes for some barcodes
+

fastlane/metadata/android/tr/full_description.txt

@@ -0,0 +1,10 @@
+Dikey ve yatay yönde çalışır, ters çevrilen kodları okuyabilir, Material
+Tasarıma sahiptir ve ayrıca barkod oluşturabilir.
+
+ZXing ("Zebra Crossing") barkod tarama kütüphanesini kullanır.
+Desteklenen barkod biçimleri: AZTEC, CODABAR, CODE 39, CODE 93, CODE 128,
+DATA MATRIX, EAN 8, EAN 13, ITF, PDF417, QR CODE, RSS 14, RSS EXPANDED,
+UPC A, UPC E ve UPC EAN UZANTISI.
+
+Açık kaynaktır:
+https://github.com/markusfisch/BinaryEye

fastlane/metadata/android/tr/short_description.txt

@@ -0,0 +1 @@
+Android için diğer bir barkod tarayıcı. Ücretsiz, reklamsız ve açık kaynak.

fastlane/metadata/android/tr/title.txt

@@ -0,0 +1 @@
+Binary Eye

svg/ic_launcher_monochrome.svg

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg width="90px" height="90px" viewBox="0 0 90 90" id="svg2" version="1.1" xmlns="http://www.w3.org/2000/svg">
-<circle style="fill-opacity: 1; stroke: none; stroke-width: 4; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="path5437" cx="45" cy="45" r="18"/>
-<circle r="13.262" cy="45" cx="45" id="circle5467" style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/>
+<path d="M 58.262 45 C 58.262 52.324 52.324 58.262 45 58.262 C 37.676 58.262 31.738 52.324 31.738 45 C 31.738 37.676 37.676 31.738 45 31.738 C 52.324 31.738 58.262 37.676 58.262 45 Z M 45 27 C 35.059 27 27 35.059 27 45 C 27 54.941 35.059 63 45 63 C 54.941 63 63 54.941 63 45 C 63 35.059 54.941 27 45 27 Z" id="circle5467" style="fill-opacity: 1; stroke: none; stroke-width: 4; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;"/>
 <path d="M 54.41 45 C 54.41 47.303 53.583 49.412 52.209 51.048 L 52.209 38.952 C 53.583 40.588 54.41 42.697 54.41 45 Z M 45 54.41 C 44.73 54.41 44.463 54.398 44.199 54.376 L 44.199 35.624 C 44.463 35.602 44.73 35.59 45 35.59 C 45.27 35.59 45.537 35.602 45.801 35.624 L 45.801 54.376 C 45.537 54.398 45.27 54.41 45 54.41 Z M 35.59 45 C 35.59 42.697 36.417 40.588 37.791 38.952 L 37.791 51.048 C 36.417 49.412 35.59 47.303 35.59 45 Z M 49.005 53.517 C 48.494 53.758 47.959 53.954 47.403 54.1 L 47.403 35.9 C 47.959 36.046 48.494 36.242 49.005 36.483 L 49.005 53.517 Z M 42.597 54.1 C 41.424 53.791 40.34 53.261 39.393 52.558 L 39.393 37.442 C 40.34 36.739 41.424 36.209 42.597 35.9 L 42.597 54.1 Z" style="fill: rgb(0, 0, 0); fill-opacity: 1; stroke: none; stroke-width: 4; stroke-linecap: butt; stroke-linejoin: miter; stroke-miterlimit: 4; stroke-dasharray: none; stroke-opacity: 1;" id="circle-6"/>
 </svg>