diff options
| author | Paul Westbrook <pwestbro@google.com> | 2014-11-02 10:49:50 -0800 |
|---|---|---|
| committer | Paul Westbrook <pwestbro@google.com> | 2014-11-02 10:49:50 -0800 |
| commit | 6666fbf0908dcfdd626e84625b2305e7e2475488 (patch) | |
| tree | 87e5ce556c286cc64a2667101771e0cb983581c8 /res/values-pt-rPT | |
| parent | 8eca7d6a5077754dbc3f1ec78506458a3384efb0 (diff) | |
| parent | 34370d5a6e8cfae302507aea7a900831a63875e4 (diff) | |
| download | android_packages_apps_Email-6666fbf0908dcfdd626e84625b2305e7e2475488.tar.gz android_packages_apps_Email-6666fbf0908dcfdd626e84625b2305e7e2475488.tar.bz2 android_packages_apps_Email-6666fbf0908dcfdd626e84625b2305e7e2475488.zip | |
resolved conflicts for merge of 34370d5a to lmp-mr1-dev-plus-aosp
Change-Id: I28a5355b850c271bdead47874d586c557e4557f6
Diffstat (limited to 'res/values-pt-rPT')
| -rw-r--r-- | res/values-pt-rPT/strings.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index e4ececdd4..ce5625f7c 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -248,7 +248,7 @@ <string name="account_settings_sync_calendar_summary" msgid="411960248618953311">"Sinc. evento do cal. p. esta conta"</string> <string name="account_settings_sync_email_enable" msgid="7135765408226471860">"Sincronizar email"</string> <string name="account_settings_sync_email_summary" msgid="71710510041953351">"Sincronizar email para esta conta"</string> - <string name="account_settings_vibrate_when_label" msgid="361069844540266098">"Vibrar"</string> + <string name="label_notification_vibrate_title" msgid="361069844540266098">"Vibrar"</string> <string name="account_settings_ringtone" msgid="2238523918221865167">"Escolher toque"</string> <string name="account_settings_servers" msgid="3386185135392642067">"Definições do servidor"</string> <string name="mailbox_settings_activity_title" msgid="2196614373847675314">"Opções de sincronização"</string> |