mirrors/nextcloud-notes-android
1
0
Fork 0
mirror of https://github.com/nextcloud/notes-android.git synced 2024-10-25 22:26:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into weblogin

Browse source
This commit is contained in:
Niedermann IT-Dienstleistungen 2018-06-08 07:17:52 +02:00 committed by GitHub
commit b1260aca09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
31 changed files with 176 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

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

6
app/src/main/java/it/niedermann/owncloud/notes/android/activity/EditNoteActivity.java
View file

@ -148,7 +148,6 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
@Override
public void onBackPressed() {
fragment.onPrepareClose();
close();
}
@ -162,15 +161,12 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case android.R.id.home:
fragment.onPrepareClose();
close();
return true;
case R.id.menu_preview:
fragment.onPrepareClose();
launchExistingNote(getNoteId(), false);
return true;
case R.id.menu_edit:
fragment.onPrepareClose();
launchExistingNote(getNoteId(), true);
return true;
default:
@ -193,7 +189,7 @@ public class EditNoteActivity extends AppCompatActivity implements BaseNoteFragm
} else {
preferences.edit().putString(prefKeyLastMode, getString(R.string.pref_value_mode_preview)).apply();
}
fragment.onFinalClose();
fragment.onCloseNote();
finish();
}

2
app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
View file

@ -558,7 +558,6 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
db = NoteSQLiteOpenHelper.getInstance(this);
if (db.getNoteServerSyncHelper().isSyncPossible()) {
adapter.removeAll();
swipeRefreshLayout.setRefreshing(true);
synchronize();
} else {
Toast.makeText(getApplicationContext(), getString(R.string.error_sync, getString(NotesClientUtil.LoginStatus.NO_NETWORK.str)), Toast.LENGTH_LONG).show();
@ -633,6 +632,7 @@ public class NotesListViewActivity extends AppCompatActivity implements ItemAdap
}
private void synchronize() {
swipeRefreshLayout.setRefreshing(true);
db.getNoteServerSyncHelper().addCallbackPull(syncCallBack);
db.getNoteServerSyncHelper().scheduleSync(false);
}

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

@ -78,6 +78,12 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
listener.onNoteUpdated(note);
}
@Override
public void onPause() {
super.onPause();
saveNote(null);
}
@Override
public void onDetach() {
super.onDetach();
@ -155,11 +161,7 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
}
}
public void onPrepareClose() {
saveNote(null);
}
public void onFinalClose() {
public void onCloseNote() {
if (originalNote == null && getContent().isEmpty()) {
db.deleteNoteAndSync(note.getId());
}
@ -172,9 +174,14 @@ public abstract class BaseNoteFragment extends Fragment implements CategoryDialo
*/
protected void saveNote(@Nullable ICallback callback) {
Log.d(getClass().getSimpleName(), "saveData()");
note = db.updateNoteAndSync(note, getContent(), callback);
String newContent = getContent();
if(note.getContent().equals(newContent)) {
Log.v(getClass().getSimpleName(), "... not saving, since nothing has changed");
} else {
note = db.updateNoteAndSync(note, newContent, callback);
listener.onNoteUpdated(note);
}
}
protected abstract String getContent();

BIN
app/src/main/res/drawable-hdpi/ic_quicksettings_new.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.3 KiB

BIN
app/src/main/res/drawable-mdpi/ic_quicksettings_new.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 900 B

BIN
app/src/main/res/drawable-xhdpi/ic_quicksettings_new.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_quicksettings_new.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_quicksettings_new.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 3.2 KiB

13
app/src/main/res/drawable/ic_quicksettings_new.xml Normal file
View file

@ -0,0 +1,13 @@
<vector android:height="24dp" android:viewportHeight="50.8"
android:viewportWidth="50.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:fillType="evenOdd"
android:pathData="M8.47,3.17C5.54,3.17 3.17,5.54 3.17,8.47L3.17,42.33C3.17,45.26 5.54,47.62 8.47,47.62L42.33,47.62C45.26,47.62 47.62,45.26 47.62,42.33L47.62,8.47C47.62,5.54 45.26,3.17 42.33,3.17L8.47,3.17zM13.76,8.47L37.04,8.47C37.53,8.47 37.99,8.54 38.44,8.66C38.03,9.07 37.88,9.22 37.18,9.92L36.91,10.19C35.66,11.43 34.66,12.44 34.66,12.44L40.75,18.52C40.75,18.52 41.6,17.67 42.33,16.93L42.33,37.04C42.33,39.97 39.97,42.33 37.04,42.33L13.76,42.33C10.83,42.33 8.47,39.97 8.47,37.04L8.47,13.76C8.47,10.83 10.83,8.47 13.76,8.47z"
android:strokeAlpha="0" android:strokeColor="#00000000"
android:strokeLineCap="round" android:strokeLineJoin="miter" android:strokeWidth="1.13385832"/>
<path android:fillAlpha="1" android:fillColor="#ffffff"
android:fillType="evenOdd"
android:pathData="M32.28,14.82C32.28,14.82 31.28,15.82 30.03,17.06L24.73,22.36C23.49,23.61 22.49,24.61 22.49,24.61L18.52,34.66L28.57,30.69C28.57,30.69 29.58,29.69 30.82,28.45L36.12,23.15C37.36,21.9 38.36,20.9 38.36,20.9L32.28,14.82zM23.55,25.66L27.52,29.63L22.22,32.81L20.37,30.96L23.55,25.66z"
android:strokeAlpha="0" android:strokeColor="#00000000"
android:strokeLineCap="round" android:strokeLineJoin="miter" android:strokeWidth="1.13385832"/>
</vector>

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

@ -9,9 +9,12 @@
<string name="action_settings">Settings</string>
<string name="action_search">Search</string>
<string name="action_create_save">Save</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 &#8230;</string>
<string name="action_edit_saved">Saved</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>
@ -27,6 +30,8 @@
<string name="menu_share">Share</string>
<string name="menu_about">About</string>
<string name="change_category_title">Choose a category</string>
<string name="listview_updated_today">Today</string>
<string name="listview_updated_yesterday">Yesterday</string>
<string name="listview_updated_this_week">This week</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Connecting &#8230;</string>
<string name="settings_view_category">View settings</string>
<string name="settings_note_mode">Display mode for Notes</string>
<string name="settings_theme_title">Theme</string>
<string name="settings_cert_category">Certificates</string>
<string name="settings_cert_trust_system">Trust system certificates</string>
<string name="settings_cert_trust_system_on">System and user-added CAs will be trusted (recommended)</string>
@ -107,6 +113,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 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>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Create a new note</string>
<string name="pref_value_theme_light">Light</string>
<string name="pref_value_theme_dark">Dark</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Open in edit mode</item>

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

@ -123,6 +123,7 @@
<plurals name="ab_selected">
<item quantity="one">vybrán %d</item>
<item quantity="few">vybrány %d</item>
<item quantity="many">vybráno %d</item>
<item quantity="other">vybráno %d</item>
</plurals>
</resources>

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

@ -52,6 +52,7 @@
<string name="settings_submitting">Verbindet&#8230;</string>
<string name="settings_view_category">Darstellung</string>
<string name="settings_note_mode">Anzeigemodus für Notizen</string>
<string name="settings_theme_title">Theme</string>
<string name="settings_cert_category">Zertifikate</string>
<string name="settings_cert_trust_system">System-Zertifikaten vertrauen</string>
<string name="settings_cert_trust_system_on">System- und installierten CAs wird vertraut (empfohlen)</string>
@ -120,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Neue Notiz erstellen</string>
<string name="pref_value_theme_light">Hell</string>
<string name="pref_value_theme_dark">Dunkel</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Im Bearbeitungsmodus öffnen</item>

4
app/src/main/res/values-de/strings.xml
View file

@ -52,6 +52,7 @@
<string name="settings_submitting">Verbindet&#8230;</string>
<string name="settings_view_category">Darstellung</string>
<string name="settings_note_mode">Anzeigemodus für Notizen</string>
<string name="settings_theme_title">Theme</string>
<string name="settings_cert_category">Zertifikate</string>
<string name="settings_cert_trust_system">System-Zertifikaten vertrauen</string>
<string name="settings_cert_trust_system_on">System- und installierten CAs wird vertraut (empfohlen)</string>
@ -120,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Neue Notiz erstellen</string>
<string name="pref_value_theme_light">Hell</string>
<string name="pref_value_theme_dark">Dunkel</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Im Bearbeitungsmodus öffnen</item>

2
app/src/main/res/values-el/strings.xml
View file

@ -101,6 +101,8 @@
<string name="widget_not_logged_in">Παρακαλούμε συνδεθείτε στις Σημειώσεις πρωτού να χρησιμοποιήσετε αυτό το γραφικό στοιχείο.</string>
<string name="widget_app_launcher_contentDescription">Εκκινεί την εφαρμογή</string>
<string name="activity_select_single_note">Επιλογή σημείωσης</string>
<!-- Shortcuts -->
<string name="shortcut_create_long">Δημιουργία νέας σημείωσης</string>

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

@ -3,13 +3,18 @@
<string name="app_name">Notas</string>
<string name="no_notes">Aún no hay notas</string>
<string name="label_all_notes">Todas las notas</string>
<string name="label_favorites">Favoritos</string>
<string name="action_create">Nota nueva</string>
<string name="action_settings">Configuraciones</string>
<string name="action_search">Buscar</string>
<string name="action_create_save">Guardar</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 &#8230;</string>
<string name="action_edit_saved">Guardado</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>
@ -25,6 +30,8 @@
<string name="menu_share">Compartir</string>
<string name="menu_about">Acerca de</string>
<string name="change_category_title">Elige una categoría</string>
<string name="listview_updated_today">Hoy</string>
<string name="listview_updated_yesterday">Ayer</string>
<string name="listview_updated_this_week">Esta semana</string>
@ -45,6 +52,7 @@
<string name="settings_submitting">Conectando &#8230;</string>
<string name="settings_view_category">Ver configuración</string>
<string name="settings_note_mode">Modo de visualización para Notas</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Certificados</string>
<string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
<string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
@ -105,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Nota no encontrada</string>
<string name="widget_create_note">Crear Nota</string>
<string name="widget_not_logged_in">Por favor inica sesión en Notes antes de usar este widget</string>
<string name="widget_entry_fav_contentDescription">El ícono de estrella se usa para marcar un elemento como favorito</string>
<string name="widget_app_launcher_contentDescription">Incia la aplicación</string>
<string name="activity_select_single_note">Seleccionar nota</string>
@ -112,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Crear una nota nueva</string>
<string name="pref_value_theme_light">Claro</string>
<string name="pref_value_theme_dark">Oscuro</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Abrir en modo edición</item>

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

@ -9,9 +9,12 @@
<string name="action_settings">Configuraciones</string>
<string name="action_search">Buscar</string>
<string name="action_create_save">Guardar</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 &#8230;</string>
<string name="action_edit_saved">Guardado</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>
@ -27,6 +30,8 @@
<string name="menu_share">Compartir</string>
<string name="menu_about">Acerca de</string>
<string name="change_category_title">Elige una categoría</string>
<string name="listview_updated_today">Hoy</string>
<string name="listview_updated_yesterday">Ayer</string>
<string name="listview_updated_this_week">Esta semana</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Conectando &#8230;</string>
<string name="settings_view_category">Ver configuración</string>
<string name="settings_note_mode">Modo de visualización para Notas</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Certificados</string>
<string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
<string name="settings_cert_trust_system_on">Los CAs del sistema y del usuario serán de confianza (recomendado)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Nota no encontrada</string>
<string name="widget_create_note">Crear Nota</string>
<string name="widget_not_logged_in">Por favor inica sesión en Notes antes de usar este widget</string>
<string name="widget_entry_fav_contentDescription">El ícono de estrella se usa para marcar un elemento como favorito</string>
<string name="widget_app_launcher_contentDescription">Incia la aplicación</string>
<string name="activity_select_single_note">Seleccionar nota</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Crear una nota nueva</string>
<string name="pref_value_theme_light">Claro</string>
<string name="pref_value_theme_dark">Oscuro</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Abrir en modo edición</item>

10
app/src/main/res/values-es/strings.xml
View file

@ -9,9 +9,12 @@
<string name="action_settings">Ajustes</string>
<string name="action_search">Buscar</string>
<string name="action_create_save">Guardar</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 &#8230;</string>
<string name="action_edit_saved">Guardado</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>
@ -27,6 +30,8 @@
<string name="menu_share">Compartir</string>
<string name="menu_about">Acerca de</string>
<string name="change_category_title">Escoge una categoría</string>
<string name="listview_updated_today">Hoy</string>
<string name="listview_updated_yesterday">Ayer</string>
<string name="listview_updated_this_week">Esta semana</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Conectando &#8230;</string>
<string name="settings_view_category">Ver configuración</string>
<string name="settings_note_mode">Modo de visualización para Notas</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Certificados</string>
<string name="settings_cert_trust_system">Confiar en los certificados del sistema</string>
<string name="settings_cert_trust_system_on">Se confiará en las autoridades de certificación —CAs— del sistema y añadidas por el usuario (recomendado)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Nota no encontrada</string>
<string name="widget_create_note">Crear nota</string>
<string name="widget_not_logged_in">Por favor, inicia sesión en Notas antes de usar este widget</string>
<string name="widget_entry_fav_contentDescription">El icono de estrella se usa para indicar que el elemento es un favorito</string>
<string name="widget_app_launcher_contentDescription">Lanza la app</string>
<string name="activity_select_single_note">Selecciona nota</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Crear una nota nueva</string>
<string name="pref_value_theme_light">Claro</string>
<string name="pref_value_theme_dark">Oscuro</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Abrir en modo edición</item>

5
app/src/main/res/values-fr/strings.xml
View file

@ -52,6 +52,7 @@
<string name="settings_submitting">Connexion en cours&#8230;</string>
<string name="settings_view_category">Voir les paramètres</string>
<string name="settings_note_mode">Mode d\'affichage pour les notes</string>
<string name="settings_theme_title">Thème</string>
<string name="settings_cert_category">Certificats</string>
<string name="settings_cert_trust_system">Faire confiance aux certificats du système</string>
<string name="settings_cert_trust_system_on">Les Autorités de Certification du système, ainsi que celles ajoutées manuellement seront considérées comme totalement fiables (recommandé)</string>
@ -112,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Note non trouvée</string>
<string name="widget_create_note">Créer une note</string>
<string name="widget_not_logged_in">Veuillez vous connecter à Notes avant d\'utiliser ce widget</string>
<string name="widget_entry_fav_contentDescription">L\'icône étoile est utilisée pour désigner un élément comme favori</string>
<string name="widget_app_launcher_contentDescription">Démarre l\'application</string>
<string name="activity_select_single_note">Choisir une note</string>
@ -119,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Créer une nouvelle note</string>
<string name="pref_value_theme_light">Clair</string>
<string name="pref_value_theme_dark">Sombre</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Ouvrir en mode édition</item>

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

@ -9,9 +9,12 @@
<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="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 &#8230;</string>
<string name="action_edit_saved">Elmentve</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>
@ -27,6 +30,8 @@
<string name="menu_share">Megosztás</string>
<string name="menu_about">Névjegy</string>
<string name="change_category_title">Válasszon kategóriát</string>
<string name="listview_updated_today">Ma</string>
<string name="listview_updated_yesterday">Tegnap</string>
<string name="listview_updated_this_week">Ezen a héten</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Kapcsolódás &#8230;</string>
<string name="settings_view_category">Beállítások megtekintése</string>
<string name="settings_note_mode">Jegyzetmegjelenítési módok</string>
<string name="settings_theme_title">Téma</string>
<string name="settings_cert_category">Tanúsítványok</string>
<string name="settings_cert_trust_system">Megbízás a rendszertanúsítványokban</string>
<string name="settings_cert_trust_system_on">A rendszer és felhasználó által hozzáadott CA-k megbízhatók (javasolt)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Jegyzet nem található</string>
<string name="widget_create_note">Jegyzet létrehozása</string>
<string name="widget_not_logged_in">Kérlek jelentkezz be a Jegyzetekbe mielőtt ezt a widget-et használnád</string>
<string name="widget_entry_fav_contentDescription">A csillag ikon az elem kedvencként megjelölésére szolgál</string>
<string name="widget_app_launcher_contentDescription">Elindítja az alkalmazást</string>
<string name="activity_select_single_note">Jegyzet kiválasztása</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Új jegyzet létrehozása</string>
<string name="pref_value_theme_light">Világos</string>
<string name="pref_value_theme_dark">Sötét</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Megnyitás szerkesztésre</item>

24
app/src/main/res/values-is/strings.xml
View file

@ -3,16 +3,24 @@
<string name="app_name">Minnispunktar</string>
<string name="no_notes">Engir minnispunktar ennþá</string>
<string name="label_all_notes">Allir minnispunktar</string>
<string name="label_favorites">Eftirlæti</string>
<string name="action_create">Nýr minnispunktur</string>
<string name="action_settings">Stillingar</string>
<string name="action_search">Leita</string>
<string name="action_create_save">Vista</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 &#8230;</string>
<string name="action_edit_saved">Vistað</string>
<string name="simple_about">Um hugbúnaðinn</string>
<string name="action_select_note">Eyða minnispunkti</string>
<string name="action_note_deleted">Minnispunkti var eytt</string>
<string name="action_note_restored">Minnispunktur endurheimtur</string>
<string name="action_undo">Afturkalla</string>
<string name="action_drawer_open">opna stýringu</string>
<string name="action_drawer_close">loka stýringu</string>
<string name="action_recent">Nýlegt</string>
<string name="action_uncategorized">Óflokkað</string>
<string name="menu_delete">Eyða</string>
@ -22,6 +30,8 @@
<string name="menu_share">Deila</string>
<string name="menu_about">Um hugbúnaðinn</string>
<string name="change_category_title">Veldu flokk</string>
<string name="listview_updated_today">Í dag</string>
<string name="listview_updated_yesterday">Í gær</string>
<string name="listview_updated_this_week">Í þessari viku</string>
@ -32,13 +42,17 @@
<string name="settings_server_settings">Stillingar aðgangs</string>
<string name="settings_server">Þjónn</string>
<string name="settings_url">Vistfang þjóns</string>
<string name="settings_url_check_description">Sýnir hvort hægt sé að ná sambandi (ping) við vistfangið.</string>
<string name="settings_url_warn_http">AÐVÖRUN: \"http\" er óöruggt. Endilega nota \"https\".</string>
<string name="settings_username">Notandanafn</string>
<string name="settings_password">Lykilorð</string>
<string name="settings_password_unchanged">Lykilorð (óbreytt)</string>
<string name="settings_password_check_description">Sýnir hvort auðkenni séu rétt.</string>
<string name="settings_submit">Tengjast</string>
<string name="settings_submitting">Tengist &#8230;</string>
<string name="settings_view_category">Skoða stillingar</string>
<string name="settings_note_mode">Birtingarhamur minnispunkta</string>
<string name="settings_theme_title">Þema</string>
<string name="settings_cert_category">Skilríki</string>
<string name="settings_cert_trust_system">Treysta skilríkjum kerfis</string>
<string name="settings_cert_trust_system_on">Vottunaraðilum kerfis og þeim sem notandi bætir við verður treyst (mælt með þessu)</string>
@ -87,19 +101,29 @@
<string name="about_app_license">Þessu forriti er dreift með almenna GNU GENERAL PUBLIC notkunarleyfinu v3+.</string>
<string name="about_app_license_button">Skoða notkunarleyfi</string>
<string name="about_icons_disclaimer_title">Táknmyndir</string>
<string name="about_icons_disclaimer">&lt;p>Upprunaleg táknmynd er gerð af %1$s&lt;/p>&lt;p>Allar aðrar táknmyndir eru úr &lt;a href=\"https://materialdesignicons.com/\">Material Design Icons&lt;/a> safninu frá Google Inc. og eru þær gefnar út með Apache 2.0 notkunarleyfi.&lt;/p></string>
<string name="about_credits_tab_title">Þakkir til</string>
<string name="about_contribution_tab_title">Framlög</string>
<string name="about_license_tab_title">Notkunarleyfi</string>
<!-- Widgets -->
<string name="widget_note_list_title">Listi yfir minnispunkta</string>
<string name="widget_note_list_placeholder">Engir minnispunktar</string>
<string name="widget_single_note_title">Stakur minnispunktur</string>
<string name="widget_single_note_placeholder_tv">Minnispunktur fannst ekki</string>
<string name="widget_create_note">Búa til minnispunkt</string>
<string name="widget_not_logged_in">Skráðu þig inn í minnispunktaforritið áður en þú notar þennan viðmótshluta</string>
<string name="widget_entry_fav_contentDescription">Stjarna er notuð til að sýna hvort atriði er í eftirlætum</string>
<string name="widget_app_launcher_contentDescription">Ræsir forritið</string>
<string name="activity_select_single_note">Veldu minnispunkt</string>
<!-- Shortcuts -->
<string name="shortcut_create_long">Búa til nýjan minnispunkt</string>
<string name="pref_value_theme_light">Ljóst</string>
<string name="pref_value_theme_dark">Dökkt</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Opna í breytingaham</item>

4
app/src/main/res/values-it/strings.xml
View file

@ -52,6 +52,7 @@
<string name="settings_submitting">Connessione a &#8230;</string>
<string name="settings_view_category">impostazioni di visualizzazione</string>
<string name="settings_note_mode">Modalità di visualizzazione delle note</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Certificati</string>
<string name="settings_cert_trust_system">Considera affidabili i certificati di sistema</string>
<string name="settings_cert_trust_system_on">Le CA di sistema e aggiunte dall\'utente saranno considerate affidabili (consigliato)</string>
@ -120,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Crea una nuova nota</string>
<string name="pref_value_theme_light">Chiaro</string>
<string name="pref_value_theme_dark">Scuro</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Apri in modalità modifica</item>

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

@ -121,6 +121,7 @@
<!-- Plurals -->
<plurals name="ab_selected">
<item quantity="one">%d არჩეულია</item>
<item quantity="other">%d არჩეულია</item>
</plurals>
</resources>

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

@ -125,6 +125,7 @@
<plurals name="ab_selected">
<item quantity="one">%d pasirinkta</item>
<item quantity="few">%d pasirinkta</item>
<item quantity="many">%d pasirinkta</item>
<item quantity="other">%d pasirinkta</item>
</plurals>
</resources>

11
app/src/main/res/values-nl/strings.xml
View file

@ -9,9 +9,12 @@
<string name="action_settings">Instellingen</string>
<string name="action_search">Zoeken</string>
<string name="action_create_save">Opslaan</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 &#8230;</string>
<string name="action_edit_saved">Opgeslagen</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>
@ -27,6 +30,9 @@
<string name="menu_share">Delen</string>
<string name="menu_about">Over</string>
<string name="change_category_title">Kies een categorie
</string>
<string name="listview_updated_today">Vandaag</string>
<string name="listview_updated_yesterday">Gisteren</string>
<string name="listview_updated_this_week">Deze week</string>
@ -47,6 +53,7 @@
<string name="settings_submitting">Verbinden&#160;&#8230;</string>
<string name="settings_view_category">Bekijk instellingen</string>
<string name="settings_note_mode">Laat modus zien voor notities</string>
<string name="settings_theme_title">Thema</string>
<string name="settings_cert_category">Certificaten</string>
<string name="settings_cert_trust_system">Vertrouw systeem certificaten</string>
<string name="settings_cert_trust_system_on">Systeem en door gebruiker toegevoegde CA\'s worden vertrouwd (aanbevolen)</string>
@ -107,6 +114,7 @@
<string name="widget_single_note_placeholder_tv">Notitie niet gevonden</string>
<string name="widget_create_note">Maak notitie</string>
<string name="widget_not_logged_in">Login bij Notities voordat je deze widget gebruikt</string>
<string name="widget_entry_fav_contentDescription">Sterpictogram gebruikt om object als favoriet te markeren</string>
<string name="widget_app_launcher_contentDescription">Start app</string>
<string name="activity_select_single_note">Selecteer notitie</string>
@ -114,6 +122,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Maak een nieuwe notitie</string>
<string name="pref_value_theme_light">Licht</string>
<string name="pref_value_theme_dark">Donker</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Open in wijzigen modus</item>

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

@ -52,6 +52,7 @@
<string name="settings_submitting">Conectando&#8230;</string>
<string name="settings_view_category">Ver configurações</string>
<string name="settings_note_mode">Mostra os modos para Anotações</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Certificados</string>
<string name="settings_cert_trust_system">Certificados de sistema confiáveis</string>
<string name="settings_cert_trust_system_on">CAs de sistema e adicionados pelo usuário serão confiáveis (recomendado)</string>
@ -120,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Criar uma nova anotação</string>
<string name="pref_value_theme_light">Claro</string>
<string name="pref_value_theme_dark">Escuro</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Abrir em modo de edição</item>

10
app/src/main/res/values-ru/strings.xml
View file

@ -9,9 +9,12 @@
<string name="action_settings">Настройки</string>
<string name="action_search">Поиск</string>
<string name="action_create_save">Сохранить</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="simple_about">О программе</string>
<string name="action_select_note">Выбрать заметку</string>
<string name="action_note_deleted">Заметка удалена</string>
<string name="action_note_restored">Заметка восстановлена</string>
@ -27,6 +30,8 @@
<string name="menu_share">Поделиться</string>
<string name="menu_about">О программе</string>
<string name="change_category_title">Выберите категорию</string>
<string name="listview_updated_today">Сегодня</string>
<string name="listview_updated_yesterday">Вчера</string>
<string name="listview_updated_this_week">Эта неделя</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Соединение …</string>
<string name="settings_view_category">Просмотр настроек</string>
<string name="settings_note_mode">Режим показа заметок</string>
<string name="settings_theme_title">Тема</string>
<string name="settings_cert_category">Сертификаты</string>
<string name="settings_cert_trust_system">Доверять системным сертификатам</string>
<string name="settings_cert_trust_system_on">Доверять системным и добавленным пользователем центрам авторизации (рекомендуется)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Заметка не найдена</string>
<string name="widget_create_note">Создать заметку</string>
<string name="widget_not_logged_in">Для использования виджета необходимо выполнить вход в приложении «Заметки»</string>
<string name="widget_entry_fav_contentDescription">Используйте звёздочку для исключения заметки из избранного</string>
<string name="widget_app_launcher_contentDescription">Запуск приложения</string>
<string name="activity_select_single_note">Выберите заметку</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Создать новую заметку</string>
<string name="pref_value_theme_light">Светлая</string>
<string name="pref_value_theme_dark">Тёмная</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Открывать в режиме редактирования</item>

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

@ -131,6 +131,7 @@
<plurals name="ab_selected">
<item quantity="one">%d vybraný</item>
<item quantity="few">%d vybraných</item>
<item quantity="many">%d vybraný</item>
<item quantity="other">%d vybraný</item>
</plurals>
</resources>

10
app/src/main/res/values-sr/strings.xml
View file

@ -9,9 +9,12 @@
<string name="action_settings">Поставке</string>
<string name="action_search">Тражи</string>
<string name="action_create_save">Сачувај</string>
<string name="simple_cancel">Поништи</string>
<string name="simple_edit">Измени</string>
<string name="action_edit_save">Сачувај</string>
<string name="action_edit_saving">Чувам &#8230;</string>
<string name="action_edit_saved">Сачувано</string>
<string name="simple_about">О програму</string>
<string name="action_select_note">Изабери белешку</string>
<string name="action_note_deleted">Белешка обрисана</string>
<string name="action_note_restored">Белешка повраћена</string>
@ -27,6 +30,8 @@
<string name="menu_share">Подели</string>
<string name="menu_about">О програму</string>
<string name="change_category_title">Одаберите категорију</string>
<string name="listview_updated_today">Данас</string>
<string name="listview_updated_yesterday">Јуче</string>
<string name="listview_updated_this_week">Ове седмице</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Повезујем се&#8230;</string>
<string name="settings_view_category">Поставке прегледа</string>
<string name="settings_note_mode">Начин приказа за Белешке</string>
<string name="settings_theme_title">Тема</string>
<string name="settings_cert_category">Сертификати</string>
<string name="settings_cert_trust_system">Веруј системским сертификатима</string>
<string name="settings_cert_trust_system_on">Вероваће се системским сертификатима и кориснички доданим сертификационим центрима (CA)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Белешка није нађена</string>
<string name="widget_create_note">Направи белешку</string>
<string name="widget_not_logged_in">Пријавите се на Белешке пре коришћења овог елемента</string>
<string name="widget_entry_fav_contentDescription">Звездица се користила да означи да је ставка омиљена</string>
<string name="widget_app_launcher_contentDescription">Покреће апликацију</string>
<string name="activity_select_single_note">Одабери белешку</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Направи нову белешку</string>
<string name="pref_value_theme_light">Светла</string>
<string name="pref_value_theme_dark">Тамна</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Отвори у режиму уређивања</item>

10
app/src/main/res/values-tr/strings.xml
View file

@ -9,9 +9,12 @@
<string name="action_settings">Ayarlar</string>
<string name="action_search">Arama</string>
<string name="action_create_save">Kaydet</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 &#8230;</string>
<string name="action_edit_saved">Kaydedildi</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>
@ -27,6 +30,8 @@
<string name="menu_share">Paylaş</string>
<string name="menu_about">Hakkında</string>
<string name="change_category_title">Bir kategori seçin</string>
<string name="listview_updated_today">Bugün</string>
<string name="listview_updated_yesterday">Dün</string>
<string name="listview_updated_this_week">Bu hafta</string>
@ -47,6 +52,7 @@
<string name="settings_submitting">Bağlanılıyor &#8230;</string>
<string name="settings_view_category">Ayarları görüntüle</string>
<string name="settings_note_mode">Notların görüntülenme kipi</string>
<string name="settings_theme_title">Tema</string>
<string name="settings_cert_category">Sertifikalar</string>
<string name="settings_cert_trust_system">Sistem sertifikalarına güvenilsin</string>
<string name="settings_cert_trust_system_on">Sistem ve kullanıcı tarafından eklenen sertifika otoritelerine güvenilir (önerilir)</string>
@ -107,6 +113,7 @@
<string name="widget_single_note_placeholder_tv">Not bulunamadı</string>
<string name="widget_create_note">Not Ekle</string>
<string name="widget_not_logged_in">Bu aracı kullanabilmek için lütfen Notlar üzerinde oturum açın</string>
<string name="widget_entry_fav_contentDescription">Sık kullanılan ögeler için kullanılacak yıldız simgesi</string>
<string name="widget_app_launcher_contentDescription">Uygulamayı başlatır</string>
<string name="activity_select_single_note">Not seçin</string>
@ -114,6 +121,9 @@
<!-- Shortcuts -->
<string name="shortcut_create_long">Yeni not ekle</string>
<string name="pref_value_theme_light">Açık</string>
<string name="pref_value_theme_dark">Koyu</string>
<!-- Array: note modes -->
<string-array name="noteMode_entries">
<item>Düzenleme kipinde aç</item>

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

@ -3,6 +3,7 @@
<string name="app_name">便笺</string>
<string name="no_notes">没有便笺</string>
<string name="label_all_notes">所有便笺</string>
<string name="action_create">新建便笺</string>
<string name="action_settings">设置</string>
<string name="action_search">搜索</string>