Merge branch 'donut' into donut-release
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index b676fc5..d939898 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -88,8 +88,8 @@
<string name="pref_gallery_sort_summary" msgid="6644398051645595214">"사진 및 동영상 정렬 순서 선택"</string>
<string name="pref_gallery_sort_dialogtitle" msgid="5787417105532562739">"사진 정렬"</string>
<string-array name="pref_gallery_sort_choices">
- <item msgid="5546009539334018063">"가장 최근 사진 먼저"</item>
- <item msgid="7931283047572866748">"가장 오래된 사진 먼저"</item>
+ <item msgid="5546009539334018063">"최근 사진부터"</item>
+ <item msgid="7931283047572866748">"오래된 사진부터"</item>
</string-array>
<string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"슬라이드쇼 간격"</string>
<string name="pref_gallery_slideshow_interval_summary" msgid="329876327077905033">"쇼에서 각 슬라이드를 표시할 시간 선택"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 86acca0..0c665db 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -101,7 +101,7 @@
</string-array>
<string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Lysbildeovergang"</string>
<string name="pref_gallery_slideshow_transition_summary" msgid="2390320265891546846">"Velg effekten som skal brukes mellom lysbilder"</string>
- <string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Lysbildevergang"</string>
+ <string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Lysbildeovergang"</string>
<string-array name="pref_gallery_slideshow_transition_choices">
<item msgid="2825716730899894863">"Ton inn og ut"</item>
<item msgid="403116336404005687">"Skli venstre - høyre"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 36f5c3a..29c82fe 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -91,26 +91,26 @@
<item msgid="5546009539334018063">"O mais recente primeiro"</item>
<item msgid="7931283047572866748">"O mais recente por último"</item>
</string-array>
- <string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"Intervalo da apresentação de slides"</string>
- <string name="pref_gallery_slideshow_interval_summary" msgid="329876327077905033">"Selecione a duração de exibição de cada slide na apresentação."</string>
+ <string name="pref_gallery_slideshow_interval_title" msgid="6534904787962619832">"Intervalo dos slides"</string>
+ <string name="pref_gallery_slideshow_interval_summary" msgid="329876327077905033">"Selecione a duração de exibição de cada slide na apresentação de slides."</string>
<string name="pref_gallery_slideshow_interval_dialogtitle" msgid="6775543119826248900">"Intervalo da apresentação de slides"</string>
<string-array name="pref_gallery_slideshow_interval_choices">
<item msgid="3089037742117543119">"2 segundos"</item>
<item msgid="738579316565625730">"3 segundos"</item>
<item msgid="5670078787463530498">"4 segundos"</item>
</string-array>
- <string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Transição da apresentação de slides"</string>
+ <string name="pref_gallery_slideshow_transition_title" msgid="3235158556228218846">"Transição dos slides"</string>
<string name="pref_gallery_slideshow_transition_summary" msgid="2390320265891546846">"Selecione o efeito usado ao passar de um slide para o próximo."</string>
<string name="pref_gallery_slideshow_transition_dialogtitle" msgid="5483406447721500371">"Transição da apresentação de slides"</string>
<string-array name="pref_gallery_slideshow_transition_choices">
- <item msgid="2825716730899894863">"Aparecimento/desaparecimento gradual (fade in/out)"</item>
+ <item msgid="2825716730899894863">"Aparecimento/desaparecimento"</item>
<item msgid="403116336404005687">"Deslizar para a esquerda - direita"</item>
<item msgid="4901733079450971731">"Deslizar para cima - para baixo"</item>
<item msgid="9006732482485375438">"Seleção aleatória"</item>
</string-array>
- <string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Repetir apresentação de slides"</string>
+ <string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Repetir apresentação"</string>
<string name="pref_gallery_slideshow_repeat_summary" msgid="8289230397431855268">"Reproduzir apresentação de slides mais de uma vez"</string>
- <string name="pref_gallery_slideshow_shuffle_title" msgid="3677508579783015598">"Reproduzir slides aleatoriamente"</string>
+ <string name="pref_gallery_slideshow_shuffle_title" msgid="3677508579783015598">"Reproduzir aleatoriamente"</string>
<string name="pref_gallery_slideshow_shuffle_summary" msgid="8566948749149325715">"Mostrar imagens em ordem aleatória"</string>
<string name="pref_camera_recordlocation_title" msgid="273727672426306702">"Armazenar o local nas imagens"</string>
<string name="pref_camera_recordlocation_summary" msgid="3275371402016128548">"Gravar o local nos dados da imagem"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c3bfa52..250eea4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -17,7 +17,7 @@
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="all_images" msgid="1195501551939178807">"Все картинки"</string>
<string name="all_videos" msgid="3380966619230896013">"Все видео"</string>
- <string name="camera_label" msgid="6346560772074764302">"Фотографии"</string>
+ <string name="camera_label" msgid="6346560772074764302">"Фотокамера"</string>
<string name="video_camera_label" msgid="2899292505526427293">"Видеокамера"</string>
<string name="gallery_picker_label" msgid="3080425245006492787">"Фотоальбом"</string>
<string name="gallery_camera_bucket_name" msgid="2924618424339240831">"Снимки, сделанные камерой"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0bd924b..1eb6e28 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -105,7 +105,7 @@
<string-array name="pref_gallery_slideshow_transition_choices">
<item msgid="2825716730899894863">"Tonas fram och bort"</item>
<item msgid="403116336404005687">"Skjuts åt vänster eller höger"</item>
- <item msgid="4901733079450971731">"Skjuts upp och ner"</item>
+ <item msgid="4901733079450971731">"Skjuts upp och ned"</item>
<item msgid="9006732482485375438">"Slumpmässigt urval"</item>
</string-array>
<string name="pref_gallery_slideshow_repeat_title" msgid="6512135022461429738">"Upprepa bildspel"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 9604b59..5699ae1 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -49,7 +49,7 @@
<string name="crop_save_text" msgid="8140440041190264400">"保存"</string>
<string name="crop_discard_text" msgid="5303657888280340603">"舍弃"</string>
<string name="confirm_delete_title" msgid="263478358046514887">"删除"</string>
- <string name="confirm_delete_message" msgid="4161389939579284604">"将会删除此照片。"</string>
+ <string name="confirm_delete_message" msgid="4161389939579284604">"将会删除此图片。"</string>
<string name="confirm_delete_video_message" msgid="5796154324948010221">"将会删除视频。"</string>
<string name="confirm_delete_multiple_message" msgid="5962369828035778779">"此时将删除这些媒体文件。"</string>
<string name="review_toss" msgid="7255331999518617841">"删除"</string>
