Merge "Import translations. DO NOT MERGE" into ub-gmail-ur12-dev
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index e8e282b..5f9f850 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -22,7 +22,7 @@
<string name="cc" msgid="7017720927911078193">"Cc"</string>
<string name="bcc" msgid="3098643138241111579">"Cci"</string>
<string name="subject_hint" msgid="7253964583324677128">"Objet"</string>
- <string name="body_hint" msgid="4279864165439577668">"Compose email"</string>
+ <string name="body_hint" msgid="4279864165439577668">"Composez un message"</string>
<string name="add_file_attachment" msgid="2203398371671979481">"Joindre un fichier"</string>
<string name="add_photo_attachment" msgid="3738882100645552858">"Joindre une photo"</string>
<string name="save_draft" msgid="5555744208032445632">"Enregistrer le brouillon"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 962d25c..047e402 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -184,16 +184,16 @@
<item quantity="other" msgid="5071459475389411227">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> er rapportert som nettsøppel."</item>
</plurals>
<plurals name="conversation_not_spam">
- <item quantity="one" msgid="7361303622131552596">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> rapporterte dette som ikke nettsøppel."</item>
- <item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> rapporterte dette som ikke nettsøppel."</item>
+ <item quantity="one" msgid="7361303622131552596">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> e-post rapp. som ikke nettsøppel."</item>
+ <item quantity="other" msgid="2250720080221922267">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> e-post rapp. som ikke nettsøppel."</item>
</plurals>
<plurals name="conversation_not_important">
<item quantity="one" msgid="788387259924027833">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> er merket som uviktig."</item>
<item quantity="other" msgid="6662213740575340397">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> er merket som uviktige."</item>
</plurals>
<plurals name="conversation_phished">
- <item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> rapporterte dette som svindel."</item>
- <item quantity="other" msgid="3678624994662639442">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> rapporterte dette som svindel."</item>
+ <item quantity="one" msgid="5386916574432049235">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> e-post rapp. som nettfisking."</item>
+ <item quantity="other" msgid="3678624994662639442">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> e-post rapp. som nettfisking."</item>
</plurals>
<plurals name="conversation_archived">
<item quantity="one" msgid="5457612502965117672">"<b><xliff:g id="COUNT">%1$d</xliff:g></b> er arkivert."</item>
@@ -367,7 +367,7 @@
<string name="preference_swipe_title_archive" msgid="1178014339238995814">"Sveip for å arkivere"</string>
<string name="preference_swipe_title_delete" msgid="8611320022727435597">"Sveip for å slette"</string>
<string name="preference_swipe_description" msgid="5132683510510041028">"I samtalelister"</string>
- <string name="preference_sender_image_title" msgid="2441320893522058724">"Avsenderbilder"</string>
+ <string name="preference_sender_image_title" msgid="2441320893522058724">"Bilde av avsender"</string>
<string name="preference_sender_image_description" msgid="7126493917536558232">"Vis ved siden av navnet i samtalelisten"</string>
<string name="empty_trash" msgid="652435297593538512">"Tøm papirkurven"</string>
<string name="empty_spam" msgid="6064497180615519589">"Fjern nettsøppel"</string>
@@ -379,8 +379,8 @@
</plurals>
<string name="drawer_open" msgid="6074646853178471940">"Åpne navigasjonsskuffen"</string>
<string name="drawer_close" msgid="2764774620737876943">"Lukk navigasjonsskuffen"</string>
- <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Trykk på et avsenderbilde for å velge den samtalen."</string>
- <string name="long_press_to_select_tip" msgid="9205666839837250150">"Trykk og hold nede for å velge en samtale, og trykk så for å velge mer."</string>
+ <string name="conversation_photo_welcome_text" msgid="4274875219447670662">"Trykk på bildet for å velge den samtalen."</string>
+ <string name="long_press_to_select_tip" msgid="9205666839837250150">"Trykk og hold nede for å velge én samtale, og trykk deretter på andre samtaler du vil velge."</string>
<string name="folder_icon_desc" msgid="1500547397347480618">"Mappeikon"</string>
<string name="add_account" msgid="2162808366829269770">"Legg til konto"</string>
<string name="attached_message" msgid="4267189489654642035">"Vedlagt e-post"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index be59952..995a600 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -397,7 +397,7 @@
<string name="phone" msgid="5171715391553213328">"telefon"</string>
<string name="tablet" msgid="7956969657216748522">"tablet"</string>
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Włącz"</string>
- <string name="show_n_more_folders" msgid="337747297817699776">"Pokaż jeszcze <xliff:g id="NUMBER">%1$s</xliff:g> foldery(ów)"</string>
+ <string name="show_n_more_folders" msgid="337747297817699776">"Pokaż więcej folderów (<xliff:g id="NUMBER">%1$s</xliff:g>)"</string>
<string name="hide_folders" msgid="7473552966537131652">"Ukryj foldery"</string>
<string name="print" msgid="7905250801319578415">"Drukuj"</string>
<string name="print_all" msgid="1789808179145024065">"Drukuj wszystko"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index d383503..ec31b45 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -316,7 +316,7 @@
<string name="message_details_title" msgid="2183394728494962332">"Podrobnosti sporočila"</string>
<string name="auto_advance_label" msgid="3192951873988392119">"Samodejno napredovanje"</string>
<string name="auto_advance_summary" msgid="573927628806250719">"Izberite, kateri zaslon naj se prikaže po brisanju sporočila"</string>
- <string name="auto_advance_help_title" msgid="8091541690538426090">"Nastavitev samodejnega napredovanja\n(po brisanju ipd.)"</string>
+ <string name="auto_advance_help_title" msgid="8091541690538426090">"Nastavitev samodejnega napredovanja \n(po brisanju ipd.)"</string>
<string-array name="prefEntries_autoAdvance">
<item msgid="3400401085256526376">"Novejši"</item>
<item msgid="5562093094216840213">"Starejši"</item>
@@ -399,7 +399,7 @@
<string name="turn_auto_sync_on_dialog_confirm_btn" msgid="1445158420197688714">"Vklopi"</string>
<string name="show_n_more_folders" msgid="337747297817699776">"Prikaži še toliko map: <xliff:g id="NUMBER">%1$s</xliff:g>"</string>
<string name="hide_folders" msgid="7473552966537131652">"Skrij mape"</string>
- <string name="print" msgid="7905250801319578415">"Tiskanje"</string>
+ <string name="print" msgid="7905250801319578415">"Natisni"</string>
<string name="print_all" msgid="1789808179145024065">"Natisni vse"</string>
<plurals name="num_messages">
<item quantity="one" msgid="1997403772739309847">"<xliff:g id="COUNT">%1$d</xliff:g> sporočilo"</item>