am 22538106: am d8800386: am 2d3730b5: am cb45d6fa: Merge "Change account type strings for AccountManager UI" into ub-gmail-ur14-dev

* commit '2253810635b44672c654cbf6c23f6babbf00c645':
  Change account type strings for AccountManager UI
This commit is contained in:
Tony Mantler 2014-11-02 18:52:23 +00:00 committed by Android Git Automerger
commit eaafa9a974

View File

@ -628,8 +628,10 @@
<string name="confirm_response">Sending response&#8230;</string> <string name="confirm_response">Sending response&#8230;</string>
<!-- Used by AccountManager --> <!-- Used by AccountManager -->
<string name="imap_name">IMAP</string> <!-- Account type name as used by AccountManager UI (IMAP is not translatable) [CHAR LIMIT=30] -->
<string name="pop3_name">POP3</string> <string name="imap_name">Personal (IMAP)</string>
<!-- Account type name as used by AccountManager UI (POP3 is not translatable) [CHAR LIMIT=30] -->
<string name="pop3_name">Personal (POP3)</string>
<!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]--> <!-- Displayed when the user must pick his server's trash folder from a list [CHAR LIMIT 30]-->
<string name="trash_folder_selection_title">Select server trash folder for <xliff:g id="account">%s</xliff:g></string> <string name="trash_folder_selection_title">Select server trash folder for <xliff:g id="account">%s</xliff:g></string>