diff --git a/config/locales/an.yml b/config/locales/an.yml index f941651438..e2e499c47f 100644 --- a/config/locales/an.yml +++ b/config/locales/an.yml @@ -1376,7 +1376,6 @@ an: edit_profile: Editar perfil featured_tags: Hashtags destacaus import: Importar - import_and_export: Importar y exportar migrate: Migración de cuenta preferences: Preferencias profile: Perfil diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 832f60795f..b144dbc1e5 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -1706,7 +1706,6 @@ ar: edit_profile: تعديل الصفحة التعريفية featured_tags: الوسوم الشائعة import: استيراد - import_and_export: استيراد وتصدير migrate: تهجير الحساب notifications: إشعارات البريد الإلكتروني preferences: التفضيلات diff --git a/config/locales/ast.yml b/config/locales/ast.yml index a3310f0d46..450af49c05 100644 --- a/config/locales/ast.yml +++ b/config/locales/ast.yml @@ -778,7 +778,6 @@ ast: edit_profile: Edición del perfil featured_tags: Etiquetes destacaes import: Importación - import_and_export: Importación y esportación migrate: Migración de la cuenta notifications: Avisos per corréu electrónicu preferences: Preferencies diff --git a/config/locales/be.yml b/config/locales/be.yml index c97547b8b9..b928fe3419 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -1709,7 +1709,6 @@ be: edit_profile: Рэдагаваць профіль featured_tags: Выбраныя хэштэгі import: Імпарт - import_and_export: Імпарт і экспарт migrate: Перамяшчэнне ўліковага запісу notifications: Апавяшчэнні па эл. пошце preferences: Налады diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 20ee1f6c68..12bfedee55 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -1638,7 +1638,6 @@ bg: edit_profile: Редактирай профила си featured_tags: Актуални хаштагове import: Импортиране - import_and_export: Импортиране и експортиране migrate: Миграция на акаунта notifications: Известия по е-поща preferences: Предпочитания diff --git a/config/locales/br.yml b/config/locales/br.yml index fbe91fcbd7..9d5b2d1fa7 100644 --- a/config/locales/br.yml +++ b/config/locales/br.yml @@ -505,7 +505,6 @@ br: edit_profile: Kemmañ ar profil featured_tags: Hashtagoù pennañ import: Enporzhiañ - import_and_export: Enporzhiañ hag ezporzhiañ preferences: Gwellvezioù profile: Profil statuses: diff --git a/config/locales/ca.yml b/config/locales/ca.yml index b1af2d95d4..868a0865dd 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -1691,7 +1691,6 @@ ca: export: Exporta featured_tags: Etiquetes destacades import: Importació - import_and_export: Importació i exportació migrate: Migració del compte notifications: Notificacions per correu electrònic preferences: Preferències diff --git a/config/locales/ckb.yml b/config/locales/ckb.yml index cfee624e36..13f439ff2b 100644 --- a/config/locales/ckb.yml +++ b/config/locales/ckb.yml @@ -908,7 +908,6 @@ ckb: edit_profile: دەستکاری پرۆفایل featured_tags: هاشتاگی تایبەت import: هاوردن - import_and_export: هاوردەکردن و ناردن migrate: گواستنەوەی هەژمارە preferences: پەسەندەکان profile: پرۆفایل diff --git a/config/locales/co.yml b/config/locales/co.yml index 39d9e9157e..91ce4a6e85 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -892,7 +892,6 @@ co: edit_profile: Mudificà u prufile featured_tags: Hashtag in vista import: Impurtazione - import_and_export: Impurtazione è spurtazione migrate: Migrazione di u contu preferences: Priferenze profile: Prufile diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 19a6372224..0f8ff89c9c 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -1653,7 +1653,6 @@ cs: edit_profile: Upravit profil featured_tags: Zvýrazněné hashtagy import: Import - import_and_export: Import a export migrate: Přesun účtu preferences: Předvolby profile: Profil diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 0daa793f97..89406f031e 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -1884,7 +1884,6 @@ cy: export: Allforio featured_tags: Prif hashnodau import: Mewnforio - import_and_export: Mewnforio ac allforio migrate: Mudo cyfrif notifications: Hysbysiadau e-bost preferences: Dewisiadau diff --git a/config/locales/da.yml b/config/locales/da.yml index 3a82278b93..4da11f0600 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -1739,7 +1739,6 @@ da: export: Eksport featured_tags: Udvalgte hashtags import: Import - import_and_export: Import og eksport migrate: Kontomigrering notifications: E-mailnotifikationer preferences: Præferencer diff --git a/config/locales/de.yml b/config/locales/de.yml index 26ccc8f3ee..c393d668a9 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -1739,7 +1739,6 @@ de: export: Exportieren featured_tags: Vorgestellte Hashtags import: Importieren - import_and_export: Importieren und exportieren migrate: Kontoumzug notifications: E-Mail-Benachrichtigungen preferences: Einstellungen diff --git a/config/locales/el.yml b/config/locales/el.yml index 98ef5f18b7..5a113fedd4 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -1619,7 +1619,6 @@ el: export: Εξαγωγή featured_tags: Παρεχόμενες ετικέτες import: Εισαγωγή - import_and_export: Εισαγωγή και εξαγωγή migrate: Μετακόμιση λογαριασμού notifications: Ειδοποιήσεις μέσω email preferences: Προτιμήσεις diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 76a16aa9db..d5d3a16aae 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -1720,7 +1720,6 @@ en-GB: export: Export featured_tags: Featured hashtags import: Import - import_and_export: Import and export migrate: Account migration notifications: Email notifications preferences: Preferences diff --git a/config/locales/en.yml b/config/locales/en.yml index 2971fe1f25..d075cd1b8d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1738,9 +1738,9 @@ en: development: Development edit_profile: Edit profile export: Export + export_and_import: Export and import featured_tags: Featured hashtags import: Import - import_and_export: Import and export migrate: Account migration notifications: Email notifications preferences: Preferences diff --git a/config/locales/eo.yml b/config/locales/eo.yml index 120df142b7..2b5de8df5f 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -1642,7 +1642,6 @@ eo: export: Eksporti featured_tags: Elstarigitaj kradvortoj import: Enporti - import_and_export: Importi kaj eksporti migrate: Konta migrado notifications: Retpoŝtaj sciigoj preferences: Preferoj diff --git a/config/locales/es-AR.yml b/config/locales/es-AR.yml index 09163c2e4a..b434a57a52 100644 --- a/config/locales/es-AR.yml +++ b/config/locales/es-AR.yml @@ -1739,7 +1739,6 @@ es-AR: export: Exportar featured_tags: Etiquetas destacadas import: Importar - import_and_export: Importación y exportación migrate: Migración de la cuenta notifications: Notificaciones por correo electrónico preferences: Configuración diff --git a/config/locales/es-MX.yml b/config/locales/es-MX.yml index 53557c091a..ae0140b1a2 100644 --- a/config/locales/es-MX.yml +++ b/config/locales/es-MX.yml @@ -1739,7 +1739,6 @@ es-MX: export: Exportar featured_tags: Hashtags destacados import: Importar - import_and_export: Importar y exportar migrate: Migración de cuenta notifications: Notificaciones por correo electrónico preferences: Preferencias diff --git a/config/locales/es.yml b/config/locales/es.yml index 22123e4309..3b49eb6c13 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1739,7 +1739,6 @@ es: export: Exportar featured_tags: Hashtags destacados import: Importar - import_and_export: Importar y exportar migrate: Migración de cuenta notifications: Notificaciones por correo electrónico preferences: Preferencias diff --git a/config/locales/et.yml b/config/locales/et.yml index 40db2eede0..592baa7a12 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -1724,7 +1724,6 @@ et: export: Eksport featured_tags: Esile toodud sildid import: Impordi - import_and_export: Import / eksport migrate: Konto kolimine notifications: E-postiteated preferences: Eelistused diff --git a/config/locales/eu.yml b/config/locales/eu.yml index dc064ebc7b..3749b8ea26 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -1579,7 +1579,6 @@ eu: edit_profile: Editatu profila featured_tags: Nabarmendutako traolak import: Inportazioa - import_and_export: Inportatu eta esportatu migrate: Kontuaren migrazioa preferences: Hobespenak profile: Profila diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 7cb0714c28..10ba84e490 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -1526,7 +1526,6 @@ fa: export: برون‌ریزی featured_tags: برچسب‌های برگزیده import: درون‌ریزی - import_and_export: درون‌ریزی و برون‌بری migrate: انتقال حساب notifications: آگاهی‌های رایانامه‌ای preferences: ترجیحات diff --git a/config/locales/fi.yml b/config/locales/fi.yml index d7755d23b8..e49cc5d614 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -1739,7 +1739,6 @@ fi: export: Vie featured_tags: Suositellut aihetunnisteet import: Tuo tietoja - import_and_export: Tuonti ja vienti migrate: Tilin muutto toisaalle notifications: Sähköposti-ilmoitukset preferences: Asetukset diff --git a/config/locales/fo.yml b/config/locales/fo.yml index 502c027b5d..3abd21560d 100644 --- a/config/locales/fo.yml +++ b/config/locales/fo.yml @@ -1739,7 +1739,6 @@ fo: export: Flyt út featured_tags: Varpaði frámerki import: Innflyt - import_and_export: Innflyt og útflyt migrate: Flyting av kontu notifications: Teldupostfráboðanir preferences: Stillingar diff --git a/config/locales/fr-CA.yml b/config/locales/fr-CA.yml index 9c2bf3398e..7512902820 100644 --- a/config/locales/fr-CA.yml +++ b/config/locales/fr-CA.yml @@ -1724,7 +1724,6 @@ fr-CA: export: Exportation featured_tags: Hashtags mis en avant import: Import de données - import_and_export: Import et export migrate: Migration de compte notifications: Notifications par courriel preferences: Préférences diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 650147eb5d..ed15355e59 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -1724,7 +1724,6 @@ fr: export: Exportation featured_tags: Hashtags mis en avant import: Import de données - import_and_export: Import et export migrate: Migration de compte notifications: Notifications par courriel preferences: Préférences diff --git a/config/locales/fy.yml b/config/locales/fy.yml index 24be51d9d7..4f7647ad62 100644 --- a/config/locales/fy.yml +++ b/config/locales/fy.yml @@ -1724,7 +1724,6 @@ fy: export: Eksportearje featured_tags: Utljochte hashtags import: Ymportearje - import_and_export: Ymportearje en eksportearje migrate: Accountmigraasje notifications: E-mailmeldingen preferences: Ynstellingen diff --git a/config/locales/ga.yml b/config/locales/ga.yml index deb9986691..0d2a508bbc 100644 --- a/config/locales/ga.yml +++ b/config/locales/ga.yml @@ -1853,7 +1853,6 @@ ga: export: Easpórtáil featured_tags: Haischlib faoi thrácht import: Iompórtáil - import_and_export: Iompórtáil agus easpórtáil migrate: Imirce cuntais notifications: Fógraí ríomhphoist preferences: Sainroghanna pearsanta diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 7581f6c856..cdaec3c09f 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -1815,7 +1815,6 @@ gd: export: Às-phortadh featured_tags: Tagaichean hais brosnaichte import: Ion-phortadh - import_and_export: Ion-phortadh ⁊ às-phortadh migrate: Imrich cunntais notifications: Brathan puist-d preferences: Roghainnean diff --git a/config/locales/gl.yml b/config/locales/gl.yml index feda673621..a14a17055b 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -1739,7 +1739,6 @@ gl: export: Exportar featured_tags: Cancelos destacados import: Importar - import_and_export: Importar e exportar migrate: Migrar conta notifications: Notificacións por correo preferences: Preferencias diff --git a/config/locales/he.yml b/config/locales/he.yml index 5243cf4768..db8a35eacc 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -1815,7 +1815,6 @@ he: export: ייצוא featured_tags: תגיות נבחרות import: יבוא - import_and_export: יבוא ויצוא migrate: הגירת חשבון notifications: התראות בדואל preferences: העדפות diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 908cbf51c4..a12f06a7cc 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -207,7 +207,6 @@ hr: edit_profile: Uredi profil featured_tags: Istaknuti hashtagovi import: Uvezi - import_and_export: Uvezi i izvezi preferences: Postavke profile: Profil statuses_cleanup: Automatsko brisanje postova diff --git a/config/locales/hu.yml b/config/locales/hu.yml index f23711d403..ef886617ed 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -1732,7 +1732,6 @@ hu: export: Exportálás featured_tags: Kiemelt hashtagek import: Importálás - import_and_export: Import és export migrate: Fiók átirányítása notifications: E-mail-értesítések preferences: Beállítások diff --git a/config/locales/hy.yml b/config/locales/hy.yml index 3b4aaf3629..43ef343223 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -758,7 +758,6 @@ hy: edit_profile: Խմբագրել պրոֆիլը featured_tags: Ընտրուած հէշթեգեր import: Ներմուծել - import_and_export: Ներմուծել և արտահանել migrate: Հաշուի տեղափոխում preferences: Կարգավորումներ profile: Հաշիւ diff --git a/config/locales/ia.yml b/config/locales/ia.yml index 54401b1c5a..61b728c765 100644 --- a/config/locales/ia.yml +++ b/config/locales/ia.yml @@ -1739,7 +1739,6 @@ ia: export: Exportar featured_tags: Hashtags in evidentia import: Importar - import_and_export: Importar e exportar migrate: Migration de conto notifications: Notificationes per e-mail preferences: Preferentias diff --git a/config/locales/id.yml b/config/locales/id.yml index 34b690828d..5a386eb906 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -1348,7 +1348,6 @@ id: edit_profile: Ubah profil featured_tags: Tagar unggulan import: Impor - import_and_export: Impor dan ekspor migrate: Pemindahan akun preferences: Pilihan profile: Profil diff --git a/config/locales/ie.yml b/config/locales/ie.yml index f006f2c8ad..2a85419f9b 100644 --- a/config/locales/ie.yml +++ b/config/locales/ie.yml @@ -1577,7 +1577,6 @@ ie: edit_profile: Modificar profil featured_tags: Recomandat hashtags import: Importar - import_and_export: Importation e exportation migrate: Migration de conto preferences: Preferenties profile: Public profil diff --git a/config/locales/io.yml b/config/locales/io.yml index 83c92484ff..91820dd016 100644 --- a/config/locales/io.yml +++ b/config/locales/io.yml @@ -1542,7 +1542,6 @@ io: edit_profile: Redaktar la profilo featured_tags: Estelata hashtagi import: Importacar - import_and_export: Importaco e exportaco migrate: Kontomigro preferences: Preferi profile: Profilo diff --git a/config/locales/is.yml b/config/locales/is.yml index cad01257fd..c527a9917b 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -1743,7 +1743,6 @@ is: export: Flytja út featured_tags: Myllumerki með aukið vægi import: Flytja inn - import_and_export: Inn- og útflutningur migrate: Yfirfærsla notandaaðgangs notifications: Tilkynningar í tölvupósti preferences: Kjörstillingar diff --git a/config/locales/it.yml b/config/locales/it.yml index 3b36bd3f7a..6abc5d33a2 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -1741,7 +1741,6 @@ it: export: Esporta featured_tags: Hashtag in evidenza import: Importa - import_and_export: Importa ed esporta migrate: Migrazione dell'account notifications: Notifiche e-mail preferences: Preferenze diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 810de2b227..0a07168039 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -1701,7 +1701,6 @@ ja: export: エクスポート featured_tags: 注目のハッシュタグ import: データのインポート - import_and_export: インポート・エクスポート migrate: アカウントの引っ越し notifications: メール通知 preferences: ユーザー設定 diff --git a/config/locales/kab.yml b/config/locales/kab.yml index 1f5c5ded79..8674e7907a 100644 --- a/config/locales/kab.yml +++ b/config/locales/kab.yml @@ -785,7 +785,6 @@ kab: development: Taneflit edit_profile: Ẓreg amaɣnu import: Kter - import_and_export: Taktert d usifeḍ migrate: Tunigin n umiḍan notifications: Alɣuten s imayl preferences: Imenyafen diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 7ab33b3134..afcc37935f 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -624,7 +624,6 @@ kk: edit_profile: Профиль өңдеу featured_tags: Таңдаулы хэштегтер import: Импорт - import_and_export: Импорт/экспорт migrate: Аккаунт көшіру preferences: Баптаулар profile: Профиль diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 3394433758..588a2840fe 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -1703,7 +1703,6 @@ ko: export: 내보내기 featured_tags: 추천 해시태그 import: 데이터 가져오기 - import_and_export: 가져오기 & 내보내기 migrate: 계정 이동 notifications: 이메일 알림 preferences: 환경설정 diff --git a/config/locales/ku.yml b/config/locales/ku.yml index 5337610992..7b6dee8c45 100644 --- a/config/locales/ku.yml +++ b/config/locales/ku.yml @@ -1370,7 +1370,6 @@ ku: edit_profile: Profîlê serrast bike featured_tags: Hashtagên bijarte import: Têxistin - import_and_export: Têxistin û derxistin migrate: Barkirina ajimêrê preferences: Hilbijarte profile: Profîl diff --git a/config/locales/lad.yml b/config/locales/lad.yml index 2612ae2131..914d4f2941 100644 --- a/config/locales/lad.yml +++ b/config/locales/lad.yml @@ -1661,7 +1661,6 @@ lad: export: Eksporto featured_tags: Etiketas avaliadas import: Importo - import_and_export: Importo i eksporto migrate: Migrasyon de kuento notifications: Avizos por posta elektronika preferences: Preferensyas diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 65bd4456ae..00649bc2b4 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -1112,7 +1112,6 @@ lt: export: Eksportuoti featured_tags: Rodomi saitažodžiai import: Importuoti - import_and_export: Importas ir eksportas migrate: Paskyros migracija notifications: El. laiško pranešimai preferences: Nuostatos diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 3e44adbf46..4377717a19 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -1668,7 +1668,6 @@ lv: export: Izgūt featured_tags: Piedāvātie tēmturi import: Imports - import_and_export: Imports un eksports migrate: Konta migrācija notifications: E-pasta paziņojumi preferences: Iestatījumi diff --git a/config/locales/ms.yml b/config/locales/ms.yml index 948ad56a54..7919b4178c 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -1516,7 +1516,6 @@ ms: edit_profile: Sunting profil featured_tags: Tanda pagar terpilih import: Import - import_and_export: Import dan eksport migrate: Penghijrahan akaun preferences: Keutamaan profile: Profil diff --git a/config/locales/my.yml b/config/locales/my.yml index 4428843855..39d67b4b6f 100644 --- a/config/locales/my.yml +++ b/config/locales/my.yml @@ -1516,7 +1516,6 @@ my: edit_profile: ပရိုဖိုင်ပြင်ဆင်ရန် featured_tags: အသားပေးဖော်ပြထားသည့် ဟက်ရှ်တဂျ်များ import: ထည့်သွင်းခြင်း - import_and_export: ထည့်သွင်းခြင်းနှင့် ထုတ်ယူခြင်း migrate: အကောင့်ပြောင်းရွှေ့ခြင်း preferences: သတ်မှတ်ချက်များ profile: ပရိုဖိုင် diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 048214eca3..84eb9cadf2 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -1729,7 +1729,6 @@ nl: export: Exporteren featured_tags: Uitgelichte hashtags import: Importeren - import_and_export: Importeren en exporteren migrate: Accountmigratie notifications: E-mailmeldingen preferences: Voorkeuren diff --git a/config/locales/nn.yml b/config/locales/nn.yml index dbb8b6c693..e217686249 100644 --- a/config/locales/nn.yml +++ b/config/locales/nn.yml @@ -1739,7 +1739,6 @@ nn: export: Eksporter featured_tags: Utvalgte emneknagger import: Hent inn - import_and_export: Importer og eksporter migrate: Kontoflytting notifications: Epostvarsel preferences: Innstillingar diff --git a/config/locales/no.yml b/config/locales/no.yml index 8bf5daad0e..3d6cb3250b 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -1571,7 +1571,6 @@ edit_profile: Endre profil featured_tags: Utvalgte emneknagger import: Importér - import_and_export: Importer og eksporter migrate: Kontomigrering preferences: Innstillinger profile: Profil diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 5dec5ebb77..6fad67a6d3 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -814,7 +814,6 @@ oc: edit_profile: Modificar lo perfil featured_tags: Etiquetas en avant import: Importar de donadas - import_and_export: Import e export migrate: Migracion de compte preferences: Preferéncias profile: Perfil diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 3592ea53f6..014a4c5e54 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -1753,7 +1753,6 @@ pl: export: Eksportowanie danych featured_tags: Wyróżnione hashtagi import: Importowanie danych - import_and_export: Import i eksport migrate: Migracja konta notifications: Powiadomienia e-mail preferences: Preferencje diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 537dee5f74..7968c02c08 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -1712,7 +1712,6 @@ pt-BR: export: Exportar featured_tags: Hashtags em destaque import: Importar - import_and_export: Importar e exportar migrate: Migração de conta notifications: Notificações por e-mail preferences: Preferências diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml index cceceb0534..27566ec4a1 100644 --- a/config/locales/pt-PT.yml +++ b/config/locales/pt-PT.yml @@ -1665,7 +1665,6 @@ pt-PT: edit_profile: Editar perfil featured_tags: Etiquetas destacadas import: Importar - import_and_export: Importar e exportar migrate: Migração de conta preferences: Preferências profile: Perfil diff --git a/config/locales/ro.yml b/config/locales/ro.yml index d4f202637b..32ef28f5fb 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -663,7 +663,6 @@ ro: account: Cont back: Înapoi la Mastodon edit_profile: Editați profilul - import_and_export: Import și export profile: Profil relationships: Urmăriri și urmăritori statuses: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index d9bf96c625..966408503b 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1808,7 +1808,6 @@ ru: export: Экспорт featured_tags: Избранные хэштеги import: Импорт - import_and_export: Импорт и экспорт migrate: Миграция учётной записи notifications: E-mail уведомление preferences: Настройки diff --git a/config/locales/sc.yml b/config/locales/sc.yml index 38ede0a72c..b332a129f5 100644 --- a/config/locales/sc.yml +++ b/config/locales/sc.yml @@ -1124,7 +1124,6 @@ sc: edit_profile: Modìfica profilu featured_tags: Etichetas in evidèntzia import: Importatzione - import_and_export: Importatzione e esportatzione migrate: Tràmuda de contu preferences: Preferèntzias profile: Profilu pùblicu diff --git a/config/locales/sco.yml b/config/locales/sco.yml index ff3a730b17..e3f97c0399 100644 --- a/config/locales/sco.yml +++ b/config/locales/sco.yml @@ -1360,7 +1360,6 @@ sco: edit_profile: Edit profile featured_tags: Featured hashtags import: Import - import_and_export: Import an export migrate: Accoont flittin preferences: Preferences profile: Profile diff --git a/config/locales/si.yml b/config/locales/si.yml index cd4abf6451..3d2a7437d2 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -1235,7 +1235,6 @@ si: edit_profile: පැතිකඩ සංස්කරණය featured_tags: විශේෂාංගගත හැෂ් ටැග් import: ආයාතය - import_and_export: ආයාත හා නිර්යාත migrate: ගිණුම් සංක්‍රමණය preferences: අභිප්‍රේත profile: ප්‍රසිද්ධ පැතිකඩ diff --git a/config/locales/sk.yml b/config/locales/sk.yml index c946b8abf1..62d4eab964 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -1234,7 +1234,6 @@ sk: edit_profile: Uprav profil featured_tags: Zvýraznené haštagy import: Importuj - import_and_export: Import a export migrate: Presuň účet preferences: Voľby profile: Profil diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 909b89e5a9..1a597f6e6b 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -1716,7 +1716,6 @@ sl: edit_profile: Uredi profil featured_tags: Vključeni ključniki import: Uvozi - import_and_export: Uvoz in izvoz migrate: Selitev računa notifications: E-poštna obvestila preferences: Nastavitve diff --git a/config/locales/sq.yml b/config/locales/sq.yml index e9247ef365..f81d24e856 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -1733,7 +1733,6 @@ sq: export: Eksportim featured_tags: Hashtag-ë të zgjedhur import: Importo - import_and_export: Importim dhe eksportim migrate: Migrim llogarie notifications: Njoftime me email preferences: Parapëlqime diff --git a/config/locales/sr-Latn.yml b/config/locales/sr-Latn.yml index 0b3043c47b..8f85ddfb1b 100644 --- a/config/locales/sr-Latn.yml +++ b/config/locales/sr-Latn.yml @@ -1606,7 +1606,6 @@ sr-Latn: edit_profile: Uređivanje profila featured_tags: Istaknute heš oznake import: Uvoz - import_and_export: Uvoz i izvoz migrate: Prebacivanje naloga preferences: Podešavanja profile: Javni profil diff --git a/config/locales/sr.yml b/config/locales/sr.yml index e077a40eee..a8218b5886 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -1636,7 +1636,6 @@ sr: edit_profile: Уређивање профила featured_tags: Истакнуте хеш ознаке import: Увоз - import_and_export: Увоз и извоз migrate: Пребацивање налога preferences: Подешавања profile: Јавни профил diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 173dd24c88..a7dfa56aa5 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -1739,7 +1739,6 @@ sv: export: Export featured_tags: Utvalda hashtaggar import: Importera - import_and_export: Import och export migrate: Kontoflytt notifications: E-postaviseringar preferences: Inställningar diff --git a/config/locales/th.yml b/config/locales/th.yml index 5178506bab..1f8553194e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -1686,7 +1686,6 @@ th: export: ส่งออก featured_tags: แฮชแท็กที่น่าสนใจ import: การนำเข้า - import_and_export: การนำเข้าและการส่งออก migrate: การโยกย้ายบัญชี notifications: การแจ้งเตือนอีเมล preferences: การกำหนดลักษณะ diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 48f6c5e240..89884d95b1 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -1739,7 +1739,6 @@ tr: export: Dışa Aktar featured_tags: Öne çıkan etiketler import: İçe aktar - import_and_export: İçe ve dışa aktar migrate: Hesap taşıma notifications: E-posta bildirimleri preferences: Tercihler diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 68ca10c0cc..f74da8756a 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -1738,7 +1738,6 @@ uk: export: Експорт featured_tags: Рекомендовані хештеґи import: Імпорт - import_and_export: Імпорт та експорт migrate: Міграція облікового запису notifications: Сповіщення е-поштою preferences: Налаштування diff --git a/config/locales/vi.yml b/config/locales/vi.yml index acc69f96cd..00af83b53e 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -1701,7 +1701,6 @@ vi: export: Xuất featured_tags: Hashtag thường dùng import: Nhập dữ liệu - import_and_export: Dữ liệu migrate: Chuyển tài khoản sang máy chủ khác notifications: Thông báo qua email preferences: Chung diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 1623f39ad6..42dda2c06d 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -1701,7 +1701,6 @@ zh-CN: export: 导出 featured_tags: 精选话题标签 import: 导入 - import_and_export: 导入与导出 migrate: 账户迁移 notifications: 邮件通知 preferences: 偏好设置 diff --git a/config/locales/zh-HK.yml b/config/locales/zh-HK.yml index 752c9b5cbf..7a6469abb7 100644 --- a/config/locales/zh-HK.yml +++ b/config/locales/zh-HK.yml @@ -1551,7 +1551,6 @@ zh-HK: edit_profile: 修改個人資料 featured_tags: 推薦的標籤 import: 匯入 - import_and_export: 匯入及匯出 migrate: 帳戶遷移 preferences: 偏好設定 profile: 個人資料 diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 701ea0ea53..95380f22cc 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1703,7 +1703,6 @@ zh-TW: export: 匯出 featured_tags: 推薦主題標籤 import: 匯入 - import_and_export: 匯入及匯出 migrate: 帳號搬遷 notifications: 電子郵件通知 preferences: 偏好設定 diff --git a/config/navigation.rb b/config/navigation.rb index bdda569092..608f595ed1 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -34,9 +34,9 @@ SimpleNavigation::Configuration.run do |navigation| s.item :authorized_apps, safe_join([material_symbol('list_alt'), t('settings.authorized_apps')]), oauth_authorized_applications_path, if: -> { !self_destruct } end - n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.import_and_export')]), settings_export_path do |s| - s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct } + n.item :data, safe_join([material_symbol('cloud_sync'), t('settings.export_and_import')]), settings_export_path do |s| s.item :export, safe_join([material_symbol('cloud_download'), t('settings.export')]), settings_export_path + s.item :import, safe_join([material_symbol('cloud_upload'), t('settings.import')]), settings_imports_path, highlights_on: %r{/settings/imports}, if: -> { current_user.functional? && !self_destruct } end n.item :user_invites, safe_join([material_symbol('person_add'), t('invites.title')]), invites_path, if: -> { current_user.can?(:invite_users) && current_user.functional? && !self_destruct }