From 0f5e54343a8237b2f0a0dae71553b40257bd2716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20Marques?= <smarquespt@gmail.com>
Date: Sun, 10 Dec 2017 23:16:11 +0000
Subject: [PATCH 01/61] Update strings.xml

---
 app/src/main/res/values-pt/strings.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 6db9b5657..d505977c7 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -88,9 +88,9 @@
     <string name="wallpaper_set_successfully">Fundo definido com sucesso</string>
     <string name="portrait_aspect_ratio">Proporção na vertical</string>
     <string name="landscape_aspect_ratio">Proporção na horizontal</string>
-    <string name="home_screen">Home screen</string>
-    <string name="lock_screen">Lock screen</string>
-    <string name="home_and_lock_screen">Home and lock screen</string>
+    <string name="home_screen">Ecrã principal</string>
+    <string name="lock_screen">Ecrã de bloqueio</string>
+    <string name="home_and_lock_screen">Ecrã principal e ecrã de bloqueio</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Apresentação</string>

From 311b8b29afdc641041cb92dd6fbdb1b85d205343 Mon Sep 17 00:00:00 2001
From: Marcio Zomb13 <marciomusicultd@gmail.com>
Date: Mon, 11 Dec 2017 10:43:05 -0200
Subject: [PATCH 02/61] PT-BR update #1

---
 app/src/main/res/values-pt-rBR/strings.xml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c3eaaeaac..50550dc6b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -40,7 +40,7 @@
     <string name="excluded_folders">Pastas excluídas</string>
     <string name="manage_excluded_folders">Gerenciar pastas excluídas</string>
     <string name="exclude_folder_description">Esta ação irá excluir as pastas selecionadas apenas dentro deste aplicativo. Você pode gerenciar as pastas excuídas nas Configurações do aplicativo.</string>
-    <string name="exclude_folder_parent">Excluir antes a pasta raíz?</string>
+    <string name="exclude_folder_parent">Excluir antes a pasta raiz?</string>
     <string name="excluded_activity_placeholder">A exclusão de uma pasta apenas oculta o seu conteúdo da galeria, pois todos os outros aplicativos poderão acessá-las.\\n\\nSe quiser ocultar de todos os aplicativos, utilize a função ocultar.</string>
     <string name="remove_all">Remover todas</string>
     <string name="remove_all_description">Remover todas as pastas da lista de exclusões? Esta ação não apaga as pastas.</string>
@@ -93,7 +93,7 @@
     <string name="home_and_lock_screen">Tela inicial e de bloqueio</string>
 
     <!-- Slideshow -->
-    <string name="slideshow">Slideshow</string>
+    <string name="slideshow">Apresentação</string>
     <string name="interval">Intervalo (segundos):</string>
     <string name="include_photos">Incluir fotos</string>
     <string name="include_videos">Incluir videos</string>
@@ -111,6 +111,10 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
+    <string name="show_info_bubble">Mostrar uma bolha de informação ao rolar usando a barra de rolagem</string>
+    <string name="apply_to_all_apps">Aplicar cores a todos os Apps Simple</string>
+    <string name="use_english_language">Usar idioma inglês</string>
+    <string name="password_protect_whole_app">Proteger o aplicativo com senha</string>
     <string name="show_hidden_media">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do arquivo</string>
@@ -134,7 +138,7 @@
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
-    <string name="app_short_description">Um aplicativo para ver fotos e vídeos.</string>
+    <string name="app_short_description">Um aplicativo para visualizar fotos e vídeos.</string>
     <string name="app_long_description">
         Uma ferramenta simples para ver fotos e vídeos. Pode organizar os itens por data, tamanho, nome e ampliar as fotografias. As pastas são mostradas em colunas, e a sua exibição dependerá do tamanho da tela, aonde o usuário poderá alterar o número de colunas através de gestos. Você pode renomear, compartilhar, apagar, copiar e mover os arquivos. Também pode recortar, girar e definir as imagens como fundo de tela.
 

From 2cdd7262cfbe949fc4a82e02a5c315bfeaf7477e Mon Sep 17 00:00:00 2001
From: FTno <16176811+FTno@users.noreply.github.com>
Date: Wed, 13 Dec 2017 18:58:51 +0100
Subject: [PATCH 03/61] Created norwegian translation (nb)

---
 app/src/main/res/values-nb/strings.xml | 152 +++++++++++++++++++++++++
 1 file changed, 152 insertions(+)
 create mode 100644 app/src/main/res/values-nb/strings.xml

diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
new file mode 100644
index 000000000..68dab6d06
--- /dev/null
+++ b/app/src/main/res/values-nb/strings.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Simple Gallery</string>
+    <string name="app_launcher_name">Galleri</string>
+    <string name="edit">Rediger</string>
+    <string name="open_camera">Åpne kamera</string>
+    <string name="hidden">(skjult)</string>
+    <string name="pin_folder">Fest mappe</string>
+    <string name="unpin_folder">Løsne mappe</string>
+    <string name="show_all">Vis alle mappers innhold</string>
+    <string name="all_folders">Alle mapper</string>
+    <string name="folder_view">Skift til mappevisning</string>
+    <string name="other_folder">Annen mappe</string>
+    <string name="show_on_map">Vis på kart</string>
+    <string name="unknown_location">Ukjent plassering</string>
+    <string name="no_map_application">Ingen app med kart er funnet</string>
+    <string name="no_camera_app_found">Ingen kamera-app er funnet</string>
+    <string name="increase_column_count">Øk antall kolonner</string>
+    <string name="reduce_column_count">Reduser antall kolonner</string>
+    <string name="change_cover_image">Endre omslagsbilde</string>
+    <string name="select_photo">Velg foto</string>
+    <string name="use_default">Bruk standard</string>
+    <string name="volume">Volum</string>
+    <string name="brightness">Lysstyrke</string>
+    <string name="do_not_ask_again">Ikke spør igjen i denne økten</string>
+    <string name="lock_orientation">Lås skjermorientering</string>
+    <string name="unlock_orientation">Lås opp skjermorientering</string>
+
+    <!-- Filter -->
+    <string name="filter_media">Filtrer media</string>
+    <string name="images">Bilder</string>
+    <string name="videos">Videoer</string>
+    <string name="gifs">GIF-bilder</string>
+    <string name="no_media_with_filters">Ingen media-filer er funnet med de valgte filtrene.</string>
+    <string name="change_filters_underlined"><u>Endre filtere</u></string>
+
+    <!-- Hide / Exclude -->
+    <string name="hide_folder_description">Denne funksjonen skjuler mappen ved å legge til filen \'.nomedia\' i den. Alle undermapper blir også skjult. Du kan se dem ved å aktivere alternativet \'Vis skjulte media\' i innstillinger. Fortsette?</string>
+    <string name="exclude">Ekskluder</string>
+    <string name="excluded_folders">Ekskluderte mapper</string>
+    <string name="manage_excluded_folders">Håndter ekskluderte mapper</string>
+    <string name="exclude_folder_description">Dette vil ekskludere valgte sammen med undermapper, bare fra Simple Gallery. Ekskluderte mapper kan håndteres i Innstillinger.</string>
+    <string name="exclude_folder_parent">Ekskludere en overordnet isteden?</string>
+    <string name="excluded_activity_placeholder">Ekskludering av mapper vil gjøre dem sammen med deres undermapper, skjulte bare i denne appen. De vil fortsatt være synlige i andre apper.\n\nHvis du vil skjule dem fra andre apper, bruk Skjul-funksjonen.</string>
+    <string name="remove_all">Fjern alle</string>
+    <string name="remove_all_description">Fjerne alle mapper fra listen av ekskluderte? Dette sletter ikke mappene.</string>
+
+    <!-- Include folders -->
+    <string name="include_folders">Inkluderte mapper</string>
+    <string name="manage_included_folders">Håndter inkluderte mapper</string>
+    <string name="add_folder">Legg til mappe</string>
+    <string name="included_activity_placeholder">Hvis du har noen mapper som inneholder media, men ikke ble gjenkjent av appen, kan du legge dem til manuelt her.\n\nÅ legge til noen elementer her, ekskluderer ikke noen annen mappe.</string>
+
+    <!-- Resizing -->
+    <string name="resize">Endre størrelse</string>
+    <string name="resize_and_save">Endre størrelse og lagre</string>
+    <string name="width">Bredde</string>
+    <string name="height">Høyde</string>
+    <string name="keep_aspect_ratio">Behold sideforhold</string>
+    <string name="invalid_values">Oppfør en gyldig oppløsning</string>
+
+    <!-- Editor -->
+    <string name="editor">Redigering</string>
+    <string name="save">Lagre</string>
+    <string name="rotate">Roter</string>
+    <string name="path">Bane</string>
+    <string name="invalid_image_path">Ugyldig bildebane</string>
+    <string name="image_editing_failed">Bilderedigering feilet</string>
+    <string name="edit_image_with">Rediger bilde med:</string>
+    <string name="no_editor_found">Ingen bilderedigeringsapp funnet</string>
+    <string name="unknown_file_location">Ukjent filplassering</string>
+    <string name="error_saving_file">Kunne ikke overskrive kildefilen</string>
+    <string name="rotate_left">Roter til venstre</string>
+    <string name="rotate_right">Roter til høyre</string>
+    <string name="rotate_one_eighty">Roter med 180º</string>
+    <string name="flip">Speilvend</string>
+    <string name="flip_horizontally">Speilvend horisontalt</string>
+    <string name="flip_vertically">Speilvend vertikalt</string>
+    <string name="edit_with">Rediger med</string>
+
+    <!-- Set wallpaper -->
+    <string name="simple_wallpaper">Bakgrunnsbilde</string>
+    <string name="set_as_wallpaper">Sett som bakgrunnsbilde</string>
+    <string name="set_as_wallpaper_failed">Å sette som bakgrunnsbilde feilet</string>
+    <string name="set_as_wallpaper_with">Sett som bakgrunnsbilde med:</string>
+    <string name="no_capable_app_found">Ingen app i stand til det er funnet</string>
+    <string name="setting_wallpaper">Stiller inn bakgrunnsbilde&#8230;</string>
+    <string name="wallpaper_set_successfully">Bakgrunnsbilde vellykket stilt inn</string>
+    <string name="portrait_aspect_ratio">Portrett-sideforhold</string>
+    <string name="landscape_aspect_ratio">Landskap-sideforhold</string>
+    <string name="home_screen">Startskjerm</string>
+    <string name="lock_screen">Låseskjerm</string>
+    <string name="home_and_lock_screen">Start- og låseskjerm</string>
+
+    <!-- Slideshow -->
+    <string name="slideshow">Lysbildeshow</string>
+    <string name="interval">Intervall (sekunder):</string>
+    <string name="include_photos">Inkluder bilder</string>
+    <string name="include_videos">Inkluder videoer</string>
+    <string name="include_gifs">Inkluder GIF-bilder</string>
+    <string name="random_order">Tilfeldig rekkefølge</string>
+    <string name="use_fade">Bruk toningseffekt</string>
+    <string name="move_backwards">Avspill bakover</string>
+    <string name="loop_slideshow">Gjenta lysbildeshow</string>
+    <string name="slideshow_ended">Lysbildeshowet er slutt</string>
+    <string name="no_media_for_slideshow">Ingen media for lysbildeshowet er funnet</string>
+
+    <!-- View types -->
+    <string name="change_view_type">Endre visningstype</string>
+    <string name="grid">Rutenett</string>
+    <string name="list">Liste</string>
+
+    <!-- Settings -->
+    <string name="show_hidden_media">Vis skjulte media</string>
+    <string name="autoplay_videos">Avspill videoer automatisk</string>
+    <string name="toggle_filename">Vis/skjul filnavn</string>
+    <string name="loop_videos">Gjenta videoer</string>
+    <string name="animate_gifs">Animert GIF i minibildevisning</string>
+    <string name="max_brightness">Maks lysstyrke ved mediavisning</string>
+    <string name="crop_thumbnails">Beskjær minibilder i kvadrater</string>
+    <string name="screen_rotation_by">Roter media etter</string>
+    <string name="screen_rotation_system_setting">Systeminnstilling</string>
+    <string name="screen_rotation_device_rotation">Enhetsrotasjon</string>
+    <string name="screen_rotation_aspect_ratio">Sideforhold</string>
+    <string name="dark_background_at_fullscreen">Mørk bakgrunn i mediavisningen</string>
+    <string name="scroll_thumbnails_horizontally">Horisontal rulling av minibilder</string>
+    <string name="hide_system_ui_at_fullscreen">Skjul automatisk systemlinjer ved mediavisning</string>
+    <string name="delete_empty_folders">Slett tomme mapper etter sletting av deres innhold</string>
+    <string name="allow_video_gestures">Tillat å styre videovolum og lysstyrke med vertikale bevegelser</string>
+    <string name="show_media_count">Vis mediaantallet i mapper på hovedvisningen</string>
+    <string name="replace_share_with_rotate">Erstatt Del med Roter i meny ved mediavisning</string>
+    <string name="show_extended_details">Vis flere detaljer i mediavisningen</string>
+    <string name="manage_extended_details">Velg detaljer</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">A gallery for viewing photos and videos without ads.</string>
+    <string name="app_long_description">
+        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
+
+        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
+
+        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
+
+        This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>

From d0c80a8cd0951512e66db17e5f1760042662b7bb Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 13 Dec 2017 19:42:40 +0100
Subject: [PATCH 04/61] reuse the Show Hidden Items string from Commons

---
 app/build.gradle                              | 2 +-
 app/src/main/res/layout/activity_settings.xml | 2 +-
 app/src/main/res/values-cs/strings.xml        | 3 +--
 app/src/main/res/values-de/strings.xml        | 1 -
 app/src/main/res/values-es/strings.xml        | 1 -
 app/src/main/res/values-fi/strings.xml        | 1 -
 app/src/main/res/values-fr/strings.xml        | 1 -
 app/src/main/res/values-hr/strings.xml        | 1 -
 app/src/main/res/values-hu/strings.xml        | 1 -
 app/src/main/res/values-it/strings.xml        | 1 -
 app/src/main/res/values-ja/strings.xml        | 1 -
 app/src/main/res/values-nb/strings.xml        | 1 -
 app/src/main/res/values-nl/strings.xml        | 1 -
 app/src/main/res/values-pl/strings.xml        | 1 -
 app/src/main/res/values-pt-rBR/strings.xml    | 5 -----
 app/src/main/res/values-pt/strings.xml        | 1 -
 app/src/main/res/values-ru/strings.xml        | 1 -
 app/src/main/res/values-sk/strings.xml        | 1 -
 app/src/main/res/values-sv/strings.xml        | 1 -
 app/src/main/res/values-tr/strings.xml        | 1 -
 app/src/main/res/values-zh-rCN/strings.xml    | 1 -
 app/src/main/res/values-zh-rTW/strings.xml    | 1 -
 app/src/main/res/values/strings.xml           | 3 +--
 23 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 71bc9a97e..4e3615997 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.2.0'
+    implementation 'com.simplemobiletools:commons:3.2.19'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index a204da6cb..2a862daea 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -104,7 +104,7 @@
                 android:clickable="false"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/show_hidden_media"/>
+                android:text="@string/show_hidden_items"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0c6d1748f..9c2530c34 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -35,7 +35,7 @@
     <string name="change_filters_underlined"><u>Change filters</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">Tato funkce skryje složku, včetně podsložek, přidáním souboru \'.nomedia\'. Zobrazíte je zvolením možnosti \'Zobrazit skryté složky\' v nastavení. Pokračovat?</string>
+    <string name="hide_folder_description">Tato funkce skryje složku, včetně podsložek, přidáním souboru \'.nomedia\'. Zobrazíte je zvolením možnosti \'Zobrazit skryté položky\' v nastavení. Pokračovat?</string>
     <string name="exclude">Vyloučit</string>
     <string name="excluded_folders">Vyloučené složky</string>
     <string name="manage_excluded_folders">Spravovat vyloučené složky</string>
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Zobrazit skryté média</string>
     <string name="autoplay_videos">Automaticky přehrávat videa</string>
     <string name="toggle_filename">Přepnout viditelnost názvů souborů</string>
     <string name="loop_videos">Přehrávat videa ve smyčce</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index bff9ec074..af2bfb338 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Liste</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Versteckte Ordner zeigen</string>
     <string name="autoplay_videos">Videos automatisch abspielen</string>
     <string name="toggle_filename">Beschriftungen ein/aus</string>
     <string name="loop_videos">Videos in Endlosschleife spielen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c5c899c29..fcd5e2b5a 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Mostrar carpetas ocultas</string>
     <string name="autoplay_videos">Reproducir vídeos automáticamente</string>
     <string name="toggle_filename">Cambiar la visibilidad del nombre de archivo</string>
     <string name="loop_videos">Reproducción continua de vídeos</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index a49f2e548..92510937e 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Näytä piilotettu media</string>
     <string name="autoplay_videos">Toista videot automaattisesti</string>
     <string name="toggle_filename">Tiedostonimien näkyvyys</string>
     <string name="loop_videos">Jatkuvat videot</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index feeaa6c03..593daf531 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Liste</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Afficher les dossiers cachés</string>
     <string name="autoplay_videos">Lecture automatique des vidéos</string>
     <string name="toggle_filename">Permuter la visibilité des noms de fichier</string>
     <string name="loop_videos">Lire en boucle les vidéos</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 1fe7dc1a2..a05379db4 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Prikaži skrivene datoteke</string>
     <string name="autoplay_videos">Automatsko pokretanje videa</string>
     <string name="toggle_filename">Uključi prikaz naziva datoteka</string>
     <string name="loop_videos">Ponavljanje videa</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5a6ef0917..1ce01199e 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Show hidden media</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
     <string name="loop_videos">Loop videos</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index bd4c0b927..1fbdc0cc6 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Elenco</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Mostra le cartelle nascoste</string>
     <string name="autoplay_videos">Riproduci i video automaticamente</string>
     <string name="toggle_filename">Visibilità nome del file</string>
     <string name="loop_videos">Ripeti i video</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b09569ba5..e56c10c04 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">非表示フォルダーを表示</string>
     <string name="autoplay_videos">ビデオを自動再生する</string>
     <string name="toggle_filename">ファイル名の表示を切り替え</string>
     <string name="loop_videos">ビデオをリピート再生する</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 68dab6d06..e6a3c6478 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Liste</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Vis skjulte media</string>
     <string name="autoplay_videos">Avspill videoer automatisk</string>
     <string name="toggle_filename">Vis/skjul filnavn</string>
     <string name="loop_videos">Gjenta videoer</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 188e0c7bf..6908de84d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Lijst</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Verborgen mappen tonen</string>
     <string name="autoplay_videos">Video\'s automatisch afspelen</string>
     <string name="toggle_filename">Bestandsnamen tonen</string>
     <string name="loop_videos">Video\'s herhalen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index e19311773..5b68cb861 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Pokazuj ukryte foldery</string>
     <string name="autoplay_videos">Odtwarzaj filmy automatycznie</string>
     <string name="toggle_filename">Pokazuj / ukrywaj nazwy plików</string>
     <string name="loop_videos">Zapętlaj odtwarzanie filmów</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 50550dc6b..7caab4ec1 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -111,11 +111,6 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
-    <string name="show_info_bubble">Mostrar uma bolha de informação ao rolar usando a barra de rolagem</string>
-    <string name="apply_to_all_apps">Aplicar cores a todos os Apps Simple</string>
-    <string name="use_english_language">Usar idioma inglês</string>
-    <string name="password_protect_whole_app">Proteger o aplicativo com senha</string>
-    <string name="show_hidden_media">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do arquivo</string>
     <string name="loop_videos">Reproduzir vídeos em ciclo</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d505977c7..f28767f20 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Lista</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Mostrar pastas ocultas</string>
     <string name="autoplay_videos">Reproduzir vídeos automaticamente</string>
     <string name="toggle_filename">Mostrar/ocultar nome do ficheiro</string>
     <string name="loop_videos">Vídeos em ciclo</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 134d082ac..393b0a939 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Список</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Показывать скрытые папки</string>
     <string name="autoplay_videos">Воспроизводить видео автоматически</string>
     <string name="toggle_filename">Переключить отображение имени файла</string>
     <string name="loop_videos">Повторять видео</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index dd75e136d..a011137df 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">Zoznam</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Zobraziť skryté médiá</string>
     <string name="autoplay_videos">Spúšťať videá automaticky</string>
     <string name="toggle_filename">Prepnúť viditeľnosť názvov súborov</string>
     <string name="loop_videos">Automaticky reštartovať videá</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index a91d2b9d6..0e3deceb2 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Visa dolda mappar</string>
     <string name="autoplay_videos">Spela upp videos automatiskt</string>
     <string name="toggle_filename">Visa/dölj filnamnen</string>
     <string name="loop_videos">Återspela videos</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cc051c267..cd52b4b1a 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Gizli klasörleri göster</string>
     <string name="autoplay_videos">Videoları otomatik olarak oynat</string>
     <string name="toggle_filename">Dosya adı görünürlüğünü değiştir</string>
     <string name="loop_videos">Videolar döngüsü</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f6107fd68..058606ed6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">列表</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">显示所有</string>
     <string name="autoplay_videos">自动播放</string>
     <string name="toggle_filename">显示文件名</string>
     <string name="loop_videos">循环播放视频</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index f7a152dce..035d25590 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -111,7 +111,6 @@
     <string name="list">列表</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">顯示隱藏的媒體檔案</string>
     <string name="autoplay_videos">自動播放影片</string>
     <string name="toggle_filename">顯示檔案名稱</string>
     <string name="loop_videos">影片循環播放</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 618f119c5..b8f987f32 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,7 +35,7 @@
     <string name="change_filters_underlined"><u>Change filters</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden folders\' option in Settings. Continue?</string>
+    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue?</string>
     <string name="exclude">Exclude</string>
     <string name="excluded_folders">Excluded folders</string>
     <string name="manage_excluded_folders">Manage excluded folders</string>
@@ -111,7 +111,6 @@
     <string name="list">List</string>
 
     <!-- Settings -->
-    <string name="show_hidden_media">Show hidden media</string>
     <string name="autoplay_videos">Play videos automatically</string>
     <string name="toggle_filename">Toggle filename visibility</string>
     <string name="loop_videos">Loop videos</string>

From ae7d3e3f18e4c9f89f9bb362353859874f669f5f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 13 Dec 2017 19:47:58 +0100
Subject: [PATCH 05/61] use the helper function for checking if only one item
 is selected

---
 .../simplemobiletools/gallery/adapters/DirectoryAdapter.kt    | 4 ++--
 .../com/simplemobiletools/gallery/adapters/MediaAdapter.kt    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
index 25a95566a..a8ee3f75f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/DirectoryAdapter.kt
@@ -61,8 +61,8 @@ class DirectoryAdapter(activity: BaseSimpleActivity, var dirs: MutableList<Direc
 
     override fun prepareActionMode(menu: Menu) {
         menu.apply {
-            findItem(R.id.cab_rename).isVisible = selectedPositions.size == 1
-            findItem(R.id.cab_change_cover_image).isVisible = selectedPositions.size == 1
+            findItem(R.id.cab_rename).isVisible = isOneItemSelected()
+            findItem(R.id.cab_change_cover_image).isVisible = isOneItemSelected()
 
             checkHideBtnVisibility(this)
             checkPinBtnVisibility(this)
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
index 5a585661b..f2c3dfb17 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/adapters/MediaAdapter.kt
@@ -61,8 +61,8 @@ class MediaAdapter(activity: BaseSimpleActivity, var media: MutableList<Medium>,
 
     override fun prepareActionMode(menu: Menu) {
         menu.apply {
-            findItem(R.id.cab_rename).isVisible = selectedPositions.size == 1
-            findItem(R.id.cab_open_with).isVisible = selectedPositions.size == 1
+            findItem(R.id.cab_rename).isVisible = isOneItemSelected()
+            findItem(R.id.cab_open_with).isVisible = isOneItemSelected()
             findItem(R.id.cab_confirm_selection).isVisible = isAGetIntent && allowMultiplePicks && selectedPositions.size > 0
 
             checkHideBtnVisibility(this)

From d711ad3ffedbb722c85fec6288a217dd3691659c Mon Sep 17 00:00:00 2001
From: FTno <16176811+FTno@users.noreply.github.com>
Date: Wed, 13 Dec 2017 20:28:38 +0100
Subject: [PATCH 06/61] Update strings.xml

Another update because of the 'hidden' modification.
---
 app/src/main/res/values-nb/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index e6a3c6478..37751c779 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -35,7 +35,7 @@
     <string name="change_filters_underlined"><u>Endre filtere</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">Denne funksjonen skjuler mappen ved å legge til filen \'.nomedia\' i den. Alle undermapper blir også skjult. Du kan se dem ved å aktivere alternativet \'Vis skjulte media\' i innstillinger. Fortsette?</string>
+    <string name="hide_folder_description">Denne funksjonen skjuler mappen ved å legge til filen \'.nomedia\' i den. Alle undermapper blir også skjult. Du kan se dem ved å aktivere alternativet \'Vis skjulte elementer\' i innstillinger. Fortsette?</string>
     <string name="exclude">Ekskluder</string>
     <string name="excluded_folders">Ekskluderte mapper</string>
     <string name="manage_excluded_folders">Håndter ekskluderte mapper</string>

From 8f78609d43a4cef86cd4a2d991ff9afb94818b4b Mon Sep 17 00:00:00 2001
From: Xose M <704948+xmgz@users.noreply.github.com>
Date: Fri, 15 Dec 2017 11:53:38 +0100
Subject: [PATCH 07/61] creado strings.xml ao galego

copiado as cadeas de texto de values/strings.xml
---
 app/src/main/res/values-gl/strings.xml | 151 +++++++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 app/src/main/res/values-gl/strings.xml

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
new file mode 100644
index 000000000..df1ef0c18
--- /dev/null
+++ b/app/src/main/res/values-gl/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Simple Gallery</string>
+    <string name="app_launcher_name">Gallery</string>
+    <string name="edit">Edit</string>
+    <string name="open_camera">Open camera</string>
+    <string name="hidden">(hidden)</string>
+    <string name="pin_folder">Pin folder</string>
+    <string name="unpin_folder">Unpin folder</string>
+    <string name="show_all">Show all folders content</string>
+    <string name="all_folders">All folders</string>
+    <string name="folder_view">Switch to folder view</string>
+    <string name="other_folder">Other folder</string>
+    <string name="show_on_map">Show on map</string>
+    <string name="unknown_location">Unknown location</string>
+    <string name="no_map_application">No application with maps has been found</string>
+    <string name="no_camera_app_found">No Camera app has been found</string>
+    <string name="increase_column_count">Increase column count</string>
+    <string name="reduce_column_count">Reduce column count</string>
+    <string name="change_cover_image">Change cover image</string>
+    <string name="select_photo">Select photo</string>
+    <string name="use_default">Use default</string>
+    <string name="volume">Volume</string>
+    <string name="brightness">Brightness</string>
+    <string name="do_not_ask_again">Do not ask again in this session</string>
+    <string name="lock_orientation">Lock orientation</string>
+    <string name="unlock_orientation">Unlock orientation</string>
+
+    <!-- Filter -->
+    <string name="filter_media">Filter media</string>
+    <string name="images">Images</string>
+    <string name="videos">Videos</string>
+    <string name="gifs">GIFs</string>
+    <string name="no_media_with_filters">No media files have been found with the selected filters.</string>
+    <string name="change_filters_underlined"><u>Change filters</u></string>
+
+    <!-- Hide / Exclude -->
+    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue?</string>
+    <string name="exclude">Exclude</string>
+    <string name="excluded_folders">Excluded folders</string>
+    <string name="manage_excluded_folders">Manage excluded folders</string>
+    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
+    <string name="exclude_folder_parent">Exclude a parent instead?</string>
+    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
+    <string name="remove_all">Remove all</string>
+    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+
+    <!-- Include folders -->
+    <string name="include_folders">Included folders</string>
+    <string name="manage_included_folders">Manage included folders</string>
+    <string name="add_folder">Add folder</string>
+    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
+
+    <!-- Resizing -->
+    <string name="resize">Resize</string>
+    <string name="resize_and_save">Resize selection and save</string>
+    <string name="width">Width</string>
+    <string name="height">Height</string>
+    <string name="keep_aspect_ratio">Keep aspect ratio</string>
+    <string name="invalid_values">Please enter a valid resolution</string>
+
+    <!-- Editor -->
+    <string name="editor">Editor</string>
+    <string name="save">Save</string>
+    <string name="rotate">Rotate</string>
+    <string name="path">Path</string>
+    <string name="invalid_image_path">Invalid image path</string>
+    <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
+    <string name="unknown_file_location">Unknown file location</string>
+    <string name="error_saving_file">Could not overwrite the source file</string>
+    <string name="rotate_left">Rotate left</string>
+    <string name="rotate_right">Rotate right</string>
+    <string name="rotate_one_eighty">Rotate by 180º</string>
+    <string name="flip">Flip</string>
+    <string name="flip_horizontally">Flip horizontally</string>
+    <string name="flip_vertically">Flip vertically</string>
+    <string name="edit_with">Edit with</string>
+
+    <!-- Set wallpaper -->
+    <string name="simple_wallpaper">Simple Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
+    <string name="no_capable_app_found">No app capable of it has been found</string>
+    <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
+    <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
+    <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
+    <string name="landscape_aspect_ratio">Landscape aspect ratio</string>
+    <string name="home_screen">Home screen</string>
+    <string name="lock_screen">Lock screen</string>
+    <string name="home_and_lock_screen">Home and lock screen</string>
+
+    <!-- Slideshow -->
+    <string name="slideshow">Slideshow</string>
+    <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos</string>
+    <string name="include_videos">Include videos</string>
+    <string name="include_gifs">Include GIFs</string>
+    <string name="random_order">Random order</string>
+    <string name="use_fade">Use fade animations</string>
+    <string name="move_backwards">Move backwards</string>
+    <string name="loop_slideshow">Loop slideshow</string>
+    <string name="slideshow_ended">The slideshow ended</string>
+    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+
+    <!-- View types -->
+    <string name="change_view_type">Change view type</string>
+    <string name="grid">Grid</string>
+    <string name="list">List</string>
+
+    <!-- Settings -->
+    <string name="autoplay_videos">Reproducir vídeos automticamente</string>
+    <string name="toggle_filename">Toggle filename visibility</string>
+    <string name="loop_videos">Loop videos</string>
+    <string name="animate_gifs">Animate GIFs at thumbnails</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
+    <string name="crop_thumbnails">Crop thumbnails into squares</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
+    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
+    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
+    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
+    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
+    <string name="show_media_count">Show folder media count on the main view</string>
+    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
+    <string name="show_extended_details">Show extended details over fullscreen media</string>
+    <string name="manage_extended_details">Manage extended details</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">A gallery for viewing photos and videos without ads.</string>
+    <string name="app_long_description">
+        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
+
+        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
+
+        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
+
+        This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>

From 56c82eb37eff958da0c9ec391ce255b769c1ddb7 Mon Sep 17 00:00:00 2001
From: Xose M <704948+xmgz@users.noreply.github.com>
Date: Fri, 15 Dec 2017 12:46:55 +0100
Subject: [PATCH 08/61] =?UTF-8?q?unhas=20cadeas=20m=C3=A1is?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/values-gl/strings.xml | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index df1ef0c18..bdb534424 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Simple Gallery</string>
-    <string name="app_launcher_name">Gallery</string>
-    <string name="edit">Edit</string>
-    <string name="open_camera">Open camera</string>
-    <string name="hidden">(hidden)</string>
-    <string name="pin_folder">Pin folder</string>
-    <string name="unpin_folder">Unpin folder</string>
-    <string name="show_all">Show all folders content</string>
-    <string name="all_folders">All folders</string>
-    <string name="folder_view">Switch to folder view</string>
-    <string name="other_folder">Other folder</string>
-    <string name="show_on_map">Show on map</string>
-    <string name="unknown_location">Unknown location</string>
+    <string name="app_launcher_name">Galería</string>
+    <string name="edit">Editar</string>
+    <string name="open_camera">Abrir cámara</string>
+    <string name="hidden">(oculto)</string>
+    <string name="pin_folder">Fixar cartafol</string>
+    <string name="unpin_folder">Soltar cartafol</string>
+    <string name="show_all">Mostrar o contido de todos os cartafoles</string>
+    <string name="all_folders">Todos os cartafoles</string>
+    <string name="folder_view">Mudar a vista por cartafol</string>
+    <string name="other_folder">Outro cartafol</string>
+    <string name="show_on_map">Mostrar no mapa</string>
+    <string name="unknown_location">Localización descoñecida</string>
     <string name="no_map_application">No application with maps has been found</string>
     <string name="no_camera_app_found">No Camera app has been found</string>
     <string name="increase_column_count">Increase column count</string>

From 844c69175ef3910f4480148a7c97fdf1d44e42a1 Mon Sep 17 00:00:00 2001
From: Xose M <704948+xmgz@users.noreply.github.com>
Date: Fri, 15 Dec 2017 19:35:10 +0100
Subject: [PATCH 09/61] Gallery strings.xml  -> galego (gl)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

tradución completa ao galego (gl)
---
 app/src/main/res/values-gl/strings.xml | 203 ++++++++++++-------------
 1 file changed, 101 insertions(+), 102 deletions(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index bdb534424..dd270b326 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -13,135 +13,134 @@
     <string name="other_folder">Outro cartafol</string>
     <string name="show_on_map">Mostrar no mapa</string>
     <string name="unknown_location">Localización descoñecida</string>
-    <string name="no_map_application">No application with maps has been found</string>
-    <string name="no_camera_app_found">No Camera app has been found</string>
-    <string name="increase_column_count">Increase column count</string>
-    <string name="reduce_column_count">Reduce column count</string>
-    <string name="change_cover_image">Change cover image</string>
-    <string name="select_photo">Select photo</string>
-    <string name="use_default">Use default</string>
+    <string name="no_map_application">Non se atopou ningún aplicativo con mapas</string>
+    <string name="no_camera_app_found">Non se atopou ningún aplicativo Cámara</string>
+    <string name="increase_column_count">Aumente o número de columnas</string>
+    <string name="reduce_column_count">Reduza o número de columnas</string>
+    <string name="change_cover_image">Cambiar a imaxe de portada</string>
+    <string name="select_photo">Escolla foto</string>
+    <string name="use_default">Usar por omisin</string>
     <string name="volume">Volume</string>
-    <string name="brightness">Brightness</string>
-    <string name="do_not_ask_again">Do not ask again in this session</string>
-    <string name="lock_orientation">Lock orientation</string>
-    <string name="unlock_orientation">Unlock orientation</string>
+    <string name="brightness">Brillo</string>
+    <string name="do_not_ask_again">Non preguntar de novo en esta sesión</string>
+    <string name="lock_orientation">Fixar orientación</string>
+    <string name="unlock_orientation">Desbloquear orientación</string>
 
     <!-- Filter -->
-    <string name="filter_media">Filter media</string>
-    <string name="images">Images</string>
-    <string name="videos">Videos</string>
+    <string name="filter_media">Filtrar medios</string>
+    <string name="images">Imaxes</string>
+    <string name="videos">Vídeos</string>
     <string name="gifs">GIFs</string>
-    <string name="no_media_with_filters">No media files have been found with the selected filters.</string>
-    <string name="change_filters_underlined"><u>Change filters</u></string>
+    <string name="no_media_with_filters">Non se atoparon medios dos indicados polo filtro.</string>
+    <string name="change_filters_underlined"><u>Cambiar filtro</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue?</string>
-    <string name="exclude">Exclude</string>
-    <string name="excluded_folders">Excluded folders</string>
-    <string name="manage_excluded_folders">Manage excluded folders</string>
-    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
-    <string name="exclude_folder_parent">Exclude a parent instead?</string>
-    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
-    <string name="remove_all">Remove all</string>
-    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+    <string name="hide_folder_description">Esta función oculta o cartafol engadindolle ficheiro \'.nomedia\', tamén ocultará os subcartafoles. Pode velos pulsando a opción \'Mostrar elementos ocultos\' nos Axustes. Continuar?</string>
+    <string name="exclude">Excluír</string>
+    <string name="excluded_folders">Cartafoles excluídos</string>
+    <string name="manage_excluded_folders">Xestionar cartafoles excluídos</string>
+    <string name="exclude_folder_description">Esto ocultará a selección xunto cos seus subcartafoles son en Simple Gallery. Pode xestionar os cartafoles ocultos en Axustes.</string>
+    <string name="exclude_folder_parent">?Excluír o cartafol fai no seu lugar?</string>
+    <string name="excluded_activity_placeholder">Excluír un cartafol xunto cos subcartafoles só terá efecto en Simple Gallery, seguirán sendo visibles en outros aplicativos.\n\nSi tamén quere excluílos en outros aplicativos, utilice a opción Agochar.</string>
+    <string name="remove_all">Eliminar todos</string>
+    <string name="remove_all_description">Eliminar todos os cartafoles da lista de excluídos? Esto non borrará os cartafoles.</string>
 
     <!-- Include folders -->
-    <string name="include_folders">Included folders</string>
-    <string name="manage_included_folders">Manage included folders</string>
-    <string name="add_folder">Add folder</string>
-    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
+    <string name="include_folders">Cartafoles incluídos</string>
+    <string name="manage_included_folders">Xestionar cartafoles incluídos</string>
+    <string name="add_folder">Engadir cartafol</string>
+    <string name="included_activity_placeholder">Si ten algún cartafol con medios, mais non foi recoñecido polo aplicativo, pódeo engadir manualmente.\n\nEngadindo aquí elementos non eliminará outros.</string>
 
     <!-- Resizing -->
-    <string name="resize">Resize</string>
-    <string name="resize_and_save">Resize selection and save</string>
-    <string name="width">Width</string>
-    <string name="height">Height</string>
-    <string name="keep_aspect_ratio">Keep aspect ratio</string>
-    <string name="invalid_values">Please enter a valid resolution</string>
+    <string name="resize">Redimensionar</string>
+    <string name="resize_and_save">Selección da redimensión e gardar</string>
+    <string name="width">Ancho</string>
+    <string name="height">Alto</string>
+    <string name="keep_aspect_ratio">Manter proporcións</string>
+    <string name="invalid_values">Por favor introduza unha resolución válida</string>
 
     <!-- Editor -->
     <string name="editor">Editor</string>
-    <string name="save">Save</string>
-    <string name="rotate">Rotate</string>
-    <string name="path">Path</string>
-    <string name="invalid_image_path">Invalid image path</string>
-    <string name="image_editing_failed">Image editing failed</string>
-    <string name="edit_image_with">Edit image with:</string>
-    <string name="no_editor_found">No image editor found</string>
-    <string name="unknown_file_location">Unknown file location</string>
-    <string name="error_saving_file">Could not overwrite the source file</string>
-    <string name="rotate_left">Rotate left</string>
-    <string name="rotate_right">Rotate right</string>
-    <string name="rotate_one_eighty">Rotate by 180º</string>
-    <string name="flip">Flip</string>
-    <string name="flip_horizontally">Flip horizontally</string>
-    <string name="flip_vertically">Flip vertically</string>
-    <string name="edit_with">Edit with</string>
+    <string name="save">Gardar</string>
+    <string name="rotate">Rotar</string>
+    <string name="path">Ruta</string>
+    <string name="invalid_image_path">Ruta a imaxe non válida</string>
+    <string name="image_editing_failed">Fallo na edición da imaxe</string>
+    <string name="edit_image_with">Editar imaxe con:</string>
+    <string name="no_editor_found">Non se atopou ningún editor</string>
+    <string name="unknown_file_location">Localización do ficheiro descoñecida</string>
+    <string name="error_saving_file">Non se puido sobreescribir o ficheiro</string>
+    <string name="rotate_left">Rotar a esquerda</string>
+    <string name="rotate_right">Rotar a dereita</string>
+    <string name="rotate_one_eighty">Rotar 180º</string>
+    <string name="flip">Voltear</string>
+    <string name="flip_horizontally">Voltear horizontalmente</string>
+    <string name="flip_vertically">Voltear verticalmente</string>
+    <string name="edit_with">Editar con</string>
 
     <!-- Set wallpaper -->
-    <string name="simple_wallpaper">Simple Wallpaper</string>
-    <string name="set_as_wallpaper">Set as Wallpaper</string>
-    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
-    <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
-    <string name="no_capable_app_found">No app capable of it has been found</string>
-    <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
-    <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
-    <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
-    <string name="landscape_aspect_ratio">Landscape aspect ratio</string>
-    <string name="home_screen">Home screen</string>
-    <string name="lock_screen">Lock screen</string>
-    <string name="home_and_lock_screen">Home and lock screen</string>
+    <string name="simple_wallpaper">Simple fondo de pantalla</string>
+    <string name="set_as_wallpaper">Establecer como fondo de pantalla</string>
+    <string name="set_as_wallpaper_failed">Fallou establecer fondo de pantalla</string>
+    <string name="set_as_wallpaper_with">Establecer fondo de pantalla con:</string>
+    <string name="no_capable_app_found">Non se atopou ningún applicativo válido</string>
+    <string name="setting_wallpaper">Establecendo fondo de pantalla&#8230;</string>
+    <string name="wallpaper_set_successfully">fondo de pantalla establecido con éxito</string>
+    <string name="portrait_aspect_ratio">Proporción de Retrato</string>
+    <string name="landscape_aspect_ratio">Proporción de Paisaxe</string>
+    <string name="home_screen">Pantalla de incio</string>
+    <string name="lock_screen">Pantalla de bloqueo</string>
+    <string name="home_and_lock_screen">Pantallas de inicio e bloqueo</string>
 
     <!-- Slideshow -->
-    <string name="slideshow">Slideshow</string>
-    <string name="interval">Interval (seconds):</string>
-    <string name="include_photos">Include photos</string>
-    <string name="include_videos">Include videos</string>
-    <string name="include_gifs">Include GIFs</string>
-    <string name="random_order">Random order</string>
-    <string name="use_fade">Use fade animations</string>
-    <string name="move_backwards">Move backwards</string>
-    <string name="loop_slideshow">Loop slideshow</string>
-    <string name="slideshow_ended">The slideshow ended</string>
-    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+    <string name="slideshow">Presentación</string>
+    <string name="interval">Intervalo (segundos):</string>
+    <string name="include_photos">Incluír fotos</string>
+    <string name="include_videos">Incluír vídeos</string>
+    <string name="include_gifs">Incluír GIFs</string>
+    <string name="random_order">Orde aleatoria</string>
+    <string name="use_fade">Utilizar animación esvaescente</string>
+    <string name="move_backwards">Mover atrás</string>
+    <string name="loop_slideshow">Reproducir en bucle</string>
+    <string name="slideshow_ended">Rematou a presentación</string>
+    <string name="no_media_for_slideshow">Non se atoparon medios para a presentación</string>
 
     <!-- View types -->
-    <string name="change_view_type">Change view type</string>
-    <string name="grid">Grid</string>
-    <string name="list">List</string>
+    <string name="change_view_type">Cambiar o tipo de vista</string>
+    <string name="grid">Grella</string>
+    <string name="list">Lista</string>
 
     <!-- Settings -->
     <string name="autoplay_videos">Reproducir vídeos automticamente</string>
-    <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="loop_videos">Loop videos</string>
-    <string name="animate_gifs">Animate GIFs at thumbnails</string>
-    <string name="max_brightness">Max brightness when viewing media</string>
-    <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="screen_rotation_by">Rotate fullscreen media by</string>
-    <string name="screen_rotation_system_setting">System setting</string>
-    <string name="screen_rotation_device_rotation">Device rotation</string>
-    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
-    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
-    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
-    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="show_media_count">Show folder media count on the main view</string>
-    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
-    <string name="show_extended_details">Show extended details over fullscreen media</string>
-    <string name="manage_extended_details">Manage extended details</string>
+    <string name="toggle_filename">Mudar a visibilidade do ficheiro</string>
+    <string name="loop_videos">videos en bucle</string>
+    <string name="animate_gifs">Animar os GIFs na icona</string>
+    <string name="max_brightness">Brillo ao máximo cando mire medios</string>
+    <string name="crop_thumbnails">Recortar iconas a cadrados</string>
+    <string name="screen_rotation_by">Rotar medios a pantalla completa a</string>
+    <string name="screen_rotation_system_setting">Axuste do sistema</string>
+    <string name="screen_rotation_device_rotation">Rotación do dispositivo</string>
+    <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
+    <string name="dark_background_at_fullscreen">Fondo oscura a pantalla completa</string>
+    <string name="scroll_thumbnails_horizontally">Desplazar iconas horizontalmente</string>
+    <string name="hide_system_ui_at_fullscreen">Agochar controis do sistema cando visualice a pantalla completa</string>
+    <string name="delete_empty_folders">Borrar cartafoles baldeiros cando elmine o seu contido</string>
+    <string name="allow_video_gestures">Permitir controlar o volume do vídeo e o brillo con xestos verticáis</string>
+    <string name="show_media_count">Mostrar a conta de medios do cartafol na vista principal</string>
+    <string name="replace_share_with_rotate">Substituír Compartir con Rotar no menú de pantalla completa</string>
+    <string name="show_extended_details">Mostrar información pormenorizada sobre medios a pantalla completa</string>
+    <string name="manage_extended_details">Xestionar información polo miúdo</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
-    <string name="app_short_description">A gallery for viewing photos and videos without ads.</string>
+    <string name="app_short_description">Unha galería para ver fotos e videos, pero non publicidade.</string>
     <string name="app_long_description">
-        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
+        Unha simple ferramenta para ver fotos e vídeos. Pode organizar os elementos por data, tamaño, nome tanto ascendentes como descendentes, pode facer zoom nas fotografías. Os ficheiros de medios móstranse en múltiples columnas dependendo do tamaño da pantalla, pode mudar o número de columnas con xestos de belisco. Poden ser renomeados, compartidos, eliminados, copiados, movidos. As imaxes tamén se poden recortar, rotar, voltear ou establecer como fondo de pantalla directamente no aplicativo.
+        A Galería tamén se ofrece como aplicación de terceiros para vista previa de imaxes / vídeos, engadir anexos en correos etc. É perfecta para o uso diario.
+        
+        Non contén anuncios nin solicita permisos innecesarios. É de código aberto, con cores personalizadas.
 
-        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
-
-        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
-
-        This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
+        Este aplicativo é só unha das pezas de unha grande familia. Pode atopar o resto en http://www.simplemobiletools.com
     </string>
 
     <!--

From 8e894debb33777356bd90de27ac8e5e794e641bc Mon Sep 17 00:00:00 2001
From: Xose M <704948+xmgz@users.noreply.github.com>
Date: Fri, 15 Dec 2017 19:36:54 +0100
Subject: [PATCH 10/61] small typo

---
 app/src/main/res/values-gl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index dd270b326..94c899a68 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -19,7 +19,7 @@
     <string name="reduce_column_count">Reduza o número de columnas</string>
     <string name="change_cover_image">Cambiar a imaxe de portada</string>
     <string name="select_photo">Escolla foto</string>
-    <string name="use_default">Usar por omisin</string>
+    <string name="use_default">Usar valor por omisión</string>
     <string name="volume">Volume</string>
     <string name="brightness">Brillo</string>
     <string name="do_not_ask_again">Non preguntar de novo en esta sesión</string>

From 2837bd42c6b06324cb50791953eeef207606deec Mon Sep 17 00:00:00 2001
From: "hanjoong.cho" <hanjoongcho@gmail.com>
Date: Sat, 16 Dec 2017 05:47:49 +0900
Subject: [PATCH 11/61] Add Korean translation

---
 app/src/main/res/values-ko-rKR/strings.xml | 151 +++++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 app/src/main/res/values-ko-rKR/strings.xml

diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 000000000..f563134e6
--- /dev/null
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">심플 갤러리</string>
+    <string name="app_launcher_name">갤러리</string>
+    <string name="edit">수정</string>
+    <string name="open_camera">카메라 열기</string>
+    <string name="hidden">(숨기기)</string>
+    <string name="pin_folder">폴더 고정</string>
+    <string name="unpin_folder">폴더 고정 해제</string>
+    <string name="show_all">모든 폴더의 컨텐츠 보기</string>
+    <string name="all_folders">모든 폴더</string>
+    <string name="folder_view">폴더 보기로 변경</string>
+    <string name="other_folder">다른 폴더</string>
+    <string name="show_on_map">지도에서 보기</string>
+    <string name="unknown_location">위치정보 없음</string>
+    <string name="no_map_application">연결 가능한 지도 애플리케이션이 없습니다.</string>
+    <string name="no_camera_app_found">연결 가능한 카메라 애플리케이션이 없습니다.</string>
+    <string name="increase_column_count">썸네일 그리드 늘리기</string>
+    <string name="reduce_column_count">썸네일 그리드 줄이기</string>
+    <string name="change_cover_image">Change cover image</string>
+    <string name="select_photo">사진 선택</string>
+    <string name="use_default">Use default</string>
+    <string name="volume">볼륨</string>
+    <string name="brightness">밝기</string>
+    <string name="do_not_ask_again">다시 물어보지 않음</string>
+    <string name="lock_orientation">사진회전 잠금</string>
+    <string name="unlock_orientation">사진회전 해제</string>
+
+    <!-- Filter -->
+    <string name="filter_media">미디어 필터 설정</string>
+    <string name="images">이미지</string>
+    <string name="videos">비디오</string>
+    <string name="gifs">GIFs</string>
+    <string name="no_media_with_filters">설정된 필터와 일치하는 컨텐츠가 존재하지 않습니다.</string>
+    <string name="change_filters_underlined"><u>필터 변경</u></string>
+
+    <!-- Hide / Exclude -->
+    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue?</string>
+    <string name="exclude">Exclude</string>
+    <string name="excluded_folders">Excluded folders</string>
+    <string name="manage_excluded_folders">Manage excluded folders</string>
+    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
+    <string name="exclude_folder_parent">Exclude a parent instead?</string>
+    <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
+    <string name="remove_all">Remove all</string>
+    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+
+    <!-- Include folders -->
+    <string name="include_folders">Included folders</string>
+    <string name="manage_included_folders">Manage included folders</string>
+    <string name="add_folder">Add folder</string>
+    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
+
+    <!-- Resizing -->
+    <string name="resize">Resize</string>
+    <string name="resize_and_save">Resize selection and save</string>
+    <string name="width">Width</string>
+    <string name="height">Height</string>
+    <string name="keep_aspect_ratio">Keep aspect ratio</string>
+    <string name="invalid_values">Please enter a valid resolution</string>
+
+    <!-- Editor -->
+    <string name="editor">Editor</string>
+    <string name="save">Save</string>
+    <string name="rotate">Rotate</string>
+    <string name="path">Path</string>
+    <string name="invalid_image_path">Invalid image path</string>
+    <string name="image_editing_failed">Image editing failed</string>
+    <string name="edit_image_with">Edit image with:</string>
+    <string name="no_editor_found">No image editor found</string>
+    <string name="unknown_file_location">Unknown file location</string>
+    <string name="error_saving_file">Could not overwrite the source file</string>
+    <string name="rotate_left">Rotate left</string>
+    <string name="rotate_right">Rotate right</string>
+    <string name="rotate_one_eighty">Rotate by 180º</string>
+    <string name="flip">Flip</string>
+    <string name="flip_horizontally">Flip horizontally</string>
+    <string name="flip_vertically">Flip vertically</string>
+    <string name="edit_with">Edit with</string>
+
+    <!-- Set wallpaper -->
+    <string name="simple_wallpaper">Simple Wallpaper</string>
+    <string name="set_as_wallpaper">Set as Wallpaper</string>
+    <string name="set_as_wallpaper_failed">Setting as Wallpaper failed</string>
+    <string name="set_as_wallpaper_with">Set as wallpaper with:</string>
+    <string name="no_capable_app_found">No app capable of it has been found</string>
+    <string name="setting_wallpaper">Setting wallpaper&#8230;</string>
+    <string name="wallpaper_set_successfully">Wallpaper set successfully</string>
+    <string name="portrait_aspect_ratio">Portrait aspect ratio</string>
+    <string name="landscape_aspect_ratio">Landscape aspect ratio</string>
+    <string name="home_screen">Home screen</string>
+    <string name="lock_screen">Lock screen</string>
+    <string name="home_and_lock_screen">Home and lock screen</string>
+
+    <!-- Slideshow -->
+    <string name="slideshow">Slideshow</string>
+    <string name="interval">Interval (seconds):</string>
+    <string name="include_photos">Include photos</string>
+    <string name="include_videos">Include videos</string>
+    <string name="include_gifs">Include GIFs</string>
+    <string name="random_order">Random order</string>
+    <string name="use_fade">Use fade animations</string>
+    <string name="move_backwards">Move backwards</string>
+    <string name="loop_slideshow">Loop slideshow</string>
+    <string name="slideshow_ended">The slideshow ended</string>
+    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+
+    <!-- View types -->
+    <string name="change_view_type">Change view type</string>
+    <string name="grid">Grid</string>
+    <string name="list">List</string>
+
+    <!-- Settings -->
+    <string name="autoplay_videos">Play videos automatically</string>
+    <string name="toggle_filename">Toggle filename visibility</string>
+    <string name="loop_videos">Loop videos</string>
+    <string name="animate_gifs">Animate GIFs at thumbnails</string>
+    <string name="max_brightness">Max brightness when viewing media</string>
+    <string name="crop_thumbnails">Crop thumbnails into squares</string>
+    <string name="screen_rotation_by">Rotate fullscreen media by</string>
+    <string name="screen_rotation_system_setting">System setting</string>
+    <string name="screen_rotation_device_rotation">Device rotation</string>
+    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
+    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
+    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
+    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
+    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
+    <string name="show_media_count">Show folder media count on the main view</string>
+    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
+    <string name="show_extended_details">Show extended details over fullscreen media</string>
+    <string name="manage_extended_details">Manage extended details</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">A gallery for viewing photos and videos without ads.</string>
+    <string name="app_long_description">
+        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
+
+        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
+
+        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
+
+        This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
+    </string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>

From 53bb1d46c4b5297149182ada6aa0f8ebd4bc8030 Mon Sep 17 00:00:00 2001
From: Tibor Kaputa <tibor@kaputa.sk>
Date: Fri, 15 Dec 2017 22:09:49 +0100
Subject: [PATCH 12/61] adding a newline

---
 app/src/main/res/values-gl/strings.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 94c899a68..63ee0f11f 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -136,6 +136,7 @@
     <string name="app_short_description">Unha galería para ver fotos e videos, pero non publicidade.</string>
     <string name="app_long_description">
         Unha simple ferramenta para ver fotos e vídeos. Pode organizar os elementos por data, tamaño, nome tanto ascendentes como descendentes, pode facer zoom nas fotografías. Os ficheiros de medios móstranse en múltiples columnas dependendo do tamaño da pantalla, pode mudar o número de columnas con xestos de belisco. Poden ser renomeados, compartidos, eliminados, copiados, movidos. As imaxes tamén se poden recortar, rotar, voltear ou establecer como fondo de pantalla directamente no aplicativo.
+        
         A Galería tamén se ofrece como aplicación de terceiros para vista previa de imaxes / vídeos, engadir anexos en correos etc. É perfecta para o uso diario.
         
         Non contén anuncios nin solicita permisos innecesarios. É de código aberto, con cores personalizadas.

From 473e0dfd065bfbd36bc127ebf80b06c4b12d3c0c Mon Sep 17 00:00:00 2001
From: "hanjoong.cho" <hanjoongcho@gmail.com>
Date: Sat, 16 Dec 2017 12:26:50 +0900
Subject: [PATCH 13/61] Update Korean translation

---
 app/src/main/res/values-ko-rKR/strings.xml | 64 +++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index f563134e6..41bae1adc 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -2,7 +2,7 @@
 <resources>
     <string name="app_name">심플 갤러리</string>
     <string name="app_launcher_name">갤러리</string>
-    <string name="edit">수정</string>
+    <string name="edit">편집</string>
     <string name="open_camera">카메라 열기</string>
     <string name="hidden">(숨기기)</string>
     <string name="pin_folder">폴더 고정</string>
@@ -15,8 +15,8 @@
     <string name="unknown_location">위치정보 없음</string>
     <string name="no_map_application">연결 가능한 지도 애플리케이션이 없습니다.</string>
     <string name="no_camera_app_found">연결 가능한 카메라 애플리케이션이 없습니다.</string>
-    <string name="increase_column_count">썸네일 그리드 늘리기</string>
-    <string name="reduce_column_count">썸네일 그리드 줄이기</string>
+    <string name="increase_column_count">섬네일크기 축소</string>
+    <string name="reduce_column_count">섬네일크기 확대</string>
     <string name="change_cover_image">Change cover image</string>
     <string name="select_photo">사진 선택</string>
     <string name="use_default">Use default</string>
@@ -35,15 +35,15 @@
     <string name="change_filters_underlined"><u>필터 변경</u></string>
 
     <!-- Hide / Exclude -->
-    <string name="hide_folder_description">This function hides the folder by adding a \'.nomedia\' file into it, it will hide all subfolders too. You can see them by toggling the \'Show hidden items\' option in Settings. Continue?</string>
-    <string name="exclude">Exclude</string>
-    <string name="excluded_folders">Excluded folders</string>
-    <string name="manage_excluded_folders">Manage excluded folders</string>
-    <string name="exclude_folder_description">This will exclude the selection together with its subfolders from Simple Gallery only. You can manage excluded folders in Settings.</string>
-    <string name="exclude_folder_parent">Exclude a parent instead?</string>
+    <string name="hide_folder_description">현재폴더 및 모든 하위폴더를 \'.nomedia\' 폴더를 생성하여 숨김니다. 숨김 처리된 모들 폴더는 옵션설정의 \'숨김파일 보기\' 메뉴를 이용하여 다시 보실 수 있습니다. 계속 하시겠습니까?</string>
+    <string name="exclude">제외하기</string>
+    <string name="excluded_folders">제외 된 폴더</string>
+    <string name="manage_excluded_folders">제외 된 폴더관리</string>
+    <string name="exclude_folder_description">현재폴더 및 모든 하위폴더를 심플 갤러리에서 제외시킵니다. 제외된 폴더는 옵션설정에서 관리 할 수 있습니다.</string>
+    <string name="exclude_folder_parent">상위 폴더를 제외 하시겠습니까?</string>
     <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
-    <string name="remove_all">Remove all</string>
-    <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+    <string name="remove_all">모두 제거</string>
+    <string name="remove_all_description">제외 목록을 모두 삭제 하시겠습니다? 목록을 삭제해도 폴더가 삭제되지는 않습니다.</string>
 
     <!-- Include folders -->
     <string name="include_folders">Included folders</string>
@@ -52,17 +52,17 @@
     <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
 
     <!-- Resizing -->
-    <string name="resize">Resize</string>
-    <string name="resize_and_save">Resize selection and save</string>
-    <string name="width">Width</string>
-    <string name="height">Height</string>
-    <string name="keep_aspect_ratio">Keep aspect ratio</string>
-    <string name="invalid_values">Please enter a valid resolution</string>
+    <string name="resize">크기 조정</string>
+    <string name="resize_and_save">크기 조정 및 저장</string>
+    <string name="width">넓이</string>
+    <string name="height">높이</string>
+    <string name="keep_aspect_ratio">가로세로 비율 유지</string>
+    <string name="invalid_values">올바른 비율을 입력하세요.</string>
 
     <!-- Editor -->
     <string name="editor">Editor</string>
     <string name="save">Save</string>
-    <string name="rotate">Rotate</string>
+    <string name="rotate">회전</string>
     <string name="path">Path</string>
     <string name="invalid_image_path">Invalid image path</string>
     <string name="image_editing_failed">Image editing failed</string>
@@ -93,22 +93,22 @@
     <string name="home_and_lock_screen">Home and lock screen</string>
 
     <!-- Slideshow -->
-    <string name="slideshow">Slideshow</string>
-    <string name="interval">Interval (seconds):</string>
-    <string name="include_photos">Include photos</string>
-    <string name="include_videos">Include videos</string>
-    <string name="include_gifs">Include GIFs</string>
-    <string name="random_order">Random order</string>
-    <string name="use_fade">Use fade animations</string>
-    <string name="move_backwards">Move backwards</string>
-    <string name="loop_slideshow">Loop slideshow</string>
-    <string name="slideshow_ended">The slideshow ended</string>
-    <string name="no_media_for_slideshow">No media for the slideshow have been found</string>
+    <string name="slideshow">슬라이드 쇼</string>
+    <string name="interval">간격 (초):</string>
+    <string name="include_photos">포함된 사진</string>
+    <string name="include_videos">포함된 비디오</string>
+    <string name="include_gifs">포함된 GIFs</string>
+    <string name="random_order">랜덤 순서</string>
+    <string name="use_fade">페이드 애니메이션 사용</string>
+    <string name="move_backwards">뒤로 이동</string>
+    <string name="loop_slideshow">슬라이드 쇼 반복</string>
+    <string name="slideshow_ended">슬라이드 쇼 종료</string>
+    <string name="no_media_for_slideshow">슬라이드 쇼를 위한 미디어를 찾을 수 없음</string>
 
     <!-- View types -->
-    <string name="change_view_type">Change view type</string>
-    <string name="grid">Grid</string>
-    <string name="list">List</string>
+    <string name="change_view_type">보기방식 변경</string>
+    <string name="grid">그리드</string>
+    <string name="list">목록</string>
 
     <!-- Settings -->
     <string name="autoplay_videos">Play videos automatically</string>

From 95c7c47a015c7ad32dd247b9cc6bbb928fc97ab4 Mon Sep 17 00:00:00 2001
From: "hanjoong.cho" <hanjoongcho@gmail.com>
Date: Sat, 16 Dec 2017 21:17:32 +0900
Subject: [PATCH 14/61] Update Korean translation

---
 app/src/main/res/values-ko-rKR/strings.xml | 96 +++++++++++-----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 41bae1adc..d4c6a2ebf 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -37,8 +37,8 @@
     <!-- Hide / Exclude -->
     <string name="hide_folder_description">현재폴더 및 모든 하위폴더를 \'.nomedia\' 폴더를 생성하여 숨김니다. 숨김 처리된 모들 폴더는 옵션설정의 \'숨김파일 보기\' 메뉴를 이용하여 다시 보실 수 있습니다. 계속 하시겠습니까?</string>
     <string name="exclude">제외하기</string>
-    <string name="excluded_folders">제외 된 폴더</string>
-    <string name="manage_excluded_folders">제외 된 폴더관리</string>
+    <string name="excluded_folders">제외된 폴더</string>
+    <string name="manage_excluded_folders">제외된 폴더관리</string>
     <string name="exclude_folder_description">현재폴더 및 모든 하위폴더를 심플 갤러리에서 제외시킵니다. 제외된 폴더는 옵션설정에서 관리 할 수 있습니다.</string>
     <string name="exclude_folder_parent">상위 폴더를 제외 하시겠습니까?</string>
     <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
@@ -46,37 +46,37 @@
     <string name="remove_all_description">제외 목록을 모두 삭제 하시겠습니다? 목록을 삭제해도 폴더가 삭제되지는 않습니다.</string>
 
     <!-- Include folders -->
-    <string name="include_folders">Included folders</string>
-    <string name="manage_included_folders">Manage included folders</string>
-    <string name="add_folder">Add folder</string>
-    <string name="included_activity_placeholder">If you have some folders which contain media, but were not recognized by the app, you can add them manually here.\n\nAdding some items here will not exclude any other folder.</string>
+    <string name="include_folders">포함된 폴더</string>
+    <string name="manage_included_folders">포함된 폴더 관리</string>
+    <string name="add_folder">폴더 추가</string>
+    <string name="included_activity_placeholder">미디어가 포함되어 있지만 앱에서 인식하지 못하는 폴더가있는 경우 여기에서 수동으로 추가 할 수 있습니다. \n\n여기에 항목을 추가해도 원본 폴더에서 제외되지 않습니다.</string>
 
     <!-- Resizing -->
-    <string name="resize">크기 조정</string>
-    <string name="resize_and_save">크기 조정 및 저장</string>
+    <string name="resize">크기 변경</string>
+    <string name="resize_and_save">크기 변경 및 저장</string>
     <string name="width">넓이</string>
     <string name="height">높이</string>
     <string name="keep_aspect_ratio">가로세로 비율 유지</string>
     <string name="invalid_values">올바른 비율을 입력하세요.</string>
 
     <!-- Editor -->
-    <string name="editor">Editor</string>
-    <string name="save">Save</string>
+    <string name="editor">편집</string>
+    <string name="save">저장</string>
     <string name="rotate">회전</string>
-    <string name="path">Path</string>
-    <string name="invalid_image_path">Invalid image path</string>
-    <string name="image_editing_failed">Image editing failed</string>
-    <string name="edit_image_with">Edit image with:</string>
-    <string name="no_editor_found">No image editor found</string>
-    <string name="unknown_file_location">Unknown file location</string>
-    <string name="error_saving_file">Could not overwrite the source file</string>
-    <string name="rotate_left">Rotate left</string>
-    <string name="rotate_right">Rotate right</string>
-    <string name="rotate_one_eighty">Rotate by 180º</string>
-    <string name="flip">Flip</string>
-    <string name="flip_horizontally">Flip horizontally</string>
-    <string name="flip_vertically">Flip vertically</string>
-    <string name="edit_with">Edit with</string>
+    <string name="path">경로</string>
+    <string name="invalid_image_path">유효하지 않은 이미지 경로</string>
+    <string name="image_editing_failed">이미지 편집 실패</string>
+    <string name="edit_image_with">이미지편집 프로그램 연결:</string>
+    <string name="no_editor_found">이미지편집 프로그램 없음</string>
+    <string name="unknown_file_location">알 수 없는 파일위치</string>
+    <string name="error_saving_file">원본파일 덮어쓰기 실패</string>
+    <string name="rotate_left">왼쪽으로 회전</string>
+    <string name="rotate_right">오른쪽으로 회전</string>
+    <string name="rotate_one_eighty">180도 회전</string>
+    <string name="flip">반전</string>
+    <string name="flip_horizontally">가로 반전</string>
+    <string name="flip_vertically">세로 반전</string>
+    <string name="edit_with">이미지편집 프로그램 연결</string>
 
     <!-- Set wallpaper -->
     <string name="simple_wallpaper">Simple Wallpaper</string>
@@ -111,37 +111,37 @@
     <string name="list">목록</string>
 
     <!-- Settings -->
-    <string name="autoplay_videos">Play videos automatically</string>
-    <string name="toggle_filename">Toggle filename visibility</string>
-    <string name="loop_videos">Loop videos</string>
-    <string name="animate_gifs">Animate GIFs at thumbnails</string>
-    <string name="max_brightness">Max brightness when viewing media</string>
-    <string name="crop_thumbnails">Crop thumbnails into squares</string>
-    <string name="screen_rotation_by">Rotate fullscreen media by</string>
-    <string name="screen_rotation_system_setting">System setting</string>
-    <string name="screen_rotation_device_rotation">Device rotation</string>
-    <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
-    <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
-    <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
-    <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
-    <string name="allow_video_gestures">Allow controlling video volume and brightness with vertical gestures</string>
-    <string name="show_media_count">Show folder media count on the main view</string>
-    <string name="replace_share_with_rotate">Replace Share with Rotate at fullscreen menu</string>
-    <string name="show_extended_details">Show extended details over fullscreen media</string>
-    <string name="manage_extended_details">Manage extended details</string>
+    <string name="autoplay_videos">비디오 자동재생</string>
+    <string name="toggle_filename">파일이름 보기</string>
+    <string name="loop_videos">비디오 반복</string>
+    <string name="animate_gifs">섬네일에서 GIFs 애니메이션 활성화</string>
+    <string name="max_brightness">미디어 최대 밝기</string>
+    <string name="crop_thumbnails">미리보기 사각형으로 자름</string>
+    <string name="screen_rotation_by">전체화면으로 회전기준</string>
+    <string name="screen_rotation_system_setting">시스템 설정</string>
+    <string name="screen_rotation_device_rotation">디바이스 회전</string>
+    <string name="screen_rotation_aspect_ratio">가로세로 비율</string>
+    <string name="dark_background_at_fullscreen">미디어 전체화면 배경 어둡게하기</string>
+    <string name="scroll_thumbnails_horizontally">섬네일 수평스크롤</string>
+    <string name="hide_system_ui_at_fullscreen">전체화면 모드에서 시스템 UI 숨김</string>
+    <string name="delete_empty_folders">콘텐츠 삭제 후 빈폴더 삭제</string>
+    <string name="allow_video_gestures">수직 제스처로 비디오 볼륨 및 밝기 제어</string>
+    <string name="show_media_count">폴더에 포함된 미디어파일 수 표시</string>
+    <string name="replace_share_with_rotate">전체화면 메뉴의 공유 아이콘을 회전 아이콘으로 변경</string>
+    <string name="show_extended_details">전체화면 모드에서 세부정보 표시</string>
+    <string name="manage_extended_details">확장된 세부정보 관리</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- Short description has to have less than 80 chars -->
-    <string name="app_short_description">A gallery for viewing photos and videos without ads.</string>
+    <string name="app_short_description">광고없이 사진과 동영상을 볼 수 있는 갤러리.</string>
     <string name="app_long_description">
-        A simple tool usable for viewing photos and videos. Items can be sorted by date, size, name both ascending or descending, photos can be zoomed in. Media files are shown in multiple columns depending on the size of the display, you can change the column count by pinch gestures. They can be renamed, shared, deleted, copied, moved. Images can also be cropped, rotated, flipped or set as Wallpaper directly from the app.
+        사진과 비디오 보기위한 간편한 툴입니다. 날짜, 크기, 이름을 오름차순 또는 내림차순으로 정렬 할 수 있으며 사진을 확대 할 수 있습니다. 미디어 파일은 디스플레이의 크기에 따라 여러 열로 표시되며 핀치 제스처로 열 수를 변경할 수 있습니다. 이름 변경, 공유, 삭제, 복사, 이동이 가능합니다. 이미지는 자르기, 회전, 반전 또는 앱에서 직접 배경 화면으로 설정할 수도 있습니다.
 
-        The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
+        갤러리는 \'이미지/비디오 미리보기\', \'이메일 클라이언트에서 첨부파일 추가하기\' 등의 기능을 서드파티에 제공합니다. 언제나 완벽하게 사용할 수 있습니다.
 
-        Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
+        광고가 포함되어 있거나, 불필요한 권한을 요청하지 않습니다. 이 앱의 모든 소스는 오픈소스이며, 사용자가 직접 애플리케이션의 컬러를 설정 할 수 있습니다.
 
-        This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
+        이 앱은 다양한 시리즈의 모바일앱 중 하나입니다. 나머지는 http://www.simplemobiletools.com 에서 찾아 보실 수 있습니다.
     </string>
 
     <!--

From 65145ca625f26feee3d4e44f713ff338f5eeda87 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 10:06:54 +0100
Subject: [PATCH 15/61] escaping a question mark in the strings

---
 app/src/main/res/values-gl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 63ee0f11f..2403109f1 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -40,7 +40,7 @@
     <string name="excluded_folders">Cartafoles excluídos</string>
     <string name="manage_excluded_folders">Xestionar cartafoles excluídos</string>
     <string name="exclude_folder_description">Esto ocultará a selección xunto cos seus subcartafoles son en Simple Gallery. Pode xestionar os cartafoles ocultos en Axustes.</string>
-    <string name="exclude_folder_parent">?Excluír o cartafol fai no seu lugar?</string>
+    <string name="exclude_folder_parent">\?Excluír o cartafol fai no seu lugar?</string>
     <string name="excluded_activity_placeholder">Excluír un cartafol xunto cos subcartafoles só terá efecto en Simple Gallery, seguirán sendo visibles en outros aplicativos.\n\nSi tamén quere excluílos en outros aplicativos, utilice a opción Agochar.</string>
     <string name="remove_all">Eliminar todos</string>
     <string name="remove_all_description">Eliminar todos os cartafoles da lista de excluídos? Esto non borrará os cartafoles.</string>

From df85c1098beee3dc0f7f6ecc110d2c387a3d61df Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 10:53:39 +0100
Subject: [PATCH 16/61] update Subsampling to 3.9.0

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4e3615997..7cccd766c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -44,7 +44,7 @@ ext {
 
 dependencies {
     implementation 'com.simplemobiletools:commons:3.2.19'
-    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
+    implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
     implementation 'com.google.code.gson:gson:2.8.2'

From 9751daa8af466ab3867c8ba4aa7ce0257513be5d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 10:53:55 +0100
Subject: [PATCH 17/61] catch exceptions thrown at fetching image orientation

---
 .../gallery/fragments/PhotoFragment.kt        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index a7297449b..48030b07e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -224,15 +224,29 @@ class PhotoFragment : ViewPagerFragment() {
 
     private fun addZoomableView() {
         if ((medium.isImage()) && isFragmentVisible && view.subsampling_view.isGone() && !medium.isDng()) {
-            val exif = android.media.ExifInterface(medium.path)
-            val orientation = exif.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, android.media.ExifInterface.ORIENTATION_NORMAL)
+            val defaultOrientation = -1
+            var orient = defaultOrientation
+
+            try {
+                val uri = if (medium.path.startsWith("content:/")) Uri.parse(medium.path) else Uri.fromFile(File(medium.path))
+                val inputStream = context!!.contentResolver.openInputStream(uri)
+                val exif = ExifInterface()
+                exif.readExif(inputStream, ExifInterface.Options.OPTION_ALL)
+                orient = exif.getTag(ExifInterface.TAG_ORIENTATION)?.getValueAsInt(defaultOrientation) ?: defaultOrientation
+
+                if (orient == defaultOrientation) {
+                    val exif2 = android.media.ExifInterface(medium.path)
+                    orient = exif2.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, defaultOrientation)
+                }
+            } catch (ignored: Exception) {
+            }
 
             ViewPagerActivity.wasDecodedByGlide = false
             view.subsampling_view.apply {
                 maxScale = 10f
                 beVisible()
                 setImage(ImageSource.uri(medium.path))
-                this.orientation = degreesForRotation(orientation)
+                orientation = if (orient == -1) SubsamplingScaleImageView.ORIENTATION_USE_EXIF else degreesForRotation(orient)
                 setOnImageEventListener(object : SubsamplingScaleImageView.OnImageEventListener {
                     override fun onImageLoaded() {
                     }

From 8843a4a00645333f00a168b7b06532c3d55f8dc2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 11:46:41 +0100
Subject: [PATCH 18/61] handle onPageSelected called twice on every page change

---
 .../gallery/activities/ViewPagerActivity.kt         | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index a551e96ff..79de936e8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -860,11 +860,14 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         if (view_pager.offscreenPageLimit == 1) {
             view_pager.offscreenPageLimit = 2
         }
-        mPos = position
-        updateActionbarTitle()
-        mRotationDegrees = 0f
-        supportInvalidateOptionsMenu()
-        scheduleSwipe()
+
+        if (mPos != position) {
+            mPos = position
+            updateActionbarTitle()
+            mRotationDegrees = 0f
+            supportInvalidateOptionsMenu()
+            scheduleSwipe()
+        }
     }
 
     override fun onPageScrollStateChanged(state: Int) {

From bd0f5404605d32b26300afec0442605e6e897003 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 11:58:14 +0100
Subject: [PATCH 19/61] fix video autoplay in slideshows

---
 .../gallery/fragments/VideoFragment.kt                | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
index e6b0831d5..7ee976475 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/VideoFragment.kt
@@ -8,6 +8,7 @@ import android.os.Build
 import android.os.Bundle
 import android.os.Handler
 import android.provider.Settings
+import android.support.annotation.RequiresApi
 import android.util.DisplayMetrics
 import android.view.*
 import android.view.animation.AnimationUtils
@@ -44,6 +45,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
     private var mStoredShowExtendedDetails = false
     private var wasEncoded = false
     private var wasInit = false
+    private var isPrepared = false
     private var mStoredExtendedDetails = 0
     private var mCurrTime = 0
     private var mDuration = 0
@@ -395,7 +397,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
     }
 
     fun playVideo() {
-        if (mMediaPlayer != null) {
+        if (mMediaPlayer != null && isPrepared) {
             mIsPlaying = true
             mMediaPlayer?.start()
         } else {
@@ -471,13 +473,15 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
     }
 
     private fun videoPrepared(mediaPlayer: MediaPlayer) {
+        isPrepared = true
         mDuration = mediaPlayer.duration / 1000
         addPreviewImage()
         setupTimeHolder()
         setProgress(mCurrTime)
 
-        if (mIsFragmentVisible && (context!!.config.autoplayVideos || mPlayOnPrepare))
+        if (mIsFragmentVisible && (context!!.config.autoplayVideos || mPlayOnPrepare)) {
             playVideo()
+        }
     }
 
     private fun videoCompleted() {
@@ -509,6 +513,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
         releaseMediaPlayer()
     }
 
+    @RequiresApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
     private fun setVideoSize() {
         if (mSurfaceHolder == null)
             mSurfaceHolder = mSurfaceView!!.holder
@@ -526,7 +531,7 @@ class VideoFragment : ViewPagerFragment(), SurfaceHolder.Callback, SeekBar.OnSee
         val screenWidth: Int
         val screenHeight: Int
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+        if (activity!!.isJellyBean1Plus()) {
             val realMetrics = DisplayMetrics()
             display.getRealMetrics(realMetrics)
             screenWidth = realMetrics.widthPixels

From 47046d3d117428bb66c28a9f0718fbd90be6ade1 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 12:27:11 +0100
Subject: [PATCH 20/61] properly fetch gif files

---
 .../com/simplemobiletools/gallery/helpers/MediaFetcher.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
index cce57aa36..e9b285d4e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
@@ -258,7 +258,7 @@ class MediaFetcher(val context: Context) {
             val isVideo = if (isImage) false else filename.isVideoFast()
             val isGif = if (isImage || isVideo) false else filename.isGif()
 
-            if (!isImage && !isVideo)
+            if (!isImage && !isVideo && !isGif)
                 continue
 
             if (isVideo && (isPickImage || filterMedia and VIDEOS == 0))

From 0ae0d8df12e2de9c1094919a29b16dfb06157550 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 13:03:32 +0100
Subject: [PATCH 21/61] also check file existence at Included folders, if size
 returns 0

---
 .../com/simplemobiletools/gallery/helpers/MediaFetcher.kt       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
index e9b285d4e..14ab1875e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
@@ -271,7 +271,7 @@ class MediaFetcher(val context: Context) {
                 continue
 
             val size = file.length()
-            if (size <= 0L)
+            if (size <= 0L && !file.exists())
                 continue
 
             val dateTaken = file.lastModified()

From 7a8d6043fa3cae0fc5facbdd0b505541a8df7ef8 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 13:14:23 +0100
Subject: [PATCH 22/61] update version to 3.0.2

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7cccd766c..d07007229 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 147
-        versionName "3.0.1"
+        versionCode 148
+        versionName "3.0.2"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }

From 67be9efbe301a9db2355442d713e07f521fd336d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 13:14:28 +0100
Subject: [PATCH 23/61] updating changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77fb901d3..64a34bd9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+Version 3.0.2 *(2017-12-17)*
+----------------------------
+
+ * Properly display email attachments
+ * Some crashfixes
+
 Version 3.0.1 *(2017-12-06)*
 ----------------------------
 

From 1c433b1ebfc1380ef544c838c017e0049d9c19ff Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 17 Dec 2017 20:53:17 +0100
Subject: [PATCH 24/61] make sure we call getLatestMediaId from a background
 thread

---
 .../simplemobiletools/gallery/activities/MainActivity.kt    | 6 ++++--
 .../simplemobiletools/gallery/activities/MediaActivity.kt   | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 05baef15e..d113f63b2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -526,9 +526,11 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     }
 
     private fun gotDirectories(newDirs: ArrayList<Directory>, isFromCache: Boolean) {
-        val dirs = getSortedDirectories(newDirs)
+        Thread {
+            mLatestMediaId = getLatestMediaId()
+        }.start()
 
-        mLatestMediaId = getLatestMediaId()
+        val dirs = getSortedDirectories(newDirs)
         directories_refresh_layout.isRefreshing = false
         mIsGettingDirs = false
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index c432843bb..7613096c8 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -537,7 +537,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
     }
 
     private fun gotMedia(media: ArrayList<Medium>, isFromCache: Boolean = false) {
-        mLatestMediaId = getLatestMediaId()
+        Thread {
+            mLatestMediaId = getLatestMediaId()
+        }.start()
+
         mIsGettingMedia = false
         media_refresh_layout.isRefreshing = false
 

From 4a91960875c12605d865fcab9930cf658e61d9cd Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 Dec 2017 22:33:51 +0100
Subject: [PATCH 25/61] flip the exif fetching functions, use the deprecated
 one first

---
 .../gallery/fragments/PhotoFragment.kt             | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index 48030b07e..a9af4d393 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -228,15 +228,15 @@ class PhotoFragment : ViewPagerFragment() {
             var orient = defaultOrientation
 
             try {
-                val uri = if (medium.path.startsWith("content:/")) Uri.parse(medium.path) else Uri.fromFile(File(medium.path))
-                val inputStream = context!!.contentResolver.openInputStream(uri)
-                val exif = ExifInterface()
-                exif.readExif(inputStream, ExifInterface.Options.OPTION_ALL)
-                orient = exif.getTag(ExifInterface.TAG_ORIENTATION)?.getValueAsInt(defaultOrientation) ?: defaultOrientation
+                val exif = android.media.ExifInterface(medium.path)
+                orient = exif.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, defaultOrientation)
 
                 if (orient == defaultOrientation) {
-                    val exif2 = android.media.ExifInterface(medium.path)
-                    orient = exif2.getAttributeInt(android.media.ExifInterface.TAG_ORIENTATION, defaultOrientation)
+                    val uri = if (medium.path.startsWith("content:/")) Uri.parse(medium.path) else Uri.fromFile(File(medium.path))
+                    val inputStream = context!!.contentResolver.openInputStream(uri)
+                    val exif2 = ExifInterface()
+                    exif2.readExif(inputStream, ExifInterface.Options.OPTION_ALL)
+                    orient = exif2.getTag(ExifInterface.TAG_ORIENTATION)?.getValueAsInt(defaultOrientation) ?: defaultOrientation
                 }
             } catch (ignored: Exception) {
             }

From 57e1678f1a966e9066d67a3728f2e44c2c1e427b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 18 Dec 2017 23:46:42 +0100
Subject: [PATCH 26/61] fix #82, properly display MMS images

---
 .../simplemobiletools/gallery/activities/PhotoVideoActivity.kt  | 2 +-
 .../com/simplemobiletools/gallery/fragments/PhotoFragment.kt    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
index de41a30a8..278fc7701 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
@@ -67,7 +67,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
             return
         } else {
             val path = applicationContext.getRealPathFromURI(mUri!!) ?: ""
-            if (path != mUri.toString() && path.isNotEmpty()) {
+            if (path != mUri.toString() && path.isNotEmpty() && mUri!!.authority != "mms") {
                 scanPath(mUri!!.path)
                 sendViewPagerIntent(path)
                 finish()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index a9af4d393..6c3093f46 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -55,7 +55,7 @@ class PhotoFragment : ViewPagerFragment() {
         }
 
         medium = arguments!!.getSerializable(MEDIUM) as Medium
-        if (medium.path.startsWith("content://")) {
+        if (medium.path.startsWith("content://") && !medium.path.startsWith("content://mms/")) {
             val originalPath = medium.path
             medium.path = context!!.getRealPathFromURI(Uri.parse(originalPath)) ?: medium.path
 

From 5903cbc0cfe552385369aca581cba33a7b562c93 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 08:32:04 +0100
Subject: [PATCH 27/61] update the Dark Background setting string, apply it to
 status bar too

---
 app/src/main/res/values-cs/strings.xml     | 2 +-
 app/src/main/res/values-de/strings.xml     | 2 +-
 app/src/main/res/values-es/strings.xml     | 2 +-
 app/src/main/res/values-fi/strings.xml     | 2 +-
 app/src/main/res/values-fr/strings.xml     | 2 +-
 app/src/main/res/values-gl/strings.xml     | 2 +-
 app/src/main/res/values-hr/strings.xml     | 2 +-
 app/src/main/res/values-hu/strings.xml     | 2 +-
 app/src/main/res/values-it/strings.xml     | 2 +-
 app/src/main/res/values-ja/strings.xml     | 2 +-
 app/src/main/res/values-ko-rKR/strings.xml | 2 +-
 app/src/main/res/values-nb/strings.xml     | 2 +-
 app/src/main/res/values-nl/strings.xml     | 2 +-
 app/src/main/res/values-pl/strings.xml     | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml | 2 +-
 app/src/main/res/values-pt/strings.xml     | 2 +-
 app/src/main/res/values-ru/strings.xml     | 2 +-
 app/src/main/res/values-sk/strings.xml     | 2 +-
 app/src/main/res/values-sv/strings.xml     | 2 +-
 app/src/main/res/values-tr/strings.xml     | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml | 2 +-
 app/src/main/res/values/strings.xml        | 2 +-
 23 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 9c2530c34..67a6713a5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index af2bfb338..00274d3e6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systemeinstellung</string>
     <string name="screen_rotation_device_rotation">Gerätedrehung</string>
     <string name="screen_rotation_aspect_ratio">Seitenverhältnis</string>
-    <string name="dark_background_at_fullscreen">Schwarzer Hintergrund im Vollbild</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Kacheln horizontal scrollen</string>
     <string name="hide_system_ui_at_fullscreen">Systemleisten ausblenden im Vollbild</string>
     <string name="delete_empty_folders">Nach Löschen leere Ordner löschen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index fcd5e2b5a..799d07293 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Configuración del sistema</string>
     <string name="screen_rotation_device_rotation">Rotación del dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
-    <string name="dark_background_at_fullscreen">Utilizar siempre fondo oscuro en pantalla completa</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Desplazar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Ocultar automáticamente la interfaz de usuario del sistema en medios de pantalla completa</string>
     <string name="delete_empty_folders">Eliminar carpetas vacias despues de borrar su contenido</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 92510937e..8d1e59eea 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Järjestelmän asetukset</string>
     <string name="screen_rotation_device_rotation">Laitteen kierto</string>
     <string name="screen_rotation_aspect_ratio">Kuvasuhde</string>
-    <string name="dark_background_at_fullscreen">Tumma tausta koko ruudun medioissa</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Vieritä pienoiskuvia vaakasuorassa</string>
     <string name="hide_system_ui_at_fullscreen">Piilota järjestelmän UI automaattisesti koko näytön mediassa</string>
     <string name="delete_empty_folders">Poista tyhjät kansiot kansion tyhjennyksen jälkeen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 593daf531..10ae97f76 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Paramètres système</string>
     <string name="screen_rotation_device_rotation">Rotation de l\'appareil</string>
     <string name="screen_rotation_aspect_ratio">Ratio d\'aspect</string>
-    <string name="dark_background_at_fullscreen">Arrière-plan sombre pour média plein écran</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Défilement des miniatures horizontalement</string>
     <string name="hide_system_ui_at_fullscreen">Masquer automatiquement l\'interface utilisateur si média plein écran</string>
     <string name="delete_empty_folders">Supprimer les dossiers vides après avoir supprimé leur contenu</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 2403109f1..c2de86c24 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Axuste do sistema</string>
     <string name="screen_rotation_device_rotation">Rotación do dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
-    <string name="dark_background_at_fullscreen">Fondo oscura a pantalla completa</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Desplazar iconas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Agochar controis do sistema cando visualice a pantalla completa</string>
     <string name="delete_empty_folders">Borrar cartafoles baldeiros cando elmine o seu contido</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a05379db4..e8a5ba4ef 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Postavke sustava</string>
     <string name="screen_rotation_device_rotation">Rotacija uređaja</string>
     <string name="screen_rotation_aspect_ratio">Omjer slike</string>
-    <string name="dark_background_at_fullscreen">Crna pozadina pri pregledu datoteka</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Listaj sličice horizontalno</string>
     <string name="hide_system_ui_at_fullscreen">Automatski sakrij UI sustava pri pregledu datoteka</string>
     <string name="delete_empty_folders">Izbriži prazne direktorije nakon brisanja njihovog sadržaja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1ce01199e..14a182647 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1fbdc0cc6..cafb2cdd8 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Impostazione di sistema</string>
     <string name="screen_rotation_device_rotation">Rotazione dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Proporzioni</string>
-    <string name="dark_background_at_fullscreen">Sfondo scuro a schermo intero</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scorri le miniature orizzontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Nascondi UI di sistema con media a schermo intero</string>
     <string name="delete_empty_folders">Elimina cartelle vuote dopo averne eliminato il contenuto</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e56c10c04..6590fb5eb 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">システム設定に従う</string>
     <string name="screen_rotation_device_rotation">端末の向きに従う</string>
     <string name="screen_rotation_aspect_ratio">メディアの縦横比に従う</string>
-    <string name="dark_background_at_fullscreen">黒背景でフルスクリーン表示</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">サムネイル画面を横方向にスクロール</string>
     <string name="hide_system_ui_at_fullscreen">フルスクリーン時にシステムUIを非表示にする</string>
     <string name="delete_empty_folders">メディアの削除後にフォルダーが空になった場合、そのフォルダーを削除する</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index d4c6a2ebf..2eb805c56 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">시스템 설정</string>
     <string name="screen_rotation_device_rotation">디바이스 회전</string>
     <string name="screen_rotation_aspect_ratio">가로세로 비율</string>
-    <string name="dark_background_at_fullscreen">미디어 전체화면 배경 어둡게하기</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">섬네일 수평스크롤</string>
     <string name="hide_system_ui_at_fullscreen">전체화면 모드에서 시스템 UI 숨김</string>
     <string name="delete_empty_folders">콘텐츠 삭제 후 빈폴더 삭제</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 37751c779..1527eaefe 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeminnstilling</string>
     <string name="screen_rotation_device_rotation">Enhetsrotasjon</string>
     <string name="screen_rotation_aspect_ratio">Sideforhold</string>
-    <string name="dark_background_at_fullscreen">Mørk bakgrunn i mediavisningen</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Horisontal rulling av minibilder</string>
     <string name="hide_system_ui_at_fullscreen">Skjul automatisk systemlinjer ved mediavisning</string>
     <string name="delete_empty_folders">Slett tomme mapper etter sletting av deres innhold</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6908de84d..a5ac3d5d1 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeeminstelling</string>
     <string name="screen_rotation_device_rotation">Rotatie van apparaat</string>
     <string name="screen_rotation_aspect_ratio">Afmetingen van bestand</string>
-    <string name="dark_background_at_fullscreen">Donkere achtergrond bij volledige weergave</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Horizontaal scrollen</string>
     <string name="hide_system_ui_at_fullscreen">Automatisch de statusbalk verbergen in volledige weergave</string>
     <string name="delete_empty_folders">Lege mappen verwijderen na het verwijderen van hun inhoud</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5b68cb861..b6a2b378b 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Ustawień systemowych</string>
     <string name="screen_rotation_device_rotation">Orientacji urządzenia</string>
     <string name="screen_rotation_aspect_ratio">Proporcji</string>
-    <string name="dark_background_at_fullscreen">Czarne tło przy podglądzie pełnoekranowym</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Przewijaj miniatury poziomo</string>
     <string name="hide_system_ui_at_fullscreen">Ukrywaj interfejs przy pełnoekranowym podglądzie</string>
     <string name="delete_empty_folders">Usuwaj puste foldery po usunięciu ich zawartości</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 7caab4ec1..1e8151a0d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Padrão do sistema</string>
     <string name="screen_rotation_device_rotation">Sensor do aparelho</string>
     <string name="screen_rotation_aspect_ratio">Proporção da mídia</string>
-    <string name="dark_background_at_fullscreen">Fundo de tela escuro em mídia tela cheia</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Rolar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Esconder interface do sistema automaticamente quando em tela cheia</string>
     <string name="delete_empty_folders">Apagar pastas vazias após deleter seu conteúdo</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index f28767f20..351a4f171 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Definições do sistema</string>
     <string name="screen_rotation_device_rotation">Rotação do dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Proporção</string>
-    <string name="dark_background_at_fullscreen">Usar sempre um fundo escuro se em ecrã completo</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Deslocação horizontal de miniaturas</string>
     <string name="hide_system_ui_at_fullscreen">Ocultar interface do sistema se em ecrã completo</string>
     <string name="delete_empty_folders">Apagar as pastas vazias depois de remover o seu conteúdo</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 393b0a939..5fd038de2 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Системные настройки</string>
     <string name="screen_rotation_device_rotation">Поворот устройства</string>
     <string name="screen_rotation_aspect_ratio">Соотношение сторон</string>
-    <string name="dark_background_at_fullscreen">Тёмный фон в полноэкранном режиме</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Прокрутка эскизов по горизонтали</string>
     <string name="hide_system_ui_at_fullscreen">Автоматически скрывать системный интерфейс в полноэкранном режиме</string>
     <string name="delete_empty_folders">Удалять пустые папки после удаления их содержимого</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index a011137df..b58639d71 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systémového nastavenia</string>
     <string name="screen_rotation_device_rotation">Otočenia zariadenia</string>
     <string name="screen_rotation_aspect_ratio">Pomeru strán</string>
-    <string name="dark_background_at_fullscreen">Tmavé pozadie pri médiách na celú obrazovku</string>
+    <string name="dark_background_at_fullscreen">Čierne pozadie a stavová lišta pri médiách na celú obrazovku</string>
     <string name="scroll_thumbnails_horizontally">Prehliadať miniatúry vodorovne</string>
     <string name="hide_system_ui_at_fullscreen">Automaticky skrývať systémové lišty pri celoobrazovkových médiách</string>
     <string name="delete_empty_folders">Odstrániť prázdne priečinky po vymazaní ich obsahu</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 0e3deceb2..80b38cd6a 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeminställning</string>
     <string name="screen_rotation_device_rotation">Enhetens rotation</string>
     <string name="screen_rotation_aspect_ratio">Bildförhållande</string>
-    <string name="dark_background_at_fullscreen">Mörk bakgrund när media visas i helskärmsläge</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Rulla horisontellt genom miniatyrer</string>
     <string name="hide_system_ui_at_fullscreen">Dölj systemanvändargränssnittet automatiskt när media visas i helskärmsläge</string>
     <string name="delete_empty_folders">Ta bort tomma mappar när deras innehåll tas bort</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index cd52b4b1a..2abb5e517 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Sistem ayarı</string>
     <string name="screen_rotation_device_rotation">Cihaz döndürme</string>
     <string name="screen_rotation_aspect_ratio">En-boy oranı</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 058606ed6..fe8543657 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">系统设置</string>
     <string name="screen_rotation_device_rotation">设备方向</string>
     <string name="screen_rotation_aspect_ratio">根据长宽比</string>
-    <string name="dark_background_at_fullscreen">全屏时黑色背景</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">水平滚动缩略图</string>
     <string name="hide_system_ui_at_fullscreen">全屏时自动隐藏状态栏</string>
     <string name="delete_empty_folders">删除没有内容的空文件夹</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 035d25590..3fd1b70d4 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">系統設定方向</string>
     <string name="screen_rotation_device_rotation">裝置實際方向</string>
     <string name="screen_rotation_aspect_ratio">圖片長寬比</string>
-    <string name="dark_background_at_fullscreen">全螢幕時黑背景</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">橫向滑動縮圖</string>
     <string name="hide_system_ui_at_fullscreen">全螢幕時自動隱藏系統介面</string>
     <string name="delete_empty_folders">刪除內容後刪除空白資料夾</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8f987f32..70ee12fed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Dark background at fullscreen media</string>
+    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>

From ef2d34ac457bb110c5cb2ff62a9ca668d37333c2 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 08:44:17 +0100
Subject: [PATCH 28/61] change the key of the changed string too

---
 app/src/main/res/layout/activity_settings.xml | 2 +-
 app/src/main/res/values-cs/strings.xml        | 2 +-
 app/src/main/res/values-de/strings.xml        | 2 +-
 app/src/main/res/values-es/strings.xml        | 2 +-
 app/src/main/res/values-fi/strings.xml        | 2 +-
 app/src/main/res/values-fr/strings.xml        | 2 +-
 app/src/main/res/values-gl/strings.xml        | 2 +-
 app/src/main/res/values-hr/strings.xml        | 2 +-
 app/src/main/res/values-hu/strings.xml        | 2 +-
 app/src/main/res/values-it/strings.xml        | 2 +-
 app/src/main/res/values-ja/strings.xml        | 2 +-
 app/src/main/res/values-ko-rKR/strings.xml    | 2 +-
 app/src/main/res/values-nb/strings.xml        | 2 +-
 app/src/main/res/values-nl/strings.xml        | 2 +-
 app/src/main/res/values-pl/strings.xml        | 2 +-
 app/src/main/res/values-pt-rBR/strings.xml    | 2 +-
 app/src/main/res/values-pt/strings.xml        | 2 +-
 app/src/main/res/values-ru/strings.xml        | 2 +-
 app/src/main/res/values-sk/strings.xml        | 2 +-
 app/src/main/res/values-sv/strings.xml        | 2 +-
 app/src/main/res/values-tr/strings.xml        | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml    | 2 +-
 app/src/main/res/values-zh-rTW/strings.xml    | 2 +-
 app/src/main/res/values/strings.xml           | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 2a862daea..788ab7f1c 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -224,7 +224,7 @@
                 android:clickable="false"
                 android:paddingLeft="@dimen/medium_margin"
                 android:paddingStart="@dimen/medium_margin"
-                android:text="@string/dark_background_at_fullscreen"/>
+                android:text="@string/black_background_at_fullscreen"/>
 
         </RelativeLayout>
 
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 67a6713a5..44294eaf5 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 00274d3e6..cc7eb6cec 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systemeinstellung</string>
     <string name="screen_rotation_device_rotation">Gerätedrehung</string>
     <string name="screen_rotation_aspect_ratio">Seitenverhältnis</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Kacheln horizontal scrollen</string>
     <string name="hide_system_ui_at_fullscreen">Systemleisten ausblenden im Vollbild</string>
     <string name="delete_empty_folders">Nach Löschen leere Ordner löschen</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 799d07293..745937f60 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Configuración del sistema</string>
     <string name="screen_rotation_device_rotation">Rotación del dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Desplazar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Ocultar automáticamente la interfaz de usuario del sistema en medios de pantalla completa</string>
     <string name="delete_empty_folders">Eliminar carpetas vacias despues de borrar su contenido</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 8d1e59eea..7ad6bd78a 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Järjestelmän asetukset</string>
     <string name="screen_rotation_device_rotation">Laitteen kierto</string>
     <string name="screen_rotation_aspect_ratio">Kuvasuhde</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Vieritä pienoiskuvia vaakasuorassa</string>
     <string name="hide_system_ui_at_fullscreen">Piilota järjestelmän UI automaattisesti koko näytön mediassa</string>
     <string name="delete_empty_folders">Poista tyhjät kansiot kansion tyhjennyksen jälkeen</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 10ae97f76..cf6d7961f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Paramètres système</string>
     <string name="screen_rotation_device_rotation">Rotation de l\'appareil</string>
     <string name="screen_rotation_aspect_ratio">Ratio d\'aspect</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Défilement des miniatures horizontalement</string>
     <string name="hide_system_ui_at_fullscreen">Masquer automatiquement l\'interface utilisateur si média plein écran</string>
     <string name="delete_empty_folders">Supprimer les dossiers vides après avoir supprimé leur contenu</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index c2de86c24..3a3ef8f9d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Axuste do sistema</string>
     <string name="screen_rotation_device_rotation">Rotación do dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Relación de aspecto</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Desplazar iconas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Agochar controis do sistema cando visualice a pantalla completa</string>
     <string name="delete_empty_folders">Borrar cartafoles baldeiros cando elmine o seu contido</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index e8a5ba4ef..d20f9bfb0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Postavke sustava</string>
     <string name="screen_rotation_device_rotation">Rotacija uređaja</string>
     <string name="screen_rotation_aspect_ratio">Omjer slike</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Listaj sličice horizontalno</string>
     <string name="hide_system_ui_at_fullscreen">Automatski sakrij UI sustava pri pregledu datoteka</string>
     <string name="delete_empty_folders">Izbriži prazne direktorije nakon brisanja njihovog sadržaja</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 14a182647..3c2e94c85 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index cafb2cdd8..47078e26e 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Impostazione di sistema</string>
     <string name="screen_rotation_device_rotation">Rotazione dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Proporzioni</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scorri le miniature orizzontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Nascondi UI di sistema con media a schermo intero</string>
     <string name="delete_empty_folders">Elimina cartelle vuote dopo averne eliminato il contenuto</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 6590fb5eb..674a1ca50 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">システム設定に従う</string>
     <string name="screen_rotation_device_rotation">端末の向きに従う</string>
     <string name="screen_rotation_aspect_ratio">メディアの縦横比に従う</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">サムネイル画面を横方向にスクロール</string>
     <string name="hide_system_ui_at_fullscreen">フルスクリーン時にシステムUIを非表示にする</string>
     <string name="delete_empty_folders">メディアの削除後にフォルダーが空になった場合、そのフォルダーを削除する</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 2eb805c56..b94a97ad6 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">시스템 설정</string>
     <string name="screen_rotation_device_rotation">디바이스 회전</string>
     <string name="screen_rotation_aspect_ratio">가로세로 비율</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">섬네일 수평스크롤</string>
     <string name="hide_system_ui_at_fullscreen">전체화면 모드에서 시스템 UI 숨김</string>
     <string name="delete_empty_folders">콘텐츠 삭제 후 빈폴더 삭제</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 1527eaefe..8d5ddf1a0 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeminnstilling</string>
     <string name="screen_rotation_device_rotation">Enhetsrotasjon</string>
     <string name="screen_rotation_aspect_ratio">Sideforhold</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Horisontal rulling av minibilder</string>
     <string name="hide_system_ui_at_fullscreen">Skjul automatisk systemlinjer ved mediavisning</string>
     <string name="delete_empty_folders">Slett tomme mapper etter sletting av deres innhold</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a5ac3d5d1..01bfb3cce 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeeminstelling</string>
     <string name="screen_rotation_device_rotation">Rotatie van apparaat</string>
     <string name="screen_rotation_aspect_ratio">Afmetingen van bestand</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Horizontaal scrollen</string>
     <string name="hide_system_ui_at_fullscreen">Automatisch de statusbalk verbergen in volledige weergave</string>
     <string name="delete_empty_folders">Lege mappen verwijderen na het verwijderen van hun inhoud</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b6a2b378b..0f9d081d0 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Ustawień systemowych</string>
     <string name="screen_rotation_device_rotation">Orientacji urządzenia</string>
     <string name="screen_rotation_aspect_ratio">Proporcji</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Przewijaj miniatury poziomo</string>
     <string name="hide_system_ui_at_fullscreen">Ukrywaj interfejs przy pełnoekranowym podglądzie</string>
     <string name="delete_empty_folders">Usuwaj puste foldery po usunięciu ich zawartości</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1e8151a0d..717fffec4 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Padrão do sistema</string>
     <string name="screen_rotation_device_rotation">Sensor do aparelho</string>
     <string name="screen_rotation_aspect_ratio">Proporção da mídia</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Rolar miniaturas horizontalmente</string>
     <string name="hide_system_ui_at_fullscreen">Esconder interface do sistema automaticamente quando em tela cheia</string>
     <string name="delete_empty_folders">Apagar pastas vazias após deleter seu conteúdo</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 351a4f171..bb0510a6d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Definições do sistema</string>
     <string name="screen_rotation_device_rotation">Rotação do dispositivo</string>
     <string name="screen_rotation_aspect_ratio">Proporção</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Deslocação horizontal de miniaturas</string>
     <string name="hide_system_ui_at_fullscreen">Ocultar interface do sistema se em ecrã completo</string>
     <string name="delete_empty_folders">Apagar as pastas vazias depois de remover o seu conteúdo</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5fd038de2..765e361aa 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Системные настройки</string>
     <string name="screen_rotation_device_rotation">Поворот устройства</string>
     <string name="screen_rotation_aspect_ratio">Соотношение сторон</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Прокрутка эскизов по горизонтали</string>
     <string name="hide_system_ui_at_fullscreen">Автоматически скрывать системный интерфейс в полноэкранном режиме</string>
     <string name="delete_empty_folders">Удалять пустые папки после удаления их содержимого</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index b58639d71..f8787b7f3 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systémového nastavenia</string>
     <string name="screen_rotation_device_rotation">Otočenia zariadenia</string>
     <string name="screen_rotation_aspect_ratio">Pomeru strán</string>
-    <string name="dark_background_at_fullscreen">Čierne pozadie a stavová lišta pri médiách na celú obrazovku</string>
+    <string name="black_background_at_fullscreen">Čierne pozadie a stavová lišta pri médiách na celú obrazovku</string>
     <string name="scroll_thumbnails_horizontally">Prehliadať miniatúry vodorovne</string>
     <string name="hide_system_ui_at_fullscreen">Automaticky skrývať systémové lišty pri celoobrazovkových médiách</string>
     <string name="delete_empty_folders">Odstrániť prázdne priečinky po vymazaní ich obsahu</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 80b38cd6a..aa19dcfea 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeminställning</string>
     <string name="screen_rotation_device_rotation">Enhetens rotation</string>
     <string name="screen_rotation_aspect_ratio">Bildförhållande</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Rulla horisontellt genom miniatyrer</string>
     <string name="hide_system_ui_at_fullscreen">Dölj systemanvändargränssnittet automatiskt när media visas i helskärmsläge</string>
     <string name="delete_empty_folders">Ta bort tomma mappar när deras innehåll tas bort</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 2abb5e517..a4a441ed3 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Sistem ayarı</string>
     <string name="screen_rotation_device_rotation">Cihaz döndürme</string>
     <string name="screen_rotation_aspect_ratio">En-boy oranı</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fe8543657..dcac88b81 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">系统设置</string>
     <string name="screen_rotation_device_rotation">设备方向</string>
     <string name="screen_rotation_aspect_ratio">根据长宽比</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">水平滚动缩略图</string>
     <string name="hide_system_ui_at_fullscreen">全屏时自动隐藏状态栏</string>
     <string name="delete_empty_folders">删除没有内容的空文件夹</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3fd1b70d4..1a1204ec6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">系統設定方向</string>
     <string name="screen_rotation_device_rotation">裝置實際方向</string>
     <string name="screen_rotation_aspect_ratio">圖片長寬比</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">橫向滑動縮圖</string>
     <string name="hide_system_ui_at_fullscreen">全螢幕時自動隱藏系統介面</string>
     <string name="delete_empty_folders">刪除內容後刪除空白資料夾</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 70ee12fed..87482dab4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">System setting</string>
     <string name="screen_rotation_device_rotation">Device rotation</string>
     <string name="screen_rotation_aspect_ratio">Aspect ratio</string>
-    <string name="dark_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
     <string name="scroll_thumbnails_horizontally">Scroll thumbnails horizontally</string>
     <string name="hide_system_ui_at_fullscreen">Automatically hide system UI at fullscreen media</string>
     <string name="delete_empty_folders">Delete empty folders after deleting their content</string>

From 8b9810bab95dd69cee3119c7abc754a4272c0cf5 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 10:55:01 +0100
Subject: [PATCH 29/61] use black status bar at fullscreen media when set so

---
 app/build.gradle                                          | 2 +-
 .../gallery/activities/PhotoVideoActivity.kt              | 5 ++++-
 .../gallery/activities/SettingsActivity.kt                | 8 ++++----
 .../gallery/activities/ViewPagerActivity.kt               | 7 ++++++-
 .../simplemobiletools/gallery/fragments/PhotoFragment.kt  | 2 +-
 .../com/simplemobiletools/gallery/helpers/Config.kt       | 2 +-
 app/src/main/res/layout/activity_settings.xml             | 4 ++--
 7 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d07007229..4d7459c13 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.2.19'
+    implementation 'com.simplemobiletools:commons:3.3.1'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
index 278fc7701..ef52e77a2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/PhotoVideoActivity.kt
@@ -89,7 +89,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
             supportFragmentManager.beginTransaction().replace(R.id.fragment_holder, mFragment).commit()
         }
 
-        if (config.darkBackground) {
+        if (config.blackBackground) {
             fragment_holder.background = ColorDrawable(Color.BLACK)
         }
 
@@ -102,6 +102,9 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
     override fun onResume() {
         super.onResume()
         supportActionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.actionbar_gradient_background))
+        if (config.blackBackground) {
+            updateStatusbarColor(Color.BLACK)
+        }
     }
 
     private fun sendViewPagerIntent(path: String) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
index 6309dd18e..950f356cf 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/SettingsActivity.kt
@@ -148,10 +148,10 @@ class SettingsActivity : SimpleActivity() {
     }
 
     private fun setupDarkBackground() {
-        settings_dark_background.isChecked = config.darkBackground
-        settings_dark_background_holder.setOnClickListener {
-            settings_dark_background.toggle()
-            config.darkBackground = settings_dark_background.isChecked
+        settings_black_background.isChecked = config.blackBackground
+        settings_black_background_holder.setOnClickListener {
+            settings_black_background.toggle()
+            config.blackBackground = settings_black_background.isChecked
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index 79de936e8..7db412eb6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -116,6 +116,10 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
         setupRotation()
         invalidateOptionsMenu()
+
+        if (config.blackBackground) {
+            updateStatusbarColor(Color.BLACK)
+        }
     }
 
     override fun onPause() {
@@ -198,8 +202,9 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         reloadViewPager()
         scanPath(mPath)
 
-        if (config.darkBackground)
+        if (config.blackBackground) {
             view_pager.background = ColorDrawable(Color.BLACK)
+        }
 
         if (config.hideSystemUI)
             fragmentClicked()
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
index 6c3093f46..747742a59 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/fragments/PhotoFragment.kt
@@ -252,7 +252,7 @@ class PhotoFragment : ViewPagerFragment() {
                     }
 
                     override fun onReady() {
-                        background = ColorDrawable(if (context.config.darkBackground) Color.BLACK else context.config.backgroundColor)
+                        background = ColorDrawable(if (context.config.blackBackground) Color.BLACK else context.config.backgroundColor)
                         setDoubleTapZoomScale(getDoubleTapZoomScale(sWidth, sHeight))
                     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
index 5df4ae0b5..8c2f7cdb1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/Config.kt
@@ -156,7 +156,7 @@ class Config(context: Context) : BaseConfig(context) {
         get() = prefs.getBoolean(DISPLAY_FILE_NAMES, false)
         set(display) = prefs.edit().putBoolean(DISPLAY_FILE_NAMES, display).apply()
 
-    var darkBackground: Boolean
+    var blackBackground: Boolean
         get() = prefs.getBoolean(DARK_BACKGROUND, false)
         set(darkBackground) = prefs.edit().putBoolean(DARK_BACKGROUND, darkBackground).apply()
 
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 788ab7f1c..9437d049a 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -209,7 +209,7 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/settings_dark_background_holder"
+            android:id="@+id/settings_black_background_holder"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/medium_margin"
@@ -217,7 +217,7 @@
             android:padding="@dimen/activity_margin">
 
             <com.simplemobiletools.commons.views.MySwitchCompat
-                android:id="@+id/settings_dark_background"
+                android:id="@+id/settings_black_background"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="@null"

From 3f72652ed80d7db3031c63d872bfd4eca3702677 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 12:20:03 +0100
Subject: [PATCH 30/61] avoid running 2 media fetching asynctasks

---
 .../com/simplemobiletools/gallery/activities/MediaActivity.kt    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 7613096c8..0125673b1 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -378,6 +378,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         }
 
         mLoadedInitialPhotos = true
+        mCurrAsyncTask?.stopFetching()
         mCurrAsyncTask = GetMediaAsynctask(applicationContext, mPath, mIsGetVideoIntent, mIsGetImageIntent, mShowAll) {
             gotMedia(it)
         }

From f96360a497345baaa33bb746a971dec120be6ef1 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 12:27:05 +0100
Subject: [PATCH 31/61] remove some seemingly redundant code at checking file
 paths individually

---
 .../gallery/helpers/MediaFetcher.kt           | 68 ++-----------------
 1 file changed, 6 insertions(+), 62 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
index 14ab1875e..efad5c169 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/helpers/MediaFetcher.kt
@@ -98,9 +98,6 @@ class MediaFetcher(val context: Context) {
         val config = context.config
         val filterMedia = config.filterMedia
         val showHidden = config.shouldShowHidden
-        val includedFolders = config.includedFolders.map { "${it.trimEnd('/')}/" }
-        val excludedFolders = config.excludedFolders.map { "${it.trimEnd('/')}/" }
-        val noMediaFolders = getNoMediaFolders()
         val isThirdPartyIntent = config.isThirdPartyIntent
 
         cur.use {
@@ -143,40 +140,14 @@ class MediaFetcher(val context: Context) {
                         if (size <= 0L)
                             continue
 
-                        var isExcluded = false
-                        excludedFolders.forEach {
-                            if (path.startsWith(it)) {
-                                isExcluded = true
-                                includedFolders.forEach {
-                                    if (path.startsWith(it)) {
-                                        isExcluded = false
-                                    }
-                                }
-                            }
-                        }
+                        if (!file.exists())
+                            continue
 
-                        if (!isExcluded && !showHidden) {
-                            noMediaFolders.forEach {
-                                if (path.startsWith(it)) {
-                                    isExcluded = true
-                                }
-                            }
-                        }
+                        val dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
+                        val dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
 
-                        if (!isExcluded && !showHidden && path.contains("/.")) {
-                            isExcluded = true
-                        }
-
-                        if (!isExcluded || isThirdPartyIntent) {
-                            if (!file.exists())
-                                continue
-
-                            val dateTaken = cur.getLongValue(MediaStore.Images.Media.DATE_TAKEN)
-                            val dateModified = cur.getIntValue(MediaStore.Images.Media.DATE_MODIFIED) * 1000L
-
-                            val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
-                            curMedia.add(medium)
-                        }
+                        val medium = Medium(filename, path, isVideo, dateModified, dateTaken, size)
+                        curMedia.add(medium)
                     } catch (e: Exception) {
                         continue
                     }
@@ -301,31 +272,4 @@ class MediaFetcher(val context: Context) {
             "$sortValue ASC"
         }
     }
-
-    private fun getNoMediaFolders(): ArrayList<String> {
-        val folders = ArrayList<String>()
-        val noMediaCondition = "${MediaStore.Files.FileColumns.MEDIA_TYPE} = ${MediaStore.Files.FileColumns.MEDIA_TYPE_NONE}"
-
-        val uri = MediaStore.Files.getContentUri("external")
-        val columns = arrayOf(MediaStore.Files.FileColumns.DATA)
-        val where = "$noMediaCondition AND ${MediaStore.Files.FileColumns.TITLE} LIKE ?"
-        val args = arrayOf("%$NOMEDIA%")
-        var cursor: Cursor? = null
-
-        try {
-            cursor = context.contentResolver.query(uri, columns, where, args, null)
-            if (cursor?.moveToFirst() == true) {
-                do {
-                    val path = cursor.getString(cursor.getColumnIndex(MediaStore.Files.FileColumns.DATA)) ?: continue
-                    val noMediaFile = File(path)
-                    if (noMediaFile.exists())
-                        folders.add("${noMediaFile.parent}/")
-                } while (cursor.moveToNext())
-            }
-        } finally {
-            cursor?.close()
-        }
-
-        return folders
-    }
 }

From bd5e61aac3439507fb6447fa56ef115fd24df294 Mon Sep 17 00:00:00 2001
From: Pzqqt <821026875@qq.com>
Date: Tue, 19 Dec 2017 19:39:03 +0800
Subject: [PATCH 32/61] Update strings.xml

---
 app/src/main/res/values-zh-rCN/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index dcac88b81..aa0681383 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">系统设置</string>
     <string name="screen_rotation_device_rotation">设备方向</string>
     <string name="screen_rotation_aspect_ratio">根据长宽比</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">全屏时使用黑色背景和状态栏​</string>
     <string name="scroll_thumbnails_horizontally">水平滚动缩略图</string>
     <string name="hide_system_ui_at_fullscreen">全屏时自动隐藏状态栏</string>
     <string name="delete_empty_folders">删除没有内容的空文件夹</string>

From af586a209f3148ef1af5281d71ea2bc1bb0b0e34 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 17:14:08 +0100
Subject: [PATCH 33/61] create a copy of the mediafiles in the viewpager
 activity

---
 .../gallery/activities/MediaActivity.kt       |  1 +
 .../gallery/activities/ViewPagerActivity.kt   | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 0125673b1..3efc0f5e7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -134,6 +134,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
         super.onDestroy()
         if (config.showAll)
             config.temporarilyShowHidden = false
+
         mMedia.clear()
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index 7db412eb6..c0db101ca 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -32,7 +32,6 @@ import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.commons.helpers.REQUEST_EDIT_IMAGE
 import com.simplemobiletools.commons.helpers.REQUEST_SET_AS
 import com.simplemobiletools.gallery.R
-import com.simplemobiletools.gallery.activities.MediaActivity.Companion.mMedia
 import com.simplemobiletools.gallery.adapters.MyPagerAdapter
 import com.simplemobiletools.gallery.asynctasks.GetMediaAsynctask
 import com.simplemobiletools.gallery.dialogs.DeleteWithRememberDialog
@@ -70,6 +69,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     private var mIsOrientationLocked = false
 
     private var mStoredUseEnglish = false
+    private var mMediaFiles = ArrayList<Medium>()
 
     companion object {
         var screenWidth = 0
@@ -81,6 +81,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_medium)
         setTranslucentNavigation()
+        mMediaFiles = MediaActivity.mMedia.clone() as ArrayList<Medium>
 
         handlePermission(PERMISSION_WRITE_STORAGE) {
             if (it) {
@@ -139,7 +140,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
             config.isThirdPartyIntent = false
 
             if (intent.extras == null || !intent.getBooleanExtra(IS_FROM_GALLERY, false)) {
-                mMedia.clear()
+                mMediaFiles.clear()
             }
         }
     }
@@ -193,8 +194,8 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
         view_pager.onGlobalLayout {
             if (!isActivityDestroyed()) {
-                if (mMedia.isNotEmpty()) {
-                    gotMedia(mMedia)
+                if (mMediaFiles.isNotEmpty()) {
+                    gotMedia(mMediaFiles)
                 }
             }
         }
@@ -424,7 +425,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
     }
 
     private fun getMediaForSlideshow(): Boolean {
-        mSlideshowMedia = mMedia.toMutableList()
+        mSlideshowMedia = mMediaFiles.toMutableList()
         if (!config.slideshowIncludePhotos) {
             mSlideshowMedia = mSlideshowMedia.filter { !it.isImage() } as MutableList
         }
@@ -774,15 +775,15 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         }
 
         mPrevHashcode = media.hashCode()
-        mMedia = media
+        mMediaFiles = media
         mPos = if (mPos == -1) {
             getPositionInList(media)
         } else {
-            Math.min(mPos, mMedia.size - 1)
+            Math.min(mPos, mMediaFiles.size - 1)
         }
 
         updateActionbarTitle()
-        updatePagerItems(mMedia.toMutableList())
+        updatePagerItems(mMediaFiles.toMutableList())
         invalidateOptionsMenu()
         checkOrientation()
     }
@@ -853,7 +854,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
         }
     }
 
-    private fun getCurrentMedia() = if (mAreSlideShowMediaVisible) mSlideshowMedia else mMedia
+    private fun getCurrentMedia() = if (mAreSlideShowMediaVisible) mSlideshowMedia else mMediaFiles
 
     private fun getCurrentPath() = getCurrentMedium()!!.path
 

From 2edaa22b220976885c37ee1838a77d33da9e7916 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 17:20:15 +0100
Subject: [PATCH 34/61] do not specify the build tools explicitly

---
 app/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4d7459c13..65cd7f581 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.1"
 
     defaultConfig {
         applicationId "com.simplemobiletools.gallery"

From dc7e4e21d5bfab57ebf87265bfd22be4d64e861f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 17:21:20 +0100
Subject: [PATCH 35/61] update commons to 3.3.4

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 65cd7f581..93d94553b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.3.1'
+    implementation 'com.simplemobiletools:commons:3.3.4'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'

From 8c3339db821a49a9564b40b6e7c3c69f9a825162 Mon Sep 17 00:00:00 2001
From: Phoenix1747 <apertured@public-files.de>
Date: Tue, 19 Dec 2017 19:15:24 +0100
Subject: [PATCH 36/61] Update DE

Updated German translation. Localized commit 5903cbc0cfe552385369aca581cba33a7b562c93 and moved words for string ```hide_system_ui_at_fullscreen```.
---
 app/src/main/res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index cc7eb6cec..d77c2907a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -121,9 +121,9 @@
     <string name="screen_rotation_system_setting">Systemeinstellung</string>
     <string name="screen_rotation_device_rotation">Gerätedrehung</string>
     <string name="screen_rotation_aspect_ratio">Seitenverhältnis</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Schwarzer Hintergrund und Statusleiste bei Vollbild-Medien</string>
     <string name="scroll_thumbnails_horizontally">Kacheln horizontal scrollen</string>
-    <string name="hide_system_ui_at_fullscreen">Systemleisten ausblenden im Vollbild</string>
+    <string name="hide_system_ui_at_fullscreen">Systemleisten in Vollbild ausblenden</string>
     <string name="delete_empty_folders">Nach Löschen leere Ordner löschen</string>
     <string name="allow_video_gestures">Gesten für Videolautstärke/Helligkeit</string>
     <string name="show_media_count">Medienanzahl bei Ordnern anzeigen</string>

From 75facb12a7d86df1ed37744c56be9c1c298dcafa Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Tue, 19 Dec 2017 23:20:12 +0100
Subject: [PATCH 37/61] update commons to 3.3.7

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index 93d94553b..9bb9c6b12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.3.4'
+    implementation 'com.simplemobiletools:commons:3.3.7'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'

From 92e3a65639719db60f87616eb8f41eb55940c815 Mon Sep 17 00:00:00 2001
From: FTno <16176811+FTno@users.noreply.github.com>
Date: Wed, 20 Dec 2017 17:01:25 +0100
Subject: [PATCH 38/61] Update strings.xml

Norwegian translation update
---
 app/src/main/res/values-nb/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 8d5ddf1a0..b3dc6f9bc 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeminnstilling</string>
     <string name="screen_rotation_device_rotation">Enhetsrotasjon</string>
     <string name="screen_rotation_aspect_ratio">Sideforhold</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Svart bakgrunn og statuslinje i mediavisningen</string>
     <string name="scroll_thumbnails_horizontally">Horisontal rulling av minibilder</string>
     <string name="hide_system_ui_at_fullscreen">Skjul automatisk systemlinjer ved mediavisning</string>
     <string name="delete_empty_folders">Slett tomme mapper etter sletting av deres innhold</string>

From 3f88bb8e21cfb4b3698b1eb9ce429bfcf04301d6 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Dec 2017 19:24:17 +0100
Subject: [PATCH 39/61] scan the included folder after adding on a background
 thread

---
 app/build.gradle                                              | 2 +-
 .../gallery/activities/IncludedFoldersActivity.kt             | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9bb9c6b12..251649bb9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.3.7'
+    implementation 'com.simplemobiletools:commons:3.3.9'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt
index 3f4067312..c9f67d621 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt
@@ -52,7 +52,9 @@ class IncludedFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener {
         FilePickerDialog(this, pickFile = false, showHidden = config.shouldShowHidden) {
             config.addIncludedFolder(it)
             updateIncludedFolders()
-            scanPath(it)
+            Thread {
+                scanPath(it)
+            }.start()
         }
     }
 }

From 12a0cba28e0123f3078d5e6639fe7f3b9cb0dd66 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Dec 2017 20:19:57 +0100
Subject: [PATCH 40/61] update the Image Cropper library

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 251649bb9..c301d8b53 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,9 +42,9 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.3.9'
+    implementation 'com.simplemobiletools:commons:3.3.12'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
-    implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
+    implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
     implementation 'com.android.support:multidex:1.0.2'
     implementation 'com.google.code.gson:gson:2.8.2'
     implementation 'it.sephiroth.android.exif:library:1.0.1'

From a89d6f5fb704873192b7d4f0cc5c01481ee23b34 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Dec 2017 20:22:23 +0100
Subject: [PATCH 41/61] update version to 3.0.3

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c301d8b53..b7355763d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 148
-        versionName "3.0.2"
+        versionCode 149
+        versionName "3.0.3"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }

From 93146e82aec9d79dae13f4c990f11c4cca9bd9af Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 20 Dec 2017 20:22:29 +0100
Subject: [PATCH 42/61] updating changelog

---
 CHANGELOG.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64a34bd9a..e23c66711 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Changelog
 ==========
 
+Version 3.0.3 *(2017-12-20)*
+----------------------------
+
+ * Added a new Black & White theme with special handling
+ * Fixed opening MMS attachments
+ * Fixed viewing properties/sharing etc at fullscreen media
+ * Apply "Dark background at fullscreen media" to the status bar too
+ * Misc performance/stability improvements
+
 Version 3.0.2 *(2017-12-17)*
 ----------------------------
 

From a9d48f63ec914a82f575990cce74a55db11c860d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 22 Dec 2017 10:27:35 +0100
Subject: [PATCH 43/61] update the app description with the fingerprint
 permission usage

---
 app/src/main/res/values-cs/strings.xml     | 2 ++
 app/src/main/res/values-de/strings.xml     | 2 ++
 app/src/main/res/values-es/strings.xml     | 2 ++
 app/src/main/res/values-fi/strings.xml     | 2 ++
 app/src/main/res/values-fr/strings.xml     | 2 ++
 app/src/main/res/values-gl/strings.xml     | 4 +++-
 app/src/main/res/values-hr/strings.xml     | 2 ++
 app/src/main/res/values-hu/strings.xml     | 2 ++
 app/src/main/res/values-it/strings.xml     | 2 ++
 app/src/main/res/values-ja/strings.xml     | 2 ++
 app/src/main/res/values-ko-rKR/strings.xml | 2 ++
 app/src/main/res/values-nb/strings.xml     | 2 ++
 app/src/main/res/values-nl/strings.xml     | 2 ++
 app/src/main/res/values-pl/strings.xml     | 4 +++-
 app/src/main/res/values-pt-rBR/strings.xml | 2 ++
 app/src/main/res/values-pt/strings.xml     | 2 ++
 app/src/main/res/values-ru/strings.xml     | 2 ++
 app/src/main/res/values-sk/strings.xml     | 2 ++
 app/src/main/res/values-sv/strings.xml     | 2 ++
 app/src/main/res/values-tr/strings.xml     | 2 ++
 app/src/main/res/values-zh-rCN/strings.xml | 2 ++
 app/src/main/res/values-zh-rTW/strings.xml | 4 +++-
 app/src/main/res/values/strings.xml        | 2 ++
 23 files changed, 49 insertions(+), 3 deletions(-)

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 44294eaf5..801d8924b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -139,6 +139,8 @@
 
         Galerie je též k disposici ostatním aplikacím za účelem zobrazení fotografií a videí a přidávání příloh v e-mailových klientech. Je vhodná ke každodennímu použití.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Neobsahuje žádné reklamy ani nepotřebná oprávnění a má otevřený zdrojový kód. Poskytuje možnost změny barev rozhraní.
 
         Táto aplikace je jen jednou ze skupiny aplikací. Všechny tyto aplikace naleznete na http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d77c2907a..80ecfd8f1 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -139,6 +139,8 @@
 
         Diese Galerie bietet auch für Drittanbieter einige Funktionen an: zum Vorschauen von Bildern / Videos, zum Hinzufügen von Anhängen bei Email-Apps, etc. Sie ist perfekt für den täglichen Gebrauch.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Beinhaltet keine Werbung oder unnötigen Berechtigungen. Sie ist komplett Open Source, verwendete Farben sind anpassbar.
 
         Diese App ist nur eine aus einer größeren Serie von schlichten Apps. Der Rest davon findet sich auf http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 745937f60..c0b3a75e3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -139,6 +139,8 @@
 
         Gallery también se ofrece para uso de terceros para previsualizar imágenes/vídeos, agregar adjuntos en clientes de correo, etc. Es perfecta para uso diario.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         No contiene publicidad ni permisos innecesarios. Es totalmente libre, proporciona colores personalizables.
 
         Esta aplicación es solamente una pieza de una serie más grande de aplicaciones. Puede encontrar el resto en http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 7ad6bd78a..46de5f5b9 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -139,6 +139,8 @@
 
         Galleriaa tarjotaan myös kolmansille osapuolille kuvien / videoiden tarkasteluun, liitteiden lisäämiseksi sähköpostiin yms. Täydellinen jokapäiväiseen käyttöön.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Ei sisällä mainoksia tai turhia käyttöoikeuksia. Täysin avointa lähdekoodia, tarjoaa muokattavat värit.
 
         Tämä sovellus on vain yksi osa suurempaa kokoelmaa. Löydät loput osoitteesta http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cf6d7961f..560bc036f 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -139,6 +139,8 @@
 
         La galerie est également proposée pour une utilisation comme tierce partie pour la prévisualisation des images/vidéos, ajouter des pièces jointes aux clients email etc. C\'est parfait pour un usage au quotidien.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         L\'application ne contient ni publicité ni autorisation inutile. Elle est totalement opensource et est aussi fournie avec des couleurs personnalisables.
 
         Cette application est juste l\'une des applications d\'une plus grande suite. Vous pouvez trouver les autres sur http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 3a3ef8f9d..ac58f934d 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -138,7 +138,9 @@
         Unha simple ferramenta para ver fotos e vídeos. Pode organizar os elementos por data, tamaño, nome tanto ascendentes como descendentes, pode facer zoom nas fotografías. Os ficheiros de medios móstranse en múltiples columnas dependendo do tamaño da pantalla, pode mudar o número de columnas con xestos de belisco. Poden ser renomeados, compartidos, eliminados, copiados, movidos. As imaxes tamén se poden recortar, rotar, voltear ou establecer como fondo de pantalla directamente no aplicativo.
         
         A Galería tamén se ofrece como aplicación de terceiros para vista previa de imaxes / vídeos, engadir anexos en correos etc. É perfecta para o uso diario.
-        
+
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Non contén anuncios nin solicita permisos innecesarios. É de código aberto, con cores personalizadas.
 
         Este aplicativo é só unha das pezas de unha grande familia. Pode atopar o resto en http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index d20f9bfb0..44036ed5f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -139,6 +139,8 @@
 
         Galerija se također može koristiti za pregledavanje slika i videa u drugim aplikacijama, prikačivanja datoteka u e-mail aplikacije itd. Savršeno za svakodnevno korištenje.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Ne sadrži reklame niti nepotrebna dopuštenja. Aplikacije je otvorenog koda, te pruža mogućnost promjene boja.
 
         Ova aplikacija je samo dio veće skupine aplikacije. Ostatak možete pronaći na http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3c2e94c85..aa8fad979 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -139,6 +139,8 @@
 
         The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
 
         This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 47078e26e..e7264e950 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -139,6 +139,8 @@
 
         Simple Gallery è anche offerta per utilizzo di terze parti per anteprime di immagini / video, aggiunta di allegati ai client email, ecc. È perfetta per un uso quotidiano.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Non contiene pubblicità o autorizzazioni non necessarie. È completamente opensource, offre colori personalizzabili.
 
         Questa app è solo una piccola parte di una grande serie di altre app. Puoi trovarle tutte su http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 674a1ca50..15d7ec52d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -139,6 +139,8 @@
 
         ギャラリーは、画像やビデオのプレビュー、メールクライアントで添付ファイルの追加など、サードパーティの用途にも提供されます。 毎日の使用には完璧です。
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         広告や不要なアクセス許可は含まれていません。 完全にオープンソースで、ダークテーマも提供しています。
 
         このアプリは、大きな一連のアプリの一つです。 他のアプリは http://www.simplemobiletools.com で見つけることができます
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index b94a97ad6..9ae27749b 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -139,6 +139,8 @@
 
         갤러리는 \'이미지/비디오 미리보기\', \'이메일 클라이언트에서 첨부파일 추가하기\' 등의 기능을 서드파티에 제공합니다. 언제나 완벽하게 사용할 수 있습니다.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         광고가 포함되어 있거나, 불필요한 권한을 요청하지 않습니다. 이 앱의 모든 소스는 오픈소스이며, 사용자가 직접 애플리케이션의 컬러를 설정 할 수 있습니다.
 
         이 앱은 다양한 시리즈의 모바일앱 중 하나입니다. 나머지는 http://www.simplemobiletools.com 에서 찾아 보실 수 있습니다.
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b3dc6f9bc..34e4731a2 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -139,6 +139,8 @@
 
         The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
 
         This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 01bfb3cce..dd9ab1b80 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -139,6 +139,8 @@
 
         De galerij kan ook worden gebruikt voor het bekijken van afbeeldingen of video\'s vanuit andere apps, om bijlagen toe te voegen in e-mail, etc. Perfect voor dagelijks gebruik.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Bevat geen advertenties of onnodige permissies. Volledig open-source. Kleuren van de app kunnen worden aangepast.
 
         Deze app is onderdeel van een grotere verzameling. Vind de andere apps op http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0f9d081d0..7cbfd6a47 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -135,7 +135,9 @@
     <!-- Short description has to have less than 80 chars -->
     <string name="app_short_description">Prosta galeria bez reklam do przeglądania obrazów i filmów.</string>
     <string name="app_long_description">
-        Prosta aplikacja galerii do oglądania obrazów i filmów. Pliki mogą być sortowane według daty, rozmiaru i nazwy, zarówno w porządku rosnącym, jak i malejącym. W zależności od wielkości ekranu, wyświetlane mogą być w wielu kolumnach. Liczbę kolumn można zmieniać za pomocą gestów, a  zdjęcia mogą być powiększane, przycinane, obracane lub ustawiane jako tapeta bezpośrednio z poziomu Prostej Galerii. Kolory aplikacji można dowolnie ustawiać.
+        Prosta aplikacja galerii do oglądania obrazów i filmów. Pliki mogą być sortowane według daty, rozmiaru i nazwy, zarówno w porządku rosnącym, jak i malejącym. W zależności od wielkości ekranu, wyświetlane mogą być w wielu kolumnach. Liczbę kolumn można zmieniać za pomocą gestów, a zdjęcia mogą być powiększane, przycinane, obracane lub ustawiane jako tapeta bezpośrednio z poziomu Prostej Galerii. Kolory aplikacji można dowolnie ustawiać.
+
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
 
         Nie zawiera natomiast żadnych reklam i nie potrzebuje całej masy uprawnień. Jest w pełni otwartoźródłowa i w pełni podatna na kolorowanie.
 
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 717fffec4..32375412e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -139,6 +139,8 @@
 
         Também pode ser utilizada para pré-visualizar imagens e vídeos, ou para adicionar como anexos ao e-mail, entre outros. É perfeita para a utilização diária.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Não contém anúncios, nem permissões desnecessárias. Disponibiliza um tema escuro, e é totalmente \'open source\'.
 
         Este aplicativo é apenas parte de um conjunto mais vasto de aplicações. Saiba mais em http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index bb0510a6d..13d3bfda1 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -139,6 +139,8 @@
 
         Também pode ser utilizada para pré-visualizar imagens e vídeos ou para adicionar como anexos ao e-mail, entre outros. É perfeita para a utilização diária.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Não contém anúncios nem permissões desnecessárias. Disponibiliza um tema escuro e é totalmente \'open source\'.
 
         Esta aplicação é apenas parte de um conjunto mais vasto de aplicações. Saiba mais em http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 765e361aa..85b7d5df9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -139,6 +139,8 @@
 
         Галерея идеальна для повседневных задач (предпросмотр фото/видео, добавление вложений в почтовых клиентах и т.д.).
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Это приложение не будет показывать рекламу или запрашивать ненужные разрешения. У него полностью открытый исходный код и настраиваемые цвета оформления.
 
         Simple Gallery — это приложение из серии Simple Mobile Tools. Остальные приложения из этой серии можно найти здесь: http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index f8787b7f3..ed17a3a2f 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -139,6 +139,8 @@
 
         Galéria je tiež poskytovaná pre použitie treťou stranou pre prehliadanie fotiek a videí, pridávanie príloh v emailových klientoch. Je perfektná na každodenné použitie.
 
+        Prístup ku odtlačkom prstov je potrebný pre uzamykanie skrytých položiek, alebo celej apky.
+
         Neobsahuje žiadne reklamy a nepotrebné oprávnenia. Je opensource, poskytuje možnosť zmeny farieb.
 
         Táto aplikácia je iba jednou zo skupiny aplikácií. Ostatné viete nájsť na http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index aa19dcfea..39b277abc 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -139,6 +139,8 @@
 
         Galleriet kan också användas av tredjepartsappar för förhandsgranskning av bilder / videos, bifoga bilagor i e-postklienter etc. Den är perfekt för det dagliga användandet.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Innehåller ingen reklam eller onödiga behörigheter. Det är helt och hållet opensource, innehåller anpassningsbara färger.
 
         Detta är bara en app i en serie av appar. Du hittar resten av dem här http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index a4a441ed3..1fa3f04d1 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -139,6 +139,8 @@
 
         Galeri, görüntüleri/videoları önizlemek, e-posta istemcilerine ek ekler yapmak için üçüncü taraf kullanımı için de önerilir. Bu\'s günlük kullanım için mükemmel.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Reklam içermeyen veya gereksiz izinler. Tamamen açık kaynaktır, özelleştirilebilir renkler sağlar.
 
         Bu uygulama, daha büyük bir uygulama serisinden sadece bir parça. Geri kalanını şu adresten bulabilirsiniz http://www.simplemobiletools.com
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index aa0681383..fa76276db 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -139,6 +139,8 @@
 
         相册亦提供能让第三方应用预览图片／视频、向电子邮件客户端添加附件等的功能。非常适合日常使用。
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         应用不包含广告与不必要的权限。它是完全开放源代码的，并内置自定义颜色主题。
 
         这个应用只是一系列应用中的一小部份。您可以在 http://www.simplemobiletools.com 找到其余的应用。
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1a1204ec6..a23625491 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -138,7 +138,9 @@
 		一個適合用來瀏覽相片和影片的簡單工具。可以根據日期、大小、名稱來遞增或遞減排序項目，相片能被縮放。媒體檔案會依畫面大小呈現在數個欄位內，你可以使用縮放手勢來改變欄數。媒體檔案可以重新命名、分享、刪除、複製、移動；圖片還能縮放、旋轉、翻轉，或者直接設為桌布。
 		
 		這相簿也支援第三方應用，像是預覽圖片/影片、添加電子信箱附件...等功能，日常使用上相當適合。
-		
+
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
 		優點包含沒廣告，也沒非必要的權限，而且完全開放原始碼，並提供自訂顏色。
 		
 		這只是一個大系列應用程式的其中一項程式，你可以在這發現更多 http://www.simplemobiletools.com
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 87482dab4..b94b2c2ab 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -139,6 +139,8 @@
 
         The Gallery is also offered for third party usage for previewing images / videos, adding attachments at email clients etc. It\'s perfect for everyday usage.
 
+        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+
         Contains no ads or unnecessary permissions. It is fully opensource, provides customizable colors.
 
         This app is just one piece of a bigger series of apps. You can find the rest of them at http://www.simplemobiletools.com

From cdd9dcbae72a5820863d384d3fd5b84a05d39311 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 22 Dec 2017 13:09:34 +0100
Subject: [PATCH 44/61] improve third party image picker intent handling

---
 .../gallery/activities/MainActivity.kt                | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index d113f63b2..9cc39903f 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -443,17 +443,12 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         if (resultCode == Activity.RESULT_OK) {
             if (requestCode == PICK_MEDIA && resultData != null) {
                 val resultIntent = Intent()
-                if (mIsGetImageContentIntent || mIsGetVideoContentIntent || mIsGetAnyContentIntent) {
+                if (mIsThirdPartyIntent) {
                     when {
                         intent.extras?.containsKey(MediaStore.EXTRA_OUTPUT) == true -> fillExtraOutput(resultData)
                         resultData.extras?.containsKey(PICKED_PATHS) == true -> fillPickedPaths(resultData, resultIntent)
                         else -> fillIntentPath(resultData, resultIntent)
                     }
-                } else if ((mIsPickImageIntent || mIsPickVideoIntent)) {
-                    val path = resultData.data?.path
-                    val uri = getFilePublicUri(File(path), BuildConfig.APPLICATION_ID)
-                    resultIntent.data = uri
-                    resultIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
                 }
 
                 setResult(Activity.RESULT_OK, resultIntent)
@@ -491,7 +486,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             clipData.addItem(ClipData.Item(it))
         }
 
-        resultIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
         resultIntent.clipData = clipData
     }
 
@@ -500,7 +495,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         val uri = getFilePublicUri(File(path), BuildConfig.APPLICATION_ID)
         val type = path.getMimeTypeFromPath()
         resultIntent.setDataAndTypeAndNormalize(uri, type)
-        resultIntent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
+        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
     }
 
     private fun itemClicked(path: String) {

From 597e62b7a17b655db31af28d287d79f50672794d Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 22 Dec 2017 15:31:13 +0100
Subject: [PATCH 45/61] tweaking some uri permissions

---
 .../simplemobiletools/gallery/activities/EditActivity.kt   | 7 ++++++-
 .../simplemobiletools/gallery/activities/MainActivity.kt   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index 5b62357ab..16d60200e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -1,6 +1,7 @@
 package com.simplemobiletools.gallery.activities
 
 import android.app.Activity
+import android.content.Intent
 import android.graphics.Bitmap
 import android.graphics.Bitmap.CompressFormat
 import android.graphics.Point
@@ -143,7 +144,11 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
                     inputStream?.close()
                     outputStream?.close()
                 }
-                setResult(RESULT_OK)
+
+                Intent().apply {
+                    addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    setResult(RESULT_OK, this)
+                }
                 finish()
             } else if (saveUri.scheme == "file") {
                 SaveAsDialog(this, saveUri.path, true) {
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 9cc39903f..29bfea737 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -486,7 +486,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             clipData.addItem(ClipData.Item(it))
         }
 
-        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
         resultIntent.clipData = clipData
     }
 
@@ -495,7 +495,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         val uri = getFilePublicUri(File(path), BuildConfig.APPLICATION_ID)
         val type = path.getMimeTypeFromPath()
         resultIntent.setDataAndTypeAndNormalize(uri, type)
-        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION or Intent.FLAG_GRANT_WRITE_URI_PERMISSION)
+        resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
     }
 
     private fun itemClicked(path: String) {

From 6659f9d691702c88f6cb670c118721a2d051ee8f Mon Sep 17 00:00:00 2001
From: Phoenix1747 <apertured@public-files.de>
Date: Fri, 22 Dec 2017 16:27:32 +0100
Subject: [PATCH 46/61] Update DE

Translated a9d48f63ec914a82f575990cce74a55db11c860d about the fingerprint permission.
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 80ecfd8f1..4c17b7b6c 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -139,7 +139,7 @@
 
         Diese Galerie bietet auch für Drittanbieter einige Funktionen an: zum Vorschauen von Bildern / Videos, zum Hinzufügen von Anhängen bei Email-Apps, etc. Sie ist perfekt für den täglichen Gebrauch.
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        Die Berechtigung für Fingerabdrücke wird nur benötigt, um die Sichtbarkeit von versteckten Dateien oder die gesamte App zu sperren.
 
         Beinhaltet keine Werbung oder unnötigen Berechtigungen. Sie ist komplett Open Source, verwendete Farben sind anpassbar.
 

From bd6c2d9adcb90e4bbc9c7deb2bc61c10e5db4a70 Mon Sep 17 00:00:00 2001
From: Rex_sa <13156001+rex07@users.noreply.github.com>
Date: Fri, 22 Dec 2017 19:17:06 +0300
Subject: [PATCH 47/61] Create strings.xml

Add ar (Arabic) translation
---
 app/src/main/res/values-ar/strings.xml | 148 +++++++++++++++++++++++++
 1 file changed, 148 insertions(+)
 create mode 100644 app/src/main/res/values-ar/strings.xml

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
new file mode 100644
index 000000000..fb3120c13
--- /dev/null
+++ b/app/src/main/res/values-ar/strings.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">الاستوديو البسيط</string>
+    <string name="app_launcher_name">الاستوديو</string>
+    <string name="edit">تعديل</string>
+    <string name="open_camera">فتح الكاميرا</string>
+    <string name="hidden">(مخفية)</string>
+    <string name="pin_folder">تثبيت المجلد</string>
+    <string name="unpin_folder">ازالة تثبيت الملف</string>
+    <string name="show_all">عرض كل محتوى المجلدات</string>
+    <string name="all_folders">كل المجلدات</string>
+    <string name="folder_view">التبديل إلى عرض المجلد</string>
+    <string name="other_folder">مجلد آخر</string>
+    <string name="show_on_map">عرض على الخريطة</string>
+    <string name="unknown_location">موقع غير معروف</string>
+    <string name="no_map_application">لم يتم العثور على أي تطبيق مع الخرائط</string>
+    <string name="no_camera_app_found">لم يتم العثور على تطبيق كاميرا</string>
+    <string name="increase_column_count">زيادة عدد الأعمدة</string>
+    <string name="reduce_column_count">تقليل عدد الأعمدة</string>
+    <string name="change_cover_image">تغيير صورة الغلاف</string>
+    <string name="select_photo">اختر الصور</string>
+    <string name="use_default">استخدم الافتراضي</string>
+    <string name="volume">الصوت</string>
+    <string name="brightness">السطوع</string>
+    <string name="do_not_ask_again">لا تسأل مرة أخرى في هذه الجلسة</string>
+    <string name="lock_orientation">غلق الاتجاه</string>
+    <string name="unlock_orientation">فتح الاتجاه</string>
+
+    <!-- Filter -->
+    <string name="filter_media">فلتر الميديا</string>
+    <string name="images">الصور</string>
+    <string name="videos">الفديوهات</string>
+    <string name="gifs">الصور المتحركة</string>
+    <string name="no_media_with_filters">لم يتم العثور على ملفات وسائط مع الفلاتر المحددة</string>
+    <string name="change_filters_underlined"><u >تغيير الفلاتر</u></string>
+
+    <!-- Hide / Exclude -->
+    <string name="hide_folder_description">هذه الميزة تخفي المجلد عن طريق إضافة ملف \'.nomedia\' بداخله، فإنه سيتم إخفاء كافة المجلدات الفرعية أيضا. يمكنك رؤيتها عن طريق تبديل الخيار \"إظهار العناصر المخفية\" في الإعدادات. استمر؟</string>
+    <string name="exclude">استبعد</string>
+    <string name="excluded_folders">المجلدات المستبعدة</string>
+    <string name="manage_excluded_folders">ادارة المجلدات المستبعدة</string>
+    <string name="exclude_folder_description">سيؤدي هذا إلى استبعاد التحديد مع مجلداته الفرعية من الاستوديو فقط. يمكنك إدارة المجلدات المستبعدة في الإعدادات</string>
+    <string name="exclude_folder_parent">هل تريد استبعاد أحد الوالدين بدلا من ذلك؟</string>
+    <string name="excluded_activity_placeholder">باستثناء المجلدات سيجعلها جنبا إلى جنب مع المجلدات الفرعية مخبأة فقط في الاستوديو ، فإنها لا تزال مرئية في تطبيقات أخرى.\n
+  \n
+  إذا كنت تريد إخفاءها من تطبيقات أخرى أيضا، استخدم ميزة الإخفاء</string>
+    <string name="remove_all">حذف الكل</string>
+    <string name="remove_all_description">هل تريد إزالة جميع المجلدات من القائمة المستبعدة؟ لن يؤدي هذا إلى حذف المجلدات</string>
+
+    <!-- Include folders -->
+    <string name="include_folders">المجلدات المضمنة</string>
+    <string name="manage_included_folders">إدارة المجلدات المضمنة</string>
+    <string name="add_folder">اضافة مجلد</string>
+    <string name="included_activity_placeholder">إذا كان لديك بعض المجلدات التي تحتوي على الملتيميديا ، ولكن لم يتم التعرف عليها من قبل التطبيق، يمكنك إضافتها يدويا هنا.\n
+  \n
+  لن تؤدي إضافة بعض العناصر هنا إلى استبعاد أي مجلد آخر.</string>
+
+    <!-- Resizing -->
+    <string name="resize">تحجيم</string>
+    <string name="resize_and_save">تغيير حجم التحديد وحفظ</string>
+    <string name="width">العرض</string>
+    <string name="height">الارتفاع</string>
+    <string name="keep_aspect_ratio">إبقاء نسبة القياس</string>
+    <string name="invalid_values">الرجاء إدخال درجة دقة صحيحة</string>
+
+    <!-- Editor -->
+    <string name="editor">تعديل</string>
+    <string name="save">حفظ</string>
+    <string name="rotate">التدوير</string>
+    <string name="path">المسار</string>
+    <string name="invalid_image_path">مسار صورة غير صحيح</string>
+    <string name="image_editing_failed">فشل تعديل الصورة</string>
+    <string name="edit_image_with">تعديل الصورة باستخدام:</string>
+    <string name="no_editor_found">لم يتم العثور على أي محرر للصور</string>
+    <string name="unknown_file_location">موقع ملف غير معروف</string>
+    <string name="error_saving_file">تعذر الكتابة فوق الملف المصدر</string>
+    <string name="rotate_left">تدوير لليسار</string>
+    <string name="rotate_right">تدوير لليمين</string>
+    <string name="rotate_one_eighty">تدوير 180º</string>
+    <string name="flip">قلب</string>
+    <string name="flip_horizontally">قلب أفقيا</string>
+    <string name="flip_vertically">قلب عموديا</string>
+    <string name="edit_with">تعديل باستخدام</string>
+
+    <!-- Set wallpaper -->
+    <string name="simple_wallpaper">خلفية بسيطة</string>
+    <string name="set_as_wallpaper">تعيين كخلفية الشاشة</string>
+    <string name="set_as_wallpaper_failed">فشل الإعداد كخلفية</string>
+    <string name="set_as_wallpaper_with">تعيين كخلفية بواسطة:</string>
+    <string name="no_capable_app_found">لم يتم العثور على أي تطبيق لأداء المهمة</string>
+    <string name="setting_wallpaper">... جار تعيين الخلفية ...</string>
+    <string name="wallpaper_set_successfully">تم تعيبن الخلفية بنجاح</string>
+    <string name="portrait_aspect_ratio">صورة نسبة العرض إلى الارتفاع</string>
+    <string name="landscape_aspect_ratio">نسبة العرض إلى الارتفاع في المناظر الطبيعية</string>
+    <string name="home_screen">الشاشة الرئيسية</string>
+    <string name="lock_screen">شاشة القفل</string>
+    <string name="home_and_lock_screen">الرئيسية وشاشة القفل</string>
+
+    <!-- Slideshow -->
+    <string name="slideshow">عرض الشرائح</string>
+    <string name="interval">الفاصل الزمني (بالثواني):</string>
+    <string name="include_photos">تضمين الصور</string>
+    <string name="include_videos">تضمين الفديو</string>
+    <string name="include_gifs">تضمين GIF</string>
+    <string name="random_order">ترتيب عشوائي</string>
+    <string name="use_fade">استخدام تاثير التلاشي</string>
+    <string name="move_backwards">ارجع للخلف</string>
+    <string name="loop_slideshow">حلقة عرض الشرائح</string>
+    <string name="slideshow_ended">انتهى عرض الشرائح</string>
+    <string name="no_media_for_slideshow">لم يتم العثور على وسائط لعرض الشرائح</string>
+
+    <!-- View types -->
+    <string name="change_view_type">تغيير طريقة العرض</string>
+    <string name="grid">الشبكة</string>
+    <string name="list">القائمة</string>
+
+    <!-- Settings -->
+    <string name="autoplay_videos">تشغيل الفديوهات تلقائيا</string>
+    <string name="toggle_filename">تبديل رؤية اسم الملف</string>
+    <string name="loop_videos">حلقة الفيديو</string>
+    <string name="animate_gifs">عرض صور GIF المتحركة في الصور المصغرة</string>
+    <string name="max_brightness">أقصى سطوع عند عرض الوسائط</string>
+    <string name="crop_thumbnails">قص الصور المصغرة الى مستطيلات</string>
+    <string name="screen_rotation_by">تدوير وسائط ملء الشاشة بواسطة</string>
+    <string name="screen_rotation_system_setting">اعدادات النظام</string>
+    <string name="screen_rotation_device_rotation">تدوير الجهاز</string>
+    <string name="screen_rotation_aspect_ratio">الابعاد</string>
+    <string name="black_background_at_fullscreen">اجعل الخلفية وشريط الحالة باللون الاسود عند عرض المحتوى في كامل الشاشة</string>
+    <string name="scroll_thumbnails_horizontally">قم بتمرير الصور المصغرة أفقيا</string>
+    <string name="hide_system_ui_at_fullscreen">إخفاء واجهة النظام تلقائيا عند العرض في وضع ملء الشاشة</string>
+    <string name="delete_empty_folders">احذف المجلدات الفارغة بعد حذف محتواها</string>
+    <string name="allow_video_gestures">السماح بالتحكم في صوت الفيديو والسطوع  بالإيماءات العمودية</string>
+    <string name="show_media_count">إظهار عدد لوسائط المجلد على طريقة العرض الرئيسية</string>
+    <string name="replace_share_with_rotate">استبدال خيار المشاركة مع خيار  تدوير في القائمة ملء الشاشة</string>
+    <string name="show_extended_details">عرض تفاصيل موسعة على وسائط ملء الشاشة</string>
+    <string name="manage_extended_details">إدارة المجلدات المستبعدة</string>
+
+    <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
+    <!-- Short description has to have less than 80 chars -->
+    <string name="app_short_description">استوديو لعرض الصور والفيديو بدون اعلانات.</string>
+    <string name="app_long_description">أداة بسيطة تستخدام لعرض الصور ومقاطع الفيديو. يمكن فرز العناصر حسب التاريخ والحجم والاسم على حد سواء تصاعدي أو تنازلي، يمكن تكبير الصور. يتم عرض ملفات الوسائط في أعمدة متعددة اعتمادا على حجم الشاشة، يمكنك تغيير عدد الأعمدة عبر إيماءاة القرص . يمكن إعادة تسميته، مشاركة، حذف، نسخ، نقل. ويمكن أيضا اقتصاص الصور، استدارة، او قلب أو تعيين كخلفية مباشرة من التطبيق. يتم عرض المحتوى أيضا للاستخدام طرف ثالث لمعاينة الصور / الفيديو، إضافة المرفقات في برامج البريد الإلكتروني الخ انه مثالي للاستخدام اليومي. لا يحتوي على إعلانات أو أذونات لا حاجة لها. مفتوح المصدر بشكل كلي ، ويوفر الألوان للتخصيص. هذا التطبيق هو مجرد قطعة واحدة من سلسلة أكبر من التطبيقات. يمكنك العثور على بقيتهم هنا\n
+  http://www.simplemobiletools.com</string>
+
+    <!--
+        Haven't found some strings? There's more at
+        https://github.com/SimpleMobileTools/Simple-Commons/tree/master/commons/src/main/res
+    -->
+</resources>

From d8c43666176840f84657dcd79188015f08b2925c Mon Sep 17 00:00:00 2001
From: Guillaume <ltGuillaume@users.noreply.github.com>
Date: Sat, 23 Dec 2017 22:45:48 +0100
Subject: [PATCH 48/61] Dutch

---
 app/src/main/res/values-nl/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index dd9ab1b80..bf5195faf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -121,7 +121,7 @@
     <string name="screen_rotation_system_setting">Systeeminstelling</string>
     <string name="screen_rotation_device_rotation">Rotatie van apparaat</string>
     <string name="screen_rotation_aspect_ratio">Afmetingen van bestand</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Zwarte achtergrond en statusbalk bij volledige weergave</string>
     <string name="scroll_thumbnails_horizontally">Horizontaal scrollen</string>
     <string name="hide_system_ui_at_fullscreen">Automatisch de statusbalk verbergen in volledige weergave</string>
     <string name="delete_empty_folders">Lege mappen verwijderen na het verwijderen van hun inhoud</string>
@@ -139,7 +139,7 @@
 
         De galerij kan ook worden gebruikt voor het bekijken van afbeeldingen of video\'s vanuit andere apps, om bijlagen toe te voegen in e-mail, etc. Perfect voor dagelijks gebruik.
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        De permissie voor het uitlezen van vingerafdrukken is benodigd voor het vergendelen van verborgen items of de gehele app.
 
         Bevat geen advertenties of onnodige permissies. Volledig open-source. Kleuren van de app kunnen worden aangepast.
 

From 6c7e406dad7e89ee8b50c0c20fb535cb5e1be329 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 24 Dec 2017 14:08:04 +0100
Subject: [PATCH 49/61] try removing temp folder only if the path isnt empty

---
 .../gallery/activities/MainActivity.kt               | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index 29bfea737..b970bd9e7 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -209,13 +209,15 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
     }
 
     private fun removeTempFolder() {
-        val newFolder = File(config.tempFolderPath)
-        if (newFolder.exists() && newFolder.isDirectory) {
-            if (newFolder.list()?.isEmpty() == true) {
-                deleteFile(newFolder, true)
+        if (config.tempFolderPath.isNotEmpty()) {
+            val newFolder = File(config.tempFolderPath)
+            if (newFolder.exists() && newFolder.isDirectory) {
+                if (newFolder.list()?.isEmpty() == true) {
+                    deleteFile(newFolder, true)
+                }
             }
+            config.tempFolderPath = ""
         }
-        config.tempFolderPath = ""
     }
 
     private fun tryloadGallery() {

From 16f913a026902a71ffb37f7a68ea3317def62115 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 25 Dec 2017 12:08:36 +0100
Subject: [PATCH 50/61] handle storage permission at EditActivity

---
 app/build.gradle                              |  2 +-
 .../gallery/activities/EditActivity.kt        | 24 ++++++++++++++-----
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index b7355763d..ad5cc1c3f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.3.12'
+    implementation 'com.simplemobiletools:commons:3.4.0'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
     implementation 'com.android.support:multidex:1.0.2'
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
index 16d60200e..d41ba13c4 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/EditActivity.kt
@@ -11,6 +11,7 @@ import android.provider.MediaStore
 import android.view.Menu
 import android.view.MenuItem
 import com.simplemobiletools.commons.extensions.*
+import com.simplemobiletools.commons.helpers.PERMISSION_WRITE_STORAGE
 import com.simplemobiletools.gallery.R
 import com.simplemobiletools.gallery.dialogs.ResizeDialog
 import com.simplemobiletools.gallery.dialogs.SaveAsDialog
@@ -24,17 +25,28 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
     private val ASPECT_Y = "aspectY"
     private val CROP = "crop"
 
-    lateinit var uri: Uri
-    lateinit var saveUri: Uri
-    var resizeWidth = 0
-    var resizeHeight = 0
-    var isCropIntent = false
-    var isEditingWithThirdParty = false
+    private lateinit var uri: Uri
+    private lateinit var saveUri: Uri
+    private var resizeWidth = 0
+    private var resizeHeight = 0
+    private var isCropIntent = false
+    private var isEditingWithThirdParty = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.view_crop_image)
 
+        handlePermission(PERMISSION_WRITE_STORAGE) {
+            if (it) {
+                initEditActivity()
+            } else {
+                toast(R.string.no_storage_permissions)
+                finish()
+            }
+        }
+    }
+
+    private fun initEditActivity() {
         if (intent.data == null) {
             toast(R.string.invalid_image_path)
             finish()

From f14b950d62610bce4e3017e709a883108660a84e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 25 Dec 2017 12:41:00 +0100
Subject: [PATCH 51/61] update commons to 3.4.2

---
 app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle b/app/build.gradle
index ad5cc1c3f..05824ab52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,7 @@ ext {
 }
 
 dependencies {
-    implementation 'com.simplemobiletools:commons:3.4.0'
+    implementation 'com.simplemobiletools:commons:3.4.2'
     implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.9.0'
     implementation 'com.theartofdev.edmodo:android-image-cropper:2.6.0'
     implementation 'com.android.support:multidex:1.0.2'

From b68e4ac9cbe3cc1b48f14278cbc3274ec40ed728 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 25 Dec 2017 12:51:00 +0100
Subject: [PATCH 52/61] update version to 3.1.0

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 05824ab52..cd09b01ca 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "com.simplemobiletools.gallery"
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 149
-        versionName "3.0.3"
+        versionCode 150
+        versionName "3.1.0"
         multiDexEnabled true
         setProperty("archivesBaseName", "gallery")
     }

From e3ac69228339f258d0b280af4e43314074cf0260 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 25 Dec 2017 12:51:05 +0100
Subject: [PATCH 53/61] updating changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e23c66711..da47dde05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Changelog
 ==========
 
+Version 3.1.0 *(2017-12-25)*
+----------------------------
+
+ * Fixed some issues around picking contact images
+ * Misc other improvements
+
 Version 3.0.3 *(2017-12-20)*
 ----------------------------
 

From f27b8cd316c480298c3622e8ddab161232ad974f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Mon, 25 Dec 2017 17:22:05 +0100
Subject: [PATCH 54/61] adding a new string for managing hidden folders

---
 app/src/main/res/values-ar/strings.xml     | 1 +
 app/src/main/res/values-cs/strings.xml     | 1 +
 app/src/main/res/values-de/strings.xml     | 1 +
 app/src/main/res/values-es/strings.xml     | 1 +
 app/src/main/res/values-fi/strings.xml     | 1 +
 app/src/main/res/values-fr/strings.xml     | 1 +
 app/src/main/res/values-gl/strings.xml     | 1 +
 app/src/main/res/values-hr/strings.xml     | 1 +
 app/src/main/res/values-hu/strings.xml     | 1 +
 app/src/main/res/values-it/strings.xml     | 1 +
 app/src/main/res/values-ja/strings.xml     | 1 +
 app/src/main/res/values-ko-rKR/strings.xml | 1 +
 app/src/main/res/values-nb/strings.xml     | 1 +
 app/src/main/res/values-nl/strings.xml     | 1 +
 app/src/main/res/values-pl/strings.xml     | 1 +
 app/src/main/res/values-pt-rBR/strings.xml | 1 +
 app/src/main/res/values-pt/strings.xml     | 1 +
 app/src/main/res/values-ru/strings.xml     | 1 +
 app/src/main/res/values-sk/strings.xml     | 1 +
 app/src/main/res/values-sv/strings.xml     | 1 +
 app/src/main/res/values-tr/strings.xml     | 1 +
 app/src/main/res/values-zh-rCN/strings.xml | 1 +
 app/src/main/res/values-zh-rTW/strings.xml | 1 +
 app/src/main/res/values/strings.xml        | 1 +
 24 files changed, 24 insertions(+)

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index fb3120c13..7249f797b 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -46,6 +46,7 @@
   إذا كنت تريد إخفاءها من تطبيقات أخرى أيضا، استخدم ميزة الإخفاء</string>
     <string name="remove_all">حذف الكل</string>
     <string name="remove_all_description">هل تريد إزالة جميع المجلدات من القائمة المستبعدة؟ لن يؤدي هذا إلى حذف المجلدات</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">المجلدات المضمنة</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 801d8924b..c7dd015b0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Vyloučené složky budou spolu s podsložkami vyloučeny jen z Jednoduché Galerie, ostatní aplikace je nadále uvidí.\n\nPokud je chcete skrýt i před ostatními aplikacemi, použijte funkci Skrýt.</string>
     <string name="remove_all">Odstranit všechny</string>
     <string name="remove_all_description">Odstranit všechny složky ze seznamu vyloučených? Tato operace neodstraní obsah složek.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Přidané složky</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 4c17b7b6c..f42668e29 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">\'Ordner ausblenden\' wird ausgewählte Ordner und deren Unterordner nur in dieser App ausblenden. Andere Apps werden solche Ordner weiterhin anzeigen.\\n\\nWenn Sie Ordner auch für andere Apps verstecken wollen, verwenden Sie dafür die Funktion \'Ordner verstecken\'.</string>
     <string name="remove_all">Alle entfernen</string>
     <string name="remove_all_description">Alle Ordner aus der Ausgeblendet-Liste entfernen? Die Ordner selbst werden nicht gelöscht.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Einbezogene Ordner</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c0b3a75e3..bfce999e1 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Excluir las carpetas las hará junto a sus subcarpetas ocultas sólo en Simple Gallery, estas seguirán siendo visibles en otras aplicaciones.\\n\\nSi desea ocultarlo de otras aplicaciones, utilice la función de Ocultar.</string>
     <string name="remove_all">Eliminar todo</string>
     <string name="remove_all_description">¿Eliminar todas las carpetas de la lista de excluidas? Esto no borrará las carpetas.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Carpetas incluidas</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 46de5f5b9..c4a20e38d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Kansion poissulkeminen piilottaa kansion alikansioineen vain Simple Galleryssa, ne jäävät näkyviin muihin sovelluksiin.\n\nJos haluat piilottaa kansion myös muissa sovelluksissa, käytä piilota-funktiota.</string>
     <string name="remove_all">Poista kaikki</string>
     <string name="remove_all_description">Poista kaikki kansiot poissuljettujen listasta? Tämä ei poista kansioita.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Sisällytä kansiot</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 560bc036f..7701830bc 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Exclure des dossiers les masquera ainsi que leurs sous-dossiers uniquement dans Simple Galerie, ils seront toujours visibles depuis d\'autres applications.\\n\\nSi vous voulez aussi les masquer ailleurs, utilisez la fonction Masquer.</string>
     <string name="remove_all">Tout supprimer</string>
     <string name="remove_all_description">Supprimer tous les dossiers de la liste des exclusions ? Ceci n\'effacera pas les dossiers.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dossiers inclus</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index ac58f934d..0f50fe1a7 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Excluír un cartafol xunto cos subcartafoles só terá efecto en Simple Gallery, seguirán sendo visibles en outros aplicativos.\n\nSi tamén quere excluílos en outros aplicativos, utilice a opción Agochar.</string>
     <string name="remove_all">Eliminar todos</string>
     <string name="remove_all_description">Eliminar todos os cartafoles da lista de excluídos? Esto non borrará os cartafoles.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Cartafoles incluídos</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 44036ed5f..0ba59c891 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Izostavljanje direktorija učiniti će ih nevidljivim zajedno s njihovim poddirektorijima samo u Simple Gallery, ali će oni biti vidljivi u drugim aplikacijama.\n\nAko ih želite sakriti od drugih aplikacija također, koristite Sakrij opciju.</string>
     <string name="remove_all">Ukloni sve</string>
     <string name="remove_all_description">Ukloni sve direktorije iz liste izostavljenih? Ovo neće izbrisati direktorije.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dodaj direktorije</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index aa8fad979..aff4967b1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\\n\\nIf you want to hide them from other apps too, use the Hide function.</string>
     <string name="remove_all">Remove all</string>
     <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Included folders</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e7264e950..b969dfde5 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">L\'esclusione delle cartelle e delle sottocartelle le renderà nascoste solo in Simple Gallery, saranno ancora visibili in altre applicazioni.\\n\\nSe desideri nasconderle anche nelle altre app, usa la funzione Nascondi.</string>
     <string name="remove_all">Rimuovi tutte</string>
     <string name="remove_all_description">Rimuovere tutte le cartelle dalla lista delle esclusioni? Ciò non eliminerà le cartelle.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Includi cartelle</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 15d7ec52d..aae7cccbf 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">フォルダーを除外すると、サブフォルダーも含めSimple Galleyの一覧から除外します。他のアプリでは引き続き表示されます。\\n\\n他のアプリでも非表示にしたい場合は、「非表示」機能を使用してください。</string>
     <string name="remove_all">すべて解除</string>
     <string name="remove_all_description">除外するフォルダーの登録をすべて解除しますか? フォルダー自体は削除されません。</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">追加フォルダー</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 9ae27749b..202baecaa 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
     <string name="remove_all">모두 제거</string>
     <string name="remove_all_description">제외 목록을 모두 삭제 하시겠습니다? 목록을 삭제해도 폴더가 삭제되지는 않습니다.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">포함된 폴더</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 34e4731a2..3d1b245e1 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Ekskludering av mapper vil gjøre dem sammen med deres undermapper, skjulte bare i denne appen. De vil fortsatt være synlige i andre apper.\n\nHvis du vil skjule dem fra andre apper, bruk Skjul-funksjonen.</string>
     <string name="remove_all">Fjern alle</string>
     <string name="remove_all_description">Fjerne alle mapper fra listen av ekskluderte? Dette sletter ikke mappene.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Inkluderte mapper</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index bf5195faf..339059140 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Uitsluiten zal mappen en hun submappen verbergen voor deze galerij, maar niet voor andere apps.\n\nAls u de mappen ook in andere apps wilt verbergen, kies dan voor de functie Verbergen.</string>
     <string name="remove_all">Alles verwijderen</string>
     <string name="remove_all_description">Verwijder alles uit de lijst van uitgesloten mappen? Dit zal de mappen zelf niet verwijderen.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Toegevoegde mappen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7cbfd6a47..05b9ecfa2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Wykluczenie folderów ukryje je tylko w aplikacji Simple Gallery, w innych aplikacjach będą one wciąż widoczne.\n\nJeśli chcesz je ukryć także w innych aplikacjach, użyj funkcji ukrywania.</string>
     <string name="remove_all">Usuń wszystko</string>
     <string name="remove_all_description">Usunąć wszystkie foldery z listy wykluczonych? Foldery nie zostaną fizycznie usunięte.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dołączone foldery</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 32375412e..e9bf84b18 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">A exclusão de uma pasta apenas oculta o seu conteúdo da galeria, pois todos os outros aplicativos poderão acessá-las.\\n\\nSe quiser ocultar de todos os aplicativos, utilize a função ocultar.</string>
     <string name="remove_all">Remover todas</string>
     <string name="remove_all_description">Remover todas as pastas da lista de exclusões? Esta ação não apaga as pastas.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Pastas incluídas</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 13d3bfda1..199672bdd 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">A exclusão de uma pasta apenas oculta o seu conteúdo do Simple Gallery porque as outras aplicações continuarão a poder aceder-lhes.\\n\\nSe quiser ocultar também das outras aplicações, utilize a função Ocultar.</string>
     <string name="remove_all">Remover todas</string>
     <string name="remove_all_description">Remover todas as pastas de lista de exclusões? Esta ação não apaga as pastas.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Pastas incluídas</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 85b7d5df9..bb5be0f97 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Исключая папки, вы сделаете их скрытыми вместе с подпапками в Simple Gallery, но они будут видны в других приложениях. Если вы хотите скрыть их в других приложениях, используйте функцию Скрыть. </string>
     <string name="remove_all">Удалить всё</string>
     <string name="remove_all_description">Очистить список исключённых? Сами папки не будут удалены.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Включённые папки</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ed17a3a2f..ed93d39ab 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Vylúčené priečinky budú spolu s podpriečinkami ukryté iba pred Jednoduchou Galériou, ostatné aplikácie ich budú stále vidieť.\\n\\nAk ich chcete ukryť aj pred ostatnými aplikáciami, použite funkciu Skryť.</string>
     <string name="remove_all">Odstrániť všetky</string>
     <string name="remove_all_description">Odstrániť všetky priečinky zo zoznamu vylúčených? Táto operácia neodstráni samotný obsah priečinkov.</string>
+    <string name="manage_hidden_folders">Spravovať skryté priečinky</string>
 
     <!-- Include folders -->
     <string name="include_folders">Pridané priečinky</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 39b277abc..431ab1bc9 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Uteslutning av mappar döljer bara dem och deras undermappar i Simple Gallery, de visas fortfarande i andra appar.\\n\\nAnvänd Dölj-funktionen om du även vill dölja dem från andra appar.</string>
     <string name="remove_all">Ta bort alla</string>
     <string name="remove_all_description">Vill du ta bort alla mappar från uteslutningslistan? Detta raderar inte mapparna.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Inkluderade mappar</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 1fa3f04d1..6d99ec493 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Klasörler hariç tutulduğunda, onları Basit Galeri\'de gizli olan alt klasörleriyle bir araya getirirler, ancak yine de diğer uygulamalarda görünür olurlar.\n\nBunları diğer uygulamalardan gizlemek isterseniz, Gizle işlevini kullanın.</string>
     <string name="remove_all">Hepsini sil</string>
     <string name="remove_all_description">Hariç tutulanlar listesinden tüm klasörleri kaldırmak mı istiyorsunuz? Bu, klasörler silinmez.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dahil edilen klasörler</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index fa76276db..a2326664e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">此目录及其子目录中的媒体将不会在“简约图库”中显示，但是其它应用可以访问。如果您想对其它应用隐藏，请使用隐藏功能。</string>
     <string name="remove_all">移除全部</string>
     <string name="remove_all_description">是否删除排除列表中的所有项目？此操作不会删除文件夹本身。</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">包含目录</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a23625491..2415e0830 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">「排除資料夾」只會將選擇的資料夾與子資料夾一起從簡易相簿中隱藏，他們仍會出現在其他應用程式中。\n\n如果您要在其他應用程式中也隱藏，請使用「隱藏」功能。</string>
     <string name="remove_all">移除全部</string>
     <string name="remove_all_description">是否將排除列表中的所有資料夾都移除?這不會刪除資料夾。</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">包含資料夾</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b94b2c2ab..e2127294e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -44,6 +44,7 @@
     <string name="excluded_activity_placeholder">Excluding folders will make them together with their subfolders hidden just in Simple Gallery, they will still be visible in other applications.\n\nIf you want to hide them from other apps too, use the Hide function.</string>
     <string name="remove_all">Remove all</string>
     <string name="remove_all_description">Remove all folders from the list of excluded? This will not delete the folders.</string>
+    <string name="manage_hidden_folders">Manage hidden folders</string>
 
     <!-- Include folders -->
     <string name="include_folders">Included folders</string>

From eda860c2572b0bf8426167319172500da7492ab7 Mon Sep 17 00:00:00 2001
From: Phoenix1747 <apertured@public-files.de>
Date: Mon, 25 Dec 2017 18:42:59 +0100
Subject: [PATCH 55/61] Update DE

Translated string from commit f27b8cd.
---
 app/src/main/res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f42668e29..ad8a1e6f6 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -44,7 +44,7 @@
     <string name="excluded_activity_placeholder">\'Ordner ausblenden\' wird ausgewählte Ordner und deren Unterordner nur in dieser App ausblenden. Andere Apps werden solche Ordner weiterhin anzeigen.\\n\\nWenn Sie Ordner auch für andere Apps verstecken wollen, verwenden Sie dafür die Funktion \'Ordner verstecken\'.</string>
     <string name="remove_all">Alle entfernen</string>
     <string name="remove_all_description">Alle Ordner aus der Ausgeblendet-Liste entfernen? Die Ordner selbst werden nicht gelöscht.</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
+    <string name="manage_hidden_folders">Versteckte Ordner verwalten</string>
 
     <!-- Include folders -->
     <string name="include_folders">Einbezogene Ordner</string>

From 0bff18bb2c1eb9aece7e7d188b995f28de601eaf Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Tue, 26 Dec 2017 00:42:37 +0300
Subject: [PATCH 56/61] Camel case fix: tryloadGallery -> tryLoadGallery

---
 .../simplemobiletools/gallery/activities/MainActivity.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
index b970bd9e7..9694a0348 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MainActivity.kt
@@ -133,13 +133,13 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
             handleAppPasswordProtection {
                 if (it) {
                     mIsPasswordProtectionPending = false
-                    tryloadGallery()
+                    tryLoadGallery()
                 } else {
                     finish()
                 }
             }
         } else {
-            tryloadGallery()
+            tryLoadGallery()
         }
     }
 
@@ -220,7 +220,7 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
         }
     }
 
-    private fun tryloadGallery() {
+    private fun tryLoadGallery() {
         handlePermission(PERMISSION_WRITE_STORAGE) {
             if (it) {
                 if (config.showAll) {

From 0ebbad7fff75c48afa66570dd5ae6fb08e914115 Mon Sep 17 00:00:00 2001
From: Nikola Trubitsyn <nikola.trubitsyn@gmail.com>
Date: Tue, 26 Dec 2017 01:07:01 +0300
Subject: [PATCH 57/61] Resources.getActionBarHeight() fix return style

Uses the same return style as in the other functions
---
 .../simplemobiletools/gallery/extensions/Resources.kt    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt
index a2a2ef7af..73a56c5ba 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/extensions/Resources.kt
@@ -6,11 +6,10 @@ import android.util.TypedValue
 
 fun Resources.getActionBarHeight(context: Context): Int {
     val tv = TypedValue()
-    var height = 0
-    if (context.theme.resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
-        height = TypedValue.complexToDimensionPixelSize(tv.data, displayMetrics)
-    }
-    return height
+    return if (context.theme.resolveAttribute(android.R.attr.actionBarSize, tv, true)) {
+        TypedValue.complexToDimensionPixelSize(tv.data, displayMetrics)
+    } else
+        0
 }
 
 fun Resources.getStatusBarHeight(): Int {

From 8568744b55845efde3fb22a7f52cc9bce42b3f47 Mon Sep 17 00:00:00 2001
From: Guillaume <ltGuillaume@users.noreply.github.com>
Date: Tue, 26 Dec 2017 15:55:30 +0100
Subject: [PATCH 58/61] Dutch

---
 app/src/main/res/values-nl/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 339059140..fc3dd2d0b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -44,7 +44,7 @@
     <string name="excluded_activity_placeholder">Uitsluiten zal mappen en hun submappen verbergen voor deze galerij, maar niet voor andere apps.\n\nAls u de mappen ook in andere apps wilt verbergen, kies dan voor de functie Verbergen.</string>
     <string name="remove_all">Alles verwijderen</string>
     <string name="remove_all_description">Verwijder alles uit de lijst van uitgesloten mappen? Dit zal de mappen zelf niet verwijderen.</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
+    <string name="manage_hidden_folders">Verborgen mappen beheren</string>
 
     <!-- Include folders -->
     <string name="include_folders">Toegevoegde mappen</string>

From fce969e6633c3b06aa432eee98f10c01e38c62ee Mon Sep 17 00:00:00 2001
From: Pzqqt <821026875@qq.com>
Date: Wed, 27 Dec 2017 00:02:47 +0800
Subject: [PATCH 59/61] Update strings.xml

---
 app/src/main/res/values-zh-rCN/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a2326664e..ecd589bf3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -44,7 +44,7 @@
     <string name="excluded_activity_placeholder">此目录及其子目录中的媒体将不会在“简约图库”中显示，但是其它应用可以访问。如果您想对其它应用隐藏，请使用隐藏功能。</string>
     <string name="remove_all">移除全部</string>
     <string name="remove_all_description">是否删除排除列表中的所有项目？此操作不会删除文件夹本身。</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
+    <string name="manage_hidden_folders">管理隐藏目录</string>
 
     <!-- Include folders -->
     <string name="include_folders">包含目录</string>
@@ -140,7 +140,7 @@
 
         相册亦提供能让第三方应用预览图片／视频、向电子邮件客户端添加附件等的功能。非常适合日常使用。
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        这个应用需要指纹权限来锁定隐藏的项目或是整个应用。
 
         应用不包含广告与不必要的权限。它是完全开放源代码的，并内置自定义颜色主题。
 

From 4733bf95f9a83d9c100c5ea7e8ddf7331ca7b719 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Wed, 27 Dec 2017 10:10:14 +0100
Subject: [PATCH 60/61] use list() instead of listFiles() in some places

---
 .../com/simplemobiletools/gallery/activities/MediaActivity.kt | 2 +-
 .../simplemobiletools/gallery/activities/ViewPagerActivity.kt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
index 3efc0f5e7..5f0ab42fa 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/MediaActivity.kt
@@ -361,7 +361,7 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
 
     private fun deleteDirectoryIfEmpty() {
         val file = File(mPath)
-        if (config.deleteEmptyFolders && !file.isDownloadsFolder() && file.isDirectory && file.listFiles()?.isEmpty() == true) {
+        if (config.deleteEmptyFolders && !file.isDownloadsFolder() && file.isDirectory && file.list()?.isEmpty() == true) {
             deleteFile(file, true)
         }
     }
diff --git a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
index c0db101ca..f901cb7c2 100644
--- a/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/gallery/activities/ViewPagerActivity.kt
@@ -615,7 +615,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
         var parent = file.parentFile ?: return false
         while (true) {
-            if (parent.isHidden || parent.listFiles()?.contains(File(NOMEDIA)) == true) {
+            if (parent.isHidden || parent.list()?.contains(NOMEDIA) == true) {
                 return true
             }
 
@@ -800,7 +800,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
 
     private fun deleteDirectoryIfEmpty() {
         val file = File(mDirectory)
-        if (config.deleteEmptyFolders && !file.isDownloadsFolder() && file.isDirectory && file.listFiles()?.isEmpty() == true) {
+        if (config.deleteEmptyFolders && !file.isDownloadsFolder() && file.isDirectory && file.list()?.isEmpty() == true) {
             deleteFile(file, true)
         }
 

From 9a5ba0ad311cac1a1ccef06a611d783cdf9af62b Mon Sep 17 00:00:00 2001
From: gregory678 <gregory678@users.noreply.github.com>
Date: Wed, 27 Dec 2017 14:47:02 +0100
Subject: [PATCH 61/61] Fixes and updates

---
 app/src/main/res/values-pl/strings.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 05b9ecfa2..7a707b80a 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Prosta Galeria</string>
-    <string name="app_launcher_name">Galeria</string>
+    <string name="app_launcher_name">Prosta Galeria</string>
     <string name="edit">Edytuj</string>
     <string name="open_camera">Uruchom aplikację aparatu</string>
     <string name="hidden">(ukryty)</string>
@@ -44,7 +44,7 @@
     <string name="excluded_activity_placeholder">Wykluczenie folderów ukryje je tylko w aplikacji Simple Gallery, w innych aplikacjach będą one wciąż widoczne.\n\nJeśli chcesz je ukryć także w innych aplikacjach, użyj funkcji ukrywania.</string>
     <string name="remove_all">Usuń wszystko</string>
     <string name="remove_all_description">Usunąć wszystkie foldery z listy wykluczonych? Foldery nie zostaną fizycznie usunięte.</string>
-    <string name="manage_hidden_folders">Manage hidden folders</string>
+    <string name="manage_hidden_folders">Zarządzaj ukrytymi folderami</string>
 
     <!-- Include folders -->
     <string name="include_folders">Dołączone foldery</string>
@@ -89,9 +89,9 @@
     <string name="wallpaper_set_successfully">Tapeta została ustawiona</string>
     <string name="portrait_aspect_ratio">Proporcje ekranu w trybie pionowym</string>
     <string name="landscape_aspect_ratio">Proporcje ekranu w trybie poziomym</string>
-    <string name="home_screen">Home screen</string>
-    <string name="lock_screen">Lock screen</string>
-    <string name="home_and_lock_screen">Home and lock screen</string>
+    <string name="home_screen">Pulpit</string>
+    <string name="lock_screen">Ekran blokady</string>
+    <string name="home_and_lock_screen">Pulpit i ekran blokady</string>
 
     <!-- Slideshow -->
     <string name="slideshow">Pokaz slajdów</string>
@@ -122,7 +122,7 @@
     <string name="screen_rotation_system_setting">Ustawień systemowych</string>
     <string name="screen_rotation_device_rotation">Orientacji urządzenia</string>
     <string name="screen_rotation_aspect_ratio">Proporcji</string>
-    <string name="black_background_at_fullscreen">Black background and status bar at fullscreen media</string>
+    <string name="black_background_at_fullscreen">Czarne tło i pasek stanu przy widoku pełnoekranowym</string>
     <string name="scroll_thumbnails_horizontally">Przewijaj miniatury poziomo</string>
     <string name="hide_system_ui_at_fullscreen">Ukrywaj interfejs przy pełnoekranowym podglądzie</string>
     <string name="delete_empty_folders">Usuwaj puste foldery po usunięciu ich zawartości</string>
@@ -136,13 +136,13 @@
     <!-- Short description has to have less than 80 chars -->
     <string name="app_short_description">Prosta galeria bez reklam do przeglądania obrazów i filmów.</string>
     <string name="app_long_description">
-        Prosta aplikacja galerii do oglądania obrazów i filmów. Pliki mogą być sortowane według daty, rozmiaru i nazwy, zarówno w porządku rosnącym, jak i malejącym. W zależności od wielkości ekranu, wyświetlane mogą być w wielu kolumnach. Liczbę kolumn można zmieniać za pomocą gestów, a zdjęcia mogą być powiększane, przycinane, obracane lub ustawiane jako tapeta bezpośrednio z poziomu Prostej Galerii. Kolory aplikacji można dowolnie ustawiać.
+        Prosta aplikacja galerii do oglądania obrazów i filmów. Pliki mogą być sortowane według daty, rozmiaru i nazwy, zarówno w porządku rosnącym, jak i malejącym. W zależności od wielkości ekranu, wyświetlane mogą być w wielu kolumnach. Liczbę kolumn można zmieniać za pomocą gestów, a zdjęcia mogą być powiększane, przycinane, obracane lub ustawiane jako tapeta bezpośrednio z poziomu aplikacji. Jej kolorystykę można dowolnie modyfikować.
 
-        The fingerprint permission is needed for locking either hidden item visibility, or the whole app.
+        Uprawnienie od odcisków palców potrzebne jest w celu blokowania widoczności elementów, bądź też całej aplikacji.
 
-        Nie zawiera natomiast żadnych reklam i nie potrzebuje całej masy uprawnień. Jest w pełni otwartoźródłowa i w pełni podatna na kolorowanie.
+        Nie zawiera żadnych reklam, nie potrzebuje wielu uprawnień i jest w pełni otwartoźródłowa.
 
-        Niniejsza aplikacja jest tylko częścią naszej kolekcji prostych narzędzi. Ta, jak i pozostałe, dostępne są na stronie http://www.simplemobiletools.com
+        Jest ona tylko częścią naszej kolekcji prostych narzędzi. Ta, jak i pozostałe, dostępne są na stronie http://www.simplemobiletools.com
     </string>
 
     <!--