Advance version number to 1.46.0

To open the app from web links.

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Change Log
 
+## 1.46.0
+* Support deep links
+* Support "A:" in WIFI codes
+* Allow multiple query arguments in custom URL
+* Add Wi-Fi info data section
+* Add Vietnamese translation
+* Update Brazilian Portuguese translation
+* Update Hungarian translation
+* Update Ukrainian translation
+* Update Russian translation
+
 ## 1.45.0
 * Add a setting to set the delay for bulk mode
 * Add support for MECARD contact format

Makefile

@@ -23,6 +23,19 @@ test:
 cat:
 	./gradlew test cAT
 
+testview:
+	adb shell am start -W -a android.intent.action.VIEW -d 'binaryeye://scan'
+
+testscan:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'binaryeye://scan/?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
+testurl:
+	adb shell am start -a android.intent.action.VIEW \
+		-c android.intent.category.BROWSABLE \
+		-d 'http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fmarkusfisch.de%2F%3Fresult%3D{RESULT}'
+
 install:
 	adb $(TARGET) install -r app/build/outputs/apk/debug/app-debug.apk
 

README.md

@@ -64,6 +64,54 @@ ZXing can generate the following barcode formats:
 * [QR CODE][qr_code]
 * [UPC A][upc_a]
 
+## Deep Links and Intents
+
+### Deep Links
+
+You can invoke Binary Eye with a web URI intent from anything that can
+open URIs. There are two options:
+
+1. [binaryeye://scan](binaryeye://scan)
+2. [http(s)://markusfisch.de/BinaryEye](http://markusfisch.de/BinaryEye)
+
+If you want to get the scanned contents, you can add a `ret` query
+argument with a (URL encoded) URI template. For example:
+
+[http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fexample.com%2F%3Fresult%3D{RESULT}](http://markusfisch.de/BinaryEye?ret=http%3A%2F%2Fexample.com%2F%3Fresult%3D{RESULT})
+
+Supported symbols are:
+
+* `RESULT` - scanned content
+* `RESULT_BYTES` - raw result as a hex string
+* `FORMAT` - barcode format
+* `META` - the meta data, if available
+
+### SCAN Intent
+
+You can also use Binary Eye from other apps by using the
+`com.google.zxing.client.android.SCAN` Intent with `startActivityForResult()`
+like this:
+
+	startActivityForResult(
+		Intent("com.google.zxing.client.android.SCAN"),
+		SOME_NUMBER
+	)
+
+And process the result in `onActivityResult()` of your `Activity`:
+
+	override fun onActivityResult(
+		requestCode: Int,
+		resultCode: Int,
+		data: Intent?
+	) {
+		when (requestCode) {
+			SOME_NUMBER -> if (resultCode == RESULT_OK) {
+				val result = data.getStringExtra("SCAN_RESULT")
+				…
+			}
+		}
+	}
+
 ## RenderScript
 
 This app uses [RenderScript][rs] to resize and rotate the camera image.

app/build.gradle

@@ -9,8 +9,8 @@ android {
 		minSdkVersion 9
 		targetSdkVersion sdk_version
 
-		versionCode 86
-		versionName '1.45.0'
+		versionCode 87
+		versionName '1.46.0'
 
 		// It's recommended to set this value to the lowest API level
 		// able to provide all the functionality.

app/src/main/AndroidManifest.xml

@@ -67,10 +67,16 @@
 				<action android:name="android.intent.action.VIEW"/>
 				<category android:name="android.intent.category.DEFAULT"/>
 				<category android:name="android.intent.category.BROWSABLE"/>
-				<data
-					android:host="www.markusfisch.de"
-					android:pathPrefix="/BinaryEye"
-					android:scheme="http"/>
+				<data android:scheme="http"
+					android:host="markusfisch.de"
+					android:pathPrefix="/BinaryEye"/>
+				<data android:scheme="https" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW"/>
+				<category android:name="android.intent.category.DEFAULT"/>
+				<category android:name="android.intent.category.BROWSABLE"/>
+				<data android:scheme="binaryeye" android:host="scan"/>
 			</intent-filter>
 		</activity>
 		<activity

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

@@ -118,7 +118,7 @@ object WifiConnector {
 		internal val hidden: Boolean
 			get() = inputMap["H"]?.unescape == "true"
 		internal val anonymousIdentity: String
-			get() = inputMap["AI"]?.unescape ?: ""
+			get() = inputMap["AI"]?.unescape ?: inputMap["A"]?.unescape ?: ""
 		internal val identity: String
 			get() = inputMap["I"]?.unescape ?: ""
 		internal val eapMethod: Int?
@@ -167,7 +167,7 @@ object WifiConnector {
 	@RequiresApi(Build.VERSION_CODES.Q)
 	private fun WifiNetworkSuggestion.Builder.apply(
 		data: SimpleDataAccessor
-	): WifiNetworkSuggestion.Builder {
+	): WifiNetworkSuggestion.Builder? {
 		fun WifiNetworkSuggestion.Builder.applyCommon(
 			data: SimpleDataAccessor
 		): WifiNetworkSuggestion.Builder {
@@ -177,40 +177,37 @@ object WifiConnector {
 
 		fun WifiNetworkSuggestion.Builder.applySecurity(
 			data: SimpleDataAccessor
-		): WifiNetworkSuggestion.Builder {
-			when (data.securityType) {
-				"WPA", "WPA2" -> {
-					data.password?.let {
-						setWpa2Passphrase(it)
+		): WifiNetworkSuggestion.Builder? {
+			try {
+				when (data.securityType) {
+					"WPA", "WPA2" -> {
+						data.password?.let { setWpa2Passphrase(it) }
+					}
+					"WPA2-EAP" -> {
+						setWpa2EnterpriseConfig(WifiEnterpriseConfig().apply {
+							identity = data.identity
+							anonymousIdentity = data.anonymousIdentity
+							password = data.password
+							data.eapMethod?.let { eapMethod = it }
+							data.phase2Method?.let { phase2Method = it }
+						})
+					}
+					"WPA3" -> {
+						data.password?.let { setWpa3Passphrase(it) }
+					}
+					"WPA3-EAP" -> {
+						setWpa3EnterpriseConfig(WifiEnterpriseConfig().apply {
+							identity = data.identity
+							anonymousIdentity = data.anonymousIdentity
+							password = data.password
+							data.eapMethod?.let { eapMethod = it }
+							data.phase2Method?.let { phase2Method = it }
+						})
 					}
 				}
-				"WPA2-EAP" -> {
-					data.password?.let {
-						setWpa2Passphrase(it)
-					}
-					setWpa2EnterpriseConfig(WifiEnterpriseConfig().apply {
-						identity = data.identity
-						anonymousIdentity = data.anonymousIdentity
-						password = data.password
-						data.eapMethod?.let { eapMethod = it }
-						data.phase2Method?.let { phase2Method = it }
-					})
-				}
-				"WPA3" -> {
-					data.password?.let {
-						setWpa3Passphrase(it)
-					}
-				}
-				"WPA3-EAP" -> {
-					data.password?.let { setWpa3Passphrase(it) }
-					setWpa3EnterpriseConfig(WifiEnterpriseConfig().apply {
-						identity = data.identity
-						anonymousIdentity = data.anonymousIdentity
-						password = data.password
-						data.eapMethod?.let { eapMethod = it }
-						data.phase2Method?.let { phase2Method = it }
-					})
-				}
+			} catch (e: IllegalArgumentException) {
+				// Don't accept passphrases that aren't ASCII encodeable.
+				return null
 			}
 			return this
 		}

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

@@ -42,6 +42,7 @@ import de.markusfisch.android.binaryeye.widget.DetectorView
 import de.markusfisch.android.binaryeye.widget.toast
 import de.markusfisch.android.binaryeye.zxing.Zxing
 import de.markusfisch.android.cameraview.widget.CameraView
+import java.net.URLEncoder
 import kotlin.math.max
 import kotlin.math.min
 import kotlin.math.roundToInt
@@ -76,6 +77,7 @@ class CameraActivity : AppCompatActivity() {
 	private var flash = false
 	private var decoding = true
 	private var returnResult = false
+	private var returnUrlTemplate: String? = null
 	private var frontFacing = false
 	private var bulkMode = prefs.bulkMode
 	private var ignoreNext: String? = null
@@ -169,12 +171,23 @@ class CameraActivity : AppCompatActivity() {
 			invalidateOptionsMenu()
 			ignoreNext = null
 		}
-		returnResult = "com.google.zxing.client.android.SCAN" == intent.action
+		setReturnTarget(intent)
 		if (hasCameraPermission(this)) {
 			openCamera()
 		}
 	}
 
+	private fun setReturnTarget(intent: Intent?) {
+		when {
+			intent?.action == "com.google.zxing.client.android.SCAN" -> {
+				returnResult = true
+			}
+			isReturnUrl(intent) -> intent?.data?.let {
+				returnUrlTemplate = it.getQueryParameter("ret")
+			}
+		}
+	}
+
 	private fun resetPreProcessor() {
 		preprocessor?.destroy()
 		preprocessor = null
@@ -679,13 +692,31 @@ class CameraActivity : AppCompatActivity() {
 				)
 			)
 			vibrator.vibrate()
-			showResult(
-				this@CameraActivity,
-				result,
-				vibrator,
-				returnResult,
-				bulkMode
-			)
+			val returnUri = returnUrlTemplate?.let {
+				try {
+					completeUrl(it, result)
+				} catch (e: Exception) {
+					e.message?.let { message ->
+						toast(message)
+					}
+					null
+				}
+			}
+			when {
+				returnResult -> {
+					setResult(Activity.RESULT_OK, getReturnIntent(result))
+					finish()
+				}
+				returnUri != null -> execShareIntent(
+					Intent(Intent.ACTION_VIEW, returnUri)
+				)
+				else -> showResult(
+					this@CameraActivity,
+					result,
+					vibrator,
+					bulkMode
+				)
+			}
 			if (bulkMode) {
 				ignoreNext = result.text
 				if (prefs.showToastInBulkMode) {
@@ -717,14 +748,8 @@ fun showResult(
 	activity: Activity,
 	result: Result,
 	vibrator: Vibrator,
-	isResult: Boolean = false,
 	bulkMode: Boolean = false,
 ) {
-	if (isResult) {
-		activity.setResult(Activity.RESULT_OK, getReturnIntent(result))
-		activity.finish()
-		return
-	}
 	if (prefs.copyImmediately) {
 		activity.copyToClipboard(result.text)
 	}
@@ -796,6 +821,36 @@ fun getReturnIntent(result: Result): Intent {
 	return intent
 }
 
+private fun isReturnUrl(intent: Intent?): Boolean {
+	val dataString = intent?.dataString
+	return listOf(
+		"binaryeye://scan",
+		"http://markusfisch.de/BinaryEye",
+		"https://markusfisch.de/BinaryEye"
+	).firstOrNull {
+		val result = dataString?.startsWith(it) == true
+		result
+	} != null
+}
+
+private fun completeUrl(urlTemplate: String, result: Result) = Uri.parse(
+	urlTemplate
+		.replace("{RESULT}", URLEncoder.encode(result.text, "UTF-8"))
+		.replace("{RESULT_BYTES}", result.rawBytes?.toHexString() ?: "")
+		.replace(
+			"{FORMAT}", URLEncoder.encode(
+				result.barcodeFormat.toString(), "UTF-8"
+			)
+		)
+		.replace(
+			"{META}", URLEncoder.encode(
+				result.resultMetadata?.toString() ?: "", "UTF-8"
+			)
+		)
+		// And support {CODE} from the old ZXing app, too.
+		.replace("{CODE}", URLEncoder.encode(result.text, "UTF-8"))
+)
+
 private fun beepBeepBeep() {
 	ToneGenerator(AudioManager.STREAM_ALARM, 100).startTone(
 		ToneGenerator.TONE_CDMA_CONFIRM,

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

@@ -0,0 +1,29 @@
+package de.markusfisch.android.binaryeye.app
+
+import java.util.regex.Pattern
+
+private val urlPattern: Pattern = Pattern.compile(
+	"(?:^|[\\W])((ht|f)tp(s?):\\/\\/|www\\.)" +
+			"(([\\w\\-]+\\.){1,}?([\\w\\-.~]+\\/?)*" +
+			"[\\p{Alnum}.,%_=?&#\\-+()\\[\\]\\*$~@!:/{};']*)",
+	Pattern.CASE_INSENSITIVE or Pattern.MULTILINE or Pattern.DOTALL
+)
+
+fun getLinks(text: String): List<String> {
+	val matcher = urlPattern.matcher(text)
+	val urls = mutableListOf<String>()
+
+	while (matcher.find()) {
+		val matchStart = matcher.start(1)
+		val matchEnd = matcher.end()
+
+		var url = text.substring(matchStart, matchEnd)
+		if (!url.startsWith("http://") && !url.startsWith("https://")) {
+			url = "https://$url"
+		}
+
+		urls.add(url)
+	}
+
+	return urls
+}

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

@@ -6,6 +6,7 @@ import android.support.design.widget.FloatingActionButton
 import android.support.v4.app.Fragment
 import android.text.Editable
 import android.text.TextWatcher
+import android.text.method.LinkMovementMethod
 import android.view.*
 import android.widget.EditText
 import android.widget.TableLayout
@@ -14,6 +15,7 @@ import android.widget.TextView
 import de.markusfisch.android.binaryeye.R
 import de.markusfisch.android.binaryeye.actions.ActionRegistry
 import de.markusfisch.android.binaryeye.actions.wifi.WifiAction
+import de.markusfisch.android.binaryeye.actions.wifi.WifiConnector
 import de.markusfisch.android.binaryeye.activity.MainActivity
 import de.markusfisch.android.binaryeye.adapter.prettifyFormatName
 import de.markusfisch.android.binaryeye.app.*
@@ -33,8 +35,10 @@ import kotlinx.coroutines.launch
 class DecodeFragment : Fragment() {
 	private lateinit var contentView: EditText
 	private lateinit var formatView: TextView
+	private lateinit var dataView: TableLayout
 	private lateinit var metaView: TableLayout
 	private lateinit var hexView: TextView
+	private lateinit var linksView: TextView
 	private lateinit var format: String
 	private lateinit var fab: FloatingActionButton
 
@@ -82,6 +86,7 @@ class DecodeFragment : Fragment() {
 		format = scan.format
 
 		contentView = view.findViewById(R.id.content)
+		linksView = view.findViewById(R.id.links)
 		fab = view.findViewById(R.id.open)
 
 		if (!isBinary) {
@@ -113,6 +118,8 @@ class DecodeFragment : Fragment() {
 			if (prefs.openImmediately) {
 				executeAction(content.toByteArray())
 			}
+			linksView.text = getLinks(inputContent).joinToString("\n")
+			linksView.movementMethod = LinkMovementMethod.getInstance()
 		} else {
 			contentView.setText(R.string.binary_data)
 			contentView.isEnabled = false
@@ -123,11 +130,16 @@ class DecodeFragment : Fragment() {
 		}
 
 		formatView = view.findViewById(R.id.format)
+		dataView = view.findViewById(R.id.data)
 		metaView = view.findViewById(R.id.meta)
 		hexView = view.findViewById(R.id.hex)
 
 		updateViewsAndAction(raw)
 
+		if (!isBinary) {
+			fillDataView(dataView, inputContent)
+		}
+
 		if (prefs.showMetaData) {
 			fillMetaView(metaView, scan)
 		}
@@ -168,20 +180,13 @@ class DecodeFragment : Fragment() {
 		}
 	}
 
-	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+	private fun fillDataTable(tableLayout: TableLayout, items: LinkedHashMap<Int, String?>?) {
 		val ctx = tableLayout.context
 		val spaceBetween = (16f * ctx.resources.displayMetrics.density).toInt()
-		var hasMeta = false
-		sortedMapOf(
-			R.string.error_correction_level to scan.errorCorrectionLevel,
-			R.string.issue_number to scan.issueNumber,
-			R.string.orientation to scan.orientation,
-			R.string.other_meta_data to scan.otherMetaData,
-			R.string.pdf417_extra_metadata to scan.pdf417ExtraMetaData,
-			R.string.possible_country to scan.possibleCountry,
-			R.string.suggested_price to scan.suggestedPrice,
-			R.string.upc_ean_extension to scan.upcEanExtension
-		).forEach { item ->
+
+		var hasEntries = false
+
+		items?.forEach { item ->
 			item.value?.let {
 				val tr = TableRow(ctx)
 				val keyView = TextView(ctx)
@@ -192,14 +197,51 @@ class DecodeFragment : Fragment() {
 				tr.addView(keyView)
 				tr.addView(valueView)
 				tableLayout.addView(tr)
-				hasMeta = true
+				hasEntries = true
 			}
 		}
-		if (hasMeta) {
+		if (hasEntries) {
 			tableLayout.setPadding(0, 0, 0, spaceBetween)
 		}
 	}
 
+	private fun fillDataView(tableLayout: TableLayout, content: String) {
+		val items = LinkedHashMap<Int, String?>()
+
+		if (action is WifiAction) {
+			val wifiData = WifiConnector.parseMap(content)
+
+			if (wifiData != null) {
+				items[R.string.entry_type] = getString(R.string.wifi_network)
+				items[R.string.wifi_ssid] = wifiData["S"]
+				items[R.string.wifi_password] = wifiData["P"]
+				items[R.string.wifi_type] = wifiData["T"]
+				items[R.string.wifi_hidden] = wifiData["H"]
+				items[R.string.wifi_eap] = wifiData["E"]
+				items[R.string.wifi_identity] = wifiData["I"]
+				items[R.string.wifi_anonymous_identity] = wifiData["A"]
+				items[R.string.wifi_phase2] = wifiData["PH2"]
+			}
+		}
+
+		fillDataTable(tableLayout, items)
+	}
+
+	private fun fillMetaView(tableLayout: TableLayout, scan: Scan) {
+		fillDataTable(
+			tableLayout, linkedMapOf(
+				R.string.error_correction_level to scan.errorCorrectionLevel,
+				R.string.issue_number to scan.issueNumber,
+				R.string.orientation to scan.orientation,
+				R.string.other_meta_data to scan.otherMetaData,
+				R.string.pdf417_extra_metadata to scan.pdf417ExtraMetaData,
+				R.string.possible_country to scan.possibleCountry,
+				R.string.suggested_price to scan.suggestedPrice,
+				R.string.upc_ean_extension to scan.upcEanExtension
+			)
+		)
+	}
+
 	override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
 		inflater.inflate(R.menu.fragment_decode, menu)
 		if (isBinary) {

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

@@ -88,7 +88,7 @@ private fun completeUrl(template: String): String {
 		s = "http://${s}"
 	}
 	if (prefs.sendScanType == "0" &&
-		!s.matches(".*/[a-zA-Z._-]*\\?[a-zA-Z0-9_-]+=$".toRegex())
+		!s.matches(".*/[a-zA-Z._-]*\\?[a-zA-Z0-9&=_-]+=$".toRegex())
 	) {
 		s = "${s}?content="
 	}

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

@@ -38,7 +38,7 @@
 				android:layout_marginBottom="16dp"
 				android:gravity="end|top"/>
 			<TableLayout
-				android:id="@+id/meta"
+				android:id="@+id/data"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_below="@+id/format"
@@ -46,6 +46,15 @@
 				android:layout_marginStart="16dp"
 				android:layout_marginLeft="16dp"
 				android:layout_marginRight="16dp"/>
+			<TableLayout
+				android:id="@+id/meta"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_below="@+id/data"
+				android:layout_marginStart="16dp"
+				android:layout_marginLeft="16dp"
+				android:layout_marginEnd="16dp"
+				android:layout_marginRight="16dp" />
 			<TextView
 				android:id="@+id/hex"
 				android:layout_width="match_parent"
@@ -56,9 +65,20 @@
 				android:layout_marginEnd="16dp"
 				android:layout_marginRight="16dp"
 				android:layout_marginBottom="16dp"
-				android:typeface="monospace"
 				android:textSize="12sp"
-				tools:text="54 65 73 74 20 51 52 20  Test QR\n43 6F 64 65              Code"/>
+				android:typeface="monospace"
+				tools:text="54 65 73 74 20 51 52 20  Test QR\n43 6F 64 65              Code" />
+			<TextView
+				android:id="@+id/links"
+				android:autoLink="web"
+				android:lineHeight="24sp"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_below="@id/hex"
+				android:layout_marginHorizontal="16dp"
+				android:textSize="12sp"
+				android:typeface="monospace"
+				tools:text="@tools:sample/lorem/random" />
 		</RelativeLayout>
 	</de.markusfisch.android.binaryeye.widget.ConfinedScrollView>
 	<android.support.design.widget.CoordinatorLayout
@@ -69,6 +89,6 @@
 			style="@style/FAB"
 			android:id="@+id/open"
 			android:contentDescription="@string/open_url"
-			android:src="@drawable/ic_action_open"/>
+			android:src="@drawable/ic_action_open" />
 	</android.support.design.widget.CoordinatorLayout>
 </FrameLayout>

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

@@ -147,4 +147,14 @@
 	<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>

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

@@ -148,4 +148,14 @@
 	<string name="shortcut_encode">Vytvořit čárový kód</string>
 	<string name="shortcut_preferences">Nastavení</string>
 	<string name="background_request_failed">Požadavek na pozadí selhal</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>

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

@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Barcode erstellen</string>
 	<string name="shortcut_preferences">Einstellungen</string>
 	<string name="background_request_failed">Hintergrundanfrage fehlgeschlagen</string>
+	<string name="entry_type">Typ</string>
+	<string name="wifi_network">Wi-Fi Netzwerk</string>
+	<string name="wifi_ssid">Name</string>
+	<string name="wifi_type">Authentifizierungstyp</string>
+	<string name="wifi_password">Passwort</string>
+	<string name="wifi_hidden">Verstecktes Netzwerk</string>
+	<string name="wifi_eap">EAP Methode</string>
+	<string name="wifi_anonymous_identity">Anonyme Identität</string>
+	<string name="wifi_identity">Identität</string>
+	<string name="wifi_phase2">Phase 2 Methode</string>
 </resources>

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

@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Crear un código</string>
 	<string name="shortcut_preferences">Ajustes</string>
 	<string name="background_request_failed">Solicitud de fondo fallida</string>
+	<string name="entry_type">Type</string>
+	<string name="wifi_network">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>

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

@@ -147,5 +147,15 @@
 	<string name="shortcut_encode">Créer un code-barres</string>
 	<string name="shortcut_preferences">Réglages</string>
 	<string name="background_request_failed">Échec de la requête d\'arrière-plan</string>
+	<string name="entry_type">Type</string>
+	<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>
 

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

@@ -44,12 +44,12 @@
 	<string name="switch_camera">Kamera átkapcsolása</string>
 	<string name="bulk_mode">Beolvasás folyamatosan</string>
 	<string name="bulk_mode_summary">Mindig folyamatos beolvasást indítson.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_delay">Folyamatos beolvasások közti késleltetés</string>
+	<string name="quarter_second">Negyed másodperc</string>
+	<string name="half_second">Fél másodperc</string>
+	<string name="a_second">Egy másodperc</string>
+	<string name="two_seconds">Két másodperc</string>
+	<string name="five_seconds">Öt másodperc</string>
 	<string name="history">Előzmények</string>
 	<string name="preferences">Beállítások</string>
 	<string name="scan_category">Beolvasás</string>
@@ -59,7 +59,7 @@
 	<string name="follow_system_settings">Rendszerbeállítások követése</string>
 	<string name="show_crop_handle">Levágási korlátozó megjelenítése</string>
 	<string name="show_crop_handle_summary">Beolvasás korlátozása egy személyre szabható területre.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Vonalkód formátumok</string>
 	<string name="zoom_by_swiping">Kamera nagyítása fel/le pöccintéssel</string>
 	<string name="zoom_by_swiping_summary">Pöccintsen fel vagy le a kamera képernyőjén a kamera nagyításának vezérléséhez.</string>
 	<string name="auto_rotate">1D vonalkódok felismerése függőlegesen</string>
@@ -84,14 +84,14 @@
 	<string name="show_hex_dump_summary">A beolvasott tartalom hexakiírásának megjelenítése.</string>
 	<string name="close_automatically">Ugrás vissza másolás vagy megosztás után</string>
 	<string name="close_automatically_summary">Automatikus visszatérés a beolvasási képernyőre a beolvasott tartalom másolása vagy megosztása után.</string>
-	<string name="default_search_engine">Open unknown data in</string>
-	<string name="always_ask">Always ask</string>
+	<string name="default_search_engine">Ismeretlen adatok megnyitása ebben</string>
+	<string name="always_ask">Mindig kérdezzen</string>
 	<string name="open_with_url">Ismeretlen adat megnyitása URL-lel</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">Hálózati javaslatok törlése</string>
+	<string name="clear_network_suggestions_summary">Az alkalmazás által korábban biztosított összes hálózati javaslat eltávolítása.</string>
+	<string name="really_remove_all_networks">Valóban eltávolítja az összes hálózatot?</string>
+	<string name="clear_network_suggestions_success">Hálózati javaslatok törölve</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nincs mit eltávolítani</string>
 	<string name="send_category">Továbbítás</string>
 	<string name="send_scan_url">Összes beolvasás küldése egy URL-re</string>
 	<string name="send_scan_type">Kérés típusa az egyes beolvasásoknál</string>
@@ -117,9 +117,9 @@
 	<string name="file_name">Fájlnév</string>
 	<string name="error_saving_file">Nem lehet elmenteni a fájlt</string>
 	<string name="error_file_exists">A fájl már létezik</string>
-	<string name="connect_to_wifi">Kapcsolódás WiFi-hez</string>
-	<string name="wifi_config_failed">Nem sikerült beállítani a WiFi-t</string>
-	<string name="wifi_added">WiFi hozzáadva</string>
+	<string name="connect_to_wifi">Kapcsolódás Wi-Fi-hez</string>
+	<string name="wifi_config_failed">Nem sikerült beállítani a Wi-Fi-t</string>
+	<string name="wifi_added">Wi-Fi hozzáadva</string>
 	<string name="sms_send">SMS küldése</string>
 	<string name="sms_error">Nem sikerült elküldeni az SMS-t</string>
 	<string name="tel_dial">Szám tárcsázása</string>
@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Vonalkód létrehozása</string>
 	<string name="shortcut_preferences">Beállítások</string>
 	<string name="background_request_failed">A háttérkérés sikertelen</string>
+	<string name="entry_type">Típus</string>
+	<string name="wifi_network">Wi-Fi hálózat</string>
+	<string name="wifi_ssid">Név</string>
+	<string name="wifi_type">Hitelesítés típusa</string>
+	<string name="wifi_password">Jelszó</string>
+	<string name="wifi_hidden">Rejtett hálózat</string>
+	<string name="wifi_eap">EAP módszer</string>
+	<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>
 </resources>

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

@@ -146,4 +146,14 @@
 	<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>
 </resources>

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

@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Crea un codice a barre</string>
 	<string name="shortcut_preferences">Impostazioni</string>
 	<string name="background_request_failed">Richiesta in secondo piano fallita</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>

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

@@ -147,4 +147,14 @@
 	<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>

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

@@ -149,4 +149,14 @@
 	<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>

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

@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Barcode genereren</string>
 	<string name="shortcut_preferences">Instellingen</string>
 	<string name="background_request_failed">Het achtergrondverzoek is mislukt</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>

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

@@ -143,4 +143,14 @@
 	<string name="save_as_file_name">Jak zapisać plik w pobranych?</string>
 	<string name="issue_number">Numer wydania</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>
 </resources>

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

@@ -1,8 +1,8 @@
 <resources>
-	<string name="no_camera_no_fun">Esse aplicativo não faz sentido de uso sem acesso para a câmera. Adeus.</string>
-	<string name="camera_error">Sem acesso a câmera, por favor tente novamente</string>
-	<string name="scan_code">Escaneie o código de barras</string>
-	<string name="compose_barcode">Compor código de barras</string>
+	<string name="no_camera_no_fun">Não faz nenhum sentido usar este aplicativo sem acesso à câmera. Tchau.</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="compose_barcode">Criar código</string>
 	<string name="decode_barcode">Decodificar código de barras</string>
 	<string name="content">Conteúdo</string>
 	<string name="binary_data">(binários)</string>
@@ -10,112 +10,112 @@
 		<item quantity="one">%2$d caractere, %1$s</item>
 		<item quantity="other">%2$d caracteres, %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="issue_number">Issue number</string>
-	<string name="orientation">Orientation</string>
-	<string name="other_meta_data">Metadata</string>
-	<string name="pdf417_extra_metadata">PDF417 metadata</string>
-	<string name="possible_country">Possible country of manufacture</string>
-	<string name="suggested_price">Suggested price</string>
-	<string name="upc_ean_extension">UPC EAN extension</string>
+	<string name="error_correction_level">Nível de correção de erros</string>
+	<string name="error_correction_level_l" formatted="false">Baixo (~7&#37; correção)</string>
+	<string name="error_correction_level_m" formatted="false">Médio (~15&#37; correção)</string>
+	<string name="error_correction_level_q" formatted="false">Quartil (~25&#37; correção)</string>
+	<string name="error_correction_level_h" formatted="false">Alto (~30&#37; correção)</string>
+	<string name="issue_number">Número de emissão</string>
+	<string name="orientation">Orientação</string>
+	<string name="other_meta_data">Metadados</string>
+	<string name="pdf417_extra_metadata">Metadados PDF417</string>
+	<string name="possible_country">Possível país de fabricação</string>
+	<string name="suggested_price">Preço sugerido</string>
+	<string name="upc_ean_extension">Extensão UPC EAN</string>
 	<string name="toggle_flash">Ativar lanterna</string>
 	<string name="share">Compartilhar</string>
-	<string name="share_as">Share as?</string>
-	<string name="copy_to_clipboard">Copiar para área de transferência</string>
-	<string name="copied_to_clipboard">Colocar na área de transferência</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">Abrir url</string>
+	<string name="share_as">Compartilhar como?</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 URL</string>
 	<string name="cannot_resolve_action">Nenhuma aplicativo pode abrir isso</string>
-	<string name="pick_search_engine">Escolha um mecanismo de busca</string>
-	<string name="format">Formatar</string>
-	<string name="size">Tamanho em pixels</string>
+	<string name="pick_search_engine">Escolha um 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">Insira o conteúdo aqui</string>
+	<string name="input_content_here">Digite um conteúdo aqui</string>
 	<string name="encode">CODIFICAR</string>
-	<string name="error_no_content">Conteúdo não disponível</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 de barras</string>
 	<string name="view_barcode">Ver código de barras</string>
 	<string name="info">Informações</string>
-	<string name="switch_camera">Trocar câmera</string>
-	<string name="bulk_mode">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="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="switch_camera">Alterar câmera</string>
+	<string name="bulk_mode">Escanear continuamente</string>
+	<string name="bulk_mode_summary">Sempre comece em modo contínuo.</string>
+	<string name="bulk_mode_delay">Atrasar em escaneamentos contínuos</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="history">Histórico</string>
 	<string name="preferences">Preferências</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">Zoom camera by swiping up/down</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 1D barcodes vertically</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, not speed</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="use_history">Salvar histórico de escaneamento</string>
-	<string name="use_history_summary">Save recognized codes on your device.</string>
-	<string name="ignore_consecutive_duplicates">Do not save consecutive duplicates</string>
-	<string name="ignore_consecutive_duplicates_summary">Do not save consecutive duplicates in the scan history.</string>
-	<string name="open_immediately">Skip inspection and open contents immediately</string>
-	<string name="open_immediately_summary">Skip inspection and open contents immediately. May open harmful content if enabled.</string>
-	<string name="copy_immediately">Automatically copy contents 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 barcoded.</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="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="scan_category">Escanear</string>
+	<string name="content_category">Conteúdo</string>
+	<string name="locale_category">Idioma</string>
+	<string name="custom_locale">Idioma personalizado</string>
+	<string name="follow_system_settings">Seguir configurações do sistema</string>
+	<string name="show_crop_handle">Mostrar limitador de corte</string>
+	<string name="show_crop_handle_summary">Restringir escaneamento a uma área personalizável.</string>
+	<string name="barcode_formats">Formatos de código de barras</string>
+	<string name="zoom_by_swiping">Deslize para baixo/cima para usar 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ódigo de barras 1D vertical</string>
+	<string name="auto_rotate_summary">Girar automaticamente a posição da câmera para reconhecer código de barras 1D vertical. Dependendo do dispositivo, isto pode afetar o desempenho.</string>
+	<string name="try_harder">Otimizar o leitor para precisão, não velocidade</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 escaneados durante escaneamento contínuo.</string>
+	<string name="vibrate">Vibrar na detecção</string>
+	<string name="vibrate_summary">Ative isto se quiser que seu dispositivo vibre quando um código for reconhecido.</string>
+	<string name="use_history">Salvar histórico de escaneamentos</string>
+	<string name="use_history_summary">Salve códigos reconhecidos em seu dispositivo.</string>
+	<string name="ignore_consecutive_duplicates">Ignorar duplicatas consecutivas</string>
+	<string name="ignore_consecutive_duplicates_summary">Não salvar duplicatas consecutivas no histórico de escaneamentos.</string>
+	<string name="open_immediately">Abrir conteúdo imediatamente</string>
+	<string name="open_immediately_summary">Pular a inspeção e abrir o conteúdo imediatamente. Pode abrir conteúdo nocivo, se ativado.</string>
+	<string name="copy_immediately">Copiar ao Clipboard</string>
+	<string name="copy_immediately_summary">Copiar automaticamente o conteúdo escaneado ao Clipboard. Observe que outros aplicativos 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 sobre o código de barras escaneado.</string>
+	<string name="show_hex_dump">Mostrar impressão hexadecimal</string>
+	<string name="show_hex_dump_summary">Mostrar uma impressão hexadecimal do conteúdo escaneado.</string>
+	<string name="close_automatically">Voltar depois de Copiar/Compartilhar</string>
+	<string name="close_automatically_summary">Voltar automaticamente à tela de digitalização após copiar ou compartilhar o conteúdo visualizado.</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 com 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">Forwarding</string>
-	<string name="send_scan_url">Send every scan to URL</string>
-	<string name="send_scan_type">Type of request for every scan</string>
-	<string name="send_type_get_add_content">GET and simply add content</string>
-	<string name="send_type_get_query_string">GET with compelete query string</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 fornecidas anteriormente por este aplicativo.</string>
+	<string name="really_remove_all_networks">Realmente remover todas as redes?</string>
+	<string name="clear_network_suggestions_success">Sugestões da rede removidas</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Nada para remover</string>
+	<string name="send_category">Encaminhar</string>
+	<string name="send_scan_url">Enviar cada escaneamento para URL</string>
+	<string name="send_scan_type">Tipo de pedido para cada escaneamento</string>
+	<string name="send_type_get_add_content">GET e simplesmente adicionar conteúdo</string>
+	<string name="send_type_get_query_string">GET com cadeia de consulta completa</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="test_url">Test URL</string>
-	<string name="really_remove_scan">Realmente deseja remover o escaneamento?</string>
-	<string name="really_remove_all_scans">Realmente deseja remover todos escaneamentos?</string>
-	<string name="really_remove_selected_scans">Really remove selected scans?</string>
+	<string name="test_url">Testar URL</string>
+	<string name="really_remove_scan">Realmente quer remover o escaneamento?</string>
+	<string name="really_remove_all_scans">Realmente quer remover todos os escaneamentos?</string>
+	<string name="really_remove_selected_scans">Realmente remover escaneamentos selecionados?</string>
 	<string name="clear_history">Limpar histórico</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">Código de barras não encontrado</string>
+	<string name="copy_scan">Copiar escaneamento</string>
+	<string name="edit_scan">Editar ID</string>
+	<string name="remove_scan">Remover escaneamento</string>
+	<string name="enter_name">Digite um nome para descrever o escaneamento</string>
+	<string name="enter_name_hint">Nome do escaneamento</string>
+	<string name="no_barcode_found">Nenhum código de barras encontrado</string>
 	<string name="pick_list_separator">Como separar itens da lista?</string>
 	<string name="separator_line_break">Quebra de linha</string>
 	<string name="separator_ruler">Régua</string>
-	<string name="save_as_file_name">Salvar como arquivo de imagem?</string>
+	<string name="save_as_file_name">Salvar arquivo em Downloads?</string>
 	<string name="file_name">Nome do arquivo</string>
-	<string name="error_saving_file">Arquivo não pode ser salvo</string>
+	<string name="error_saving_file">Não foi possível salvar o arquivo</string>
 	<string name="error_file_exists">Arquivo já existe</string>
 	<string name="connect_to_wifi">Conectar para o WiFi</string>
 	<string name="wifi_config_failed">Não foi possível configurar o WiFi</string>
@@ -127,24 +127,34 @@
 	<string name="mail_send">Enviar e-mail</string>
 	<string name="mail_error">Não foi possível enviar o e-mail</string>
 	<string name="vcard_add">Adicionar para os contatos</string>
-	<string name="vcard_failed">NNão foi possível adicionar para os contatos</string>
+	<string name="vcard_failed">Não foi possível adicionar para os 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">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="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="otpauth_add">Adicionar 2FA</string>
+	<string name="search_web">Pesquisar na internet</string>
+	<string name="search_scan">Pesquisar em escaneamentos</string>
+	<string name="export_to_file">Exportar para arquivo</string>
+	<string name="export_as">Exportar como?</string>
+	<string name="export_csv_comma">Arquivo CSV com vírgulas</string>
+	<string name="export_csv_semicolon">Arquivo CSV com ponto-e-vírgula</string>
+	<string name="export_json">Arquivo JSON</string>
+	<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="pick_file">Escolha um arquivo de imagem</string>
+	<string name="pick_code_to_scan">Escolha o código para escanear</string>
+	<string name="shortcut_decode">Escanear um código de barras</string>
+	<string name="shortcut_encode">Criar um código</string>
+	<string name="shortcut_preferences">Configurações</string>
+	<string name="background_request_failed">A solicitação de segundo plano falhou</string>
+	<string name="entry_type">Tipo</string>
+	<string name="wifi_network">Rede Wi-Fi</string>
+	<string name="wifi_ssid">Nome</string>
+	<string name="wifi_type">Tipo de autenticação</string>
+	<string name="wifi_password">Senha</string>
+	<string name="wifi_hidden">Rede oculta</string>
+	<string name="wifi_eap">Método EAP</string>
+	<string name="wifi_anonymous_identity">Identidade anônima</string>
+	<string name="wifi_identity">Identidade</string>
+	<string name="wifi_phase2">Método Phase 2</string>
 </resources>

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

@@ -46,12 +46,12 @@
 	<string name="switch_camera">Переключить камеру</string>
 	<string name="bulk_mode">Непрерывное сканирование</string>
 	<string name="bulk_mode_summary">Всегда запускать непрерывное сканирование.</string>
-	<string name="bulk_mode_delay">Delay between continuous scans</string>
-	<string name="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_delay">Задержка непрерывного сканирования</string>
+	<string name="quarter_second">Четверть секунды</string>
+	<string name="half_second">Полсекунды</string>
+	<string name="a_second">Одну секунду</string>
+	<string name="two_seconds">Две секунды</string>
+	<string name="five_seconds">Пять секунд</string>
 	<string name="history">История</string>
 	<string name="preferences">Настройки</string>
 	<string name="scan_category">Сканирование</string>
@@ -149,4 +149,14 @@
 	<string name="shortcut_encode">Создать штрих-код</string>
 	<string name="shortcut_preferences">Настройки</string>
 	<string name="background_request_failed">Фоновый запрос не выполнен</string>
+	<string name="entry_type">Тип</string>
+	<string name="wifi_network">Сеть Wi-Fi</string>
+	<string name="wifi_ssid">Имя</string>
+	<string name="wifi_type">Метод аутентификации</string>
+	<string name="wifi_password">Пароль</string>
+	<string name="wifi_hidden">Скрытая сеть</string>
+	<string name="wifi_eap">Тип EAP</string>
+	<string name="wifi_anonymous_identity">Аноним</string>
+	<string name="wifi_identity">Пользователь</string>
+	<string name="wifi_phase2">Двухэтапный метод</string>
 </resources>

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

@@ -147,4 +147,14 @@
 	<string name="shortcut_encode">Barkod yarat</string>
 	<string name="shortcut_preferences">Ayarlar</string>
 	<string name="background_request_failed">Arka plan isteği başarısız</string>
+	<string name="entry_type">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>

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

@@ -12,10 +12,10 @@
 		<item quantity="many">%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="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="issue_number">Номер випуску</string>
 	<string name="orientation">Орієнтація</string>
 	<string name="other_meta_data">Метадані</string>
@@ -25,7 +25,7 @@
 	<string name="upc_ean_extension">Розширення UPC EAN</string>
 	<string name="toggle_flash">Увімкнути спалах</string>
 	<string name="share">Поділитися</string>
-	<string name="share_as">Share as?</string>
+	<string name="share_as">Поділитися як?</string>
 	<string name="copy_to_clipboard">Копіювати у буфер обміну</string>
 	<string name="copied_to_clipboard">Скопійовано у буфер обміну</string>
 	<string name="copy_password">Копіювати пароль у буфер обміну</string>
@@ -44,31 +44,31 @@
 	<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="quarter_second">A quarter second</string>
-	<string name="half_second">Half a second</string>
-	<string name="a_second">One second</string>
-	<string name="two_seconds">Two seconds</string>
-	<string name="five_seconds">Five seconds</string>
+	<string name="bulk_mode_summary">Завжди починати безперервне сканування.</string>
+	<string name="bulk_mode_delay">Затримка між безперервним скануванням</string>
+	<string name="quarter_second">Чверть секунди</string>
+	<string name="half_second">Півсекунди</string>
+	<string name="a_second">Одна секунда</string>
+	<string name="two_seconds">Дві секунди</string>
+	<string name="five_seconds">П\'ять секунд</string>
 	<string name="history">Історія</string>
 	<string name="preferences">Налаштування</string>
 	<string name="scan_category">Сканування</string>
 	<string name="content_category">Вміст</string>
-	<string name="locale_category">Language</string>
-	<string name="custom_locale">Custom language</string>
-	<string name="follow_system_settings">Follow system settings</string>
+	<string name="locale_category">Мова</string>
+	<string name="custom_locale">Вибрати мову</string>
+	<string name="follow_system_settings">Дотримуватись системних налаштувань</string>
 	<string name="show_crop_handle">Обмежити область сканування</string>
 	<string name="show_crop_handle_summary">Обмежити сканування до налаштованої області.</string>
-	<string name="barcode_formats">Barcode formats</string>
+	<string name="barcode_formats">Формати штрих-коду</string>
 	<string name="zoom_by_swiping">Проведіть пальцем вгору/вниз, для масштабування</string>
 	<string name="zoom_by_swiping_summary">Проведіть пальцем вгору або вниз по екрану камери, щоб керувати масштабуванням камери.</string>
 	<string name="auto_rotate">Розпізнавати вертикальні 1D штрихкоди</string>
 	<string name="auto_rotate_summary">Автоматично повертати кадр камери, щоб розпізнати вертикальні 1D штрих-коди. Залежно від пристрою, це може вплинути на продуктивність.</string>
 	<string name="try_harder">Оптимізувати зчитувач для точності</string>
 	<string name="try_harder_summary">Увімкніть цю опцію для дуже важких для зчитування кодів. Це вплине на продуктивність.</string>
-	<string name="show_toast_in_bulk_mode">Show data in continuous mode</string>
-	<string name="show_toast_in_bulk_mode_summary">Briefly show the scanned data when scanning continuously.</string>
+	<string name="show_toast_in_bulk_mode">Показувати дані в безперервному режимі</string>
+	<string name="show_toast_in_bulk_mode_summary">Коротко показати відскановані дані під час безперервного сканування.</string>
 	<string name="vibrate">Вібрувати при виявленні</string>
 	<string name="vibrate_summary">Увімкніть це, якщо хочете, щоб пристрій вібрував, коли код розпізнано.</string>
 	<string name="use_history">Зберігати історію сканування</string>
@@ -83,16 +83,16 @@
 	<string name="show_meta_data_summary">Показувати додаткові дані про відскановані штрих-коди.</string>
 	<string name="show_hex_dump">Показувати шістнадцятковий дамп</string>
 	<string name="show_hex_dump_summary">Показувати шістнадцятковий дамп відсканованого вмісту.</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="close_automatically">Повернутися після копіювання/поширення</string>
+	<string name="close_automatically_summary">Автоматично повернутися на екран сканування після копіювання або поширення прочитаного вмісту.</string>
+	<string name="default_search_engine">Відкривати невідомі дані в</string>
+	<string name="always_ask">Завжди запитувати</string>
 	<string name="open_with_url">Відкривати невідомі дані за допомогою URL</string>
-	<string name="clear_network_suggestions">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">Очистити мережеві пропозиції</string>
+	<string name="clear_network_suggestions_summary">Видалити усі мережеві пропозиції, які раніше надавала ця програма.</string>
+	<string name="really_remove_all_networks">Ви впевнені, що хочете видалити всі мережі?</string>
+	<string name="clear_network_suggestions_success">Мережеві пропозиції очищено</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Нічого видаляти</string>
 	<string name="send_category">Пересилання</string>
 	<string name="send_scan_url">Надсилати кожне сканування на URL</string>
 	<string name="send_scan_type">Тип запиту для кожного сканування</string>
@@ -100,7 +100,7 @@
 	<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="test_url">Test URL</string>
+	<string name="test_url">Перевірити URL</string>
 	<string name="really_remove_scan">Дійсно видалити сканування?</string>
 	<string name="really_remove_all_scans">Дійсно видалити всі сканування?</string>
 	<string name="really_remove_selected_scans">Дійсно видалити вибрані сканування?</string>
@@ -148,4 +148,14 @@
 	<string name="shortcut_encode">Створити штрих-код</string>
 	<string name="shortcut_preferences">Налаштування</string>
 	<string name="background_request_failed">Помилка фонового запиту</string>
+	<string name="entry_type">Тип</string>
+	<string name="wifi_network">Wi-Fi мережа</string>
+	<string name="wifi_ssid">Ім\'я</string>
+	<string name="wifi_type">Тип автентифікації</string>
+	<string name="wifi_password">Пароль</string>
+	<string name="wifi_hidden">Прихована мережа</string>
+	<string name="wifi_eap">Метод EAP</string>
+	<string name="wifi_anonymous_identity">Анонімна особа</string>
+	<string name="wifi_identity">Користувач</string>
+	<string name="wifi_phase2">Phase 2 метод</string>
 </resources>

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

@@ -0,0 +1,160 @@
+<resources>
+	<string name="no_camera_no_fun">Ứng dụng này không hoạt động nếu không có camera. Tạm biệt.</string>
+	<string name="camera_error">Không thể mở camera, hãy thử lại</string>
+	<string name="scan_code">Quét mã</string>
+	<string name="compose_barcode">Tạo mã vạch</string>
+	<string name="decode_barcode">Giải mã vạch</string>
+	<string name="content">Nội dung</string>
+	<string name="binary_data">(thông tin dạng nhị phân)</string>
+	<plurals name="barcode_info">
+		<item quantity="one">%2$d ký tự, %1$s</item>
+		<item quantity="other">%2$d ký tự, %1$s</item>
+	</plurals>
+	<string name="error_correction_level">Mức độ tự sửa mã</string>
+	<string name="error_correction_level_l" formatted="false">Thấp (sửa ~7&#37;)</string>
+	<string name="error_correction_level_m" formatted="false">Trung bình (sửa ~15&#37;)</string>
+	<string name="error_correction_level_q" formatted="false">Một phần tư (sửa ~25&#37;)</string>
+	<string name="error_correction_level_h" formatted="false">Cao (sửa ~30&#37;)</string>
+	<string name="issue_number">Số</string>
+	<string name="orientation">Hướng</string>
+	<string name="other_meta_data">Dữ liệu</string>
+	<string name="pdf417_extra_metadata">Dữ liệu PDF417</string>
+	<string name="possible_country">Có thể được sản xuất ở nước</string>
+	<string name="suggested_price">Giá được gợi ý</string>
+	<string name="upc_ean_extension">Phần mở rộng UPC EAN</string>
+	<string name="toggle_flash">Bật/tắt đèn</string>
+	<string name="share">Chia sẻ</string>
+	<string name="share_as">Chia sẻ dưới định dạng?</string>
+	<string name="copy_to_clipboard">Sao chép</string>
+	<string name="copied_to_clipboard">Đã sao chép</string>
+	<string name="copy_password">Sao chép mật khẩu</string>
+	<string name="copied_password_to_clipboard">Đã sao chép mật khẩu</string>
+	<string name="open_url">Mở đường dẫn</string>
+	<string name="cannot_resolve_action">Không có ứng dụng nào mở được nội dung này</string>
+	<string name="pick_search_engine">Chọn một trình tìm kiếm</string>
+	<string name="format">Định dạng</string>
+	<string name="size">Kích cỡ theo pixel</string>
+	<string name="width_by_height">%1$d×%2$d</string>
+	<string name="input_content_here">Nhập nội dung vào đây</string>
+	<string name="encode">MÃ HOÁ</string>
+	<string name="error_no_content">Thiếu nội dung</string>
+	<string name="error_encoding_barcode">Không thể tạo ra mã vạch</string>
+	<string name="view_barcode">Xem mã vạch</string>
+	<string name="info">Thông tin</string>
+	<string name="switch_camera">Đổi camera</string>
+	<string name="bulk_mode">Quét liên tục</string>
+	<string name="bulk_mode_summary">Luôn quét liên tục.</string>
+	<string name="bulk_mode_delay">Thời gian giữa các lần quét</string>
+	<string name="quarter_second">Một phần tư giây</string>
+	<string name="half_second">Nửa giây</string>
+	<string name="a_second">Một giây</string>
+	<string name="two_seconds">Hai giây</string>
+	<string name="five_seconds">Năm giây</string>
+	<string name="history">Lịch sử</string>
+	<string name="preferences">Tuỳ chọn</string>
+	<string name="scan_category">Quét</string>
+	<string name="content_category">Nội dung</string>
+	<string name="locale_category">Ngôn ngữ</string>
+	<string name="custom_locale">Tùy chọn ngôn ngữ</string>
+	<string name="follow_system_settings">Theo cài đặt của máy</string>
+	<string name="show_crop_handle">Hiện giới hạn cắt hình</string>
+	<string name="show_crop_handle_summary">Giới hạn vùng quét.</string>
+	<string name="barcode_formats">Các định dạng mã vạch</string>
+	<string name="zoom_by_swiping">Vuốt lên/xuống để phóng to/thu nhỏ</string>
+	<string name="zoom_by_swiping_summary">Vuốt lên/xuống ở màn hình camera để điều chỉnh độ phóng.</string>
+	<string name="auto_rotate">Nhận diện mã vạch đứng một chiều</string>
+	<string name="auto_rotate_summary">Tự động xoay khung camera để nhận diện mã vạch đứng một chiều. Tùy theo máy, cài đặt này có thể ảnh hưởng đến tốc độ xử lý.</string>
+	<string name="try_harder">Tối ưu hoá độ chính xác</string>
+	<string name="try_harder_summary">Kích hoạt tùy chọn này đối với mã rất khó đọc. Có thể ảnh hưởng đến tốc độ xử lý.</string>
+	<string name="show_toast_in_bulk_mode">Hiện dữ liệ liên tục</string>
+	<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="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>
+	<string name="ignore_consecutive_duplicates_summary">Không lưu các kết quả quét trùng lặp liên tục vào lịch sử.</string>
+	<string name="open_immediately">Mở ngay</string>
+	<string name="open_immediately_summary">Bỏ qua kiểm tra và mở ngay nội dung. Có thể mở nội dung nguy hiểm nếu kích hoạt.</string>
+	<string name="copy_immediately">Sao chép kết quả</string>
+	<string name="copy_immediately_summary">Tự động sao chép kết quả. Lưu ý: ứng dụng khác có thể xem nội dung bạn đã sao chép.</string>
+	<string name="show_meta_data">Hiện dữ liệu</string>
+	<string name="show_meta_data_summary">Hiện thêm thông tin về mã vạch quét được.</string>
+	<string name="show_hex_dump">Hiện mã thập lục phân</string>
+	<string name="show_hex_dump_summary">Hiện mã thập lục phân từ mã quét được.</string>
+	<string name="close_automatically">Quay lại sau khi Sao chép/Chia sẻ</string>
+	<string name="close_automatically_summary">Tự động quay trở về màn hình quét sao khi sao chép hoặc chia sẻ nội dung đọc được.</string>
+	<string name="default_search_engine">Mở dữ liệu không xác định bằng</string>
+	<string name="always_ask">Luôn hỏi</string>
+	<string name="open_with_url">Mở dữ liệu không xác định với URL</string>
+	<string name="clear_network_suggestions">Xoá gợi ý mạng</string>
+	<string name="clear_network_suggestions_summary">Xoá tất cả trang mạng được gợi ý bởi ứng dụng này.</string>
+	<string name="really_remove_all_networks">Thật sự xoá tất cả trang mạng?</string>
+	<string name="clear_network_suggestions_success">Gợi ý mạng đã xoá</string>
+	<string name="clear_network_suggestions_nothing_to_remove">Không còn gì để xoá</string>
+	<string name="send_category">Chuyển tới</string>
+	<string name="send_scan_url">Gửi tất cả mã quét được đến URL</string>
+	<string name="send_scan_type">Kiểu yêu cầu đối với mỗi lần quét</string>
+	<string name="send_type_get_add_content">GET và chỉ thêm nội dung</string>
+	<string name="send_type_get_query_string">GET với xâu truy vấn đầy đủ</string>
+	<string name="send_type_post_form">POST application/x-www-form-urlencoded</string>
+	<string name="send_type_post_json">POST application/json</string>
+	<string name="test_url">URL thử</string>
+	<string name="really_remove_scan">Thật sự xoá lần quét này?</string>
+	<string name="really_remove_all_scans">Thật sự xoá tất cả các lần quét?</string>
+	<string name="really_remove_selected_scans">Thật sự xoá các lần quét được chọn?</string>
+	<string name="clear_history">Xoá lịch sử</string>
+	<string name="copy_scan">Sao chép lần quét</string>
+	<string name="edit_scan">Sửa nhãn</string>
+	<string name="remove_scan">Xoá lần quét</string>
+	<string name="enter_name">Nhập tên để miêu tả lần quét</string>
+	<string name="enter_name_hint">Tên lần quét</string>
+	<string name="no_barcode_found">Không tìm thấy mã vạch</string>
+	<string name="pick_list_separator">Phân chia các mục như thế nào?</string>
+	<string name="separator_line_break">Ngắt dòng</string>
+	<string name="separator_ruler">Đường kẻ</string>
+	<string name="save_as_file_name">Lưu vào Downloads?</string>
+	<string name="file_name">Tên tệp</string>
+	<string name="error_saving_file">Không thể lưu tệp</string>
+	<string name="error_file_exists">Tệp đã tồn tại</string>
+	<string name="connect_to_wifi">Kết nối WiFi</string>
+	<string name="wifi_config_failed">Không thể thiết lập WiFi</string>
+	<string name="wifi_added">Đã thêm WiFi</string>
+	<string name="sms_send">Gửi tin nhắn SMS</string>
+	<string name="sms_error">Không thể gửi tin nhắn SMS</string>
+	<string name="tel_dial">Gọi theo số này</string>
+	<string name="tel_error">Không thể gọi số này</string>
+	<string name="mail_send">Gửi mail</string>
+	<string name="mail_error">Không thể gửi mail</string>
+	<string name="vcard_add">Thêm vào danh bạ</string>
+	<string name="vcard_failed">Không thể thêm vào danh bạ</string>
+	<string name="vevent_add">Thêm vào lịch</string>
+	<string name="vevent_failed">Không thể thêm vào lịch</string>
+	<string name="otpauth_add">Thêm xác thực hai bước</string>
+	<string name="search_web">Tìm kiếm web</string>
+	<string name="search_scan">Tìm kiếm lần quét</string>
+	<string name="export_to_file">Xuất thành tệp</string>
+	<string name="export_as">Xuất dưói dạng?</string>
+	<string name="export_csv_comma">Tệp CSV với dấu phẩy</string>
+	<string name="export_csv_semicolon">Tệp CSV với dấu chấm phẩy</string>
+	<string name="export_json">Tệp JSON</string>
+	<string name="export_database">Cơ sở dữ liệu SQLite</string>
+	<string name="saved_in_downloads">Lưu vào Downloads</string>
+	<string name="rotate_image_cw">Quay ảnh theo chiều kim đồng hồ</string>
+	<string name="pick_file">Chọn tệp ảnh</string>
+	<string name="pick_code_to_scan">Chọn mã để quét</string>
+	<string name="shortcut_decode">Quét mã vạch</string>
+	<string name="shortcut_encode">Tạo mã vạch</string>
+	<string name="shortcut_preferences">Cài đặt</string>
+	<string name="background_request_failed">Yêu cầu nền thất bại</string>
+	<string name="entry_type">Type</string>
+	<string name="wifi_network">Wi-Fi network</string>
+	<string name="wifi_ssid">Name</string>
+	<string name="wifi_type">Authentication type</string>
+	<string name="wifi_password">Password</string>
+	<string name="wifi_hidden">Hidden network</string>
+	<string name="wifi_eap">EAP method</string>
+	<string name="wifi_anonymous_identity">Anonymous identity</string>
+	<string name="wifi_identity">Identity</string>
+	<string name="wifi_phase2">Phase 2 method</string>
+</resources>

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

@@ -146,4 +146,14 @@
 	<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>

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

@@ -147,4 +147,14 @@
 	<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>

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

@@ -147,4 +147,14 @@
 	<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>
 </resources>

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

@@ -20,6 +20,30 @@ class WifiConnectorTest {
 		assertFalse(info.hidden)
 	}
 
+	@Test
+	fun anonymousIdentity() {
+		val info = simpleDataAccessor("WIFI:T:WPA2-EAP;S:wifi;P:password;I:ident;A:anonymous;;")
+
+		assertEquals("WPA2-EAP", info.securityType)
+		assertEquals("wifi", info.ssid)
+		assertEquals("password", info.password)
+		assertEquals("ident", info.identity)
+		assertEquals("anonymous", info.anonymousIdentity)
+		assertFalse(info.hidden)
+	}
+
+	@Test
+	fun anonymousIdentityAI() {
+		val info = simpleDataAccessor("WIFI:T:WPA2-EAP;S:wifi;P:password;I:ident;AI:anonymous;;")
+
+		assertEquals("WPA2-EAP", info.securityType)
+		assertEquals("wifi", info.ssid)
+		assertEquals("password", info.password)
+		assertEquals("ident", info.identity)
+		assertEquals("anonymous", info.anonymousIdentity)
+		assertFalse(info.hidden)
+	}
+
 	@Test
 	fun hidden() {
 		val info = simpleDataAccessor("WIFI:T:WPA;S:asdfz;P:password;H:true;;")

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		kotlin_version = '1.5.30'
-		tools_version = '7.0.1'
+		tools_version = '7.0.3'
 		build_tools_version = '30.0.2'
 		sdk_version = 30
 		support_version = '25.3.1'

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

@@ -0,0 +1,4 @@
+* Add a setting to set the delay for bulk mode
+* Add support for MECARD contact format
+* Remove unused permissions on Android Q
+