Merge remote-tracking branch 'upstream/develop' into webpack-4-dart-sass
* upstream/develop: (126 commits) entity normalizer: hook up in_reply_to_account_acct add BBCode strings fix follow button not updating bug in follow-card refer searched user objects from the global user rep set max-width of textarea in settings page Remove space in the timeline setting copy user_card.vue: Fix .emoji to apply to img Update oc.json Update oc.json Update oc.json Update oc.json replace pencil with wrench icon rebuild fontello with wrench icon added fetch all friends using pagination stop fetching user relationship when user is unauthorized Revert "recover border between basic-user-card using list component" remove extra spacing code readability fix typos clean up ...
This commit is contained in:
commit
e0247e21f6
76 changed files with 1859 additions and 513 deletions
|
@ -73,7 +73,8 @@
|
|||
"content_type": {
|
||||
"text/plain": "Prostý text",
|
||||
"text/html": "HTML",
|
||||
"text/markdown": "Markdown"
|
||||
"text/markdown": "Markdown",
|
||||
"text/bbcode": "BBCode"
|
||||
},
|
||||
"content_warning": "Předmět (volitelný)",
|
||||
"default": "Právě jsem přistál v L.A.",
|
||||
|
|
|
@ -22,7 +22,8 @@
|
|||
"generic_error": "An error occured",
|
||||
"optional": "optional",
|
||||
"show_more": "Show more",
|
||||
"show_less": "Show less"
|
||||
"show_less": "Show less",
|
||||
"cancel": "Cancel"
|
||||
},
|
||||
"image_cropper": {
|
||||
"crop_picture": "Crop picture",
|
||||
|
@ -76,7 +77,8 @@
|
|||
"content_type": {
|
||||
"text/plain": "Plain text",
|
||||
"text/html": "HTML",
|
||||
"text/markdown": "Markdown"
|
||||
"text/markdown": "Markdown",
|
||||
"text/bbcode": "BBCode"
|
||||
},
|
||||
"content_warning": "Subject (optional)",
|
||||
"default": "Just landed in L.A.",
|
||||
|
@ -111,6 +113,9 @@
|
|||
"password_confirmation_match": "should be the same as password"
|
||||
}
|
||||
},
|
||||
"selectable_list": {
|
||||
"select_all": "Select all"
|
||||
},
|
||||
"settings": {
|
||||
"app_name": "App name",
|
||||
"attachmentRadius": "Attachments",
|
||||
|
@ -216,6 +221,8 @@
|
|||
"reply_visibility_self": "Only show replies directed at me",
|
||||
"saving_err": "Error saving settings",
|
||||
"saving_ok": "Settings saved",
|
||||
"search_user_to_block": "Search whom you want to block",
|
||||
"search_user_to_mute": "Search whom you want to mute",
|
||||
"security_tab": "Security",
|
||||
"scope_copy": "Copy scope when replying (DMs are always copied)",
|
||||
"minimal_scopes_mode": "Minimize post scope selection options",
|
||||
|
@ -403,7 +410,26 @@
|
|||
"block_progress": "Blocking...",
|
||||
"unmute": "Unmute",
|
||||
"unmute_progress": "Unmuting...",
|
||||
"mute_progress": "Muting..."
|
||||
"mute_progress": "Muting...",
|
||||
"admin_menu": {
|
||||
"moderation": "Moderation",
|
||||
"grant_admin": "Grant Admin",
|
||||
"revoke_admin": "Revoke Admin",
|
||||
"grant_moderator": "Grant Moderator",
|
||||
"revoke_moderator": "Revoke Moderator",
|
||||
"activate_account": "Activate account",
|
||||
"deactivate_account": "Deactivate account",
|
||||
"delete_account": "Delete account",
|
||||
"force_nsfw": "Mark all posts as NSFW",
|
||||
"strip_media": "Remove media from posts",
|
||||
"force_unlisted": "Force posts to be unlisted",
|
||||
"sandbox": "Force posts to be followers-only",
|
||||
"disable_remote_subscription": "Disallow following user from remote instances",
|
||||
"disable_any_subscription": "Disallow following user at all",
|
||||
"quarantine": "Disallow user posts from federating",
|
||||
"delete_user": "Delete user",
|
||||
"delete_user_confirmation": "Are you absolutely sure? This action cannot be undone."
|
||||
}
|
||||
},
|
||||
"user_profile": {
|
||||
"timeline_title": "User Timeline",
|
||||
|
|
|
@ -20,7 +20,10 @@
|
|||
"submit": "Mandar",
|
||||
"more": "Mai",
|
||||
"generic_error": "Una error s’es producha",
|
||||
"optional": "opcional"
|
||||
"optional": "opcional",
|
||||
"show_more": "Mostrar mai",
|
||||
"show_less": "Mostrar mens",
|
||||
"cancel": "Anullar"
|
||||
},
|
||||
"image_cropper": {
|
||||
"crop_picture": "Talhar l’imatge",
|
||||
|
@ -74,11 +77,13 @@
|
|||
"content_type": {
|
||||
"text/plain": "Tèxte brut",
|
||||
"text/html": "HTML",
|
||||
"text/markdown": "Markdown"
|
||||
"text/markdown": "Markdown",
|
||||
"text/bbcode": "BBCode"
|
||||
},
|
||||
"content_warning": "Avís de contengut (opcional)",
|
||||
"default": "Escrivètz aquí vòstre estatut.",
|
||||
"direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.",
|
||||
"direct_warning_to_all": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.",
|
||||
"direct_warning_to_first_only": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats a la debuta del messatge.",
|
||||
"posting": "Mandadís",
|
||||
"scope": {
|
||||
"direct": "Dirècte - Publicar pels utilizaires mencionats solament",
|
||||
|
@ -108,6 +113,9 @@
|
|||
"password_confirmation_match": "deu èsser lo meteis senhal"
|
||||
}
|
||||
},
|
||||
"selectable_list": {
|
||||
"select_all": "O seleccionar tot"
|
||||
},
|
||||
"settings": {
|
||||
"app_name": "Nom de l’aplicacion",
|
||||
"attachmentRadius": "Pèças juntas",
|
||||
|
@ -213,8 +221,11 @@
|
|||
"reply_visibility_self": "Mostrar pas que las responsas que me son destinadas",
|
||||
"saving_err": "Error en enregistrant los paramètres",
|
||||
"saving_ok": "Paramètres enregistrats",
|
||||
"scope_copy": "Copiar lo nivèl de confidencialitat per las responsas (Totjorn aissí pels Messatges Dirèctes)",
|
||||
"search_user_to_block": "Cercatz qual volètz blocar",
|
||||
"search_user_to_mute": "Cercatz qual volètz rescondre",
|
||||
"security_tab": "Seguretat",
|
||||
"scope_copy": "Copiar lo nivèl de confidencialitat per las responsas (Totjorn aissí pels Messatges Dirèctes)",
|
||||
"minimal_scopes_mode": "Minimizar lo nombre d’opcions per publicacion",
|
||||
"set_new_avatar": "Definir un nòu avatar",
|
||||
"set_new_profile_background": "Definir un nòu fons de perfil",
|
||||
"set_new_profile_banner": "Definir una nòva bandièra de perfil",
|
||||
|
@ -349,6 +360,11 @@
|
|||
"checkbox": "Ai legit los tèrmes e condicions d’utilizacion",
|
||||
"link": "un pichon ligam simpatic"
|
||||
}
|
||||
},
|
||||
"version": {
|
||||
"title": "Version",
|
||||
"backend_version": "Version Backend",
|
||||
"frontend_version": "Version Frontend"
|
||||
}
|
||||
},
|
||||
"timeline": {
|
||||
|
@ -394,7 +410,26 @@
|
|||
"block_progress": "Blocatge...",
|
||||
"unmute": "Tornar mostrar",
|
||||
"unmute_progress": "Afichatge...",
|
||||
"mute_progress": "A amagar..."
|
||||
"mute_progress": "A amagar...",
|
||||
"admin_menu": {
|
||||
"moderation": "Moderacion",
|
||||
"grant_admin": "Passar Admin",
|
||||
"revoke_admin": "Revocar Admin",
|
||||
"grant_moderator": "Passar Moderator",
|
||||
"revoke_moderator": "Revocar Moderator",
|
||||
"activate_account": "Activar lo compte",
|
||||
"deactivate_account": "Desactivar lo compte",
|
||||
"delete_account": "Suprimir lo compte",
|
||||
"force_nsfw": "Marcar totas las publicacions coma sensiblas",
|
||||
"strip_media": "Tirar los mèdias de las publicacions",
|
||||
"force_unlisted": "Forçar las publicacions en pas-listadas",
|
||||
"sandbox": "Forçar las publicacions en seguidors solament",
|
||||
"disable_remote_subscription": "Desactivar lo seguiment d’utilizaire d’instàncias alonhadas",
|
||||
"disable_any_subscription": "Desactivar tot seguiment",
|
||||
"quarantine": "Defendre la federacion de las publicacions de l’utilizaire",
|
||||
"delete_user": "Suprimir l’utilizaire",
|
||||
"delete_user_confirmation": "Volètz vertadièrament far aquò ? Aquesta accion se pòt pas anullar."
|
||||
}
|
||||
},
|
||||
"user_profile": {
|
||||
"timeline_title": "Flux utilizaire",
|
||||
|
@ -426,4 +461,4 @@
|
|||
"TiB": "Tio"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -74,7 +74,8 @@
|
|||
"content_type": {
|
||||
"text/plain": "Czysty tekst",
|
||||
"text/html": "HTML",
|
||||
"text/markdown": "Markdown"
|
||||
"text/markdown": "Markdown",
|
||||
"text/bbcode": "BBCode"
|
||||
},
|
||||
"content_warning": "Temat (nieobowiązkowy)",
|
||||
"default": "Właśnie wróciłem z kościoła",
|
||||
|
@ -431,4 +432,4 @@
|
|||
"TiB": "TiB"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,7 +8,8 @@
|
|||
},
|
||||
"general": {
|
||||
"apply": "Применить",
|
||||
"submit": "Отправить"
|
||||
"submit": "Отправить",
|
||||
"cancel": "Отмена"
|
||||
},
|
||||
"login": {
|
||||
"login": "Войти",
|
||||
|
@ -311,7 +312,26 @@
|
|||
"muted": "Игнорирую",
|
||||
"per_day": "в день",
|
||||
"remote_follow": "Читать удалённо",
|
||||
"statuses": "Статусы"
|
||||
"statuses": "Статусы",
|
||||
"admin_menu": {
|
||||
"moderation": "Опции модератора",
|
||||
"grant_admin": "Сделать администратором",
|
||||
"revoke_admin": "Забрать права администратора",
|
||||
"grant_moderator": "Сделать модератором",
|
||||
"revoke_moderator": "Забрать права модератора",
|
||||
"activate_account": "Активировать аккаунт",
|
||||
"deactivate_account": "Деактивировать аккаунт",
|
||||
"delete_account": "Удалить аккаунт",
|
||||
"force_nsfw": "Отмечать посты пользователя как NSFW",
|
||||
"strip_media": "Убирать вложения из постов пользователя",
|
||||
"force_unlisted": "Не добавлять посты в публичные ленты",
|
||||
"sandbox": "Посты доступны только для подписчиков",
|
||||
"disable_remote_subscription": "Запретить подписываться с удаленных серверов",
|
||||
"disable_any_subscription": "Запретить подписываться на пользователя",
|
||||
"quarantine": "Не федерировать посты пользователя",
|
||||
"delete_user": "Удалить пользователя",
|
||||
"delete_user_confirmation": "Вы уверены? Это действие нельзя отменить."
|
||||
}
|
||||
},
|
||||
"user_profile": {
|
||||
"timeline_title": "Лента пользователя"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue