diff options
author | Mario Danic <mario@lovelyhq.com> | 2018-04-11 18:27:41 +0300 |
---|---|---|
committer | Niedermann IT-Dienstleistungen <stefan-niedermann@users.noreply.github.com> | 2018-04-11 19:26:31 +0300 |
commit | 79cb33b07ea976e93735fa0b877268cc6532f77b (patch) | |
tree | 3e8c3b213fc752f18fe52acaa0495b900a286210 | |
parent | e664bc3c1751d93e119afa24483ca6f1f89a7c9c (diff) |
Few fixes to strings
Signed-off-by: Mario Danic <mario@lovelyhq.com>
63 files changed, 178 insertions, 183 deletions
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 013b4c77..46dd566f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,7 +58,7 @@ <activity android:name="it.niedermann.owncloud.notes.android.activity.EditNoteActivity" - android:label="@string/menu_edit" + android:label="@string/simple_edit" android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" android:windowSoftInputMode="stateHidden" android:launchMode="singleTask"> @@ -71,7 +71,7 @@ <activity android:name="it.niedermann.owncloud.notes.android.activity.AboutActivity" - android:label="@string/menu_about" + android:label="@string/simple_about" android:parentActivityName="it.niedermann.owncloud.notes.android.activity.NotesListViewActivity" /> <activity 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 3471393c..1ac93f48 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 @@ -328,7 +328,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap private void setupNavigationMenu() { final NavigationAdapter.NavigationItem itemSettings = new NavigationAdapter.NavigationItem("settings", getString(R.string.action_settings), null, R.drawable.ic_settings_grey600_24dp); - final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.action_about), null, R.drawable.ic_information_outline_grey600_24dp); + final NavigationAdapter.NavigationItem itemAbout = new NavigationAdapter.NavigationItem("about", getString(R.string.simple_about), null, R.drawable.ic_information_outline_grey600_24dp); ArrayList<NavigationAdapter.NavigationItem> itemsMenu = new ArrayList<>(); itemsMenu.add(itemSettings); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java index 86a0ec7a..283782a1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/android/fragment/CategoryDialogFragment.java @@ -76,7 +76,7 @@ public class CategoryDialogFragment extends DialogFragment { listener.onCategoryChosen(textCategory.getText().toString()); } }) - .setNegativeButton(R.string.action_edit_cancel, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.simple_cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { // do nothing diff --git a/app/src/main/res/menu/menu_list_context_single.xml b/app/src/main/res/menu/menu_list_context_single.xml index 0b4eba29..7a24a2cb 100644 --- a/app/src/main/res/menu/menu_list_context_single.xml +++ b/app/src/main/res/menu/menu_list_context_single.xml @@ -6,7 +6,7 @@ android:id="@+id/menu_edit" android:icon="@drawable/ic_action_edit" android:orderInCategory="100" - android:title="@string/menu_edit" + android:title="@string/simple_edit" app:showAsAction="ifRoom" /> <item android:id="@+id/menu_share" diff --git a/app/src/main/res/menu/menu_menu_create.xml b/app/src/main/res/menu/menu_menu_create.xml index 18613478..28504b5c 100644 --- a/app/src/main/res/menu/menu_menu_create.xml +++ b/app/src/main/res/menu/menu_menu_create.xml @@ -6,7 +6,7 @@ android:id="@+id/action_create_cancel" android:icon="@drawable/ic_action_cancel" android:orderInCategory="90" - android:title="@string/action_create_cancel" + android:title="@string/simple_cancel" app:showAsAction="ifRoom" /> <item diff --git a/app/src/main/res/menu/menu_note_activity.xml b/app/src/main/res/menu/menu_note_activity.xml index ead056a8..3330f51e 100644 --- a/app/src/main/res/menu/menu_note_activity.xml +++ b/app/src/main/res/menu/menu_note_activity.xml @@ -11,6 +11,6 @@ android:id="@+id/menu_edit" android:icon="@drawable/ic_action_edit_24dp" android:orderInCategory="50" - android:title="@string/menu_edit" + android:title="@string/simple_edit" app:showAsAction="ifRoom" /> </menu>
\ No newline at end of file diff --git a/app/src/main/res/menu/menu_note_fragment.xml b/app/src/main/res/menu/menu_note_fragment.xml index f47ac001..2a00d1f9 100644 --- a/app/src/main/res/menu/menu_note_fragment.xml +++ b/app/src/main/res/menu/menu_note_fragment.xml @@ -23,7 +23,7 @@ android:id="@+id/menu_cancel" android:icon="@drawable/ic_action_cancel" android:orderInCategory="110" - android:title="@string/menu_cancel" + android:title="@string/simple_cancel" app:showAsAction="never" /> <item android:id="@+id/menu_delete" 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 da8a991c..cedb2584 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Settings</string> <string name="action_search">Search</string> <string name="action_create_save">Save</string> - <string name="action_create_cancel">Cancel</string> - <string name="action_edit_editing">Edit</string> + <string name="simple_cancel">Cancel</string> + <string name="simple_edit">Edit</string> <string name="action_edit_save">Save</string> <string name="action_edit_saving">Saving …</string> <string name="action_edit_saved">Saved</string> <string name="action_edit_cancel">Cancel</string> - <string name="action_about">About</string> + <string name="simple_about">About</string> <string name="action_select_note">Select note</string> <string name="action_note_deleted">Note deleted</string> <string name="action_note_restored">Note restored</string> diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-b+es+419/strings.xml +++ b/app/src/main/res/values-b+es+419/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 197c51b3..012c3879 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Нова бележка</string> <string name="action_settings">Настройки</string> <string name="action_create_save">Запис</string> - <string name="action_create_cancel">Отказ</string> - <string name="action_edit_editing">Редакция</string> + <string name="simple_cancel">Отказ</string> + <string name="simple_edit">Редакция</string> <string name="action_edit_save">Запис</string> <string name="action_edit_saving">Записване …</string> <string name="action_edit_saved">Запазено</string> <string name="action_edit_cancel">Отказ</string> - <string name="action_about">Относно</string> + <string name="simple_about">Относно</string> <string name="action_select_note">Избор на бележка</string> <string name="action_note_deleted">Бележката е изтрита</string> <string name="action_note_restored">Бележката е възстановена</string> diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b71cf8bf..204ea6f8 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Nova nota</string> <string name="action_settings">Paràmetres</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancel·lar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancel·lar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardant …</string> <string name="action_edit_saved">Guardat</string> <string name="action_edit_cancel">Cancel·lar</string> - <string name="action_about">Sobre</string> + <string name="simple_about">Sobre</string> <string name="action_select_note">Selecciona una nota</string> <string name="action_note_deleted">S\\\'ha esborrat la nota</string> <string name="action_note_restored">S\\\'ha restaurat la nota</string> diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 77d2ba22..288335bf 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Nastavení</string> <string name="action_search">Hledat</string> <string name="action_create_save">Uložit</string> - <string name="action_create_cancel">Zrušit</string> - <string name="action_edit_editing">Upravit</string> + <string name="simple_cancel">Zrušit</string> + <string name="simple_edit">Upravit</string> <string name="action_edit_save">Uložit</string> <string name="action_edit_saving">Ukládání …</string> <string name="action_edit_saved">Uloženo</string> <string name="action_edit_cancel">Zrušit</string> - <string name="action_about">O aplikaci</string> + <string name="simple_about">O aplikaci</string> <string name="action_select_note">Vybrat poznámku</string> <string name="action_note_deleted">Poznámka byla smazána</string> <string name="action_note_restored">Poznámka byla obnovena</string> diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 821ca01f..f0ae7491 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Nový zápisek</string> <string name="action_settings">Nastavení</string> <string name="action_create_save">Uložit</string> - <string name="action_create_cancel">Storno</string> - <string name="action_edit_editing">Upravit</string> + <string name="simple_cancel">Storno</string> + <string name="simple_edit">Upravit</string> <string name="action_edit_save">Uložit</string> <string name="action_edit_saving">Ukládám …</string> <string name="action_edit_saved">Uloženo</string> <string name="action_edit_cancel">Storno</string> - <string name="action_about">O aplikaci</string> + <string name="simple_about">O aplikaci</string> <string name="action_select_note">Vybrat zápisek</string> <string name="menu_delete">Smazat</string> <string name="menu_copy">Kopírovat</string> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index b5dff63a..b8d3a046 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Indstillinger</string> <string name="action_search">Søg</string> <string name="action_create_save">Gem</string> - <string name="action_create_cancel">Annullér</string> - <string name="action_edit_editing">Redigér</string> + <string name="simple_cancel">Annullér</string> + <string name="simple_edit">Redigér</string> <string name="action_edit_save">Gem</string> <string name="action_edit_saving">Gemmer …</string> <string name="action_edit_saved">Gemt</string> <string name="action_edit_cancel">Annullér</string> - <string name="action_about">Om</string> + <string name="simple_about">Om</string> <string name="action_select_note">Vælg note</string> <string name="action_note_deleted">Note slettet</string> <string name="action_note_restored">Note gendannet</string> diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 826add15..be1a2ee2 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Einstellungen</string> <string name="action_search">Suche</string> <string name="action_create_save">Speichern</string> - <string name="action_create_cancel">Abbrechen</string> - <string name="action_edit_editing">Bearbeiten</string> + <string name="simple_cancel">Abbrechen</string> + <string name="simple_edit">Bearbeiten</string> <string name="action_edit_save">Speichern</string> <string name="action_edit_saving">Speichern…</string> <string name="action_edit_saved">Gespeichert</string> <string name="action_edit_cancel">Abbrechen</string> - <string name="action_about">Über</string> + <string name="simple_about">Über</string> <string name="action_select_note">Notiz auswählen</string> <string name="action_note_deleted">Notiz gelöscht</string> <string name="action_note_restored">Notiz wiederhergestellt</string> diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 5d418a36..30fde4f8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Einstellungen</string> <string name="action_search">Suche</string> <string name="action_create_save">Speichern</string> - <string name="action_create_cancel">Abbrechen</string> - <string name="action_edit_editing">Bearbeiten</string> + <string name="simple_cancel">Abbrechen</string> + <string name="simple_edit">Bearbeiten</string> <string name="action_edit_save">Speichern</string> <string name="action_edit_saving">Speichern…</string> <string name="action_edit_saved">Gespeichert</string> <string name="action_edit_cancel">Abbrechen</string> - <string name="action_about">Über</string> + <string name="simple_about">Über</string> <string name="action_select_note">Notiz auswählen</string> <string name="action_note_deleted">Notiz gelöscht</string> <string name="action_note_restored">Notiz wiederhergestellt</string> diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index a568e0f3..ab59b7bf 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Ρυθμίσεις</string> <string name="action_search">Ψάχνει</string> <string name="action_create_save">Αποθήκευση</string> - <string name="action_create_cancel">Ακύρωση</string> - <string name="action_edit_editing">Επεξεργασία</string> + <string name="simple_cancel">Ακύρωση</string> + <string name="simple_edit">Επεξεργασία</string> <string name="action_edit_save">Αποθήκευση</string> <string name="action_edit_saving">Γίνεται αποθήκευση …</string> <string name="action_edit_saved">Αποθηκεύτηκε</string> <string name="action_edit_cancel">Ακύρωση</string> - <string name="action_about">Περί</string> + <string name="simple_about">Περί</string> <string name="action_select_note">Επιλογή σημείωσης</string> <string name="action_note_deleted">Η σημείωση διαγράφηκε.</string> <string name="action_note_restored">Έγινε επαναφορά της σημείωσης.</string> diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index 3b5a6b49..1632f32b 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Settings</string> <string name="action_search">Search</string> <string name="action_create_save">Save</string> - <string name="action_create_cancel">Cancel</string> - <string name="action_edit_editing">Edit</string> + <string name="simple_cancel">Cancel</string> + <string name="simple_edit">Edit</string> <string name="action_edit_save">Save</string> <string name="action_edit_saving">Saving …</string> <string name="action_edit_saved">Saved</string> <string name="action_edit_cancel">Cancel</string> - <string name="action_about">About</string> + <string name="simple_about">About</string> <string name="action_select_note">Select note</string> <string name="action_note_deleted">Note deleted</string> <string name="action_note_restored">Note restored</string> diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index babb870a..1b1976f7 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Nueva nota</string> <string name="action_settings">Configuraciones</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">La nota ha sido borrada</string> <string name="action_note_restored">La nota ha sido restaurada</string> diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rCO/strings.xml +++ b/app/src/main/res/values-es-rCO/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rCR/strings.xml b/app/src/main/res/values-es-rCR/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rCR/strings.xml +++ b/app/src/main/res/values-es-rCR/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rDO/strings.xml +++ b/app/src/main/res/values-es-rDO/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rEC/strings.xml +++ b/app/src/main/res/values-es-rEC/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rGT/strings.xml b/app/src/main/res/values-es-rGT/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rGT/strings.xml +++ b/app/src/main/res/values-es-rGT/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rHN/strings.xml b/app/src/main/res/values-es-rHN/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rHN/strings.xml +++ b/app/src/main/res/values-es-rHN/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 7c9788c4..2dc32f75 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rNI/strings.xml b/app/src/main/res/values-es-rNI/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rNI/strings.xml +++ b/app/src/main/res/values-es-rNI/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rPA/strings.xml b/app/src/main/res/values-es-rPA/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rPA/strings.xml +++ b/app/src/main/res/values-es-rPA/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rPE/strings.xml b/app/src/main/res/values-es-rPE/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rPE/strings.xml +++ b/app/src/main/res/values-es-rPE/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rPR/strings.xml b/app/src/main/res/values-es-rPR/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rPR/strings.xml +++ b/app/src/main/res/values-es-rPR/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rPY/strings.xml b/app/src/main/res/values-es-rPY/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rPY/strings.xml +++ b/app/src/main/res/values-es-rPY/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rSV/strings.xml b/app/src/main/res/values-es-rSV/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rSV/strings.xml +++ b/app/src/main/res/values-es-rSV/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es-rUY/strings.xml b/app/src/main/res/values-es-rUY/strings.xml index 980002bd..0792552e 100644 --- a/app/src/main/res/values-es-rUY/strings.xml +++ b/app/src/main/res/values-es-rUY/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Configuraciones</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota borrada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 771ee7a8..70c6350b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Ajustes</string> <string name="action_search">Buscar</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">Guardando …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">Nota eliminada</string> <string name="action_note_restored">Nota restaurada</string> diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index fe6bd162..d67e0ce4 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Ohar berria</string> <string name="action_settings">Ezarpenak</string> <string name="action_create_save">Gorde</string> - <string name="action_create_cancel">Ezeztatu</string> - <string name="action_edit_editing">Aldatu</string> + <string name="simple_cancel">Ezeztatu</string> + <string name="simple_edit">Aldatu</string> <string name="action_edit_save">Gorde</string> <string name="action_edit_saving">Gordetzen …</string> <string name="action_edit_saved">Gordeta</string> <string name="action_edit_cancel">Ezeztatu</string> - <string name="action_about">Honi buruz</string> + <string name="simple_about">Honi buruz</string> <string name="action_select_note">Oharra aukeratu </string> <string name="action_note_deleted">Oharra aukeratuta</string> <string name="action_note_restored">Oharra berreskuratuta</string> diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 7f66528f..10c225b3 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Asetukset</string> <string name="action_search">Etsi</string> <string name="action_create_save">Tallenna</string> - <string name="action_create_cancel">Peruuta</string> - <string name="action_edit_editing">Muokkaa</string> + <string name="simple_cancel">Peruuta</string> + <string name="simple_edit">Muokkaa</string> <string name="action_edit_save">Tallenna</string> <string name="action_edit_saving">Tallennetaan...</string> <string name="action_edit_saved">Tallennettu</string> <string name="action_edit_cancel">Peruuta</string> - <string name="action_about">Tietoja</string> + <string name="simple_about">Tietoja</string> <string name="action_select_note">Valitse muistiinpano</string> <string name="action_note_deleted">Muistiinpano poistettu</string> <string name="action_note_restored">Muistiinpano palautettu</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index ba08db39..0699b00c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Paramètres</string> <string name="action_search">Rechercher</string> <string name="action_create_save">Sauvegarder</string> - <string name="action_create_cancel">Annuler</string> - <string name="action_edit_editing">Modifier</string> + <string name="simple_cancel">Annuler</string> + <string name="simple_edit">Modifier</string> <string name="action_edit_save">Sauvegarder</string> <string name="action_edit_saving">Enregistrement de …</string> <string name="action_edit_saved">Sauvegardé</string> <string name="action_edit_cancel">Annuler</string> - <string name="action_about">À propos</string> + <string name="simple_about">À propos</string> <string name="action_select_note">Choisir une note</string> <string name="action_note_deleted">Note supprimée</string> <string name="action_note_restored">Note restaurée</string> diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 1e41df8e..30abe25e 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Nova nota</string> <string name="action_settings">Axustes</string> <string name="action_create_save">Gardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Gardar</string> <string name="action_edit_saving">Gardando …</string> <string name="action_edit_saved">Gardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Acerca de</string> + <string name="simple_about">Acerca de</string> <string name="action_select_note">Seleccionar nota</string> <string name="action_note_deleted">A nota foi eliminada</string> <string name="action_note_restored">A nota foi restaurada</string> diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index d2444638..ec25730b 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Beállítások</string> <string name="action_search">Keresés</string> <string name="action_create_save">Mentés</string> - <string name="action_create_cancel">Mégsem</string> - <string name="action_edit_editing">Szerkesztés</string> + <string name="simple_cancel">Mégsem</string> + <string name="simple_edit">Szerkesztés</string> <string name="action_edit_save">Mentés</string> <string name="action_edit_saving">Mentés …</string> <string name="action_edit_saved">Elmentve</string> <string name="action_edit_cancel">Mégsem</string> - <string name="action_about">Névjegy</string> + <string name="simple_about">Névjegy</string> <string name="action_select_note">Jegyzet választás</string> <string name="action_note_deleted">Jegyzet törölve</string> <string name="action_note_restored">Jegyzet visszaállítva</string> diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml index bb59de04..9270fb36 100644 --- a/app/src/main/res/values-hy/strings.xml +++ b/app/src/main/res/values-hy/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">նոր գրառում</string> <string name="action_settings">կարգավորումներ</string> <string name="action_create_save">հիշել</string> - <string name="action_create_cancel">չեղարկել</string> - <string name="action_edit_editing">մշակել</string> + <string name="simple_cancel">չեղարկել</string> + <string name="simple_edit">մշակել</string> <string name="action_edit_save">հիշել</string> <string name="action_edit_saving">հիշել…</string> <string name="action_edit_saved">պահպանված է</string> <string name="action_edit_cancel">ընդհատել</string> - <string name="action_about">էջի վերաբերյալ</string> + <string name="simple_about">էջի վերաբերյալ</string> <string name="action_select_note">ընտրելգրառումը</string> <string name="menu_delete">հեռացնել</string> <string name="menu_copy">պատճենահանել</string> diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 5fe15f5c..15bec08e 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Catatan baru</string> <string name="action_settings">Pengaturan</string> <string name="action_create_save">Simpan</string> - <string name="action_create_cancel">Batal</string> - <string name="action_edit_editing">Sunting</string> + <string name="simple_cancel">Batal</string> + <string name="simple_edit">Sunting</string> <string name="action_edit_save">Simpan</string> <string name="action_edit_saving">Menyimpan …</string> <string name="action_edit_saved">Tersimpan</string> <string name="action_edit_cancel">Batal</string> - <string name="action_about">Tentang</string> + <string name="simple_about">Tentang</string> <string name="action_select_note">Pilih catatan</string> <string name="action_note_deleted">Catatan dihapus</string> <string name="action_note_restored">Catatan dipulihkan</string> diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index f7042fb6..4e7d704d 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Stillingar</string> <string name="action_search">Leita</string> <string name="action_create_save">Vista</string> - <string name="action_create_cancel">Hætta við</string> - <string name="action_edit_editing">Breyta</string> + <string name="simple_cancel">Hætta við</string> + <string name="simple_edit">Breyta</string> <string name="action_edit_save">Vista</string> <string name="action_edit_saving">Vista …</string> <string name="action_edit_saved">Vistað</string> <string name="action_edit_cancel">Hætta við</string> - <string name="action_about">Um hugbúnaðinn</string> + <string name="simple_about">Um hugbúnaðinn</string> <string name="action_select_note">Eyða minnispunkti</string> <string name="action_note_restored">Minnispunktur endurheimtur</string> <string name="action_undo">Afturkalla</string> diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index bde0379a..af228d44 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Impostazioni</string> <string name="action_search">Cerca</string> <string name="action_create_save">Salva</string> - <string name="action_create_cancel">Annulla</string> - <string name="action_edit_editing">Modifica</string> + <string name="simple_cancel">Annulla</string> + <string name="simple_edit">Modifica</string> <string name="action_edit_save">Salva</string> <string name="action_edit_saving">Salvataggio di …</string> <string name="action_edit_saved">Salvata</string> <string name="action_edit_cancel">Annulla</string> - <string name="action_about">Informazioni</string> + <string name="simple_about">Informazioni</string> <string name="action_select_note">Seleziona nota</string> <string name="action_note_deleted">Nota eliminata</string> <string name="action_note_restored">Nota ripristinata</string> diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index a3233da6..bdd159a6 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">設定</string> <string name="action_search">検索</string> <string name="action_create_save">保存</string> - <string name="action_create_cancel">キャンセル</string> - <string name="action_edit_editing">編集</string> + <string name="simple_cancel">キャンセル</string> + <string name="simple_edit">編集</string> <string name="action_edit_save">保存</string> <string name="action_edit_saving">保存中…</string> <string name="action_edit_saved">保存しました</string> <string name="action_edit_cancel">キャンセル</string> - <string name="action_about">アプリについて</string> + <string name="simple_about">アプリについて</string> <string name="action_select_note">ノートを選択</string> <string name="action_undo">元に戻す</string> <string name="menu_delete">削除</string> diff --git a/app/src/main/res/values-ka-rGE/strings.xml b/app/src/main/res/values-ka-rGE/strings.xml index 84faa719..92d6cd26 100644 --- a/app/src/main/res/values-ka-rGE/strings.xml +++ b/app/src/main/res/values-ka-rGE/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">პარამეტრები</string> <string name="action_search">ძიება</string> <string name="action_create_save">შენახვა</string> - <string name="action_create_cancel">უარყოფა</string> - <string name="action_edit_editing">შეცვლა</string> + <string name="simple_cancel">უარყოფა</string> + <string name="simple_edit">შეცვლა</string> <string name="action_edit_save">შენახვა</string> <string name="action_edit_saving">ინახება …</string> <string name="action_edit_saved">შენახულია</string> <string name="action_edit_cancel">უარყოფა</string> - <string name="action_about">ჩვენს შესახებ</string> + <string name="simple_about">ჩვენს შესახებ</string> <string name="action_select_note">აირჩიეთ ჩანაწერი</string> <string name="action_note_deleted">ჩანაწერი გაუქმდა</string> <string name="action_note_restored">ჩანაწერი აღდგა</string> diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 44c33716..388f41ba 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">설정</string> <string name="action_search">검색</string> <string name="action_create_save">저장</string> - <string name="action_create_cancel">취소</string> - <string name="action_edit_editing">편집</string> + <string name="simple_cancel">취소</string> + <string name="simple_edit">편집</string> <string name="action_edit_save">저장</string> <string name="action_edit_saving">저장 중…</string> <string name="action_edit_saved">저장됨</string> <string name="action_edit_cancel">취소</string> - <string name="action_about">정보</string> + <string name="simple_about">정보</string> <string name="action_select_note">메모 선택</string> <string name="action_note_deleted">메모 삭제됨</string> <string name="action_note_restored">메모 복원됨</string> diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index ace9d561..103520ea 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Nustatymai</string> <string name="action_search">Paieška</string> <string name="action_create_save">Įrašyti</string> - <string name="action_create_cancel">Atsisakyti</string> - <string name="action_edit_editing">Redaguoti</string> + <string name="simple_cancel">Atsisakyti</string> + <string name="simple_edit">Redaguoti</string> <string name="action_edit_save">Įrašyti</string> <string name="action_edit_saving">Įrašoma …</string> <string name="action_edit_saved">Įrašyta</string> <string name="action_edit_cancel">Atsisakyti</string> - <string name="action_about">Apie</string> + <string name="simple_about">Apie</string> <string name="action_select_note">Sukurti</string> <string name="action_note_deleted">Pastaba ištrinta</string> <string name="action_note_restored">Pastaba atstatyta</string> diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index d4bb584d..f204725b 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Jauna piezīme</string> <string name="action_settings">Iestatījumi</string> <string name="action_create_save">Saglabāt</string> - <string name="action_create_cancel">Atcelt</string> - <string name="action_edit_editing">Rediģēt</string> + <string name="simple_cancel">Atcelt</string> + <string name="simple_edit">Rediģēt</string> <string name="action_edit_save">Saglabāt</string> <string name="action_edit_saving">Saglabā …</string> <string name="action_edit_saved">Saglabāts</string> <string name="action_edit_cancel">Atcelt</string> - <string name="action_about">Par</string> + <string name="simple_about">Par</string> <string name="action_select_note">Izvēlieties piezīmi</string> <string name="action_note_deleted">Piezīme ir dzēsta</string> <string name="action_note_restored">Piezīme restaurēta</string> diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index cf2ad4ce..ad400a1c 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Innstillinger</string> <string name="action_search">Søk</string> <string name="action_create_save">Lagre</string> - <string name="action_create_cancel">Avbryt</string> - <string name="action_edit_editing">Rediger</string> + <string name="simple_cancel">Avbryt</string> + <string name="simple_edit">Rediger</string> <string name="action_edit_save">Lagre</string> <string name="action_edit_saving">Lagrer …</string> <string name="action_edit_saved">Lagret</string> <string name="action_edit_cancel">Avbryt</string> - <string name="action_about">Om</string> + <string name="simple_about">Om</string> <string name="action_select_note">Velg notat</string> <string name="action_note_deleted">Notat slettet</string> <string name="action_note_restored">Notat gjenopprettet</string> diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index de953551..872a525f 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Instellingen</string> <string name="action_search">Zoeken</string> <string name="action_create_save">Opslaan</string> - <string name="action_create_cancel">Annuleren</string> - <string name="action_edit_editing">Bewerken</string> + <string name="simple_cancel">Annuleren</string> + <string name="simple_edit">Bewerken</string> <string name="action_edit_save">Opslaan</string> <string name="action_edit_saving">Opslaan …</string> <string name="action_edit_saved">Opgeslagen</string> <string name="action_edit_cancel">Annuleren</string> - <string name="action_about">Over</string> + <string name="simple_about">Over</string> <string name="action_select_note">Notitie selecteren</string> <string name="action_note_deleted">Notitie verwijderd</string> <string name="action_note_restored">Notitie hersteld</string> diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8c0c01a3..d70e0686 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Ustawienia</string> <string name="action_search">Szukaj</string> <string name="action_create_save">Zapisz</string> - <string name="action_create_cancel">Anuluj</string> - <string name="action_edit_editing">Edytuj</string> + <string name="simple_cancel">Anuluj</string> + <string name="simple_edit">Edytuj</string> <string name="action_edit_save">Zapisz</string> <string name="action_edit_saving">Zapisywanie …</string> <string name="action_edit_saved">Zapisano</string> <string name="action_edit_cancel">Anuluj</string> - <string name="action_about">O aplikacji</string> + <string name="simple_about">O aplikacji</string> <string name="action_select_note">Wybierz notatkę</string> <string name="action_note_deleted">Notatka usunięta</string> <string name="action_note_restored">Notatka przywrócona</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 98a285d0..9c646123 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Configurações</string> <string name="action_search">Pesquisar</string> <string name="action_create_save">Salvar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Salvar</string> <string name="action_edit_saving">Salvando…</string> <string name="action_edit_saved">Salvo</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Sobre</string> + <string name="simple_about">Sobre</string> <string name="action_select_note">Selecionar anotação</string> <string name="action_note_deleted">Anotação excluída</string> <string name="action_note_restored">Anotação restaurada</string> diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 7c36b932..69348bc4 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Nova nota</string> <string name="action_settings">Definições</string> <string name="action_create_save">Guardar</string> - <string name="action_create_cancel">Cancelar</string> - <string name="action_edit_editing">Editar</string> + <string name="simple_cancel">Cancelar</string> + <string name="simple_edit">Editar</string> <string name="action_edit_save">Guardar</string> <string name="action_edit_saving">A guardar …</string> <string name="action_edit_saved">Guardado</string> <string name="action_edit_cancel">Cancelar</string> - <string name="action_about">Sobre</string> + <string name="simple_about">Sobre</string> <string name="action_select_note">Selecionar nota</string> <string name="action_undo">Anular</string> <string name="menu_delete">Eliminar</string> diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 12b83f1d..e33ad45b 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -6,13 +6,13 @@ <string name="action_create">Notă nouă</string> <string name="action_settings">Setări</string> <string name="action_create_save">Salvează</string> - <string name="action_create_cancel">Anulează</string> - <string name="action_edit_editing">Editează</string> + <string name="simple_cancel">Anulează</string> + <string name="simple_edit">Editează</string> <string name="action_edit_save">Salvează</string> <string name="action_edit_saving">Se salvează …</string> <string name="action_edit_saved">Salvat</string> <string name="action_edit_cancel">Anulat</string> - <string name="action_about">Despre</string> + <string name="simple_about">Despre</string> <string name="action_select_note">Selectează o notă</string> <string name="action_note_deleted">Nota este ștearsă</string> <string name="action_note_restored">Nota este restaurată</string> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 054ed3ca..78ada6fa 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Настройки</string> <string name="action_search">Поиск</string> <string name="action_create_save">Сохранить</string> - <string name="action_create_cancel">Отмена</string> - <string name="action_edit_editing">Редактировать</string> + <string name="simple_cancel">Отмена</string> + <string name="simple_edit">Редактировать</string> <string name="action_edit_save">Сохранить</string> <string name="action_edit_saving">Сохранение …</string> <string name="action_edit_saved">Сохранено</string> <string name="action_edit_cancel">Отмена</string> - <string name="action_about">О программе</string> + <string name="simple_about">О программе</string> <string name="action_select_note">Выбрать заметку</string> <string name="action_note_deleted">Заметка удалена</string> <string name="action_note_restored">Заметка восстановлена</string> diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index a89a6959..3b8c3177 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Settings</string> <string name="action_search">Hľadať</string> <string name="action_create_save">Uložiť</string> - <string name="action_create_cancel">Zrušiť</string> - <string name="action_edit_editing">Upraviť</string> + <string name="simple_cancel">Zrušiť</string> + <string name="simple_edit">Upraviť</string> <string name="action_edit_save">Uložiť</string> <string name="action_edit_saving">Ukladám …</string> <string name="action_edit_saved">Uložené</string> <string name="action_edit_cancel">Zrušiť</string> - <string name="action_about">O</string> + <string name="simple_about">O</string> <string name="action_select_note">Vybrať poznámku</string> <string name="action_note_deleted">Poznámka vymazaná</string> <string name="action_note_restored">Poznámka obnovená</string> diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index 3cfd7b3c..1ab5da85 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Konfigurimet</string> <string name="action_search">Kërko</string> <string name="action_create_save">Ruaj</string> - <string name="action_create_cancel">Anullo</string> - <string name="action_edit_editing">Modifiko</string> + <string name="simple_cancel">Anullo</string> + <string name="simple_edit">Modifiko</string> <string name="action_edit_save">Ruaj</string> <string name="action_edit_saving">Duke ruajtur …</string> <string name="action_edit_saved">U ruajt</string> <string name="action_edit_cancel">Anullo</string> - <string name="action_about">Rreth Nesh</string> + <string name="simple_about">Rreth Nesh</string> <string name="action_select_note">Selekto shënimin</string> <string name="action_note_deleted">Shënimi u fshi</string> <string name="action_note_restored">Shënimi i rivendos</string> diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 0953184c..67675e4b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Поставке</string> <string name="action_search">Тражи</string> <string name="action_create_save">Сачувај</string> - <string name="action_create_cancel">Одустани</string> - <string name="action_edit_editing">Уреди</string> + <string name="simple_cancel">Одустани</string> + <string name="simple_edit">Уреди</string> <string name="action_edit_save">Сачувај</string> <string name="action_edit_saving">Чувам …</string> <string name="action_edit_saved">Сачувано</string> <string name="action_edit_cancel">Одустани</string> - <string name="action_about">О програму</string> + <string name="simple_about">О програму</string> <string name="action_select_note">Изабери белешку</string> <string name="action_note_deleted">Белешка обрисана</string> <string name="action_note_restored">Белешка повраћена</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index d5356755..22351fb9 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">Inställningar</string> <string name="action_search">Sök</string> <string name="action_create_save">Spara</string> - <string name="action_create_cancel">Avbryt</string> - <string name="action_edit_editing">Redigera</string> + <string name="simple_cancel">Avbryt</string> + <string name="simple_edit">Redigera</string> <string name="action_edit_save">Spara</string> <string name="action_edit_saving">Sparar …</string> <string name="action_edit_saved">Sparad</string> <string name="action_edit_cancel">Avbryt</string> - <string name="action_about">Om</string> + <string name="simple_about">Om</string> <string name="action_select_note">Välj anteckning</string> <string name="action_note_deleted">Anteckningen raderad</string> <string name="action_note_restored">Anteckningen återskapad</string> diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b8b22868..1f1c1cf3 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -9,13 +9,13 @@ <string name="action_settings">Ayarlar</string> <string name="action_search">Arama</string> <string name="action_create_save">Kaydet</string> - <string name="action_create_cancel">İptal</string> - <string name="action_edit_editing">Düzenle</string> + <string name="simple_cancel">İptal</string> + <string name="simple_edit">Düzenle</string> <string name="action_edit_save">Kaydet</string> <string name="action_edit_saving">Kaydediliyor …</string> <string name="action_edit_saved">Kaydedildi</string> <string name="action_edit_cancel">İptal</string> - <string name="action_about">Hakkında</string> + <string name="simple_about">Hakkında</string> <string name="action_select_note">Not seçin</string> <string name="action_note_deleted">Not silindi</string> <string name="action_note_restored">Not geri yüklendi</string> diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ba7aa312..4ab9e9a7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -7,13 +7,13 @@ <string name="action_settings">设置</string> <string name="action_search">搜索</string> <string name="action_create_save">保存</string> - <string name="action_create_cancel">取消</string> - <string name="action_edit_editing">编辑</string> + <string name="simple_cancel">取消</string> + <string name="simple_edit">编辑</string> <string name="action_edit_save">保存</string> <string name="action_edit_saving">保存 …</string> <string name="action_edit_saved">已保存</string> <string name="action_edit_cancel">取消</string> - <string name="action_about">关于</string> + <string name="simple_about">关于</string> <string name="action_select_note">选择便笺</string> <string name="action_note_deleted">已删除的笔记</string> <string name="action_note_restored">已恢复笔记</string> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e9f9777d..9466afc6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,13 +9,12 @@ <string name="action_settings">Settings</string> <string name="action_search">Search</string> <string name="action_create_save">Save</string> - <string name="action_create_cancel">Cancel</string> - <string name="action_edit_editing">Edit</string> + <string name="simple_cancel">Cancel</string> + <string name="simple_edit">Edit</string> <string name="action_edit_save">Save</string> <string name="action_edit_saving">Saving …</string> <string name="action_edit_saved">Saved</string> - <string name="action_edit_cancel">Cancel</string> - <string name="action_about">About</string> + <string name="simple_about">About</string> <string name="action_select_note">Select note</string> <string name="action_note_deleted">Note deleted</string> <string name="action_note_restored">Note restored</string> @@ -25,17 +24,13 @@ <string name="action_recent">Recent</string> <string name="action_uncategorized">Uncategorized</string> <string name="menu_delete">Delete</string> - <string name="menu_copy">Copy</string> - <string name="menu_edit">Edit</string> - <string name="menu_cancel">Cancel</string> <string name="menu_change_category">Category</string> <string name="menu_favorite">Favorite</string> <string name="menu_preview">Preview</string> <string name="menu_share">Share</string> <string name="menu_about">About</string> - <string name="change_category_title">Chose category</string> - <string name="copy">Copy</string> + <string name="change_category_title">Choose a category</string> <string name="listview_updated_today">Today</string> <string name="listview_updated_yesterday">Yesterday</string> @@ -127,7 +122,7 @@ <string name="widget_single_note_placeholder_tv">Note not found</string> <string name="widget_create_note">Create Note</string> <string name="widget_not_logged_in">Please login to Notes before using this widget</string> - <string name="widget_entry_fav_contentDescription">Star icon used to denote item as a favourite</string> + <string name="widget_entry_fav_contentDescription">Star icon is used to denote an item as a favourite</string> <string name="widget_app_launcher_contentDescription">Launches app</string> <string name="activity_select_single_note">Select note</string> |