Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bda0d8e3: Merge "Mark configuration strings as non-translatable."

Browse Source 
* commit 'bda0d8e3d6d4ddb5d70351169852693b4c5ec047':
  Mark configuration strings as non-translatable.
This commit is contained in:
Robert Greenwalt
2014-08-20 23:50:00 +00:00
committed by Android Git Automerger
parent be39e99187 bda0d8e3d6
commit 4b48ce8f0c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/res/res/values/config.xml
View File

@@ -469,10 +469,10 @@
<integer name="config_longPressOnPowerBehavior">1</integer> <integer name="config_longPressOnPowerBehavior">1</integer>
<!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] --> <!-- Package name for default keyguard appwidget [DO NOT TRANSLATE] -->
<string name="widget_default_package_name"></string> <string name="widget_default_package_name" translatable="false"></string>
<!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] --> <!-- Class name for default keyguard appwidget [DO NOT TRANSLATE] -->
<string name="widget_default_class_name"></string> <string name="widget_default_class_name" translatable="false"></string>
<!-- Indicate whether the SD card is accessible without removing the battery. --> <!-- Indicate whether the SD card is accessible without removing the battery. -->
<bool name="config_batterySdCardAccessibility">false</bool> <bool name="config_batterySdCardAccessibility">false</bool>
@@ -888,7 +888,7 @@
PERSIST may improve performance by reducing how often journal blocks are PERSIST may improve performance by reducing how often journal blocks are
reallocated (compared to truncation) resulting in better data block locality reallocated (compared to truncation) resulting in better data block locality
and less churn of the storage media. --> and less churn of the storage media. -->
<string name="db_default_journal_mode">PERSIST</string> <string name="db_default_journal_mode" translatable="false">PERSIST</string>
<!-- Maximum size of the persistent journal file in bytes. <!-- Maximum size of the persistent journal file in bytes.
If the journal file grows to be larger than this amount then SQLite will If the journal file grows to be larger than this amount then SQLite will
@@ -900,7 +900,7 @@
NORMAL also preserves durability in non-WAL modes and uses checksums to ensure NORMAL also preserves durability in non-WAL modes and uses checksums to ensure
integrity although there is a small chance that an error might go unnoticed. integrity although there is a small chance that an error might go unnoticed.
Choices are: FULL, NORMAL, OFF. --> Choices are: FULL, NORMAL, OFF. -->
<string name="db_default_sync_mode">FULL</string> <string name="db_default_sync_mode" translatable="false">FULL</string>
<!-- The database synchronization mode when using Write-Ahead Logging. <!-- The database synchronization mode when using Write-Ahead Logging.
FULL is safest and preserves durability at the cost of extra fsyncs. FULL is safest and preserves durability at the cost of extra fsyncs.
@@ -908,7 +908,7 @@
and after checkpoint operations. If checkpoints are infrequent and power loss and after checkpoint operations. If checkpoints are infrequent and power loss
occurs, then committed transactions could be lost and applications might break. occurs, then committed transactions could be lost and applications might break.
Choices are: FULL, NORMAL, OFF. --> Choices are: FULL, NORMAL, OFF. -->
<string name="db_wal_sync_mode">FULL</string> <string name="db_wal_sync_mode" translatable="false">FULL</string>
<!-- The Write-Ahead Log auto-checkpoint interval in database pages (typically 1 to 4KB). <!-- The Write-Ahead Log auto-checkpoint interval in database pages (typically 1 to 4KB).
The log is checkpointed automatically whenever it exceeds this many pages. The log is checkpointed automatically whenever it exceeds this many pages.
@@ -1085,7 +1085,8 @@
<!-- If supported and enabled, are dreams activated when asleep and charging? (by default) --> <!-- If supported and enabled, are dreams activated when asleep and charging? (by default) -->
<bool name="config_dreamsActivatedOnSleepByDefault">false</bool> <bool name="config_dreamsActivatedOnSleepByDefault">false</bool>
<!-- ComponentName of the default dream (Settings.Secure.SCREENSAVER_COMPONENT) --> <!-- ComponentName of the default dream (Settings.Secure.SCREENSAVER_COMPONENT) -->
<string name="config_dreamsDefaultComponent">com.google.android.deskclock/com.android.deskclock.Screensaver</string> <string name="config_dreamsDefaultComponent" translatable="false"
>com.google.android.deskclock/com.android.deskclock.Screensaver</string>
<!-- Base "touch slop" value used by ViewConfiguration as a <!-- Base "touch slop" value used by ViewConfiguration as a
movement threshold where scrolling should begin. --> movement threshold where scrolling should begin. -->
@@ -1222,20 +1223,20 @@
<!-- Class name of the framework account picker activity. <!-- Class name of the framework account picker activity.
Can be customized for other product types --> Can be customized for other product types -->
<string name="config_chooseAccountActivity" <string name="config_chooseAccountActivity" translatable="false"
>android/android.accounts.ChooseAccountActivity</string> >android/android.accounts.ChooseAccountActivity</string>
<!-- Class name of the account type and account picker activity. <!-- Class name of the account type and account picker activity.
Can be customized for other product types --> Can be customized for other product types -->
<string name="config_chooseTypeAndAccountActivity" <string name="config_chooseTypeAndAccountActivity" translatable="false"
>android/android.accounts.ChooseTypeAndAccountActivity</string> >android/android.accounts.ChooseTypeAndAccountActivity</string>
<!-- Component name of a custom ResolverActivity (Intent resolver) to be used instead of <!-- Component name of a custom ResolverActivity (Intent resolver) to be used instead of
the default framework version. If left empty, then the framework version will be used. the default framework version. If left empty, then the framework version will be used.
Example: com.google.android.myapp/.resolver.MyResolverActivity --> Example: com.google.android.myapp/.resolver.MyResolverActivity -->
<string name="config_customResolverActivity"></string> <string name="config_customResolverActivity" translatable="false"></string>
<!-- Apps that are authorized to access shared accounts, overridden by product overlays --> <!-- Apps that are authorized to access shared accounts, overridden by product overlays -->
<string name="config_appsAuthorizedForSharedAccounts">;com.android.settings;</string> <string name="config_appsAuthorizedForSharedAccounts" translatable="false">;com.android.settings;</string>
<!-- Flag indicating that the media framework should not allow changes or mute on any <!-- Flag indicating that the media framework should not allow changes or mute on any
stream or master volumes. --> stream or master volumes. -->