From 61d11198891a15d17a061c89e3152d91a1b462a4 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Tue, 3 Oct 2017 22:46:23 +0900
Subject: [PATCH] Improve log activity title

---
 src/main/AndroidManifest.xml                          |  1 -
 .../syncthingandroid/activities/LogActivity.java      | 11 +++++++++--
 src/main/res/layout/fragment_external_versioning.xml  |  2 --
 src/main/res/layout/fragment_no_versioning.xml        |  1 -
 src/main/res/layout/fragment_simple_versioning.xml    |  3 ---
 src/main/res/layout/fragment_staggered_versioning.xml |  4 ----
 src/main/res/layout/fragment_trashcan_versioning.xml  |  3 ---
 src/main/res/layout/numberpicker_fragment.xml         |  1 -
 src/main/res/menu/log_list.xml                        |  2 +-
 src/main/res/values-bg/strings.xml                    |  7 +++----
 src/main/res/values-ca-rES/strings.xml                |  7 +++----
 src/main/res/values-cs/strings.xml                    |  7 +++----
 src/main/res/values-da/strings.xml                    |  7 +++----
 src/main/res/values-de/strings.xml                    |  7 +++----
 src/main/res/values-el/strings.xml                    |  7 +++----
 src/main/res/values-es-rMX/strings.xml                |  7 +++----
 src/main/res/values-es/strings.xml                    |  7 +++----
 src/main/res/values-fi/strings.xml                    |  7 +++----
 src/main/res/values-fr/strings.xml                    |  7 +++----
 src/main/res/values-hu/strings.xml                    |  7 +++----
 src/main/res/values-in/strings.xml                    |  7 +++----
 src/main/res/values-it/strings.xml                    |  7 +++----
 src/main/res/values-ja/strings.xml                    |  7 +++----
 src/main/res/values-ko/strings.xml                    |  7 +++----
 src/main/res/values-nb/strings.xml                    |  7 +++----
 src/main/res/values-nl/strings.xml                    |  7 +++----
 src/main/res/values-nn/strings.xml                    |  7 +++----
 src/main/res/values-pl/strings.xml                    |  7 +++----
 src/main/res/values-pt-rBR/strings.xml                |  7 +++----
 src/main/res/values-pt/strings.xml                    |  7 +++----
 src/main/res/values-ru/strings.xml                    |  7 +++----
 src/main/res/values-sk/strings.xml                    |  7 +++----
 src/main/res/values-sv/strings.xml                    |  7 +++----
 src/main/res/values-tr/strings.xml                    |  7 +++----
 src/main/res/values-vi/strings.xml                    |  7 +++----
 src/main/res/values-zh-rCN/strings.xml                |  7 +++----
 src/main/res/values/strings.xml                       |  8 ++++----
 37 files changed, 95 insertions(+), 130 deletions(-)

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 96b0fbf8..78451542 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -70,7 +70,6 @@
         </activity>
         <activity
             android:name=".activities.LogActivity"
-            android:label="@string/log_title"
             android:parentActivityName=".activities.SettingsActivity">
             <intent-filter>
                 <action android:name=".activities.LogActivity" />
diff --git a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
index 57fa7093..1729736c 100644
--- a/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
+++ b/src/main/java/com/nutomic/syncthingandroid/activities/LogActivity.java
@@ -39,6 +39,7 @@ public class LogActivity extends SyncthingActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_log);
+        setTitle(R.string.syncthing_log_title);
 
         if (savedInstanceState != null) {
             mSyncthingLog = savedInstanceState.getBoolean("syncthingLog");
@@ -63,7 +64,7 @@ public class LogActivity extends SyncthingActivity {
         inflater.inflate(R.menu.log_list, menu);
 
         MenuItem switchLog = menu.findItem(R.id.switch_logs);
-        switchLog.setTitle(mSyncthingLog ? R.string.log_android_title : R.string.log_syncthing_title);
+        switchLog.setTitle(mSyncthingLog ? R.string.view_android_log : R.string.view_syncthing_log);
 
         // Add the share button
         MenuItem shareItem = menu.findItem(R.id.menu_share);
@@ -82,7 +83,13 @@ public class LogActivity extends SyncthingActivity {
         switch (item.getItemId()) {
             case R.id.switch_logs:
                 mSyncthingLog = !mSyncthingLog;
-                item.setTitle(mSyncthingLog ? R.string.log_android_title : R.string.log_syncthing_title);
+                if (mSyncthingLog) {
+                    item.setTitle(R.string.view_android_log);
+                    setTitle(R.string.syncthing_log_title);
+                } else {
+                    item.setTitle(R.string.view_syncthing_log);
+                    setTitle(R.string.android_log_title);
+                }
                 updateLog();
                 return true;
             default:
diff --git a/src/main/res/layout/fragment_external_versioning.xml b/src/main/res/layout/fragment_external_versioning.xml
index e99ee5f2..82ebab19 100644
--- a/src/main/res/layout/fragment_external_versioning.xml
+++ b/src/main/res/layout/fragment_external_versioning.xml
@@ -4,7 +4,6 @@
     android:layout_height="match_parent">
 
     <TextView
-        android:id="@+id/textView5"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
@@ -23,7 +22,6 @@
          />
 
     <TextView
-        android:id="@+id/textView6"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/external_versioning_description" />
diff --git a/src/main/res/layout/fragment_no_versioning.xml b/src/main/res/layout/fragment_no_versioning.xml
index b1885bb1..8b3d671e 100644
--- a/src/main/res/layout/fragment_no_versioning.xml
+++ b/src/main/res/layout/fragment_no_versioning.xml
@@ -4,7 +4,6 @@
     android:layout_height="wrap_content">
 
     <TextView
-        android:id="@+id/textView7"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="10dp"
diff --git a/src/main/res/layout/fragment_simple_versioning.xml b/src/main/res/layout/fragment_simple_versioning.xml
index 2a11f57b..42cb5552 100644
--- a/src/main/res/layout/fragment_simple_versioning.xml
+++ b/src/main/res/layout/fragment_simple_versioning.xml
@@ -10,14 +10,12 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/textView8"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/simple_file_versioning_description"
             android:layout_margin="10dp" />
 
         <TextView
-            android:id="@+id/textView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -36,7 +34,6 @@
             tools:layout="@layout/numberpicker_fragment" />
 
         <TextView
-            android:id="@+id/textView2"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/keep_versions_description"
diff --git a/src/main/res/layout/fragment_staggered_versioning.xml b/src/main/res/layout/fragment_staggered_versioning.xml
index 39c484d9..60434246 100644
--- a/src/main/res/layout/fragment_staggered_versioning.xml
+++ b/src/main/res/layout/fragment_staggered_versioning.xml
@@ -5,7 +5,6 @@
     android:layout_height="wrap_content" >
 
         <TextView
-            android:id="@+id/textView10"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/staggered_versioning_description"
@@ -31,7 +30,6 @@
             tools:layout="@layout/numberpicker_fragment" />
 
         <TextView
-            android:id="@+id/textView11"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/maximum_age_description"
@@ -39,7 +37,6 @@
             />
 
         <TextView
-            android:id="@+id/textView13"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
@@ -61,7 +58,6 @@
             android:hint="@string/directory"/>
 
         <TextView
-            android:id="@+id/textView12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="10dp"
diff --git a/src/main/res/layout/fragment_trashcan_versioning.xml b/src/main/res/layout/fragment_trashcan_versioning.xml
index 34998638..8a51226e 100644
--- a/src/main/res/layout/fragment_trashcan_versioning.xml
+++ b/src/main/res/layout/fragment_trashcan_versioning.xml
@@ -11,14 +11,12 @@
         android:orientation="vertical" >
 
         <TextView
-            android:id="@+id/textView9"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/trashcan_versioning_description"
             android:layout_margin="10dp" />
 
         <TextView
-            android:id="@+id/textView3"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/clean_out_after"
@@ -37,7 +35,6 @@
             tools:layout="@layout/numberpicker_fragment" />
 
         <TextView
-            android:id="@+id/textView4"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/cleanout_after_description"
diff --git a/src/main/res/layout/numberpicker_fragment.xml b/src/main/res/layout/numberpicker_fragment.xml
index 75dad684..ec0fad6c 100644
--- a/src/main/res/layout/numberpicker_fragment.xml
+++ b/src/main/res/layout/numberpicker_fragment.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <NumberPicker xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/numberpicker"
     android:layout_width="match_parent"
     android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/src/main/res/menu/log_list.xml b/src/main/res/menu/log_list.xml
index a713ee6d..2119e917 100644
--- a/src/main/res/menu/log_list.xml
+++ b/src/main/res/menu/log_list.xml
@@ -5,7 +5,7 @@
 
     <item
         android:id="@+id/switch_logs"
-        android:title="@string/log_android_title"
+        android:title="@string/view_android_log"
         app:showAsAction="ifRoom" />
 
       <item
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index b42b27a8..72c658b3 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -227,11 +227,10 @@
   <string name="create_folder_failed">Създаването на нова папка се провали</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Журнал</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Към журнала на Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Към журнала на Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Към журнала на Syncthing</string>
+  <string name="view_syncthing_log">Към журнала на Syncthing</string>
   <string name="retrieving_logs">Извличане на журналите...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Сподели</string>
diff --git a/src/main/res/values-ca-rES/strings.xml b/src/main/res/values-ca-rES/strings.xml
index 1dab6aa0..91bfb972 100644
--- a/src/main/res/values-ca-rES/strings.xml
+++ b/src/main/res/values-ca-rES/strings.xml
@@ -261,11 +261,10 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="create_folder_failed">No s\'ha pogut crear la carpeta</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Registre</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Mostra el registre de l\'Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Mostra el registre de l\'Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Mostra el registre del Syncthing</string>
+  <string name="view_syncthing_log">Mostra el registre del Syncthing</string>
   <string name="retrieving_logs">Obtenint registres...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Comparteix</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 9e204eb6..0fd06809 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -236,11 +236,10 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="create_folder_failed">Vytvoření adresáře selhalo</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Zobrazit log pro Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Zobrazit log pro Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Zobrazit log pro Syncthing</string>
+  <string name="view_syncthing_log">Zobrazit log pro Syncthing</string>
   <string name="retrieving_logs">Získávám logy...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Sdílet</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index d04eafbd..65326b74 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -248,11 +248,10 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="create_folder_failed">Det lykkedes ikke at oprette en ny mappe</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Vis Android Log</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Vis Android Log</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Vis Syncthing Log</string>
+  <string name="view_syncthing_log">Vis Syncthing Log</string>
   <string name="retrieving_logs">Indhenter logs...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Del</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 3b9d4d81..6a4d9f68 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -255,11 +255,10 @@ Bitte melden Sie auftretende Probleme via Github.</string>
   <string name="create_folder_failed">Verzeichniserstellung fehlgeschlagen</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Zeige Android-Log</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Zeige Android-Log</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Zeige Syncthing-Log</string>
+  <string name="view_syncthing_log">Zeige Syncthing-Log</string>
   <string name="retrieving_logs">Rufe Protokoll ab...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Teilen</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 18f470e6..2a09febc 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -261,11 +261,10 @@
   <string name="create_folder_failed">Η δημιουργία φακέλου απέτυχε</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Καταγραφή συμβάντων</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Εμφάνιση καταγραφής Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Εμφάνιση καταγραφής Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Εμφάνιση καταγραφής Syncthing</string>
+  <string name="view_syncthing_log">Εμφάνιση καταγραφής Syncthing</string>
   <string name="retrieving_logs">Ανάκτηση καταγραφών...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Κοινή χρήση</string>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index c76cbdf5..20470ac5 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -208,11 +208,10 @@
   <string name="create_folder_failed">Fallo al crear carpeta</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Registro</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Ver registro de Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Ver registro de Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Ver registro de Syncthing</string>
+  <string name="view_syncthing_log">Ver registro de Syncthing</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Compartir</string>
   <!--ShareActivity-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 598d5abe..0ab59ed0 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -242,11 +242,10 @@
   <string name="create_folder_failed">Error al crear la carpeta</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Registro</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Mostrar registro de Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Mostrar registro de Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Mostrar registro de Syncthing</string>
+  <string name="view_syncthing_log">Mostrar registro de Syncthing</string>
   <string name="retrieving_logs">Recuperando los registros...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Compartir</string>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index d2de8a8e..a775f604 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -243,11 +243,10 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="create_folder_failed">Kansion luominen epäonnistui</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Loki</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Näytä Android loki</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Näytä Android loki</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Näytä Synching loki</string>
+  <string name="view_syncthing_log">Näytä Synching loki</string>
   <string name="retrieving_logs">Noudetaan lokeja...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Jaa</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e4226460..9ed8f645 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -261,11 +261,10 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <string name="create_folder_failed">Échec de création du partage</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Journal</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Voir le journal Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Voir le journal Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Voir le journal Syncthing</string>
+  <string name="view_syncthing_log">Voir le journal Syncthing</string>
   <string name="retrieving_logs">Récupération des journaux....</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Partage</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index ebad683f..430ce3e4 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -269,11 +269,10 @@ Biztosan törölni szeretnéd a Syncthing index adatbázisát?</string>
   <string name="create_folder_failed">Nem sikerült létrehozni a mappát</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Napló</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Android napló megtekintése</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Android napló megtekintése</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Syncthing napló megtekintése</string>
+  <string name="view_syncthing_log">Syncthing napló megtekintése</string>
   <string name="retrieving_logs">Naplók betöltése...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Megosztás</string>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 1d23192a..f0f8ccdb 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -241,11 +241,10 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <string name="create_folder_failed">Gagal membuat folder</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Lihat Log Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Lihat Log Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Lihat Log Syncthing</string>
+  <string name="view_syncthing_log">Lihat Log Syncthing</string>
   <string name="retrieving_logs">Memuat log...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Bagikan</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 64efaaf0..e8cfe420 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -258,11 +258,10 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <string name="create_folder_failed">Impossibile creare la cartella</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Registro</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Mostra Registro di Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Mostra Registro di Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Mostra Registro di Syncthing</string>
+  <string name="view_syncthing_log">Mostra Registro di Syncthing</string>
   <string name="retrieving_logs">Recupero log...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Condividi</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 3e9273e9..42efa799 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -259,11 +259,10 @@
   <string name="create_folder_failed">フォルダーの作成に失敗しました</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">ログ</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Android ログを表示</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Android ログを表示</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Syncthing ログを表示</string>
+  <string name="view_syncthing_log">Syncthing ログを表示</string>
   <string name="retrieving_logs">ログの取得中…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">共有</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index c8f87d68..25a69883 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -259,11 +259,10 @@
   <string name="create_folder_failed">폴더를 생성할 수 없었습니다</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">로그</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Android 로그 보기</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Android 로그 보기</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Syncthing 로그 보기</string>
+  <string name="view_syncthing_log">Syncthing 로그 보기</string>
   <string name="retrieving_logs">로그를 받아오는중...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">공유</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 79e1346f..bf4d9738 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -214,11 +214,10 @@
   <string name="create_folder_failed">Feil ved opprettelse av mappe</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Logg</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Vis Android-logg</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Vis Android-logg</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Vis Syncthing-logg</string>
+  <string name="view_syncthing_log">Vis Syncthing-logg</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Del</string>
   <!--ShareActivity-->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index df8ecc7d..6ce71851 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -248,11 +248,10 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="create_folder_failed">Aanmaken van map mislukt</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Bekijk Android-log</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Bekijk Android-log</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Bekijk Syncthing-log</string>
+  <string name="view_syncthing_log">Bekijk Syncthing-log</string>
   <string name="retrieving_logs">Logs worden opgehaald…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Delen</string>
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index ad949b5f..535bde74 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -214,11 +214,10 @@
   <string name="create_folder_failed">Lukkast ikkje med å lage mappe</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Logg</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Vis Android-logg</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Vis Android-logg</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Vis Synchting-logg</string>
+  <string name="view_syncthing_log">Vis Synchting-logg</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Del</string>
   <!--ShareActivity-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 252ebbfa..5e5936b6 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -237,11 +237,10 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <string name="create_folder_failed">Nie udało się utworzyć katalogu</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Dziennik</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Wyświetl dziennik systemu</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Wyświetl dziennik systemu</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Wyświetl dziennik programu</string>
+  <string name="view_syncthing_log">Wyświetl dziennik programu</string>
   <string name="retrieving_logs">Uzyskiwanie dzienników…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Udostępnij</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 194f56c5..1a42a7e4 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -255,11 +255,10 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <string name="create_folder_failed">Falha na criação da pasta</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Log</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Exibir o log do Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Exibir o log do Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Exibir o log do Syncthing</string>
+  <string name="view_syncthing_log">Exibir o log do Syncthing</string>
   <string name="retrieving_logs">Recuperando logs...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Compartilhar</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index bb18d752..ecce9bae 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -235,11 +235,10 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <string name="create_folder_failed">Falhou a criação da pasta</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Registo</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Ver registo do Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Ver registo do Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Ver o registo do Syncthing</string>
+  <string name="view_syncthing_log">Ver o registo do Syncthing</string>
   <string name="retrieving_logs">Obtendo registos...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Partilhar</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 2ccd08e8..eae96e27 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -241,11 +241,10 @@
   <string name="create_folder_failed">Не удалось создать папку</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Лог</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Логи Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Логи Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Логи Syncthing</string>
+  <string name="view_syncthing_log">Логи Syncthing</string>
   <string name="retrieving_logs">Получение логов...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Поделиться</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 60941eaf..634b8f08 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -194,11 +194,10 @@ Naozaj chcete resetovať databázu s indexom súborov?</string>
   <string name="create_folder_failed">Nepodarilo sa vytvoriť adresár</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Záznam</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Zobraziť záznam Androidu</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Zobraziť záznam Androidu</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Zobraziť záznam Syncthing</string>
+  <string name="view_syncthing_log">Zobraziť záznam Syncthing</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Zdielať</string>
   <!--ShareActivity-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index a5afe28b..8a5fcd33 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -260,11 +260,10 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="create_folder_failed">Det gick inte att skapa mapp</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Logg</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Visa Android logg</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Visa Android logg</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Visa Syncthing logg</string>
+  <string name="view_syncthing_log">Visa Syncthing logg</string>
   <string name="retrieving_logs">Hämtar loggar...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Dela</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 05706d72..dcd44926 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -234,11 +234,10 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="create_folder_failed">Klasör oluşturulamadı</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Günlük</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Android Günlüğünü Göster</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Android Günlüğünü Göster</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Syncthing Günlük Kayıtlarını Göster</string>
+  <string name="view_syncthing_log">Syncthing Günlük Kayıtlarını Göster</string>
   <string name="retrieving_logs">Günlükler alınıyor...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Paylaş</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 6646aa38..ef449c17 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -208,11 +208,10 @@
   <string name="create_folder_failed">Tạo thư mục thất bại</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">Lịch sử</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">Xem lịch sử Android</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">Xem lịch sử Android</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Xem lịch sử Syncthing</string>
+  <string name="view_syncthing_log">Xem lịch sử Syncthing</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Chia sẻ</string>
   <!--ShareActivity-->
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index dfaa35e7..56e48d33 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -261,11 +261,10 @@
   <string name="create_folder_failed">新建文件夹失败</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
-  <string name="log_title">日志</string>
-  <!--Title of the "log android" menu button-->
-  <string name="log_android_title">查看 Android 系统日志</string>
+    <!--Title of the "log android" menu button-->
+  <string name="view_android_log">查看 Android 系统日志</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">查看 Syncthing 日志</string>
+  <string name="view_syncthing_log">查看 Syncthing 日志</string>
   <string name="retrieving_logs">正在检索日志…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">日志</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5ae78ce2..f4193473 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -437,14 +437,14 @@ Please report any problems you encounter via Github.</string>
     <!-- LogActivity -->
 
 
-    <!-- Title of the "log" activity -->
-    <string name="log_title">Log</string>
+    <string name="syncthing_log_title">Syncthing Log</string>
+    <string name="android_log_title">Android Log</string>
 
     <!-- Title of the "log android" menu button -->
-    <string name="log_android_title">View Android Log</string>
+    <string name="view_android_log">View Android Log</string>
 
     <!-- Title of the "log Syncthing" menu button -->
-    <string name="log_syncthing_title">View Syncthing Log</string>
+    <string name="view_syncthing_log">View Syncthing Log</string>
 
     <string name="retrieving_logs">Retrieving logs…</string>