This removes the word "account" to eliminate the need for translation and to simplify
the use of overlays for vendors that need to customize these strings.
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-mr2
* commit '5905791775e7e431135bda21969b9e5efd24de62':
Import revised translations. DO NOT MERGE
Merge commit '5905791775e7e431135bda21969b9e5efd24de62' into eclair-plus-aosp
* commit '5905791775e7e431135bda21969b9e5efd24de62':
Import revised translations. DO NOT MERGE
Merge commit '98796942eab3215eb1c3c8486a65a152e8cee516' into eclair-mr2-plus-aosp
* commit '98796942eab3215eb1c3c8486a65a152e8cee516':
change BEFORE triggers to AFTER triggers - to make them work with sqlite 3.6.20 and beyond
Merge commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df' into eclair-mr2-plus-aosp
* commit 'c2b42a4d67efdb90f66212d00fb2cbbbc1c879df':
Import revised translations. DO NOT MERGE
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-mr2
* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
Import revised translations. DO NOT MERGE
Merge commit '2bae776e55231a365e1a0c326a736cbbbba166eb'
* commit '2bae776e55231a365e1a0c326a736cbbbba166eb':
Save the state of checkboxes when orientation is changed
Merge commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4' into eclair-mr2-plus-aosp
* commit '4cb25d93a23d086b954c03cb72afb2cf0248f1c4':
Save the state of checkboxes when orientation is changed
Merge commit 'ddc69f42482cf991562052c24d95a018fbce8c61' into eclair-plus-aosp
* commit 'ddc69f42482cf991562052c24d95a018fbce8c61':
Import revised translations. DO NOT MERGE
Merge commit 'b73742528492d022472b8a02c17cf0a8ae622e85'
* commit 'b73742528492d022472b8a02c17cf0a8ae622e85':
Move the org.kxml2.wap.Wbxml class into the EAS code, the only user.
Merge commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665' into eclair-mr2-plus-aosp
* commit '5660af68e96e7ec2f17c9c057ef013bdecfa8665':
Fix improper constant to allow retry for sending Exchange mail
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-mr2
* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
Fix improper constant to allow retry for sending Exchange mail
Merge commit 'd457c744cde468c3bd9b92f28a140379c714f540' into eclair-plus-aosp
* commit 'd457c744cde468c3bd9b92f28a140379c714f540':
Fix improper constant to allow retry for sending Exchange mail
* Related to MR1 triaged bug 2274389 in which mail was stuck in the
Outbox and wouldn't send
* It turns out an improper constant was being used in the SQL code
for turning off the "error" state flag
Change-Id: Ic1a2e5b9dd34ec3f9d7da0b3d2cd63d77bb7681e
* The "send outgoing messages" button doesn't work in the combined
inbox (the case wasn't handled)
* Add code to loop through accounts, calling the Controller for each
in this case
* Fixes (partially or completely) #2274389
Change-Id: I94e984247d43f93a4d6546b8c10f6ce149b091be
Merge commit '6b93f61eea40f83e2bb35aa45fb0301b48225260' into eclair-mr2-plus-aosp
* commit '6b93f61eea40f83e2bb35aa45fb0301b48225260':
Don't allow "trash" to be synced (Fixes#2116463)
* When settings are changed, we loop through the sync error map,
clearing mailboxes in the changed account that are in an error
state.
* It's possible that there are mailboxes referenced in the map that
no longer exist. When trying to retrieve them from the provider,
null is returned, but we're not checking for this case, and an
NPE results.
* The fix is simply to check for null, and clear the error map for
the mailboxId that references a deleted mailbox
Change-Id: I8c1c847090026fa1c53b09bbe6b12d864bce4df1
