diff options
author | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2020-02-07 12:39:47 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-07 12:39:47 +0300 |
commit | 6a9cf4f5f73ce2c6527c25f49b6432316091ce37 (patch) | |
tree | b9c6e2477374c74c31f9f9b07695826f4484ab99 /app/src/main | |
parent | 68ed8c9998b56e0ecc801f42551d5bd5f9c77719 (diff) | |
parent | 0125009abc5b8071b04557b0ee4bdfc89049a80a (diff) |
Merge branch 'master' into 354-password-protection
Diffstat (limited to 'app/src/main')
47 files changed, 574 insertions, 267 deletions
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java index fcac49d5..8c5733ba 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java @@ -236,6 +236,7 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter localAccount = db.getLocalAccountByAccountName(accountName); try { ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(getApplicationContext()); + new NotesListViewItemTouchHelper(ssoAccount, this, this, db, adapter, syncCallBack, this::refreshLists).attachToRecyclerView(listView); synchronize(); } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) { Log.i(TAG, "Tried to select account, but got an " + e.getClass().getSimpleName() + ". Asking for importing an account..."); @@ -534,7 +535,6 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter adapter = new ItemAdapter(this); listView.setAdapter(adapter); listView.setLayoutManager(new LinearLayoutManager(this)); - new NotesListViewItemTouchHelper(ssoAccount, this, this, db, adapter, syncCallBack, this::refreshLists).attachToRecyclerView(listView); } private void refreshLists() { @@ -740,7 +740,8 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter @Override public void onNoteClick(int position, View v) { - if (mActionMode != null) { + boolean hasCheckedItems = adapter.getSelected().size() > 0; + if (hasCheckedItems) { if (!adapter.select(position)) { v.setSelected(false); adapter.deselect(position); @@ -748,23 +749,9 @@ public class NotesListViewActivity extends LockedActivity implements ItemAdapter v.setSelected(true); } int size = adapter.getSelected().size(); - mActionMode.setTitle(getResources().getQuantityString(R.plurals.ab_selected, size, size)); - int checkedItemCount = adapter.getSelected().size(); - boolean hasCheckedItems = checkedItemCount > 0; - - if (hasCheckedItems && mActionMode == null) { - // TODO differ if one or more items are selected - // if (checkedItemCount == 1) { - // mActionMode = startActionMode(new - // SingleSelectedActionModeCallback()); - // } else { - // there are some selected items, start the actionMode - mActionMode = startSupportActionMode(new MultiSelectedActionModeCallback( - this, this, db, mActionMode, adapter, listView, this::refreshLists, getSupportFragmentManager(), searchView - )); - // } - } else if (!hasCheckedItems && mActionMode != null) { - // there no selected items, finish the actionMode + if (size > 0) { + mActionMode.setTitle(getResources().getQuantityString(R.plurals.ab_selected, size, size)); + } else { mActionMode.finish(); } } else { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java index 1798e585..907960c5 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/NoteEditFragment.java @@ -143,6 +143,7 @@ public class NoteEditFragment extends SearchableBaseNoteFragment { textWatcher = new NotesTextWatcher(editContent) { @Override public void afterTextChanged(final Editable s) { + super.afterTextChanged(s); unsavedEdit = true; if (!saveActive) { handler.removeCallbacks(runAutoSave); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/LoginStatus.java b/app/src/main/java/it/niedermann/owncloud/notes/model/LoginStatus.java index 7608590d..a2415324 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/model/LoginStatus.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/LoginStatus.java @@ -10,6 +10,7 @@ public enum LoginStatus { JSON_FAILED(R.string.error_json), PROBLEM_WITH_FILES_APP(R.string.error_files_app), FILES_APP_VERSION_TOO_OLD(R.string.error_files_app_version_too_old), + INSUFFICIENT_STORAGE(R.string.error_insufficient_storage), UNKNOWN_PROBLEM(R.string.error_unknown); @StringRes diff --git a/app/src/main/java/it/niedermann/owncloud/notes/model/SyncResultStatus.java b/app/src/main/java/it/niedermann/owncloud/notes/model/SyncResultStatus.java new file mode 100644 index 00000000..12e5768f --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/model/SyncResultStatus.java @@ -0,0 +1,6 @@ +package it.niedermann.owncloud.notes.model; + +public class SyncResultStatus { + public LoginStatus pullStatus = LoginStatus.OK; + public LoginStatus pushStatus = LoginStatus.OK; +} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java index 6d5c3492..c4371b9a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java @@ -7,12 +7,14 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; +import android.graphics.Typeface; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.AsyncTask; import android.preference.PreferenceManager; import android.util.Log; import android.view.View; +import android.widget.TextView; import android.widget.Toast; import androidx.annotation.NonNull; @@ -47,11 +49,14 @@ import it.niedermann.owncloud.notes.model.DBStatus; import it.niedermann.owncloud.notes.model.ISyncCallback; import it.niedermann.owncloud.notes.model.LocalAccount; import it.niedermann.owncloud.notes.model.LoginStatus; +import it.niedermann.owncloud.notes.model.SyncResultStatus; import it.niedermann.owncloud.notes.util.ExceptionUtil; import it.niedermann.owncloud.notes.util.SSOUtil; import it.niedermann.owncloud.notes.util.ServerResponse; import static android.content.Context.CLIPBOARD_SERVICE; +import static java.net.HttpURLConnection.HTTP_NOT_FOUND; +import static java.net.HttpURLConnection.HTTP_NOT_MODIFIED; /** * Helps to synchronize the Database to the Server. @@ -143,9 +148,9 @@ public class NoteServerSyncHelper { /** * Synchronization is only possible, if there is an active network connection. - * + * <p> * This method respects the user preference "Sync on Wi-Fi only". - * + * <p> * NoteServerSyncHelper observes changes in the network connection. * The current state can be retrieved with this method. * @@ -276,12 +281,12 @@ public class NoteServerSyncHelper { * SyncTask is an AsyncTask which performs the synchronization in a background thread. * Synchronization consists of two parts: pushLocalChanges and pullRemoteChanges. */ - private class SyncTask extends AsyncTask<Void, Void, LoginStatus> { + private class SyncTask extends AsyncTask<Void, Void, SyncResultStatus> { private final LocalAccount localAccount; private final SingleSignOnAccount ssoAccount; private final boolean onlyLocalChanges; - private final Map<String, List<ISyncCallback>> callbacks = new HashMap<>(); - private List<Throwable> exceptions = new ArrayList<>(); + @NonNull private final Map<String, List<ISyncCallback>> callbacks = new HashMap<>(); + @NonNull private List<Throwable> exceptions = new ArrayList<>(); SyncTask(@NonNull LocalAccount localAccount, @NonNull SingleSignOnAccount ssoAccount, boolean onlyLocalChanges) { this.localAccount = localAccount; @@ -306,13 +311,13 @@ public class NoteServerSyncHelper { } @Override - protected LoginStatus doInBackground(Void... voids) { + protected SyncResultStatus doInBackground(Void... voids) { Log.i(TAG, "STARTING SYNCHRONIZATION"); //db.debugPrintFullDB(); - LoginStatus status = LoginStatus.OK; - pushLocalChanges(); + SyncResultStatus status = new SyncResultStatus(); + status.pushStatus = pushLocalChanges(); if (!onlyLocalChanges) { - status = pullRemoteChanges(); + status.pullStatus = pullRemoteChanges(); } //db.debugPrintFullDB(); Log.i(TAG, "SYNCHRONIZATION FINISHED"); @@ -322,55 +327,77 @@ public class NoteServerSyncHelper { /** * Push local changes: for each locally created/edited/deleted Note, use NotesClient in order to push the changed to the server. */ - private void pushLocalChanges() { + private LoginStatus pushLocalChanges() { if (localAccount == null) { - return; + return LoginStatus.NO_NETWORK; } Log.d(TAG, "pushLocalChanges()"); + LoginStatus status = LoginStatus.OK; List<DBNote> notes = db.getLocalModifiedNotes(localAccount.getId()); for (DBNote note : notes) { Log.d(TAG, " Process Local Note: " + note); try { - CloudNote remoteNote = null; + CloudNote remoteNote; switch (note.getStatus()) { case LOCAL_EDITED: Log.v(TAG, " ...create/edit"); - // if note is not new, try to edit it. if (note.getRemoteId() > 0) { - Log.v(TAG, " ...try to edit"); - remoteNote = notesClient.editNote(ssoAccount, note).getNote(); - } - // However, the note may be deleted on the server meanwhile; or was never synchronized -> (re)create - // Please note, thas db.updateNote() realizes an optimistic conflict resolution, which is required for parallel changes of this Note from the UI. - if (remoteNote == null) { - Log.v(TAG, " ...Note does not exist on server -> (re)create"); + Log.v(TAG, " ...Note has remoteId -> try to edit"); + try { + remoteNote = notesClient.editNote(ssoAccount, note).getNote(); + } catch (NextcloudHttpRequestFailedException e) { + if (e.getStatusCode() == HTTP_NOT_FOUND) { + Log.v(TAG, " ...Note does no longer exist on server -> recreate"); + remoteNote = notesClient.createNote(ssoAccount, note).getNote(); + } else { + throw e; + } + } + } else { + Log.v(TAG, " ...Note does not have a remoteId yet -> create"); remoteNote = notesClient.createNote(ssoAccount, note).getNote(); } + // Please note, that db.updateNote() realizes an optimistic conflict resolution, which is required for parallel changes of this Note from the UI. db.updateNote(note.getId(), remoteNote, note); break; case LOCAL_DELETED: if (note.getRemoteId() > 0) { Log.v(TAG, " ...delete (from server and local)"); - notesClient.deleteNote(ssoAccount, note.getRemoteId()); + try { + notesClient.deleteNote(ssoAccount, note.getRemoteId()); + } catch(NextcloudHttpRequestFailedException e) { + if(e.getStatusCode() == HTTP_NOT_FOUND) { + Log.v(TAG, " ...delete (note has already been deleted remotely)"); + } else { + throw e; + } + } } else { - Log.v(TAG, " ...delete (only local, since it was not synchronized)"); + Log.v(TAG, " ...delete (only local, since it has never been synchronized)"); } - // Please note, thas db.deleteNote() realizes an optimistic conflict resolution, which is required for parallel changes of this Note from the UI. + // Please note, that db.deleteNote() realizes an optimistic conflict resolution, which is required for parallel changes of this Note from the UI. db.deleteNote(note.getId(), DBStatus.LOCAL_DELETED); break; default: throw new IllegalStateException("Unknown State of Note: " + note); } } catch (NextcloudHttpRequestFailedException e) { - if (e.getStatusCode() == 304) { + if (e.getStatusCode() == HTTP_NOT_MODIFIED) { Log.d(TAG, "Server returned HTTP Status Code 304 - Not Modified"); + } else if (e.getStatusCode() == 507) { + exceptions.add(e); + Log.d(TAG, "Server returned HTTP Status Code 507 - Insufficient Storage"); + status = LoginStatus.INSUFFICIENT_STORAGE; } else { exceptions.add(e); + status = LoginStatus.JSON_FAILED; } } catch (Exception e) { exceptions.add(e); + status = LoginStatus.UNKNOWN_PROBLEM; } } + return status; } /** @@ -381,7 +408,6 @@ public class NoteServerSyncHelper { return LoginStatus.NO_NETWORK; } Log.d(TAG, "pullRemoteChanges() for account " + localAccount.getAccountName()); - LoginStatus status; try { Map<Long, Long> idMap = db.getIdMap(localAccount.getId()); ServerResponse.NotesResponse response = notesClient.getNotes(ssoAccount, localAccount.getModified(), localAccount.getEtag()); @@ -418,7 +444,7 @@ public class NoteServerSyncHelper { return LoginStatus.OK; } catch (JSONException | NullPointerException e) { exceptions.add(e); - status = LoginStatus.JSON_FAILED; + return LoginStatus.JSON_FAILED; } catch (NextcloudHttpRequestFailedException e) { Log.d(TAG, "Server returned HTTP Status Code " + e.getStatusCode() + " - " + e.getMessage()); if (e.getStatusCode() == 304) { @@ -440,22 +466,27 @@ public class NoteServerSyncHelper { exceptions.add(e); return LoginStatus.UNKNOWN_PROBLEM; } - return status; } @Override - protected void onPostExecute(LoginStatus status) { + protected void onPostExecute(SyncResultStatus status) { super.onPostExecute(status); - if (status != LoginStatus.OK) { - for (Throwable e : exceptions) { - Log.e(TAG, e.getMessage(), e); - } - String statusMessage = context.getApplicationContext().getString(R.string.error_sync, context.getApplicationContext().getString(status.str)); + for (Throwable e : exceptions) { + Log.e(TAG, e.getMessage(), e); + } + if (status.pullStatus != LoginStatus.OK || status.pushStatus != LoginStatus.OK) { + String statusMessage = context.getApplicationContext().getString(R.string.error_sync, context.getApplicationContext().getString( + // Since we can only display one snackbar at a time, let's first fix the pullStatus errors. + status.pushStatus == LoginStatus.OK + ? status.pullStatus.str + : status.pushStatus.str + ) + ); if (context instanceof ViewProvider && context instanceof AppCompatActivity) { Snackbar.make(((ViewProvider) context).getView(), statusMessage, Snackbar.LENGTH_LONG) .setAction(R.string.simple_more, v -> { String debugInfos = ExceptionUtil.getDebugInfos((AppCompatActivity) context, exceptions); - new AlertDialog.Builder(context) + AlertDialog dialog = new AlertDialog.Builder(context) .setTitle(statusMessage) .setMessage(debugInfos) .setPositiveButton(android.R.string.copy, (a, b) -> { @@ -466,8 +497,9 @@ public class NoteServerSyncHelper { a.dismiss(); }) .setNegativeButton(R.string.simple_close, null) - .create() - .show(); + .create(); + dialog.show(); + ((TextView) dialog.findViewById(android.R.id.message)).setTypeface(Typeface.MONOSPACE); }) .show(); } else { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java index 76d2f538..0ccaafa8 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesClient.java @@ -122,12 +122,8 @@ public class NotesClient { return putNote(ssoAccount, note, "notes/" + note.getRemoteId(), METHOD_PUT); } - void deleteNote(SingleSignOnAccount ssoAccount, long noteId) { - try { - this.requestServer(ssoAccount, "notes/" + noteId, METHOD_DELETE, null, null, null); - } catch (Exception e) { - e.printStackTrace(); - } + void deleteNote(SingleSignOnAccount ssoAccount, long noteId) throws Exception { + this.requestServer(ssoAccount, "notes/" + noteId, METHOD_DELETE, null, null, null); } /** diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java index 87227f69..beb6d428 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/MarkDownUtil.java @@ -1,6 +1,7 @@ package it.niedermann.owncloud.notes.util; import android.content.Context; +import android.graphics.Color; import android.text.Spanned; import androidx.core.content.res.ResourcesCompat; @@ -39,6 +40,7 @@ public class MarkDownUtil { .setHeader5RelativeSize(1.1f) .setHeader6RelativeSize(1.05f) .setHorizontalRulesHeight(2) + .setCodeBgColor(darkTheme ? ResourcesCompat.getColor(context.getResources(), R.color.fg_default_high, null) : Color.LTGRAY) .setTheme(darkTheme ? new ThemeSonsOfObsidian() : new ThemeDefault()) .setTodoColor(ResourcesCompat.getColor(context.getResources(), darkTheme ? R.color.widget_fg_dark_theme : R.color.widget_fg_default, null)) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesTextWatcher.java b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesTextWatcher.java index 1d924169..bf2d40b0 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/util/NotesTextWatcher.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/util/NotesTextWatcher.java @@ -1,18 +1,29 @@ package it.niedermann.owncloud.notes.util; +import android.text.Editable; import android.text.TextWatcher; +import android.util.Log; import android.widget.EditText; /** * Implements auto-continuation for checked-lists */ public abstract class NotesTextWatcher implements TextWatcher { + + private static final String TAG = NotesTextWatcher.class.getCanonicalName(); + + private static final String codeBlock = "```"; + private static final String uncheckedMinusCheckbox = "- [ ] "; private static final String uncheckedStarCheckbox = "* [ ] "; private static final String checkedMinusCheckbox = "- [x] "; private static final String checkedStarCheckbox = "* [x] "; private static final int lengthCheckbox = 6; + private boolean resetSelection = false; + private boolean afterTextChangedHandeled = false; + private int resetSelectionTo = -1; + private EditText editText; protected NotesTextWatcher(EditText editText) { @@ -26,21 +37,69 @@ public abstract class NotesTextWatcher implements TextWatcher { @Override public void onTextChanged(CharSequence s, int start, int before, int count) { + // https://github.com/stefan-niedermann/nextcloud-notes/issues/608 if (count == 1 && s.charAt(start) == '\n') { // 'Enter' was pressed - // Find start of line - int startOfLine = start; - while (startOfLine > 0 && s.charAt(startOfLine - 1) != '\n') { - startOfLine--; + autoContinueCheckboxListsOnEnter(s, start, count); + } + // https://github.com/stefan-niedermann/nextcloud-notes/issues/558 + if (s.toString().contains(codeBlock)) { + preventCursorJumpToTopWithinCodeBlock(s, start, count); + } + } + + @Override + public void afterTextChanged(Editable s) { + if (resetSelection && !afterTextChangedHandeled) { + Log.v(TAG, "Resetting selection to " + resetSelectionTo); + afterTextChangedHandeled = true; + setNewText(new StringBuilder(s), resetSelectionTo); + afterTextChangedHandeled = false; + resetSelection = false; + resetSelectionTo = -1; + } + } + + private void autoContinueCheckboxListsOnEnter(CharSequence s, int start, int count) { + // Find start of line + int startOfLine = getStartOfLine(s, start); + String line = s.subSequence(startOfLine, start).toString(); + + if (line.equals(uncheckedMinusCheckbox) || line.equals(uncheckedStarCheckbox)) { + editText.setSelection(startOfLine + 1); + setNewText(new StringBuilder(s).replace(startOfLine, startOfLine + lengthCheckbox + 1, "\n"), startOfLine + 1); + } else if (lineStartsWithCheckbox(line, false)) { + setNewText(new StringBuilder(s).insert(start + count, uncheckedMinusCheckbox), start + lengthCheckbox + 1); + } else if (lineStartsWithCheckbox(line, true)) { + setNewText(new StringBuilder(s).insert(start + count, uncheckedStarCheckbox), start + lengthCheckbox + 1); + } + } + + private static int getStartOfLine(CharSequence s, int start) { + int startOfLine = start; + while (startOfLine > 0 && s.charAt(startOfLine - 1) != '\n') { + startOfLine--; + } + return startOfLine; + } + + private void preventCursorJumpToTopWithinCodeBlock(CharSequence s, int start, int count) { + // Find start of line + int startOfLine = getStartOfLine(s, start); + String line = s.subSequence(startOfLine, start).toString(); + if (line.startsWith(codeBlock)) { + // "start" is the direct sibling of the codeBlock + if (start - startOfLine == codeBlock.length()) { + if (!resetSelection) { + resetSelectionTo = editText.getSelectionEnd(); + resetSelection = true; + Log.v(TAG, "Entered a character directly behind a codeBlock - prepare selection reset to " + resetSelectionTo); + } } - String line = s.subSequence(startOfLine, start).toString(); - - if (line.equals(uncheckedMinusCheckbox) || line.equals(uncheckedStarCheckbox)) { - editText.setSelection(startOfLine + 1); - setNewText(new StringBuilder(s).replace(startOfLine, startOfLine + lengthCheckbox + 1, "\n"), startOfLine + 1); - } else if(lineStartsWithCheckbox(line, false)) { - setNewText(new StringBuilder(s).insert(start + count, uncheckedMinusCheckbox), start + lengthCheckbox + 1); - } else if(lineStartsWithCheckbox(line, true)) { - setNewText(new StringBuilder(s).insert(start + count, uncheckedStarCheckbox), start + lengthCheckbox + 1); + } else if (s.subSequence(startOfLine, start + count).toString().startsWith(codeBlock)) { + if (!resetSelection) { + resetSelectionTo = editText.getSelectionEnd(); + resetSelection = true; + Log.v(TAG, "One completed a ``-codeBlock with the third `-character - prepare selection reset to " + resetSelectionTo); } } } diff --git a/app/src/main/res/drawable/ic_text_format_grey600_24dp.xml b/app/src/main/res/drawable/ic_text_format_grey600_24dp.xml new file mode 100644 index 00000000..6dbd68e2 --- /dev/null +++ b/app/src/main/res/drawable/ic_text_format_grey600_24dp.xml @@ -0,0 +1,5 @@ +<vector android:autoMirrored="true" android:height="24dp" + android:tint="#757575" android:viewportHeight="24.0" + android:viewportWidth="24.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android"> + <path android:fillColor="#FF000000" android:pathData="M5,17v2h14v-2L5,17zM9.5,12.8h5l0.9,2.2h2.1L12.75,4h-1.5L6.5,15h2.1l0.9,-2.2zM12,5.98L13.87,11h-3.74L12,5.98z"/> +</vector> diff --git a/app/src/main/res/layout/item_notes_list_note_item.xml b/app/src/main/res/layout/item_notes_list_note_item.xml index 2c6a0eed..e4b6c8af 100644 --- a/app/src/main/res/layout/item_notes_list_note_item.xml +++ b/app/src/main/res/layout/item_notes_list_note_item.xml @@ -128,10 +128,4 @@ </androidx.appcompat.widget.LinearLayoutCompat> </androidx.appcompat.widget.LinearLayoutCompat> - <ImageView - android:layout_width="match_parent" - android:layout_height="1px" - android:contentDescription="@null" - android:src="@color/separator" /> - </FrameLayout> diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index cf0a1bba..ae3578ba 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -37,15 +37,13 @@ <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Font size</string> <string name="settings_wifi_only">Sync only on Wi-Fi</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Synchronisation failed: %1$s</string> - <string name="error_json">is the Notes app activated on the server?</string> - <string name="error_no_network">no network connection</string> + <string name="error_no_network">No network connection</string> <!-- About --> <string name="about_version_title">Version</string> <string name="about_version">You are currently using <strong>%1$s</strong></string> @@ -84,6 +82,7 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Create a new note</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Light</string> <string name="pref_value_font_normal">Normal</string> <string name="simple_error">Error</string> @@ -111,6 +110,13 @@ <item>Large</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 minutes</item> + <item>1 hour</item> + <item>6 hours</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d selected</item> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index f515dd44..9218b5ff 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Tipus de lletra de mida fixa</string> <string name="settings_font_size">Mida de la lletra</string> <string name="settings_wifi_only">Sincronitza només per Wi-Fi</string> + <string name="settings_background_sync">Sincronització en segon pla</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Ha fallat la sincronització: %1$s</string> - <string name="error_json">l\'aplicació Notes està activada al servidor?</string> - <string name="error_no_network">no hi ha connexió a la xarxa</string> - <string name="error_files_app">tens instal·lada l\'aplicació de fitxers?</string> - <string name="error_unknown">S\'ha produït un error desconegut</string> - + <string name="error_no_network">Sense connexió de xarxa</string> <!-- About --> <string name="about_version_title">Versió</string> <string name="about_version">Actualment esteu utilitzant la versió <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Crea una nota nova</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Clar</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Sincronitza per Wi-Fi i dades mòbils</string> + <string name="simple_error">Error</string> <string name="simple_close">Tanca</string> <string name="simple_copy">Copia</string> @@ -136,6 +135,14 @@ <item>Gran</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Apagat</item> + <item>15 minuts</item> + <item>1 hora</item> + <item>6 hores</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d nota seleccionada</item> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index ac228570..3a878c55 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -24,7 +24,7 @@ <string name="action_uncategorized">Nezařazeno</string> <string name="menu_delete">Smazat</string> <string name="menu_change_category">Kategorie</string> - <string name="menu_favorite">Oblíbený</string> + <string name="menu_favorite">Oblíbená</string> <string name="menu_preview">Náhled</string> <string name="menu_share">Sdílet</string> @@ -38,11 +38,12 @@ <string name="listview_updated_last_month">Minulý měsíc</string> <!-- Settings --> - <string name="settings_note_mode">Režim zobrazení pro poznámky</string> + <string name="settings_note_mode">Režim zobrazení poznámek</string> <string name="settings_theme_title">Tmavý motiv vzhledu</string> - <string name="settings_font_title">Písmo se znaky všemi stejně širokými</string> - <string name="settings_font_size">Velikost písma</string> + <string name="settings_font_title">Písmo se všemi znaky stejně širokými</string> + <string name="settings_font_size">Velikost písmen</string> <string name="settings_wifi_only">Synchronizovat pouze přes Wi-Fi</string> + <string name="settings_background_sync">Synchronizace na pozadí</string> <!-- Certificates --> @@ -50,42 +51,38 @@ <!-- Error --> <string name="error_sync">Synchronizace se nezdařila: %1$s</string> - <string name="error_json">je na serveru aktivní aplikace Poznámky?</string> - <string name="error_no_network">žádné síťové spojení</string> - <string name="error_files_app">máte nainstalovanou aplikaci Soubory?</string> - <string name="error_unknown">Vyskytla se neznámá chyba</string> - + <string name="error_no_network">Žádné síťové spojení</string> <!-- About --> <string name="about_version_title">Verze</string> - <string name="about_version">Právě používáte <strong>%1$s</strong></string> - <string name="about_maintainer_title">Tvůrci</string> + <string name="about_version">Nyní používáte <strong>%1$s</strong></string> + <string name="about_maintainer_title">Vývoj spravuje</string> <string name="about_developers_title">Vývojáři</string> <string name="about_translators_title">Překladatelé</string> - <string name="about_translators_transifex">Nextcloud komunita na <a href=\"%1$s\">Transifex</a></string> + <string name="about_translators_transifex">Nextcloud komunita na portálu <a href=\"%1$s\">Transifex</a></string> <string name="about_testers_title">Testeři</string> <string name="about_source_title">Zdrojové kódy</string> <string name="about_source">Tento projekt je hostován na portálu GitHub: <a href=\"%1$s\">%1$s</a></string> <string name="about_issues_title">Problémy</string> <string name="about_issues">Chyby, návrhy na zlepšení a další funkce je možné posílat prostřednictvím systému správy hlášení na portálu GitHub: <a href=\"%1$s\">%1$s</a></string> - <string name="about_translate_title">Překládat</string> - <string name="about_translate">Připojte se k týmu na službě Transifex a pomozte nám přelkládat tuto aplikaci: <a href=\"%1$s\">%1$s</a></string> + <string name="about_translate_title">Překládání</string> + <string name="about_translate">Připojte se k týmu Nextcloud na portálu Transifex a pomozte nám překládat (i) tuto aplikaci: <a href=\"%1$s\">%1$s</a></string> <string name="about_app_license_title">Licence aplikace</string> - <string name="about_app_license">Tato aplikace je licencována pod GNU GENERAL PUBLIC LICENSE v3+.</string> + <string name="about_app_license">Tato aplikace je vydávána pod licencí GNU GENERAL PUBLIC LICENSE v3+.</string> <string name="about_app_license_button">Zobrazit licenci</string> <string name="about_icons_disclaimer_title">Ikony</string> - <string name="about_icons_disclaimer"><p>Původní ikonu vyrobil %1$s</p><p>Všechny ostatní ikony používané touto aplikací byly <a href=\"https://materialdesignicons.com/\">Material Design Icons</a> vytvořeny společností Google Inc. a jsou licencovány pod licencí Apache 2.0.</p></string> + <string name="about_icons_disclaimer"><p>Původní ikonu vytvořil %1$s</p><p>Všechny ostatní ikony používané touto aplikací jsou <a href=\"https://materialdesignicons.com/\">Material Design Icons</a>, vytvořené společností Google Inc. a vydávané pod licencí Apache 2.0.</p></string> <string name="about_credits_tab_title">Zásluhy</string> - <string name="about_contribution_tab_title">Příspěvek</string> + <string name="about_contribution_tab_title">Zapojení se</string> <string name="about_license_tab_title">Licence</string> <!-- Widgets --> <string name="widget_note_list_title">Seznam poznámek</string> <string name="widget_note_list_placeholder">Žádné poznámky</string> - <string name="widget_single_note_title">Jedna poznámka</string> + <string name="widget_single_note_title">Jediná poznámka</string> <string name="widget_single_note_placeholder_tv">Poznámka nenalezena</string> <string name="widget_create_note">Vytvořit poznámku</string> - <string name="widget_not_logged_in">Abyste mohli tento widget používat, přihlaste se do aplikacie Poznámky</string> - <string name="widget_entry_fav_contentDescription">Ikonka hvězdičky označí položku jako oblíbenou</string> + <string name="widget_not_logged_in">Abyste mohli využívat tuto miniaplikaci plochy, přihlaste se do aplikace Poznámky</string> + <string name="widget_entry_fav_contentDescription">Ikonka hvězdičky slouží pro označení položky jako oblíbené</string> <string name="widget_app_launcher_contentDescription">Spustí aplikaci</string> <string name="activity_select_single_note">Vybrat poznámku</string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Vytvořit novou poznámku</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Světlý</string> <string name="pref_value_font_normal">Normální</string> <string name="pref_value_wifi_and_mobile">Synchronizovat přes Wi-Fi a mobilní data</string> + <string name="simple_error">Chyba</string> <string name="simple_close">Zavřít</string> <string name="simple_copy">Zkopírovat</string> @@ -110,12 +109,12 @@ <string name="category_work">Práce</string> <string name="account_already_imported">Účet už byl naimportován</string> <string name="no_notes_yet">Zatím žádné poznámky</string> - <string name="no_notes_yet_description">Pro vytvoření nové poznámky klepněte na + (plus)</string> - <string name="could_not_load_preview_two_digit_numbered_list">Náhled se nedaří načíst. Zkontrolujte zda je zde položka dvoučíslicového seznamu bez obsahu.</string> - <string name="simple_more">Více</string> + <string name="no_notes_yet_description">Novou poznámku vytvoříte klepnutím na + (plus)</string> + <string name="could_not_load_preview_two_digit_numbered_list">Náhled se nedaří načíst. Zkontrolujte zda zde není položka dvouciferného seznamu bez obsahu.</string> + <string name="simple_more">Další</string> <string name="simple_move">Přesunout</string> <string name="error_files_app_version_too_old">Je vámi používaná verze aplikace Soubory aktuální?</string> - <string name="checkbox_could_not_be_toggled">Zaškrtávací kolonku se nepodařilo přepnout.</string> + <string name="checkbox_could_not_be_toggled">Stav zaškrtávací kolonky se nepodařilo přepnout.</string> <string name="bulk_notes_deleted">Smazáno %1$d poznámek</string> <string name="bulk_notes_restored">Obnoveno %1$d poznámek</string> <string name="category_readonly">Pouze pro čtení</string> @@ -136,11 +135,19 @@ <item>Velké</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Vypnuto</item> + <item>15 minut</item> + <item>1 hodina</item> + <item>6 hodin</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> - <item quantity="one">vybrán %d</item> + <item quantity="one">vybrána %d</item> <item quantity="few">vybrány %d</item> <item quantity="many">vybráno %d</item> - <item quantity="other">vybráno %d</item> + <item quantity="other">vybrány %d</item> </plurals> </resources> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index c2e223b0..2165572a 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -2,6 +2,7 @@ <resources> <string name="app_name">Noter</string> + <string name="app_name_long">Nextcloud noter</string> <string name="label_all_notes">Alle noter</string> <string name="label_favorites">Foretrukne</string> <string name="action_create">Ny note</string> @@ -15,6 +16,8 @@ <string name="simple_bold">Fed</string> <string name="simple_link">Link</string> <string name="simple_italic">Kursiv</string> + <string name="action_note_deleted">%1$s blev slettet</string> + <string name="action_note_restored">%1$s blev gendannet</string> <string name="action_undo">Fortryd</string> <string name="action_drawer_open">åbnn navigation</string> <string name="action_drawer_close">Luk navigation</string> @@ -30,13 +33,17 @@ <string name="listview_updated_today">I dag</string> <string name="listview_updated_yesterday">I går</string> <string name="listview_updated_this_week">Denne uge</string> + <string name="listview_updated_last_week">Seneste uge</string> <string name="listview_updated_this_month">Denne måned</string> + <string name="listview_updated_last_month">Seneste måned</string> + <!-- Settings --> <string name="settings_note_mode">Visningstilstand for noter</string> <string name="settings_theme_title">Mørk tema</string> <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Skriftstørrelse</string> <string name="settings_wifi_only">Synk kun på Wi-Fi</string> + <string name="settings_background_sync">Synkronisering i baggrunden</string> <!-- Certificates --> @@ -44,10 +51,6 @@ <!-- Error --> <string name="error_sync">Synkronisering fejlede: %1$s</string> - <string name="error_json">er Notes appen aktiveret på serveren?</string> - <string name="error_no_network">ingen netværksforbindelse</string> - <string name="error_unknown">En ukendt fejl er opstået</string> - <!-- About --> <string name="about_version_title">Version</string> <string name="about_version">Du bruger lige nu <strong>%1$s</strong></string> @@ -86,9 +89,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Opret en ny note</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Lys</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Synk på Wi-Fi og mobil data</string> + <string name="simple_error">Fejl</string> <string name="simple_close">Luk</string> <string name="simple_copy">Kopier</string> @@ -99,11 +104,22 @@ <string name="add_account">Tilføj konto</string> <string name="category_music">Musik</string> <string name="category_movies">Film</string> + <string name="category_movie">Film</string> <string name="category_work">Arbejde</string> + <string name="account_already_imported">Kontoen er allerede importeret</string> <string name="no_notes_yet">Ingen noter endnu</string> + <string name="no_notes_yet_description">Tryk på + for at oprette en ny note</string> + <string name="could_not_load_preview_two_digit_numbered_list">Forhåndsvisningen kunne ikke indlæses. Kontroller om der er et listeemne nummereret med to cifre og uden indhold.</string> <string name="simple_more">Mere</string> <string name="simple_move">Flyt</string> + <string name="error_files_app_version_too_old">Er din fil app opdateret?</string> + <string name="checkbox_could_not_be_toggled">Afrkydsningsfeltet kunne ikke skiftes.</string> + <string name="bulk_notes_deleted">%1$d noter slettet</string> + <string name="bulk_notes_restored">%1$d noter gendannet</string> <string name="category_readonly">Skrivebeskyttet</string> + <string name="no_category">Ingen kategori</string> + <string name="add_category">Tilføj %1$s</string> + <!-- Array: note modes --> <string-array name="noteMode_entries"> <item>Åbn i redigeringstilstand</item> @@ -118,6 +134,14 @@ <item>Stor</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Fra</item> + <item>15 minutter</item> + <item>1 time</item> + <item>6 timer</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d valgt</item> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 1600f355..59a86d89 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Nichtproportionale Schriftart</string> <string name="settings_font_size">Schriftgröße</string> <string name="settings_wifi_only">Nur über WLAN synchronisieren</string> + <string name="settings_background_sync">Hintergrundsynchronisation</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Synchronisation fehlgeschlagen: %1$s</string> - <string name="error_json">ist die Notes-App auf dem Server aktiviert?</string> - <string name="error_no_network">keine Netzwerk-Verbindung</string> - <string name="error_files_app">Haben Sie die Dateien-App installiert?</string> - <string name="error_unknown">Unbekannter Fehler aufgetreten</string> - + <string name="error_no_network">Keine Netzwerkverbindung</string> <!-- About --> <string name="about_version_title">Version</string> <string name="about_version">Sie benutzen gerade <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Neue Notiz erstellen</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Hell</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Über WLAN und mobile Daten synchronisieren</string> + <string name="simple_error">Fehler</string> <string name="simple_close">Schließen</string> <string name="simple_copy">Kopieren</string> @@ -136,6 +135,14 @@ <item>Groß</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Aus</item> + <item>15 Minuten</item> + <item>1 Stunde</item> + <item>6 Stunden</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d ausgewählt</item> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 630300c6..93bd7a31 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Γραμματοσειρά monospace</string> <string name="settings_font_size">Μέγεθος γραμματοσειράς</string> <string name="settings_wifi_only">Συγχρονισμός μόνο σε Wi-Fi</string> + <string name="settings_background_sync">Συγχρονισμός στο παρασκήνιο</string> <!-- Certificates --> @@ -50,11 +51,6 @@ <!-- Error --> <string name="error_sync">Αποτυχία συγχρονισμού: %1$s</string> - <string name="error_json">Είναι η εφαρμογή Σημειώσεις ενεργοποιημένη στον εξυπηρετητή Nextcloud;</string> - <string name="error_no_network">δεν υπάρχει σύνδεση δικτύου</string> - <string name="error_files_app">εγκαταστάθηκε η εφαρμογή αρχείων?</string> - <string name="error_unknown">Ένα άγνωστο σφάλμα προέκυψε</string> - <!-- About --> <string name="about_version_title">Έκδοση</string> <string name="about_version">Προς το παρόν χρησιμοποιείτε <strong>%1$s</strong></string> @@ -93,9 +89,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Δημιουργία νέας σημείωσης</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Φωτεινό</string> <string name="pref_value_font_normal">Κανονικό</string> <string name="pref_value_wifi_and_mobile">Συγχρονισμός μόνο σε Wi-Fi και δεδομένα κινητού</string> + <string name="simple_error">Σφάλμα</string> <string name="simple_close">Κλείσιμο</string> <string name="simple_copy">Αντιγραφή</string> @@ -136,6 +134,14 @@ <item>Μεγάλο</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Απενεργοποίηση </item> + <item>15 λεπτά</item> + <item>1 ώρα</item> + <item>6 ώρες</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d επιλέχτηκε</item> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 4ca01bfc..1b7af52a 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -41,17 +41,13 @@ <string name="settings_font_title">Fuente monoespaciada</string> <string name="settings_font_size">Tamaño de fuente</string> <string name="settings_wifi_only">SIncronizar sólo por Wi-Fi</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Falló la sincronización: %1$s</string> - <string name="error_json">¿Se encuentra activiada la aplicación de Notes en el servidor?</string> - <string name="error_no_network">no hay conexión a red</string> - <string name="error_unknown">Se presentó un error desconocido</string> - + <string name="error_no_network">No hay conexión de red</string> <!-- About --> <string name="about_version_title">Versión</string> <string name="about_version">Actualmente usted está usando <strong>%1$s</strong></string> @@ -85,6 +81,7 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Crear una nota nueva</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Claro</string> <string name="pref_value_font_normal">Normal</string> <string name="simple_error">Error</string> @@ -118,6 +115,13 @@ <item>Grande</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 minutos</item> + <item>1 hora</item> + <item>6 horas</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d seleccionado</item> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 22a17137..77c2d968 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Tipo de letra monoespaciado</string> <string name="settings_font_size">Tamaño de fuente</string> <string name="settings_wifi_only">Sincronizar solo sobre Wi-Fi</string> + <string name="settings_background_sync">Sincronización en segundo plano</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Fallo en la sincronización: %1$s</string> - <string name="error_json">¿Está la app de Notas activada en el servidor?</string> - <string name="error_no_network">no hay conexión a la red</string> - <string name="error_files_app">¿Ha instalado los archivos de la aplicación?</string> - <string name="error_unknown">Ha ocurrido un error desconocido</string> - + <string name="error_no_network">Sin conexión de red</string> <!-- About --> <string name="about_version_title">Versión</string> <string name="about_version">Esta actualmente usando <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Crear una nota nueva</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Claro</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Sincronizar sobre Wi-Fi y datos móviles</string> + <string name="simple_error">Error</string> <string name="simple_close">Cerrar</string> <string name="simple_copy">Copiar</string> @@ -136,6 +135,14 @@ <item>Grande</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Off</item> + <item>15 minutos</item> + <item>1 hora</item> + <item>6 horas</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d selecionado</item> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index bb9ea146..e72f23fa 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Zabalera bakarreko letra mota</string> <string name="settings_font_size">Letra tamaina</string> <string name="settings_wifi_only">Sinkronizatu wifi bidez bakarrik</string> + <string name="settings_background_sync">Atzeko planoko sinkronizazioa</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Sinkronizazioa huts egin du: %1$s</string> - <string name="error_json">Oharrak aplikazioa zerbitzariak aktibatuta al dago?</string> - <string name="error_no_network">Ez dago sare-konexiorik</string> - <string name="error_files_app">fitxategien aplikazioa instalatu al duzu?</string> - <string name="error_unknown">Errore ezezagun bat gertatu da</string> - + <string name="error_no_network">Ez dago sare konexiorik</string> <!-- About --> <string name="about_version_title">Bertsioa</string> <string name="about_version"> <strong>%1$s</strong> erabiltzen ari zara</string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Sortu ohar berria</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Argia</string> <string name="pref_value_font_normal">Normala</string> <string name="pref_value_wifi_and_mobile">Sinkronizatu wifi eta datu mugikorrekin</string> + <string name="simple_error">Errorea</string> <string name="simple_close">Itxi</string> <string name="simple_copy">Kopiatu</string> @@ -135,6 +134,14 @@ <item>Handia</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Off</item> + <item>15 minutu</item> + <item>Ordu 1</item> + <item>6 ordu</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d hautatuta</item> diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 10985e02..943f781e 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -17,6 +17,7 @@ <string name="simple_link">Link</string> <string name="simple_italic">Italic</string> <string name="action_undo">برگرداندن</string> + <string name="action_uncategorized">دستهبندی نشده</string> <string name="menu_delete">حذف</string> <string name="menu_change_category">دستهبندی</string> <string name="menu_favorite">برگزیده</string> @@ -25,6 +26,9 @@ <string name="listview_updated_today">Today</string> <string name="listview_updated_yesterday">دیروز</string> + <string name="listview_updated_this_week">این هفته</string> + <string name="listview_updated_last_week">هفته گذشته</string> + <string name="listview_updated_this_month">این ماه</string> <string name="listview_updated_last_month">ماه گذشته</string> <!-- Settings --> @@ -33,12 +37,9 @@ <string name="settings_font_title">فونت Monospace</string> <string name="settings_font_size">اندازهٔ قلم</string> <string name="settings_wifi_only">همگام سازی فقط در Wi-Fi</string> + <string name="settings_background_sync">همگام سازی پس زمینه</string> - <string name="error_json">آیا برنامه یادداشت ها روی سرور فعال می شود؟</string> - <string name="error_no_network">بدون اتصال به شبکه</string> - <string name="error_files_app">آیا برنامه فایل ها را نصب کرده اید؟</string> - <string name="error_unknown">خطایی ناشناخته اتفاق افتاده است</string> - + <string name="error_no_network">هیچ ارتباطی به شبکه موجود نیست</string> <!-- About --> <string name="about_version_title">نسخه</string> <string name="about_maintainer_title">نگهدار</string> @@ -71,9 +72,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">ساختن یادداشت جدید</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">روشن</string> <string name="pref_value_font_normal">معمولی</string> <string name="pref_value_wifi_and_mobile">همگام سازی داده های Wi-Fi و تلفن همراه</string> + <string name="simple_error">خطا</string> <string name="simple_close">بستن</string> <string name="simple_copy">کپی کردن</string> @@ -94,6 +97,8 @@ <string name="simple_move">انتقال</string> <string name="error_files_app_version_too_old">نسخه برنامه فایلهای شما به روز است؟</string> <string name="category_readonly">فقط خواندنی</string> + <string name="add_category">افزودن%1$s</string> + <!-- Array: note modes --> <string-array name="noteMode_entries"> <item>در حالت ویرایش باز کنید</item> @@ -108,4 +113,12 @@ <item>بزرگ</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>خاموش</item> + <item>۱۵ دقیقه</item> + <item>۱ ساعت</item> + <item>۶ ساعت</item> + </string-array> + </resources> diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 2e8f756d..7935434d 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -40,16 +40,13 @@ <string name="settings_font_title">Tasalevyinen fontti</string> <string name="settings_font_size">Fontin koko</string> <string name="settings_wifi_only">Synkronoi vain wifi-yhteydellä</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Synkronointi epäonnistui: %1$s</string> - <string name="error_no_network">ei verkkoyhteyttä</string> - <string name="error_unknown">Tapahtui tuntematon virhe</string> - + <string name="error_no_network">Ei verkkoyhteyttä</string> <!-- About --> <string name="about_version_title">Versio</string> <string name="about_version">Käytössäsi on nyt <strong>%1$s</strong></string> @@ -81,9 +78,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Luo uusi muistiinpano</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Vaalea</string> <string name="pref_value_font_normal">Normaali</string> <string name="pref_value_wifi_and_mobile">Synkronoi wifi- ja mobiilidatayhteydellä</string> + <string name="simple_error">Virhe</string> <string name="simple_close">Sulje</string> <string name="simple_copy">Kopioi</string> @@ -114,6 +113,13 @@ <item>Suuri</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 minuuttia</item> + <item>1 tunti</item> + <item>6 tuntia</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d valittu</item> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 81a7860b..f78bd527 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Texte monospace</string> <string name="settings_font_size">Taille des caractères</string> <string name="settings_wifi_only">Synchroniser uniquement en Wifi</string> + <string name="settings_background_sync">Synchronisation en tâche de fond</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Échec de synchronisation : %1$s</string> - <string name="error_json">Est-ce que l\'application Notes est activée sur le serveur ?</string> - <string name="error_no_network">pas de connexion réseau</string> - <string name="error_files_app">Avez-vous installé l\'appli Fichiers ?</string> - <string name="error_unknown">Une erreur inconnue est survenue</string> - + <string name="error_no_network">Aucune connexion réseau</string> <!-- About --> <string name="about_version_title">Version</string> <string name="about_version">Vous utilisez actuellement la <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Créer une nouvelle note</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Clair</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Synchroniser en Wifi et données mobiles</string> + <string name="simple_error">Erreur</string> <string name="simple_close">Fermer</string> <string name="simple_copy">Copier</string> @@ -136,6 +135,14 @@ <item>Grand</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Éteint</item> + <item>15 minutes</item> + <item>1 heure</item> + <item>6 heures</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d sélectionné</item> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 6c09feb8..430c7a9d 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Letra monoespazada</string> <string name="settings_font_size">Tamaño da letra</string> <string name="settings_wifi_only">Sincronizar só con WiFi</string> + <string name="settings_background_sync">Sincronización do traballo en segundo plano</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Produciuse un fallo na sincronización: %1$s</string> - <string name="error_json">está activada a aplicación «Notes» no servidor?</string> - <string name="error_no_network">sen conexión de rede</string> - <string name="error_files_app">instalou a aplicación de ficheiros?</string> - <string name="error_unknown">Produciuse un erro descoñecido</string> - + <string name="error_no_network">Sen conexión de rede</string> <!-- About --> <string name="about_version_title">Versión</string> <string name="about_version">Agora está a usando <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Crear unha nota nova</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Claro</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Sincronización con WiFi e con datos móbiles</string> + <string name="simple_error">Erro</string> <string name="simple_close">Pechar</string> <string name="simple_copy">Copiar</string> @@ -136,6 +135,14 @@ <item>Grande</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Apagado</item> + <item>15 minutos</item> + <item>1 hora</item> + <item>6 horas</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d seleccionado</item> diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index 19f57929..b5037b3a 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -37,17 +37,13 @@ <string name="settings_font_title">גופן ברוחב אחיד</string> <string name="settings_font_size">גודל גופן</string> <string name="settings_wifi_only">סנכרון רק דרך רשת אלחוטית</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">הסנכרון נכשל: %1$s</string> - <string name="error_json">האם יישומון הפתקים מופעל בשרת?</string> - <string name="error_no_network">אין חיבור לרשת</string> - <string name="error_unknown">אירעה שגיאה בלתי ידועה</string> - + <string name="error_no_network">אין חיבור לאינטרנט</string> <!-- About --> <string name="about_version_title">גרסה</string> <string name="about_version">הניצולת עומדת על <strong>%1$s</strong></string> @@ -86,9 +82,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">יצירת פתק חדש</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">בהיר</string> <string name="pref_value_font_normal">רגיל</string> <string name="pref_value_wifi_and_mobile">עדכון דרך רשת אלחוטית ונתונים סלולריים</string> + <string name="simple_error">שגיאה</string> <string name="simple_close">סגור</string> <string name="simple_copy">העתק</string> @@ -116,6 +114,13 @@ <item>גדול</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 דקות</item> + <item>שעה</item> + <item>6 שעות</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">נבחר %d</item> diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index ca00e3ea..27adf915 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -41,6 +41,7 @@ <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Veličina fonta</string> <string name="settings_wifi_only">Sinkroniziraj samo putem bežične (Wi-Fi) mreže</string> + <string name="settings_background_sync">Pozadinska sinkronizacija</string> <!-- Certificates --> @@ -48,11 +49,7 @@ <!-- Error --> <string name="error_sync">Sinkronizacija nije uspjela: %1$s</string> - <string name="error_json">je li aplikacija Bilješke aktivirana na poslužitelju?</string> - <string name="error_no_network">nema veze s mrežom</string> - <string name="error_files_app">je li instalirana aplikacija za upravljanje datotekama?</string> - <string name="error_unknown">Došlo je do nepoznate pogreške</string> - + <string name="error_no_network">Nema veze s mrežom</string> <!-- About --> <string name="about_version_title">Inačica</string> <string name="about_version">Trenutno se koristite <strong>%1$s</strong></string> @@ -91,9 +88,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Stvori novu bilješku</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Svijetlo</string> <string name="pref_value_font_normal">Normalno</string> <string name="pref_value_wifi_and_mobile">Sinkronizacija putem bežičnih (Wi-Fi) i mobilnih podataka</string> + <string name="simple_error">Pogreška</string> <string name="simple_close">Zatvorite</string> <string name="simple_copy">Kopirajte</string> @@ -130,6 +129,14 @@ <item>Veliki</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Isključeno</item> + <item>15 minuta</item> + <item>1 sat</item> + <item>6 sati</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">Odabrano je %d</item> diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index 3e27651f..7679e9ac 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -39,17 +39,13 @@ <string name="settings_theme_title">Sötét téma</string> <string name="settings_font_size">Betű méret</string> <string name="settings_wifi_only">Szinkronizáció csak Wifin keresztül</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">sikertelen szinkronizálás: %1$s</string> - <string name="error_json">be van kapcsolva a Jegyzetek app a szerveren?</string> <string name="error_no_network">Nincs hálózati kapcsolat</string> - <string name="error_unknown">Ismeretlen hiba történt</string> - <!-- About --> <string name="about_version_title">Verzió</string> <string name="about_version">Jelenleg ezt használod: <strong>%1$s</strong></string> @@ -88,9 +84,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Új jegyzet létrehozása</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Világos</string> <string name="pref_value_font_normal">Normál</string> <string name="pref_value_wifi_and_mobile">Szinkronizálás Wi-Fin és mobil adatkapcsolaton</string> + <string name="simple_error">Hiba</string> <string name="simple_close">Bezár</string> <string name="simple_copy">Másolás</string> @@ -119,6 +117,13 @@ <item>Nagy</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 perc</item> + <item>1 óra</item> + <item>6 óra</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d kiválasztva</item> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index cce73a78..0691a1e8 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -37,17 +37,13 @@ <string name="settings_font_title">Jafnbreitt letur</string> <string name="settings_font_size">Leturstærð</string> <string name="settings_wifi_only">Aðeins samstilla á WiFi-neti</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Samstilling mistókst: %1$s</string> - <string name="error_json">er minnispunktaforritið virkt á þjóninum?</string> - <string name="error_no_network">engin nettenging</string> - <string name="error_unknown">Óþekkt villa kom upp</string> - + <string name="error_no_network">Engin nettenging</string> <!-- About --> <string name="about_version_title">Útgáfa</string> <string name="about_version">Þú ert núna að nota <strong>%1$s</strong></string> @@ -86,9 +82,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Búa til nýjan minnispunkt</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Ljóst</string> <string name="pref_value_font_normal">Venjulegt</string> <string name="pref_value_wifi_and_mobile">Samstilla á WiFi-neti og farsímatengingu</string> + <string name="simple_error">Villa</string> <string name="simple_close">Loka</string> <string name="simple_copy">Afrita</string> @@ -120,6 +118,14 @@ <item>Stórt</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Slökkt</item> + <item>15 mínútur</item> + <item>1 klukkustund</item> + <item>6 klukkustundir</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d valið</item> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 38cee485..bbb4388a 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Carattere a spaziatura fissa</string> <string name="settings_font_size">Dimensiine carattere</string> <string name="settings_wifi_only">Sincronizza solo con Wi-Fi</string> + <string name="settings_background_sync">Sincronizzazione in background</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Sincronizzazione non riuscita: %1$s</string> - <string name="error_json">L\'applicazione Notes è stata attivata sul server?</string> - <string name="error_no_network">nessuna connessione di rete</string> - <string name="error_files_app">hai installato l\'applicazione File?</string> - <string name="error_unknown">Si è verificato un errore sconosciuto</string> - + <string name="error_no_network">Nessuna connessione di rete</string> <!-- About --> <string name="about_version_title">Versione</string> <string name="about_version">Stai utilizzando attualmente <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Crea una nuova nota</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Chiaro</string> <string name="pref_value_font_normal">Normale</string> <string name="pref_value_wifi_and_mobile">Sincronizza su Wi-FI e dati mobili</string> + <string name="simple_error">Errore</string> <string name="simple_close">Chiudi</string> <string name="simple_copy">Copia</string> @@ -136,6 +135,14 @@ <item>Grande</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Spenta</item> + <item>15 minuti</item> + <item>1 ora</item> + <item>6 ore</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d selezionato</item> diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index bc31755a..1fbc835c 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -41,6 +41,7 @@ <string name="settings_font_title">モノスペースフォント</string> <string name="settings_font_size">フォントサイズ</string> <string name="settings_wifi_only">Wi-Fi接続時のみ同期する</string> + <string name="settings_background_sync">バックグラウンド同期</string> <!-- Certificates --> @@ -48,11 +49,6 @@ <!-- Error --> <string name="error_sync">同期に失敗しました: %1$s</string> - <string name="error_json">ノートアプリはサーバー上で有効になっていますか?</string> - <string name="error_no_network">ネットワーク接続がありません</string> - <string name="error_files_app">ファイルアプリはインストールしましたか?</string> - <string name="error_unknown">不明なエラーが発生しました</string> - <!-- About --> <string name="about_version_title">バージョン</string> <string name="about_version">現在 <strong>%1$s</strong> を使用しています</string> @@ -91,9 +87,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">新しいノートを作成</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">ライト</string> <string name="pref_value_font_normal">ノーマル</string> <string name="pref_value_wifi_and_mobile">Wi-Fiおよびモバイル接続時に同期する</string> + <string name="simple_error">エラー</string> <string name="simple_close">閉じる</string> <string name="simple_copy">コピー</string> @@ -128,6 +126,14 @@ <item>大</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>オフ</item> + <item>15 分</item> + <item>1時間</item> + <item>6 時間</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="other">%d 選択済</item> diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 32e00b6b..c654180f 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Lygiaplotis šriftas</string> <string name="settings_font_size">Šrifto dydis</string> <string name="settings_wifi_only">Sinchronizuoti tik naudojant belaidį (Wi-Fi)</string> + <string name="settings_background_sync">Foninis sinchronizavimas</string> <!-- Certificates --> @@ -50,11 +51,6 @@ <!-- Error --> <string name="error_sync">Sinchronizacija nepavyko: %1$s</string> - <string name="error_json">Ar užrašų programėlė aktyvuota serveryje?</string> - <string name="error_no_network">nėra tinklo ryšio</string> - <string name="error_files_app">ar esate įdiegę failų programėlę?</string> - <string name="error_unknown">Įvyko nežinoma klaida</string> - <!-- About --> <string name="about_version_title">Versija</string> <string name="about_version">Jūs dabar naudojate <strong>%1$s</strong></string> @@ -93,9 +89,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Sukurti naujus užrašus</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Šviesus</string> <string name="pref_value_font_normal">Normalus</string> <string name="pref_value_wifi_and_mobile">Sinchronizuoti naudojant belaidį (Wi-Fi) ir mobiliuosius duomenis</string> + <string name="simple_error">Klaida</string> <string name="simple_close">Užverti</string> <string name="simple_copy">Kopijuoti</string> @@ -136,6 +134,14 @@ <item>Didelis</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Išjungta</item> + <item>15 minučių</item> + <item>1 valanda</item> + <item>6 valandos</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d pasirinkta</item> diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 83ebb663..61ae7d0e 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -41,17 +41,13 @@ <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Skriftstørrelse</string> <string name="settings_wifi_only">Synkroniser kun med WiFi</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Synkronisering mislyktes: %1$s</string> - <string name="error_json">er Notat-appen påslått på serveren?</string> <string name="error_no_network">Ingen nettverkstilkobling</string> - <string name="error_unknown">En ukjent feil oppstod</string> - <!-- About --> <string name="about_version_title">Versjon</string> <string name="about_version">Du bruker <strong>%1$s</strong></string> @@ -90,9 +86,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Opprett et nytt notat</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Lys</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Synkroniser med WiFi og mobil data</string> + <string name="simple_error">Feil</string> <string name="simple_close">Lukk</string> <string name="simple_copy">Kopier</string> @@ -122,6 +120,13 @@ <item>Stor</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>ett kvarter</item> + <item>1 time</item> + <item>6 timer</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d er valgt</item> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 2bcbf281..c01010ad 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -4,10 +4,8 @@ <color name="primary_dark">#286090</color> - <color name="separator">#262626</color> - - <color name="bg_highlighted">#060606</color> - <color name="bg_normal">#222222</color> + <color name="bg_highlighted">#2a2a2a</color> + <color name="bg_normal">#121212</color> <color name="bg_attention">#ff3333</color> <color name="fg_default">#eeeeee</color> <color name="fg_default_selection">#cccccc</color> @@ -16,5 +14,4 @@ <color name="fg_contrast">#000000</color> <color name="category_background">@color/primary</color> - <color name="category_border">@color/primary</color> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 9ce1c13d..3b9142f5 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -44,6 +44,7 @@ <string name="settings_font_title">Monospace lettertype</string> <string name="settings_font_size">Fontgrootte</string> <string name="settings_wifi_only">Sync alleen met Wi-Fi</string> + <string name="settings_background_sync">Achtergrond synchronisatie</string> <!-- Certificates --> @@ -51,11 +52,7 @@ <!-- Error --> <string name="error_sync">Synchronisatie mislukt: %1$s</string> - <string name="error_json">is de Notities app op de server geactiveerd?</string> - <string name="error_no_network">geen netwerkverbinding</string> - <string name="error_files_app">heb je de Bestanden app geïnstalleerd?</string> - <string name="error_unknown">Er trad een onbekende fout op.</string> - + <string name="error_no_network">Geen netwerkverbinding</string> <!-- About --> <string name="about_version_title">Versie</string> <string name="about_version">Je gebruikt nu <strong>%1$s</strong></string> @@ -94,9 +91,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Maak een nieuwe notitie</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Licht</string> <string name="pref_value_font_normal">Normaal</string> <string name="pref_value_wifi_and_mobile">Sync met Wi-Fi en mobiele data</string> + <string name="simple_error">Fout</string> <string name="simple_close">Sluiten</string> <string name="simple_copy">Kopiëren</string> @@ -136,6 +135,14 @@ <item>Groot</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Uit</item> + <item>15 minuten</item> + <item>1 uur</item> + <item>6 uur</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d geselecteerd</item> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index af32e019..abad8dcb 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Czcionka monospace</string> <string name="settings_font_size">Rozmiar czcionki</string> <string name="settings_wifi_only">Synchronizuj tylko przez Wi-Fi</string> + <string name="settings_background_sync">Synchronizacja w tle</string> <!-- Certificates --> @@ -50,11 +51,6 @@ <!-- Error --> <string name="error_sync">Synchronizacja nie powiodła się: %1$s</string> - <string name="error_json">czy aplikacja Notes jest aktywowana na serwerze?</string> - <string name="error_no_network">brak połączenia sieciowego</string> - <string name="error_files_app">czy masz zainstalowaną aplikację plików?</string> - <string name="error_unknown">Wystąpił nieznany błąd</string> - <!-- About --> <string name="about_version_title">Wersja</string> <string name="about_version">Aktualnie używasz <strong>%1$s</strong></string> @@ -93,9 +89,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Utwórz nową notatkę</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Jasny</string> <string name="pref_value_font_normal">Podstawowy</string> <string name="pref_value_wifi_and_mobile">Synchronizacja w sieci Wi-Fi i komórkowej transmisji danych</string> + <string name="simple_error">Błąd</string> <string name="simple_close">Zamknij </string> <string name="simple_copy">Kopiuj</string> @@ -136,6 +134,14 @@ <item>Duża</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Wyłączone</item> + <item>15 minut</item> + <item>1 godzina</item> + <item>6 godzin</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d wybrany</item> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index eb19b584..5c74fa5d 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title"> Fonte monospaçada</string> <string name="settings_font_size">Tamanho da fonte</string> <string name="settings_wifi_only">Sincronizar somente por Wi-Fi</string> + <string name="settings_background_sync">Sincronização em segundo plano</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">A sincronização falhou: %1$s</string> - <string name="error_json">O aplicativo Notes está ativado no servidor?</string> - <string name="error_no_network">não existe conexão de rede</string> - <string name="error_files_app">Você instalou o aplicativo files?</string> - <string name="error_unknown">Um erro desconhecido ocorreu</string> - + <string name="error_no_network">Sem conexão de rede</string> <!-- About --> <string name="about_version_title">Versão</string> <string name="about_version">Você está usando <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Criar uma nova anotação</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Claro</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Sincronizar por Wi-Fi e dados móveis</string> + <string name="simple_error">Erro</string> <string name="simple_close">Fechar</string> <string name="simple_copy">Copiar</string> @@ -136,6 +135,14 @@ <item>Grande</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Desligar</item> + <item>15 minutos</item> + <item>1 hora</item> + <item>6 horas</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d selecionados</item> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5b02f550..d30efd7c 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -37,6 +37,7 @@ <string name="settings_font_title">Моноширинный шрифт</string> <string name="settings_font_size">Размер шрифта</string> <string name="settings_wifi_only">Синхр. только по Wi-Fi</string> + <string name="settings_background_sync">Синхр. в фоновом режиме</string> <!-- Certificates --> @@ -44,10 +45,6 @@ <!-- Error --> <string name="error_sync">Синхронизация не удалась: %1$s</string> - <string name="error_json">Включено ли приложение «Заметки» на сервере?</string> - <string name="error_no_network">нет подключения к сети</string> - <string name="error_unknown">Произошла неизвестная ошибка</string> - <!-- About --> <string name="about_version_title">Версия</string> <string name="about_version">Вы используете <strong>%1$s</strong></string> @@ -86,9 +83,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Создать новую заметку</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Светлая</string> <string name="pref_value_font_normal">Обычный</string> <string name="pref_value_wifi_and_mobile">Синхр. по Wi-Fi и мобильной связи</string> + <string name="simple_error">Ошибка</string> <string name="simple_close">Закрыть</string> <string name="simple_copy">Копировать</string> @@ -121,6 +120,14 @@ <item>Большой</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Отключены</item> + <item>15 минут</item> + <item>1 час</item> + <item>6 часов</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d выбран</item> diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index f69603b7..e41290fb 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -43,18 +43,13 @@ <string name="settings_font_title">Písmo s pevnou šírkou</string> <string name="settings_font_size">Veľkosť písma</string> <string name="settings_wifi_only">Synchronizovať len na Wi-Fi</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Synchronizácia zlyhala: %1$s</string> - <string name="error_json">máte povolenú aplikáciu Poznámky na serveri?</string> - <string name="error_no_network">nie je pripojenie k sieti</string> - <string name="error_files_app">máte nainštalovanú apku Súbory?</string> - <string name="error_unknown">Vyskytla sa neznáma chyba</string> - + <string name="error_no_network">Bez sieťového pripojenia</string> <!-- About --> <string name="about_version_title">Verzia</string> <string name="about_version">Momentálne používate <strong>%1$s</strong></string> @@ -93,9 +88,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Vytvoriť novú poznámku</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Svetlý</string> <string name="pref_value_font_normal">Normálne</string> <string name="pref_value_wifi_and_mobile">Synchronizovať na Wi-Fi a mobilných dátach</string> + <string name="simple_error">Chyba</string> <string name="simple_close">Zatvoriť</string> <string name="simple_copy">Kopírovať</string> @@ -133,6 +130,13 @@ <item>Veľká</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>15 minút</item> + <item>1 hodina</item> + <item>6 hodín</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d vybraný</item> diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index c0899102..d77b27f5 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Pisava enotne širine</string> <string name="settings_font_size">Velikost pisave</string> <string name="settings_wifi_only">Usklajuj le na Wi-Fi</string> + <string name="settings_background_sync"> Usklajevanje v ozadju</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Usklajevanje je spodletelo: %1$s</string> - <string name="error_json">Ali je program Beležka Notes nameščen na strežniku?</string> - <string name="error_no_network">ni omrežne povezave</string> - <string name="error_files_app">Ali je program za upravljanje datotek »files« nameščen?</string> - <string name="error_unknown">Prišlo je do neznane napake!</string> - + <string name="error_no_network">Ni omrežne povezave</string> <!-- About --> <string name="about_version_title">Različica</string> <string name="about_version">Trenutno je v uporabi <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Ustvari novo zabeležko</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Svetla</string> <string name="pref_value_font_normal">Običajno</string> <string name="pref_value_wifi_and_mobile">Usklajuj na Wi-Fi in mobilni povezavi</string> + <string name="simple_error">Napaka</string> <string name="simple_close">Zapri</string> <string name="simple_copy">Kopiraj</string> @@ -136,6 +135,14 @@ <item>Velika</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Onemogočeno</item> + <item>15 minut</item> + <item>1 ura</item> + <item>6 ur</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d izbrana</item> diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index f31b7602..69e69864 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -41,17 +41,13 @@ <string name="settings_font_title">Font fiksne širine</string> <string name="settings_font_size">Veličina fonta</string> <string name="settings_wifi_only">Sinhronizuj samo preko bežične veze</string> - <!-- Certificates --> <!-- Network --> <!-- Error --> <string name="error_sync">Sinhronizacija nije uspela%1$s</string> - <string name="error_json">Da li je aplikacija Beleški aktivirana na serveru?</string> - <string name="error_no_network">nema mrežne veze</string> - <string name="error_unknown">Desila se nepoznata greška</string> - + <string name="error_no_network">Nema mrežne veze</string> <!-- About --> <string name="about_version_title">Verzija</string> <string name="about_version">Trenutno koristite <strong>%1$s</strong></string> @@ -90,9 +86,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Napravi novu belešku</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Svetla</string> <string name="pref_value_font_normal">Normalna</string> <string name="pref_value_wifi_and_mobile">Sinhronizuj i na bežičnoj i na mobilnoj vezi</string> + <string name="simple_error">Greška</string> <string name="simple_close">Zatvori</string> <string name="simple_copy">Kopiraj</string> @@ -126,6 +124,14 @@ <item>Veliki</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Isključena</item> + <item>15 minuta</item> + <item>1 sat</item> + <item>6 sati</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d označena</item> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index ae276031..b24b7952 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Фонт фиксне ширине</string> <string name="settings_font_size">Величина фонта</string> <string name="settings_wifi_only">Синхронизуј само преко бежичне везе</string> + <string name="settings_background_sync">Позадинска синхронизација</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Синхронизација није успела%1$s</string> - <string name="error_json">Да ли је апликација Белешки активирана на серверу?</string> - <string name="error_no_network">нема мрежне везе</string> - <string name="error_files_app">да ли имате инсталирану апликацију за фајлове?</string> - <string name="error_unknown">Десила се непозната грешка</string> - + <string name="error_no_network">Нема мрежне везе</string> <!-- About --> <string name="about_version_title">Верзија</string> <string name="about_version">Тренутно користите <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Направи нову белешку</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Светла</string> <string name="pref_value_font_normal">Нормална</string> <string name="pref_value_wifi_and_mobile">Синхронизуј и на бежичној и на мобилној вези</string> + <string name="simple_error">Грешка</string> <string name="simple_close">Затвори</string> <string name="simple_copy">Копирај</string> @@ -136,6 +135,14 @@ <item>Велики</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Искључена</item> + <item>15 минута</item> + <item>1 сат</item> + <item>6 сати</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d означена</item> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index e32e3580..73fa74f8 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Monospace font</string> <string name="settings_font_size">Teckenstorlek</string> <string name="settings_wifi_only">Synkronisera endast med Wi-Fi</string> + <string name="settings_background_sync">Bakgrundssynkronisering</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">Synkronisering misslyckades: %1$s</string> - <string name="error_json">är anteckningar-appen aktiverad på servern?</string> - <string name="error_no_network">ingen nätverksanslutning</string> - <string name="error_files_app">har du installerat filappen?</string> - <string name="error_unknown">Ett okänt fel uppstod</string> - + <string name="error_no_network">Ingen nätverksanslutning</string> <!-- About --> <string name="about_version_title">Version</string> <string name="about_version">Du använder just nu <strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Skapa en ny anteckning</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Ljus</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Synkronisera med Wi-Fi och mobil data</string> + <string name="simple_error">Fel</string> <string name="simple_close">Stäng</string> <string name="simple_copy">Kopiera</string> @@ -119,6 +118,7 @@ <string name="bulk_notes_deleted">Raderade %1$d anteckningar</string> <string name="bulk_notes_restored">Återställde %1$d anteckningar</string> <string name="category_readonly">Läsbehörighet</string> + <string name="no_category">Ingen kategori</string> <string name="add_category">Lägg till %1$s</string> <!-- Array: note modes --> @@ -135,6 +135,14 @@ <item>Stor</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Av</item> + <item>15 minuter</item> + <item>1 timme</item> + <item>6 timmar</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d vald</item> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index c43d3a25..1d8f7d33 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">Sabit aralıklı yazı tipi</string> <string name="settings_font_size">Yazı boyutu</string> <string name="settings_wifi_only">Yalnız Wi-Fi ile eşitlensin</string> + <string name="settings_background_sync">Arka planda eşitleme</string> <!-- Certificates --> @@ -50,11 +51,6 @@ <!-- Error --> <string name="error_sync">Eşitlenemedi: %1$s</string> - <string name="error_json">Notlar uygulaması sunucu üzerinde etkinleştirilmiş mi?</string> - <string name="error_no_network">ağ bağlantısı yok</string> - <string name="error_files_app">dosyalar uygulamasını kurdunuz mu?</string> - <string name="error_unknown">Bilinmeyen bir sorun çıktı</string> - <!-- About --> <string name="about_version_title">Sürüm</string> <string name="about_version">Şu anda <strong>%1$s</strong> kullanıyorsunuz</string> @@ -93,9 +89,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">Not ekle</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">Açık</string> <string name="pref_value_font_normal">Normal</string> <string name="pref_value_wifi_and_mobile">Wi-Fi ve mobil veri ile eşitlensin</string> + <string name="simple_error">Hata</string> <string name="simple_close">Kapat</string> <string name="simple_copy">Kopyala</string> @@ -136,6 +134,14 @@ <item>Büyük</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>Kapalı</item> + <item>15 dakika</item> + <item>1 saat</item> + <item>6 saat</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="one">%d seçilmiş</item> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 3c5c076e..024afef7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -43,6 +43,7 @@ <string name="settings_font_title">等宽字体</string> <string name="settings_font_size">字体大小</string> <string name="settings_wifi_only">仅在Wi-Fi下同步</string> + <string name="settings_background_sync">后台同步</string> <!-- Certificates --> @@ -50,11 +51,7 @@ <!-- Error --> <string name="error_sync">同步失败:%1$s</string> - <string name="error_json">服务器上的笔记应用是否启用?</string> <string name="error_no_network">没有网络连接</string> - <string name="error_files_app">您是否已安装 文件 应用程序?</string> - <string name="error_unknown">发生了未知错误。</string> - <!-- About --> <string name="about_version_title">版本</string> <string name="about_version">您正在使用<strong>%1$s</strong></string> @@ -93,9 +90,11 @@ <!-- Shortcuts --> <string name="shortcut_create_long">创建新便笺</string> + <!-- These values should not be translateable. They should be migrated at some point. --> <string name="pref_value_theme_light">浅色主题</string> <string name="pref_value_font_normal">普通</string> <string name="pref_value_wifi_and_mobile">在有 Wi-Fi 和移动数据网络时同步</string> + <string name="simple_error">错误</string> <string name="simple_close">关闭</string> <string name="simple_copy">复制</string> @@ -136,6 +135,14 @@ <item>大</item> </string-array> + <!-- Array: background synchronization --> + <string-array name="sync_entries"> + <item>关闭</item> + <item>15 分钟</item> + <item>1 小时</item> + <item>6 小时</item> + </string-array> + <!-- Plurals --> <plurals name="ab_selected"> <item quantity="other">已选择 %d 个</item> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b1298909..61cab6e6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -5,8 +5,6 @@ <color name="primary">#0082C9</color> <color name="primary_dark">#286090</color> - <color name="separator">#fbfbfb</color> - <color name="bg_highlighted">#eee</color> <color name="bg_normal">#ffffff</color> <color name="bg_attention">#d40000</color> @@ -23,7 +21,7 @@ <color name="widget_fg_default">#000000</color> <color name="widget_fg_contrast">#ffffff</color> - <color name="category_background">#ffffff</color> + <color name="category_background">?android:colorBackground</color> <color name="category_border">@color/primary</color> <!-- Dark Theme --> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b353149..f5b9fd98 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,10 +52,11 @@ <!-- Error --> <string name="error_sync">Synchronization failed: %1$s</string> - <string name="error_json">is the Notes app activated on the server?</string> - <string name="error_no_network">no network connection</string> - <string name="error_files_app">do you have installed the files app?</string> - <string name="error_unknown">An unknown error has occurred</string> + <string name="error_json">Is the Notes app activated on the server?</string> + <string name="error_no_network">No network connection</string> + <string name="error_files_app">Do you have installed the files app?</string> + <string name="error_unknown">An unknown error has occurred.</string> + <string name="error_insufficient_storage">Your server storage is full.</string> <!-- Snackbar Actions --> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1ac219b2..a53b12c4 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -6,6 +6,7 @@ <item name="colorPrimaryDark">@color/primary</item> <item name="colorAccent">@color/primary</item> <item name="windowActionModeOverlay">true</item> + <item name="android:colorBackground">@color/bg_normal</item> </style> <style name="toolbarStyle" parent="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> <item name="colorAccent">#fff</item> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 9219480f..1762b30f 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -28,7 +28,7 @@ <SwitchPreference android:defaultValue="@string/pref_value_font_normal" - android:icon="@drawable/ic_text_fields_black_24dp" + android:icon="@drawable/ic_text_format_grey600_24dp" android:key="@string/pref_key_font" android:layout="@layout/item_pref" android:title="@string/settings_font_title" /> |