Merge branch 'master' into bookmark
This commit is contained in:
mjaillot
commit
7abf31554c
|
|
@ -135,7 +135,7 @@ class EditPhotoTest {
|
|||
Espresso.onView(withId(R.id.toolbar)).check(matches(isDisplayed()))
|
||||
Espresso.onView(withId(R.id.action_save)).perform(click())
|
||||
Espresso.onView(withId(com.google.android.material.R.id.snackbar_text))
|
||||
.check(matches(withText("Image succesfully saved")))
|
||||
.check(matches(withText(R.string.save_image_success)))
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
|
|
@ -47,11 +47,11 @@ class LoginCheckIntent {
|
|||
ActivityScenario.launch(LoginActivity::class.java)
|
||||
val expectedIntent: Matcher<Intent> = allOf(
|
||||
hasAction(ACTION_VIEW),
|
||||
hasDataString(containsString("pixelfed.social"))
|
||||
hasDataString(containsString("pixelfed.de"))
|
||||
)
|
||||
Thread.sleep(1000)
|
||||
|
||||
onView(withId(R.id.editText)).perform(scrollTo()).perform(ViewActions.replaceText("pixelfed.social"), ViewActions.closeSoftKeyboard())
|
||||
onView(withId(R.id.editText)).perform(scrollTo()).perform(ViewActions.replaceText("pixelfed.de"), ViewActions.closeSoftKeyboard())
|
||||
onView(withId(R.id.connect_instance_button)).perform(scrollTo()).perform(click())
|
||||
|
||||
Thread.sleep(3000)
|
||||
|
|
|
|||
|
|
@ -1,46 +1,76 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:orientation="vertical"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".PhotoEditActivity"
|
||||
tools:showIn="@layout/activity_photo_edit"
|
||||
>
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image_preview"
|
||||
<LinearLayout
|
||||
android:orientation="vertical"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".70"
|
||||
android:scaleType="centerInside" />
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".PhotoEditActivity"
|
||||
tools:showIn="@layout/activity_photo_edit"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image_preview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".70"
|
||||
android:scaleType="centerInside" />
|
||||
|
||||
<com.h.pixeldroid.utils.NonSwipeableViewPager
|
||||
android:id="@+id/viewPager"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".22" />
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tabs"
|
||||
app:tabGravity="fill"
|
||||
app:tabMode="fixed"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".08"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/left_guideline"
|
||||
app:layout_constraintGuide_percent=".15"
|
||||
android:orientation="vertical"/>
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/right_guideline"
|
||||
app:layout_constraintGuide_percent=".85"
|
||||
android:orientation="vertical"/>
|
||||
|
||||
<androidx.constraintlayout.widget.Guideline
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/bottom_guideline"
|
||||
app:layout_constraintGuide_percent=".7"
|
||||
android:orientation="horizontal"/>
|
||||
|
||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
android:id="@+id/cropImageButton"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:src="@drawable/ic_crop_black_24dp" />
|
||||
|
||||
<com.h.pixeldroid.utils.NonSwipeableViewPager
|
||||
android:id="@+id/viewPager"
|
||||
android:layout_above="@+id/tabs"
|
||||
app:layout_behavior="@string/appbar_scrolling_view_behavior"
|
||||
android:layout_below="@+id/image_preview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".22" />
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tabs"
|
||||
app:tabGravity="fill"
|
||||
app:tabMode="fixed"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight=".08"/>
|
||||
|
||||
</LinearLayout>
|
||||
android:layout_marginTop="411dp"
|
||||
android:backgroundTint="#FFFFFFFF"
|
||||
android:src="@drawable/ic_crop_black_24dp"
|
||||
app:layout_constraintLeft_toLeftOf="@+id/left_guideline"
|
||||
app:layout_constraintRight_toRightOf="@+id/right_guideline"
|
||||
app:layout_constraintBottom_toBottomOf="@+id/bottom_guideline" />
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
|
@ -42,4 +42,8 @@
|
|||
<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>
|
||||
</resources>
|
||||
|
|
@ -42,4 +42,56 @@
|
|||
<string name="add_account_description">Afegeix un altre compte</string>
|
||||
<string name="add_account_name">Afegeix un compte</string>
|
||||
<string name="instance_error">No s\'ha pogut obtenir informació sobre la instància</string>
|
||||
<string name="shares">%1$s Accions</string>
|
||||
<string name="hashtags">HASHTAGS</string>
|
||||
<string name="accounts">COMPTES</string>
|
||||
<string name="posts">PUBLICACIONS</string>
|
||||
<string name="search">Buscar</string>
|
||||
<string name="edit_profile">Editar perfil</string>
|
||||
<string name="follow">Seguir</string>
|
||||
<string name="no_username">Sense nom d’usuari</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nSeguint</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nSeguidors</string>
|
||||
<string name="default_nposts">-
|
||||
\nPublicacions</string>
|
||||
<string name="access_token_invalid">El token d\'accés és invalid</string>
|
||||
<string name="unfollow_error">No s\'ha pogut parar de seguir</string>
|
||||
<string name="action_not_allowed">Aquesta acció no està permesa</string>
|
||||
<string name="follow_error">No s\'ha pogut seguir</string>
|
||||
<string name="follow_button_failed">No s\'ha pogut mostrar el botó de seguir</string>
|
||||
<string name="follow_status_failed">No s\'ha pogut obtenir l\'estat de seguiment</string>
|
||||
<string name="nb_following">%1$s
|
||||
\nSeguits</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nSeguidors</string>
|
||||
<string name="nb_posts">%1$s
|
||||
\nPublicacions</string>
|
||||
<string name="comment">Comentari</string>
|
||||
<string name="comment_posted">Comentari: %1$s publicat!</string>
|
||||
<string name="comment_error">Error de comentari!</string>
|
||||
<string name="share_image">Compartir imatge</string>
|
||||
<string name="write_permission_share_pic">Necessites concedir permís d’escriptura per compartir imatges!</string>
|
||||
<string name="write_permission_download_pic">Has de concedir permís d’escriptura per baixar imatges!</string>
|
||||
<string name="empty_comment">El comentari no ha de ser buit!</string>
|
||||
<string name="posted_on">Publica\'t el %1$s</string>
|
||||
<string name="likes">%1$s M\'agrades</string>
|
||||
<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">Ha fallat l\'enviament de la publicació: no 200</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>
|
||||
<string name="request_format_error">Error d\'enviament: format de sol·licitud dolent</string>
|
||||
<string name="picture_format_error">Error d\'enviament: format d\'imatge erroni.</string>
|
||||
<string name="upload_picture_failed">Error d\'enviament d\'imatges!</string>
|
||||
<string name="description_max_characters">La descripció ha de contenir %1$s caràcters com a mínim.</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_theme">Per defecte (seguint el sistema)</string>
|
||||
</resources>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<string name="theme_title">Erscheinungsbild</string>
|
||||
<string name="description">Beschreibung…</string>
|
||||
<string name="save_to_gallery">In Galerie speichern…</string>
|
||||
<string name="image_download_failed">Der Download ist fehlgeschlagen, bitte versuchen Sie es erneut</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>
|
||||
|
|
@ -36,8 +36,31 @@
|
|||
<string name="CommentDisplay">zeigen…</string>
|
||||
<string name="domain_of_your_instance">Domain Ihrer Instanz</string>
|
||||
<string name="connect_to_pixelfed">Mit Pixelfed verbinden</string>
|
||||
<string name="login_connection_required_once">Sie müssen online sein, um das erste Konto hinzuzufügen und um PixelDroid verwenden zu können :(</string>
|
||||
<string name="login_connection_required_once">Sie müssen online sein, um das erste Konto hinzuzufügen und um PixelDroid zu verwenden :(</string>
|
||||
<string name="switch_camera_button_alt">Kamera wechseln</string>
|
||||
<string name="registration_failed">Konnte die App nicht mit diesem Server verbinden</string>
|
||||
<string name="instance_error">Konnte die Informationen der Instanz nicht abrufen</string>
|
||||
</resources>
|
||||
<string name="upload_picture_failed">Fehler beim Hochladen!</string>
|
||||
<string name="default_theme">Standard (Systemeinstellung)</string>
|
||||
<string name="permission_denied">Berechtigung verweigert</string>
|
||||
<string name="save_image_failed">Bild kann nicht gespeichert werden</string>
|
||||
<string name="description_max_characters">Die Beschreibung darf höchstens %1$s Zeichen enthalten.</string>
|
||||
<string name="normal_filter">Normal</string>
|
||||
<string name="save_image_success">Bild gespeichert</string>
|
||||
<string name="picture_format_error">Upload-Fehler: falsches Bildformat.</string>
|
||||
<string name="upload_post_failed">Hochladen des Beitrags fehlgeschlagen</string>
|
||||
<string name="add_account_name">Konto hinzufügen</string>
|
||||
<string name="add_account_description">Ein weiteres Pixelfed Konto hinzugefügen</string>
|
||||
<string name="light_theme">Hell</string>
|
||||
<string name="dark_theme">Dunkel</string>
|
||||
<string name="comment">Kommentieren</string>
|
||||
<string name="share_image">Bild teilen</string>
|
||||
<string name="empty_comment">Der Kommentar darf nicht leer sein!</string>
|
||||
<string name="shares">%1$s Geteilt</string>
|
||||
<string name="likes">%1$s Likes</string>
|
||||
<string name="no_description">Keine Beschreibung</string>
|
||||
<string name="loading_toast">Beim Laden ist etwas schiefgegangen</string>
|
||||
<string name="search">Suchen</string>
|
||||
<string name="follow">Folgen</string>
|
||||
<string name="edit_profile">Profil bearbeiten</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -42,4 +42,25 @@
|
|||
<string name="add_account_description">Beste Pixelfed kontu bat gehitu</string>
|
||||
<string name="add_account_name">Kontua gehitu</string>
|
||||
<string name="instance_error">Ezinezkoa nodoaren informazioa lortzea</string>
|
||||
</resources>
|
||||
<string name="search">Bilatu</string>
|
||||
<string name="follow">Jarraitu</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nJarraitzen</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nJarraitzaile</string>
|
||||
<string name="default_nposts">-
|
||||
\nArgitalpen</string>
|
||||
<string name="nb_following">%1$s
|
||||
\nJarraitzen</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nJarraitzaile</string>
|
||||
<string name="share_image">Irudia partekatu</string>
|
||||
<string name="upload_picture_failed">Ezin izan da irudia igo!</string>
|
||||
<string name="save_image_failed">Ezinezkoa irudia gordetzea</string>
|
||||
<string name="dark_theme">Iluna</string>
|
||||
<string name="light_theme">Argia</string>
|
||||
<string name="default_theme">Lehenetsia (Sistemaren lehentsia)</string>
|
||||
<string name="no_description">Deskribapenik ez</string>
|
||||
<string name="description_max_characters">Deskribapenak %1$s karaktere izan behar ditu gehienez.</string>
|
||||
<string name="save_image_success">Irudia behar bezala gorde da</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -42,4 +42,22 @@
|
|||
<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="description_max_characters">"توضیحات حداکثر میتوانند تا %1$s حرف داشته باشند."</string>
|
||||
<string name="default_theme">پیشفرض (پیروی از سیستمعامل)</string>
|
||||
<string name="light_theme">روشن</string>
|
||||
<string name="dark_theme">تاریک</string>
|
||||
<string name="upload_post_error">بارگذاری مطلب ناموفق بود: غیر از ۲۰۰</string>
|
||||
<string name="save_image_success">تصویر با موفقیت ذخیره شد</string>
|
||||
<string name="upload_picture_failed">خطا در بارگذاری تصویر!</string>
|
||||
<string name="picture_format_error">خطای بارگذاری: تصویر با قالب نادرست</string>
|
||||
<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>
|
||||
<string name="likes">%1$s پسند</string>
|
||||
</resources>
|
||||
|
|
@ -42,4 +42,56 @@
|
|||
<string name="add_account_description">Ajouter un autre compte PixelFed</string>
|
||||
<string name="add_account_name">Ajouter un compte</string>
|
||||
<string name="instance_error">Impossible d’obtenir des informations sur l’instance</string>
|
||||
</resources>
|
||||
<string name="request_format_error">Erreur de téléversement: format de requête incorrect</string>
|
||||
<string name="picture_format_error">Erreur de téléversement: format d\'image incorrect.</string>
|
||||
<string name="upload_picture_failed">Erreur de téléversement d\'image!</string>
|
||||
<string name="description_max_characters">La description doit contenir au plus %1$s caractères.</string>
|
||||
<string name="save_image_success">Image enregistrée avec succès</string>
|
||||
<string name="save_image_failed">Impossible de sauvegarder 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_theme">Par défaut (en suivant le système)</string>
|
||||
<string name="upload_post_failed">Échec du téléversement de la publication</string>
|
||||
<string name="upload_post_success">Réussite du téléversement de la publication</string>
|
||||
<string name="posted_on">Piublié le %1$s</string>
|
||||
<string name="empty_comment">Le commentaire ne doit pas être vide !</string>
|
||||
<string name="write_permission_share_pic">Vous devez accorder une autorisation d\'écriture pour partager des photos !</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nAbonnés</string>
|
||||
<string name="upload_post_error">Erreur lors du téléversement de la publication : pas 200</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>
|
||||
<string name="likes">%1$s J\'aime(s)</string>
|
||||
<string name="shares">%1$s Partages</string>
|
||||
<string name="write_permission_download_pic">Vous devez accorder une autorisation d\'écriture pour télécharger des photos !</string>
|
||||
<string name="share_image">Partager image</string>
|
||||
<string name="comment_error">Erreur de commentaire !</string>
|
||||
<string name="comment_posted">Commentaire : %1$s publié !</string>
|
||||
<string name="comment">Commenter</string>
|
||||
<string name="nb_posts">%1$s
|
||||
\nPublications</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nAbonnés</string>
|
||||
<string name="nb_following">%1$s
|
||||
\nAbonnements</string>
|
||||
<string name="follow_status_failed">Impossible d\'obtenir l\'état de suivi</string>
|
||||
<string name="follow_button_failed">Impossible d\'afficher le bouton de suivi</string>
|
||||
<string name="follow_error">Impossible de suivre</string>
|
||||
<string name="action_not_allowed">Cette action n\'est pas autorisée</string>
|
||||
<string name="unfollow_error">Impossible de se désabonner</string>
|
||||
<string name="access_token_invalid">Le token d\'accès n\'est pas valide</string>
|
||||
<string name="default_nposts">-
|
||||
\nPublications</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nAbonnements</string>
|
||||
<string name="no_username">Pas de nom d\'utilisateur</string>
|
||||
<string name="follow">S\'abonner</string>
|
||||
<string name="edit_profile">Editer le profil</string>
|
||||
<string name="search">Chercher</string>
|
||||
<string name="posts">PUBLICATIONS</string>
|
||||
<string name="accounts">COMPTES</string>
|
||||
<string name="hashtags">HASHTAGS</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -42,4 +42,56 @@
|
|||
<string name="add_account_description">Engadir outra conta Pixelfed</string>
|
||||
<string name="add_account_name">Engadir Conta</string>
|
||||
<string name="instance_error">Non se obtivo a información da instancia</string>
|
||||
<string name="save_image_success">Imaxe gardada</string>
|
||||
<string name="hashtags">CANCELOS</string>
|
||||
<string name="accounts">CONTAS</string>
|
||||
<string name="posts">POSTS</string>
|
||||
<string name="search">Buscar</string>
|
||||
<string name="edit_profile">Editar perfil</string>
|
||||
<string name="follow">Seguir</string>
|
||||
<string name="no_username">Sen nome de usuaria</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nSeguindo</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nSeguidoras</string>
|
||||
<string name="default_nposts">-
|
||||
\nPublicacións</string>
|
||||
<string name="access_token_invalid">O token de acceso non é válido</string>
|
||||
<string name="unfollow_error">Non se puido deixar de seguir</string>
|
||||
<string name="action_not_allowed">Non está permitida a acción</string>
|
||||
<string name="follow_error">Non se puido seguir</string>
|
||||
<string name="follow_button_failed">Non se pode mostrar o botón para seguir</string>
|
||||
<string name="follow_status_failed">Non se obtivo o estado de relacións</string>
|
||||
<string name="nb_following">%1$s
|
||||
\nSeguindo</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nSeguidoras</string>
|
||||
<string name="nb_posts">%1$s
|
||||
\nPublicacións</string>
|
||||
<string name="comment">Comentar</string>
|
||||
<string name="comment_posted">Comentario: %1$s publicado!</string>
|
||||
<string name="comment_error">Fallo ao comentar!</string>
|
||||
<string name="share_image">Compartir Imaxe</string>
|
||||
<string name="write_permission_share_pic">Tes que dar permiso de escritura para compartir fotos!</string>
|
||||
<string name="write_permission_download_pic">Tes que conceder permiso de escritura para descargar fotos!</string>
|
||||
<string name="empty_comment">O comentario non debe quedar baleiro!</string>
|
||||
<string name="posted_on">Publicado o %1$s</string>
|
||||
<string name="shares">Compartido %1$s</string>
|
||||
<string name="likes">%1$s Gústame</string>
|
||||
<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">Fallou a publicación: not 200</string>
|
||||
<string name="upload_post_success">Publicación correcta</string>
|
||||
<string name="upload_post_failed">Fallou a subida da publicación</string>
|
||||
<string name="request_format_error">Erro na subida: formato da solicitude non válido</string>
|
||||
<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="description_max_characters">A descrición non pode superar os %1$s caracteres.</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_theme">Por omisión (do sistema)</string>
|
||||
</resources>
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<string name="liked_notification">%1$s vond je bericht leuk</string>
|
||||
<string name="shared_notification">%1$s heeft je bericht gedeeld</string>
|
||||
<string name="mention_notification">%1$s heeft je genoemd</string>
|
||||
<string name="followed_notification">%1$s volgt je</string>
|
||||
<string name="followed_notification">%1$s volgt jou</string>
|
||||
<string name="auth_failed">Kon niet authenticeren</string>
|
||||
<string name="app_name">PixelDroid</string>
|
||||
<string name="save_to_gallery">Opslaan in gallerij…</string>
|
||||
|
|
@ -41,4 +41,27 @@
|
|||
<string name="login_connection_required_once">Je moet met het internet verbonden zijn om je eerste account toe te voegen en PixelDroid te kunnen gebruiken :(</string>
|
||||
<string name="add_account_description">Andere Pixelfed account toevoegen</string>
|
||||
<string name="add_account_name">Account toevoegen</string>
|
||||
<string name="upload_picture_failed">Fout bij het uploaden!</string>
|
||||
<string name="description_max_characters">De beschrijving mag maximaal %1$s karakters bevatten.</string>
|
||||
<string name="dark_theme">Donker</string>
|
||||
<string name="light_theme">Licht</string>
|
||||
<string name="search">Zoeken</string>
|
||||
<string name="edit_profile">Profiel bewerken</string>
|
||||
<string name="follow">Volgen</string>
|
||||
<string name="no_username">Geen gebruikersnaam</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nVolgend</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nVolgers</string>
|
||||
<string name="action_not_allowed">Deze actie is niet toegestaan</string>
|
||||
<string name="nb_following">%1$s
|
||||
\nVolgend</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nVolgers</string>
|
||||
<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>
|
||||
</resources>
|
||||
|
|
@ -42,4 +42,56 @@
|
|||
<string name="add_account_description">Добавить другой аккаунт PixelFed</string>
|
||||
<string name="add_account_name">Добавить аккаунт</string>
|
||||
<string name="instance_error">Не удалось получить информацию о инстансе</string>
|
||||
</resources>
|
||||
<string name="nb_following">%1$s
|
||||
\nПодписок</string>
|
||||
<string name="nb_followers">%1$s
|
||||
\nПодписчиков</string>
|
||||
<string name="nb_posts">%1$s
|
||||
\nПостов</string>
|
||||
<string name="comment">Комментарий</string>
|
||||
<string name="comment_posted">Комментарий: %1$s опубликовано!</string>
|
||||
<string name="comment_error">Ошибка комментария!</string>
|
||||
<string name="share_image">Поделиться изображением</string>
|
||||
<string name="write_permission_download_pic">Вы должны дать разрешение что бы загрузить изображения!</string>
|
||||
<string name="write_permission_share_pic">Вы должны дать разрешение что бы поделиться изображениями!</string>
|
||||
<string name="empty_comment">Комментарий не должен быть пустым!</string>
|
||||
<string name="posted_on">Опубликовано в %1$s</string>
|
||||
<string name="shares">%1$s репостов</string>
|
||||
<string name="likes">%1$s лайков</string>
|
||||
<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">Не удалось загрузить пост: не 200</string>
|
||||
<string name="upload_post_success">Пост удачно загружен</string>
|
||||
<string name="upload_post_failed">Не удалось загрузить пост</string>
|
||||
<string name="request_format_error">Ошибка загрузки: плохой формат запроса</string>
|
||||
<string name="picture_format_error">Ошибка загрузки: неправильный формат изображения.</string>
|
||||
<string name="upload_picture_failed">Ошибка загрузки изображения!</string>
|
||||
<string name="description_max_characters">Описание должно содержать максимум %1$s символов.</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_theme">По умолчанию (как в системе)</string>
|
||||
<string name="follow_status_failed">Не удалось получить статус подписки</string>
|
||||
<string name="follow_error">Не удалось подписаться</string>
|
||||
<string name="action_not_allowed">Это действие не разрешено</string>
|
||||
<string name="unfollow_error">Не удалось отписаться</string>
|
||||
<string name="access_token_invalid">Этот токен доступа недействительный</string>
|
||||
<string name="default_nposts">-
|
||||
\nПостов</string>
|
||||
<string name="default_nfollowers">-
|
||||
\nПодписчиков</string>
|
||||
<string name="default_nfollowing">-
|
||||
\nПодписок</string>
|
||||
<string name="no_username">Нет имени пользователя</string>
|
||||
<string name="follow">Подписаться</string>
|
||||
<string name="edit_profile">Редактировать профиль</string>
|
||||
<string name="search">Поиск</string>
|
||||
<string name="posts">ПОСТЫ</string>
|
||||
<string name="accounts">АККАУНТЫ</string>
|
||||
<string name="hashtags">ХЭШТЕГИ</string>
|
||||
<string name="follow_button_failed">Не удалось отобразить кнопку подписки</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -10,14 +10,12 @@
|
|||
<string name="token_error">"Error getting token"</string>
|
||||
<string name="instance_error">"Could not get instance information"</string>
|
||||
<string name="title_activity_settings2">Settings</string>
|
||||
|
||||
<!-- Theme Preferences -->
|
||||
<string name="theme_title">Application Theme</string>
|
||||
<string name="theme_header">Theme</string>
|
||||
<string name="default_theme">Default (Follows system)</string>
|
||||
<string name="light_theme">Light</string>
|
||||
<string name="dark_theme">Dark</string>
|
||||
|
||||
<string name="followed_notification">%1$s followed you</string>
|
||||
<string name="mention_notification">%1$s mentioned you</string>
|
||||
<string name="shared_notification">%1$s shared your post</string>
|
||||
|
|
@ -34,7 +32,7 @@
|
|||
<!-- Post creation -->
|
||||
<string name="permission_denied">Permission denied</string>
|
||||
<string name="save_image_failed">Unable to save image</string>
|
||||
<string name="save_image_success">Image succesfully saved</string>
|
||||
<string name="save_image_success">Image successfully saved</string>
|
||||
<string name="description_max_characters">"Description must contain %1$s characters at most."</string>
|
||||
<string name="upload_picture_failed">Picture upload error!</string>
|
||||
<string name="picture_format_error">Upload error: wrong picture format.</string>
|
||||
|
|
|
|||
Loading…
Reference in New Issue