diff --git a/app/javascript/flavours/glitch/features/getting_started/index.js b/app/javascript/flavours/glitch/features/getting_started/index.js index f9d79013b..8dcea1867 100644 --- a/app/javascript/flavours/glitch/features/getting_started/index.js +++ b/app/javascript/flavours/glitch/features/getting_started/index.js @@ -31,7 +31,7 @@ const messages = defineMessages({ direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' }, bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' }, preferences: { id: 'navigation_bar.preferences', defaultMessage: 'Preferences' }, - settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' }, + settings: { id: 'navigation_bar.app_settings', defaultMessage: 'Config visuelle' }, follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' }, lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' }, keyboard_shortcuts: { id: 'navigation_bar.keyboard_shortcuts', defaultMessage: 'Keyboard shortcuts' }, diff --git a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js index 3b46c6eec..07a7528de 100644 --- a/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js +++ b/app/javascript/flavours/glitch/features/ui/components/navigation_panel.js @@ -18,7 +18,7 @@ const messages = defineMessages({ explore: { id: 'explore.title', defaultMessage: 'Explore' }, local: { id: 'tabs_bar.local_timeline', defaultMessage: 'Local' }, federated: { id: 'tabs_bar.federated_timeline', defaultMessage: 'Federated' }, - direct: { id: 'navigation_bar.direct', defaultMessage: 'Direct messages' }, + direct: { id: 'navigation_bar.direct', defaultMessage: 'Lettres d\'amour' }, favourites: { id: 'navigation_bar.favourites', defaultMessage: 'Favourites' }, bookmarks: { id: 'navigation_bar.bookmarks', defaultMessage: 'Bookmarks' }, lists: { id: 'navigation_bar.lists', defaultMessage: 'Lists' }, @@ -26,7 +26,7 @@ const messages = defineMessages({ followsAndFollowers: { id: 'navigation_bar.follows_and_followers', defaultMessage: 'Follows and followers' }, about: { id: 'navigation_bar.about', defaultMessage: 'About' }, search: { id: 'navigation_bar.search', defaultMessage: 'Search' }, - app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'App settings' }, + app_settings: { id: 'navigation_bar.app_settings', defaultMessage: 'Config visuelle' }, }); export default @injectIntl diff --git a/app/javascript/flavours/glitch/locales/fr.js b/app/javascript/flavours/glitch/locales/fr.js index 8562f5594..f327311b0 100644 --- a/app/javascript/flavours/glitch/locales/fr.js +++ b/app/javascript/flavours/glitch/locales/fr.js @@ -1,7 +1,9 @@ import inherited from 'mastodon/locales/fr.json'; const messages = { - // No translations available. + 'navigation_bar.app_settings': 'Config de ouf', + 'tabs_bar.local_timeline': 'Bilveusées locales', + 'tabs_bar.federated_timeline': 'La mine de sel', }; export default Object.assign({}, inherited, messages); diff --git a/app/javascript/flavours/glitch/styles/_custom_tk.scss b/app/javascript/flavours/glitch/styles/_custom_tk.scss index e17739945..98658017f 100644 --- a/app/javascript/flavours/glitch/styles/_custom_tk.scss +++ b/app/javascript/flavours/glitch/styles/_custom_tk.scss @@ -60,9 +60,12 @@ background-position: top left; background-attachment: fixed; background-repeat: no-repeat; - background-size: 100vh; + background-size: cover; .compose-panel{ - background-image: linear-gradient(transparent, #15141A 90%); + //background-image: linear-gradient(transparent, #15141A 90%); + } + .navigation-bar__profile .permalink.acct{ + font-size: 1.25rem; } } diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index eeb5d9ee7..0ef1af26b 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -100,8 +100,8 @@ "column.about": "À propos", "column.blocks": "Utilisateurs bloqués", "column.bookmarks": "Signets", - "column.community": "Fil public local", - "column.direct": "Messages directs", + "column.community": "Bilveusées locales", + "column.direct": "Lettres d'amour", "column.directory": "Parcourir les profils", "column.domain_blocks": "Domaines bloqués", "column.favourites": "Favoris", @@ -367,24 +367,24 @@ "navigation_bar.about": "À propos", "navigation_bar.blocks": "Comptes bloqués", "navigation_bar.bookmarks": "Marque-pages", - "navigation_bar.community_timeline": "Fil public local", + "navigation_bar.community_timeline": "Bilveusées locales", "navigation_bar.compose": "Rédiger un nouveau message", - "navigation_bar.direct": "Messages directs", + "navigation_bar.direct": "Lettres d'amour", "navigation_bar.discover": "Découvrir", "navigation_bar.domain_blocks": "Domaines bloqués", "navigation_bar.edit_profile": "Modifier le profil", "navigation_bar.explore": "Explorer", - "navigation_bar.favourites": "Favoris", + "navigation_bar.favourites": "Appréciés", "navigation_bar.filters": "Mots masqués", - "navigation_bar.follow_requests": "Demandes d’abonnement", - "navigation_bar.follows_and_followers": "Abonnements et abonnés", + "navigation_bar.follow_requests": "Demandes de stalkers", + "navigation_bar.follows_and_followers": "Abonnements et adeptes", "navigation_bar.lists": "Listes", "navigation_bar.logout": "Déconnexion", "navigation_bar.mutes": "Comptes masqués", "navigation_bar.personal": "Personnel", "navigation_bar.pins": "Messages épinglés", "navigation_bar.preferences": "Préférences", - "navigation_bar.public_timeline": "Fil public global", + "navigation_bar.public_timeline": "Galaxies voisines", "navigation_bar.search": "Rechercher", "navigation_bar.security": "Sécurité", "not_signed_in_indicator.not_signed_in": "Vous devez vous connecter pour accéder à cette ressource.",