From 0c4dc26808c3bb7508bf9005f3c3430f1c7e2039 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Mon, 12 Mar 2018 02:31:33 +0300 Subject: after nine years of development, hopefully, it has been worth the weight --- src/i18n/messages.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index c4a62128..48708539 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -245,6 +245,7 @@ const en = { hide_attachments_in_tl: 'Hide attachments in timeline', hide_attachments_in_convo: 'Hide attachments in conversations', nsfw_clickthrough: 'Enable clickthrough NSFW attachment hiding', + stop_gifs: 'Play-on-hover GIFs', autoload: 'Enable automatic loading when scrolled to the bottom', streaming: 'Enable automatic streaming of new posts when scrolled to the top', reply_link_preview: 'Enable reply-link preview on mouse hover', @@ -1096,6 +1097,7 @@ const ru = { attachments: 'Вложения', hide_attachments_in_tl: 'Прятать вложения в ленте', hide_attachments_in_convo: 'Прятать вложения в разговорах', + stop_gifs: 'Проигрывать GIF анимации только при наведении', nsfw_clickthrough: 'Включить скрытие NSFW вложений', autoload: 'Включить автоматическую загрузку при прокрутке вниз', streaming: 'Включить автоматическую загрузку новых сообщений при прокрутке вверх', -- cgit v1.2.3-70-g09d2 From f6fb592ba11f90298e7bb43fa5b7b68af1088773 Mon Sep 17 00:00:00 2001 From: Sebastian Huebner Date: Mon, 12 Mar 2018 11:11:07 +0100 Subject: updated german translation --- src/i18n/messages.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a2ce3dff..2a465794 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -20,7 +20,8 @@ const de = { muted: 'Stummgeschaltet', followers: 'Folgende', followees: 'Folgt', - per_day: 'pro Tag' + per_day: 'pro Tag', + remote_follow: 'Remote Follow' }, timeline: { show_new: 'Zeige Neuere', @@ -53,9 +54,9 @@ const de = { filtering: 'Filter', filtering_explanation: 'Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.', attachments: 'Anhänge', - hide_attachments_in_tl: 'Anhänge in der Timeline ausblenden', + hide_attachments_in_tl: 'Anhänge in der Zeitleiste ausblenden', hide_attachments_in_convo: 'Anhänge in Unterhaltungen ausblenden', - nsfw_clickthrough: 'Aktiviere ausblendbares Overlay für als NSFW markierte Anhänge', + nsfw_clickthrough: 'Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind', autoload: 'Aktiviere automatisches Laden von älteren Beiträgen beim scrollen', streaming: 'Aktiviere automatisches Laden (Streaming) von neuen Beiträgen', reply_link_preview: 'Aktiviere reply-link Vorschau bei Maus-Hover', @@ -94,6 +95,9 @@ const de = { general: { submit: 'Absenden', apply: 'Anwenden' + }, + user_profile: { + timeline_title: 'Beiträge' } } -- cgit v1.2.3-70-g09d2 From d57dec6fb48520c087edbda0e46d01d7eb76b507 Mon Sep 17 00:00:00 2001 From: Daniel Cobalto Date: Tue, 20 Mar 2018 01:24:20 +0000 Subject: Update messages.js for pt fix --- src/i18n/messages.js | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a2ce3dff..bd738b5a 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -960,11 +960,12 @@ const pt = { blocked: 'Bloqueado!', block: 'Bloquear', statuses: 'Postagens', - mute: 'Mutar', - muted: 'Mudo', + mute: 'Silenciar', + muted: 'Silenciado', followers: 'Seguidores', followees: 'Seguindo', - per_day: 'por dia' + per_day: 'por dia', + remote_follow: 'Seguidor Remoto' }, timeline: { show_new: 'Mostrar novas', @@ -980,16 +981,16 @@ const pt = { bio: 'Biografia', avatar: 'Avatar', current_avatar: 'Seu avatar atual', - set_new_avatar: 'Mudar avatar', + set_new_avatar: 'Alterar avatar', profile_banner: 'Capa de perfil', current_profile_banner: 'Sua capa de perfil atual', - set_new_profile_banner: 'Mudar capa de perfil', + set_new_profile_banner: 'Alterar capa de perfil', profile_background: 'Plano de fundo de perfil', - set_new_profile_background: 'Mudar o plano de fundo de perfil', + set_new_profile_background: 'Alterar o plano de fundo de perfil', settings: 'Configurações', theme: 'Tema', presets: 'Predefinições', - theme_help: 'Use cores em códigos hexadecimais (#aabbcc) para personalizar seu esquema de cores.', + theme_help: 'Use cores em código hexadecimal (#aabbcc) para personalizar seu esquema de cores.', background: 'Plano de Fundo', foreground: 'Primeiro Plano', text: 'Texto', @@ -1004,9 +1005,9 @@ const pt = { streaming: 'Habilitar o fluxo automático de postagens quando ao topo da página', reply_link_preview: 'Habilitar a pré-visualização de link de respostas ao passar o mouse.', follow_import: 'Importar seguidas', - import_followers_from_a_csv_file: 'Importe os perfis que tu segues apartir de um arquivo CSV', - follows_imported: 'Seguidas importadas! O processamento das mesmas pode demorar um pouco.', - follow_import_error: 'Erro ao importar seguidas' + import_followers_from_a_csv_file: 'Importe seguidores a partir de um arquivo CSV', + follows_imported: 'Seguidores importados! O processamento pode demorar um pouco.', + follow_import_error: 'Erro ao importar seguidores' }, notifications: { notifications: 'Notificações', @@ -1023,7 +1024,7 @@ const pt = { registration: { registration: 'Registro', fullname: 'Nome para exibição', - email: 'Correio eletônico', + email: 'Correio eletrônico', bio: 'Biografia', password_confirm: 'Confirmação de senha' }, -- cgit v1.2.3-70-g09d2 From 362cde1c03b28d0e9181c67570902a1fa79c3e5b Mon Sep 17 00:00:00 2001 From: Exilat Date: Mon, 2 Apr 2018 09:27:04 +0000 Subject: Update messages.js Occitan language added + corrections in French --- src/i18n/messages.js | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 3 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a2ce3dff..57dc12d4 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -626,8 +626,8 @@ const fr = { twkn: 'Le réseau connu' }, user_card: { - follows_you: 'Vous suit!', - following: 'Suivi!', + follows_you: 'Vous suit !', + following: 'Suivi !', follow: 'Suivre', blocked: 'Bloqué', block: 'Bloquer', @@ -671,7 +671,7 @@ const fr = { }, notifications: { notifications: 'Notfications', - read: 'Lu!', + read: 'Lu !', followed_you: 'vous a suivi' }, login: { @@ -759,6 +759,89 @@ const it = { } } +const oc = { + nav: { + timeline: 'Jornal', + mentions: 'Notificacions', + public_tl: 'Estatuts locals', + twkn: 'Lo malhum conegut' + }, + user_card: { + follows_you: 'Vos sèc !', + following: 'Seguit !', + follow: 'Seguir', + blocked: 'Blocat', + block: 'Blocar', + statuses: 'Estatuts', + mute: 'En silenci', + muted: 'Mes en silenci', + followers: 'Seguidors', + followees: 'Abonaments', + per_day: 'per jorn' + }, + timeline: { + show_new: 'Ne veire mai', + error_fetching: 'Error en cercant de mesas a jorn', + up_to_date: 'Actualizat', + load_older: 'Ne veire mai', + conversation: 'Conversacion' + }, + settings: { + user_settings: 'Paramètres utilizaire', + name_bio: 'Nom & Bio', + name: 'Nom', + bio: 'Biografia', + avatar: 'Avatar', + current_avatar: 'Vòstre avatar', + set_new_avatar: 'Cambiar l’avatar', + profile_banner: 'Bandièra del perfil', + current_profile_banner: 'Bandièra del perfil', + set_new_profile_banner: 'Cambiar de bandièra', + profile_background: 'Imatge de fons', + set_new_profile_background: 'Cambiar l’imatge de fons', + settings: 'Paramètres', + theme: 'Tèma', + filtering: 'Filtre', + filtering_explanation: 'Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha.', + attachments: 'Pèças juntas', + hide_attachments_in_tl: 'Rescondre las pèças juntas', + hide_attachments_in_convo: 'Rescondre las pèças juntas dins las conversacions', + nsfw_clickthrough: 'Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles', + autoload: 'Activar lo cargament automatic un còp arribat al cap de la pagina', + reply_link_preview: 'Activar l’apercebut en passar la mirga' + }, + notifications: { + notifications: 'Notficacions', + read: 'Legit !', + followed_you: 'vos a seguit' + }, + login: { + login: 'Connexion', + username: 'Nom d’utilizaire', + password: 'Senhal', + register: 'Se marcar', + logout: 'Desconnexion' + }, + registration: { + registration: 'Inscripcion', + fullname: 'Nom complèt', + email: 'Adreça de corrièl', + bio: 'Biografia', + password_confirm: 'Confirmar lo senhal' + }, + post_status: { + posting: 'Mandadís', + default: 'Escrivètz aquí vòstre estatut.' + }, + finder: { + find_user: 'Cercar un utilizaire', + error_fetching_user: 'Error pendent la recèrca d’un utilizaire' + }, + general: { + submit: 'Mandar' + } +} + const pl = { nav: { timeline: 'Oś czasu', -- cgit v1.2.3-70-g09d2 From 83dbb81acdd4dca469c3332afbe6a1c9ce1c47cc Mon Sep 17 00:00:00 2001 From: Exilat Date: Mon, 2 Apr 2018 18:46:56 +0000 Subject: Update messages.js --- src/i18n/messages.js | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 57dc12d4..d68372eb 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -760,8 +760,12 @@ const it = { } const oc = { + chat: { + title: 'Chat' + }, nav: { - timeline: 'Jornal', + chat: 'Chat local', + timeline: 'Flux d’actualitat', mentions: 'Notificacions', public_tl: 'Estatuts locals', twkn: 'Lo malhum conegut' @@ -777,7 +781,8 @@ const oc = { muted: 'Mes en silenci', followers: 'Seguidors', followees: 'Abonaments', - per_day: 'per jorn' + per_day: 'per jorn', + remote_follow: 'Seguir a distància' }, timeline: { show_new: 'Ne veire mai', @@ -792,15 +797,21 @@ const oc = { name: 'Nom', bio: 'Biografia', avatar: 'Avatar', - current_avatar: 'Vòstre avatar', + current_avatar: 'Vòstre avatar actual', set_new_avatar: 'Cambiar l’avatar', profile_banner: 'Bandièra del perfil', - current_profile_banner: 'Bandièra del perfil', + current_profile_banner: 'Bandièra actula del perfil', set_new_profile_banner: 'Cambiar de bandièra', profile_background: 'Imatge de fons', set_new_profile_background: 'Cambiar l’imatge de fons', settings: 'Paramètres', theme: 'Tèma', + presets: 'Pre-enregistrats', + theme_help: 'Use hex color codes (#aabbcc) to customize your color theme.', + background: 'Rèire plan', + foreground: 'Endavant', + text: 'Tèxte', + links: 'Ligams', filtering: 'Filtre', filtering_explanation: 'Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha.', attachments: 'Pèças juntas', @@ -808,7 +819,12 @@ const oc = { hide_attachments_in_convo: 'Rescondre las pèças juntas dins las conversacions', nsfw_clickthrough: 'Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles', autoload: 'Activar lo cargament automatic un còp arribat al cap de la pagina', - reply_link_preview: 'Activar l’apercebut en passar la mirga' + streaming: 'Activar lo cargament automatic dels novèls estatus en anar amont', + reply_link_preview: 'Activar l’apercebut en passar la mirga', + follow_import: 'Importar los abonaments', + import_followers_from_a_csv_file: 'Importar los seguidors d’un fichièr csv', + follows_imported: 'Seguidors importats. Lo tractament pòt trigar una estona.', + follow_import_error: 'Error en important los seguidors' }, notifications: { notifications: 'Notficacions', @@ -838,7 +854,11 @@ const oc = { error_fetching_user: 'Error pendent la recèrca d’un utilizaire' }, general: { - submit: 'Mandar' + submit: 'Mandar', + apply: 'Aplicar' + }, + user_profile: { + timeline_title: 'Flux a l’utilizaire' } } -- cgit v1.2.3-70-g09d2 From 146538c126e388f60b874937fa29483551f0f651 Mon Sep 17 00:00:00 2001 From: Exilat Date: Mon, 2 Apr 2018 18:48:01 +0000 Subject: Update messages.js --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index d68372eb..9ebc4a50 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -800,7 +800,7 @@ const oc = { current_avatar: 'Vòstre avatar actual', set_new_avatar: 'Cambiar l’avatar', profile_banner: 'Bandièra del perfil', - current_profile_banner: 'Bandièra actula del perfil', + current_profile_banner: 'Bandièra actuala del perfil', set_new_profile_banner: 'Cambiar de bandièra', profile_background: 'Imatge de fons', set_new_profile_background: 'Cambiar l’imatge de fons', -- cgit v1.2.3-70-g09d2 From 8cb95be4df381b7e926e5d67d9b84d0ff8607634 Mon Sep 17 00:00:00 2001 From: Exilat Date: Mon, 2 Apr 2018 19:21:39 +0000 Subject: Update messages.js --- src/i18n/messages.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 9ebc4a50..38ec87f6 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -807,7 +807,7 @@ const oc = { settings: 'Paramètres', theme: 'Tèma', presets: 'Pre-enregistrats', - theme_help: 'Use hex color codes (#aabbcc) to customize your color theme.', + theme_help: 'Emplegatz los còdis de color hex (#aabbcc) per personalizar vòstre tèma de color.', background: 'Rèire plan', foreground: 'Endavant', text: 'Tèxte', -- cgit v1.2.3-70-g09d2 From f62646c2f0f455705759ed46b3e7dec713133e1b Mon Sep 17 00:00:00 2001 From: Exilat Date: Tue, 3 Apr 2018 16:05:32 +0000 Subject: Update messages.js --- src/i18n/messages.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 38ec87f6..a85dd0aa 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -760,7 +760,7 @@ const it = { } const oc = { - chat: { + chat: { title: 'Chat' }, nav: { @@ -857,7 +857,7 @@ const oc = { submit: 'Mandar', apply: 'Aplicar' }, - user_profile: { + user_profile: { timeline_title: 'Flux a l’utilizaire' } } -- cgit v1.2.3-70-g09d2 From 845bdb3dfb768741b78d2a638e66d05feaa039bd Mon Sep 17 00:00:00 2001 From: Exilat Date: Tue, 3 Apr 2018 16:06:28 +0000 Subject: Update messages.js --- src/i18n/messages.js | 1 + 1 file changed, 1 insertion(+) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index a85dd0aa..6867d256 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1257,6 +1257,7 @@ const messages = { ja, fr, it, + oc, pl, es, pt, -- cgit v1.2.3-70-g09d2 From 986dbab3d267541449cd9ba684c632d9fe67ced7 Mon Sep 17 00:00:00 2001 From: Azurolu Date: Sat, 7 Apr 2018 03:28:23 +0000 Subject: Update messages.js: Added "streaming" french translation and corrected typo. --- src/i18n/messages.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/i18n/messages.js') diff --git a/src/i18n/messages.js b/src/i18n/messages.js index df923be4..d5f3674a 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -631,8 +631,8 @@ const fr = { twkn: 'Le réseau connu' }, user_card: { - follows_you: 'Vous suit !', - following: 'Suivi !', + follows_you: 'Vous suit !', + following: 'Suivi !', follow: 'Suivre', blocked: 'Bloqué', block: 'Bloquer', @@ -672,11 +672,12 @@ const fr = { hide_attachments_in_convo: 'Cacher les pièces jointes dans les conversations', nsfw_clickthrough: 'Activer le clic pour afficher les images marquées comme contenu adulte ou sensible', autoload: 'Activer le chargement automatique une fois le bas de la page atteint', + streaming: 'Activer le chargement automatique de nouveau statuts une fois le haut de la page atteint', reply_link_preview: 'Activer un aperçu sur passage de la souris' }, notifications: { - notifications: 'Notfications', - read: 'Lu !', + notifications: 'Notifications', + read: 'Lu !', followed_you: 'vous a suivi' }, login: { -- cgit v1.2.3-70-g09d2 From 65f82cf29438fc898cb7733f7bfc8a7868e6f4af Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sat, 7 Apr 2018 21:58:29 +0300 Subject: in a decent way. Needs different markup - // -webkit-appearance:none; - // -moz-appearance:none; - // appearance:none; + select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + background: transparent; + border: none; + margin: 0; + color: $fallback--fg; + color: var(--fg, $fallback--fg); + padding: 4px 3ch 3px 3px; + width: 100%; + z-index: 1; + } &[type=radio], &[type=checkbox] { @@ -185,7 +213,7 @@ nav { height: 50px; background-repeat: no-repeat; background-position: center; - background-size: contain; + background-size: auto 80%; a i { color: $fallback--link; diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 65dc3bab..04f6add4 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -41,6 +41,11 @@ flex: 0 0 auto; max-height: 300px; max-width: 100%; + line-height: 0; + + video { + max-height: 300px; + } } .attachment { diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue index 0f99b3b1..929f81ee 100644 --- a/src/components/post_status_form/post_status_form.vue +++ b/src/components/post_status_form/post_status_form.vue @@ -103,8 +103,8 @@ .attachment { position: relative; - border: $fallback--border; - border: var(--border, $fallback--border); + border: 1px solid $fallback--border; + border: 1px solid var(--border, $fallback--border); margin: 0.5em 0.8em 0.2em 0; } diff --git a/src/components/still-image/still-image.vue b/src/components/still-image/still-image.vue index 5695c554..5fefe714 100644 --- a/src/components/still-image/still-image.vue +++ b/src/components/still-image/still-image.vue @@ -10,53 +10,55 @@ diff --git a/src/components/style_switcher/style_switcher.js b/src/components/style_switcher/style_switcher.js index 5e5ba266..e6b80ac9 100644 --- a/src/components/style_switcher/style_switcher.js +++ b/src/components/style_switcher/style_switcher.js @@ -6,7 +6,7 @@ export default { availableStyles: [], selected: this.$store.state.config.theme, bgColorLocal: '', - fgColorLocal: '', + btnColorLocal: '', textColorLocal: '', linkColorLocal: '', redColorLocal: '#ff0000', @@ -26,7 +26,7 @@ export default { }, mounted () { this.bgColorLocal = rgbstr2hex(this.$store.state.config.colors.bg) - this.fgColorLocal = rgbstr2hex(this.$store.state.config.colors.lightBg) + this.btnColorLocal = rgbstr2hex(this.$store.state.config.colors.lightBg) this.textColorLocal = rgbstr2hex(this.$store.state.config.colors.fg) this.linkColorLocal = rgbstr2hex(this.$store.state.config.colors.link) @@ -37,7 +37,7 @@ export default { }, methods: { setCustomTheme () { - if (!this.bgColorLocal && !this.fgColorLocal && !this.linkColorLocal) { + if (!this.bgColorLocal && !this.btnColorLocal && !this.linkColorLocal) { // reset to picked themes } const rgb = (hex) => { @@ -49,7 +49,7 @@ export default { } : null } const bgRgb = rgb(this.bgColorLocal) - const fgRgb = rgb(this.fgColorLocal) + const btnRgb = rgb(this.btnColorLocal) const textRgb = rgb(this.textColorLocal) const linkRgb = rgb(this.linkColorLocal) @@ -58,11 +58,11 @@ export default { const greenRgb = rgb(this.greenColorLocal) const orangeRgb = rgb(this.orangeColorLocal) - if (bgRgb && fgRgb && linkRgb) { + if (bgRgb && btnRgb && linkRgb) { this.$store.dispatch('setOption', { name: 'customTheme', value: { - fg: fgRgb, + fg: btnRgb, bg: bgRgb, text: textRgb, link: linkRgb, @@ -77,12 +77,12 @@ export default { watch: { selected () { this.bgColorLocal = this.selected[1] - this.fgColorLocal = this.selected[2] + this.btnColorLocal = this.selected[2] this.textColorLocal = this.selected[3] this.linkColorLocal = this.selected[4] this.redColorLocal = this.selected[5] - this.blueColorLocal = this.selected[6] - this.greenColorLocal = this.selected[7] + this.greenColorLocal = this.selected[6] + this.blueColorLocal = this.selected[7] this.orangeColorLocal = this.selected[8] } } diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 6bdd4391..2ebf2b90 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -1,11 +1,15 @@