merge in jb-mr2-release history after reset to master
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 3d321ee..f94e592 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -390,7 +390,7 @@
<string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Synchroniz. e-mail"</string>
<string name="account_settings_sync_email_summary" msgid="262964076412310990">"Synchr. e-mail pre tento účet"</string>
<string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Vibrovať"</string>
- <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť vyzváňací tón"</string>
+ <string name="account_settings_ringtone" msgid="8229878374785575207">"Zvoliť tón zvonenia"</string>
<string name="account_settings_servers" msgid="4925493817981624242">"Nastavenia servera"</string>
<string name="account_delete_dlg_title" msgid="6806087520856396608">"Odstrániť účet"</string>
<string name="account_delete_dlg_instructions_fmt" msgid="8236846322040271280">"Účet <xliff:g id="ACCOUNT">%s</xliff:g> bude odstránený z aplikácie E-mail."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 3650b4a..278cbfc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -158,7 +158,7 @@
<string name="message_view_status_attachment_not_saved" msgid="2433097334272991035">"Det gick inte att spara bilagan."</string>
<string name="message_view_attachment_background_load" msgid="756797444835526487">"Obs! En eller flera bilagor i det vidarebefordrade meddelandet hämtas innan de skickas."</string>
<string name="message_view_show_message_action" msgid="5134222901019191436">"Meddelande"</string>
- <string name="message_view_show_invite_action" msgid="8862797393776226777">"Bjud in"</string>
+ <string name="message_view_show_invite_action" msgid="8862797393776226777">"Inbjudan"</string>
<plurals name="message_view_show_attachments_action">
<item quantity="one" msgid="7594476368958824007">"Bilaga <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
<item quantity="other" msgid="974463163535515223">"Bilagor <xliff:g id="NUM_ATTACHMENT">%1$d</xliff:g>"</item>
