Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 985a6cd1 authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge remote-tracking branch 'origin/master'

parents e0400720 6ff297af
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -46,11 +46,11 @@ dependencies {
    annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.1'

    implementation "androidx.appcompat:appcompat:1.1.0"
    implementation "androidx.fragment:fragment:1.2.1"
    implementation "androidx.fragment:fragment:1.2.2"
    implementation "androidx.preference:preference:1.1.0"
    implementation "androidx.recyclerview:recyclerview:1.1.0"
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
    implementation 'androidx.work:work-runtime:2.3.1'
    implementation 'androidx.work:work-runtime:2.3.2'
    implementation "com.google.android.material:material:1.1.0"

    androidTestImplementation 'junit:junit:4.13'
+6 −0
Original line number Diff line number Diff line
@@ -52,7 +52,12 @@

    <!-- Error -->
    <string name="error_sync">Synchronisatie mislukt: %1$s</string>
    <string name="error_json">is de Notities app op de server geactiveerd?</string>
    <string name="error_no_network">Geen netwerkverbinding</string>
    <string name="error_files_app">heb je de bestanden app geïnstalleerd?</string>
    <string name="error_unknown">Er trad een onbekende fout op.</string>
    <string name="error_insufficient_storage">De serveropslag is vol.</string>

    <!-- About -->
    <string name="about_version_title">Versie</string>
    <string name="about_version">Je gebruikt nu &lt;strong>%1$s&lt;/strong></string>
@@ -119,6 +124,7 @@
    <string name="bulk_notes_deleted">Verwijderde %1$d notities</string>
    <string name="bulk_notes_restored">Herstelde %1$d notities</string>
    <string name="category_readonly">Alleen lezen</string>
    <string name="no_category">Geen categorie</string>
    <string name="add_category">Toevoegen %1$s</string>

    <!-- Array: note modes -->