Merge branch 'fix_fdroid' into 'master'

Fix F-Droid build

See merge request pixeldroid/PixelDroid!499

app/build.gradle

@@ -198,7 +198,7 @@ dependencies {
     implementation 'com.github.connyduck:sparkbutton:4.1.0'
 
 
-    implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.1'
+    implementation 'org.pixeldroid.pixeldroid:android-media-editor:1.2'
     implementation project(path: ':scrambler')
 
     implementation('com.github.bumptech.glide:glide:4.14.2') {

app/licenses.yml

@@ -925,12 +925,6 @@
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
   url: https://github.com/davemorrissey/subsampling-scale-image-view
-- artifact: com.arthenica:ffmpeg-kit-min:+
-  name: ffmpeg-kit-min
-  copyrightHolder:  Taner Şener
-  license: GNU Lesser General Public License, Version 3
-  licenseUrl: https://www.gnu.org/licenses/lgpl-3.0.txt
-  url: https://github.com/tanersener/ffmpeg-kit
 - artifact: com.arthenica:smart-exception-java:+
   name: smart-exception-java
   copyrightHolder: Taner Şener
@@ -949,3 +943,47 @@
   license: Simplified BSD License
   licenseUrl: http://www.opensource.org/licenses/bsd-license
   url: https://github.com/bumptech/glide
+- artifact: androidx.core:core-splashscreen:+
+  name: core-splashscreen
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/jetpack/androidx/releases/core#1.0.0
+- artifact: androidx.databinding:databinding-adapters:+
+  name: databinding-adapters
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+- artifact: androidx.databinding:databinding-ktx:+
+  name: databinding-ktx
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+- artifact: androidx.databinding:databinding-runtime:+
+  name: databinding-runtime
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+- artifact: androidx.databinding:viewbinding:+
+  name: viewbinding
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+- artifact: com.squareup.okio:okio-jvm:+
+  name: okio-jvm
+  copyrightHolder: #COPYRIGHT_HOLDER#
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/square/okio/
+- artifact: com.arthenica:ffmpeg-kit-min-gpl:+
+  name: ffmpeg-kit-min-gpl
+  copyrightHolder:  Taner Şener
+  license: GNU Lesser General Public License, Version 3
+  licenseUrl: https://www.gnu.org/licenses/lgpl-3.0.txt
+  url: https://github.com/arthenica/ffmpeg-kit
+- artifact: org.pixeldroid.pixeldroid:android-media-editor:+
+  name: android-media-editor
+  copyrightHolder: Matthieu De Beule
+  license: GNU General Public License version 3
+  licenseUrl: https://www.gnu.org/licenses/gpl-3.0.html
+  url: https://gitlab.shinice.net/pixeldroid/android-media-editor/

app/proguard-rules.pro

@@ -93,6 +93,14 @@
 -keep public class * extends com.bumptech.glide.module.AppGlideModule
 -keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
 
+-dontwarn org.bouncycastle.**
+-dontwarn org.conscrypt.**
+-dontwarn org.openjsse.javax.net.ssl.**
+-dontwarn org.openjsse.net.ssl.**
+
+-dontwarn org.checkerframework.checker.nullness.qual.EnsuresNonNull
+-dontwarn org.checkerframework.checker.nullness.qual.RequiresNonNull
+
 ##---------------Begin: proguard configuration for Gson  ----------
 # Gson uses generic type information stored in a class file when working with fields. Proguard
 # removes such information by default, so configure it to keep all of it.
@@ -127,3 +135,47 @@
 -keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
 
 ##---------------End: proguard configuration for Gson  ----------
+
+##---------------Begin: proguard configuration for Retrofit  ----------
+# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
+# EnclosingMethod is required to use InnerClasses.
+-keepattributes Signature, InnerClasses, EnclosingMethod
+
+# Retrofit does reflection on method and parameter annotations.
+-keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
+
+# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
+-keepattributes AnnotationDefault
+
+# Retain service method parameters when optimizing.
+-keepclassmembers,allowshrinking,allowobfuscation interface * {
+    @retrofit2.http.* <methods>;
+}
+
+# Ignore annotation used for build tooling.
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
+
+# Ignore JSR 305 annotations for embedding nullability information.
+-dontwarn javax.annotation.**
+
+# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
+-dontwarn kotlin.Unit
+
+# Top-level functions that can only be used by Kotlin.
+-dontwarn retrofit2.KotlinExtensions
+-dontwarn retrofit2.KotlinExtensions$*
+
+# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
+# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
+-if interface * { @retrofit2.http.* <methods>; }
+-keep,allowobfuscation interface <1>
+
+# Keep generic signature of Call, Response (R8 full mode strips signatures from non-kept items).
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+-keep,allowobfuscation,allowshrinking class retrofit2.Response
+
+# With R8 full mode generic signatures are stripped for classes that are not
+# kept. Suspend functions are wrapped in continuations where the type argument
+# is used.
+-keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
+##---------------End: proguard configuration for Retrofit  ----------

app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.CAMERA" />
 
@@ -20,13 +21,11 @@
 
     <application
         android:name=".utils.PixelDroidApplication"
-        android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/AppTheme">
-        tools:replace="android:allowBackup">
         <activity
             android:name=".posts.AlbumActivity"
             android:exported="false"
@@ -54,10 +53,6 @@
             android:name=".posts.ReportActivity"
             android:screenOrientation="sensorPortrait"
             tools:ignore="LockedOrientationActivity" />
-        <activity
-            android:name="org.pixeldroid.media_editor.photoEdit.VideoEditActivity"
-            android:exported="false"/>
-        <activity android:name="org.pixeldroid.media_editor.photoEdit.PhotoEditActivity" />
         <activity
             android:name=".postCreation.PostCreationActivity"
             android:exported="true"
@@ -135,12 +130,6 @@
                     android:scheme="@string/auth_scheme" />
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.yalantis.ucrop.UCropActivity"
-            android:exported="true"
-            android:screenOrientation="sensorPortrait"
-            android:theme="@style/AppTheme.NoActionBar"
-            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".searchDiscover.SearchActivity"
             android:exported="true"

app/src/main/java/org/pixeldroid/app/MainActivity.kt

@@ -1,15 +1,21 @@
 package org.pixeldroid.app
 
+import android.Manifest
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.net.Uri
+import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.view.View
 import android.widget.ImageView
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.GravityCompat
@@ -121,10 +127,21 @@ class MainActivity : BaseThemedWithoutBarActivity() {
             if(showNotification){
                 binding.viewPager.currentItem = 3
             }
-
+            if (ActivityCompat.checkSelfPermission(applicationContext,
-            enablePullNotifications(this)
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) enablePullNotifications(this)
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                notificationPermissionLauncher.launch(Manifest.permission.POST_NOTIFICATIONS)
             }
         }
+    }
+
+    private val notificationPermissionLauncher = registerForActivityResult(
+        ActivityResultContracts.RequestPermission()
+    ) { isGranted: Boolean ->
+        if (isGranted) enablePullNotifications(this)
+    }
 
     // Checks if the activity was launched from a notification from another account than the
     // current active one, and if so switches to that account

app/src/main/java/org/pixeldroid/app/postCreation/PostCreationActivity.kt

@@ -252,7 +252,7 @@ class PostCreationActivity : BaseThemedWithoutBarActivity() {
                 else MediaStore.Images.Media.EXTERNAL_CONTENT_URI
             val imageUri: Uri = resolver.insert(store, contentValues)!!
             path = imageUri.toString()
-            outputStream = resolver.openOutputStream(Objects.requireNonNull(imageUri))!!
+            outputStream = resolver.openOutputStream(imageUri)!!
         } else {
             @Suppress("DEPRECATION") val imagesDir =
                 Environment.getExternalStoragePublicDirectory(getString(R.string.app_name))

app/src/main/java/org/pixeldroid/app/utils/notificationsWorker/NotificationsWorker.kt

@@ -1,12 +1,15 @@
 package org.pixeldroid.app.utils.notificationsWorker
 
+import android.Manifest
 import android.app.NotificationChannel
 import android.app.NotificationChannelGroup
 import android.app.NotificationManager
 import android.app.PendingIntent
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.os.Build
+import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.work.CoroutineWorker
@@ -143,7 +146,10 @@ class NotificationsWorker(
             )
 
         with(NotificationManagerCompat.from(applicationContext)) {
-            notify(uniqueUserId.hashCode(), groupBuilder.build())
+            if (ActivityCompat.checkSelfPermission(applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) notify(uniqueUserId.hashCode(), groupBuilder.build())
         }
 
     }
@@ -216,7 +222,10 @@ class NotificationsWorker(
 
         with(NotificationManagerCompat.from(applicationContext)) {
             // notificationId is a unique int for each notification
-            notify((uniqueUserId + notification.id).hashCode(), builder.build())
+            if (ActivityCompat.checkSelfPermission(applicationContext,
+                    Manifest.permission.POST_NOTIFICATIONS
+                ) == PackageManager.PERMISSION_GRANTED
+            ) notify((uniqueUserId + notification.id).hashCode(), builder.build())
         }
     }
 

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

@@ -18,7 +18,6 @@
     <string name="post">ارسل</string>
     <string name="whats_an_instance">ماذا نعني بمثيل الخادم؟</string>
     <string name="logout">الخروج</string>
-    <string name="tab_filters">الفلاتر</string>
     <string name="edit">تعديل</string>
     <string name="save_to_gallery">احتفظ بها في المعرض…</string>
     <string name="image_download_downloading">التنزيل جارٍ…</string>
@@ -28,7 +27,6 @@
     <string name="share_picture">شارِك الصورة…</string>
     <string name="NoCommentsToShow">لا توجد تعليقات في هذا المنشور…</string>
     <string name="connect_to_pixelfed">لِج إلى Pixelfed</string>
-    <string name="lbl_brightness">السطوع</string>
     <string name="image_download_failed">فشل التنزيل ، حاول مجددًا مِن فضلك</string>
     <string name="liked_notification">أعجِب %1$s بمنشورك</string>
     <string name="domain_of_your_instance">اسم نطاق مثيل خادمك</string>
@@ -36,13 +34,10 @@
     <string name="capture_button_alt">لقطة شاشة</string>
     <string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / وسائط مخفية
 \n (اضعط للعرض)</string>
-    <string name="lbl_contrast">تباين عالٍ</string>
-    <string name="lbl_saturation">التشبّع اللوني</string>
     <string name="add_account_description">إضافة حساب Pixelfed آخر</string>
     <string name="add_account_name">إضافة حساب</string>
     <string name="instance_error">تعذّر الحصول على معلومات مثيل الخادم</string>
     <string name="save_image_failed">لا يمكن حفظ الصورة</string>
-    <string name="permission_denied">رُفض التصريح</string>
     <string name="dark_theme">داكن</string>
     <string name="light_theme">فاتح</string>
     <string name="save_image_success">تم حفظ الصورة بنجاح</string>
@@ -51,7 +46,6 @@
     <string name="upload_post_failed">فشل في تحميل المنشور</string>
     <string name="upload_picture_failed">خطأ في تحميل الصورة!</string>
     <string name="loading_toast">حدث خلل اثناء التحميل</string>
-    <string name="normal_filter">عادي</string>
     <string name="upload_post_error">فشل في تحميل المنشور</string>
 
     <string name="comment">تعليق</string>
@@ -89,7 +83,4 @@
     <string name="picture_format_error">خطأ في التحميل: نسق الصورة غير صالح.</string>
     <string name="request_format_error">خطأ في التحميل: نسق الطلب غير صالح</string>
     <string name="media_upload_failed">{gmd_cloud_off} فشل في تحميل الوسائط ، يرجى إعادة المحاولة أو تحقق مِن حالة الشبكة</string>
-    <string name="busy_dialog_ok_button">حسنًا ، انتظر ذلك.</string>
-    <string name="crop_result_error">تعذّر جلب الصورة بعد القص</string>
-    <string name="busy_dialog_text">"لا تزال الصورة في المعالجة, انتظر حتى تنتهي من ذالك  أولاً!"</string>
 </resources>

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

@@ -26,10 +26,6 @@
     <string name="switch_camera_button_alt">Canviar la càmera</string>
     <string name="login_connection_required_once">Per poder afegir el primer compte i utilitzar PixelDroid, has d’estar en línia :(</string>
     <string name="theme_header">Tema</string>
-    <string name="lbl_brightness">BRILLANTOR</string>
-    <string name="lbl_contrast">CONTRAST</string>
-    <string name="lbl_saturation">SATURACIÓ</string>
-    <string name="tab_filters">FILTRES</string>
     <string name="edit">EDITAR</string>
     <string name="capture_button_alt">Captura</string>
     <string name="gallery_button_alt">Galeria</string>
@@ -71,7 +67,6 @@
     <string name="no_description">Sense descripció</string>
     <string name="feed_failed">No s\'ha pogut obtenir el fil</string>
     <string name="loading_toast">Alguna cosa no ha funcionat correctament mentre es carregava</string>
-    <string name="normal_filter">Normal</string>
     <string name="upload_post_error">Error de pujada</string>
     <string name="upload_post_success">S\'ha publicat amb èxit la publicació</string>
     <string name="upload_post_failed">Ha fallat l\'enviament de la publicació</string>
@@ -80,7 +75,6 @@
     <string name="upload_picture_failed">Error d\'enviament d\'imatges!</string>
     <string name="save_image_success">La imatge s\'ha desat correctament</string>
     <string name="save_image_failed">No es pot desar la imatge</string>
-    <string name="permission_denied">Permís denegat</string>
     <string name="dark_theme">Fosc</string>
     <string name="light_theme">Clar</string>
     <string name="default_system">Per defecte (seguint el sistema)</string>
@@ -88,9 +82,6 @@
     <string name="media_upload_failed">Ha fallat la pujada del contingut gràfic, torneu-ho a provar o reviseu les condicions de la xarxa</string>
     <string name="posting_image_accessibility_hint">Imatge que s\'està publicant</string>
     <string name="retry">Tornar a provar</string>
-    <string name="crop_result_error">No s\'ha pogut recuperar la imatge després del tall</string>
-    <string name="busy_dialog_ok_button">D\'acord, espera per això.</string>
-    <string name="busy_dialog_text">Processant la imatge, espara abans de continuar!</string>
     <string name="nothing_to_see_here">Res per veure aquí!</string>
     <string name="delete_dialog">Esborra aquest contingut\?</string>
     <string name="language">Idioma</string>
@@ -106,7 +97,6 @@
     <string name="about">Quant a</string>
     <string name="post_title">%1$s imatges</string>
     <string name="followers_title">%1$s seguidors</string>
-    <string name="toolbar_title_edit">Editar</string>
     <string name="profile_picture">Imatge de perfil</string>
     <string name="something_went_wrong">Alguna cosa ha anat malament…</string>
     <string name="add_photo">Afegeix una fotografia</string>
@@ -146,10 +136,8 @@
     </plurals>
     <string name="issues_contribute">Informar de problemes o contribuir a l\'aplicació:</string>
     <string name="switch_to_grid">Canvia a la vista de quadrícula</string>
-    <string name="no_cancel_edit">No, cancel·lar l\'edició</string>
     <string name="add_comment">Afegir un comentari</string>
     <string name="submit_comment">Enviar el comentari</string>
-    <string name="save_before_returning">Voleu desar les vostres edicions\?</string>
     <string name="switch_to_carousel">Canvia a carrusel</string>
     <string name="save_image_description">Desar la descripció de la imatge</string>
     <string name="no_media_description">Afegeix aquí una descripció del contingut gràfic…</string>
@@ -163,8 +151,6 @@
     <string name="follow_requested">Seguiment sol·licitat</string>
     <string name="dialog_message_cancel_follow_request">Voleu cancel·lar la sol·licitud de seguiment\?</string>
     <string name="delete_post_failed_io_except">No s\'ha pogut suprimir la publicació, comproveu la vostra connexió\?</string>
-    <string name="filter_thumbnail">Miniatura del filtre</string>
-    <string name="image_preview">Previsualització de la imatge que s\'està editant</string>
     <plurals name="nb_following">
         <item quantity="one">%d
 \nSeguint</item>
@@ -201,7 +187,6 @@
     </plurals>
     <string name="poll_notification_channel">Enquestes</string>
     <string name="size_exceeds_instance_limit">La mida del número d\'imatge %1$d a l\'àlbum supera la mida màxima permesa per la instància (%2$d kB però el límit és %3$d kB). És possible que no puguis pujar-ho.</string>
-    <string name="crop_button">Botó per escapçar o girar la imatge</string>
     <string name="post_is_album">Aquesta entrada és un àlbum</string>
     <string name="delete_post_failed_error">No s\'ha pogut suprimir la publicació, error %1$d</string>
     <string name="notifications_settings">Configuració de notificacions</string>

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

@@ -6,7 +6,6 @@
     <string name="delete">Smazat</string>
     <string name="something_went_wrong">Něco se pokazilo…</string>
     <string name="profile_picture">Profilový obrázek</string>
-    <string name="toolbar_title_edit">Upravit</string>
     <string name="report_error">Hlášení se nepodařilo odeslat</string>
     <string name="reported">Příspěvek nahlášen</string>
     <string name="report_target">Nahlásit příspěvek uživatele @%1$s</string>
@@ -147,7 +146,6 @@
     <string name="login_connection_required_once">Abyste mohli přidat první účet a používat PixelDroid, musíte být online :(</string>
     <string name="api_not_enabled_dialog">API není na této instanci aktivováno. Kontaktujete správce instance a požádejte jej o aktivaci.</string>
     <string name="logout">Odhlásit</string>
-    <string name="permission_denied">Přístup odepřen</string>
     <string name="save_image_failed">Obrázek nelze uložit</string>
     <string name="save_image_success">Obrázek úspěšně uložen</string>
     <plurals name="description_max_characters">
@@ -171,20 +169,7 @@
     <string name="switch_to_grid">Zobrazit v gridu</string>
     <string name="size_exceeds_instance_limit">Velikost obrázku číslo %1$d překračuje maximální povolenou velikost instance (%2$d kB, limit je %3$d kB). Je možné, že jej nebude možné nahrát.</string>
     <string name="upload_error">Chybový kód vrácený serverem: %1$d</string>
-    <string name="lbl_brightness">Jas</string>
-    <string name="lbl_contrast">Kontrast</string>
-    <string name="lbl_saturation">Nasycení</string>
-    <string name="tab_filters">Filtry</string>
     <string name="edit">Upravit</string>
-    <string name="filter_thumbnail">Náhled filtru</string>
-    <string name="busy_dialog_text">Obrázek se stále zpracovává, nejprve počkejte na dokončení!</string>
-    <string name="busy_dialog_ok_button">Rozumím, čekám.</string>
-    <string name="normal_filter">Žádný</string>
-    <string name="crop_result_error">Obrázek se po oříznutí nepodařilo načíst</string>
-    <string name="image_preview">Náhled upravovaného obrázku</string>
-    <string name="crop_button">Tlačítko k oříznutí nebo otočení obrázku</string>
-    <string name="save_before_returning">Uložit úpravy\?</string>
-    <string name="no_cancel_edit">Ne, zrušit úpravy</string>
     <string name="capture_button_alt">Vyfotit</string>
     <string name="switch_camera_button_alt">Přepnout kameru</string>
     <string name="open_drawer_menu">Otevřít nabídku</string>
@@ -218,17 +203,13 @@
     <string name="no_storage_permission">Oprávnění k úložišti nebylo uděleno, udělte oprávnění v nastavení, pokud chcete, aby PixelDroid zobrazoval náhledy</string>
     <string name="no_camera_permission">Oprávnění k fotoaparátu nebylo uděleno, udělte oprávnění v nastavení, pokud chcete, aby PixelDroid mohl použít fotoaparát</string>
     <string name="play_video">Přehrát video</string>
-    <string name="video_edit_not_yet_supported">Úprava videa zatím není podporována</string>
-    <string name="save_edit_menu">ULOŽIT</string>
     <string name="new_post_shortcut_long">Vytvořit nový příspěvek</string>
     <string name="new_post_shortcut_short">Nový příspěvek</string>
     <string name="notification_summary_large">%1$s, %2$s, %3$s a %4$d dalších</string>
     <string name="notification_summary_medium">%1$s, %2$s, a %3$s</string>
     <string name="notification_summary_small">%1$s a %2$s</string>
     <string name="public_feed">Veřejné</string>
-    <string name="error_editing">Chyba při úpravě</string>
     <string name="post_is_video">Tento příspěvek je video</string>
-    <string name="select_video_range">Vyberte, co z videa zachovat</string>
     <plurals name="notification_title_summary">
         <item quantity="one">%d nové upozornění</item>
         <item quantity="few">%d nové upozornění</item>
@@ -248,12 +229,10 @@
         <item quantity="few">%d odpovědi</item>
         <item quantity="other">%d odpovědí</item>
     </plurals>
-    <string name="reset_edit_menu">RESETOVAT</string>
     <string name="encode_error">Chyba při kódování</string>
     <string name="encode_success">Kódování bylo úspěšné!</string>
     <string name="encode_progress">Kódování %1$d%%</string>
     <string name="still_encoding">Jedno nebo více videí se stále kóduje. Před nahráním počkejte, na dokončení</string>
-    <string name="thumbnail_reel_video_edit">Reel zobrazuje náhledy videa, které upravujete</string>
     <string name="color_choice_button">Vybrat tento barevný odstín</string>
     <string name="color_chosen">Zvolený barevný odstín</string>
     <string name="follow_request">%1$s vás chce sledovat</string>

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

@@ -57,7 +57,6 @@
     </plurals>
     <string name="save_image_success">Billedet gemt</string>
     <string name="save_image_failed">Kunne i gemme billedet</string>
-    <string name="permission_denied">Adgang nægtet</string>
     <string name="add_account_description">Tilføj endnu en Pixelfed konto</string>
     <string name="add_account_name">Tilføj konto</string>
     <string name="logout">Log ud</string>

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

@@ -20,11 +20,7 @@
     <string name="save_to_gallery">In Galerie speichern…</string>
     <string name="image_download_failed">Der Download ist fehlgeschlagen, bitte versuche es erneut</string>
     <string name="logout">Abmelden</string>
-    <string name="lbl_brightness">Helligkeit</string>
-    <string name="tab_filters">Filter</string>
     <string name="edit">bearbeiten</string>
-    <string name="lbl_contrast">Kontrast</string>
-    <string name="lbl_saturation">Sättigung</string>
     <string name="NoCommentsToShow">Keine Kommentare zu diesem Beitrag…</string>
     <string name="image_download_downloading">Herunterladen…</string>
     <string name="cw_nsfw_hidden_media_n_click_to_show">CW/NSFW/Versteckte Medien
@@ -41,9 +37,7 @@
     <string name="instance_error">Konnte die Informationen der Instanz nicht abrufen</string>
     <string name="upload_picture_failed">Fehler beim Hochladen!</string>
     <string name="default_system">Standard (Systemeinstellung)</string>
-    <string name="permission_denied">Berechtigung verweigert</string>
     <string name="save_image_failed">Bild kann nicht gespeichert werden</string>
-    <string name="normal_filter">Normal</string>
     <string name="save_image_success">Bild erfolgreich gespeichert</string>
     <string name="picture_format_error">Upload-Fehler: falsches Bildformat.</string>
     <string name="upload_post_failed">Das Hochladen des Beitrags ist fehlgeschlagen</string>
@@ -88,9 +82,6 @@
     <string name="write_permission_share_pic">Für die Teilen von Bildern müssen Sie eine Schreibgenehmigung erteilen!</string>
     <string name="follow_status_failed">Konnte den Folgestatus nicht erhalten</string>
     <string name="retry">Wiederholen</string>
-    <string name="crop_result_error">Konnte das Bild nach dem Zuschneiden nicht verarbeiten</string>
-    <string name="busy_dialog_ok_button">Ok, warten.</string>
-    <string name="busy_dialog_text">Das Bild wird noch verarbeitet, warte bis es fertig ist!</string>
     <string name="nothing_to_see_here">Hier gibt\'s nichts zu sehen!</string>
     <string name="optional_report_comment">Optionale Nachricht für mods/admins</string>
     <string name="share_link">Link teilen</string>
@@ -112,10 +103,8 @@
     <string name="instance_not_pixelfed_continue">Ok, trotzdem fortfahren</string>
     <string name="instance_not_pixelfed_warning">Dies scheint keine Pixelfed-Instanz zu sein. Die App könnte sich daher unerwartet verhalten.</string>
     <string name="switch_to_grid">Wechsle zur Rasteransicht</string>
-    <string name="no_cancel_edit">Nein, Änderung abbrechen</string>
     <string name="mascot_description">Das Bild zeigt einen roten Panda, das Maskottchen von Pixelfed, der ein Telefon benutzt</string>
     <string name="switch_to_carousel">Wechsel zur Karussellansicht</string>
-    <string name="save_before_returning">Änderungen speichern\?</string>
     <string name="issues_contribute">Melde Probleme oder hilf mit bei der Entwicklung der Anwendung:</string>
     <string name="help_translate">Helfe PixelDroid in deine Sprache zu übersetzen:</string>
     <string name="language">Sprache</string>
@@ -126,16 +115,12 @@
     <string name="discover">ENTDECKE</string>
     <string name="open_drawer_menu">Öffne Menü</string>
     <string name="profile_picture">Profilbild</string>
-    <string name="toolbar_title_edit">Bearbeiten</string>
     <string name="report_error">Konnte nicht gemeldet werden</string>
     <string name="reported">Post wurde gemeldet</string>
     <string name="report_target">Melde den Beitrag von @%1$s</string>
     <string name="post_is_album">Dieser Beitrag ist ein Album</string>
     <string name="submit_comment">Kommentar senden</string>
     <string name="add_comment">Erstelle einen Kommentar</string>
-    <string name="crop_button">Schaltfläche zum ausschneiden oder rotieren des Bildes</string>
-    <string name="image_preview">Vorschau des bearbeiteten Bildes</string>
-    <string name="filter_thumbnail">Vorschaubild des Filters</string>
     <string name="post_image">Eines der Bilder im Beitrag</string>
     <string name="verify_credentials">Benutzerdaten konnten nicht geladen werden</string>
     <plurals name="nb_posts">
@@ -215,17 +200,12 @@
     <string name="video_not_supported">Der von dir verwendete Server unterstützt keine Video-Uploads, daher wirst du die in diesem Beitrag enthaltende Videos möglicherweise nicht hochladen können</string>
     <string name="post_is_video">Dieser Beitrag ist ein Video</string>
     <string name="play_video">Video abspielen</string>
-    <string name="video_edit_not_yet_supported">Das Bearbeiten von Videos wird noch nicht unterstützt</string>
-    <string name="reset_edit_menu">ZURÜCKSETZEN</string>
-    <string name="save_edit_menu">SPEICHERN</string>
     <string name="new_post_shortcut_long">Neuen Beitrag erstellen</string>
     <string name="new_post_shortcut_short">Neuer Beitrag</string>
     <string name="status_notification">%1$s hat einen Beitrag erstellt</string>
-    <string name="thumbnail_reel_video_edit">Vorschaubilder des Videos, das Sie bearbeiten</string>
     <string name="encode_error">Fehler-Kodierung</string>
     <string name="encode_success">Kodierung war erfolgreich!</string>
     <string name="encode_progress">Kodierung %1$d%%</string>
-    <string name="select_video_range">Wählen Sie aus was sie vom Video behalten möchten</string>
     <string name="still_encoding">Mindestens ein Video wird noch kodiert. Bitte warten bis alle fertig sind, bevor sie die Videos hochladen</string>
     <string name="follow_request">%1$s möchte dir folgen</string>
     <string name="home_feed">Start</string>
@@ -241,7 +221,6 @@
         <item quantity="one">%d Antwort</item>
         <item quantity="other">%d Antworten</item>
     </plurals>
-    <string name="error_editing">Fehler beim Bearbeiten</string>
     <string name="profile_error">Profil konnte nicht geladen werden</string>
     <string name="from_other_domain">von %1$s</string>
     <string name="add_images_error">Fehler beim Hinzufügen der Bilder</string>

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

@@ -25,10 +25,6 @@
     <string name="switch_camera_button_alt">Cambiar cámara</string>
     <string name="theme_title">Tema de la Aplicación</string>
     <string name="theme_header">Tema</string>
-    <string name="lbl_brightness">BRILLO</string>
-    <string name="lbl_contrast">CONTRASTE</string>
-    <string name="lbl_saturation">SATURACIÓN</string>
-    <string name="tab_filters">FILTROS</string>
     <string name="edit">EDITAR</string>
     <string name="capture_button_alt">Capturar</string>
     <string name="gallery_button_alt">Galería</string>
@@ -75,7 +71,6 @@
     <string name="no_description">Sin descripción</string>
     <string name="feed_failed">No se pudieron obtener publicaciones</string>
     <string name="loading_toast">Algo salió mal al cargar</string>
-    <string name="normal_filter">Normal</string>
     <string name="upload_post_error">Falló la subida de la publicación</string>
     <string name="upload_post_success">Publicación subida correctamente</string>
     <string name="upload_post_failed">Falló la subida de la publicación</string>
@@ -84,13 +79,9 @@
     <string name="upload_picture_failed">¡Error al subir la foto!</string>
     <string name="save_image_success">Imagen guardada correctamente</string>
     <string name="save_image_failed">No se puede guardar la imagen</string>
-    <string name="permission_denied">Permiso denegado</string>
     <string name="dark_theme">Oscuro</string>
     <string name="light_theme">Claro</string>
     <string name="default_system">Por defecto (Sistema)</string>
-    <string name="crop_result_error">No se pudo recuperar la imagen después del recorte</string>
-    <string name="busy_dialog_ok_button">Bien, espera.</string>
-    <string name="busy_dialog_text">Procesando imagen, ¡Espera a que termine!</string>
     <string name="nothing_to_see_here">¡Nada que ver aquí!</string>
     <plurals name="nb_following">
         <item quantity="one">%d
@@ -115,7 +106,6 @@
     <string name="discover">DESCUBRE</string>
     <string name="open_drawer_menu">Abrir el menú lateral</string>
     <string name="profile_picture">Imagen de perfil</string>
-    <string name="toolbar_title_edit">Editar</string>
     <string name="report_error">No se pudo enviar el reporte</string>
     <string name="reported">Reportado {gmd_check_circle}</string>
     <string name="report_target">Reportar la publicación de @%1$s</string>
@@ -164,11 +154,6 @@
         <item quantity="one">%d Me gusta</item>
         <item quantity="other">%d Me gustas</item>
     </plurals>
-    <string name="no_cancel_edit">No, cancelar edición</string>
-    <string name="save_before_returning">¿Guardar tus ediciones\?</string>
-    <string name="crop_button">Botón para recortar o rotar la imagen</string>
-    <string name="image_preview">Previsualización de la imagen siendo editada</string>
-    <string name="filter_thumbnail">Previsualización del filtro</string>
     <string name="upload_error">Código de error devuelto por el servidor: %1$d</string>
     <string name="size_exceeds_instance_limit">El tamaño de la imagen número %1$d del álbum, supera el máximo permitido por esta instancia (%2$d kB, siendo el límite: %3$d kB). Podrías no subirla.</string>
     <string name="total_exceeds_album_limit">Has escogido más imágenes que el máximo que tu servidor permite (%1$s). Las imágenes por encima de ese límite serán ignoradas.</string>

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

@@ -29,14 +29,10 @@
     <string name="switch_camera_button_alt">Aldatu kamera</string>
     <string name="capture_button_alt">Atera</string>
     <string name="theme_header">Gaia</string>
-    <string name="lbl_contrast">KONTRASTEA</string>
-    <string name="lbl_saturation">SATURAZIOA</string>
-    <string name="tab_filters">IRAGAZKIAK</string>
     <string name="connect_to_pixelfed">Konektatu Pixelfedera</string>
     <string name="login_connection_required_once">PixelDroid erabili ahal izateko Internet konexioa behar duzu :(</string>
     <string name="cw_nsfw_hidden_media_n_click_to_show">Eduki-abisua / Multimedia ezkutatuta
 \n (egin klik erakusteko)</string>
-    <string name="lbl_brightness">DISTIRA</string>
     <string name="domain_of_your_instance">Zure instantziaren domeinua</string>
     <string name="add_account_description">Beste Pixelfed kontu bat gehitu</string>
     <string name="add_account_name">Kontua gehitu</string>
@@ -61,7 +57,6 @@
     <string name="loading_toast">Zerbait gaizki joan da kargatzean</string>
     <string name="write_permission_download_pic">Idazteko baimena eman behar duzu irudiak deskargatzeko!</string>
     <string name="empty_comment">Iruzkina ez da hutsik egon behar!</string>
-    <string name="normal_filter">Normala</string>
     <string name="upload_post_error">Argitalpena igotzean errorea</string>
     <string name="comment_posted">Iruzkina: %1$s argitaratua!</string>
     <string name="upload_post_success">Argitalpena ongi kargatu da</string>
@@ -70,7 +65,6 @@
     <string name="picture_format_error">Karga errorea: irudi-formatu okerra.</string>
     <string name="posts">ARGITALPENAK</string>
     <string name="comment_error">Iruzkin akatsa!</string>
-    <string name="permission_denied">Baimena ukatuta</string>
     <string name="retry">Saiatu berriz</string>
     <string name="posting_image_accessibility_hint">Argitaratzen ari den irudia</string>
     <string name="edit_profile">Editatu profila</string>
@@ -88,8 +82,6 @@
     <string name="accounts">KONTUAK</string>
     <string name="media_upload_completed">Multimedia igoera amaitu da</string>
     <string name="upload_post_failed">Argitalpena igotzeak huts egin du</string>
-    <string name="no_cancel_edit">Ez, utzi editatzeari</string>
-    <string name="save_before_returning">Zure edizioak gorde\?</string>
     <string name="mascot_description">Panda gorri bat, Pixelfeden maskota, mugikor bat erabiltzen erakusten duen irudia</string>
     <string name="issues_contribute">Jakinarazi arazoak edo aplikazioan lagundu:</string>
     <string name="help_translate">Lagundu PixelDroid zure hizkuntzara itzultzen:</string>
@@ -101,7 +93,6 @@
     <string name="discover">AURKITU</string>
     <string name="open_drawer_menu">Ireki menu lerrakorra</string>
     <string name="profile_picture">Profileko irudia</string>
-    <string name="toolbar_title_edit">Editatu</string>
     <string name="report_error">Ezin izan da salaketa bidali</string>
     <string name="reported">Salatua {gmd_check_circle}</string>
     <string name="report_target">Salatu @%1$s erabiltzailearen argitalpena</string>
@@ -153,12 +144,6 @@
         <item quantity="one">Gogoko %d</item>
         <item quantity="other">%d gogoko</item>
     </plurals>
-    <string name="crop_button">Irudia moztu edo biratzeko botoia</string>
-    <string name="image_preview">Editatutako irudiaren aurrebista</string>
-    <string name="crop_result_error">Ezin izan da irudia berreskuratu moztu ondoren</string>
-    <string name="busy_dialog_ok_button">Ados, itxaron.</string>
-    <string name="busy_dialog_text">Oraindik irudia prozesatzen ari da, itxaron amaitu arte!</string>
-    <string name="filter_thumbnail">Iragazkiaren koadro txikia</string>
     <string name="no_media_description">Gehitu multimediaren deskribapena hemen…</string>
     <string name="save_image_description">Gorde irudiaren deskribapena</string>
     <string name="switch_to_carousel">Aldatu karruselera</string>

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

@@ -19,10 +19,6 @@
     <string name="post">بفرست</string>
     <string name="whats_an_instance">نمونه چیست؟</string>
     <string name="logout">خروج</string>
-    <string name="lbl_brightness">روشنایی</string>
-    <string name="lbl_contrast">تضاد</string>
-    <string name="lbl_saturation">اشباع</string>
-    <string name="tab_filters">پالایه‌ها</string>
     <string name="edit">ویرایش</string>
     <string name="save_to_gallery">ذخیره در نگارخانه…</string>
     <string name="image_download_failed">بارگیری شکست خورد، دوباره تلاش کنید</string>
@@ -41,7 +37,6 @@
     <string name="add_account_description">افزودن یک حساب دیگر پیکسل‌فد</string>
     <string name="add_account_name">افزودن حساب</string>
     <string name="instance_error">نتوانستیم اطلاعات نمونه را دریافت کنیم</string>
-    <string name="permission_denied">ممنوعیت دسترسی</string>
     <string name="save_image_failed">نتوانستیم تصویر را ذخیره کنیم</string>
     <string name="default_system">پیش‌گزیده (پیروی از سامانه)</string>
     <string name="light_theme">روشن</string>
@@ -53,7 +48,6 @@
     <string name="request_format_error">خطای بارگذاری: درخواست با قالب نادرست</string>
     <string name="upload_post_failed">بارگذاری فرسته ناموفق بود</string>
     <string name="upload_post_success">فرسته با موفقیت بارگذاری شد</string>
-    <string name="normal_filter">عادی</string>
     <string name="loading_toast">مشکلی حین بارکردن رخ داد</string>
     <string name="feed_failed">نتوانستیم خوراک را دریافت کنیم</string>
     <string name="no_description">بدون توضیحات</string>
@@ -88,9 +82,6 @@
     <string name="default_nfollowing">-
 \nپی‌گیری</string>
     <string name="media_upload_failed">بارگذاری رسانه شکست خورد، وضعیت شبکه را بررسی کرده یا دوباره تلاش کنید</string>
-    <string name="crop_result_error">تصویر برش یافته از دسترس خارج شده است</string>
-    <string name="busy_dialog_ok_button">خوب، منتظر می‌مانم.</string>
-    <string name="busy_dialog_text">منتظر بمانید تا پردازش تصویر پایان یابد!</string>
     <string name="nothing_to_see_here">چیزی برای دیدن نیست!</string>
     <string name="instance_not_pixelfed_cancel">لغو ورود</string>
     <string name="instance_not_pixelfed_continue">باشه، به هر حال ادامه بده</string>
@@ -107,7 +98,6 @@
     <string name="discover">کشف</string>
     <string name="open_drawer_menu">گشودن فهرست کشویی</string>
     <string name="profile_picture">تصویر نمایه</string>
-    <string name="toolbar_title_edit">ویرایش</string>
     <string name="report_error">گزارش نتوانست ارسال شود</string>
     <string name="reported">گزارش شد {gmd_check_circle}</string>
     <string name="report_target">گزارش فرستهٔ @%1$s</string>
@@ -128,9 +118,6 @@
     <string name="post_is_album">این فرسته، یک آلبوم است</string>
     <string name="submit_comment">فرستادن نظر</string>
     <string name="add_comment">نظری اضافه کنید</string>
-    <string name="crop_button">دکمه برش یا چرخش تصویر</string>
-    <string name="image_preview">پیش‌نمایش تصویری که در حال ویرایش است</string>
-    <string name="filter_thumbnail">تصویر بندانگشتی پالایه</string>
     <string name="post_image">یکی از تصاویر در فرسته</string>
     <string name="verify_credentials">ناتوانی در دریافت اطلاعات کاربر</string>
     <string name="mascot_description">تصویر، یک پاندای قرمز که شگونهٔ پیکسل‌فد است را گوشی به دست نشان می‌دهد</string>
@@ -153,8 +140,6 @@
         <item quantity="other">%d پسند</item>
     </plurals>
     <string name="switch_to_carousel">تغییر وضعیت به نمای گردونه</string>
-    <string name="no_cancel_edit">خیر، ویرایش لغو شود</string>
-    <string name="save_before_returning">ویرایش‌ها ذخیره شوند؟</string>
     <plurals name="nb_followers">
         <item quantity="one">%d
 \nپی‌گیر</item>

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

@@ -14,7 +14,6 @@
         <item quantity="other">Kuvaus saa sisältää enintään %d merkkiä.</item>
     </plurals>
     <string name="save_image_failed">Kuvan tallentaminen epäonnistui</string>
-    <string name="permission_denied">Lupa evätty</string>
     <string name="api_not_enabled_dialog">API ei ole käytössä tässä instansissa. Pyydä ylläpitäjää ottamaan se käyttöön.</string>
     <string name="login_connection_required_once">Sinun on oltava verkossa, jotta voit lisätä ensimmäisen tilin ja käyttää PixelDroidia :(</string>
     <string name="whats_an_instance_explanation">Saatat olla hämmentynyt tekstikentästä, jossa kysytään \'instanssisi\' verkkotunnusta.
@@ -38,8 +37,6 @@
     <string name="project_website">Projektin verkkosivu: https://pixeldroid.org</string>
     <string name="add_comment">Lisää kommentti</string>
     <string name="save_to_gallery">Tallenna galleriaan…</string>
-    <string name="no_cancel_edit">Ei, peruuta muokkaukset</string>
-    <string name="save_before_returning">Tallennetaanko muokkaukset\?</string>
     <string name="add_photo">Lisää kuva</string>
     <string name="mention_notification">%1$s mainitsi sinut</string>
     <string name="instance_not_pixelfed_cancel">Peruuta kirjautuminen</string>
@@ -103,7 +100,6 @@
     <string name="invalid_domain">Virheellinen verkkotunnus</string>
     <string name="language">Kieli</string>
     <string name="delete">Poista</string>
-    <string name="toolbar_title_edit">Muokkaa</string>
     <string name="report">Ilmianna</string>
     <string name="hashtag_title">#%1$s</string>
     <string name="about">Tietoja</string>
@@ -115,12 +111,7 @@
     <string name="comment">Kommentti</string>
     <string name="image_download_downloading">Ladataan…</string>
     <string name="gallery_button_alt">Galleria</string>
-    <string name="normal_filter">Normaali</string>
     <string name="edit">Muokkaa</string>
-    <string name="tab_filters">SUODATIN</string>
-    <string name="lbl_saturation">VÄRIKYLLÄISYYS</string>
-    <string name="lbl_contrast">KONTRASTI</string>
-    <string name="lbl_brightness">KIRKKAUS</string>
     <string name="post">julkaise</string>
     <string name="description">Kuvaus…</string>
     <string name="dark_theme">Tumma</string>

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

@@ -25,10 +25,6 @@
     <string name="connect_to_pixelfed">Se connecter à Pixelfed</string>
     <string name="theme_title">Thème de l’application</string>
     <string name="theme_header">Thème</string>
-    <string name="lbl_brightness">Luminosité</string>
-    <string name="lbl_contrast">Contraste</string>
-    <string name="lbl_saturation">Saturation</string>
-    <string name="tab_filters">Filtres</string>
     <string name="edit">Modifier</string>
     <string name="capture_button_alt">Prendre une photo</string>
     <string name="switch_camera_button_alt">Changer de caméra</string>
@@ -46,7 +42,6 @@
     <string name="upload_picture_failed">Erreur de téléversement d\'image !</string>
     <string name="save_image_success">Image enregistrée avec succès</string>
     <string name="save_image_failed">Impossible d\'enregistrer l\'image</string>
-    <string name="permission_denied">Permission refusée</string>
     <string name="dark_theme">Sombre</string>
     <string name="light_theme">Clair</string>
     <string name="default_system">Par défaut (selon votre système)</string>
@@ -58,7 +53,6 @@
     <string name="default_nfollowers">- 
 \nAbonné·e·s</string>
     <string name="upload_post_error">Le téléversement de la publication a échoué</string>
-    <string name="normal_filter">Normal</string>
     <string name="loading_toast">Une erreur s\'est produite lors du chargement</string>
     <string name="feed_failed">Impossible d\'obtenir le flux</string>
     <string name="no_description">Sans description</string>
@@ -88,17 +82,12 @@
     <string name="retry">Réessayez</string>
     <string name="posting_image_accessibility_hint">Image en cours de publication</string>
     <string name="media_upload_failed">Échec du téléversement du média, réessayez ou vérifiez l\'état du réseau</string>
-    <string name="crop_result_error">Impossible de récupérer l\'image après le recadrage</string>
-    <string name="busy_dialog_ok_button">D\'accord, attendez pour ça.</string>
-    <string name="busy_dialog_text">Toujours en train de traiter l\'image, attendez tout d\'abord que cela se termine !</string>
     <string name="nothing_to_see_here">Rien à voir ici !</string>
     <string name="issues_contribute">Signaler des problèmes ou contribuer à l\'application :</string>
     <string name="something_went_wrong">Il y a eu un problème…</string>
     <string name="reported">Signalé {gmd_check_circle}</string>
     <string name="report_target">Signaler la publication de @%1$s</string>
     <string name="report">Signaler</string>
-    <string name="image_preview">Aperçu de l\'image en cours de modification</string>
-    <string name="filter_thumbnail">Vignette d\'un filtre</string>
     <string name="mascot_description">Image montrant un panda rouge (la mascotte de Pixelfed) utilisant un téléphone</string>
     <string name="help_translate">Aidez à traduire PixelDroid dans votre langue :</string>
     <string name="language">Langue</string>
@@ -106,7 +95,6 @@
     <string name="delete">Supprimer</string>
     <string name="discover">DÉCOUVRIR</string>
     <string name="profile_picture">Photo de profil</string>
-    <string name="toolbar_title_edit">Modifier</string>
     <string name="report_error">Échec lors de l\'envoi du signalement</string>
     <string name="optional_report_comment">Message facultatif pour les modérateurs/admins</string>
     <string name="share_link">Partager le lien</string>
@@ -122,7 +110,6 @@
     <string name="post_is_album">Cette publication est un album</string>
     <string name="submit_comment">Envoyer le commentaire</string>
     <string name="add_comment">Ajouter un commentaire</string>
-    <string name="crop_button">Bouton pour effectuer une rotation ou recadrement de l\'image</string>
     <string name="post_image">Une des images de la publication</string>
     <string name="add_photo">Ajouter une photo</string>
     <string name="poll_notification">Le sondage de %1$s est terminé</string>
@@ -131,8 +118,6 @@
     <string name="instance_not_pixelfed_warning">Il ne semble pas s\'agir d\'une instance Pixelfed, l\'application pourrait rencontrer des bugs de manière inattendue.</string>
     <string name="switch_to_carousel">Changer vers la vue carrousel</string>
     <string name="switch_to_grid">Changer vers la vue en grille</string>
-    <string name="no_cancel_edit">Non, annuler la modification</string>
-    <string name="save_before_returning">Enregistrer vos modifications \?</string>
     <string name="panda_pull_to_refresh_to_try_again">Ce panda est malheureux. Glissez pour actualiser et réessayer.</string>
     <string name="open_drawer_menu">Ouvrir le menu latéral</string>
     <string name="follows_title">Abonnements de %1$s</string>

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

@@ -17,10 +17,6 @@
     <string name="post">Publicar</string>
     <string name="whats_an_instance">Que é unha instancia\?</string>
     <string name="logout">Saír</string>
-    <string name="lbl_brightness">Brillo</string>
-    <string name="lbl_contrast">Contraste</string>
-    <string name="lbl_saturation">Saturación</string>
-    <string name="tab_filters">Filtros</string>
     <string name="edit">EDITAR</string>
     <string name="save_to_gallery">Gardar na Galería…</string>
     <string name="image_download_downloading">Descargando…</string>
@@ -72,7 +68,6 @@
     <string name="no_description">Sen descrición</string>
     <string name="feed_failed">Non se obtivo a fonte</string>
     <string name="loading_toast">Algo fallou ao realizar a subida</string>
-    <string name="normal_filter">Normal</string>
     <string name="upload_post_error">Erro ao subir a publicación</string>
     <string name="upload_post_success">Publicación correcta</string>
     <string name="upload_post_failed">Fallou a subida da publicación</string>
@@ -80,7 +75,6 @@
     <string name="picture_format_error">Erro na subida: formato de imaxe non válido.</string>
     <string name="upload_picture_failed">Erro ao subir a foto!</string>
     <string name="save_image_failed">Non se gardou a imaxe</string>
-    <string name="permission_denied">Permiso denegado</string>
     <string name="dark_theme">Escuro</string>
     <string name="light_theme">Claro</string>
     <string name="default_system">Por omisión (do sistema)</string>
@@ -89,9 +83,6 @@
     <string name="media_upload_completed">Subida do multimedia completada</string>
     <string name="retry">Reintentar</string>
     <string name="nothing_to_see_here">Nada por aquí!</string>
-    <string name="crop_result_error">Tras o recorte non se puido obter a imaxe</string>
-    <string name="busy_dialog_ok_button">OK, agardo.</string>
-    <string name="busy_dialog_text">Estase procesando a imaxe, agarda a que remate!</string>
     <string name="instance_not_pixelfed_warning">Non semella ser unha instancia Pixelfed, polo que a app podería non funcionar correctamente.</string>
     <string name="instance_not_pixelfed_continue">Ok, adiante igualmente</string>
     <string name="instance_not_pixelfed_cancel">Cancelar o acceso</string>
@@ -112,7 +103,6 @@
     <string name="report_target">Denuncia a publicación de %1$s</string>
     <string name="reported">Publicación denunciada</string>
     <string name="report_error">Non se puido enviar a denuncia</string>
-    <string name="toolbar_title_edit">Editar</string>
     <string name="profile_picture">Imaxe de perfil</string>
     <string name="open_drawer_menu">Abrir o menú do editor</string>
     <string name="discover">DESCUBRIR</string>
@@ -160,11 +150,6 @@
         <item quantity="one">%d Gústame</item>
         <item quantity="other">%d Gústame</item>
     </plurals>
-    <string name="no_cancel_edit">Non, cancela a edición</string>
-    <string name="save_before_returning">Gardar a edición\?</string>
-    <string name="crop_button">Botón para recortar ou rotar a imaxe</string>
-    <string name="image_preview">Vista previa da imaxe a ser editada</string>
-    <string name="filter_thumbnail">Miniatura do filtro</string>
     <string name="upload_error">Código de erro devolto polo servidor: %1$d</string>
     <string name="size_exceeds_instance_limit">O tamaño do número de imaxes %1$d no álbume supera o máximo permitido pola instancia (%2$d kB pero o límite é %3$d kB). É posible que non poidas subilas.</string>
     <string name="total_exceeds_album_limit">Elexiches máis imaxes das que permite o servidor (%1$s). As imaxes que superan o límite serán ignoradas.</string>
@@ -217,9 +202,6 @@
     <string name="post_is_video">Esta publicación é un vídeo</string>
     <string name="no_storage_permission">Non tes permiso de almacenaxe, concede o permiso nos axustes se queres permitir que PixelDroid mostre a miniatura</string>
     <string name="play_video">Reproducir vídeo</string>
-    <string name="video_edit_not_yet_supported">Aínda non hai soporte para edición de vídeo</string>
-    <string name="reset_edit_menu">RESTABLECER</string>
-    <string name="save_edit_menu">GARDAR</string>
     <string name="encode_error">Erro ao codificar</string>
     <string name="encode_success">Codificación correcta!</string>
     <string name="encode_progress">Codificar %1$d%%</string>
@@ -228,9 +210,6 @@
     <string name="new_post_shortcut_short">Nova publicación</string>
     <string name="follow_request">%1$s solicitou seguirte</string>
     <string name="status_notification">%1$s creou unha publicación</string>
-    <string name="thumbnail_reel_video_edit">Fila mostrando as miniaturas do vídeo que estás editando</string>
-    <string name="select_video_range">Elixe a parte a conservar do vídeo</string>
-    <string name="error_editing">Erro ao editar</string>
     <string name="color_choice_button">Elixe esta cor</string>
     <string name="notification_thumbnail">Miniatura da imaxe na notificación desta publicación</string>
     <string name="home_feed">Inicio</string>

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

@@ -7,13 +7,8 @@
     <string name="new_post_shortcut_short">Új bejegyzés</string>
     <string name="new_post_shortcut_long">Új bejegyzés létrehozása</string>
     <string name="still_encoding">Egy vagy több videó még kódolás alatt áll. A feltöltés előtt várjon a befejeződésükre.</string>
-    <string name="select_video_range">Válassza ki, hogy mit tart meg a videóból</string>
     <string name="encode_success">A kódolás sikeres!</string>
     <string name="encode_error">Hiba a kódoláskor</string>
-    <string name="save_edit_menu">MENTÉS</string>
-    <string name="reset_edit_menu">VISSZAÁLLÍTÁS</string>
-    <string name="thumbnail_reel_video_edit">A szerkesztett videó bélyegképeit tartalmazó filmtekercs</string>
-    <string name="video_edit_not_yet_supported">A videószerkesztés még nem támogatott</string>
     <string name="play_video">Videó lejátszása</string>
     <string name="no_storage_permission">A tároló engedély nincs megadva, adja meg a beállításokban, ha szeretné, hogy a PixelDroid megjelenítse a bélyegképet</string>
     <string name="no_camera_permission">A kamera engedély nincs megadva, adja meg a beállításokban, ha szeretné, hogy a PixelDroid használhassa a kamerát</string>
@@ -34,7 +29,6 @@
     <string name="discover">FELFEDEZÉS</string>
     <string name="open_drawer_menu">Fiókmenü megnyitása</string>
     <string name="profile_picture">Profilkép</string>
-    <string name="toolbar_title_edit">Szerkesztés</string>
     <string name="report_error">A jelentés elküldése sikertelen</string>
     <string name="reported">Jelentve {gmd_check_circle}</string>
     <string name="report_target">\@%1$s bejegyzésének jelentése</string>
@@ -136,20 +130,7 @@
     <string name="gallery_button_alt">Galéria</string>
     <string name="switch_camera_button_alt">Kamera váltása</string>
     <string name="capture_button_alt">Rögzítés</string>
-    <string name="no_cancel_edit">Nem, a szerkesztés megszakítása</string>
-    <string name="save_before_returning">Menti a szerkesztéseit\?</string>
-    <string name="crop_button">Gomb a kép levágásához vagy forgatásához</string>
-    <string name="image_preview">A szerkesztett kép előnézete</string>
-    <string name="crop_result_error">A kép lekérése a vágás után sikertelen</string>
-    <string name="busy_dialog_ok_button">Rendben, megvárom.</string>
-    <string name="busy_dialog_text">A kép még feldolgozás alatt van, várjon, hogy befejeződjön!</string>
-    <string name="normal_filter">Normál</string>
-    <string name="filter_thumbnail">A szűrő bélyegképe</string>
     <string name="edit">Szerkesztés</string>
-    <string name="tab_filters">SZŰRŐK</string>
-    <string name="lbl_saturation">TELÍTETTSÉG</string>
-    <string name="lbl_contrast">KONTRASZT</string>
-    <string name="lbl_brightness">FÉNYERŐ</string>
     <string name="upload_error">A kiszolgáló által visszaadott hibakód: %1$d</string>
     <string name="video_not_supported">A használt kiszolgáló nem támogatja a videók feltöltését, lehet hogy nem fogja tudni feltölteni a bejegyzésben szereplő videókat</string>
     <string name="size_exceeds_instance_limit">Az album %1$d. képének mérete túllépi a példány által megengedett legnagyobb méretet (%2$d kB a méret, de a korlát %3$d kB-os). Lehet, hogy nem fogja tudni feltölteni.</string>
@@ -174,7 +155,6 @@
     </plurals>
     <string name="save_image_success">A kép mentése sikeres</string>
     <string name="save_image_failed">A kép nem menthető</string>
-    <string name="permission_denied">Hozzáférés megtagadva</string>
     <string name="add_account_description">Másik Pixelfed-fiók hozzáadása</string>
     <string name="add_account_name">Fiók hozzáadása</string>
     <string name="logout">Kijelentkezés</string>

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

@@ -17,7 +17,6 @@
     <string name="whats_an_instance">Apa itu instansi\?</string>
     <string name="logout">Keluar</string>
     <string name="add_account_description">Tambahkan Akun Pixelfed lain</string>
-    <string name="permission_denied">Izin ditolak</string>
     <string name="save_image_success">Gambar berhasil disimpan</string>
     <string name="picture_format_error">Kesalahan pengunggahan: format gambar salah.</string>
     <string name="request_format_error">Kesalahan pengunggahan: format permintaan buruk</string>
@@ -25,17 +24,7 @@
     <string name="post">postingan</string>
     <string name="save_image_description">Simpan keterangan gambar</string>
     <string name="upload_error">Kode kesalahan yang dikembalikan oleh server: %1$d</string>
-    <string name="lbl_brightness">KECERAHAN</string>
-    <string name="lbl_contrast">KONTRAS</string>
-    <string name="lbl_saturation">KEJENUHAN</string>
-    <string name="tab_filters">FILTER-FILTER</string>
     <string name="edit">Sunting</string>
-    <string name="normal_filter">Normal</string>
-    <string name="busy_dialog_text">Masih memproses gambar, tunggu sampai itu selesai dahulu!</string>
-    <string name="busy_dialog_ok_button">Oke, tunggu itu.</string>
-    <string name="crop_result_error">Tidak dapat menerima gambar setelah pemotongan</string>
-    <string name="save_before_returning">Simpan suntingan-suntingan Anda\?</string>
-    <string name="no_cancel_edit">Tidak, batalkan suntingan</string>
     <string name="capture_button_alt">Tangkap</string>
     <string name="switch_camera_button_alt">Ubah kamera</string>
     <string name="gallery_button_alt">Galeri</string>
@@ -107,7 +96,6 @@
     <string name="optional_report_comment">Pesan opsional untuk para mod/admin</string>
     <string name="report_target">Laporkan postingan @%1$s</string>
     <string name="report_error">Tidak dapat mengirim laporan</string>
-    <string name="toolbar_title_edit">Sunting</string>
     <string name="profile_picture">Gambar profil</string>
     <string name="discover">TEMUKAN</string>
     <string name="something_went_wrong">Suatu kesalahan terjadi…</string>
@@ -140,7 +128,6 @@
     <string name="switch_to_carousel">Beralih ke karosel</string>
     <string name="no_media_description">Tambahkan sebuah keterangan media di sini…</string>
     <string name="size_exceeds_instance_limit">Ukuran gambar nomor %1$d di album melewati ukuran maksimum yang diperbolehkan oleh instansi ini (%2$d kB tetapi batasnya %3$d kB). Anda mungkin tidak dapat mengunggahnya.</string>
-    <string name="crop_button">Tombol untuk memotong atau memutar gambar</string>
     <string name="image_download_failed">Pengunduhan gagal, mohon coba lagi</string>
     <string name="no_description">Tidak ada keterangan</string>
     <string name="write_permission_download_pic">Anda harus memberikan izin menulis untuk mengunduh gambar!</string>

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

@@ -13,15 +13,11 @@
     <string name="followed_notification">%1$s ti ha seguito</string>
     <string name="mention_notification">%1$s ti ha menzionato</string>
     <string name="liked_notification">%1$s è piaciuto il tuo post</string>
-    <string name="tab_filters">FILTRI</string>
     <string name="post">invia</string>
-    <string name="lbl_brightness">LUMINOSITÀ</string>
     <string name="description">Descrizione…</string>
     <string name="whats_an_instance">Cos\'è un\'istanza\?</string>
     <string name="logout">Disconnettersi</string>
-    <string name="lbl_saturation">SATURAZIONE</string>
     <string name="connect_to_pixelfed">Connetti a Pixelfed</string>
-    <string name="lbl_contrast">CONTRASTO</string>
     <string name="save_to_gallery">Salva nella galleria…</string>
     <string name="image_download_failed">Il download non è riuscito, per favore riprova</string>
     <string name="share_picture">Condividi immagine…</string>
@@ -38,7 +34,6 @@
     <string name="login_connection_required_once">Devi essere online per poter aggiungere il primo account e utilizzare PixelDroid :(</string>
     <string name="invalid_domain">Dominio non valido</string>
     <string name="edit">MODIFICA</string>
-    <string name="permission_denied">Permesso negato</string>
     <string name="instance_error">Impossibile ottenere informazioni sull\'istanza</string>
     <string name="save_image_failed">Impossibile salvare l\'immagine</string>
     <string name="light_theme">Chiaro</string>
@@ -54,7 +49,6 @@
     <string name="upload_post_failed">Caricamento post non riuscito</string>
     <string name="upload_post_success">Post caricato correttamente</string>
     <string name="retry">Riprova</string>
-    <string name="normal_filter">Normale</string>
     <string name="feed_failed">Impossibile ottenere il feed</string>
     <string name="no_description">Nessuna descrizione</string>
     <string name="posted_on">Postato su %1$s</string>
@@ -88,9 +82,6 @@
     <string name="follow_button_failed">Impossibile visualizzare il tasto segui</string>
     <string name="follow_status_failed">Impossibile ottenere lo stato segui</string>
     <string name="default_system">Predefinito (Segue il sistema)</string>
-    <string name="crop_result_error">Impossibile recuperare l\'immagine dopo il ritaglio</string>
-    <string name="busy_dialog_ok_button">Ok, aspetta.</string>
-    <string name="busy_dialog_text">Elaborando ancora l\'immagine, attendi che finisca prima!</string>
     <string name="nothing_to_see_here">Niente da vedere quì!</string>
     <string name="instance_not_pixelfed_warning">Questa non sembra essere un\'istanza di Pixelfed, quindi l\'app potrebbe interrompersi in modi inaspettati.</string>
     <string name="instance_not_pixelfed_cancel">Annullare l\'accesso</string>
@@ -98,7 +89,6 @@
     <string name="discover">SCOPRI</string>
     <string name="open_drawer_menu">Apri il menu a scomparsa</string>
     <string name="profile_picture">Foto profilo</string>
-    <string name="toolbar_title_edit">Modifica</string>
     <string name="report_error">Impossibile inviare la segnalazione</string>
     <string name="reported">Segnalato {gmd_check_circle}</string>
     <string name="report_target">Segnala @%1$s\'s post</string>
@@ -129,14 +119,9 @@
     <string name="post_is_album">Questo post è un album</string>
     <string name="submit_comment">Invia commento</string>
     <string name="add_comment">Aggiungi un commento</string>
-    <string name="crop_button">Pulsante per ritagliare o ruotare l\'immagine</string>
-    <string name="image_preview">Anteprima dell\'immagine in fase di modifica</string>
-    <string name="filter_thumbnail">Miniatura del filtro</string>
     <string name="post_image">Una delle immagini nel post</string>
     <string name="verify_credentials">Impossibile ottenere le informazioni sull\'utente</string>
     <string name="switch_to_grid">Passa alla visualizzazione a griglia</string>
-    <string name="no_cancel_edit">No, cancella la modifica</string>
-    <string name="save_before_returning">Salavre le tue modifiche\?</string>
     <string name="switch_to_carousel">Passa alla panoramica</string>
     <string name="whats_an_instance_explanation">Potresti essere confuso dal campo di testo che chiede il dominio della tua \'instanza\'.
 \n

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

@@ -14,10 +14,6 @@
     <string name="post">送信</string>
     <string name="whats_an_instance">インスタンスとは？</string>
     <string name="logout">ログアウト</string>
-    <string name="lbl_brightness">輝度</string>
-    <string name="lbl_contrast">コントラスト</string>
-    <string name="lbl_saturation">サチュレーション</string>
-    <string name="tab_filters">フィルター</string>
     <string name="save_to_gallery">ギャラリーに保存…</string>
     <string name="image_download_downloading">ダウンロード中…</string>
     <string name="image_download_success">画像のダウンロードに成功しました</string>
@@ -75,7 +71,6 @@
     <string name="no_description">説明はありません</string>
     <string name="feed_failed">フィードを取得できませんでした</string>
     <string name="loading_toast">読み込み中に問題が発生しました</string>
-    <string name="normal_filter">ノーマル</string>
     <string name="upload_post_error">投稿のアップロードに失敗しました</string>
     <string name="upload_post_success">投稿のアップロードに成功しました</string>
     <string name="upload_post_failed">投稿のアップロードに失敗しました</string>
@@ -84,12 +79,8 @@
     <string name="upload_picture_failed">画像アップロードエラー</string>
     <string name="save_image_success">画像が保存されました</string>
     <string name="save_image_failed">画像を保存できません</string>
-    <string name="permission_denied">権限がありません</string>
     <string name="dark_theme">ダーク</string>
     <string name="light_theme">ライト</string>
     <string name="default_system">デフォルト(システム設定)</string>
-    <string name="busy_dialog_ok_button">お待ちください。</string>
-    <string name="busy_dialog_text">画像を処理しています。しばらくお待ちください。</string>
     <string name="nothing_to_see_here">ここには何もありません！</string>
-    <string name="crop_result_error">トリミング後に画像を取得できませんでした</string>
 </resources>

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

@@ -2,7 +2,6 @@
 <resources>
     <string name="save_image_description">ഇമേജ് വിവരണം സംരക്ഷിക്കുക</string>
     <string name="description">വിവരണം…</string>
-    <string name="permission_denied">അനുമതി നിഷേധിച്ചു</string>
     <string name="instance_not_pixelfed_cancel">പ്രവേശിക്കുന്നത് റദ്ദാക്കുക</string>
     <string name="instance_not_pixelfed_continue">ശരി, എന്തായാലും തുടരുക</string>
     <string name="invalid_domain">അസാധുവായ മേഖല</string>
@@ -11,7 +10,6 @@
     <string name="language">ഭാഷ</string>
     <string name="delete_dialog">ഈ പോസ്റ്റ് ഇല്ലാതാക്കണോ\?</string>
     <string name="delete">ഇല്ലാതാക്കൂ</string>
-    <string name="toolbar_title_edit">തിരുത്തുക</string>
     <string name="about">കുറിച്ച്</string>
     <string name="about_pixeldroid">PixelDroid-നെ കുറിച്ച്</string>
     <string name="accounts">അക്കൗണ്ടുകൾ</string>
@@ -32,7 +30,6 @@
     <string name="followed_notification">%1$s നിങ്ങളെ പിന്തുടർന്നു</string>
     <string name="theme_header">തീം</string>
     <string name="title_activity_settings2">ക്രമീകരണങ്ങൾ</string>
-    <string name="normal_filter">സാധാരണ</string>
     <string name="menu_settings">ക്രമീകരണ</string>
     <string name="app_name">PixelDroid</string>
     <string name="media_upload_completed">മീഡിയ അപ്‌ലോഡ് പൂർത്തിയായി</string>
@@ -56,7 +53,6 @@
         <item quantity="other">%d
 \nപോസ്റ്റുകൾ</item>
     </plurals>
-    <string name="busy_dialog_ok_button">ശരി, അതിനായി കാത്തിരിക്കുക.</string>
     <string name="upload_post_success">പോസ്റ്റ് അപ്‌ലോഡുചെയ്‌തു</string>
     <string name="upload_post_failed">പോസ്റ്റ് അപ്‌ലോഡ് പരാജയപ്പെട്ടു</string>
     <string name="save_image_success">ചിത്രം സംരക്ഷിച്ചു</string>
@@ -83,11 +79,6 @@
     <string name="gallery_button_alt">ഗാലറി</string>
     <string name="switch_camera_button_alt">ക്യാമറ മാറ്റുക</string>
     <string name="capture_button_alt">എടുക്കുക</string>
-    <string name="no_cancel_edit">ഇല്ല, എഡിറ്റ് റദ്ദാക്കുക</string>
-    <string name="lbl_contrast">ദൃശ്യതീവ്രത</string>
-    <string name="lbl_saturation">സാച്ചുറേഷൻ</string>
-    <string name="tab_filters">ഫിൽട്ടറുകൾ</string>
-    <string name="lbl_brightness">തെളിച്ചം</string>
     <string name="no_media_description">ഒരു മീഡിയ വിവരണം ഇവിടെ ചേർക്കുക…</string>
     <string name="logout">പുറത്തു കടക്കുക</string>
     <string name="whats_an_instance">ഒരു ഇൻസ്റ്റൻസ് എന്താണ്\?</string>
@@ -95,11 +86,9 @@
     <string name="menu_account">എന്റെ പ്രൊഫൈൽ</string>
     <string name="upload_post_error">പോസ്റ്റ് അപ്‌ലോഡ് പിശക്</string>
     <string name="switch_to_carousel">കറൗസലിലേക്ക് മാറുക</string>
-    <string name="save_before_returning">നിങ്ങളുടെ മാറ്റങ്ങൾ സംരക്ഷിക്കണോ\?</string>
     <string name="post_is_album">ഈ പോസ്റ്റ് ഒരു ആൽബമാണ്</string>
     <string name="action_not_allowed">ഈ പ്രവർത്തനം അനുവദനീയമല്ല</string>
     <string name="hashtags">ഹാഷ്‌ടാഗുകൾ</string>
-    <string name="busy_dialog_text">ഇപ്പോഴും ഇമേജ് പ്രോസസ്സ് ചെയ്യുന്നു, ആദ്യം അത് പൂർത്തിയാകാൻ കാത്തിരിക്കുക!</string>
     <string name="hashtag_title">#%1$s</string>
     <string name="default_system">സ്ഥിരസ്ഥിതി (സിസ്റ്റം പിന്തുടരുന്നു)</string>
     <string name="login_connection_required_once">PixelDroid ഉപയോഗിക്കാനും ഒരു അക്കൗണ്ട് ചേർക്കാനും നിങ്ങൾ ഓൺലൈനിൽ ആയിരിക്കണം :(</string>

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

@@ -26,10 +26,6 @@
     <string name="share_picture">Afbeelding delen…</string>
     <string name="cw_nsfw_hidden_media_n_click_to_show">CW / NSFW / Verborgen Media
 \n (Klik om weer te geven)</string>
-    <string name="lbl_brightness">Helderheid</string>
-    <string name="lbl_contrast">CONTRAST</string>
-    <string name="lbl_saturation">VERZADIGING</string>
-    <string name="tab_filters">FILTERS</string>
     <string name="edit">BEWERKEN</string>
     <string name="capture_button_alt">Vastleggen</string>
     <string name="switch_camera_button_alt">Van camera wisselen</string>
@@ -55,7 +51,6 @@
     <string name="empty_comment">Commentaar mag niet leeg zijn!</string>
     <string name="no_description">Geen beschrijving</string>
     <string name="loading_toast">Er ging iets mis tijdens het laden</string>
-    <string name="normal_filter">Normaal</string>
     <string name="picture_format_error">Uploadfout: verkeerd beeldformaat.</string>
     <string name="save_image_success">Beeld succesvol opgeslagen</string>
     <string name="upload_post_success">Post met succes geüpload</string>
@@ -67,7 +62,6 @@
     <string name="upload_post_error">Post-upload mislukt</string>
     <string name="upload_post_failed">Kon post niet uploaden</string>
     <string name="save_image_failed">Kon afbeelding niet opslaan</string>
-    <string name="permission_denied">Toestemming geweigerd</string>
     <string name="default_system">Standaard (systeem instelling)</string>
     <string name="instance_error">Kon instance-informatie niet ophalen</string>
     <string name="request_format_error">Fout bij het uploaden: slecht verzoekformaat</string>
@@ -79,9 +73,6 @@
     <string name="write_permission_share_pic">Je moet schrijven toestaan om afbeeldingen te delen!</string>
     <string name="write_permission_download_pic">Je moet schrijven toestaan om afbeeldingen te downloaden!</string>
     <string name="follow_status_failed">Kon volgstatus niet ophalen</string>
-    <string name="busy_dialog_ok_button">Ok, wacht.</string>
-    <string name="crop_result_error">Kon de afbeelding niet ophalen na bijsnijden</string>
-    <string name="busy_dialog_text">Bezig met het verwerken van de afbeelding, wacht even tot dat het klaar is!</string>
     <string name="follow_error">Kon niet volgen</string>
     <string name="feed_failed">Kon de feed niet halen</string>
     <string name="nothing_to_see_here">Niets te zien hier!</string>
@@ -95,9 +86,6 @@
     <string name="share_link">Link delen</string>
     <string name="status_more_options">Meer opties</string>
     <string name="unfollow">Stoppen met volgen</string>
-    <string name="crop_button">Knop om de afbeelding af te snijden of te draaien</string>
-    <string name="image_preview">Voorbeeld van de afbeelding die bewerkt wordt</string>
-    <string name="filter_thumbnail">Miniatuur van de filter</string>
     <string name="post_image">Een van de afbeeldingen in de post</string>
     <string name="verify_credentials">Kon gebruiker informatie niet verkrijgen</string>
     <string name="mascot_description">Afbeelding dat een rode panda (de mascotte van Pixelfed) toont, in gebruik van een telefoon</string>
@@ -110,7 +98,6 @@
     <string name="something_went_wrong">Er is iets misgegaan…</string>
     <string name="discover">ONTDEK</string>
     <string name="profile_picture">Profiel afbeelding</string>
-    <string name="toolbar_title_edit">Bewerken</string>
     <string name="optional_report_comment">Optioneel bericht voor moderators/admins</string>
     <string name="about">Over</string>
     <string name="license_info">PixelDroid is vrije software, gelicenseerd onder de GNU General Public License (versie 3 of hoger)</string>
@@ -126,8 +113,6 @@
     <string name="instance_not_pixelfed_warning">Dit is geen Pixelfed instantie, dus de app zou zich op onverwachte wijze kunnen gedragen.</string>
     <string name="report">Melden</string>
     <string name="poll_notification">De peiling van %1$s is beëindigd</string>
-    <string name="save_before_returning">Wijzigingen opslaan\?</string>
-    <string name="no_cancel_edit">Nee, bewerken annuleren</string>
     <string name="delete_post_failed_error">Kon post niet verwijderen, error %1$d</string>
     <string name="delete_post_failed_io_except">Kon post niet verwijderen, controleer je verbinding\?</string>
     <plurals name="number_comments">

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

@@ -29,14 +29,7 @@
     <string name="description">Opis…</string>
     <string name="post">Post</string>
     <string name="add_photo">Dodaj zdjęcie</string>
-    <string name="lbl_brightness">Jasność</string>
-    <string name="lbl_contrast">Kontrast</string>
-    <string name="lbl_saturation">Nasycenie</string>
-    <string name="tab_filters">Filtry</string>
     <string name="edit">EDYCJA</string>
-    <string name="normal_filter">Zwykły</string>
-    <string name="busy_dialog_ok_button">OK, zaczekam.</string>
-    <string name="crop_result_error">Nie udało się pobrać obrazka po przycięciu</string>
     <string name="capture_button_alt">Zrób zdjęcie</string>
     <string name="switch_camera_button_alt">Przełącz aparat</string>
     <string name="gallery_button_alt">Galeria</string>
@@ -61,10 +54,8 @@
     <string name="liked_notification">%1$s polubień</string>
     <string name="whats_an_instance">Co to jest instancja\?</string>
     <string name="login_connection_required_once">Musisz być online, aby dodać konto i korzystać z PixelDroida :(</string>
-    <string name="permission_denied">Brak dostępu</string>
     <string name="picture_format_error">Błąd wgrywania na serwer: niewłaściwy format pliku.</string>
     <string name="upload_post_error">Błąd podczas publikacji posta</string>
-    <string name="busy_dialog_text">Przetwarzam obrazek, zaczekaj aż skończę!</string>
     <string name="loading_toast">Coś poszło nie tak podczas ładowania</string>
     <string name="save_to_gallery">Zapisz w galerii…</string>
     <string name="image_download_failed">Błąd pobierania, spróbuj ponownie</string>
@@ -87,7 +78,6 @@
     </plurals>
     <string name="delete">Usuń</string>
     <string name="delete_dialog">Czy usunąć ten post\?</string>
-    <string name="no_cancel_edit">Nie, odrzuć edycję</string>
     <string name="switch_to_carousel">Przełącz na karuzelę</string>
     <plurals name="replies_count">
         <item quantity="one">%d odpowiedź</item>
@@ -117,10 +107,7 @@
     <string name="follow_requested">Prośba obserwacji</string>
     <string name="dialog_message_cancel_follow_request">Anulować prośbę obserwacji\?</string>
     <string name="delete_post_failed_io_except">Nie udało się usunąć posta, sprawdź swoje połączenie internetowe\?</string>
-    <string name="filter_thumbnail">Miniaturka filtra</string>
     <string name="post_image">Jedno ze zdjęć w tym poście</string>
-    <string name="crop_button">Przycisk do przycinania lub obracania zdjęcia</string>
-    <string name="image_preview">Podgląd edytowanego zdjęcia</string>
     <string name="no_camera_permission">Dostęp do aparatu nie został przyznany, przyznaj dostęp w ustawieniach jeśli chcesz, aby PixelDroid korzystał z kamery</string>
     <string name="no_storage_permission">Dostęp do pamięci nie został przyznany, przyznaj dostęp w ustawieniach, jeśli chcesz, aby PixelDroid wyświetlał miniatury</string>
     <plurals name="nb_posts">
@@ -167,7 +154,6 @@
     <string name="search">Szukaj</string>
     <string name="post_title">post %1$s</string>
     <string name="reported">Post zgłoszony</string>
-    <string name="toolbar_title_edit">Edytuj</string>
     <string name="open_drawer_menu">Otwórz menu szuflady</string>
     <string name="something_went_wrong">Coś poszło nie tak…</string>
     <string name="profile_picture">Zdjęcie profilowe</string>
@@ -178,10 +164,8 @@
     <string name="file_not_found">Plik %1$s nie został odnaleziony</string>
     <string name="switch_to_grid">Zmień na widok siatki</string>
     <string name="unfollow">Anuluj obserwowanie</string>
-    <string name="save_before_returning">Zapisać edycję\?</string>
     <string name="media_upload_failed">Wysyłanie multimediów nie udało się, spróbuj ponownie lub sprawdź swoje połączenie sieciowe</string>
     <string name="posting_image_accessibility_hint">Zdjęcie, które jest publikowane</string>
-    <string name="error_editing">Błąd podczas edycji</string>
     <string name="nothing_to_see_here">Nic tu nie ma!</string>
     <string name="about_pixeldroid">O PixelDroid</string>
     <string name="accounts">KONTA</string>
@@ -221,12 +205,8 @@
 \nTo też oznacza, że powinieneś wybrać serwer lub „instancję” Pixelfeda, z której chcesz korzystać. Jeśli nie znasz żadnej, to poszukaj tutaj: https://pixelfed.org/join
 \n
 \nAby uzyskać więcej informacji na temat Pixelfeda, wejdź tutaj: https://pixelfed.org</string>
-    <string name="thumbnail_reel_video_edit">Rolka pokazująca miniaturę edytowanego filmu</string>
-    <string name="reset_edit_menu">ZRESETUJ</string>
-    <string name="save_edit_menu">ZAPISZ</string>
     <string name="encode_success">Sukces kodowania!</string>
     <string name="encode_progress">Kodowanie %1$d%%</string>
-    <string name="select_video_range">Wybierz fragment filmu, który chcesz zachować</string>
     <string name="still_encoding">Jeden lub więcej filmów jest właśnie kodowany. Poczekaj z publikacją do zakończenia tego procesu</string>
     <string name="new_post_shortcut_long">Stwórz nowy post</string>
     <string name="new_post_shortcut_short">Nowy post</string>
@@ -267,7 +247,6 @@
     <string name="help_translate">Pomóż przetłumaczyć PixelDroid na Twój język:</string>
     <string name="login_notifications">Nie udało się uzyskać najnowszych powiadomień</string>
     <string name="play_video">Odtwórz wideo</string>
-    <string name="video_edit_not_yet_supported">Edytowanie filmów nie jest wspierane</string>
     <string name="follow_request">%1$s poprosił Cię o obserwowanie</string>
     <string name="profile_error">Niepowodzenie podczas ładowania profilu</string>
     <string name="from_other_domain">Z %1$s</string>

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

@@ -23,10 +23,6 @@
     <string name="image_download_failed">O download falhou. Por favor, tente novamente</string>
     <string name="save_to_gallery">Salvar na Galeria…</string>
     <string name="edit">EDITAR</string>
-    <string name="tab_filters">FILTROS</string>
-    <string name="lbl_saturation">SATURAÇÃO</string>
-    <string name="lbl_contrast">CONTRASTE</string>
-    <string name="lbl_brightness">BRILHO</string>
     <string name="logout">Sair</string>
     <string name="whats_an_instance">O que é uma instância\?</string>
     <string name="post">publicar</string>
@@ -41,11 +37,9 @@
     <string name="menu_settings">Configurações</string>
     <string name="menu_account">Meu Perfil</string>
     <string name="app_name">PixelDroid</string>
-    <string name="no_cancel_edit">Não, cancelar edição</string>
     <string name="help_translate">Ajude a traduzir o PixelDroid para o seu idioma:</string>
     <string name="delete">Excluir</string>
     <string name="discover">DESCOBRIR</string>
-    <string name="toolbar_title_edit">Editar</string>
     <string name="share_link">Compartilhar link</string>
     <string name="report">Denunciar</string>
     <string name="status_more_options">Mais opções</string>
@@ -81,10 +75,6 @@
     </plurals>
     <string name="no_description">Sem descrição</string>
     <string name="feed_failed">Não foi possível obter feed</string>
-    <string name="crop_button">Botão para cortar ou girar a imagem</string>
-    <string name="image_preview">Pré-visualização da imagem a ser editada</string>
-    <string name="busy_dialog_text">Processando imagem, aguarde o término primeiro!</string>
-    <string name="normal_filter">Normal</string>
     <string name="save_image_description">Salvar descrição da imagem</string>
     <string name="post_image">Uma das imagens na publicação</string>
     <string name="add_photo">Adicionar foto</string>
@@ -95,7 +85,6 @@
     <string name="upload_picture_failed">Erro ao publicar imagem!</string>
     <string name="save_image_success">Imagem salva com sucesso</string>
     <string name="save_image_failed">Não foi possível salvar a imagem</string>
-    <string name="permission_denied">Permissão negada</string>
     <string name="dark_theme">Escuro</string>
     <string name="light_theme">Claro</string>
     <string name="verify_credentials">Não foi possível obter informação do usuário</string>
@@ -179,10 +168,6 @@
     <string name="size_exceeds_instance_limit">O tamanho da imagem número %1$d no álbum excede o tamanho máximo permitido pela instância (%2$d kB, mas o limite é %3$d kB). Você não poderá realizar a publicação.</string>
     <string name="total_exceeds_album_limit">Você excedeu o limite máximo que seu servidor permite (%1$s) em número de imagens. Imagens além do limite foram ignoradas.</string>
     <string name="request_format_error">Erro ao publicar: formato incorreto</string>
-    <string name="filter_thumbnail">Miniatura do filtro</string>
-    <string name="crop_result_error">Não é possível recuperar imagem após o corte</string>
-    <string name="busy_dialog_ok_button">OK, aguarde um momento.</string>
-    <string name="save_before_returning">Salvar suas edições\?</string>
     <string name="file_not_found">Arquivo %1$s não encontrado</string>
     <string name="delete_post_failed_io_except">Não foi possível excluir a publicação, verifique sua conexão\?</string>
     <string name="delete_post_failed_error">Não foi possível excluir a publicação. Erro %1$d</string>
@@ -195,7 +180,6 @@
     <string name="hashtag_title">#%1$s</string>
     <string name="new_post_shortcut_short">Nova publicação</string>
     <string name="new_post_shortcut_long">Criar nova publicação</string>
-    <string name="select_video_range">Escolha o que manter do vídeo</string>
     <string name="color_choice_button">Escolher esta cor</string>
     <string name="accentColorSummary">Escolha uma cor</string>
     <string name="accentColorTitle">Cor</string>

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

@@ -58,19 +58,8 @@
     <string name="request_format_error">Erro de envio: formato inválido</string>
     <string name="no_media_description">Adicionar descrição aqui…</string>
     <string name="upload_error">Código de erro enviado pelo servidor: %1$d</string>
-    <string name="lbl_brightness">Brilho</string>
-    <string name="lbl_contrast">Contraste</string>
-    <string name="lbl_saturation">Saturação</string>
-    <string name="tab_filters">Filtros</string>
     <string name="edit">Editar</string>
-    <string name="busy_dialog_text">Espere que acabe de processar a imagem!</string>
-    <string name="busy_dialog_ok_button">Ok, espere que acabe.</string>
-    <string name="save_before_returning">Guardar as edições\?</string>
-    <string name="no_cancel_edit">Não, cancelar edição</string>
-    <string name="image_preview">Pré-visualização da imagem a ser editada</string>
     <string name="size_exceeds_instance_limit">O tamanho da imagem núm. %1$d no álbum ultrapassa o limite de tamanho permitido pela instância (%2$d kB mas o limte é %3$d kB). Poderá não ser possível o envio.</string>
-    <string name="filter_thumbnail">Miniaturas dos filtros</string>
-    <string name="crop_result_error">Não foi possível buscar a imagem após redimensionar</string>
     <string name="capture_button_alt">Capturar</string>
     <string name="switch_camera_button_alt">Mudar câmara</string>
     <string name="gallery_button_alt">Galeria</string>
@@ -154,7 +143,6 @@
     <string name="report">Denunciar</string>
     <string name="share_link">Partilhar Link</string>
     <string name="reported">Publicação denunciada</string>
-    <string name="toolbar_title_edit">Editar</string>
     <string name="profile_picture">Imagem de perfil</string>
     <string name="discover">DESCOBRIR</string>
     <string name="something_went_wrong">Algo correu mal…</string>
@@ -172,7 +160,6 @@
     <string name="login_notifications">Não foi possível buscar as últimas notificações</string>
     <string name="no_camera_permission">Permissão para usar a câmara não permitida. Se quer que PixelDroid use a câmara, adicione a permissão nas definições</string>
     <string name="play_video">Reproduzir vídeo</string>
-    <string name="save_edit_menu">GUARDAR</string>
     <string name="new_post_shortcut_long">Criar nova publicação</string>
     <string name="new_post_shortcut_short">Nova publicação</string>
     <string name="follow_request">%1$s pediu para o seguir</string>
@@ -194,12 +181,9 @@
         <item quantity="one">%d resposta</item>
         <item quantity="other">%d respostas</item>
     </plurals>
-    <string name="video_edit_not_yet_supported">Edição de vídeo ainda não suportada</string>
-    <string name="reset_edit_menu">RESET</string>
     <string name="encode_error">Erro ao codificar</string>
     <string name="encode_success">Codificação com sucesso!</string>
     <string name="encode_progress">Codificação %1$d%%</string>
-    <string name="select_video_range">Selecione o que manter do video</string>
     <string name="still_encoding">Um ou mais vídeos ainda estão a ser codificados. Espere que termine ante do envio</string>
     <string name="verify_credentials">Não foi possível obter informação do utilizador</string>
     <string name="instance_not_pixelfed_warning">Não parece ser uma instância Pixelfed, por isso a aplicação pode terminar de forma inesperada.</string>
@@ -212,12 +196,9 @@
 \nTambém significa que tem de escolher um servidor, ou \"instância\" de Pixelfed a usar. Se não sabe qual usar, veja aqui: https://pixelfed.org/join
 \n
 \nPara mais informação sobre Pixelfed, veja aqui: https://pixelfed.org</string>
-    <string name="permission_denied">Permissão negada</string>
     <string name="upload_post_success">Publicação enviada com sucesso</string>
     <string name="switch_to_carousel">Mudar para vista em carrossel</string>
     <string name="save_image_description">Guardar descrição da imagem</string>
-    <string name="normal_filter">Normal</string>
-    <string name="error_editing">Erro ao editar</string>
     <string name="image_download_failed">A transferência falhou, por favor tente novamente</string>
     <plurals name="number_comments">
         <item quantity="one">%d comentário</item>

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

@@ -10,11 +10,7 @@
     <string name="shared_notification">%1$s поделился(ась) вашим постом</string>
     <string name="post">пост</string>
     <string name="logout">Выйти</string>
-    <string name="lbl_brightness">ЯРКОСТЬ</string>
     <string name="whats_an_instance">Что такое инстанс\?</string>
-    <string name="lbl_contrast">КОНТРАСТ</string>
-    <string name="lbl_saturation">НАСЫЩЕННОСТЬ</string>
-    <string name="tab_filters">ФИЛЬТРЫ</string>
     <string name="edit">РЕДАКТИРОВАТЬ</string>
     <string name="save_to_gallery">Сохранить в Галерею…</string>
     <string name="image_download_downloading">Загрузка…</string>
@@ -52,7 +48,6 @@
     <string name="no_description">Нет описания</string>
     <string name="feed_failed">Не удалось загрузить ленту</string>
     <string name="loading_toast">При загрузке что-то пошло не так</string>
-    <string name="normal_filter">Обычный</string>
     <string name="upload_post_error">Ошибка загрузки поста</string>
     <string name="upload_post_success">Пост успешно загружен</string>
     <string name="upload_post_failed">Не удалось загрузить пост</string>
@@ -61,7 +56,6 @@
     <string name="upload_picture_failed">Ошибка загрузки изображения!</string>
     <string name="save_image_success">Изображение успешно сохранено</string>
     <string name="save_image_failed">Не удалось сохранить изображение</string>
-    <string name="permission_denied">Отказано в доступе</string>
     <string name="dark_theme">Тёмная</string>
     <string name="light_theme">Светлая</string>
     <string name="default_system">По умолчанию (как в системе)</string>
@@ -89,15 +83,11 @@
     <string name="retry">Повторить</string>
     <string name="media_upload_failed">Ошибка загрузки медиа, попробуйте ещё раз или проверьте состояние сети</string>
     <string name="nothing_to_see_here">Здесь нечего смотреть!</string>
-    <string name="crop_result_error">Не удалось получить изображение после обрезки</string>
-    <string name="busy_dialog_ok_button">Ок, ожидайте.</string>
-    <string name="busy_dialog_text">Изображение обрабатывается, пожалуйста, ожидайте!</string>
     <string name="open_drawer_menu">Открыть меню навигации</string>
     <string name="panda_pull_to_refresh_to_try_again">Панде грустно. Потяните, чтобы обновить.</string>
     <string name="something_went_wrong">Что-то пошло не так…</string>
     <string name="discover">ОБЗОР</string>
     <string name="profile_picture">Изображение профиля</string>
-    <string name="toolbar_title_edit">Редактировать</string>
     <string name="report_error">Не удалось отправить жалобу</string>
     <string name="reported">Отправлено {gmd_check_circle}</string>
     <string name="report_target">Пожаловаться на пост @%1$s</string>
@@ -129,8 +119,6 @@
         <item quantity="many">Описание должно содержать максимум %d символов.</item>
         <item quantity="other">Описание должно содержать максимум %d символов.</item>
     </plurals>
-    <string name="no_cancel_edit">Нет, отменить изменения</string>
-    <string name="save_before_returning">Сохранить изменения\?</string>
     <string name="mascot_description">Изображение красной панды, талисман Pixelfed , использующей телефон</string>
     <string name="issues_contribute">Сообщайте о проблемах или вносите свой вклад в приложение:</string>
     <string name="help_translate">Помогите перевести PixelDroid на ваш язык:</string>
@@ -188,8 +176,6 @@
         <item quantity="many">%d Лайков</item>
         <item quantity="other">%d Лайков</item>
     </plurals>
-    <string name="image_preview">Предварительный просмотр редактируемого изображения</string>
-    <string name="filter_thumbnail">Фильтр миниатюр</string>
     <string name="no_media_description">Добавьте описание медиа файла здесь…</string>
     <string name="switch_to_carousel">Показывать в режиме «карусель»</string>
     <string name="whats_an_instance_explanation">Вас может смутить текстовое поле, запрашивающее доменное имя вашего \'инстанса\'.
@@ -199,7 +185,6 @@
 \nЭто также означает, что вы должны выбрать, какой сервер или \'инстанс\' Pixelfed использовать. Если вы еще ничего не знаете об этом, перейдите по ссылке: https://pixelfed.org/join
 \n
 \nДополнительную информации о Pixelfed вы можете посмотреть здесь: https://pixelfed.org</string>
-    <string name="crop_button">Кнопка для обрезки или поворота изображения</string>
     <string name="switch_to_grid">Переключить в вид сетки</string>
     <string name="dialog_message_cancel_follow_request">Отменить запрос на подписку\?</string>
     <string name="follow_requested">Подписаться на запрос</string>
@@ -239,5 +224,4 @@
     <string name="no_camera_permission">Разрешение на использование камеры не предоставлено, выдайте разрешение в настройках, если хотите чтобы PixelDroid использовал камеру</string>
     <string name="no_storage_permission">Разрешение на хранилище не предоставлено, дайте разрешение в настройках, если вы хотите, чтобы PixelDroid показывал миниатюры</string>
     <string name="play_video">Воспроизвести видео</string>
-    <string name="video_edit_not_yet_supported">Редактирование видео ещё не поддерживается</string>
 </resources>

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

@@ -25,10 +25,6 @@
     <string name="post">skicka</string>
     <string name="whats_an_instance">Vad är en instans\?</string>
     <string name="logout">Logga ut</string>
-    <string name="lbl_brightness">LJUSSTYRKA</string>
-    <string name="lbl_contrast">KONTRAST</string>
-    <string name="lbl_saturation">FÄRGMÄTTNAD</string>
-    <string name="tab_filters">FILTER</string>
     <string name="edit">REDIGERA</string>
     <string name="capture_button_alt">Lagra</string>
     <string name="switch_camera_button_alt">Byt kamera</string>
@@ -75,7 +71,6 @@
     <string name="no_description">Ingen beskrivning</string>
     <string name="feed_failed">Kunde inte hämta flöde</string>
     <string name="loading_toast">Något gick fel vid laddningen</string>
-    <string name="normal_filter">Normal</string>
     <string name="upload_post_error">Uppladdningen misslyckades</string>
     <string name="upload_post_success">Uppladdningen lyckades</string>
     <string name="upload_post_failed">Uppladdningen misslyckades</string>
@@ -84,12 +79,8 @@
     <string name="upload_picture_failed">Fel vid uppladdning av bild!</string>
     <string name="save_image_success">Bild sparades</string>
     <string name="save_image_failed">Kunde inte spara bild</string>
-    <string name="permission_denied">Åtkomst nekas</string>
     <string name="dark_theme">Mörkt</string>
     <string name="light_theme">Ljust</string>
     <string name="default_system">Standard (Följer systemet)</string>
     <string name="nothing_to_see_here">Det finns inget här!</string>
-    <string name="crop_result_error">Kunde inte hämta bilden efter beskärning</string>
-    <string name="busy_dialog_ok_button">OK, vänta på det.</string>
-    <string name="busy_dialog_text">Bearbetar fortfarande bilden, vänta på att den blir klar först!</string>
 </resources>

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

@@ -10,10 +10,6 @@
     <string name="mention_notification">%1$s вас згадує</string>
     <string name="description">Опис…</string>
     <string name="post">надіслати</string>
-    <string name="lbl_brightness">ЯСКРАВІСТЬ</string>
-    <string name="lbl_contrast">КОНТРАСТ</string>
-    <string name="lbl_saturation">НАСИЧЕННЯ</string>
-    <string name="tab_filters">ФІЛЬТРИ</string>
     <string name="save_to_gallery">Зберегти до галереї…</string>
     <string name="image_download_downloading">Завантаження…</string>
     <string name="image_download_success">Зображення успішно завантажено</string>
@@ -30,7 +26,6 @@
     <string name="help_translate">Допоможіть перекласти PixelDroid:</string>
     <string name="default_system">Усталено (як у системі)</string>
     <string name="delete">Видалити</string>
-    <string name="no_cancel_edit">Ні, знехтувати</string>
     <string name="whats_an_instance_explanation">Можливо, вас дивує текстове поле з проханням зазначити домен вашого сервера.
 \n
 \nPixelfed — федерована платформа в складі федіверсу, тобто ви можете прямо в застосунку спілкуватися з авдиторією інших платформ, сервери яких втілюють домовлений стандарт, наприклад Mastodon (див. https://joinmastodon.org).
@@ -53,7 +48,6 @@
     <string name="size_exceeds_instance_limit">Зображення %1$d в альбомі важить більше (%2$d кБ), ніж дозволяє сервер (%3$d кБ). Ймовірно, вивантажити його не вдасться.</string>
     <string name="upload_error">Код помилки сервера: %1$d</string>
     <string name="hashtag_title">#%1$s</string>
-    <string name="save_before_returning">Зберегти зміни\?</string>
     <string name="add_account_description">Кілька сторінок, один пристрій</string>
     <string name="no_storage_permission">Бракує дозволу на доступ до пам\'яті. Надайте цей дозвіл у параметрах, якщо бажаєте бачити мініатюри в PixelDroid</string>
     <string name="upload_post_success">Допис успішно вивантажено</string>
@@ -62,12 +56,8 @@
     <string name="issues_contribute">Опишіть вади чи зробіть внесок до застосунку:</string>
     <string name="follow_requested">Запит на підписку</string>
     <string name="dialog_message_cancel_follow_request">Відхилити запит на підписку\?</string>
-    <string name="permission_denied">Бракує дозволу</string>
     <string name="upload_picture_failed">Помилка вивантаження зображення!</string>
     <string name="post_image">Одне з зображень допису</string>
-    <string name="filter_thumbnail">Мініатюра фільтра</string>
-    <string name="image_preview">Попередній перегляд редагованого зображення</string>
-    <string name="crop_button">Кнопка зрізу чи оберту зображення</string>
     <plurals name="number_comments">
         <item quantity="one">%d коментар</item>
         <item quantity="few">%d коментарі</item>
@@ -90,7 +80,6 @@
     <string name="instance_not_pixelfed_cancel">Скасувати вхід</string>
     <string name="request_format_error">Помилка вивантаження: хибний формат запиту</string>
     <string name="connect_to_pixelfed">З\'єднатися з Pixelfed</string>
-    <string name="normal_filter">Оригінал</string>
     <string name="comment">Коментар</string>
     <plurals name="nb_posts">
         <item quantity="one">%d
@@ -141,10 +130,8 @@
     <string name="whats_an_instance">Що таке сервер\?</string>
     <string name="login_connection_required_once">Слід бути в мережі, щоб додати перший обліковий запис та почати користуватись PixelDroid :(</string>
     <string name="add_account_name">Додати обліковий запис</string>
-    <string name="crop_result_error">Не вдалося отримати зображення після зрізу</string>
     <string name="capture_button_alt">Знімати</string>
     <string name="comment_error">Помилка коментування!</string>
-    <string name="busy_dialog_ok_button">Гаразд, зачекаю.</string>
     <string name="loading_toast">Щось пішло не так при завантаженні</string>
     <string name="comment_posted">Коментар: %1$s надіслано!</string>
     <string name="follow_button_failed">Не вдалось показати кнопку підписки</string>
@@ -165,7 +152,6 @@
     <string name="license_info">PixelDroid — вільне й відкрите програмне забезпечення, доступне на умовах Загальної громадської ліцензії GNU (версії 3 чи новішої)</string>
     <string name="about">Про застосунок</string>
     <string name="post_title">Допис %1$s</string>
-    <string name="toolbar_title_edit">Редагувати</string>
     <string name="reported">Скаргу надіслано {gmd_check_circle}</string>
     <string name="profile_picture">Зображення профілю</string>
     <string name="open_drawer_menu">Відкрити висувне меню</string>
@@ -181,7 +167,6 @@
     <string name="file_not_found">Файлу %1$s не знайдено</string>
     <string name="write_permission_share_pic">Для поширення зображень потрібен дозвіл на запис!</string>
     <string name="picture_format_error">Помилка вивантаження: хибний формат зображення.</string>
-    <string name="busy_dialog_text">Триває обробка зображення, дочекайтесь її завершення!</string>
     <string name="unfollow">Відписатись</string>
     <string name="media_upload_failed">Не вдалося вивантажити медіа, повторіть спробу чи перевірте мережне з\'єднання</string>
     <string name="posting_image_accessibility_hint">Розміщуване зображення</string>
@@ -239,5 +224,4 @@
     <string name="video_not_supported">Використовуваний сервер не підтримує вивантаження відео. Ймовірно, вивантажити відео цього допису не вдасться</string>
     <string name="post_is_video">Це відеодопис</string>
     <string name="play_video">Відтворити відео</string>
-    <string name="video_edit_not_yet_supported">Редагування відео ще не підтримується</string>
 </resources>

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

@@ -20,10 +20,6 @@
     <string name="liked_notification">%1$s 给你的帖文点赞</string>
     <string name="description">描述……</string>
     <string name="whats_an_instance">什么是实例？</string>
-    <string name="lbl_brightness">亮度</string>
-    <string name="lbl_contrast">对比度</string>
-    <string name="lbl_saturation">饱和度</string>
-    <string name="tab_filters">滤镜</string>
     <string name="edit">编辑</string>
     <string name="save_to_gallery">保存到相册……</string>
     <string name="image_download_failed">下载失败，请重试</string>
@@ -75,7 +71,6 @@
     <string name="no_description">没有描述</string>
     <string name="feed_failed">无法获取订阅</string>
     <string name="loading_toast">加载时出了一些问题</string>
-    <string name="normal_filter">正常</string>
     <string name="upload_post_error">帖文上传错误</string>
     <string name="upload_post_failed">帖文上传失败</string>
     <string name="upload_post_success">帖文成功上传</string>
@@ -84,14 +79,10 @@
     <string name="upload_picture_failed">图片上传错误！</string>
     <string name="save_image_success">图片成功保存</string>
     <string name="save_image_failed">无法保存图像</string>
-    <string name="permission_denied">没有权限</string>
     <string name="default_system">默认（跟随系统设置）</string>
     <string name="light_theme">浅色</string>
     <string name="dark_theme">深色</string>
     <string name="nothing_to_see_here">这里什么也没有！</string>
-    <string name="crop_result_error">图像裁剪后无法恢复</string>
-    <string name="busy_dialog_ok_button">好的，等一下。</string>
-    <string name="busy_dialog_text">图像仍在处理中，请先等待完成！</string>
     <string name="post_image">帖文中的一张图片</string>
     <string name="add_photo">添加照片</string>
     <string name="poll_notification">%1$s投票已经结束</string>
@@ -125,7 +116,6 @@
     <string name="discover">发现</string>
     <string name="open_drawer_menu">打开抽屉按钮</string>
     <string name="profile_picture">个人资料图片</string>
-    <string name="toolbar_title_edit">编辑</string>
     <string name="report_error">无法发送报告</string>
     <string name="reported">已报告该帖文</string>
     <string name="report_target">报告 @%1$s 的帖子</string>
@@ -148,11 +138,6 @@
     <plurals name="number_comments">
         <item quantity="other">%d 条评论</item>
     </plurals>
-    <string name="no_cancel_edit">不，取消编辑</string>
-    <string name="save_before_returning">保存你的编辑？</string>
-    <string name="crop_button">裁剪或旋转图片的按钮</string>
-    <string name="image_preview">被编辑图片的预览</string>
-    <string name="filter_thumbnail">过滤器的缩略图</string>
     <string name="upload_error">服务器返回了错误码：%1$d</string>
     <string name="size_exceeds_instance_limit">相册中 %1$d 号图片的尺寸超出了实例允许的最大尺寸 (图片大小为 %2$d kb 而上限为 %3$d kb)。你可能无法上传这张图片。</string>
     <string name="total_exceeds_album_limit">你选择的图片数超出了你服务器允许的最大数目 (%1$s)。超出上限的图像已被忽略。</string>
@@ -201,19 +186,14 @@
         <item quantity="other">%d 条新通知</item>
     </plurals>
     <string name="video_not_supported">你正使用的服务器不支持视频上传，你可能无法上传包含于该帖子内的视频</string>
-    <string name="video_edit_not_yet_supported">尚不支持视频编辑</string>
     <string name="notification_summary_large">%1$s、%2$s、%3$s 和其他 %4$d</string>
     <string name="notification_summary_medium">%1$s、%2$s, 和 %3$s</string>
     <string name="notification_summary_small">%1$s 和 %2$s</string>
     <string name="post_is_video">该帖子是一个视频</string>
     <string name="play_video">播放视频</string>
-    <string name="thumbnail_reel_video_edit">滚动显示你正编辑的视频的缩略图</string>
-    <string name="reset_edit_menu">重置</string>
-    <string name="save_edit_menu">保存</string>
     <string name="encode_error">编码出错</string>
     <string name="encode_success">编码成功！</string>
     <string name="encode_progress">编码 %1$d%%</string>
-    <string name="select_video_range">选择要保留的视频内容</string>
     <string name="still_encoding">一个或多个视频仍在编码中。请等编码完成后再上传</string>
     <string name="new_post_shortcut_long">新建帖子</string>
     <string name="new_post_shortcut_short">新帖子</string>
@@ -228,7 +208,6 @@
     <string name="color_choice_button">选择这个强调色</string>
     <string name="color_chosen">已选择强调色</string>
     <string name="accentColorTitle">强调色</string>
-    <string name="error_editing">编辑时出错</string>
     <string name="profile_error">无法加载个人资料</string>
     <string name="from_other_domain">来自 %1$s</string>
     <string name="add_images_error">添加图片时出错</string>

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.0-alpha06'
+        classpath 'com.android.tools.build:gradle:8.0.0-alpha07'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -23,3 +23,4 @@ org.gradle.daemon=true
 org.gradle.caching=true
 org.gradle.parallel=true
 kapt.incremental.apt=true
+android.enableR8.fullMode=true