Skip to content

Commit fba47ec

Browse files
codeanticodecodeanticode
committed
done with SDK strings
1 parent 286076c commit fba47ec

3 files changed

Lines changed: 91 additions & 300 deletions

File tree

‎mode/languages/mode.properties‎

Lines changed: 39 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -138,148 +138,49 @@ android_runner.status.unknwon_exception = Unknown exception
138138

139139
android_sdk.dialog.found_installed_sdk_title = Found an Android SDK!
140140
android_sdk.dialog.found_installed_sdk_body = Processing found a valid Android SDK that seems to be in use already. Processing could use this SDK too, or download a new one.<br><br>Sharing the same SDK across different development tools, like Processing and Android Studio, will save space (the SDK may use up to several GBs), but when one tool updates the SDK, it can create problems in the other. If Processing downloads a new SDK, it will keep it separate from the one it just found.<br><br>What do you want to do?
141-
142141
android_sdk.option.use_existing_sdk = Use existing SDK
143142
android_sdk.option.download_new_sdk = Download new SDK
144-
145-
146143
android_sdk.dialog.cannot_find_sdk_title = Cannot find an Android SDK...
147-
android_sdk.dialog.cannot_find_sdk_body = Processing did not find an Android SDK on this computer. If there is one, and you know where it is, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API %s.
148-
144+
android_sdk.dialog.cannot_find_sdk_body = Processing did not find an Android SDK on this computer. If there is one, and you know where it is, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API %s.
149145
android_sdk.dialog.invalid_sdk_title = Android SDK is not valid...
150-
android_sdk.dialog.invalid_sdk_body =
151-
private static final String INVALID_SDK_TITLE =
152-
"";
153-
private static final String INVALID_SDK_MESSAGE =
154-
"Processing found an Android SDK, but is not valid. It could be missing " +
155-
"some files, or might not be including the required platform for " +
156-
"API " + AndroidBuild.TARGET_SDK + ".<br><br>" +
157-
"If a valid SDK is available in a different location, " +
158-
"click \"Locate SDK path\" to select it, or \"Download SDK\" to let " +
159-
"Processing download the SDK automatically.<br><br>" +
160-
"If you want to download the SDK manually, you can get "+
161-
"the command line tools from <a href=\"" + SDK_DOWNLOAD_URL + "\">here</a>. " +
162-
"Make sure to install the SDK platform for API " + AndroidBuild.TARGET_SDK + ".";
163-
164-
private static final String COMMAND_LINE_TUT_URL =
165-
"http://android.processing.org/tutorials/command_line/index.html";
166-
167-
private static final String ANDROID_SYS_IMAGE_PRIMARY =
168-
"Download phone system image?";
169-
170-
private static final String ANDROID_SYS_IMAGE_SECONDARY =
171-
"The system image needed by the emulator does not appear to be installed. " +
172-
"Do you want Processing to download and install it now? <br><br>" +
173-
"Otherwise, you will need to do it through the sdkmanager<br>" +
174-
"command line tool, check <a href=\"" + COMMAND_LINE_TUT_URL +
175-
"\">this online tutorial</a> for more info.";
176-
177-
private static final String ANDROID_SYS_IMAGE_WEAR_PRIMARY =
178-
"Download watch system image?";
179-
180-
private static final String ANDROID_SYS_IMAGE_WEAR_SECONDARY =
181-
"The system image needed by the emulator does not appear to be installed. " +
182-
"Do you want Processing to download and install it now? <br><br>" +
183-
"Otherwise, you will need to do it through the sdkmanager<br>" +
184-
"command line tool, check <a href=\"" + COMMAND_LINE_TUT_URL +
185-
"\">this online tutorial</a> for more info.";
186-
187-
private static final String SELECT_ANDROID_SDK_FOLDER =
188-
"Choose the location of the Android SDK";
189-
190-
private static final String SDK_INSTALL_TITLE = "SDK installed!";
191-
192-
private static final String PROCESSING_FOR_ANDROID_URL =
193-
"http://android.processing.org/";
194-
195-
private static final String WHATS_NEW_URL =
196-
"http://android.processing.org/whatsnew.html";
197-
198-
private static final String DRIVER_INSTALL_URL =
199-
"https://developer.android.com/studio/run/oem-usb.html#InstallingDriver";
200-
201-
private static final String SDK_INSTALL_MESSAGE =
202-
"Processing just downloaded and installed the Android SDK succesfully. " +
203-
"The Android mode is now ready to use!<br><br>" +
204-
"For documentation, examples, and tutorials, " +
205-
"visit the <a href=\"" + PROCESSING_FOR_ANDROID_URL + "\">Processing for Android website</a>, and " +
206-
"if you updated from version 3 of the mode, check the <a href=\"" + WHATS_NEW_URL + "\">what's new page</a>.";
207-
208-
private static final String SDK_EXISTS_TITLE = "SDK configured!";
209-
210-
private static final String SDK_EXISTS_MESSAGE =
211-
"Processing will use the existing Android SDK. " +
212-
"The Android mode is now ready to use!<br><br>" +
213-
"For documentation, examples, and tutorials, " +
214-
"visit the <a href=\"" + PROCESSING_FOR_ANDROID_URL + "\">Processing for Android website</a>, and " +
215-
"if you updated from version 3 of the mode, check the <a href=\"" + WHATS_NEW_URL + "\">what's new page</a>.";
216-
217-
private static final String DRIVER_INSTALL_MESSAGE = "<br><br>" +
218-
"If you are planning to use Google Nexus devices, then you need the " +
219-
"Google USB Driver to connect them to Processing. You will have to " +
220-
"install the driver manually following <a href=\"" + DRIVER_INSTALL_URL +
221-
"\">these instructions</a>.<br><br>" +
222-
"The installation files are available in this folder:</br>";
223-
224-
private static final String SDK_LICENSE_URL =
225-
"https://developer.android.com/studio/terms.html";
226-
227-
private static final String SDK_LICENSE_TITLE = "Accept SDK license?";
228-
229-
private static final String SDK_LICENSE_MESSAGE =
230-
"You need to accept the terms of the Android SDK license from Google in " +
231-
"order to use the SDK. Read the license <a href=\"" + SDK_LICENSE_URL +
232-
"\">from here</a>.";
233-
234-
private static final String NO_SDK_LICENSE_TITLE = "SDK license not accepted";
235-
236-
private static final String NO_SDK_LICENSE_MESSAGE =
237-
"The Android SDK was installed, but will not be usable. You can accept " +
238-
"the license at a later time by opening a terminal, changing to the " +
239-
"SDK folder, and then running the following command:<br><br>" +
240-
"tools/bin/sdkmanager --licenses";
241-
242-
private static final String SYSTEM_32BIT_TITLE = "System is 32 bit...";
243-
244-
private static final String SYSTEM_32BIT_URL =
245-
"https://askubuntu.com/questions/710426/android-sdk-on-ubuntu-32bit";
246-
247-
private static final String SYSTEM_32BIT_MESSAGE =
248-
"The Android SDK no longer includes 32 bit platform tools (adb, etc.), and so they will not work.<br><br>" +
249-
"<a href=\"" + SYSTEM_32BIT_URL + "\">This thread</a> provides some possible workarounds.";
250-
251-
private static final String ADB_TROUBLE_TITLE = "Trouble with adb!";
252-
253-
private static final String ADB_TROUBLE_MESSAGE = "Could not run the adb tool from the Android SDK.\n" +
254-
"One possibility is that its executable permission\n" +
255-
"is not properly set. You can try setting this\n" +
256-
"permission manually, or re-installing the SDK.\n\n" +
257-
"The mode will be disabled until this problem is fixed.\n";
258-
259-
260-
private static final String YES_PROMPT = "Yes";
261-
private static final String NO_PROMPT = "No";
262-
263-
264-
265-
private static final String DOWNLOAD_SDK_AUTOMATICALLY = "Download SDK automatically";
266-
private static final String LOCATE_SDK_MANUALLY = "Locate SDK path manually";
267-
268-
269-
private static final String MISSING_SDK_FOLDER = " does not exist";
270-
private static final String MISSING_TOOLS_FOLDER = "There is no tools folder in ";
271-
private static final String MISSING_PLATFORM_TOOLS_FOLDER = "There is no platform-tools folder in ";
272-
private static final String MISSING_BUILD_TOOLS_FOLDER = "There is no build-tools folder in ";
273-
private static final String MISSING_PLATFORMS_FOLDER = "There is no platforms folder in ";
274-
275-
private static final String MISSING_TARGET_PLATFORM = "There is no Android ";
276-
private static final String MISSING_ANDROID_JAR = "android.jar for plaform ";
277-
278-
private static final String REMOVING_KEYSTORE_FILE = "Removing expired debug.keystore file.";
279-
private static final String CANNOT_REMOVE_KEYSTORE_FILE = "Could not remove the expired debug.keystore file.";
280-
private static final String REMOVE_FILE_PROMPT = "Please remove the file ";
281-
private static final String INVALID_DATE = "The date '";
282-
private static final String REPORT_BUG_PROMPT = "Please report this as a bug so we can fix it.";
146+
android_sdk.dialog.invalid_sdk_body = Processing found an Android SDK, but is not valid. It could be missing some files, or might not be including the required platform for API %s.<br><br>If a valid SDK is available in a different location, click \"Locate SDK path\" to select it, or \"Download SDK\" to let Processing download the SDK automatically.<br><br>If you want to download the SDK manually, you can get the command line tools from <a href=\"%s\">here</a>. Make sure to install the SDK platform for API %s.
147+
android_sdk.option.download_sdk = Download SDK automatically
148+
android_sdk.option.locate_sdk = Locate SDK path manually
149+
android_sdk.dialog.download_phone_image_title = Download phone system image?
150+
android_sdk.dialog.download_phone_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
151+
android_sdk.dialog.download_watch_image_title = Download watch system image?
152+
android_sdk.dialog.download_watch_image_body = The system image needed by the emulator does not appear to be installed. Do you want Processing to download and install it now?
153+
android_sdk.dialog.select_sdk_folder = Choose the location of the Android SDK
154+
android_sdk.error.sdk_selection_canceled = User canceled attempt to find SDK
155+
android_sdk.error.sdk_download_canceled = User canceled SDK download
156+
android_sdk.error.sdk_download_failed = SDK could not be downloaded
157+
android_sdk.dialog.sdk_installed_title = SDK installed!
158+
android_sdk.dialog.sdk_installed_body = Processing just downloaded and installed the Android SDK succesfully. The Android mode is now ready to use!<br><br>For documentation, examples, and tutorials, visit the <a href=\"%s\">Processing for Android website</a>, and if you updated from version 3 of the mode, check the <a href=\"%s"\">what's new page</a>.
159+
android_sdk.dialog.install_usb_driver = <br><br>If you are planning to use Google Nexus devices, then you need the Google USB Driver to connect them to Processing. You will have to install the driver manually following <a href=\"%s\">these instructions</a>.<br><br>The installation files are available in this folder:</br>%s
160+
android_sdk.dialog.sdk_license_rejected_title = SDK license not accepted
161+
android_sdk.dialog.sdk_license_rejected_body = The Android SDK was installed, but will not be usable. You can accept the license at a later time by opening a terminal, changing to the SDK folder, and then running the following command:<br><br>tools/bin/sdkmanager --licenses
162+
android_sdk.dialog.32bit_system_title = System is 32 bit...
163+
android_sdk.dialog.32bit_system_body = The Android SDK no longer includes 32 bit platform tools (adb, etc.), and so they will not work.<br><br><a href=\"%s\">This thread</a> provides some possible workarounds.
164+
android_sdk.error.emulator_download_canceled = User canceled emulator download
165+
android_sdk.error.emulator_download_failed = Emulator could not be downloaded
166+
android_sdk.dialog.using_existing_sdk_title = SDK configured!
167+
android_sdk.dialog.using_existing_sdk_body = Processing will use the existing Android SDK. The Android mode is now ready to use!<br><br>For documentation, examples, and tutorials, visit the <a href=\"%s\">Processing for Android website</a>, and if you updated from version 3 of the mode, check the <a href=\"%s\">what's new page</a>.
168+
android_sdk.dialog.accept_sdk_license_title = Accept SDK license?
169+
android_sdk.dialog.accept_sdk_license_body = You need to accept the terms of the Android SDK license from Google in order to use the SDK. Read the license <a href=\"%s\">from here</a>.
170+
android_sdk.warn.cannot_run_adb_title = Trouble with adb!
171+
android_sdk.warn.cannot_run_adb_body = Could not run the adb tool from the Android SDK.\nOne possibility is that its executable permission\nis not properly set. You can try setting this\npermission manually, or re-installing the SDK.\n\nThe mode will be disabled until this problem is fixed.\n
172+
android_sdk.error.missing_sdk_folder = %s does not exist
173+
android_sdk.error.missing_tools_folder = There is no tools folder in %s
174+
android_sdk.error.missing_platform_tools_folder = There is no platform-tools folder in %s
175+
android_sdk.error.missing_build_tools_folder = There is no build-tools folder in %s
176+
android_sdk.error.missing_platforms_folder = There is no platforms folder in %s
177+
android_sdk.error.missing_target_platform = There is no Android %s in %s
178+
android_sdk.error.missing_android_jar = android.jar for plaform %s is missing from %s
179+
android_debugger.info.removing_expired_keystore = Removing expired debug.keystore file.
180+
android_debugger.error.cannot_remove_expired_keystore = Could not remove the expired debug.keystore file.
181+
android_debugger.error.request_removing_keystore = Please remove the file %s
182+
android_debugger.error.invalid_keystore_timestamp = The date '%s' could not be parsed.
183+
android_debugger.error.request_bug_report = Please report this as a bug so we can fix it.
283184

284185
# ---------------------------------------
285186
# AVD

‎mode/libraries/ar/examples/Spheres/code/sketch.properties‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1+
mode=Android
12
component=ar
3+
mode.id=processing.mode.android.AndroidMode

0 commit comments

Comments
 (0)