diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 20:07:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-02 20:07:06 +0000 |
| commit | 9829ed351c60561dbd8edcb0b7ae2c7db7ca09ca (patch) | |
| tree | 6f4377fbb02bf57adb79980d30b9b52984dffd15 /res/values-en-rGB | |
| parent | f482f9e73e4e4c649d599e14b0f7f43df921e5e3 (diff) | |
| parent | 7acc700b50d3c2d1b8181595f0365dc369bf0789 (diff) | |
| download | android_packages_apps_UnifiedEmail-9829ed351c60561dbd8edcb0b7ae2c7db7ca09ca.tar.gz android_packages_apps_UnifiedEmail-9829ed351c60561dbd8edcb0b7ae2c7db7ca09ca.tar.bz2 android_packages_apps_UnifiedEmail-9829ed351c60561dbd8edcb0b7ae2c7db7ca09ca.zip | |
am 7acc700b: resolved conflicts for merge of 7bcf66fb to lmp-mr1-dev-plus-aosp
* commit '7acc700b50d3c2d1b8181595f0365dc369bf0789':
Use link to linkify account settings
Diffstat (limited to 'res/values-en-rGB')
| -rw-r--r-- | res/values-en-rGB/strings.xml | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 63b235fcb..f58854aba 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -387,11 +387,6 @@ <string name="folder_icon_desc" msgid="6272938864914794739">"Folder icon"</string> <string name="add_account" msgid="5905863370226612377">"Add account"</string> <string name="dismiss_tip_hover_text" msgid="5400049020835024519">"Dismiss tip"</string> - <string name="auto_sync_off" msgid="3664082916022670831">"Auto-sync is off."</string> - <string name="tap_to_enable_sync" msgid="30588010316606899">"Touch to turn on."</string> - <string name="account_sync_off" msgid="1351286883806741348">"Account sync is off."</string> - <string name="enable_sync_in_account_settings" msgid="2596841920743507047">"Turn on in <xliff:g id="ACCOUNT_SETTINGS">%1$s</xliff:g>."</string> - <string name="account_settings_param" msgid="3649244241101156660">"Account settings"</string> <string name="unsent_messages_in_outbox" msgid="146722891559469589">"<xliff:g id="NUMBER">%1$s</xliff:g> unsent in <xliff:g id="OUTBOX">%2$s</xliff:g>"</string> <string name="turn_auto_sync_on_dialog_title" msgid="543412762396502297">"Turn auto-sync on?"</string> <string name="turn_auto_sync_on_dialog_body" msgid="614939812938149398">"Changes you make to all apps and accounts, not just Gmail, will be synchronised between the web, your other devices and your <xliff:g id="PHONE_OR_TABLET">%1$s</xliff:g>."</string> |