Merge branch 'master' into weblogin

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "it.niedermann.owncloud.notes"
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 29
+        versionCode 30
-        versionName "0.17.0"
+        versionName "0.18.0"
     }
     buildTypes {
         release {

app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidget.java

@@ -26,6 +26,7 @@ public class NoteListWidget extends AppWidgetProvider {
 
     @Override
     public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {
+        super.onUpdate(context, appWidgetManager, appWidgetIds);
 
         for (int appWidgetId : appWidgetIds) {
             SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(context);
@@ -62,7 +63,7 @@ public class NoteListWidget extends AppWidgetProvider {
                                                                 0, templateIntent,
                                                                 PendingIntent.FLAG_UPDATE_CURRENT);
 
-            if (displayMode == 2) {
+            if (displayMode == NLW_DISPLAY_CATEGORY) {
                 serviceIntent.putExtra(NoteListWidget.WIDGET_CATEGORY_KEY + appWidgetId, category);
             }
             serviceIntent.setData(Uri.parse(serviceIntent.toUri(Intent.URI_INTENT_SCHEME)));
@@ -71,12 +72,12 @@ public class NoteListWidget extends AppWidgetProvider {
             views.setEmptyView(R.id.note_list_widget_lv, R.id.widget_note_list_placeholder_tv);
             appWidgetManager.updateAppWidget(appWidgetId, views);
         }
-
-        super.onUpdate(context, appWidgetManager, appWidgetIds);
     }
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+
         AppWidgetManager awm = AppWidgetManager.getInstance(context);
         int appWidgetIds[] = awm.getAppWidgetIds(new ComponentName(context, NoteListWidget.class));
 
@@ -85,8 +86,6 @@ public class NoteListWidget extends AppWidgetProvider {
                 awm.notifyAppWidgetViewDataChanged(appWidgetId, R.id.note_list_widget_lv);
             }
         }
-
-        super.onReceive(context, intent);
     }
 
     @Override

app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/NoteListWidgetFactory.java

@@ -39,17 +39,16 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
     public void onCreate() {
         db = NoteSQLiteOpenHelper.getInstance(context);
         RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_note_list);
-        AppWidgetManager awm = AppWidgetManager.getInstance(context);
 
         switch (displayMode)
         {
-            case 0:
+            case NoteListWidget.NLW_DISPLAY_ALL:
                 views.setTextViewText(R.id.widget_note_list_title_tv, context.getString(R.string.app_name));
                 break;
-            case 1:
+            case NoteListWidget.NLW_DISPLAY_STARRED:
                 views.setTextViewText(R.id.widget_note_list_title_tv, "Starred");
                 break;
-            case 2:
+            case NoteListWidget.NLW_DISPLAY_CATEGORY:
                 category = sp.getString(NoteListWidget.WIDGET_CATEGORY_KEY + appWidgetId, null);
                 if (category.equals("")) {
                     views.setTextViewText(R.id.widget_note_list_title_tv, context.getString(R.string.action_uncategorized));
@@ -58,8 +57,6 @@ public class NoteListWidgetFactory implements RemoteViewsService.RemoteViewsFact
                 }
                 break;
         }
-
-        awm.updateAppWidget(appWidgetId, views);
     }
 
     @Override

app/src/main/java/it/niedermann/owncloud/notes/android/appwidget/SingleNoteWidgetFactory.java

@@ -36,21 +36,6 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
         db = NoteSQLiteOpenHelper.getInstance(mContext);
     }
 
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    // TODO Set loading view
-    @Override
-    public RemoteViews getLoadingView() {
-        return null;
-    }
-
-    @Override
-    public int getViewTypeCount() {
-        return 1;
-    }
 
     @Override
     public void onDataSetChanged() {
@@ -107,8 +92,25 @@ public class SingleNoteWidgetFactory implements RemoteViewsService.RemoteViewsFa
         return note_content;
     }
 
+
+    // TODO Set loading view
+    @Override
+    public RemoteViews getLoadingView() {
+        return null;
+    }
+
+    @Override
+    public int getViewTypeCount() {
+        return 1;
+    }
+
     @Override
     public long getItemId(int position) {
         return position;
     }
+
+    @Override
+    public boolean hasStableIds() {
+        return true;
+    }
 }

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java

@@ -93,6 +93,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
     @Override
     public void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
+        saveNote(null);
         outState.putSerializable(SAVEDKEY_NOTE, note);
         outState.putSerializable(SAVEDKEY_ORIGINAL_NOTE, originalNote);
     }

app/src/main/java/it/niedermann/owncloud/notes/android/fragment/PreferencesFragment.java

@@ -24,7 +24,7 @@ public class PreferencesFragment extends PreferenceFragment {
         resetTrust.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
             public boolean onPreferenceClick(Preference preference) {
-                CustomCertManager.resetCertificates(getActivity());
+                CustomCertManager.Companion.resetCertificates(getActivity());
                 Toast.makeText(getActivity(), getString(R.string.settings_cert_reset_toast), Toast.LENGTH_SHORT).show();
                 return true;
             }

app/src/main/java/it/niedermann/owncloud/notes/model/ItemAdapter.java

@@ -16,6 +16,8 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import it.niedermann.owncloud.notes.R;
 
+import static android.support.v7.widget.RecyclerView.NO_POSITION;
+
 public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int section_type = 0;
@@ -201,7 +203,10 @@ public class ItemAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
         @Override
         public void onClick(View v) {
-            noteClickListener.onNoteClick(getAdapterPosition(), v);
+            final int adapterPosition = getAdapterPosition();
+            if (adapterPosition != NO_POSITION) {
+                noteClickListener.onNoteClick(adapterPosition, v);
+            }
         }
 
         @Override

app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java

@@ -21,6 +21,7 @@ public class MarkDownUtil {
      */
     public static RxMDConfiguration getMarkDownConfiguration(Context context) {
         return new RxMDConfiguration.Builder(context)
+                .setUnOrderListColor(ResourcesCompat.getColor(context.getResources(), R.color.fg_default, null))
                 .setHeader2RelativeSize(1.35f)
                 .setHeader3RelativeSize(1.25f)
                 .setHeader4RelativeSize(1.15f)

app/src/main/res/drawable/ic_account_circle_grey_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,5c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM12,19.2c-2.5,0 -4.71,-1.28 -6,-3.22 0.03,-1.99 4,-3.08 6,-3.08 1.99,0 5.97,1.09 6,3.08 -1.29,1.94 -3.5,3.22 -6,3.22z"/>
+</vector>

app/src/main/res/drawable/ic_brightness_2_grey_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M10,2c-1.82,0 -3.53,0.5 -5,1.35C7.99,5.08 10,8.3 10,12s-2.01,6.92 -5,8.65C6.47,21.5 8.18,22 10,22c5.52,0 10,-4.48 10,-10S15.52,2 10,2z"/>
+</vector>

app/src/main/res/drawable/ic_https_grey_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>

app/src/main/res/drawable/ic_remove_red_eye_grey_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF757575"
+        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+</vector>

app/src/main/res/layout/widget_entry.xml

@@ -30,7 +30,7 @@
         android:layout_gravity="center_vertical"
         android:gravity="center_vertical"
         android:layout_weight="1"
-        android:textColor="@color/fg_default"
+        android:textColor="@color/black"
         android:lines="1"
         android:ellipsize="end" />
 

app/src/main/res/layout/widget_note_list.xml

@@ -31,7 +31,7 @@
             android:id="@+id/widget_note_list_title_tv"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:textColor="@color/fg_contrast"
+            android:textColor="@color/white"
             android:textStyle="bold"
             android:textSize="18sp"
             android:layout_toRightOf="@id/widget_note_header_icon"

app/src/main/res/layout/widget_single_note_content.xml

@@ -3,4 +3,4 @@
     android:id="@+id/single_note_content_tv"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:textColor="@color/fg_default" />
+    android:textColor="@color/black" />

app/src/main/res/values-b+en+001/strings.xml

@@ -39,8 +39,7 @@
     <string name="listview_updated_earlier">Earlier</string>
 
     <!-- Settings -->
-    <string name="settings_server_settings">Account Settings</string>
+    <string name="settings_server_settings">Account</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server address</string>
     <string name="settings_url_check_description">Shows whether the address can be pinged.</string>
     <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
@@ -50,10 +49,9 @@
     <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
     <string name="settings_submit">Connect</string>
     <string name="settings_submitting">Connecting &#8230;</string>
-    <string name="settings_view_category">View settings</string>
     <string name="settings_note_mode">Display mode for Notes</string>
     <string name="settings_theme_title">Theme</string>
-    <string name="settings_cert_category">Certificates</string>
+    <string name="settings_cert_category">Manage certificates</string>
     <string name="settings_cert_trust_system">Trust system certificates</string>
     <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>
     <string name="settings_cert_trust_system_off">System and user-added CAs won\'t be trusted</string>

app/src/main/res/values-b+es+419/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -32,7 +32,6 @@
     <string name="listview_updated_yesterday">Вчера</string>
     <string name="listview_updated_this_week">Тази седмица</string>
     <string name="listview_updated_this_month">Този месец</string>
-    <string name="settings_server">Сървър</string>
     <string name="settings_url">Адрес на сървъра</string>
     <string name="settings_username">Потребител</string>
     <string name="settings_password">Парола</string>

app/src/main/res/values-ca/strings.xml

@@ -34,7 +34,6 @@
     <string name="listview_updated_this_month">Aquest mes</string>
     <string name="listview_updated_earlier">Aviat</string>
 
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Adreça del servidor</string>
     <string name="settings_url_check_description">Mostra si es pot fer ping a l\\\'adreça</string>
     <string name="settings_url_warn_http">ATENCIÓ: \"http\" és insegur. Si us plau utilitzeu \"https\".</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Nastavení účtu</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Adresa serveru</string>
     <string name="settings_url_check_description">Značí, zda lze adresu pingnout.</string>
     <string name="settings_url_warn_http">POZOR: \"http\" není bezpečné. Prosím použijte \"https\"</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Zobrazí, zda jsou pověření správná.</string>
     <string name="settings_submit">Připojit</string>
     <string name="settings_submitting">Připojování &#8230;</string>
-    <string name="settings_view_category">Nastavení zobrazení</string>
     <string name="settings_note_mode">Režim zobrazení pro poznámky</string>
     <string name="settings_cert_category">Certifikáty</string>
     <string name="settings_cert_trust_system">Důvěřovat systémovým certifikátům</string>

app/src/main/res/values-cs/strings.xml

@@ -29,7 +29,6 @@
     <string name="listview_updated_earlier">Dřívější</string>
 
     <!-- Settings -->
-    <string name="settings_server">Server</string>
     <string name="settings_url">Adresa serveru</string>
     <string name="settings_url_check_description">Ukáže, zdali lze na server provést ping.</string>
     <string name="settings_url_warn_http">POZOR: "http" není bezpečné. Použijte "https".</string>

app/src/main/res/values-da/strings.xml

@@ -35,7 +35,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Kontoindstillinger</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server adresse</string>
     <string name="settings_url_check_description">Viser hvorvidt  adressen kan blive pinget.</string>
     <string name="settings_url_warn_http">Advarsel: \"http\" er ikke sikker, benyt venligst \"https\".</string>
@@ -45,7 +44,6 @@
     <string name="settings_password_check_description">Viser hvorvidt brugeroplysningerne er korrekte.</string>
     <string name="settings_submit">Tilslut</string>
     <string name="settings_submitting">Tilslutter &#8230;</string>
-    <string name="settings_view_category">Vis indstillinger</string>
     <string name="settings_note_mode">Display tilstand for noter</string>
     <string name="settings_cert_category">Certifikater</string>
     <string name="settings_cert_trust_system">Stol på systemcertifikater</string>

app/src/main/res/values-de-rDE/strings.xml

@@ -39,8 +39,7 @@
     <string name="listview_updated_earlier">Früher</string>
 
     <!-- Settings -->
-    <string name="settings_server_settings"> Konto-Einstellungen </string>
+    <string name="settings_server_settings">Konto</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server-Adresse</string>
     <string name="settings_url_check_description">Zeigt an, ob die angegebene Adresse erreichbar ist.</string>
     <string name="settings_url_warn_http">WARNUNG: "http" ist unsicher. Bitte benutzen Sie "https".</string>
@@ -50,10 +49,9 @@
     <string name="settings_password_check_description">Zeigt an, ob die angegebenen Zugangsdaten korrekt sind.</string>
     <string name="settings_submit">Verbinden</string>
     <string name="settings_submitting">Verbindet&#8230;</string>
-    <string name="settings_view_category">Darstellung</string>
     <string name="settings_note_mode">Anzeigemodus für Notizen</string>
     <string name="settings_theme_title">Theme</string>
-    <string name="settings_cert_category">Zertifikate</string>
+    <string name="settings_cert_category">Zertifikate verwalten</string>
     <string name="settings_cert_trust_system">System-Zertifikaten vertrauen</string>
     <string name="settings_cert_trust_system_on">System- und installierten CAs wird vertraut (empfohlen)</string>
     <string name="settings_cert_trust_system_off">System- und installierten CAs wird nicht vertraut</string>

app/src/main/res/values-de/strings.xml

@@ -39,8 +39,7 @@
     <string name="listview_updated_earlier">Früher</string>
 
     <!-- Settings -->
-    <string name="settings_server_settings">Konto-Einstellungen</string>
+    <string name="settings_server_settings">Konto</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server-Adresse</string>
     <string name="settings_url_check_description">Zeigt an, ob die angegebene Adresse erreichbar ist.</string>
     <string name="settings_url_warn_http">WARNUNG: \"http\" ist unsicher. Bitte benutze \"https\".</string>
@@ -50,10 +49,9 @@
     <string name="settings_password_check_description">Zeigt an, ob die angegebenen Zugangsdaten korrekt sind.</string>
     <string name="settings_submit">Verbinden</string>
     <string name="settings_submitting">Verbindet&#8230;</string>
-    <string name="settings_view_category">Darstellung</string>
     <string name="settings_note_mode">Anzeigemodus für Notizen</string>
     <string name="settings_theme_title">Theme</string>
-    <string name="settings_cert_category">Zertifikate</string>
+    <string name="settings_cert_category">Zertifikate verwalten</string>
     <string name="settings_cert_trust_system">System-Zertifikaten vertrauen</string>
     <string name="settings_cert_trust_system_on">System- und installierten CAs wird vertraut (empfohlen)</string>
     <string name="settings_cert_trust_system_off">System- und installierten CAs wird nicht vertraut</string>

app/src/main/res/values-el/strings.xml

@@ -35,7 +35,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Ρυθμίσεις λογαριασμού</string>
-    <string name="settings_server">Διακομιστής</string>
     <string name="settings_url">Διεύθυνση διακομιστή</string>
     <string name="settings_url_warn_http">ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Το \"http\" δεν είναι ασφαλές. Παρακαλούμε χρησιμοποιήστε το \"https\".</string>
     <string name="settings_username">Όνομα χρήστη</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_unchanged">Συνθηματικό (δεν άλλαξε)</string>
     <string name="settings_submit">Σύνδεση</string>
     <string name="settings_submitting">Συνδέεται &#8230;</string>
-    <string name="settings_view_category">Προβολή ρυθμίσεων</string>
     <string name="settings_note_mode">Λειτουργία προβολής σημειώσεων</string>
     <string name="settings_cert_category">Πιστοποιητικά</string>
     <string name="settings_cert_trust_system">Εμπιστοσύνη πιστοποιητικών συστήματος.</string>

app/src/main/res/values-en-rGB/strings.xml

@@ -43,8 +43,7 @@
     <string name="listview_updated_earlier">Earlier</string>
 
     <!-- Settings -->
-    <string name="settings_server_settings">Account Settings</string>
+    <string name="settings_server_settings">Account</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server address</string>
     <string name="settings_url_check_description">Shows whether the address can be pinged.</string>
     <string name="settings_url_warn_http">WARNING: \"http\" is unsafe. Please use \"https\".</string>
@@ -54,11 +53,10 @@
     <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
     <string name="settings_submit">Connect</string>
     <string name="settings_submitting">Connecting &#8230;</string>
-    <string name="settings_view_category">View settings</string>
     <string name="settings_note_mode">Display mode for Notes</string>
     <string name="settings_notification_title">\"Create note\" as notification</string>
     <string name="settings_notification">Enable to show a persistent notification for quickly creating new notes.</string>
-    <string name="settings_cert_category">Certificates</string>
+    <string name="settings_cert_category">Manage certificates</string>
     <string name="settings_cert_trust_system">Trust system certificates</string>
     <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>
     <string name="settings_cert_trust_system_off">System and user-added CAs won\'t be trusted</string>

app/src/main/res/values-es-rAR/strings.xml

@@ -39,7 +39,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones  de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si se puede hacer ping a la dirección</string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Favor de usar \"https\".</string>

app/src/main/res/values-es-rCL/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rCO/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rCR/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rDO/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rEC/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rGT/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Certificados</string>

app/src/main/res/values-es-rHN/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rMX/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Certificados</string>

app/src/main/res/values-es-rNI/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rPA/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rPE/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rPR/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rPY/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rSV/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es-rUY/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configuraciones de la cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección del servidor</string>
     <string name="settings_url_check_description">Muestra si a la dirección se le puede hacer un ping. </string>
     <string name="settings_url_warn_http">ADVERTENCIA: \"http\" no es seguro. Por favor usa \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>

app/src/main/res/values-es/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Ajustes de cuenta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Dirección de servidor</string>
     <string name="settings_url_check_description">Muestra si se puede hacer ping a la dirección.</string>
     <string name="settings_url_warn_http">AVISO: \"http\" es inseguro. Por favor, use \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Muestra si las credenciales son correctas.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando &#8230;</string>
-    <string name="settings_view_category">Ver configuración</string>
     <string name="settings_note_mode">Modo de visualización para Notas</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Certificados</string>

app/src/main/res/values-eu/strings.xml

@@ -34,7 +34,6 @@
     <string name="listview_updated_this_month">Hilabete honetan</string>
     <string name="listview_updated_earlier">Lehenago</string>
 
-    <string name="settings_server">Zerbitzaria</string>
     <string name="settings_url">Zerbitzariaren helbidea</string>
     <string name="settings_url_check_description">Erakusten du ea helbideari ping egin daiteken</string>
     <string name="settings_url_warn_http">ERNE: \"http\" ez da segurua. Mesedez, erabili \"https\".</string>

app/src/main/res/values-fi-rFI/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Tilin asetukset</string>
-    <string name="settings_server">Palvelin</string>
     <string name="settings_url">Palvelimen osoite</string>
     <string name="settings_url_warn_http">VAROITUS: \"http\" on suojaamaton. Käytä \"https\"-yhteyttä.</string>
     <string name="settings_username">Käyttäjätunnus</string>

app/src/main/res/values-fr/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Paramètres du compte</string>
-    <string name="settings_server">Serveur</string>
     <string name="settings_url">Adresse du serveur</string>
     <string name="settings_url_check_description">Visible si l\'adresse répond aux pings.</string>
     <string name="settings_url_warn_http">ATTENTION : "http" n\'est pas sécurisé. Veuillez utiliser "https".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Visible si les informations d\'identification sont correctes.</string>
     <string name="settings_submit">Se connecter</string>
     <string name="settings_submitting">Connexion en cours&#8230;</string>
-    <string name="settings_view_category">Voir les paramètres</string>
     <string name="settings_note_mode">Mode d\'affichage pour les notes</string>
     <string name="settings_theme_title">Thème</string>
     <string name="settings_cert_category">Certificats</string>

app/src/main/res/values-gl/strings.xml

@@ -39,7 +39,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Axustes da Conta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Enderezo do servidor</string>
     <string name="settings_url_check_description">Amosa se pódeselle facer ping ao enderezo.</string>
     <string name="settings_url_warn_http">AVISO: «http» non é seguro. Por favor empregue «https».</string>

app/src/main/res/values-hu-rHU/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Fiók beállítások</string>
-    <string name="settings_server">Kiszolgáló</string>
     <string name="settings_url">A szerver címe</string>
     <string name="settings_url_check_description">Mutatja, hogy cím pingelhető-e.</string>
     <string name="settings_url_warn_http">Figyelem: a \"http\" biztonságtalan. Kérjük használj \"https\"-t.</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Mutatja ha a hitelesítőadatok helyesek.</string>
     <string name="settings_submit">Kapcsolódás</string>
     <string name="settings_submitting">Kapcsolódás &#8230;</string>
-    <string name="settings_view_category">Beállítások megtekintése</string>
     <string name="settings_note_mode">Jegyzetmegjelenítési módok</string>
     <string name="settings_theme_title">Téma</string>
     <string name="settings_cert_category">Tanúsítványok</string>

app/src/main/res/values-hy/strings.xml

@@ -29,7 +29,6 @@
     <string name="listview_updated_earlier">ավելի վաղ</string>
 
     <!-- Settings -->
-    <string name="settings_server">սերվեր</string>
     <string name="settings_url">սերվերի հասցեն</string>
     <string name="settings_url_check_description">ցույց է տալիս, որ տրված հասցեն հասանելի է</string>
     <string name="settings_url_warn_http">ՈՒՇԱԴՐՈՒԹՅՈՒՆ: "http" պարունակում է վտանգ. առաջարկում ենք օգտագործել "https".</string>

app/src/main/res/values-id/strings.xml

@@ -34,7 +34,6 @@
     <string name="listview_updated_this_month">Bulan ini</string>
     <string name="listview_updated_earlier">Terdahulu</string>
 
-    <string name="settings_server">Peladen</string>
     <string name="settings_url">Alamat peladen</string>
     <string name="settings_url_check_description">Tampilkan jika alamat dapat diping.</string>
     <string name="settings_url_warn_http">PERHATIAN: \"http\" tidak aman. Harap gunakan \"https\".</string>

app/src/main/res/values-is/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Stillingar aðgangs</string>
-    <string name="settings_server">Þjónn</string>
     <string name="settings_url">Vistfang þjóns</string>
     <string name="settings_url_check_description">Sýnir hvort hægt sé að ná sambandi (ping) við vistfangið.</string>
     <string name="settings_url_warn_http">AÐVÖRUN: \"http\" er óöruggt. Endilega nota \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Sýnir hvort auðkenni séu rétt.</string>
     <string name="settings_submit">Tengjast</string>
     <string name="settings_submitting">Tengist &#8230;</string>
-    <string name="settings_view_category">Skoða stillingar</string>
     <string name="settings_note_mode">Birtingarhamur minnispunkta</string>
     <string name="settings_theme_title">Þema</string>
     <string name="settings_cert_category">Skilríki</string>

app/src/main/res/values-it/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Impostazioni account</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Indirizzo del server</string>
     <string name="settings_url_check_description">Mostra se l\'indirizzo può rispondere al ping.</string>
     <string name="settings_url_warn_http">AVVISO: \"http\" non è sicuro. Utlizza \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Mostra se le credenziali sono corrette.</string>
     <string name="settings_submit">Connetti</string>
     <string name="settings_submitting">Connessione a &#8230;</string>
-    <string name="settings_view_category">impostazioni di visualizzazione</string>
     <string name="settings_note_mode">Modalità  di visualizzazione delle note</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Certificati</string>

app/src/main/res/values-ja-rJP/strings.xml

@@ -37,7 +37,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">アカウント設定</string>
-    <string name="settings_server">サーバー</string>
     <string name="settings_url">サーバーアドレス</string>
     <string name="settings_url_warn_http">警告: \"http\" は安全ではありません。 \"https\" を使用してください。</string>
     <string name="settings_username">ユーザー名</string>

app/src/main/res/values-ka-rGE/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">ანგარიშის პარამეტრები</string>
-    <string name="settings_server">სერვერი</string>
     <string name="settings_url">სერვერის მისამართი</string>
     <string name="settings_url_check_description">აჩვენებს იპინგება თუ არა მისამართი</string>
     <string name="settings_url_warn_http">გაფრთხილება: \"http\" არაა უსაფრთხო. გამოიყენეთ \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">აცვენებს უფლებამოსილებების სისწორეს</string>
     <string name="settings_submit">დაკავშირება</string>
     <string name="settings_submitting">ხდება დაკავშირება &#8230;</string>
-    <string name="settings_view_category">პარამეტრების ჩვენება</string>
     <string name="settings_note_mode">ჩანაწერების ჩვენების რეჟიმი</string>
     <string name="settings_cert_category">სერტიფიკატები</string>
     <string name="settings_cert_trust_system">ენდეთ სისტემის სერტიფიკატებს</string>

app/src/main/res/values-ko/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">계정 설정</string>
-    <string name="settings_server">서버</string>
     <string name="settings_url">서버 주소</string>
     <string name="settings_url_check_description">지정한 주소에 핑을 보낼 수 있는지 표시합니다.</string>
     <string name="settings_url_warn_http">경고: "http"는 안전하지 않습니다. "https"를 사용하십시오.</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">인증 정보가 올바른지 표시합니다.</string>
     <string name="settings_submit">연결</string>
     <string name="settings_submitting">연결 중&#8230;</string>
-    <string name="settings_view_category">보기 설정</string>
     <string name="settings_note_mode">메모 표시 모드</string>
     <string name="settings_cert_category">인증서</string>
     <string name="settings_cert_trust_system">시스템 인증서 신뢰</string>

app/src/main/res/values-lt-rLT/strings.xml

@@ -35,7 +35,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Paskyros nustatymai</string>
-    <string name="settings_server">Serveris</string>
     <string name="settings_url">Serverio adresas</string>
     <string name="settings_url_check_description">Parodo, ar adresas yra pasiekiamas.</string>
     <string name="settings_url_warn_http">ĮSPĖJIMAS: \"http\" protokolas yra nesaugus. Prašome naudoti \"https\".</string>
@@ -45,7 +44,6 @@
     <string name="settings_password_check_description">Parodo, ar teisingi prisijungimo duomenys</string>
     <string name="settings_submit">Prisijungti</string>
     <string name="settings_submitting">Jungiamasi &#8230;</string>
-    <string name="settings_view_category">Žiūrėti nustatymus</string>
     <string name="settings_note_mode">Pastabų atvaizdavimas</string>
     <string name="settings_cert_category">Sertifikatai</string>
     <string name="settings_cert_trust_system">Pasitikėti sistemos sertifikatais</string>

app/src/main/res/values-lv/strings.xml

@@ -36,7 +36,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Konta iestatījumi</string>
-    <string name="settings_server">Serveris</string>
     <string name="settings_url">Servera adrese</string>
     <string name="settings_url_check_description">Parāda, ja adresi var nopingot.</string>
     <string name="settings_url_warn_http">BRĪDINĀJUMS: \"http\" ir nedrošs, lietojiet \"https\" !!!</string>

app/src/main/res/values-nb-rNO/strings.xml

@@ -38,7 +38,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Kontoinnstillinger</string>
-    <string name="settings_server">Tjener</string>
     <string name="settings_url">Tjeneradresse</string>
     <string name="settings_url_check_description">Viser hvorvidt adressen kan pinges.</string>
     <string name="settings_url_warn_http">ADVARSEL: \"http\" er usikker. Bruk \"https\".</string>
@@ -48,7 +47,6 @@
     <string name="settings_password_check_description">Viser hvorvidt påloggingsdetaljene er korrekte.</string>
     <string name="settings_submit">Koble til</string>
     <string name="settings_submitting">Kobler &#8230;</string>
-    <string name="settings_view_category">Vis innstillinger</string>
     <string name="settings_note_mode">Visningsmodus for Notater</string>
     <string name="settings_cert_category">Sertifikater</string>
     <string name="settings_cert_trust_system">Stol på systemets sertifikater</string>

app/src/main/res/values-nl/strings.xml

@@ -41,7 +41,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Account instellingen</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Serveradres</string>
     <string name="settings_url_check_description">Toont of het adres gepingt kan worden.</string>
     <string name="settings_url_warn_http">WAARSCHUWING: \"http\" is niet veilig. Gebruik \"https\".</string>
@@ -51,7 +50,6 @@
     <string name="settings_password_check_description">Toont of de login-gegevens correct zijn.</string>
     <string name="settings_submit">Verbinden</string>
     <string name="settings_submitting">Verbinden&#160;&#8230;</string>
-    <string name="settings_view_category">Bekijk instellingen</string>
     <string name="settings_note_mode">Laat modus zien voor notities</string>
     <string name="settings_theme_title">Thema</string>
     <string name="settings_cert_category">Certificaten</string>

app/src/main/res/values-pl/strings.xml

@@ -35,7 +35,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Ustawienia Konta</string>
-    <string name="settings_server">Serwer</string>
     <string name="settings_url">Adres serwera</string>
     <string name="settings_url_check_description">Pokazuje czy adres może być pingowany.</string>
     <string name="settings_url_warn_http">OSTRZEŻENIE: \"http\" nie jest bezpieczne. Proszę użyć \"https\".</string>
@@ -45,7 +44,6 @@
     <string name="settings_password_check_description">Wyświetla czy poświadczenia są poprawne.</string>
     <string name="settings_submit">Połącz</string>
     <string name="settings_submitting">Łączenie &#8230;</string>
-    <string name="settings_view_category">Przeglądaj ustawienia</string>
     <string name="settings_note_mode">Wyświetl tryb dla Notatek</string>
     <string name="settings_cert_category">Certyfikaty</string>
     <string name="settings_cert_trust_system">Ufaj systemowym certyfikatom</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Configurações da Conta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Endereço do servidor</string>
     <string name="settings_url_check_description">Mostra se o endereço pode ser alcançado.</string>
     <string name="settings_url_warn_http">AVISO: \"http\" é inseguro. Utilize \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Mostra se a senha está correta.</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">Conectando&#8230;</string>
-    <string name="settings_view_category">Ver configurações</string>
     <string name="settings_note_mode">Mostra os modos para Anotações</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Certificados</string>

app/src/main/res/values-pt-rPT/strings.xml

@@ -26,7 +26,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Definições da conta</string>
-    <string name="settings_server">Servidor</string>
     <string name="settings_url">Endereço do servidor</string>
     <string name="settings_url_warn_http">AVISO: "http" é inseguro. Por favor use "https".</string>
     <string name="settings_username">Nome de utilizador</string>
@@ -34,7 +33,6 @@
     <string name="settings_password_unchanged">Palavra-passe (não alterada)</string>
     <string name="settings_submit">Conectar</string>
     <string name="settings_submitting">A conectar &#8230;</string>
-    <string name="settings_view_category">Definições de visualização</string>
     <string name="settings_cert_category">Certificados</string>
     <string name="settings_cert_trust_system">Confiar nos certificados do sistema</string>
     <string name="settings_cert_trust_system_on">As ACs do sistema e adicionadas pelo utilizador serão confiadas (recomendado)</string>

app/src/main/res/values-ro/strings.xml

@@ -34,7 +34,6 @@
     <string name="listview_updated_this_month">Luna asta</string>
     <string name="listview_updated_earlier">Anterior</string>
 
-    <string name="settings_server">Server</string>
     <string name="settings_url">Adresa serverului</string>
     <string name="settings_url_check_description">Arată dacă se poate face \'ping\' la adresă.</string>
     <string name="settings_url_warn_http">ATENȚIE: \"http\" este nesigur. Vă rugăm utilizați \"https\".</string>

app/src/main/res/values-ru/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Настройки аккаунта</string>
-    <string name="settings_server">Сервер</string>
     <string name="settings_url">Адрес сервера</string>
     <string name="settings_url_check_description"> Показывает доступность адреса.</string>
     <string name="settings_url_warn_http">ВНИМАНИЕ: использование «http» небезопасно. Используйте «https».</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Показывает, верно ли указаны учётные данные.</string>
     <string name="settings_submit">Соединить</string>
     <string name="settings_submitting">Соединение …</string>
-    <string name="settings_view_category">Просмотр настроек</string>
     <string name="settings_note_mode">Режим показа заметок</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_cert_category">Сертификаты</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Nastavenia účtu</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Adresa servera</string>
     <string name="settings_url_check_description">Zobrazuje či môže byť adresa pingnutá.</string>
     <string name="settings_url_warn_http">VAROVANIE: \"http\" nie je bezpečné. Použite prosím \"https\".</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Zobrazuje či sú platné overenia.</string>
     <string name="settings_submit">Pripojiť</string>
     <string name="settings_submitting">Pripájam &#8230;</string>
-    <string name="settings_view_category">Zobraziť nastavenia</string>
     <string name="settings_note_mode">Režim zobrazovania pre Poznámky</string>
     <string name="settings_cert_category">Certifikáty</string>
     <string name="settings_cert_trust_system">Dôverovať systémovým certifikátom</string>

app/src/main/res/values-sq/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Konfigurimet e Llogarisë</string>
-    <string name="settings_server">Serveri</string>
     <string name="settings_url">Adresa e serverit</string>
     <string name="settings_url_check_description">Tregon nëse adresa mund të bëhet ping.</string>
     <string name="settings_url_warn_http">PARALAJMËRIM: \"http\" nuk është e sigurt. Ju lutemi përdorni \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Paraqet në qoftë se kredencialet janë të sakta.</string>
     <string name="settings_submit">Lidhu</string>
     <string name="settings_submitting">Duke u lidhur &#8230;</string>
-    <string name="settings_view_category">Shiko opsionet</string>
     <string name="settings_note_mode">Mënyra e paraqitjes për Shënimet</string>
     <string name="settings_cert_category">Çertifikatat</string>
     <string name="settings_cert_trust_system">Beso tek çertifikatat e sistemit</string>

app/src/main/res/values-sr/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Поставке налога</string>
-    <string name="settings_server">Сервер</string>
     <string name="settings_url">Адреса сервера</string>
     <string name="settings_url_check_description">Приказује да ли адреса може да да се пингује.</string>
     <string name="settings_url_warn_http">УПОЗОРЕЊЕ: „http“ протокол није безбедан. Користите „https“.</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Прикзује да ли су акредитиви исправни.</string>
     <string name="settings_submit">Повежи се</string>
     <string name="settings_submitting">Повезујем се&#8230;</string>
-    <string name="settings_view_category">Поставке прегледа</string>
     <string name="settings_note_mode">Начин приказа за Белешке</string>
     <string name="settings_theme_title">Тема</string>
     <string name="settings_cert_category">Сертификати</string>

app/src/main/res/values-sv/strings.xml

@@ -33,7 +33,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Kontoinställningar</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Serveradress</string>
     <string name="settings_url_check_description">Visar om adressen kan pingas.</string>
     <string name="settings_url_warn_http">VARNING: \"http\" är osäkert. Vänligen använd \"https\".</string>
@@ -43,7 +42,6 @@
     <string name="settings_password_check_description">Visar huruvida uppgifterna är korrekta.</string>
     <string name="settings_submit">Anslut</string>
     <string name="settings_submitting">Ansluter &#8230;</string>
-    <string name="settings_view_category">Kolla inställningar</string>
     <string name="settings_note_mode">Visningslägen för Anteckningar</string>
     <string name="settings_cert_category">Certifikat</string>
     <string name="settings_cert_trust_system">Lita på systemcertifikat</string>

app/src/main/res/values-tr/strings.xml

@@ -40,7 +40,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">Hesap Ayarları</string>
-    <string name="settings_server">Sunucu</string>
     <string name="settings_url">Sunucu adresi</string>
     <string name="settings_url_check_description">Adresin pinglenebildiğini gösterir.</string>
     <string name="settings_url_warn_http">UYARI: \"http\" güvenli değildir. Lütfen \"https\" kullanın.</string>
@@ -50,7 +49,6 @@
     <string name="settings_password_check_description">Oturum açma bilgilerinin doğru olduğunu gösterir.</string>
     <string name="settings_submit">Bağlan</string>
     <string name="settings_submitting">Bağlanılıyor &#8230;</string>
-    <string name="settings_view_category">Ayarları görüntüle</string>
     <string name="settings_note_mode">Notların görüntülenme kipi</string>
     <string name="settings_theme_title">Tema</string>
     <string name="settings_cert_category">Sertifikalar</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -34,7 +34,6 @@
 
     <!-- Settings -->
     <string name="settings_server_settings">账户设置</string>
-    <string name="settings_server">服务器</string>
     <string name="settings_url">服务器地址</string>
     <string name="settings_url_warn_http">警告:“http”是不安全的，请使用“https”。</string>
     <string name="settings_username">用户名</string>
@@ -42,7 +41,6 @@
     <string name="settings_password_unchanged">密码(没修改)</string>
     <string name="settings_submit">连接</string>
     <string name="settings_submitting">连接 &#8230;</string>
-    <string name="settings_view_category">预览设置</string>
     <string name="settings_note_mode">笔记的显示模式</string>
     <string name="settings_cert_category">证书</string>
     <string name="settings_cert_trust_system">信任系统证书</string>

app/src/main/res/values/colors.xml

@@ -23,4 +23,7 @@
 
     <color name="category_background">#FFF</color>
     <color name="category_border">@color/primary</color>
+
+    <color name="black">#000000</color>
+    <color name="white">#ffffff</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -39,8 +39,7 @@
     <string name="listview_updated_earlier">Earlier</string>
 
     <!-- Settings -->
-    <string name="settings_server_settings">Account Settings</string>
+    <string name="settings_server_settings">Account</string>
-    <string name="settings_server">Server</string>
     <string name="settings_url">Server address</string>
     <string name="settings_url_check_description">Shows whether the address can be pinged.</string>
     <string name="settings_url_warn_http">WARNING: "http" is unsafe. Please use "https".</string>
@@ -50,10 +49,9 @@
     <string name="settings_password_check_description">Displays whether the credentials are correct.</string>
     <string name="settings_submit">Connect</string>
     <string name="settings_submitting">Connecting &#8230;</string>
-    <string name="settings_view_category">View settings</string>
     <string name="settings_note_mode">Display mode for Notes</string>
     <string name="settings_theme_title">Theme</string>
-    <string name="settings_cert_category">Certificates</string>
+    <string name="settings_cert_category">Manage certificates</string>
     <string name="settings_cert_trust_system">Trust system certificates</string>
     <string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>
     <string name="settings_cert_trust_system_off">System and user-added CAs won\'t be trusted</string>
@@ -132,6 +130,7 @@
     <string name="shortcut_create_long">Create a new note</string>
 
     <!-- Key / Values for preferences -->
+    <string name="pref_key_certs" translatable="false">certificates</string>
     <string name="pref_key_trust_system_certs" translatable="false">trustSystemCerts</string>
     <string name="pref_key_reset_trust" translatable="false">resetTrust</string>
     <string name="pref_key_note_mode" translatable="false">noteMode</string>

app/src/main/res/xml/preferences.xml

@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="@string/settings_server">
-        <Preference android:title="@string/settings_server_settings">
-            <intent
-                android:targetPackage="it.niedermann.owncloud.notes"
-                android:targetClass="it.niedermann.owncloud.notes.android.activity.SettingsActivity" />
-        </Preference>
-    </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_view_category">
+    <Preference
-        <ListPreference
+        android:icon="@drawable/ic_account_circle_grey_24dp"
-            android:defaultValue="@string/pref_value_mode_edit"
+        android:title="@string/settings_server_settings">
-            android:key="@string/pref_key_note_mode"
+        <intent
-            android:title="@string/settings_note_mode"
+            android:targetClass="it.niedermann.owncloud.notes.android.activity.SettingsActivity"
-            android:summary="%s"
+            android:targetPackage="it.niedermann.owncloud.notes" />
-            android:entries="@array/noteMode_entries"
+    </Preference>
-            android:entryValues="@array/noteMode_values" />
 
-        <SwitchPreference
+    <ListPreference
-            android:defaultValue="@string/pref_value_theme_light"
+        android:defaultValue="@string/pref_value_mode_edit"
-            android:key="@string/pref_key_theme"
+        android:entries="@array/noteMode_entries"
-            android:title="@string/settings_theme_title"
+        android:entryValues="@array/noteMode_values"
-            android:summary="%s"
+        android:icon="@drawable/ic_remove_red_eye_grey_24dp"
-            />
+        android:key="@string/pref_key_note_mode"
-    </PreferenceCategory>
+        android:summary="%s"
+        android:title="@string/settings_note_mode" />
 
-    <PreferenceCategory android:title="@string/settings_cert_category">
+    <SwitchPreference
+        android:defaultValue="@string/pref_value_theme_light"
+        android:icon="@drawable/ic_brightness_2_grey_24dp"
+        android:key="@string/pref_key_theme"
+        android:summary="%s"
+        android:title="@string/settings_theme_title" />
+
+    <PreferenceScreen
+        android:key="@string/pref_key_certs"
+        android:persistent="false"
+        android:icon="@drawable/ic_https_grey_24dp"
+        android:title="@string/settings_cert_category">
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="@string/pref_key_trust_system_certs"
@@ -36,6 +40,6 @@
             android:key="@string/pref_key_reset_trust"
             android:title="@string/settings_cert_reset"
             android:summary="@string/settings_cert_reset_summary" />
-    </PreferenceCategory>
+    </PreferenceScreen>
 
 </PreferenceScreen>

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
     dependencies {
         apply plugin: 'maven'
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

cert4android

@@ -1 +1 @@
-Subproject commit 0d12bf44ec340004f1f062d2f6b8a12e13a49385
+Subproject commit 4e52388dccfed8afbfba0dfc509a54025ade300c