From 10070394780ac79e9ee1e8548500586a1f78f65b Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko
Date: Sun, 10 May 2020 12:54:55 +0200
Subject: Autocomplete domain mutes from list of known instances
---
src/i18n/en.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'src/i18n')
diff --git a/src/i18n/en.json b/src/i18n/en.json
index c322e538..eefe10e5 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -401,7 +401,7 @@
"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
"tooltipRadius": "Tooltips/alerts",
- "type_domains_to_mute": "Type in domains to mute",
+ "type_domains_to_mute": "Search domains to mute",
"upload_a_photo": "Upload a photo",
"user_settings": "User Settings",
"values": {
--
cgit v1.2.3-70-g09d2
From ff2cd3d672f7bec9e5985ecb86a491004cc53f74 Mon Sep 17 00:00:00 2001
From: hj
Date: Sun, 7 Jun 2020 15:23:21 +0000
Subject: Translated using Weblate (Russian)
Currently translated at 60.0% (373 of 621 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/ru/
---
src/i18n/ru.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'src/i18n')
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 69b22618..f9a72954 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -456,9 +456,9 @@
},
"domain_mute_card": {
"mute": "Игнорировать",
- "mute_progress": "В процессе...",
+ "mute_progress": "В процессе…",
"unmute": "Прекратить игнорирование",
- "unmute_progress": "В процессе..."
+ "unmute_progress": "В процессе…"
},
"exporter": {
"export": "Экспорт",
--
cgit v1.2.3-70-g09d2
From 7b9fa325859683c31d5c5cfacab59b27921bb740 Mon Sep 17 00:00:00 2001
From: Ben Is
Date: Tue, 9 Jun 2020 16:32:41 +0000
Subject: Translated using Weblate (Italian)
Currently translated at 68.5% (426 of 621 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
src/i18n/it.json | 39 ++++++++++++++++++++++++++++++++++++---
1 file changed, 36 insertions(+), 3 deletions(-)
(limited to 'src/i18n')
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 360c72aa..101e1dd3 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -12,7 +12,12 @@
"disable": "Disabilita",
"enable": "Abilita",
"confirm": "Conferma",
- "verify": "Verifica"
+ "verify": "Verifica",
+ "peek": "Anteprima",
+ "close": "Chiudi",
+ "retry": "Riprova",
+ "error_retry": "Per favore, riprova",
+ "loading": "Carico…"
},
"nav": {
"mentions": "Menzioni",
@@ -212,7 +217,34 @@
},
"common": {
"opacity": "Opacità",
- "color": "Colore"
+ "color": "Colore",
+ "contrast": {
+ "context": {
+ "text": "per il testo",
+ "18pt": "per il testo grande (oltre 17pt)"
+ },
+ "level": {
+ "bad": "non soddisfa le linee guida di alcun livello",
+ "aaa": "soddisfa le linee guida di livello AAA (ottimo)",
+ "aa": "soddisfa le linee guida di livello AA (sufficiente)"
+ },
+ "hint": "Il rapporto di contrasto è {ratio}, e {level} {context}"
+ }
+ },
+ "advanced_colors": {
+ "badge": "Sfondo medaglie",
+ "post": "Messaggi / Biografie",
+ "alert_neutral": "Neutro",
+ "alert_warning": "Attenzione",
+ "alert_error": "Errore",
+ "alert": "Sfondo degli avvertimenti",
+ "_tab_label": "Avanzate"
+ },
+ "common_colors": {
+ "rgbo": "Icone, accenti, medaglie",
+ "foreground_hint": "Seleziona l'etichetta \"Avanzate\" per controlli più fini",
+ "main": "Colori comuni",
+ "_tab_label": "Comuni"
}
},
"enable_web_push_notifications": "Abilita notifiche web push",
@@ -273,7 +305,8 @@
"accent": "Accento",
"emoji_reactions_on_timeline": "Mostra emoji di reazione sulle sequenze",
"pad_emoji": "Affianca spazi agli emoji inseriti tramite selettore",
- "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più."
+ "notification_blocks": "Bloccando un utente non riceverai più le sue notifiche né lo seguirai più.",
+ "mutes_and_blocks": "Zittiti e bloccati"
},
"timeline": {
"error_fetching": "Errore nell'aggiornamento",
--
cgit v1.2.3-70-g09d2
From c59c0ec4be4a1d253c89e912ddce19029a5b5ba2 Mon Sep 17 00:00:00 2001
From: Ben Is
Date: Wed, 10 Jun 2020 13:46:42 +0000
Subject: Translated using Weblate (Italian)
Currently translated at 72.6% (451 of 621 strings)
Translation: Pleroma/Pleroma-FE
Translate-URL: https://translate.pleroma.social/projects/pleroma/pleroma-fe/it/
---
src/i18n/it.json | 33 +++++++++++++++++++++++++++++++--
1 file changed, 31 insertions(+), 2 deletions(-)
(limited to 'src/i18n')
diff --git a/src/i18n/it.json b/src/i18n/it.json
index 101e1dd3..6c8be351 100644
--- a/src/i18n/it.json
+++ b/src/i18n/it.json
@@ -238,13 +238,42 @@
"alert_warning": "Attenzione",
"alert_error": "Errore",
"alert": "Sfondo degli avvertimenti",
- "_tab_label": "Avanzate"
+ "_tab_label": "Avanzate",
+ "tabs": "Etichette",
+ "disabled": "Disabilitato",
+ "selectedMenu": "Voce menù selezionata",
+ "selectedPost": "Messaggio selezionato",
+ "pressed": "Premuto",
+ "highlight": "Elementi evidenziati",
+ "icons": "Icone",
+ "poll": "Grafico sondaggi",
+ "underlay": "Sottostante",
+ "faint_text": "Testo sbiadito",
+ "inputs": "Campi d'immissione",
+ "buttons": "Pulsanti",
+ "borders": "Bordi",
+ "top_bar": "Barra superiore",
+ "panel_header": "Titolo pannello",
+ "badge_notification": "Notifica",
+ "popover": "Suggerimenti, menù, sbalzi"
},
"common_colors": {
"rgbo": "Icone, accenti, medaglie",
"foreground_hint": "Seleziona l'etichetta \"Avanzate\" per controlli più fini",
"main": "Colori comuni",
"_tab_label": "Comuni"
+ },
+ "shadows": {
+ "inset": "Includi",
+ "spread": "Spandi",
+ "blur": "Sfoca",
+ "shadow_id": "Ombra numero {value}",
+ "override": "Sostituisci",
+ "component": "Componente",
+ "_tab_label": "Luci ed ombre"
+ },
+ "radii": {
+ "_tab_label": "Raggio"
}
},
"enable_web_push_notifications": "Abilita notifiche web push",
@@ -261,7 +290,7 @@
"notifications": "Notifiche",
"greentext": "Frecce da meme",
"upload_a_photo": "Carica un'immagine",
- "type_domains_to_mute": "Inserisci domini da zittire",
+ "type_domains_to_mute": "Cerca domini da zittire",
"theme_help_v2_2": "Le icone dietro alcuni elementi sono indicatori del contrasto fra testo e sfondo, passaci sopra col puntatore per ulteriori informazioni. Se si usano delle trasparenze, questi indicatori mostrano il peggior caso possibile.",
"theme_help_v2_1": "Puoi anche forzare colore ed opacità di alcuni elementi selezionando la casella. Usa il pulsante \"Azzera\" per azzerare tutte le forzature.",
"useStreamingApiWarning": "(Sconsigliato, sperimentale, può saltare messaggi)",
--
cgit v1.2.3-70-g09d2
From 14540e2a078bd59ca8f13cd5c0b894acad3d639f Mon Sep 17 00:00:00 2001
From: lain
Date: Tue, 16 Jun 2020 13:27:36 +0200
Subject: Service Worker: Extract messages to own module.
---
src/i18n/service_worker_messages.js | 35 +++++++++++++++++++++++++++++++++++
src/sw.js | 32 +-------------------------------
2 files changed, 36 insertions(+), 31 deletions(-)
create mode 100644 src/i18n/service_worker_messages.js
(limited to 'src/i18n')
diff --git a/src/i18n/service_worker_messages.js b/src/i18n/service_worker_messages.js
new file mode 100644
index 00000000..270ed043
--- /dev/null
+++ b/src/i18n/service_worker_messages.js
@@ -0,0 +1,35 @@
+/* eslint-disable import/no-webpack-loader-syntax */
+// This module exports only the notification part of the i18n,
+// which is useful for the service worker
+
+const messages = {
+ ar: require('../lib/notification-i18n-loader.js!./ar.json'),
+ ca: require('../lib/notification-i18n-loader.js!./ca.json'),
+ cs: require('../lib/notification-i18n-loader.js!./cs.json'),
+ de: require('../lib/notification-i18n-loader.js!./de.json'),
+ eo: require('../lib/notification-i18n-loader.js!./eo.json'),
+ es: require('../lib/notification-i18n-loader.js!./es.json'),
+ et: require('../lib/notification-i18n-loader.js!./et.json'),
+ eu: require('../lib/notification-i18n-loader.js!./eu.json'),
+ fi: require('../lib/notification-i18n-loader.js!./fi.json'),
+ fr: require('../lib/notification-i18n-loader.js!./fr.json'),
+ ga: require('../lib/notification-i18n-loader.js!./ga.json'),
+ he: require('../lib/notification-i18n-loader.js!./he.json'),
+ hu: require('../lib/notification-i18n-loader.js!./hu.json'),
+ it: require('../lib/notification-i18n-loader.js!./it.json'),
+ ja: require('../lib/notification-i18n-loader.js!./ja_pedantic.json'),
+ ja_easy: require('../lib/notification-i18n-loader.js!./ja_easy.json'),
+ ko: require('../lib/notification-i18n-loader.js!./ko.json'),
+ nb: require('../lib/notification-i18n-loader.js!./nb.json'),
+ nl: require('../lib/notification-i18n-loader.js!./nl.json'),
+ oc: require('../lib/notification-i18n-loader.js!./oc.json'),
+ pl: require('../lib/notification-i18n-loader.js!./pl.json'),
+ pt: require('../lib/notification-i18n-loader.js!./pt.json'),
+ ro: require('../lib/notification-i18n-loader.js!./ro.json'),
+ ru: require('../lib/notification-i18n-loader.js!./ru.json'),
+ te: require('../lib/notification-i18n-loader.js!./te.json'),
+ zh: require('../lib/notification-i18n-loader.js!./zh.json'),
+ en: require('../lib/notification-i18n-loader.js!./en.json')
+}
+
+export default messages
diff --git a/src/sw.js b/src/sw.js
index 6e31516a..c971222e 100644
--- a/src/sw.js
+++ b/src/sw.js
@@ -1,41 +1,11 @@
/* eslint-env serviceworker */
-/* eslint-disable import/no-webpack-loader-syntax */
import localForage from 'localforage'
import { parseNotification } from './services/entity_normalizer/entity_normalizer.service.js'
import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
import Vue from 'vue'
import VueI18n from 'vue-i18n'
-
-const messages = {
- ar: require('./lib/notification-i18n-loader.js!./i18n/ar.json'),
- ca: require('./lib/notification-i18n-loader.js!./i18n/ca.json'),
- cs: require('./lib/notification-i18n-loader.js!./i18n/cs.json'),
- de: require('./lib/notification-i18n-loader.js!./i18n/de.json'),
- eo: require('./lib/notification-i18n-loader.js!./i18n/eo.json'),
- es: require('./lib/notification-i18n-loader.js!./i18n/es.json'),
- et: require('./lib/notification-i18n-loader.js!./i18n/et.json'),
- eu: require('./lib/notification-i18n-loader.js!./i18n/eu.json'),
- fi: require('./lib/notification-i18n-loader.js!./i18n/fi.json'),
- fr: require('./lib/notification-i18n-loader.js!./i18n/fr.json'),
- ga: require('./lib/notification-i18n-loader.js!./i18n/ga.json'),
- he: require('./lib/notification-i18n-loader.js!./i18n/he.json'),
- hu: require('./lib/notification-i18n-loader.js!./i18n/hu.json'),
- it: require('./lib/notification-i18n-loader.js!./i18n/it.json'),
- ja: require('./lib/notification-i18n-loader.js!./i18n/ja_pedantic.json'),
- ja_easy: require('./lib/notification-i18n-loader.js!./i18n/ja_easy.json'),
- ko: require('./lib/notification-i18n-loader.js!./i18n/ko.json'),
- nb: require('./lib/notification-i18n-loader.js!./i18n/nb.json'),
- nl: require('./lib/notification-i18n-loader.js!./i18n/nl.json'),
- oc: require('./lib/notification-i18n-loader.js!./i18n/oc.json'),
- pl: require('./lib/notification-i18n-loader.js!./i18n/pl.json'),
- pt: require('./lib/notification-i18n-loader.js!./i18n/pt.json'),
- ro: require('./lib/notification-i18n-loader.js!./i18n/ro.json'),
- ru: require('./lib/notification-i18n-loader.js!./i18n/ru.json'),
- te: require('./lib/notification-i18n-loader.js!./i18n/te.json'),
- zh: require('./lib/notification-i18n-loader.js!./i18n/zh.json'),
- en: require('./lib/notification-i18n-loader.js!./i18n/en.json')
-}
+import messages from './i18n/service_worker_messages.js'
Vue.use(VueI18n)
const i18n = new VueI18n({
--
cgit v1.2.3-70-g09d2
From 2451956d838d132a14a3089546ceac59c07e1b3a Mon Sep 17 00:00:00 2001
From: Sergey Suprunenko
Date: Sun, 21 Jun 2020 14:59:05 +0200
Subject: Add 'bot' flag to Profile settings
---
src/components/settings_modal/tabs/profile_tab.js | 2 ++
src/components/settings_modal/tabs/profile_tab.vue | 5 +++++
src/i18n/en.json | 1 +
src/i18n/ru.json | 1 +
4 files changed, 9 insertions(+)
(limited to 'src/i18n')
diff --git a/src/components/settings_modal/tabs/profile_tab.js b/src/components/settings_modal/tabs/profile_tab.js
index 8658b097..56e956cd 100644
--- a/src/components/settings_modal/tabs/profile_tab.js
+++ b/src/components/settings_modal/tabs/profile_tab.js
@@ -23,6 +23,7 @@ const ProfileTab = {
showRole: this.$store.state.users.currentUser.show_role,
role: this.$store.state.users.currentUser.role,
discoverable: this.$store.state.users.currentUser.discoverable,
+ bot: this.$store.state.users.currentUser.bot,
allowFollowingMove: this.$store.state.users.currentUser.allow_following_move,
pickAvatarBtnVisible: true,
bannerUploading: false,
@@ -79,6 +80,7 @@ const ProfileTab = {
hide_follows: this.hideFollows,
hide_followers: this.hideFollowers,
discoverable: this.discoverable,
+ bot: this.bot,
allow_following_move: this.allowFollowingMove,
hide_follows_count: this.hideFollowsCount,
hide_followers_count: this.hideFollowersCount,
diff --git a/src/components/settings_modal/tabs/profile_tab.vue b/src/components/settings_modal/tabs/profile_tab.vue
index fff4f970..decdb389 100644
--- a/src/components/settings_modal/tabs/profile_tab.vue
+++ b/src/components/settings_modal/tabs/profile_tab.vue
@@ -95,6 +95,11 @@
{{ $t('settings.discoverable') }}
+
+
+ {{ $t('settings.bot') }}
+
+