Merge translations (#202)

* Merge translations

* fix test after string changed
This commit is contained in:
Wv5twkFEKh54vo4tta9yu7dHa3 2020-05-21 21:21:13 +02:00 committed by GitHub
parent d942c30898
commit 66e6bd66dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 164 additions and 4 deletions

View File

@ -135,7 +135,7 @@ class EditPhotoTest {
Espresso.onView(withId(R.id.toolbar)).check(matches(isDisplayed())) Espresso.onView(withId(R.id.toolbar)).check(matches(isDisplayed()))
Espresso.onView(withId(R.id.action_save)).perform(click()) Espresso.onView(withId(R.id.action_save)).perform(click())
Espresso.onView(withId(com.google.android.material.R.id.snackbar_text)) 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 @Test

View File

@ -42,4 +42,56 @@
<string name="add_account_description">Afegeix un altre compte</string> <string name="add_account_description">Afegeix un altre compte</string>
<string name="add_account_name">Afegeix un 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="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 dusuari</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 descriptura per compartir imatges!</string>
<string name="write_permission_download_pic">Has de concedir permís descriptura 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> </resources>

View File

@ -42,4 +42,19 @@
<string name="add_account_description">Beste Pixelfed kontu bat gehitu</string> <string name="add_account_description">Beste Pixelfed kontu bat gehitu</string>
<string name="add_account_name">Kontua gehitu</string> <string name="add_account_name">Kontua gehitu</string>
<string name="instance_error">Ezinezkoa nodoaren informazioa lortzea</string> <string name="instance_error">Ezinezkoa nodoaren informazioa lortzea</string>
<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>
</resources> </resources>

View File

@ -42,4 +42,14 @@
<string name="add_account_description">Ajouter un autre compte PixelFed</string> <string name="add_account_description">Ajouter un autre compte PixelFed</string>
<string name="add_account_name">Ajouter un compte</string> <string name="add_account_name">Ajouter un compte</string>
<string name="instance_error">Impossible dobtenir des informations sur linstance</string> <string name="instance_error">Impossible dobtenir des informations sur linstance</string>
<string name="request_format_error">"Erreur de téléchargement: format de requête incorrect"</string>
<string name="picture_format_error">Erreur de téléchargement: format d\'image incorrect.</string>
<string name="upload_picture_failed">Erreur de téléchargement 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>
</resources> </resources>

View File

@ -42,4 +42,56 @@
<string name="add_account_description">Engadir outra conta Pixelfed</string> <string name="add_account_description">Engadir outra conta Pixelfed</string>
<string name="add_account_name">Engadir Conta</string> <string name="add_account_name">Engadir Conta</string>
<string name="instance_error">Non se obtivo a información da instancia</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> </resources>

View File

@ -42,4 +42,37 @@
<string name="add_account_description">Добавить другой аккаунт PixelFed</string> <string name="add_account_description">Добавить другой аккаунт PixelFed</string>
<string name="add_account_name">Добавить аккаунт</string> <string name="add_account_name">Добавить аккаунт</string>
<string name="instance_error">Не удалось получить информацию о инстансе</string> <string name="instance_error">Не удалось получить информацию о инстансе</string>
<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>
</resources> </resources>

View File

@ -10,14 +10,12 @@
<string name="token_error">"Error getting token"</string> <string name="token_error">"Error getting token"</string>
<string name="instance_error">"Could not get instance information"</string> <string name="instance_error">"Could not get instance information"</string>
<string name="title_activity_settings2">Settings</string> <string name="title_activity_settings2">Settings</string>
<!-- Theme Preferences --> <!-- Theme Preferences -->
<string name="theme_title">Application Theme</string> <string name="theme_title">Application Theme</string>
<string name="theme_header">Theme</string> <string name="theme_header">Theme</string>
<string name="default_theme">Default (Follows system)</string> <string name="default_theme">Default (Follows system)</string>
<string name="light_theme">Light</string> <string name="light_theme">Light</string>
<string name="dark_theme">Dark</string> <string name="dark_theme">Dark</string>
<string name="followed_notification">%1$s followed you</string> <string name="followed_notification">%1$s followed you</string>
<string name="mention_notification">%1$s mentioned you</string> <string name="mention_notification">%1$s mentioned you</string>
<string name="shared_notification">%1$s shared your post</string> <string name="shared_notification">%1$s shared your post</string>
@ -34,7 +32,7 @@
<!-- Post creation --> <!-- Post creation -->
<string name="permission_denied">Permission denied</string> <string name="permission_denied">Permission denied</string>
<string name="save_image_failed">Unable to save image</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="description_max_characters">"Description must contain %1$s characters at most."</string>
<string name="upload_picture_failed">Picture upload error!</string> <string name="upload_picture_failed">Picture upload error!</string>
<string name="picture_format_error">Upload error: wrong picture format.</string> <string name="picture_format_error">Upload error: wrong picture format.</string>