Merge pull request #1879 from keymanapp/android-ui-strings-dictionary

[Android] UI Strings:  'Model' -> 'Dictionary'
This commit is contained in:
Joshua Horton 2019-07-22 11:00:25 +07:00 • committed by GitHub
commit f9aa5f305c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 13 deletions

View file

@ -34,6 +34,7 @@
<string name="more_info" translatable="false">More info</string>
<string name="show_get_started" translatable="false">Show \"Get Started\" on startup</string>
<!-- Keyman Settings menu strings -->
<string name="keyman_settings" translatable="false">Settings</string>
<string name="installed_languages_empty" translatable="false">Installed languages</string>

View file

@ -67,7 +67,7 @@ public final class ModelInfoActivity extends AppCompatActivity {
final TextView textView = (TextView) findViewById(R.id.bar_title);
final String modelName = getIntent().getStringExtra(KMManager.KMKey_LexicalModelName);
textView.setText(String.format("%s model", modelName));
textView.setText(String.format(getString(R.string.model_info_header), modelName));
if (titleFont != null)
textView.setTypeface(titleFont, Typeface.BOLD);

View file

@ -68,7 +68,7 @@ public final class ModelPickerActivity extends AppCompatActivity {
languageID = newLanguageID;
final String languageName = bundle.getString(KMManager.KMKey_LanguageName);
textView.setText(String.format("%s model", languageName));
textView.setText(String.format(getString(R.string.model_picker_header), languageName));
listView = (ListView) findViewById(R.id.listView);
listView.setFastScrollEnabled(true);
@ -135,7 +135,7 @@ public final class ModelPickerActivity extends AppCompatActivity {
modelInfo.put(KMManager.KMKey_CustomHelpLink, "");
boolean result = KMManager.addLexicalModel(context, new HashMap<>(modelInfo));
if (result) {
Toast.makeText(context, "Model installed", Toast.LENGTH_SHORT).show();
Toast.makeText(context, getString(R.string.model_install_toast), Toast.LENGTH_SHORT).show();
}
immediateRegister = true;

View file

@ -30,14 +30,14 @@
<!-- For the following, &#8230; is the ellipsis character "..." -->
<!-- Cloud API related strings -->
<string name="getting_cloud_catalog" translatable="false">Getting keyboard and model catalog.\nThis may take a while&#8230;</string>
<string name="getting_cloud_catalog" translatable="false">Getting keyboard and dictionary catalogs.\nThis may take a while&#8230;</string>
<!-- Keyboard Updates -->
<string name="cannot_connect" translatable="false">Cannot connect to Keyman server!</string>
<string name="checking_keyboard_updates" translatable="false">Checking keyboard updates&#8230;</string>
<string name="confirm_delete_keyboard" translatable="false">Would you like to delete this keyboard?</string>
<string name="confirm_download_keyboard" translatable="false">Would you like to download this keyboard?</string>
<string name="confirm_update" translatable="false">Would you like to update keyboards and models now?</string>
<string name="confirm_update" translatable="false">Would you like to update keyboards and dictionaries now?</string>
<string name="custom_keyboard" translatable="false">Custom Keyboard</string>
<string name="downloading_keyboard" translatable="false">Downloading keyboard&#8230;</string>
<string name="font_failed_to_download" translatable="false">Warning: Font failed to download</string>
@ -52,10 +52,10 @@
<string name="uninstall_keyboard" translatable="false">Uninstall keyboard</string>
<!-- Model Updates -->
<string name="getting_model_catalog" translatable="false">Getting lexical model catalog.\nThis may take a while&#8230;</string>
<string name="confirm_download_model" translatable="false">Would you like to download this model?</string>
<string name="checking_model_download" translatable="false">Checking to download model&#8230;</string>
<string name="downloading_model" translatable="false">Downloading model&#8230;</string>
<string name="getting_model_catalog" translatable="false">Getting dictionary catalog.\nThis may take a while&#8230;</string>
<string name="confirm_download_model" translatable="false">Would you like to download this dictionary?</string>
<string name="checking_model_download" translatable="false">Checking to download dictionary&#8230;</string>
<string name="downloading_model" translatable="false">Downloading dictionary&#8230;</string>
<string name="catalog_unavailable" translatable="false">The resource catalog is unavailable\n</string>
<!-- General Updates -->
@ -63,15 +63,18 @@
<string name="update_check_current" translatable="false">"All resources are up to date!"</string>
<!-- Model Info -->
<string name="model_version" translatable="false">Model version</string>
<string name="uninstall_model" translatable="false">Uninstall model</string>
<string name="confirm_delete_model" translatable="false">Would you like to delete this model?</string>
<string name="model_version" translatable="false">Dictionary version</string>
<string name="uninstall_model" translatable="false">Uninstall dictionary</string>
<string name="confirm_delete_model" translatable="false">Would you like to delete this dictionary?</string>
<!-- Language Settings menu strings -->
<string name="enable_corrections" translatable="false">Enable corrections</string>
<string name="enable_predictions" translatable="false">Enable predictions</string>
<string name="model" translatable="false">Model</string>
<string name="model" translatable="false">Dictionary</string>
<string name="model_info_header" translatable="false">Dictionary: %s</string>
<string name="model_picker_header" translatable="false">%s dictionaries</string>
<string name="manage_dictionary" translatable="false">Manage dictionary</string>
<string name="model_install_toast" translatable="false">Dictionary installed</string>
<string name="single_keyboard_count" translatable="false">(1 keyboard)</string>
<string name="multiple_keyboard_count" translatable="false">(%d keyboards)</string>