diff --git a/app/javascript/mastodon/actions/notifications.js b/app/javascript/mastodon/actions/notifications.js index bb494924daeb69256bc4bd1d26924afc3bd25709..323e2e9b66b37c0c011b5ebfee1a52c985e7f7a1 100644 --- a/app/javascript/mastodon/actions/notifications.js +++ b/app/javascript/mastodon/actions/notifications.js @@ -2,6 +2,7 @@ import api, { getLinks } from '../api' import Immutable from 'immutable'; import IntlMessageFormat from 'intl-messageformat'; import { fetchRelationships } from './accounts'; +import { defineMessages } from 'react-intl'; export const NOTIFICATIONS_UPDATE = 'NOTIFICATIONS_UPDATE'; @@ -16,6 +17,10 @@ export const NOTIFICATIONS_EXPAND_FAIL = 'NOTIFICATIONS_EXPAND_FAIL'; export const NOTIFICATIONS_CLEAR = 'NOTIFICATIONS_CLEAR'; export const NOTIFICATIONS_SCROLL_TOP = 'NOTIFICATIONS_SCROLL_TOP'; +const messages = defineMessages({ + mention: { id: 'notification.mention', defaultMessage: '{name} mentioned you' }, +}); + const fetchRelatedRelationships = (dispatch, notifications) => { const accountIds = notifications.filter(item => item.type === 'follow').map(item => item.account.id); diff --git a/app/javascript/mastodon/locales/ar.json b/app/javascript/mastodon/locales/ar.json index 48087f085ebf4272b133e16e65ce60a3166d71dd..e6f6d8c512007c2b9db08ada22fd63d2c49e0d6d 100644 --- a/app/javascript/mastodon/locales/ar.json +++ b/app/javascript/mastodon/locales/ar.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "الخيط العام الموØد", "notification.favourite": "{name} أعجب بمنشورك", "notification.follow": "{name} يتابعك", + "notification.mention": "{name} ذكرك", "notification.reblog": "{name} قام بترقية تبويقك", "notifications.clear": "Ø¥Ù…Ø³Ø Ø§Ù„Ø¥Ø®Ø·Ø§Ø±Ø§Øª", "notifications.clear_confirmation": "أمتأكد من أنك تود Ù…Ø³Ø Ø¬Ù„ الإخطارات الخاصة بك Ùˆ المتلقاة إلى Øد الآن ØŸ", diff --git a/app/javascript/mastodon/locales/bg.json b/app/javascript/mastodon/locales/bg.json index 3afd01fa8c51ea3824d2f78c3bac24228b401f8f..7d0660c25dff8d207cf1addd180bbc0957ebb60d 100644 --- a/app/javascript/mastodon/locales/bg.json +++ b/app/javascript/mastodon/locales/bg.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Публичен канал", "notification.favourite": "{name} хареÑа твоÑта публикациÑ", "notification.follow": "{name} те поÑледва", + "notification.mention": "{name} те Ñпомена", "notification.reblog": "{name} Ñподели твоÑта публикациÑ", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/de.json b/app/javascript/mastodon/locales/de.json index 76656bbf5f158684e7435af5d1df3ceaa7ed1987..1c3a8b6560c91f799c9f26fcf4fe84f1e66b8f4a 100644 --- a/app/javascript/mastodon/locales/de.json +++ b/app/javascript/mastodon/locales/de.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Föderierte Zeitleiste", "notification.favourite": "{name} favorisierte deinen Status", "notification.follow": "{name} folgt dir", + "notification.mention": "{name} erwähnte dich", "notification.reblog": "{name} teilte deinen Status", "notifications.clear": "Mitteilungen beseitigen", "notifications.clear_confirmation": "Bist du sicher, dass du alle Mitteilungen beseitigen willst?", diff --git a/app/javascript/mastodon/locales/defaultMessages.json b/app/javascript/mastodon/locales/defaultMessages.json index 04a149263f5a4fc8f5af6adb9fd51c7505c74900..9163a3563d70c060209ccebc1ab4cbeb8ab493f6 100644 --- a/app/javascript/mastodon/locales/defaultMessages.json +++ b/app/javascript/mastodon/locales/defaultMessages.json @@ -1,4 +1,13 @@ [ + { + "descriptors": [ + { + "defaultMessage": "{name} mentioned you", + "id": "notification.mention" + } + ], + "path": "app/javascript/mastodon/actions/notifications.json" + }, { "descriptors": [ { diff --git a/app/javascript/mastodon/locales/en.json b/app/javascript/mastodon/locales/en.json index c8fa3fed63d4dd0b0cb093ad9c769740f8c940e0..4dd59b88313455a2a09e2772d666edfa1ad67d01 100644 --- a/app/javascript/mastodon/locales/en.json +++ b/app/javascript/mastodon/locales/en.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federated timeline", "notification.favourite": "{name} favourited your status", "notification.follow": "{name} followed you", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} boosted your status", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/eo.json b/app/javascript/mastodon/locales/eo.json index 7a1171306cd144f2384fd7c929379bec8d6ba759..205af27e18dc42bd0f18b0276fd4784cc0e565f2 100644 --- a/app/javascript/mastodon/locales/eo.json +++ b/app/javascript/mastodon/locales/eo.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fratara tempolinio", "notification.favourite": "{name} favoris vian mesaÄon", "notification.follow": "{name} sekvis vin", + "notification.mention": "{name} menciis vin", "notification.reblog": "{name} diskonigis vian mesaÄon", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/es.json b/app/javascript/mastodon/locales/es.json index 16ee1274fbae8adceb87b662c72b32c2e8429cc1..fec4b391e7bf53ccc2295ec31712655c96b20139 100644 --- a/app/javascript/mastodon/locales/es.json +++ b/app/javascript/mastodon/locales/es.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Historia federada", "notification.favourite": "{name} marcó tu estado como favorito", "notification.follow": "{name} te empezó a seguir", + "notification.mention": "{name} te ha mencionado", "notification.reblog": "{name} ha retooteado tu estado", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/fa.json b/app/javascript/mastodon/locales/fa.json index 227293ca928f67733f5db0ded0521a877de108af..7820da5f6c05d35cb9f6152f4c599283840e1a71 100644 --- a/app/javascript/mastodon/locales/fa.json +++ b/app/javascript/mastodon/locales/fa.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "نوشته‌های همه‌جا", "notification.favourite": "{name} نوشتهٔ شما را پسندید", "notification.follow": "{name} پیگیر شما شد", + "notification.mention": "{name} از شما نام برد", "notification.reblog": "{name} نوشتهٔ شما را بازبوقید", "notifications.clear": "پاک‌کردن اعلان‌ها", "notifications.clear_confirmation": "واقعاً می‌خواهید همهٔ اعلان‌هایتان را برای همیشه پاک کنید؟", diff --git a/app/javascript/mastodon/locales/fi.json b/app/javascript/mastodon/locales/fi.json index b66f925b9745717c15e1aa8e2d576303d9d2138e..2621baa518171d70fe059867a63aad00f436109c 100644 --- a/app/javascript/mastodon/locales/fi.json +++ b/app/javascript/mastodon/locales/fi.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Yleinen aikajana", "notification.favourite": "{name} tykkäsi statuksestasi", "notification.follow": "{name} seurasi sinua", + "notification.mention": "{name} mainitsi sinut", "notification.reblog": "{name} buustasi statustasi", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index 30151b771fdf36102578869f9916752bc3fa2d5b..f80cf5a716d51126daee63086ff18f0388bf4f9f 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fil public global", "notification.favourite": "{name} a ajouté à ses favoris :", "notification.follow": "{name} vous suit.", + "notification.mention": "{name} vous a mentionné⋅e :", "notification.reblog": "{name} a partagé votre statut :", "notifications.clear": "Nettoyer", "notifications.clear_confirmation": "Voulez-vous vraiment supprimer toutes vos notifications ?", diff --git a/app/javascript/mastodon/locales/he.json b/app/javascript/mastodon/locales/he.json index 44d88368348e225370057097b5f469d6e1b00ef3..56954d8db6fb3ac9f80745cb34dfda7e12a5a66f 100644 --- a/app/javascript/mastodon/locales/he.json +++ b/app/javascript/mastodon/locales/he.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "ציר זמן בין-קהילתי", "notification.favourite": "חצרוצך חובב על ידי {name}", "notification.follow": "{name} במעקב ×חרייך", + "notification.mention": "{name} mentioned you", "notification.reblog": "חצרוצך הודהד על ידי {name}", "notifications.clear": "הסרת התר×ות", "notifications.clear_confirmation": "להסיר ×ת כל ההתר×ות? בטוח?", diff --git a/app/javascript/mastodon/locales/hr.json b/app/javascript/mastodon/locales/hr.json index 563e4dbece1b15043b453e6cfa86f3b158164e51..726ad960999a574dbe36b3bb452cb117af6ed912 100644 --- a/app/javascript/mastodon/locales/hr.json +++ b/app/javascript/mastodon/locales/hr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federalni timeline", "notification.favourite": "{name} je lajkao tvoj status", "notification.follow": "{name} te sada slijedi", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} je podigao tvoj status", "notifications.clear": "OÄisti notifikacije", "notifications.clear_confirmation": "ŽeliÅ¡ li zaista obrisati sve svoje notifikacije?", diff --git a/app/javascript/mastodon/locales/hu.json b/app/javascript/mastodon/locales/hu.json index 6dd4cbfdf63262330fdd9ef1d2beb120067aa55c..dd283d736ea0e04cafded373474d2ec43a3b4a38 100644 --- a/app/javascript/mastodon/locales/hu.json +++ b/app/javascript/mastodon/locales/hu.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Nyilvános idÅ‘folyam", "notification.favourite": "{name} kedvencnek jelölte az állapotod", "notification.follow": "{name} követ téged", + "notification.mention": "{name} megemlÃtett", "notification.reblog": "{name} reblogolta az állapotod", "notifications.clear": "Clear notifications", "notifications.clear_confirmation": "Are you sure you want to permanently clear all your notifications?", diff --git a/app/javascript/mastodon/locales/id.json b/app/javascript/mastodon/locales/id.json index d4be39f0a842f7c7681ecd2e8a4b4814cbce9f18..ce0399a65f6dc1a97acf651dadf9a963d3068293 100644 --- a/app/javascript/mastodon/locales/id.json +++ b/app/javascript/mastodon/locales/id.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Linimasa gabungan", "notification.favourite": "{name} menyukai status anda", "notification.follow": "{name} mengikuti anda", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} mem-boost status anda", "notifications.clear": "Hapus notifikasi", "notifications.clear_confirmation": "Apa anda yakin hendak menghapus semua notifikasi anda?", diff --git a/app/javascript/mastodon/locales/io.json b/app/javascript/mastodon/locales/io.json index 03ea719e908bd97abc70d6dc05a42488a307be98..5f63f2a8999928462def99b31352f56a322eb9e4 100644 --- a/app/javascript/mastodon/locales/io.json +++ b/app/javascript/mastodon/locales/io.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federata tempolineo", "notification.favourite": "{name} favorizis tua mesajo", "notification.follow": "{name} sequeskis tu", + "notification.mention": "{name} mencionis tu", "notification.reblog": "{name} repetis tua mesajo", "notifications.clear": "Efacar savigi", "notifications.clear_confirmation": "Ka tu esas certa, ke tu volas efacar omna tua savigi?", diff --git a/app/javascript/mastodon/locales/it.json b/app/javascript/mastodon/locales/it.json index 048b9d2cad1d7b8420874cbd7556ba1b8df2e45d..38d23f44c9d53cd531177252ad63ed448674957b 100644 --- a/app/javascript/mastodon/locales/it.json +++ b/app/javascript/mastodon/locales/it.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Timeline federata", "notification.favourite": "{name} ha apprezzato il tuo post", "notification.follow": "{name} ha iniziato a seguirti", + "notification.mention": "{name} ti ha menzionato", "notification.reblog": "{name} ha condiviso il tuo post", "notifications.clear": "Cancella notifiche", "notifications.clear_confirmation": "Vuoi davvero cancellare tutte le notifiche?", diff --git a/app/javascript/mastodon/locales/ja.json b/app/javascript/mastodon/locales/ja.json index 02bf13dca594f463fc76d3245c52e4ecdd392ef8..0c252535f96a3cbae37bce403cdd7dd2deb04053 100644 --- a/app/javascript/mastodon/locales/ja.json +++ b/app/javascript/mastodon/locales/ja.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "連åˆã‚¿ã‚¤ãƒ ライン", "notification.favourite": "{name} ã•ã‚“ãŒã‚ãªãŸã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ãŠæ°—ã«å…¥ã‚Šã«ç™»éŒ²ã—ã¾ã—ãŸ", "notification.follow": "{name} ã•ã‚“ã«ãƒ•ã‚©ãƒãƒ¼ã•ã‚Œã¾ã—ãŸ", + "notification.mention": "{name} ã•ã‚“ãŒã‚ãªãŸã«è¿”ä¿¡ã—ã¾ã—ãŸ", "notification.reblog": "{name} ã•ã‚“ãŒã‚ãªãŸã®ãƒˆã‚¥ãƒ¼ãƒˆã‚’ブーストã—ã¾ã—ãŸ", "notifications.clear": "通知を消去", "notifications.clear_confirmation": "本当ã«é€šçŸ¥ã‚’消去ã—ã¾ã™ã‹ï¼Ÿ", diff --git a/app/javascript/mastodon/locales/nl.json b/app/javascript/mastodon/locales/nl.json index 11416baa569e833cb1f0ea243cdc29f735288584..5db417c1a12c7cbf9f8df1ca5a2ead76c519fb48 100644 --- a/app/javascript/mastodon/locales/nl.json +++ b/app/javascript/mastodon/locales/nl.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Globale tijdlijn", "notification.favourite": "{name} markeerde jouw toot als favoriet", "notification.follow": "{name} volgt jou nu", + "notification.mention": "{name} vermeldde jou", "notification.reblog": "{name} boostte jouw toot", "notifications.clear": "Meldingen verwijderen", "notifications.clear_confirmation": "Weet je zeker dat je al jouw meldingen wilt verwijderen?", diff --git a/app/javascript/mastodon/locales/no.json b/app/javascript/mastodon/locales/no.json index a43ba2c4fd433f2cdfc31ba4852e82949adbab36..4254dd2d442cfa6c925ac91414fb4b170cb2fd5b 100644 --- a/app/javascript/mastodon/locales/no.json +++ b/app/javascript/mastodon/locales/no.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Felles tidslinje", "notification.favourite": "{name} likte din status", "notification.follow": "{name} fulgte deg", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} fremhevde din status", "notifications.clear": "Fjern varsler", "notifications.clear_confirmation": "Er du sikker pÃ¥ at du vil fjerne alle dine varsler?", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 7751ddd8086b274e1c9b48aca06d7ff36935dd85..6830bc0930b5ab48f9b7dd20cfd414c9b5fa82e6 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Fil public global", "notification.favourite": "{name} a apondut a sos favorits :", "notification.follow": "{name} vos sèc.", + "notification.mention": "{name} vos a mencionat :", "notification.reblog": "{name} a partejat vòstre estatut :", "notifications.clear": "Levar", "notifications.clear_confirmation": "Volètz vertadièrament levar totas vòstras las notificacions ?", diff --git a/app/javascript/mastodon/locales/pl.json b/app/javascript/mastodon/locales/pl.json index 4c2090f6f263b78fb24b748f462ad89e863f6b21..65c7443d3020ea998ec8aaf547eea8af0c26395e 100644 --- a/app/javascript/mastodon/locales/pl.json +++ b/app/javascript/mastodon/locales/pl.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "OÅ› czasu federacji", "notification.favourite": "{name} dodaÅ‚ twój status do ulubionych", "notification.follow": "{name} zaczÄ…Å‚ ciÄ™ obserwować", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} podbiÅ‚ twój status", "notifications.clear": "Wyczyść powiadomienia", "notifications.clear_confirmation": "Czy na pewno chcesz bezpowrotnie usunąć wszystkie powiadomienia?", diff --git a/app/javascript/mastodon/locales/pt-BR.json b/app/javascript/mastodon/locales/pt-BR.json index b6dc04e4f0615de957b50efc9810e99da73c4f94..999742e5b9f8eff876298161f278a6746adac4f2 100644 --- a/app/javascript/mastodon/locales/pt-BR.json +++ b/app/javascript/mastodon/locales/pt-BR.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Global", "notification.favourite": "{name} adicionou o teu post aos favoritos", "notification.follow": "{name} seguiu-te", + "notification.mention": "{name} mencionou-te", "notification.reblog": "{name} partilhou o teu post", "notifications.clear": "Limpar notificações", "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?", diff --git a/app/javascript/mastodon/locales/pt.json b/app/javascript/mastodon/locales/pt.json index b6dc04e4f0615de957b50efc9810e99da73c4f94..999742e5b9f8eff876298161f278a6746adac4f2 100644 --- a/app/javascript/mastodon/locales/pt.json +++ b/app/javascript/mastodon/locales/pt.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Global", "notification.favourite": "{name} adicionou o teu post aos favoritos", "notification.follow": "{name} seguiu-te", + "notification.mention": "{name} mencionou-te", "notification.reblog": "{name} partilhou o teu post", "notifications.clear": "Limpar notificações", "notifications.clear_confirmation": "Queres mesmo limpar todas as notificações?", diff --git a/app/javascript/mastodon/locales/ru.json b/app/javascript/mastodon/locales/ru.json index 7db0f5b6bfef46f799846a0954cb3fa978bd5b50..fc73a280cc457e70cd1c3efc60b679b0190b5b77 100644 --- a/app/javascript/mastodon/locales/ru.json +++ b/app/javascript/mastodon/locales/ru.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Ð“Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð°Ñ Ð»ÐµÐ½Ñ‚Ð°", "notification.favourite": "{name} понравилÑÑ Ð’Ð°Ñˆ ÑтатуÑ", "notification.follow": "{name} подпиÑалÑÑ(-лаÑÑŒ) на ВаÑ", + "notification.mention": "{name} упомÑнул(а) ВаÑ", "notification.reblog": "{name} продвинул(а) Ваш ÑтатуÑ", "notifications.clear": "ОчиÑтить уведомлениÑ", "notifications.clear_confirmation": "Ð’Ñ‹ уверены, что хотите очиÑтить вÑе уведомлениÑ?", diff --git a/app/javascript/mastodon/locales/tr.json b/app/javascript/mastodon/locales/tr.json index 652b97b7cbc8e1ab8040cf70c1ca6f370667bc5f..f483762b46b004413492af008cd2191aaa13ddb9 100644 --- a/app/javascript/mastodon/locales/tr.json +++ b/app/javascript/mastodon/locales/tr.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Federe zaman tüneli", "notification.favourite": "{name} senin durumunu favorilere ekledi", "notification.follow": "{name} seni takip ediyor", + "notification.mention": "{name} mentioned you", "notification.reblog": "{name} senin durumunu boost etti", "notifications.clear": "Bildirimleri temizle", "notifications.clear_confirmation": "Tüm bildirimlerinizi kalıcı olarak temizlemek ister misiniz?", diff --git a/app/javascript/mastodon/locales/uk.json b/app/javascript/mastodon/locales/uk.json index 0beffe0727f0e9b5bd8212221284e20841889eff..e4c4cf2eb01201f4104e52ccc65d3c1a1f34ea29 100644 --- a/app/javascript/mastodon/locales/uk.json +++ b/app/javascript/mastodon/locales/uk.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "Глобальна Ñтрічка", "notification.favourite": "{name} ÑподобавÑÑ Ð²Ð°Ñˆ допиÑ", "notification.follow": "{name} підпиÑавÑÑ(-лаÑÑŒ) на ВаÑ", + "notification.mention": "{name} згадав(-ла) ВаÑ", "notification.reblog": "{name} передмухнув(-ла) Ваш допиÑ", "notifications.clear": "ОчиÑтити ÑповіщеннÑ", "notifications.clear_confirmation": "Ви впевнені, що хочете видалити вÑÑ– ÑповіщенÑ?", diff --git a/app/javascript/mastodon/locales/zh-CN.json b/app/javascript/mastodon/locales/zh-CN.json index 03e26c4c8e587d826730e93c3263bff9e5c53cfa..fa32ebc5ee47c28c195487f49706e8c8051bbe6f 100644 --- a/app/javascript/mastodon/locales/zh-CN.json +++ b/app/javascript/mastodon/locales/zh-CN.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "跨站公共时间轴", "notification.favourite": "{name} èµžä½ çš„å˜Ÿæ–‡", "notification.follow": "{name} å¼€å§‹å…³æ³¨ä½ ", + "notification.mention": "{name} æåŠä½ ", "notification.reblog": "{name} è½¬å˜Ÿä½ çš„å˜Ÿæ–‡", "notifications.clear": "清空通知纪录", "notifications.clear_confirmation": "ä½ ç¡®å®šè¦æ¸…空通知纪录å—?", diff --git a/app/javascript/mastodon/locales/zh-HK.json b/app/javascript/mastodon/locales/zh-HK.json index 23de100785f6685450c44e1425401950c26ca9f3..157fca27f2e102a0bbae826586c87e11eef715d1 100644 --- a/app/javascript/mastodon/locales/zh-HK.json +++ b/app/javascript/mastodon/locales/zh-HK.json @@ -88,6 +88,7 @@ "navigation_bar.public_timeline": "跨站時間軸", "notification.favourite": "{name} å–œæ¡ä½ çš„æ–‡ç« ", "notification.follow": "{name} é–‹å§‹é—œæ³¨ä½ ", + "notification.mention": "{name} æåŠä½ ", "notification.reblog": "{name} è½‰æŽ¨ä½ çš„æ–‡ç« ", "notifications.clear": "清空通知紀錄", "notifications.clear_confirmation": "ä½ ç¢ºå®šè¦æ¸…空通知紀錄嗎?", diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml index 7b3b5108aa6f5aa4fb415cc4b91e23363be07dab..39140b5a18e8fe9adca9a660d5061bb1b96874a0 100644 --- a/config/locales/simple_form.ar.yml +++ b/config/locales/simple_form.ar.yml @@ -4,10 +4,10 @@ ar: hints: defaults: avatar: PNG, GIF أو JPG. على الأكثر 2 ميغابيت . سو٠يتم تصغيرها إلى 120x120px - display_name: '%{counter} Ø£Øر٠متبقية' - locked: يتطلب منك المواÙقة يدويا على كل طلب للإشتراك بØسابك Ùˆ منشوراتك تعرض لمتابعيك Ùقط دون غيرهم + display_name: "%{counter} Ø£Øر٠متبقية" header: PNG, GIF or JPG. على الأكثر 2 ميغابيت . سو٠يتم تصغيرها إلى 700x335px - note: '%{counter} Ø£Øر٠متبقية' + locked: يتطلب منك المواÙقة يدويا على كل طلب للإشتراك بØسابك Ùˆ منشوراتك تعرض لمتابعيك Ùقط دون غيرهم + note: "%{counter} Ø£Øر٠متبقية" imports: data: مل٠CSV تم تصديره من خادوم مثيل آخر لماستدون sessions: @@ -46,8 +46,8 @@ ar: follow_request: إبعث بريداً إلكترونياً عند تلقيك طلب بالمتابعة mention: إبعث بريداً إلكترونياً عندما يشار إليك reblog: إبعث بريداً إلكترونياً عندما ÙŠÙرقّي اØدهم منشورك - 'no': 'لا' + 'no': لا required: mark: "*" text: مطلوب - 'yes': 'نعم' + 'yes': نعم