Advance version number to 1.57.0

From Android R on, because `WifiManager.getNetworkSuggestions()`
is not available on Q.

CHANGELOG.md

@@ -1,5 +1,29 @@
 # Change Log
 
+## 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

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

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 106
-		versionName '1.56.0'
+		versionCode 112
+		versionName '1.57.0'
 	}
 
 	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.7'
+	implementation 'com.github.markusfisch:ScalingImageView:1.4.1'
+	implementation 'com.github.markusfisch:zxing-cpp:v1.4.0.10'
 }

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/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.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
@@ -33,12 +30,12 @@ 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.net.urlEncode
-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.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
@@ -55,7 +52,6 @@ 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
@@ -118,8 +114,6 @@ class CameraActivity : AppCompatActivity() {
 		// custom locale.
 		setTitle(R.string.scan_code)
 
-		vibrator = getVibrator()
-
 		initSystemBars(this)
 		setSupportActionBar(findViewById(R.id.toolbar) as Toolbar)
 
@@ -144,6 +138,7 @@ class CameraActivity : AppCompatActivity() {
 		fallbackBuffer = null
 		saveZoom()
 		detectorView.saveCropHandlePos()
+		releaseToneGenerators()
 	}
 
 	override fun onResume() {
@@ -561,7 +556,7 @@ class CameraActivity : AppCompatActivity() {
 					detectorView.coordinates
 				)
 			)
-			vibrator.vibrate()
+			scanFeedback()
 			val returnUri = returnUrlTemplate?.let {
 				try {
 					completeUrl(it, result)
@@ -584,7 +579,6 @@ class CameraActivity : AppCompatActivity() {
 					showResult(
 						this@CameraActivity,
 						result,
-						vibrator,
 						bulkMode
 					)
 					// If this app was invoked via a deep link but without
@@ -648,7 +642,6 @@ fun Result.redact() = if (
 fun showResult(
 	activity: Activity,
 	result: Result,
-	vibrator: Vibrator,
 	bulkMode: Boolean = false,
 ) {
 	if (prefs.copyImmediately) {
@@ -670,10 +663,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)
@@ -715,19 +705,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,12 +20,8 @@ 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
@@ -42,7 +37,6 @@ class PickActivity : AppCompatActivity() {
 	private val parentJob = Job()
 	private val scope = CoroutineScope(Dispatchers.IO + parentJob)
 
-	private lateinit var vibrator: Vibrator
 	private lateinit var cropImageView: CropImageView
 	private lateinit var detectorView: DetectorView
 	private lateinit var freeRotationItem: MenuItem
@@ -62,8 +56,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)
@@ -160,7 +152,7 @@ class PickActivity : AppCompatActivity() {
 						return@withContext
 					}
 					result = it
-					vibrator.vibrate()
+					scanFeedback()
 					detectorView.update(
 						matrix.mapPosition(
 							it.position,
@@ -176,6 +168,7 @@ class PickActivity : AppCompatActivity() {
 		super.onDestroy()
 		detectorView.saveCropHandlePos()
 		parentJob.cancel()
+		releaseToneGenerators()
 	}
 
 	override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -231,7 +224,7 @@ class PickActivity : AppCompatActivity() {
 	private fun showResult() {
 		val r = result
 		if (r != null) {
-			showResult(this, r.redact(), vibrator)
+			showResult(this, r.redact())
 			finish()
 		} else {
 			applicationContext.toast(R.string.no_barcode_found)

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

@@ -31,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 {
@@ -86,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 {

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/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/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/os/Vibrator.kt

@@ -4,7 +4,6 @@ import android.content.Context
 import android.os.Build
 import android.os.VibrationEffect
 import android.os.Vibrator
-import de.markusfisch.android.binaryeye.app.prefs
 
 private const val DURATION_IN_MS = 100L
 
@@ -38,9 +37,7 @@ fun Context.getVibrator(): Vibrator = getSystemService(
 ) as Vibrator
 
 fun Vibrator.vibrate() {
-	if (!prefs.vibrate) {
-		return
-	} else if (beforeO) {
+	if (beforeO) {
 		@Suppress("DEPRECATION")
 		vibrate(DURATION_IN_MS)
 	} else {
@@ -54,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
@@ -99,6 +100,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)
@@ -214,6 +225,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,
@@ -260,6 +275,15 @@ class Preferences {
 		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) =
 		preferences.edit().putBoolean(label, value)
 
@@ -304,6 +328,8 @@ 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"

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/res/drawable/ic_action_rotation_locked.xml

@@ -1,3 +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="@android:color/white" 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"/>
+    <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

@@ -1,3 +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="@android:color/white" 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"/>
+    <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/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/values-bn/strings.xml

@@ -81,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>
@@ -174,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

@@ -83,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>
@@ -176,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-de/strings.xml

@@ -16,10 +16,10 @@
 	<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 Weiss</string>
-	<string name="colors_white_on_black">Weiss auf Schwarz</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">Weiss 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>
@@ -79,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>
@@ -101,7 +110,7 @@
 	<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>
@@ -174,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

@@ -81,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>
@@ -174,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/strings.xml

@@ -81,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>
@@ -174,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,14 +16,14 @@
 	<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="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">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>
@@ -82,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>
@@ -94,8 +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">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</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>
@@ -158,7 +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">Toggle free rotation</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>
@@ -175,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

@@ -81,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>
@@ -174,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,22 +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="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">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$d (%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>
@@ -50,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>
@@ -69,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>
@@ -92,29 +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="show_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
-	<string name="close_automatically">Go back after Copy/Share</string>
-	<string name="close_automatically_summary">Automatically return to the scan screen after copying or sharing the read contents.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="show_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>
@@ -156,21 +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">Toggle free rotation</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

@@ -81,6 +81,15 @@
 	<string name="show_toast_in_bulk_mode_summary">Mostra brevemente i dati scansionati durante la scansione continua.</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="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">Salva cronologia delle scansioni</string>
 	<string name="use_history_summary">Salva i codici riconosciuti sul dispositivo.</string>
 	<string name="ignore_consecutive_duplicates">Ignora i duplicati</string>
@@ -174,4 +183,6 @@
 	<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="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -80,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>
@@ -173,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-ka/strings.xml

@@ -1,177 +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="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$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="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">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="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>
-</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$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="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$d (%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

@@ -81,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>
@@ -174,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

@@ -99,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>
@@ -170,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,38 +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="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">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="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>
@@ -58,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>
@@ -70,39 +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_recreation">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</string>
+	<string name="show_hex_dump_summary">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>
@@ -110,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>
@@ -131,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>
@@ -157,7 +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">Toggle free rotation</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>
@@ -174,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,11 +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">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="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>
@@ -74,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>
@@ -159,7 +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">Toggle free rotation</string>
+	<string name="toggle_free_rotation">Переключить свободный поворот</string>
 	<string name="pick_file">Открыть файл с изображением</string>
 	<string name="pick_code_to_scan">Выберите штрих-код для сканирования</string>
 	<string name="shortcut_decode">Сканировать штрих-код</string>
@@ -176,4 +185,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-tr/strings.xml

@@ -15,11 +15,11 @@
 	<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="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="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>
@@ -81,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>
@@ -157,7 +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">Toggle free rotation</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>
@@ -174,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

@@ -82,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>
@@ -175,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

@@ -80,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>
@@ -173,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,18 +10,18 @@
 		<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="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="error_correction_level_l" formatted="false">低 (~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>
@@ -80,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>
@@ -92,8 +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">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</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>
@@ -155,8 +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="toggle_free_rotation">Toggle free rotation</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>
@@ -173,4 +182,6 @@
 	<string name="wifi_anonymous_identity">匿名身份</string>
 	<string name="wifi_identity">身份</string>
 	<string name="wifi_phase2">阶段 2 方法</string>
+	<string name="network_suggestions">Network suggestions</string>
+	<string name="remove_suggestion">Remove suggestion</string>
 </resources>

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

@@ -12,24 +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="colors">Fore and background</string>
-	<string name="colors_black_on_white">Black on white</string>
-	<string name="colors_white_on_black">White on black</string>
-	<string name="colors_black_on_transparent">Black on transparent</string>
-	<string name="colors_white_on_transparent">White on transparent</string>
-	<string name="sequence_size">Sequence size</string>
-	<string name="sequence_index">Sequence index</string>
-	<string name="sequence_id">Sequence ID</string>
+	<string name="colors">前景和背景</string>
+	<string name="colors_black_on_white">白底黑字</string>
+	<string name="colors_white_on_black">黑底白字</string>
+	<string name="colors_black_on_transparent">透明底黑字</string>
+	<string name="colors_white_on_transparent">透明底白字</string>
+	<string name="sequence_size">序列大小</string>
+	<string name="sequence_index">序列索引</string>
+	<string name="sequence_id">序列 ID</string>
 	<string name="gtin_issue_number">發行編號</string>
 	<string name="gtin_country">可能製作國家</string>
 	<string name="gtin_price">建議價格</string>
 	<string name="gtin_add_on">UPC EAN 擴充</string>
-	<string name="barcode_version_number">Version</string>
+	<string name="barcode_version_number">版本</string>
 	<string name="qr_version_and_modules">%1$d (%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>
@@ -52,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>
@@ -64,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>
@@ -80,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>
@@ -92,8 +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">Show recreated barcode</string>
-	<string name="show_recreation_summary">Recreate and show barcode from read content if possible.</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>
@@ -105,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>
@@ -153,10 +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">Toggle free rotation</string>
+	<string name="toggle_free_rotation">切換自由旋轉</string>
 	<string name="pick_file">選擇圖片檔案</string>
 	<string name="pick_code_to_scan">選擇要掃描的條碼</string>
 	<string name="shortcut_decode">掃描條碼</string>
@@ -173,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/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/strings.xml

@@ -81,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>
@@ -100,8 +109,8 @@
 	<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>
@@ -174,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/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"

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"

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"

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'
 	}