diff --git a/android/app/build.gradle b/android/app/build.gradle index ed83e445..efc470c7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -119,8 +119,8 @@ android { applicationId 'ca.psiphon.conduit' minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion - versionCode 21 - versionName "1.2.2-RC.21" + versionCode 22 + versionName "1.2.2-RC.22" } signingConfigs { config { diff --git a/package-lock.json b/package-lock.json index 906d4add..4c1d720e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7122,9 +7122,9 @@ } }, "node_modules/@shopify/react-native-skia": { - "version": "1.5.7", - "resolved": "https://registry.npmjs.org/@shopify/react-native-skia/-/react-native-skia-1.5.7.tgz", - "integrity": "sha512-b2NqgEx1VjB33ZhC54NiFkGEGrQVNFDBhtEUtCcFsCHg7uCgPqO7w8cAlllhvf4QhG8EGr/h1eHZo9rbPH73QQ==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/@shopify/react-native-skia/-/react-native-skia-1.5.10.tgz", + "integrity": "sha512-wjWE0eY6PJiWw1fIjh/XgpLGivnTNwASCDZCecpUMMNB3df2SaZUOSO1k1jBFzQ/2GXbf95CSd8DAA9caSl5nA==", "license": "MIT", "dependencies": { "canvaskit-wasm": "0.39.1", diff --git a/src/components/ConduitOrbToggle.tsx b/src/components/ConduitOrbToggle.tsx index b1a5cdcd..3378a433 100644 --- a/src/components/ConduitOrbToggle.tsx +++ b/src/components/ConduitOrbToggle.tsx @@ -115,7 +115,7 @@ export function ConduitOrbToggle({ }); // The "Turn On" text also uses interpolation to appear to fade in by going // from transparent to it's final color. - const orbText = t("TURN_ON_I18N.string"); + const orbText = t("TAP_TO_TURN_ON_I18N.string"); const orbTextColors = [palette.transparent, palette.midGrey]; const orbTextColorIndex = useSharedValue(0); const orbTextColor = useDerivedValue(() => { diff --git a/src/i18n/locales/en/translation.json b/src/i18n/locales/en/translation.json index 87b31593..e28db412 100644 --- a/src/i18n/locales/en/translation.json +++ b/src/i18n/locales/en/translation.json @@ -3,30 +3,14 @@ "string": "Loading...", "developer_comment": "Text displayed when the app is loading content." }, - "TURN_ON_I18N": { - "string": "Turn On", + "TAP_TO_TURN_ON_I18N": { + "string": "Tap to Turn On", "developer_comment": "Text displayed on a button to turn on a feature." }, - "CONDUIT_OFF_I18N": { - "string": "Conduit is OFF", - "developer_comment": "Indicates to the user that Conduit is off. The name 'Conduit' is the app name and should not be translated." - }, "YOUR_CONDUIT_ID_I18N": { "string": "Your Conduit ID", "developer_comment": "Text displayed to the user to indicate their Conduit ID. The name 'Conduit' is the app name and should not be translated." }, - "ANNOUNCING_I18N": { - "string": "Announcing...", - "developer_comment": "Text displayed while the Conduit Station is announcing it's presence to the network" - }, - "SERVING_N_PEERS_I18N": { - "string": "Serving {{ num }} Peers", - "developer_comment": "Indicates the number of peers currently connected to the user's Conduit Station" - }, - "SHUTTING_DOWN_I18N": { - "string": "Shutting Down...", - "developer_comment": "Text displayed while the Conduit Station is shutting down" - }, "TOTAL_BYTES_TRANSFERRED_I18N": { "string": "{{ niceBytes }} transferred" }, @@ -36,21 +20,12 @@ "CONNECTING_PEERS_I18N": { "string": "{{ peers }} connecting" }, - "DONE_I18N": { - "string": "Done" - }, "CANCEL_I18N": { "string": "Cancel" }, "CONFIRM_I18N": { "string": "Confirm" }, - "SAVE_I18N": { - "string": "Save" - }, - "EDIT_SETTINGS_I18N": { - "string": "Edit Settings" - }, "MAX_PEERS_I18N": { "string": "Max Peers" }, @@ -78,9 +53,6 @@ "ENABLED_I18N": { "string": "Enabled" }, - "PROXY_STATUS_I18N": { - "string": "Conduit Station is {{ status }}" - }, "CONDUIT_STATION_I18N": { "string": "Conduit Station" },