From f7c1668bf6927d9723fe4468091c8b794c0ed305 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Tue, 13 Mar 2018 14:06:14 +0900 Subject: [PATCH 01/12] Do not run lint in Travis CI (#6763) Lint is done by codeclimate --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 61d51ca21c..576659aafc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,5 +55,5 @@ before_script: script: - travis_retry bundle exec parallel_test spec/ --group-by filesize --type rspec - - yarn test + - yarn run test:jest - bundle exec i18n-tasks check-normalized && bundle exec i18n-tasks unused From d9500c8a3bee85cd74d8a42f21ff349cebdd5ade Mon Sep 17 00:00:00 2001 From: Daniel Hunsaker Date: Mon, 12 Mar 2018 23:07:02 -0600 Subject: [PATCH 02/12] [Nanobox] Fix DB backup task (#6766) Not sure how I missed that it had been using the wrong evar this entire time... --- boxfile.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boxfile.yml b/boxfile.yml index bb4149e70a..70774dac92 100644 --- a/boxfile.yml +++ b/boxfile.yml @@ -193,7 +193,7 @@ data.db: - id: backup schedule: '0 3 * * *' command: | - PGPASSWORD=${DATA_POSTGRES_PASS} pg_dump -U ${DATA_POSTGRES_USER} -w -Fc -O gonano | + PGPASSWORD=${DATA_DB_PASS} pg_dump -U ${DATA_DB_USER} -w -Fc -O gonano | gzip | curl -k -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/backup-${HOSTNAME}-$(date -u +%Y-%m-%d.%H-%M-%S).sql.gz --data-binary @- && curl -k -s -H "X-AUTH-TOKEN: ${WAREHOUSE_DATA_HOARDER_TOKEN}" https://${WAREHOUSE_DATA_HOARDER_HOST}:7410/blobs/ | From 386365090c9c9063941e3f7425c2e33c7d5c5b2a Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 13 Mar 2018 07:16:43 +0100 Subject: [PATCH 03/12] Fix #6762: Do not overwrite some status attributes in reducer (#6767) --- app/javascript/mastodon/reducers/statuses.js | 22 ++++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/javascript/mastodon/reducers/statuses.js b/app/javascript/mastodon/reducers/statuses.js index 5a47e72723..7b31416239 100644 --- a/app/javascript/mastodon/reducers/statuses.js +++ b/app/javascript/mastodon/reducers/statuses.js @@ -56,17 +56,21 @@ const normalizeStatus = (state, status) => { normalStatus.reblog = status.reblog.id; } - const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); + // Only calculate these values when status first encountered + // Otherwise keep the ones already in the reducer + if (!state.has(status.id)) { + const searchContent = [status.spoiler_text, status.content].join('\n\n').replace(//g, '\n').replace(/<\/p>

/g, '\n\n'); - const emojiMap = normalStatus.emojis.reduce((obj, emoji) => { - obj[`:${emoji.shortcode}:`] = emoji; - return obj; - }, {}); + const emojiMap = normalStatus.emojis.reduce((obj, emoji) => { + obj[`:${emoji.shortcode}:`] = emoji; + return obj; + }, {}); - normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; - normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); - normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap); - normalStatus.hidden = normalStatus.sensitive; + normalStatus.search_index = domParser.parseFromString(searchContent, 'text/html').documentElement.textContent; + normalStatus.contentHtml = emojify(normalStatus.content, emojiMap); + normalStatus.spoilerHtml = emojify(escapeTextContentForBrowser(normalStatus.spoiler_text || ''), emojiMap); + normalStatus.hidden = normalStatus.sensitive; + } return state.update(status.id, ImmutableMap(), map => map.mergeDeep(fromJS(normalStatus))); }; From 0dccb398bd0450068c4e90bf52be9688229ea1f3 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Tue, 13 Mar 2018 15:58:13 +0900 Subject: [PATCH 04/12] Change the title of spoiler button by state The title will give the precise representation of the current state. It would be helpful for blind people. --- .../compose/containers/spoiler_button_container.js | 5 +++-- app/javascript/mastodon/locales/ar.json | 3 ++- app/javascript/mastodon/locales/bg.json | 3 ++- app/javascript/mastodon/locales/ca.json | 3 ++- app/javascript/mastodon/locales/de.json | 3 ++- app/javascript/mastodon/locales/defaultMessages.json | 8 ++++++-- app/javascript/mastodon/locales/en.json | 3 ++- app/javascript/mastodon/locales/eo.json | 3 ++- app/javascript/mastodon/locales/es.json | 3 ++- app/javascript/mastodon/locales/fa.json | 3 ++- app/javascript/mastodon/locales/fi.json | 3 ++- app/javascript/mastodon/locales/fr.json | 3 ++- app/javascript/mastodon/locales/gl.json | 3 ++- app/javascript/mastodon/locales/he.json | 3 ++- app/javascript/mastodon/locales/hr.json | 3 ++- app/javascript/mastodon/locales/hu.json | 3 ++- app/javascript/mastodon/locales/hy.json | 3 ++- app/javascript/mastodon/locales/id.json | 3 ++- app/javascript/mastodon/locales/io.json | 3 ++- app/javascript/mastodon/locales/it.json | 3 ++- app/javascript/mastodon/locales/ja.json | 3 ++- app/javascript/mastodon/locales/ko.json | 3 ++- app/javascript/mastodon/locales/nl.json | 3 ++- app/javascript/mastodon/locales/no.json | 3 ++- app/javascript/mastodon/locales/oc.json | 3 ++- app/javascript/mastodon/locales/pl.json | 3 ++- app/javascript/mastodon/locales/pt-BR.json | 3 ++- app/javascript/mastodon/locales/pt.json | 3 ++- app/javascript/mastodon/locales/ru.json | 3 ++- app/javascript/mastodon/locales/sk.json | 3 ++- app/javascript/mastodon/locales/sr-Latn.json | 3 ++- app/javascript/mastodon/locales/sr.json | 3 ++- app/javascript/mastodon/locales/sv.json | 3 ++- app/javascript/mastodon/locales/th.json | 3 ++- app/javascript/mastodon/locales/tr.json | 3 ++- app/javascript/mastodon/locales/uk.json | 3 ++- app/javascript/mastodon/locales/zh-CN.json | 3 ++- app/javascript/mastodon/locales/zh-HK.json | 3 ++- app/javascript/mastodon/locales/zh-TW.json | 3 ++- 39 files changed, 83 insertions(+), 41 deletions(-) diff --git a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js index 4179b97060..0b9dc8df3b 100644 --- a/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js +++ b/app/javascript/mastodon/features/compose/containers/spoiler_button_container.js @@ -4,12 +4,13 @@ import { changeComposeSpoilerness } from '../../../actions/compose'; import { injectIntl, defineMessages } from 'react-intl'; const messages = defineMessages({ - title: { id: 'compose_form.spoiler', defaultMessage: 'Hide text behind warning' }, + marked: { id: 'compose_form.spoiler.marked', defaultMessage: 'Text is hidden behind warning' }, + unmarked: { id: 'compose_form.spoiler.unmarked', defaultMessage: 'Text is not hidden' }, }); const mapStateToProps = (state, { intl }) => ({ label: 'CW', - title: intl.formatMessage(messages.title), + title: intl.formatMessage(state.getIn(['compose', 'spoiler']) ? messages.marked : messages.unmarked), active: state.getIn(['compose', 'spoiler']), ariaControls: 'cw-spoiler-input', }); diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 397927abbd..c7734d72e6 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -61,7 +61,8 @@ "compose_form.publish": "بوّق", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "ضع علامة على الوسيط باعتباره حسّاس", - "compose_form.spoiler": "أخفِ النص واعرض تحذيرا", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "تنبيه عن المحتوى", "confirmation_modal.cancel": "إلغاء", "confirmations.block.confirm": "حجب", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 673ce0bc32..b596d25a09 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -61,7 +61,8 @@ "compose_form.publish": "Раздумай", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Отбележи съдържанието като деликатно", - "compose_form.spoiler": "Скрий текста зад предупреждение", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 318b36c966..729d29876f 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marca el contingut multimèdia com a sensible", - "compose_form.spoiler": "Amaga el text darrera darrere un avís", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escriu l'avís aquí", "confirmation_modal.cancel": "Cancel·la", "confirmations.block.confirm": "Bloca", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 92dc51be0b..15ede82626 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tröt", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Medien als heikel markieren", - "compose_form.spoiler": "Text hinter Warnung verbergen", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Inhaltswarnung", "confirmation_modal.cancel": "Abbrechen", "confirmations.block.confirm": "Blockieren", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index cd64ae26e7..4466d2ff63 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -777,8 +777,12 @@ { "descriptors": [ { - "defaultMessage": "Hide text behind warning", - "id": "compose_form.spoiler" + "defaultMessage": "Text is hidden behind warning", + "id": "compose_form.spoiler.marked" + }, + { + "defaultMessage": "Text is not hidden", + "id": "compose_form.spoiler.unmarked" } ], "path": "app/javascript/mastodon/features/compose/containers/spoiler_button_container.json" diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index 3a5daee210..d32e941295 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Mark media as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Write your warning here", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 03719963f6..6dd9ed1339 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -61,7 +61,8 @@ "compose_form.publish": "Hup", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marki aŭdovidaĵon tikla", - "compose_form.spoiler": "Kaŝi tekston malantaŭ averto", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Skribu vian averton ĉi tie", "confirmation_modal.cancel": "Nuligi", "confirmations.block.confirm": "Bloki", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 8ecb81ddfd..9a219f9515 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tootear", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marcar contenido como sensible", - "compose_form.spoiler": "Ocultar texto tras una advertencia", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Advertencia de contenido", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 50aa12a05b..9a925c320d 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -61,7 +61,8 @@ "compose_form.publish": "بوق", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "تصاویر حساس هستند", - "compose_form.spoiler": "نوشته را پشت هشدار پنهان کنید", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "هشدار محتوا", "confirmation_modal.cancel": "بی‌خیال", "confirmations.block.confirm": "مسدود کن", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index f4d730c0c4..c8775c78d5 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Merkitse media herkäksi", - "compose_form.spoiler": "Piiloita teksti varoituksen taakse", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Peruuta", "confirmations.block.confirm": "Estä", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 2140ee506f..202d0f7ce6 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -61,7 +61,8 @@ "compose_form.publish": "Pouet", "compose_form.publish_loud": "{publish} !", "compose_form.sensitive": "Marquer le média comme sensible", - "compose_form.spoiler": "Masquer le texte derrière un avertissement", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Écrivez ici votre avertissement", "confirmation_modal.cancel": "Annuler", "confirmations.block.confirm": "Bloquer", diff --git a/app/javascript/mastodon/locales/gl.json b/app/javascript/mastodon/locales/gl.json index 3c74ba4000..404253b7f8 100644 --- a/app/javascript/mastodon/locales/gl.json +++ b/app/javascript/mastodon/locales/gl.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marcar medios como sensibles", - "compose_form.spoiler": "Agochar texto detrás de un aviso", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escriba o aviso aquí", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 8e784b171e..c9dcd088dc 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -61,7 +61,8 @@ "compose_form.publish": "ללחוש", "compose_form.publish_loud": "לחצרץ!", "compose_form.sensitive": "סימון תוכן כרגיש", - "compose_form.spoiler": "הסתרה מאחורי אזהרת תוכן", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "אזהרת תוכן", "confirmation_modal.cancel": "ביטול", "confirmations.block.confirm": "לחסום", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 70d89091ea..6c8283870a 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Označi media sadržaj kao osjetljiv", - "compose_form.spoiler": "Sakrij text iza upozorenja", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Upozorenje o sadržaju", "confirmation_modal.cancel": "Otkaži", "confirmations.block.confirm": "Blokiraj", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 087305a9a5..1d635490c7 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tülk", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Tartalom érzékenynek jelölése", - "compose_form.spoiler": "Szöveg figyelmeztetés mögé rejtése", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Figyelmeztetését írja ide", "confirmation_modal.cancel": "Bezár", "confirmations.block.confirm": "Letilt", diff --git a/app/javascript/mastodon/locales/hy.json b/app/javascript/mastodon/locales/hy.json index 7849d6941f..6e10024874 100644 --- a/app/javascript/mastodon/locales/hy.json +++ b/app/javascript/mastodon/locales/hy.json @@ -61,7 +61,8 @@ "compose_form.publish": "Թթել", "compose_form.publish_loud": "Թթե՜լ", "compose_form.sensitive": "Նշել բովանդակությունը որպես կասկածելի", - "compose_form.spoiler": "Թաքցնել տեքստը նախազգուշացման ետեւում", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Գրիր նախազգուշացումդ այստեղ", "confirmation_modal.cancel": "Չեղարկել", "confirmations.block.confirm": "Արգելափակել", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index 6b00d79b69..923dee919c 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Tandai media sensitif", - "compose_form.spoiler": "Sembunyikan teks dibalik peringatan", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Peringatan konten", "confirmation_modal.cancel": "Batal", "confirmations.block.confirm": "Blokir", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index d51b240903..f174a0c7d6 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -61,7 +61,8 @@ "compose_form.publish": "Siflar", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Markizar kontenajo kom trubliva", - "compose_form.spoiler": "Celar texto dop averto", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Averto di kontenajo", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 0babc7c025..72e8381f10 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Segnala file come sensibile", - "compose_form.spoiler": "Nascondi testo con avvertimento", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 254848f595..1001c196eb 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -61,7 +61,8 @@ "compose_form.publish": "トゥート", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive": "メディアを閲覧注意としてマークする", - "compose_form.spoiler": "テキストを隠す", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "ここに警告を書いてください", "confirmation_modal.cancel": "キャンセル", "confirmations.block.confirm": "ブロック", diff --git a/app/javascript/mastodon/locales/ko.json b/app/javascript/mastodon/locales/ko.json index 4c56d2a45d..039f3a4030 100644 --- a/app/javascript/mastodon/locales/ko.json +++ b/app/javascript/mastodon/locales/ko.json @@ -61,7 +61,8 @@ "compose_form.publish": "툿", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "이 미디어를 민감한 미디어로 취급", - "compose_form.spoiler": "텍스트 숨기기", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "경고", "confirmation_modal.cancel": "취소", "confirmations.block.confirm": "차단", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 8906f73516..f58d0314bc 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Media als gevoelig markeren (nsfw)", - "compose_form.spoiler": "Tekst achter waarschuwing verbergen", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Waarschuwingstekst", "confirmation_modal.cancel": "Annuleren", "confirmations.block.confirm": "Blokkeren", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index b14ecaeddb..b82476b0cd 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tut", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Merk media som følsomt", - "compose_form.spoiler": "Skjul tekst bak advarsel", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Innholdsadvarsel", "confirmation_modal.cancel": "Avbryt", "confirmations.block.confirm": "Blokkèr", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index c3d8bcf37a..d6308b864a 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tut", "compose_form.publish_loud": "{publish} !", "compose_form.sensitive": "Marcar lo mèdia coma sensible", - "compose_form.spoiler": "Rescondre lo tèxte darrièr un avertiment", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Escrivètz l’avertiment aquí", "confirmation_modal.cancel": "Anullar", "confirmations.block.confirm": "Blocar", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 2f39bd8500..b7523f6d89 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -61,7 +61,8 @@ "compose_form.publish": "Wyślij", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Oznacz treści jako wrażliwe", - "compose_form.spoiler": "Ukryj tekst za ostrzeżeniem", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości", "confirmation_modal.cancel": "Anuluj", "confirmations.block.confirm": "Zablokuj", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index 67b36fdf21..6416f25985 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -61,7 +61,8 @@ "compose_form.publish": "Publicar", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marcar mídia como conteúdo sensível", - "compose_form.spoiler": "Esconder texto com aviso de conteúdo", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Bloquear", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index 014884637e..5f87fabd79 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -61,7 +61,8 @@ "compose_form.publish": "Publicar", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Marcar media como conteúdo sensível", - "compose_form.spoiler": "Esconder texto com aviso", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Aviso de conteúdo", "confirmation_modal.cancel": "Cancelar", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 88152a8859..690b8e28a9 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -61,7 +61,8 @@ "compose_form.publish": "Трубить", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Отметить как чувствительный контент", - "compose_form.spoiler": "Скрыть текст за предупреждением", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Напишите свое предупреждение здесь", "confirmation_modal.cancel": "Отмена", "confirmations.block.confirm": "Заблокировать", diff --git a/app/javascript/mastodon/locales/sk.json b/app/javascript/mastodon/locales/sk.json index 4ff34012e2..ead0e8e298 100644 --- a/app/javascript/mastodon/locales/sk.json +++ b/app/javascript/mastodon/locales/sk.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Označ médiá ako chúlostivé", - "compose_form.spoiler": "Skryť text za varovanie", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Sem napíšte vaše varovanie", "confirmation_modal.cancel": "Zrušiť", "confirmations.block.confirm": "Blokovať", diff --git a/app/javascript/mastodon/locales/sr-Latn.json b/app/javascript/mastodon/locales/sr-Latn.json index fc4d0cdc92..7f4e64c20d 100644 --- a/app/javascript/mastodon/locales/sr-Latn.json +++ b/app/javascript/mastodon/locales/sr-Latn.json @@ -61,7 +61,8 @@ "compose_form.publish": "Tutni", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Obeleži multimediju kao osetljivu", - "compose_form.spoiler": "Sakrij tekst ispod upozorenja", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Ovde upišite upozorenje", "confirmation_modal.cancel": "Poništi", "confirmations.block.confirm": "Blokiraj", diff --git a/app/javascript/mastodon/locales/sr.json b/app/javascript/mastodon/locales/sr.json index ae496d7cc6..52f756a70f 100644 --- a/app/javascript/mastodon/locales/sr.json +++ b/app/javascript/mastodon/locales/sr.json @@ -61,7 +61,8 @@ "compose_form.publish": "Тутни", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Обележи мултимедију као осетљиву", - "compose_form.spoiler": "Сакриј текст испод упозорења", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Овде упишите упозорење", "confirmation_modal.cancel": "Поништи", "confirmations.block.confirm": "Блокирај", diff --git a/app/javascript/mastodon/locales/sv.json b/app/javascript/mastodon/locales/sv.json index e72280136c..1436d23b8b 100644 --- a/app/javascript/mastodon/locales/sv.json +++ b/app/javascript/mastodon/locales/sv.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Markera media som känslig", - "compose_form.spoiler": "Dölj text bakom varning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Skriv din varning här", "confirmation_modal.cancel": "Ångra", "confirmations.block.confirm": "Blockera", diff --git a/app/javascript/mastodon/locales/th.json b/app/javascript/mastodon/locales/th.json index 617f4fb780..5fdbb848ae 100644 --- a/app/javascript/mastodon/locales/th.json +++ b/app/javascript/mastodon/locales/th.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Mark media as sensitive", - "compose_form.spoiler": "Hide text behind warning", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Content warning", "confirmation_modal.cancel": "Cancel", "confirmations.block.confirm": "Block", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 499281ae5c..f7903584a1 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -61,7 +61,8 @@ "compose_form.publish": "Toot", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Görseli hassas olarak işaretle", - "compose_form.spoiler": "Metni uyarı arkasına gizle", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "İçerik uyarısı", "confirmation_modal.cancel": "İptal", "confirmations.block.confirm": "Engelle", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index ff458eb4b3..c2601797a2 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -61,7 +61,8 @@ "compose_form.publish": "Дмухнути", "compose_form.publish_loud": "{publish}!", "compose_form.sensitive": "Відмітити як непристойний зміст", - "compose_form.spoiler": "Приховати текст за попередженням", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "Попередження щодо прихованого тексту", "confirmation_modal.cancel": "Відмінити", "confirmations.block.confirm": "Заблокувати", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index d7a08bd17d..bfc4c682a0 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -61,7 +61,8 @@ "compose_form.publish": "嘟嘟", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive": "将媒体文件标记为敏感内容", - "compose_form.spoiler": "折叠嘟文内容", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "折叠部分的警告消息", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "屏蔽", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index a02edc2faa..403f40eef0 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -61,7 +61,8 @@ "compose_form.publish": "發文", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive": "將媒體檔案標示為「敏感內容」", - "compose_form.spoiler": "將部份文字藏於警告訊息之後", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "敏感警告訊息", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "封鎖", diff --git a/app/javascript/mastodon/locales/zh-TW.json b/app/javascript/mastodon/locales/zh-TW.json index 7e61ff32cb..1a1b8f3785 100644 --- a/app/javascript/mastodon/locales/zh-TW.json +++ b/app/javascript/mastodon/locales/zh-TW.json @@ -61,7 +61,8 @@ "compose_form.publish": "貼掉", "compose_form.publish_loud": "{publish}！", "compose_form.sensitive": "將此媒體標為敏感", - "compose_form.spoiler": "將訊息隱藏在警告訊息之後", + "compose_form.spoiler.marked": "Text is hidden behind warning", + "compose_form.spoiler.unmarked": "Text is not hidden", "compose_form.spoiler_placeholder": "內容警告", "confirmation_modal.cancel": "取消", "confirmations.block.confirm": "封鎖", From 18241ccbe1778f67f657c8346a2dda1b131ee852 Mon Sep 17 00:00:00 2001 From: Akihiko Odaki Date: Tue, 13 Mar 2018 16:10:12 +0900 Subject: [PATCH 05/12] Change the title of sensitive button by state (#6771) Icon showing the state may be confusing. (does the slahed eye icon mean the state that it is sensitive, or to mark it as sensitive?) Moreover, it may not help for blind people. The title will give the precise representation of the current state. --- .../compose/containers/sensitive_button_container.js | 5 +++-- app/javascript/mastodon/locales/ar.json | 3 ++- app/javascript/mastodon/locales/bg.json | 3 ++- app/javascript/mastodon/locales/ca.json | 3 ++- app/javascript/mastodon/locales/de.json | 3 ++- app/javascript/mastodon/locales/defaultMessages.json | 8 ++++++-- app/javascript/mastodon/locales/en.json | 3 ++- app/javascript/mastodon/locales/eo.json | 3 ++- app/javascript/mastodon/locales/es.json | 3 ++- app/javascript/mastodon/locales/fa.json | 3 ++- app/javascript/mastodon/locales/fi.json | 3 ++- app/javascript/mastodon/locales/fr.json | 3 ++- app/javascript/mastodon/locales/gl.json | 3 ++- app/javascript/mastodon/locales/he.json | 3 ++- app/javascript/mastodon/locales/hr.json | 3 ++- app/javascript/mastodon/locales/hu.json | 3 ++- app/javascript/mastodon/locales/hy.json | 3 ++- app/javascript/mastodon/locales/id.json | 3 ++- app/javascript/mastodon/locales/io.json | 3 ++- app/javascript/mastodon/locales/it.json | 3 ++- app/javascript/mastodon/locales/ja.json | 3 ++- app/javascript/mastodon/locales/ko.json | 3 ++- app/javascript/mastodon/locales/nl.json | 3 ++- app/javascript/mastodon/locales/no.json | 3 ++- app/javascript/mastodon/locales/oc.json | 3 ++- app/javascript/mastodon/locales/pl.json | 3 ++- app/javascript/mastodon/locales/pt-BR.json | 3 ++- app/javascript/mastodon/locales/pt.json | 3 ++- app/javascript/mastodon/locales/ru.json | 3 ++- app/javascript/mastodon/locales/sk.json | 3 ++- app/javascript/mastodon/locales/sr-Latn.json | 3 ++- app/javascript/mastodon/locales/sr.json | 3 ++- app/javascript/mastodon/locales/sv.json | 3 ++- app/javascript/mastodon/locales/th.json | 3 ++- app/javascript/mastodon/locales/tr.json | 3 ++- app/javascript/mastodon/locales/uk.json | 3 ++- app/javascript/mastodon/locales/zh-CN.json | 3 ++- app/javascript/mastodon/locales/zh-HK.json | 3 ++- app/javascript/mastodon/locales/zh-TW.json | 3 ++- 39 files changed, 83 insertions(+), 41 deletions(-) diff --git a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js index c8e74f5a1a..43de8f213e 100644 --- a/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js +++ b/app/javascript/mastodon/features/compose/containers/sensitive_button_container.js @@ -9,7 +9,8 @@ import spring from 'react-motion/lib/spring'; import { injectIntl, defineMessages } from 'react-intl'; const messages = defineMessages({ - title: { id: 'compose_form.sensitive', defaultMessage: 'Mark media as sensitive' }, + marked: { id: 'compose_form.sensitive.marked', defaultMessage: 'Media is marked as sensitive' }, + unmarked: { id: 'compose_form.sensitive.unmarked', defaultMessage: 'Media is not marked as sensitive' }, }); const mapStateToProps = state => ({ @@ -50,7 +51,7 @@ class SensitiveButton extends React.PureComponent {

Date: Tue, 13 Mar 2018 08:14:08 +0100 Subject: [PATCH 06/12] Fix #6757: Adjust RTL styles for landing page (#6768) --- .../mastodon/components/status_content.js | 2 +- app/javascript/styles/mastodon/rtl.scss | 16 ++++++++++++++++ app/views/about/show.html.haml | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/components/status_content.js b/app/javascript/mastodon/components/status_content.js index 701b5702cc..b6082f008f 100644 --- a/app/javascript/mastodon/components/status_content.js +++ b/app/javascript/mastodon/components/status_content.js @@ -154,7 +154,7 @@ export default class StatusContent extends React.PureComponent { } return ( -
+

مكان جيد للقواعد

+

لا يوجد تفصيل طويل حتى الآن.

features: humane_approach_body: تعلُّمًا مِن فشل الشبكات الأخرى، غاية ماستدون هي بلوغ الخيارات الأخلاقية في التصميم لمُحارَبة إسائة إستعمال شبكات التواصل الإجتماعية. humane_approach_title: أسلوب يعيد الإعتبار للإنسان @@ -73,13 +77,16 @@ ar: followers: المتابِعون followers_url: عنوان رابط المتابِعين follows: يتابع + inbox_url: رابط صندوق الوارد ip: عنوان الإيبي location: all: الكل local: المحلي remote: عن بُعد title: الموقع + login_status: وضع الدخول media_attachments: الوسائط المرفقة + memorialize: تحول إلى صفحة للذاكرة moderation: all: الكل silenced: تم كتمه @@ -88,17 +95,22 @@ ar: moderation_notes: ملاحظات الإشراف most_recent_activity: آخر نشاط حديث most_recent_ip: أحدث عنوان إيبي + not_subscribed: غير مشترك order: alphabetic: أبجديًا most_recent: الأحدث title: الترتيب + outbox_url: رابط صندوق الصادر + perform_full_suspension: تعطيل الحساب بالكامل profile_url: رابط الملف الشخصي promote: ترقية protocol: البروتوكول public: عمومي + push_subscription_expires: انتهاء الاشتراك ”PuSH“ redownload: تحديث الصورة الرمزية reset: إعادة التعيين reset_password: إعادة ضبط كلمة السر + resubscribe: اشترك مرة أخرى role: التصريحات roles: admin: مدير @@ -111,9 +123,13 @@ ar: created_reports: البلاغات التي أنشأها هذا الحساب report: التقرير targeted_reports: التقريرات التي أُنشِأت ضد هذا الحساب + silence: سكتهم statuses: المنشورات + subscribe: اشترك title: الحسابات + undo_silenced: رفع الصمت undo_suspension: إلغاء تعليق الحساب + unsubscribe: إلغاء الاشتراك username: إسم المستخدم web: الويب action_logs: diff --git a/config/locales/devise.ar.yml b/config/locales/devise.ar.yml index 4e302d3eaa..cadc4daa87 100644 --- a/config/locales/devise.ar.yml +++ b/config/locales/devise.ar.yml @@ -2,7 +2,7 @@ ar: devise: confirmations: - confirmed: تم التحقق من عنوان بريدك الإلكتروني بنجاح. + confirmed: تم تأكيد عنوان بريدك الإلكتروني. send_instructions: سوف تتلقى بعد بضع دقائق رسالةً إلكترونيةً تضم تعليمات التأكيد. إن لم تتلق الرسالة، الرجاء التحقق من إنها ليست ضمن ملف الرسائل غير المرغوب فيها. send_paranoid_instructions: إن كان عنوان بريدك الإلكتروني موجودا في قاعدة بياناتنا سوف تتلقّى الإرشادات اللازمة لتأكيده خلال بضع دقائق. يُرجى الإطلاع على الرسائل المتلقاة في البريد غير المرغوب فيه أيضا للتحقق من تلقي الرسالة. failure: diff --git a/config/locales/doorkeeper.id.yml b/config/locales/doorkeeper.id.yml index 95560ecf91..6db797c876 100644 --- a/config/locales/doorkeeper.id.yml +++ b/config/locales/doorkeeper.id.yml @@ -3,17 +3,19 @@ id: activerecord: attributes: doorkeeper/application: - name: Nama - redirect_uri: URI Pengalihan (Redirect) + name: Nama aplikasi + redirect_uri: URI Pengalihan + scopes: Cakupan + website: Website aplikasi errors: models: doorkeeper/application: attributes: redirect_uri: - fragment_present: tidak dapat mengandung fragmen. - invalid_uri: URI harus valid. - relative_uri: URI harus absolut. - secured_uri: URI harus berupa HTTPS/SSL. + fragment_present: tidak dapat mengandung sebuah pecahan. + invalid_uri: harus URI yang valid. + relative_uri: harus URI yang absolut. + secured_uri: harus berupa URI HTTPS/SSL. doorkeeper: applications: buttons: @@ -23,11 +25,11 @@ id: edit: Ubah submit: Kirim confirmations: - destroy: Anda yakin? + destroy: Apakah anda yakin? edit: title: Ubah aplikasi form: - error: Oh tidak! Cek kembali kemungkinan kesalahan pada formulir anda + error: Oops! Cek kembali kemungkinan kesalahan pada formulir anda help: native_redirect_uri: Gunakan %{native_redirect_uri} sebagai tes lokal redirect_uri: Gunakan satu baris per URI diff --git a/config/locales/es.yml b/config/locales/es.yml index f55b8bb51a..d5ba1777bc 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -273,6 +273,8 @@ es: contact_information: email: Correo de trabajo username: Nombre de usuario + hero: + desc_html: Mostrado en la página principal. Recomendable al menos 600x100px. Por defecto se establece a la miniatura de la instancia peers_api_enabled: desc_html: Nombres de dominio que esta instancia ha encontrado en el fediverso title: Publicar lista de instancias descubiertas @@ -289,6 +291,9 @@ es: open: desc_html: Permite a cualquiera a registrar una cuenta title: Registro abierto + show_known_fediverse_at_about_page: + desc_html: Cuando esté activado, se mostrarán toots de todo el fediverso conocido en la vista previa. En otro caso, se mostrarán solamente toots locales. + title: Mostrar fediverso conocido en la vista previa de la historia show_staff_badge: desc_html: Mostrar un parche de staff en la página de un usuario title: Mostrar parche de staff @@ -353,6 +358,8 @@ es: your_token: Tu token de acceso auth: agreement_html: Al registrarte, acepta seguir las reglas de la instancia y nuestros términos de servicio. + change_password: Contraseña + confirm_email: Confirmar email delete_account: Borrar cuenta delete_account_html: Si desea eliminar su cuenta, puede proceder aquí. Será pedido de una confirmación. didnt_get_confirmation: "¿No recibió el correo de confirmación?" @@ -362,7 +369,13 @@ es: logout: Cerrar sesión migrate_account: Mudarse a otra cuenta migrate_account_html: Si deseas redireccionar esta cuenta a otra distinta, puedes configurarlo aquí. + or: o + or_log_in_with: O inicia sesión con + providers: + cas: CAS + saml: SAML register: Registrarse + register_elsewhere: Registrarse en otro servidor resend_confirmation: Volver a enviar el correo de confirmación reset_password: Restablecer contraseña security: Cambiar contraseña @@ -412,6 +425,13 @@ es: title: Esta página no es correcta noscript_html: Para usar la aplicación web de Mastodon, por favor activa Javascript. Alternativamente, prueba alguna de las aplicaciones nativas para Mastodon para tu plataforma. exports: + archive_takeout: + date: Fecha + download: Descargar tu archivo + hint_html: Puedes solicitar un archivo de tus toots y materiales subidos. Los datos exportados estarán en formato ActivityPub, legibles por cualquier software compatible. + in_progress: Recopilando tu archivo... + request: Solicitar tu archivo + size: Tamaño blocks: Personas que has bloqueado csv: CSV follows: Personas que sigues @@ -527,7 +547,9 @@ es: trillion: T unit: '' pagination: + newer: Más nuevo next: Próximo + older: Más antiguo prev: Anterior truncate: "…" preferences: @@ -724,23 +746,30 @@ es: setup: Configurar wrong_code: "¡El código ingresado es inválido! ¿El dispositivo y tiempo del servidor están correctos?" user_mailer: + backup_ready: + explanation: Has solicitado una copia completa de tu cuenta de Mastodon. ¡Ya está preparada para descargar! + subject: Tu archivo está preparado para descargar + title: Recogida del archivo welcome: edit_profile_action: Configurar el perfil - explanation: Aquí hay algunos consejos para iniciar + edit_profile_step: Puedes personalizar tu perfil subiendo un avatar, cabecera, cambiando tu nombre para mostrar y más. Si te gustaría revisar seguidores antes de autorizarlos a que te sigan, puedes bloquear tu cuenta. + explanation: Aquí hay algunos consejos para empezar final_action: Empezar a publicar final_step: '¡Empieza a publicar! Incluso sin seguidores, tus mensajes públicos pueden ser vistos por otros, por ejemplo en la linea de tiempo local y con "hashtags". Podrías querer introducirte con el "hashtag" #introductions.' full_handle: Su sobrenombre completo full_handle_hint: Esto es lo que le dirías a tus amigos para que ellos puedan enviarte mensajes o seguirte desde otra instancia. review_preferences_action: Cambiar preferencias - review_preferences_step: Asegurate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs". + review_preferences_step: Asegúrate de poner tus preferencias, como que correos te gustaría recibir, o que nivel de privacidad te gustaría que tus publicaciones tengan por defecto. Si no tienes mareos, podrías elegir habilitar la reproducción automática de "GIFs". subject: Bienvenido a Mastodon tip_bridge_html: Si esta viniendo desde Twitter, puedes encontrar a tus amigos en Mastodon usando la aplicación puente. Aunque solo funciona si ellos también usaron la aplicación puente! + tip_federated_timeline: La historia federada es una vista de toda la red Mastodon conocida. Sólo incluye gente a la que se han suscrito personas de tu instancia, así que no está completa. tip_following: Sigues a tus administradores de servidor por defecto. Para encontrar más gente interesante, revisa las lineas de tiempo local y federada. tip_local_timeline: La linea de tiempo local is una vista de la gente en %{instance}. Estos son tus vecinos inmediatos! tip_mobile_webapp: Si el navegador de tu dispositivo móvil ofrece agregar Mastodon a tu página de inicio, puedes recibir notificaciones. Actúa como una aplicación nativa en muchas formas! tips: Tips - title: Bienvenido a bordo, %{name}! + title: Te damos la bienvenida a bordo, %{name}! users: invalid_email: La dirección de correo es incorrecta invalid_otp_token: Código de dos factores incorrecto + seamless_external_login: Has iniciado sesión desde un servicio externo, así que los ajustes de contraseña y correo no están disponibles. signed_in_as: 'Sesión iniciada como:' diff --git a/config/locales/ru.yml b/config/locales/ru.yml index a2cb1e793b..81af42556c 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -160,6 +160,7 @@ ru: update_status: "%{name} изменил(а) статус пользователя %{target}" title: Журнал событий custom_emojis: + by_domain: Домен copied_msg: Локальная копия эмодзи успешно создана copy: Скопироват copy_failed_msg: Не удалось создать локальную копию эмодзи @@ -342,6 +343,7 @@ ru: salutation: "%{name}," settings: 'Изменить настройки e-mail: %{link}' view: 'Просмотр:' + view_profile: Просмотреть профиль view_status: Просмотреть статус applications: created: Приложение успешно создано @@ -353,6 +355,8 @@ ru: your_token: Ваш токен доступа auth: agreement_html: Создавая аккаунт, вы соглашаетесь с правилами узла и нашими условиями обслуживания. + change_password: Пароль + confirm_email: Подтвердите email delete_account: Удалить аккаунт delete_account_html: Если Вы хотите удалить свой аккаунт, вы можете перейти сюда. У Вас будет запрошено подтверждение. didnt_get_confirmation: Не получили инструкцию для подтверждения? @@ -362,7 +366,10 @@ ru: logout: Выйти migrate_account: Перенести аккаунт migrate_account_html: Если Вы хотите перенести этот аккаунт на другой, вы можете сделать это здесь. + or: или + or_log_in_with: Или войти с помощью register: Зарегистрироваться + register_elsewhere: Зарегистрироваться на другом сервере resend_confirmation: Повторить отправку инструкции для подтверждения reset_password: Сбросить пароль security: Изменить пароль @@ -412,6 +419,13 @@ ru: title: Страница неверна noscript_html: Для работы с Mastodon, пожалуйста, включите JavaScript. Кроме того, вы можете использовать одно из приложений Mastodon для Вашей платформы. exports: + archive_takeout: + date: Дата + download: Скачать ваш архив + hint_html: Вы можете запросить архив своих статусов и загруженных медиа-файлов. Экспортированные данные будут в формате ActivityPub, который можно прочесть любой соответствующей программой. + in_progress: Собирается ваш архив... + request: Запросить ваш архив + size: Размер blocks: Список блокировки csv: CSV follows: Подписки @@ -483,33 +497,40 @@ ru: title: Модерация notification_mailer: digest: - body: 'Кратко о пропущенном Вами на %{instance} с Вашего последнего захода %{since}:' + action: Просмотреть все уведомления + body: Кратко о пропущенных Вами сообщениях с Вашего последнего захода %{since} mention: "%{name} упомянул(а) Вас в:" new_followers_summary: few: У Вас появилось %{count} новых подписчика! Отлично! many: У Вас появилось %{count} новых подписчиков! Отлично! - one: У Вас появился новый подписчик! Ура! - other: У Вас появилось %{count} новых подписчиков! Отлично! + one: Также, пока вас не было, у Вас появился новый подписчик! Ура! + other: Также, пока вас не было, у Вас появилось %{count} новых подписчиков! Отлично! subject: few: "%{count} новых уведомления с Вашего последнего захода \U0001F418" many: "%{count} новых уведомлений с Вашего последнего захода \U0001F418" one: "1 новое уведомление с Вашего последнего захода \U0001F418" other: "%{count} новых уведомлений с Вашего последнего захода \U0001F418" + title: В ваше отсутствие… favourite: body: 'Ваш статус понравился %{name}:' subject: "%{name} понравился Ваш статус" follow: body: "%{name} теперь подписан(а) на Вас!" subject: "%{name} теперь подписан(а) на Вас" + title: Новый подписчик follow_request: body: "%{name} запросил Вас о подписке" subject: "%{name} хочет подписаться на Вас" + title: Новый запрос о подписке mention: + action: Ответить body: 'Вас упомянул(а) %{name} в:' subject: Вы были упомянуты %{name} + title: Новое упоминание reblog: body: 'Ваш статус был продвинут %{name}:' subject: "%{name} продвинул(а) Ваш статус" + title: Новое продвижение number: human: decimal_units: @@ -522,7 +543,9 @@ ru: trillion: трлн unit: '' pagination: + newer: Новее next: След + older: Старше prev: Пред truncate: "…" preferences: @@ -687,6 +710,18 @@ ru: recovery_instructions_html: В случае утери доступа к Вашему телефону Вы можете использовать один из кодов восстановления, указанных ниже, чтобы вернуть доступ к аккаунту. Держите коды восстановления в безопасности, например, распечатав их и храня с другими важными документами. setup: Настроить wrong_code: Введенный код неверен! Правильно ли установлены серверное время и время устройства? + user_mailer: + backup_ready: + explanation: Вы запросили полный архив вашего аккаунта Mastodon. Он готов к загрузке! + subject: Ваш архив готов к загрузке + title: Вынос архива + welcome: + edit_profile_action: Настроить профиль + final_action: Начать постить + review_preferences_action: Изменить настройки + subject: Добро пожаловать на Mastodon + tips: Советы + title: Добро пожаловать на борт, %{name}! users: invalid_email: Введенный e-mail неверен invalid_otp_token: Введен неверный код diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml index 5d6a9e3d20..38661b00ff 100644 --- a/config/locales/simple_form.es.yml +++ b/config/locales/simple_form.es.yml @@ -4,21 +4,21 @@ es: hints: defaults: avatar: PNG, GIF o JPG. Máximo 2MB. Será escalado a 400x400px - digest: Solo enviado tras un largo periodo de inactividad y solo si usted ha recibido mensajes personales durante su ausencia + digest: Solo enviado tras un largo periodo de inactividad y solo si has recibido mensajes personales durante tu ausencia display_name: one: 1 caracter restante other: %{count} caracteres restantes header: PNG, GIF o JPG. Máximo 2MB. Será escalado a 700x335px locked: Requiere que manualmente apruebes seguidores y las publicaciones serán mostradas solamente a tus seguidores note: - one: 1 caracter restante + one: 1 carácter restante other: %{count} caracteres restantes setting_noindex: Afecta a tu perfil público y páginas de estado setting_theme: Afecta al aspecto de Mastodon cuando te identificas desde cualquier dispositivo. imports: data: Archivo CSV exportado desde otra instancia de Mastodon sessions: - otp: Ingresa el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación. + otp: Introduce el código de autenticación de dos factores de tu teléfono o usa uno de tus códigos de recuperación. user: filtered_languages: Los idiomas seleccionados dejarán de mostrarse para ti en las líneas de tiempo públicas labels: @@ -28,7 +28,7 @@ es: confirm_password: Confirmar contraseña current_password: Contraseña actual data: Información - display_name: Mostrar nombre + display_name: Nombre para mostrar email: Dirección de correo electrónico expires_in: Expirar tras filtered_languages: Idiomas filtrados @@ -45,6 +45,7 @@ es: setting_default_privacy: Privacidad de publicaciones setting_default_sensitive: Marcar siempre imágenes como sensibles setting_delete_modal: Mostrar diálogo de confirmación antes de borrar un toot + setting_display_sensitive_media: Mostrar siempre material marcado como sensible setting_noindex: Excluirse del indexado de motores de búsqueda setting_reduce_motion: Reducir el movimiento de las animaciones setting_system_font_ui: Utilizar la tipografía por defecto del sistema @@ -53,6 +54,7 @@ es: severity: Severidad type: Importar tipo username: Nombre de usuario + username_or_email: Usuario o Email interactions: must_be_follower: Bloquear notificaciones de personas que no te siguen must_be_following: Bloquear notificaciones de personas que no sigues From fd385e256d1ca99fa9a6f1bd8068d083cb0e39ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Miko=C5=82ajczak?= Date: Tue, 13 Mar 2018 18:17:48 +0100 Subject: [PATCH 12/12] i18n: Update Polish translation (#6780) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Mikołajczak --- app/javascript/mastodon/locales/pl.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 2d6f0c01b7..8496495f5d 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -60,10 +60,10 @@ "compose_form.placeholder": "Co Ci chodzi po głowie?", "compose_form.publish": "Wyślij", "compose_form.publish_loud": "{publish}!", - "compose_form.sensitive.marked": "Media is marked as sensitive", - "compose_form.sensitive.unmarked": "Media is not marked as sensitive", - "compose_form.spoiler.marked": "Text is hidden behind warning", - "compose_form.spoiler.unmarked": "Text is not hidden", + "compose_form.sensitive.marked": "Zawartość multimedia jest oznaczona jako wrażliwa", + "compose_form.sensitive.unmarked": "Zawartość multimedialna nie jest oznaczona jako wrażliwa", + "compose_form.spoiler.marked": "Tekst jest ukryty za ostrzeżeniem", + "compose_form.spoiler.unmarked": "Tekst nie jest ukryty", "compose_form.spoiler_placeholder": "Wprowadź swoje ostrzeżenie o zawartości", "confirmation_modal.cancel": "Anuluj", "confirmations.block.confirm": "Zablokuj",