From 6815204c374db56f032b9c2dbf421055e60129cc Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 24 Aug 2018 22:48:38 +0200
Subject: [PATCH 1/4] update kotlin to 1.2.61

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

diff --git a/build.gradle b/build.gradle
index d56274edf..f86546f6a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,8 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.6.15'
-        kotlin_version = '1.2.60'
+        propVersionName = '4.7.0'
+        kotlin_version = '1.2.61'
         support_libs = '27.1.1'
     }
 

From 6fa26a383826e873c205caa25dff79f26053edf3 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 1 Sep 2018 23:07:51 +0200
Subject: [PATCH 2/4] update version to 4.7.1

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

diff --git a/build.gradle b/build.gradle
index f86546f6a..82b053ccb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.7.0'
+        propVersionName = '4.7.1'
         kotlin_version = '1.2.61'
         support_libs = '27.1.1'
     }

From c7e57c3c8de35f20098345c03e7475f4191fff6e Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 2 Sep 2018 21:55:57 +0200
Subject: [PATCH 3/4] adding a new string for Label

---
 build.gradle                                   | 2 +-
 commons/src/main/res/values-ar/strings.xml     | 1 +
 commons/src/main/res/values-az/strings.xml     | 1 +
 commons/src/main/res/values-br/strings.xml     | 1 +
 commons/src/main/res/values-ca/strings.xml     | 1 +
 commons/src/main/res/values-cs/strings.xml     | 1 +
 commons/src/main/res/values-da/strings.xml     | 1 +
 commons/src/main/res/values-de/strings.xml     | 1 +
 commons/src/main/res/values-el/strings.xml     | 1 +
 commons/src/main/res/values-es/strings.xml     | 1 +
 commons/src/main/res/values-fi/strings.xml     | 1 +
 commons/src/main/res/values-fr/strings.xml     | 1 +
 commons/src/main/res/values-gl/strings.xml     | 1 +
 commons/src/main/res/values-hi-rIN/strings.xml | 1 +
 commons/src/main/res/values-hr/strings.xml     | 1 +
 commons/src/main/res/values-hu/strings.xml     | 1 +
 commons/src/main/res/values-id/strings.xml     | 1 +
 commons/src/main/res/values-it/strings.xml     | 1 +
 commons/src/main/res/values-iw/strings.xml     | 1 +
 commons/src/main/res/values-ja/strings.xml     | 1 +
 commons/src/main/res/values-ko-rKR/strings.xml | 1 +
 commons/src/main/res/values-lt/strings.xml     | 1 +
 commons/src/main/res/values-nb/strings.xml     | 1 +
 commons/src/main/res/values-nl/strings.xml     | 1 +
 commons/src/main/res/values-no/strings.xml     | 1 +
 commons/src/main/res/values-pl/strings.xml     | 1 +
 commons/src/main/res/values-pt-rBR/strings.xml | 1 +
 commons/src/main/res/values-pt/strings.xml     | 1 +
 commons/src/main/res/values-ru/strings.xml     | 1 +
 commons/src/main/res/values-sk/strings.xml     | 1 +
 commons/src/main/res/values-sv/strings.xml     | 1 +
 commons/src/main/res/values-tr/strings.xml     | 1 +
 commons/src/main/res/values-zh-rCN/strings.xml | 1 +
 commons/src/main/res/values-zh-rTW/strings.xml | 1 +
 commons/src/main/res/values/strings.xml        | 1 +
 35 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 82b053ccb..97993cfb6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         propMinSdkVersion = 16
         propTargetSdkVersion = propCompileSdkVersion
         propVersionCode = 1
-        propVersionName = '4.7.1'
+        propVersionName = '4.7.2'
         kotlin_version = '1.2.61'
         support_libs = '27.1.1'
     }
diff --git a/commons/src/main/res/values-ar/strings.xml b/commons/src/main/res/values-ar/strings.xml
index 948247add..cd3d7d256 100644
--- a/commons/src/main/res/values-ar/strings.xml
+++ b/commons/src/main/res/values-ar/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">المفضلة</string>
diff --git a/commons/src/main/res/values-az/strings.xml b/commons/src/main/res/values-az/strings.xml
index ce4d66c48..929b200a3 100644
--- a/commons/src/main/res/values-az/strings.xml
+++ b/commons/src/main/res/values-az/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Qeydlər</string>
     <string name="deleting_folder">\'%s\' qovluğu silinir</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Sevimlilər</string>
diff --git a/commons/src/main/res/values-br/strings.xml b/commons/src/main/res/values-br/strings.xml
index 3bad55cb0..f220aee58 100644
--- a/commons/src/main/res/values-br/strings.xml
+++ b/commons/src/main/res/values-br/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-ca/strings.xml b/commons/src/main/res/values-ca/strings.xml
index 70490cfed..820e5e125 100644
--- a/commons/src/main/res/values-ca/strings.xml
+++ b/commons/src/main/res/values-ca/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">S\'està eliminant la carpeta \'%s\'</string>
     <string name="none">Cap</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Preferits</string>
diff --git a/commons/src/main/res/values-cs/strings.xml b/commons/src/main/res/values-cs/strings.xml
index d11243750..e4337245d 100644
--- a/commons/src/main/res/values-cs/strings.xml
+++ b/commons/src/main/res/values-cs/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Oblíbené</string>
diff --git a/commons/src/main/res/values-da/strings.xml b/commons/src/main/res/values-da/strings.xml
index c93b397c6..ad543ca21 100644
--- a/commons/src/main/res/values-da/strings.xml
+++ b/commons/src/main/res/values-da/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Noter</string>
     <string name="deleting_folder">Sletter mappen \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Bogmærker</string>
diff --git a/commons/src/main/res/values-de/strings.xml b/commons/src/main/res/values-de/strings.xml
index b97f153f4..88a50f9a7 100644
--- a/commons/src/main/res/values-de/strings.xml
+++ b/commons/src/main/res/values-de/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notizen</string>
     <string name="deleting_folder">Lösche Ordner \'%s\'</string>
     <string name="none">nichts</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoriten</string>
diff --git a/commons/src/main/res/values-el/strings.xml b/commons/src/main/res/values-el/strings.xml
index d4e680f9c..eb8b939bb 100644
--- a/commons/src/main/res/values-el/strings.xml
+++ b/commons/src/main/res/values-el/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Σημειώσεις</string>
     <string name="deleting_folder">Διαγραφή φακέλου \'%s\'</string>
     <string name="none">Χωρίς</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Αγαπημένα</string>
diff --git a/commons/src/main/res/values-es/strings.xml b/commons/src/main/res/values-es/strings.xml
index 81bed24ab..f6f1549a9 100644
--- a/commons/src/main/res/values-es/strings.xml
+++ b/commons/src/main/res/values-es/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Eliminando carpeta \'%s\'</string>
     <string name="none">Ninguno</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoritos</string>
diff --git a/commons/src/main/res/values-fi/strings.xml b/commons/src/main/res/values-fi/strings.xml
index 03fc4bb09..ea8d1766c 100644
--- a/commons/src/main/res/values-fi/strings.xml
+++ b/commons/src/main/res/values-fi/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Muistiinpanot</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-fr/strings.xml b/commons/src/main/res/values-fr/strings.xml
index 10746fcb7..2b9844c4b 100644
--- a/commons/src/main/res/values-fr/strings.xml
+++ b/commons/src/main/res/values-fr/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Supprimer le dossier \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoris</string>
diff --git a/commons/src/main/res/values-gl/strings.xml b/commons/src/main/res/values-gl/strings.xml
index 5185861ec..619b64b05 100644
--- a/commons/src/main/res/values-gl/strings.xml
+++ b/commons/src/main/res/values-gl/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-hi-rIN/strings.xml b/commons/src/main/res/values-hi-rIN/strings.xml
index 53aec6042..bc78a59d8 100644
--- a/commons/src/main/res/values-hi-rIN/strings.xml
+++ b/commons/src/main/res/values-hi-rIN/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-hr/strings.xml b/commons/src/main/res/values-hr/strings.xml
index 6b0053354..53d845354 100644
--- a/commons/src/main/res/values-hr/strings.xml
+++ b/commons/src/main/res/values-hr/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoriti</string>
diff --git a/commons/src/main/res/values-hu/strings.xml b/commons/src/main/res/values-hu/strings.xml
index c85041f82..ddca80ae0 100644
--- a/commons/src/main/res/values-hu/strings.xml
+++ b/commons/src/main/res/values-hu/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Jegyzetek</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Kedvencek</string>
diff --git a/commons/src/main/res/values-id/strings.xml b/commons/src/main/res/values-id/strings.xml
index 1daf49d2b..61fc80c95 100644
--- a/commons/src/main/res/values-id/strings.xml
+++ b/commons/src/main/res/values-id/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorit</string>
diff --git a/commons/src/main/res/values-it/strings.xml b/commons/src/main/res/values-it/strings.xml
index 771b2194c..2ad06804c 100644
--- a/commons/src/main/res/values-it/strings.xml
+++ b/commons/src/main/res/values-it/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Note</string>
     <string name="deleting_folder">Eliminazione cartella \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Preferiti</string>
diff --git a/commons/src/main/res/values-iw/strings.xml b/commons/src/main/res/values-iw/strings.xml
index 8833e71d8..b7db8b597 100644
--- a/commons/src/main/res/values-iw/strings.xml
+++ b/commons/src/main/res/values-iw/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index ec7978a83..542a00bb9 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">メモ</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">お気に入り</string>
diff --git a/commons/src/main/res/values-ko-rKR/strings.xml b/commons/src/main/res/values-ko-rKR/strings.xml
index 5fa2d1b7e..4ed9e857f 100644
--- a/commons/src/main/res/values-ko-rKR/strings.xml
+++ b/commons/src/main/res/values-ko-rKR/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">즐겨찾기</string>
diff --git a/commons/src/main/res/values-lt/strings.xml b/commons/src/main/res/values-lt/strings.xml
index 1d4d2d5fc..b7e26b683 100644
--- a/commons/src/main/res/values-lt/strings.xml
+++ b/commons/src/main/res/values-lt/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Užrašai</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Mėgiamiausieji</string>
diff --git a/commons/src/main/res/values-nb/strings.xml b/commons/src/main/res/values-nb/strings.xml
index 203285c9a..a9e0f270d 100644
--- a/commons/src/main/res/values-nb/strings.xml
+++ b/commons/src/main/res/values-nb/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Sletter mappen \'%s\'</string>
     <string name="none">Ingen</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoritter</string>
diff --git a/commons/src/main/res/values-nl/strings.xml b/commons/src/main/res/values-nl/strings.xml
index d2cc70751..52841fdb5 100644
--- a/commons/src/main/res/values-nl/strings.xml
+++ b/commons/src/main/res/values-nl/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notities</string>
     <string name="deleting_folder">Map \'%s\' verwijderen</string>
     <string name="none">Geen</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorieten</string>
diff --git a/commons/src/main/res/values-no/strings.xml b/commons/src/main/res/values-no/strings.xml
index 5ca0e3e88..ad4bc00bb 100644
--- a/commons/src/main/res/values-no/strings.xml
+++ b/commons/src/main/res/values-no/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>
diff --git a/commons/src/main/res/values-pl/strings.xml b/commons/src/main/res/values-pl/strings.xml
index 422d6834b..bb08e4ffb 100644
--- a/commons/src/main/res/values-pl/strings.xml
+++ b/commons/src/main/res/values-pl/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notatnik</string>
     <string name="deleting_folder">Usuwam folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Ulubione</string>
diff --git a/commons/src/main/res/values-pt-rBR/strings.xml b/commons/src/main/res/values-pt-rBR/strings.xml
index 16bc812d5..7fd96781a 100644
--- a/commons/src/main/res/values-pt-rBR/strings.xml
+++ b/commons/src/main/res/values-pt-rBR/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">Excluindo pastas \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoritos</string>
diff --git a/commons/src/main/res/values-pt/strings.xml b/commons/src/main/res/values-pt/strings.xml
index 7572ead73..fe23341b3 100644
--- a/commons/src/main/res/values-pt/strings.xml
+++ b/commons/src/main/res/values-pt/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notas</string>
     <string name="deleting_folder">A apagar a pasta \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoritos</string>
diff --git a/commons/src/main/res/values-ru/strings.xml b/commons/src/main/res/values-ru/strings.xml
index 45354bbdf..e2af9e4c0 100644
--- a/commons/src/main/res/values-ru/strings.xml
+++ b/commons/src/main/res/values-ru/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Заметки</string>
     <string name="deleting_folder">Удаление папки \"%s\"</string>
     <string name="none">Нет</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Избранное</string>
diff --git a/commons/src/main/res/values-sk/strings.xml b/commons/src/main/res/values-sk/strings.xml
index 3e6b53cc9..c0df6bffb 100644
--- a/commons/src/main/res/values-sk/strings.xml
+++ b/commons/src/main/res/values-sk/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Poznámky</string>
     <string name="deleting_folder">Odstraňuje sa priečinok \'%s\'</string>
     <string name="none">Žiadny</string>
+    <string name="label">Štítok</string>
 
     <!-- Favorites -->
     <string name="favorites">Obľúbené</string>
diff --git a/commons/src/main/res/values-sv/strings.xml b/commons/src/main/res/values-sv/strings.xml
index 72f7c5238..95d100b51 100644
--- a/commons/src/main/res/values-sv/strings.xml
+++ b/commons/src/main/res/values-sv/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Anteckningar</string>
     <string name="deleting_folder">Tar bort mappen \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoriter</string>
diff --git a/commons/src/main/res/values-tr/strings.xml b/commons/src/main/res/values-tr/strings.xml
index 9e293d346..a55b3b813 100644
--- a/commons/src/main/res/values-tr/strings.xml
+++ b/commons/src/main/res/values-tr/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notlar</string>
     <string name="deleting_folder">\'%s\' klasörü siliniyor</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favoriler</string>
diff --git a/commons/src/main/res/values-zh-rCN/strings.xml b/commons/src/main/res/values-zh-rCN/strings.xml
index 4ee264088..36ca7299c 100644
--- a/commons/src/main/res/values-zh-rCN/strings.xml
+++ b/commons/src/main/res/values-zh-rCN/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">笔记</string>
     <string name="deleting_folder">正在删除目录 \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">收藏</string>
diff --git a/commons/src/main/res/values-zh-rTW/strings.xml b/commons/src/main/res/values-zh-rTW/strings.xml
index 5f2b39883..86846e149 100644
--- a/commons/src/main/res/values-zh-rTW/strings.xml
+++ b/commons/src/main/res/values-zh-rTW/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">筆記</string>
     <string name="deleting_folder">資料夾 \'%s\' 刪除中</string>
     <string name="none">無</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">我的最愛</string>
diff --git a/commons/src/main/res/values/strings.xml b/commons/src/main/res/values/strings.xml
index 5be241cf2..1bdd5fc69 100644
--- a/commons/src/main/res/values/strings.xml
+++ b/commons/src/main/res/values/strings.xml
@@ -17,6 +17,7 @@
     <string name="notes">Notes</string>
     <string name="deleting_folder">Deleting folder \'%s\'</string>
     <string name="none">None</string>
+    <string name="label">Label</string>
 
     <!-- Favorites -->
     <string name="favorites">Favorites</string>

From f93a8eaba5ad5d2862921fdfe2a89b661c6335b8 Mon Sep 17 00:00:00 2001
From: ScratchBuild <foobarbuzz@gmail.com>
Date: Mon, 3 Sep 2018 13:41:22 +0900
Subject: [PATCH 4/4] Update Japanese translation

---
 commons/src/main/res/values-ja/strings.xml | 110 ++++++++++-----------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/commons/src/main/res/values-ja/strings.xml b/commons/src/main/res/values-ja/strings.xml
index 542a00bb9..c194e3917 100644
--- a/commons/src/main/res/values-ja/strings.xml
+++ b/commons/src/main/res/values-ja/strings.xml
@@ -15,9 +15,9 @@
     <string name="never">Never</string>
     <string name="details">詳細</string>
     <string name="notes">メモ</string>
-    <string name="deleting_folder">Deleting folder \'%s\'</string>
+    <string name="deleting_folder">フォルダ \'%s\' を削除しています</string>
     <string name="none">None</string>
-    <string name="label">Label</string>
+    <string name="label">ラベル</string>
 
     <!-- Favorites -->
     <string name="favorites">お気に入り</string>
@@ -35,10 +35,10 @@
     <string name="change_filter">フィルタを変更</string>
 
     <!-- Permissions -->
-    <string name="no_storage_permissions">Storage permission is required</string>
-    <string name="no_contacts_permission">Contacts permission is required</string>
-    <string name="no_camera_permissions">Camera permission is required</string>
-    <string name="no_audio_permissions">Audio permission is required</string>
+    <string name="no_storage_permissions">ストレージへのアクセス許可が必要です</string>
+    <string name="no_contacts_permission">連絡先へのアクセス許可が必要です</string>
+    <string name="no_camera_permissions">カメラへのアクセス許可が必要です</string>
+    <string name="no_audio_permissions">マイクへのアクセス許可が必要です</string>
 
     <!-- Renaming -->
     <string name="rename_file">ファイルの名前を変更</string>
@@ -52,9 +52,9 @@
     <string name="renaming_folder">フォルダの名前を変更中</string>
     <string name="filename_cannot_be_empty">ファイル名は空にできません</string>
     <string name="filename_invalid_characters">ファイル名に無効な文字が含まれています</string>
-    <string name="filename_invalid_characters_placeholder">Filename \'%s\' contains invalid characters</string>
+    <string name="filename_invalid_characters_placeholder">ファイル名 \'%s\' に無効な文字が含まれています</string>
     <string name="extension_cannot_be_empty">拡張子は省略できません</string>
-    <string name="source_file_doesnt_exist">Source file %s doesn\'t exist</string>
+    <string name="source_file_doesnt_exist">ソースファイル %s が存在しません</string>
 
     <!-- Copy / Move -->
     <string name="copy">コピー</string>
@@ -95,8 +95,8 @@
     <!-- File operation conflicts -->
     <string name="file_already_exists">ファイル \"%s\" は既に存在しています</string>
     <string name="file_already_exists_overwrite">ファイル \"%s\" は既に存在しています。上書きしますか？</string>
-    <string name="folder_already_exists">Folder \"%s\" already exists</string>
-    <string name="merge">Merge</string>
+    <string name="folder_already_exists">フォルダ \"%s\" は既に存在しています</string>
+    <string name="merge">統合</string>
     <string name="overwrite">上書き</string>
     <string name="skip">スキップ</string>
     <string name="append">\'_1\' に追記する</string>
@@ -106,8 +106,8 @@
     <string name="select_folder">フォルダを選択</string>
     <string name="select_file">ファイルを選択</string>
     <string name="confirm_storage_access_title">外部ストレージのアクセスを確認してください</string>
-    <string name="confirm_storage_access_text">次の画面で SD カードのルートフォルダを選択して、書き込みアクセス許可を付与してください</string>
-    <string name="confirm_storage_access_text_sd">SD カードの内容が表示されない場合は、こちらをお試しください</string>
+    <string name="confirm_storage_access_text">次の画面で SDカードのルートフォルダを選択して、書き込みアクセス許可を付与してください</string>
+    <string name="confirm_storage_access_text_sd">SDカードの内容が表示されない場合は、こちらをお試しください</string>
     <string name="confirm_selection">Confirm selection</string>
 
     <plurals name="items">
@@ -122,17 +122,17 @@
     </plurals>
 
     <plurals name="deleting_items">
-        <item quantity="one">Deleting %d item</item>
-        <item quantity="other">Deleting %d items</item>
+        <item quantity="one">%d アイテムを削除しています</item>
+        <item quantity="other">%d アイテムを削除しています</item>
     </plurals>
 
     <!-- Storages -->
     <string name="select_storage">ストレージを選択</string>
     <string name="internal">内部</string>
-    <string name="sd_card">SD カード</string>
+    <string name="sd_card">SDカード</string>
     <string name="root">ルート</string>
-    <string name="wrong_root_selected">フォルダの選択が正しくありません。SD カードを選択してください</string>
-    <string name="sd_card_otg_same">SD card and OTG device paths cannot be the same</string>
+    <string name="wrong_root_selected">フォルダの選択が正しくありません。SDカードを選択してください</string>
+    <string name="sd_card_otg_same">SDカードとOTGデバイスのパスを同じにすることはできません</string>
     <string name="app_on_sd_card">You seem to have the app installed on an SD card, that makes the app widgets unavailable. You won\'t even see them on the list of available widgets.
         It is a system limitation, so if you want to use the widgets, you have to move the app back on the internal storage.</string>
 
@@ -173,7 +173,7 @@
     <string name="share_colors_success">Colors updated successfully. A new Theme called \'Shared\' has been added, please use that for updating all app colors in the future.</string>
     <string name="purchase_thank_you">
         <![CDATA[
-            Please purchase <a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> to unlock this function and support the development. Thanks!
+            この機能のロックを解除して開発者をサポートするには、<a href="https://play.google.com/store/apps/details?id=com.simplemobiletools.thankyou">Simple Thank You</a> アプリを購入してください。
         ]]>
     </string>
 
@@ -182,7 +182,7 @@
     <string name="dark_theme">ダーク</string>
     <string name="solarized">Solarized</string>
     <string name="dark_red">Dark red</string>
-    <string name="black_white">Black &amp; White</string>
+    <string name="black_white">モノクロ</string>
     <string name="custom">カスタム</string>
     <string name="shared">Shared</string>
 
@@ -203,8 +203,8 @@
     <string name="unhide_folder">フォルダを再表示</string>
     <string name="temporarily_show_hidden">非表示の項目を一時的に表示</string>
     <string name="stop_showing_hidden">非表示項目を表示しない</string>
-    <string name="maximum_share_reached">You cannot share this much content at once</string>
-    <string name="empty_and_disable_recycle_bin">Empty and disable the Recycle Bin</string>
+    <string name="maximum_share_reached">一度に複数のコンテンツを共有することはできません</string>
+    <string name="empty_and_disable_recycle_bin">ごみ箱を空にして無効にする</string>
     <string name="undo">Undo</string>
     <string name="redo">Redo</string>
 
@@ -225,15 +225,15 @@
     <string name="proceed_with_deletion">削除を続行してもよろしいですか？</string>
     <string name="deletion_confirmation">%s を削除してもよろしいですか？</string>    <!-- Are you sure you want to delete 5 items? -->
     <string name="move_to_recycle_bin_confirmation">%s をゴミ箱に移動してもよろしいですか？</string>    <!-- Are you sure you want to move 3 items into the Recycle Bin? -->
-    <string name="are_you_sure_delete">Are you sure you want to delete this item?</string>
-    <string name="are_you_sure_recycle_bin">Are you sure you want to move this item into the Recycle Bin?</string>
+    <string name="are_you_sure_delete">このアイテムを削除してもよろしいですか？</string>
+    <string name="are_you_sure_recycle_bin">個のアイテムをゴミ箱に移動してもよろしいですか？</string>
     <string name="do_not_ask_again">このセッションでは再度たずねない</string>
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
 
     <plurals name="delete_warning">
-        <item quantity="one">WARNING: You are deleting a folder</item>
-        <item quantity="other">WARNING: You are deleting %d folders</item>
+        <item quantity="one">警告: フォルダを削除しようとしています</item>
+        <item quantity="other">警告: %d 個のフォルダを削除しようとしています</item>
     </plurals>
 
     <!-- Password protection -->
@@ -246,9 +246,9 @@
     <string name="insert_pattern">パターンを入力</string>
     <string name="wrong_pattern">パターンに誤りがあります</string>
     <string name="repeat_pattern">パターンを再入力</string>
-    <string name="fingerprint">Fingerprint</string>
-    <string name="add_fingerprint">Add fingerprint</string>
-    <string name="place_finger">Please place your finger on the fingerprint sensor</string>
+    <string name="fingerprint">指紋</string>
+    <string name="add_fingerprint">指紋を追加</string>
+    <string name="place_finger">指紋センサーに指を置いてください</string>
     <string name="authentication_failed">Authentication failed</string>
     <string name="authentication_blocked">Authentication blocked, please try again in a moment</string>
     <string name="no_fingerprints_registered">You have no fingerprints registered, please add some in the Settings of your device</string>
@@ -257,8 +257,8 @@
     <string name="fingerprint_setup_successfully">Protection setup successfully. Please reinstall the app in case of problems with reseting it.</string>
 
     <!-- Times -->
-    <string name="yesterday">Yesterday</string>
-    <string name="today">Today</string>
+    <string name="yesterday">昨日</string>
+    <string name="today">今日</string>
     <string name="tomorrow">明日</string>
     <string name="seconds_raw">秒</string>
     <string name="minutes_raw">分</string>
@@ -361,8 +361,8 @@
     <string name="settings">設定</string>
     <string name="purchase_simple_thank_you">Purchase Simple Thank You</string>
     <string name="customize_colors">表示色のカスタマイズ</string>
-    <string name="customize_widget_colors">Customize widget colors</string>
-    <string name="use_english_language">Use English language</string>
+    <string name="customize_widget_colors">ウィジェットの色をカスタマイズ</string>
+    <string name="use_english_language">英語で表示する</string>
     <string name="avoid_whats_new">起動時に更新履歴を表示しない</string>
     <string name="show_hidden_items">Show hidden items</string>
     <string name="font_size">メモのフォントサイズ</string>
@@ -383,7 +383,7 @@
     <string name="use_same_snooze">Always use same snooze time</string>
     <string name="snooze_time">Snooze time</string>
     <string name="vibrate_on_button_press">Vibrate on button press</string>
-    <string name="move_items_into_recycle_bin">Move items into the Recycle Bin instead of deleting</string>
+    <string name="move_items_into_recycle_bin">削除の代わりにアイテムをごみ箱に移動する</string>
     <string name="recycle_bin_cleaning_interval">Recycle Bin cleaning interval</string>
     <string name="empty_recycle_bin">Empty the Recycle Bin</string>
     <string name="force_portrait_mode">Force portrait mode</string>
@@ -392,9 +392,9 @@
     <string name="visibility">Visibility</string>
     <string name="security">Security</string>
     <string name="scrolling">Scrolling</string>
-    <string name="file_operations">File operations</string>
-    <string name="recycle_bin">Recycle Bin</string>
-    <string name="saving_label">Saving</string>
+    <string name="file_operations">ファイル操作</string>
+    <string name="recycle_bin">ごみ箱</string>
+    <string name="saving_label">保存中</string>
     <string name="startup">Startup</string>
     <string name="text">Text</string>
 
@@ -451,13 +451,13 @@
     <string name="in_november">in November</string>
     <string name="in_december">in December</string>
 
-    <string name="monday">Monday</string>
-    <string name="tuesday">Tuesday</string>
-    <string name="wednesday">Wednesday</string>
-    <string name="thursday">Thursday</string>
-    <string name="friday">Friday</string>
-    <string name="saturday">Saturday</string>
-    <string name="sunday">Sunday</string>
+    <string name="monday">月曜日</string>
+    <string name="tuesday">火曜日</string>
+    <string name="wednesday">水曜日</string>
+    <string name="thursday">木曜日</string>
+    <string name="friday">金曜日</string>
+    <string name="saturday">土曜日</string>
+    <string name="sunday">日曜日</string>
 
     <string name="monday_letter">月</string>
     <string name="tuesday_letter">火</string>
@@ -467,24 +467,24 @@
     <string name="saturday_letter">土</string>
     <string name="sunday_letter">日</string>
 
-    <string name="monday_short">Mon</string>
-    <string name="tuesday_short">Tue</string>
-    <string name="wednesday_short">Wed</string>
-    <string name="thursday_short">Thu</string>
-    <string name="friday_short">Fri</string>
-    <string name="saturday_short">Sat</string>
-    <string name="sunday_short">Sun</string>
+    <string name="monday_short">月</string>
+    <string name="tuesday_short">火</string>
+    <string name="wednesday_short">水</string>
+    <string name="thursday_short">木</string>
+    <string name="friday_short">金</string>
+    <string name="saturday_short">土</string>
+    <string name="sunday_short">日</string>
 
     <!-- About -->
-    <string name="about">アプリについて</string>
-    <string name="website_label">もっとシンプルなアプリとソースコードは</string>
+    <string name="about">このアプリについて</string>
+    <string name="website_label">ソースコードはこちら</string>
     <string name="email_label">ご意見やご提案をお送りください</string>
     <string name="more_apps_underlined"><u>他のアプリ</u></string>
     <string name="third_party_licences_underlined"><u>サードパーティー ライセンス</u></string>
     <string name="invite_friends_underlined"><u>友達を招待</u></string>
     <string name="share_text">%2$s で %1$s を確認してください</string>
     <string name="invite_via">招待</string>
-    <string name="rate_us_underlined"><u>Play ストアで評価してください</u></string>
+    <string name="rate_us_underlined"><u>Playストアで評価してください</u></string>
     <string name="donate">寄付</string>
     <string name="donate_underlined"><u>寄付</u></string>
     <string name="follow_us">フォローしてください</string>
@@ -500,7 +500,7 @@
         ]]>
     </string>
     <string name="purchase">Purchase</string>
-    <string name="update_thank_you">Please update Simple Thank You to the latest version</string>
+    <string name="update_thank_you">\"Simple Thank You\" アプリを最新版に更新してください</string>
     <string name="before_asking_question_read_faq">Before you ask a question, please read the Frequently Asked Questions first, maybe the solution is there.</string>
     <string name="read_it">Read it</string>
 
@@ -532,7 +532,7 @@
     <string name="faq_5_text_commons">If they were really deleted, you cannot. However, you can enable using a Recycle Bin instead of deleting in the app settings. That will just move the files in it instead of deleting them.</string>
 
     <!-- License -->
-    <string name="notice">このアプリは、私の暮らしにゆとりを持たせるために、次のサードパーティのライブラリーを使用しています。 ありがとうございます。</string>
+    <string name="notice">このアプリは、私の暮らしにゆとりを持たせるために、次のサードパーティのライブラリーを使用しています。ありがとうございます。</string>
     <string name="third_party_licences">サードパーティー ライセンス</string>
     <string name="kotlin_title">Kotlin (プログラミング言語)</string>
     <string name="subsampling_title">Subsampling Scale Image View (ズーム可能画像ビュー)</string>