From dcb7e1ecf479a72c904dd882c05f1c446dbe2fe4 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 00:32:25 +0100 Subject: [PATCH 01/36] Add option for disabling counts (followers, statuses) in user profiles. --- src/components/settings/settings.js | 4 ++++ src/components/settings/settings.vue | 4 ++++ src/components/user_card_content/user_card_content.js | 5 +++++ src/components/user_card_content/user_card_content.vue | 10 +++++----- src/i18n/messages.js | 1 + src/main.js | 1 + src/modules/config.js | 1 + 7 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index de12894b..088e19d3 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -10,6 +10,7 @@ const settings = { hideAttachmentsLocal: this.$store.state.config.hideAttachments, hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, hideNsfwLocal: this.$store.state.config.hideNsfw, + hideUserStatsLocal: this.$store.state.config.hideUserStats, notificationVisibilityLocal: this.$store.state.config.notificationVisibility, replyVisibilityLocal: this.$store.state.config.replyVisibility, loopVideoLocal: this.$store.state.config.loopVideo, @@ -47,6 +48,9 @@ const settings = { hideAttachmentsInConvLocal (value) { this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value }) }, + hideUserStatsLocal (value) { + this.$store.dispatch('setOption', { name: 'hideUserStats', value }) + }, hideNsfwLocal (value) { this.$store.dispatch('setOption', { name: 'hideNsfw', value }) }, diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index c106b79c..2cf62200 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -122,6 +122,10 @@ +
+ + +

{{$t('settings.filtering_explanation')}}

diff --git a/src/components/user_card_content/user_card_content.js b/src/components/user_card_content/user_card_content.js index 76a5577e..eefa65f3 100644 --- a/src/components/user_card_content/user_card_content.js +++ b/src/components/user_card_content/user_card_content.js @@ -3,6 +3,11 @@ import { hex2rgb } from '../../services/color_convert/color_convert.js' export default { props: [ 'user', 'switcher', 'selected', 'hideBio' ], + data () { + return { + hideUserStatsLocal: this.$store.state.config.hideUserStats + } + }, computed: { headingStyle () { const color = this.$store.state.config.colors.bg diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 59358040..65fd26eb 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -17,7 +17,7 @@
{{user.name}}
@{{user.screen_name}} - {{dailyAvg}} {{ $t('user_card.per_day') }} + {{dailyAvg}} {{ $t('user_card.per_day') }}
@@ -90,19 +90,19 @@ -
+
{{ $t('user_card.statuses') }}
- {{user.statuses_count}}
+ {{user.statuses_count}}
{{ $t('user_card.followees') }}
- {{user.friends_count}} + {{user.friends_count}}
{{ $t('user_card.followers') }}
- {{user.followers_count}} + {{user.followers_count}}

diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 42e7e9d4..42b1dd40 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -328,6 +328,7 @@ const en = { loop_video_silent_only: 'Loop only videos without sound (i.e. Mastodon\'s "gifs")', reply_link_preview: 'Enable reply-link preview on mouse hover', replies_in_timeline: 'Replies in timeline', + hide_user_stats: 'Hide user statistics (e.g. status and follower counts)', reply_visibility_all: 'Show all replies', reply_visibility_following: 'Only show replies directed at me or users I\'m following', reply_visibility_self: 'Only show replies directed at me', diff --git a/src/main.js b/src/main.js index debd8703..d05ecba8 100644 --- a/src/main.js +++ b/src/main.js @@ -48,6 +48,7 @@ const persistedStateOptions = { 'config.collapseMessageWithSubject', 'config.hideAttachments', 'config.hideAttachmentsInConv', + 'config.hideUserStats', 'config.hideNsfw', 'config.replyVisibility', 'config.notificationVisibility', diff --git a/src/modules/config.js b/src/modules/config.js index 60a34bc1..24665e95 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -9,6 +9,7 @@ const defaultState = { collapseMessageWithSubject: false, hideAttachments: false, hideAttachmentsInConv: false, + hideUserStats: false, hideNsfw: true, loopVideo: true, loopVideoSilentOnly: true, From bdcbd110e42a5deb46116f3ba631118143f71a69 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 00:41:37 +0100 Subject: [PATCH 02/36] Add option for hiding post statistics (e.g. repeats, favs) --- src/components/favorite_button/favorite_button.js | 1 + src/components/favorite_button/favorite_button.vue | 4 ++-- src/components/retweet_button/retweet_button.js | 1 + src/components/retweet_button/retweet_button.vue | 4 ++-- src/components/settings/settings.js | 4 ++++ src/components/settings/settings.vue | 4 ++++ src/i18n/messages.js | 1 + src/main.js | 1 + src/modules/config.js | 1 + 9 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js index 1266be90..80893719 100644 --- a/src/components/favorite_button/favorite_button.js +++ b/src/components/favorite_button/favorite_button.js @@ -2,6 +2,7 @@ const FavoriteButton = { props: ['status', 'loggedIn'], data () { return { + hidePostStatsLocal: this.$store.state.config.hidePostStats, animated: false } }, diff --git a/src/components/favorite_button/favorite_button.vue b/src/components/favorite_button/favorite_button.vue index 1e1a6970..71cb875e 100644 --- a/src/components/favorite_button/favorite_button.vue +++ b/src/components/favorite_button/favorite_button.vue @@ -1,11 +1,11 @@ diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js index cafa9cbc..ef2f271a 100644 --- a/src/components/retweet_button/retweet_button.js +++ b/src/components/retweet_button/retweet_button.js @@ -2,6 +2,7 @@ const RetweetButton = { props: ['status', 'loggedIn', 'visibility'], data () { return { + hidePostStatsLocal: this.$store.state.config.hidePostStats, animated: false } }, diff --git a/src/components/retweet_button/retweet_button.vue b/src/components/retweet_button/retweet_button.vue index ee5722bd..5b1e64b8 100644 --- a/src/components/retweet_button/retweet_button.vue +++ b/src/components/retweet_button/retweet_button.vue @@ -2,7 +2,7 @@
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index 088e19d3..1dd53ab2 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -10,6 +10,7 @@ const settings = { hideAttachmentsLocal: this.$store.state.config.hideAttachments, hideAttachmentsInConvLocal: this.$store.state.config.hideAttachmentsInConv, hideNsfwLocal: this.$store.state.config.hideNsfw, + hidePostStatsLocal: this.$store.state.config.hidePostStats, hideUserStatsLocal: this.$store.state.config.hideUserStats, notificationVisibilityLocal: this.$store.state.config.notificationVisibility, replyVisibilityLocal: this.$store.state.config.replyVisibility, @@ -48,6 +49,9 @@ const settings = { hideAttachmentsInConvLocal (value) { this.$store.dispatch('setOption', { name: 'hideAttachmentsInConv', value }) }, + hidePostStatsLocal (value) { + this.$store.dispatch('setOption', { name: 'hidePostStats', value }) + }, hideUserStatsLocal (value) { this.$store.dispatch('setOption', { name: 'hideUserStats', value }) }, diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue index 2cf62200..18e8e244 100644 --- a/src/components/settings/settings.vue +++ b/src/components/settings/settings.vue @@ -122,6 +122,10 @@
+
+ + +
diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 42b1dd40..56cc7b49 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -328,6 +328,7 @@ const en = { loop_video_silent_only: 'Loop only videos without sound (i.e. Mastodon\'s "gifs")', reply_link_preview: 'Enable reply-link preview on mouse hover', replies_in_timeline: 'Replies in timeline', + hide_post_stats: 'Hide post statistics (e.g. repeat and favorite counts)', hide_user_stats: 'Hide user statistics (e.g. status and follower counts)', reply_visibility_all: 'Show all replies', reply_visibility_following: 'Only show replies directed at me or users I\'m following', diff --git a/src/main.js b/src/main.js index d05ecba8..132029dc 100644 --- a/src/main.js +++ b/src/main.js @@ -48,6 +48,7 @@ const persistedStateOptions = { 'config.collapseMessageWithSubject', 'config.hideAttachments', 'config.hideAttachmentsInConv', + 'config.hidePostStats', 'config.hideUserStats', 'config.hideNsfw', 'config.replyVisibility', diff --git a/src/modules/config.js b/src/modules/config.js index 24665e95..dae58eb1 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -9,6 +9,7 @@ const defaultState = { collapseMessageWithSubject: false, hideAttachments: false, hideAttachmentsInConv: false, + hidePostStats: false, hideUserStats: false, hideNsfw: true, loopVideo: true, From 699ee0891ddb8d788cff77366ee8ac73eb4b02f9 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 00:48:14 +0100 Subject: [PATCH 03/36] Changeable defaults for hideUserStats and hidePostStats --- src/main.js | 4 ++++ static/config.json | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main.js b/src/main.js index 132029dc..c69ca6c3 100644 --- a/src/main.js +++ b/src/main.js @@ -123,6 +123,8 @@ window.fetch('/api/statusnet/config.json') var scopeOptionsEnabled = (config.scopeOptionsEnabled) var formattingOptionsEnabled = (config.formattingOptionsEnabled) var collapseMessageWithSubject = (config.collapseMessageWithSubject) + var hidePostStats = (config.hidePostStats) + var hideUserStats = (config.hideUserStats) store.dispatch('setOption', { name: 'theme', value: theme }) store.dispatch('setOption', { name: 'background', value: background }) @@ -136,6 +138,8 @@ window.fetch('/api/statusnet/config.json') store.dispatch('setOption', { name: 'scopeOptionsEnabled', value: scopeOptionsEnabled }) store.dispatch('setOption', { name: 'formattingOptionsEnabled', value: formattingOptionsEnabled }) store.dispatch('setOption', { name: 'collapseMessageWithSubject', value: collapseMessageWithSubject }) + store.dispatch('setOption', { name: 'hidePostStats', value: hidePostStats }) + store.dispatch('setOption', { name: 'hideUserStats', value: hideUserStats }) if (chatDisabled) { store.dispatch('disableChat') } diff --git a/static/config.json b/static/config.json index 144fe951..a6eace0f 100644 --- a/static/config.json +++ b/static/config.json @@ -10,5 +10,7 @@ "showInstanceSpecificPanel": false, "scopeOptionsEnabled": false, "formattingOptionsEnabled": false, - "collapseMessageWithSubject": false + "collapseMessageWithSubject": false, + "hidePostStats": false, + "hideUserStats": false } From 5a59eb4efab1aa54000a229694a958e3e1274e8d Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 01:10:22 +0100 Subject: [PATCH 04/36] Don't hide the bio. --- src/components/user_card_content/user_card_content.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 65fd26eb..84669d7f 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -90,8 +90,8 @@
-
-
+
+
{{ $t('user_card.statuses') }}
{{user.statuses_count}}
From 8dc85b057e058a39f968fa188e0d77a5a9dd5ca6 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 01:18:55 +0100 Subject: [PATCH 05/36] Don't only include whitespace conditionally, to fix the fade. --- src/components/user_card_content/user_card_content.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 84669d7f..9ce3ca19 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -94,7 +94,7 @@
{{ $t('user_card.statuses') }}
- {{user.statuses_count}}
+ {{user.statuses_count}}
{{ $t('user_card.followees') }}
@@ -105,6 +105,7 @@ {{user.followers_count}}
+

{{ user.description }}

From 145929207ef9204066b03ab104284168a054b5f0 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 4 Sep 2018 02:00:12 +0100 Subject: [PATCH 06/36] Revert "Don't only include whitespace conditionally, to fix the fade." This reverts commit 8dc85b057e058a39f968fa188e0d77a5a9dd5ca6. --- src/components/user_card_content/user_card_content.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue index 9ce3ca19..84669d7f 100644 --- a/src/components/user_card_content/user_card_content.vue +++ b/src/components/user_card_content/user_card_content.vue @@ -94,7 +94,7 @@
{{ $t('user_card.statuses') }}
- {{user.statuses_count}} + {{user.statuses_count}}
{{ $t('user_card.followees') }}
@@ -105,7 +105,6 @@ {{user.followers_count}}
-

{{ user.description }}

From 11f1bac502c96f2d58274bb2a5dbb6a2930bcb61 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 25 Sep 2018 14:01:01 +0300 Subject: [PATCH 07/36] Less confusing description --- src/i18n/en.json | 2 +- src/i18n/ru.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/en.json b/src/i18n/en.json index 2dc6493e..1f58c43f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -130,7 +130,7 @@ "notification_visibility_likes": "Likes", "notification_visibility_mentions": "Mentions", "notification_visibility_repeats": "Repeats", - "no_rich_text_description": "Disable rich text support", + "no_rich_text_description": "Strip rich text formatting from all posts", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "panelRadius": "Panels", "pause_on_unfocused": "Pause streaming when tab is not focused", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 3a50369a..921bf67e 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -114,6 +114,7 @@ "notification_visibility_likes": "Лайки", "notification_visibility_mentions": "Упоминания", "notification_visibility_repeats": "Повторы", + "no_rich_text_description": "Убрать форматирование из всех постов", "nsfw_clickthrough": "Включить скрытие NSFW вложений", "panelRadius": "Панели", "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе", From 0beba08618e39a1301a51fc5750f65f169baae29 Mon Sep 17 00:00:00 2001 From: fadelkon Date: Tue, 2 Oct 2018 20:31:02 +0200 Subject: [PATCH 08/36] Add placeholder catalan translation file to be able to see the work in progress in further commits --- src/i18n/ca.json | 199 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 199 insertions(+) create mode 100644 src/i18n/ca.json diff --git a/src/i18n/ca.json b/src/i18n/ca.json new file mode 100644 index 00000000..b3cb6598 --- /dev/null +++ b/src/i18n/ca.json @@ -0,0 +1,199 @@ +{ + "chat": { + "title": "Chat" + }, + "features_panel": { + "chat": "Chat", + "gopher": "Gopher", + "media_proxy": "Media proxy", + "scope_options": "Scope options", + "text_limit": "Text limit", + "title": "Features", + "who_to_follow": "Who to follow" + }, + "finder": { + "error_fetching_user": "Error fetching user", + "find_user": "Find user" + }, + "general": { + "apply": "Apply", + "submit": "Submit" + }, + "login": { + "login": "Log in", + "logout": "Log out", + "password": "Password", + "placeholder": "e.g. lain", + "register": "Register", + "username": "Username" + }, + "nav": { + "chat": "Local Chat", + "friend_requests": "Follow Requests", + "mentions": "Mentions", + "public_tl": "Public Timeline", + "timeline": "Timeline", + "twkn": "The Whole Known Network" + }, + "notifications": { + "broken_favorite": "Unknown status, searching for it...", + "favorited_you": "favorited your status", + "followed_you": "followed you", + "load_older": "Load older notifications", + "notifications": "Notifications", + "read": "Read!", + "repeated_you": "repeated your status" + }, + "post_status": { + "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.", + "account_not_locked_warning_link": "locked", + "attachments_sensitive": "Mark attachments as sensitive", + "content_type": { + "plain_text": "Plain text" + }, + "content_warning": "Subject (optional)", + "default": "Just landed in L.A.", + "direct_warning": "This post will only be visible to all the mentioned users.", + "posting": "Posting", + "scope": { + "direct": "Direct - Post to mentioned users only", + "private": "Followers-only - Post to followers only", + "public": "Public - Post to public timelines", + "unlisted": "Unlisted - Do not post to public timelines" + } + }, + "registration": { + "bio": "Bio", + "email": "Email", + "fullname": "Display name", + "password_confirm": "Password confirmation", + "registration": "Registration", + "token": "Invite token" + }, + "settings": { + "attachmentRadius": "Attachments", + "attachments": "Attachments", + "autoload": "Enable automatic loading when scrolled to the bottom", + "avatar": "Avatar", + "avatarAltRadius": "Avatars (Notifications)", + "avatarRadius": "Avatars", + "background": "Background", + "bio": "Bio", + "btnRadius": "Buttons", + "cBlue": "Blue (Reply, follow)", + "cGreen": "Green (Retweet)", + "cOrange": "Orange (Favorite)", + "cRed": "Red (Cancel)", + "change_password": "Change Password", + "change_password_error": "There was an issue changing your password.", + "changed_password": "Password changed successfully!", + "collapse_subject": "Collapse posts with subjects", + "confirm_new_password": "Confirm new password", + "current_avatar": "Your current avatar", + "current_password": "Current password", + "current_profile_banner": "Your current profile banner", + "data_import_export_tab": "Data Import / Export", + "default_vis": "Default visibility scope", + "delete_account": "Delete Account", + "delete_account_description": "Permanently delete your account and all your messages.", + "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.", + "delete_account_instructions": "Type your password in the input below to confirm account deletion.", + "export_theme": "Save preset", + "filtering": "Filtering", + "filtering_explanation": "All statuses containing these words will be muted, one per line", + "follow_export": "Follow export", + "follow_export_button": "Export your follows to a csv file", + "follow_export_processing": "Processing, you'll soon be asked to download your file", + "follow_import": "Follow import", + "follow_import_error": "Error importing followers", + "follows_imported": "Follows imported! Processing them will take a while.", + "foreground": "Foreground", + "general": "General", + "hide_attachments_in_convo": "Hide attachments in conversations", + "hide_attachments_in_tl": "Hide attachments in timeline", + "import_followers_from_a_csv_file": "Import follows from a csv file", + "import_theme": "Load preset", + "inputRadius": "Input fields", + "instance_default": "(default: {value})", + "interfaceLanguage": "Interface language", + "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", + "limited_availability": "Unavailable in your browser", + "links": "Links", + "lock_account_description": "Restrict your account to approved followers only", + "loop_video": "Loop videos", + "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")", + "name": "Name", + "name_bio": "Name & Bio", + "new_password": "New password", + "notification_visibility": "Types of notifications to show", + "notification_visibility_follows": "Follows", + "notification_visibility_likes": "Likes", + "notification_visibility_mentions": "Mentions", + "notification_visibility_repeats": "Repeats", + "no_rich_text_description": "Strip rich text formatting from all posts", + "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", + "panelRadius": "Panels", + "pause_on_unfocused": "Pause streaming when tab is not focused", + "presets": "Presets", + "profile_background": "Profile Background", + "profile_banner": "Profile Banner", + "profile_tab": "Profile", + "radii_help": "Set up interface edge rounding (in pixels)", + "replies_in_timeline": "Replies in timeline", + "reply_link_preview": "Enable reply-link preview on mouse hover", + "reply_visibility_all": "Show all replies", + "reply_visibility_following": "Only show replies directed at me or users I'm following", + "reply_visibility_self": "Only show replies directed at me", + "saving_err": "Error saving settings", + "saving_ok": "Settings saved", + "security_tab": "Security", + "set_new_avatar": "Set new avatar", + "set_new_profile_background": "Set new profile background", + "set_new_profile_banner": "Set new profile banner", + "settings": "Settings", + "stop_gifs": "Play-on-hover GIFs", + "streaming": "Enable automatic streaming of new posts when scrolled to the top", + "text": "Text", + "theme": "Theme", + "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.", + "tooltipRadius": "Tooltips/alerts", + "user_settings": "User Settings", + "values": { + "false": "no", + "true": "yes" + } + }, + "timeline": { + "collapse": "Collapse", + "conversation": "Conversation", + "error_fetching": "Error fetching updates", + "load_older": "Load older statuses", + "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated", + "repeated": "repeated", + "show_new": "Show new", + "up_to_date": "Up-to-date" + }, + "user_card": { + "approve": "Approve", + "block": "Block", + "blocked": "Blocked!", + "deny": "Deny", + "follow": "Follow", + "followees": "Following", + "followers": "Followers", + "following": "Following!", + "follows_you": "Follows you!", + "mute": "Mute", + "muted": "Muted", + "per_day": "per day", + "remote_follow": "Remote follow", + "statuses": "Statuses" + }, + "user_profile": { + "timeline_title": "User Timeline" + }, + "who_to_follow": { + "more": "More", + "who_to_follow": "Who to follow" + } +} From f8323b72aef2a4cbcb9edb162ea7f13ea56a3271 Mon Sep 17 00:00:00 2001 From: fadelkon Date: Tue, 2 Oct 2018 20:33:07 +0200 Subject: [PATCH 09/36] Translate some strings to catalan. Most part of block "settings" is not translated yet --- src/i18n/ca.json | 166 +++++++++++++++++++++++------------------------ 1 file changed, 83 insertions(+), 83 deletions(-) diff --git a/src/i18n/ca.json b/src/i18n/ca.json index b3cb6598..98e8fe41 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -1,90 +1,90 @@ { "chat": { - "title": "Chat" + "title": "Xat" }, "features_panel": { - "chat": "Chat", + "chat": "Xat", "gopher": "Gopher", - "media_proxy": "Media proxy", - "scope_options": "Scope options", - "text_limit": "Text limit", - "title": "Features", - "who_to_follow": "Who to follow" + "media_proxy": "Proxy per multimèdia", + "scope_options": "Opcions d'àbast", + "text_limit": "Límit de text", + "title": "Funcionalitats", + "who_to_follow": "A qui seguir" }, "finder": { - "error_fetching_user": "Error fetching user", + "error_fetching_user": "Hi ha hagut un error en carregar l'usuari/a", "find_user": "Find user" }, "general": { - "apply": "Apply", - "submit": "Submit" + "apply": "Aplica", + "submit": "Desa" }, "login": { - "login": "Log in", - "logout": "Log out", - "password": "Password", - "placeholder": "e.g. lain", - "register": "Register", - "username": "Username" + "login": "Inicia sessió", + "logout": "Tanca la sessió", + "password": "Contrasenya", + "placeholder": "p.ex.: Maria", + "register": "Registra't", + "username": "Nom d'usuari/a" }, "nav": { - "chat": "Local Chat", + "chat": "Xat local públic", "friend_requests": "Follow Requests", - "mentions": "Mentions", - "public_tl": "Public Timeline", - "timeline": "Timeline", - "twkn": "The Whole Known Network" + "mentions": "Mencions", + "public_tl": "Flux públic del node", + "timeline": "Flux personal", + "twkn": "Tota la xarxa coneguda" }, "notifications": { - "broken_favorite": "Unknown status, searching for it...", - "favorited_you": "favorited your status", - "followed_you": "followed you", - "load_older": "Load older notifications", - "notifications": "Notifications", + "broken_favorite": "No es coneix aquest estat. S'està cercant.", + "favorited_you": "ha marcat un estat teu", + "followed_you": "ha començat a seguir-te", + "load_older": "Carrega més notificacions", + "notifications": "Notificacions", "read": "Read!", - "repeated_you": "repeated your status" + "repeated_you": "ha repetit el teu estat" }, "post_status": { - "account_not_locked_warning": "Your account is not {0}. Anyone can follow you to view your follower-only posts.", - "account_not_locked_warning_link": "locked", - "attachments_sensitive": "Mark attachments as sensitive", + "account_not_locked_warning": "El teu compte no està {0}. Qualsevol persona pot seguir-te per llegir les teves entrades reservades només a seguidores.", + "account_not_locked_warning_link": "bloquejat", + "attachments_sensitive": "Marca l'adjunt com a delicat", "content_type": { - "plain_text": "Plain text" + "plain_text": "Text pla" }, - "content_warning": "Subject (optional)", - "default": "Just landed in L.A.", - "direct_warning": "This post will only be visible to all the mentioned users.", - "posting": "Posting", + "content_warning": "Assumpte (opcional)", + "default": "Em sento", + "direct_warning": "Aquesta entrada només serà visible per les usuràries que etiquetis", + "posting": "Publicació", "scope": { - "direct": "Direct - Post to mentioned users only", - "private": "Followers-only - Post to followers only", - "public": "Public - Post to public timelines", - "unlisted": "Unlisted - Do not post to public timelines" + "direct": "Directa - Publica només per les usuàries etiquetades", + "private": "Només seguidors/es - Publica només per comptes que et segueixin", + "public": "Pública - Publica als fluxos públics", + "unlisted": "Silenciosa - No la mostris en fluxos públics" } }, "registration": { - "bio": "Bio", - "email": "Email", - "fullname": "Display name", - "password_confirm": "Password confirmation", - "registration": "Registration", - "token": "Invite token" + "bio": "Sobre mi", + "email": "Correu", + "fullname": "Nom per mostrar", + "password_confirm": "Confirma la contrasenya", + "registration": "Registra't", + "token": "Codi d'invitació" }, "settings": { - "attachmentRadius": "Attachments", - "attachments": "Attachments", - "autoload": "Enable automatic loading when scrolled to the bottom", + "attachmentRadius": "Adjunts", + "attachments": "Adjunts", + "autoload": "Recarrega automàticament en arribar a sota de tot.", "avatar": "Avatar", - "avatarAltRadius": "Avatars (Notifications)", + "avatarAltRadius": "Avatars (notificacions)", "avatarRadius": "Avatars", - "background": "Background", - "bio": "Bio", - "btnRadius": "Buttons", - "cBlue": "Blue (Reply, follow)", - "cGreen": "Green (Retweet)", - "cOrange": "Orange (Favorite)", - "cRed": "Red (Cancel)", - "change_password": "Change Password", + "background": "Imatge de fons", + "bio": "Sobre l'usuària", + "btnRadius": "Botons", + "cBlue": "Blau (Respon, segueix)", + "cGreen": "Verd (Republica)", + "cOrange": "Taronja (Marca com a preferit)", + "cRed": "Red (Canceŀla", + "change_password": "Chanvia la contrasenya", "change_password_error": "There was an issue changing your password.", "changed_password": "Password changed successfully!", "collapse_subject": "Collapse posts with subjects", @@ -157,43 +157,43 @@ "theme": "Theme", "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.", "tooltipRadius": "Tooltips/alerts", - "user_settings": "User Settings", + "user_settings": "Configuració personal", "values": { "false": "no", - "true": "yes" + "true": "sí" } }, "timeline": { - "collapse": "Collapse", - "conversation": "Conversation", - "error_fetching": "Error fetching updates", - "load_older": "Load older statuses", - "no_retweet_hint": "Post is marked as followers-only or direct and cannot be repeated", - "repeated": "repeated", - "show_new": "Show new", - "up_to_date": "Up-to-date" + "collapse": "Amaga", + "conversation": "Conversa", + "error_fetching": "S'ha produït un error en carregar els estats", + "load_older": "Carrera estats anteriors", + "no_retweet_hint": "L'entrada és només per a seguidores o \"directa\" i no es pot republicar", + "repeated": "repetit", + "show_new": "Mostra els nous", + "up_to_date": "Actualitzat" }, "user_card": { - "approve": "Approve", - "block": "Block", - "blocked": "Blocked!", - "deny": "Deny", - "follow": "Follow", - "followees": "Following", - "followers": "Followers", - "following": "Following!", - "follows_you": "Follows you!", - "mute": "Mute", - "muted": "Muted", - "per_day": "per day", - "remote_follow": "Remote follow", - "statuses": "Statuses" + "approve": "Aprova", + "block": "Bloqueja", + "blocked": "Bloquejat!", + "deny": "Denega", + "follow": "Segueix", + "followees": "Segueixo", + "followers": "Seguidors/es", + "following": "Seguint!", + "follows_you": "Et segueix!", + "mute": "Silencia", + "muted": "Silenciat", + "per_day": "per dia", + "remote_follow": "Seguiment remot", + "statuses": "Estats" }, "user_profile": { - "timeline_title": "User Timeline" + "timeline_title": "Flux personal" }, "who_to_follow": { "more": "More", - "who_to_follow": "Who to follow" + "who_to_follow": "A qui seguir" } } From 59dec1b43f5465f484a0afea95a411a705dcb29e Mon Sep 17 00:00:00 2001 From: fadelkon Date: Sat, 13 Oct 2018 18:17:00 +0200 Subject: [PATCH 10/36] =?UTF-8?q?Finish=20general=20and=20timeago=20catala?= =?UTF-8?q?n=20strings.=20Glossary:=20*=20bio:=20presentaci=C3=B3=20*=20ti?= =?UTF-8?q?meline:=20flux=20[d'entrades]=20*=20post/status:=20entrada=20*?= =?UTF-8?q?=20settings:=20configuraci=C3=B3=20*=20user:=20usuari/a=20*=20u?= =?UTF-8?q?sers:=20usu=C3=A0ries=20*=20background:=20fons=20de=20pantalla?= =?UTF-8?q?=20*=20banner:=20fons=20de=20perfil=20*=20follower:=20seguidor/?= =?UTF-8?q?a=20*=20follow:=20contacte/a=20qui=20segueixo=20*=20avatar:=20a?= =?UTF-8?q?vatar=20*=20[visibility]=20scope:=20abast=20de=20la=20publicaci?= =?UTF-8?q?=C3=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translation based on https://www.softcatala.org/guia-estil-de-softcatala/convencions-de-format/ and http://www.termcat.cat/ca/Cercaterm/ . --- src/i18n/ca.json | 170 ++++++++++++++++++++--------------------- static/timeago-ca.json | 10 +++ 2 files changed, 95 insertions(+), 85 deletions(-) create mode 100644 static/timeago-ca.json diff --git a/src/i18n/ca.json b/src/i18n/ca.json index 98e8fe41..d4224691 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -6,13 +6,13 @@ "chat": "Xat", "gopher": "Gopher", "media_proxy": "Proxy per multimèdia", - "scope_options": "Opcions d'àbast", + "scope_options": "Opcions d'abast i visibilitat", "text_limit": "Límit de text", "title": "Funcionalitats", "who_to_follow": "A qui seguir" }, "finder": { - "error_fetching_user": "Hi ha hagut un error en carregar l'usuari/a", + "error_fetching_user": "No s'ha pogut carregar l'usuari/a", "find_user": "Find user" }, "general": { @@ -29,11 +29,11 @@ }, "nav": { "chat": "Xat local públic", - "friend_requests": "Follow Requests", + "friend_requests": "Soŀlicituds de connexió", "mentions": "Mencions", "public_tl": "Flux públic del node", "timeline": "Flux personal", - "twkn": "Tota la xarxa coneguda" + "twkn": "Flux de la xarxa coneguda" }, "notifications": { "broken_favorite": "No es coneix aquest estat. S'està cercant.", @@ -75,88 +75,88 @@ "attachments": "Adjunts", "autoload": "Recarrega automàticament en arribar a sota de tot.", "avatar": "Avatar", - "avatarAltRadius": "Avatars (notificacions)", + "avatarAltRadius": "Avatars en les notificacions", "avatarRadius": "Avatars", - "background": "Imatge de fons", - "bio": "Sobre l'usuària", + "background": "Fons de pantalla", + "bio": "Sobre l'usuari/a", "btnRadius": "Botons", - "cBlue": "Blau (Respon, segueix)", - "cGreen": "Verd (Republica)", - "cOrange": "Taronja (Marca com a preferit)", - "cRed": "Red (Canceŀla", - "change_password": "Chanvia la contrasenya", - "change_password_error": "There was an issue changing your password.", - "changed_password": "Password changed successfully!", - "collapse_subject": "Collapse posts with subjects", - "confirm_new_password": "Confirm new password", - "current_avatar": "Your current avatar", - "current_password": "Current password", - "current_profile_banner": "Your current profile banner", - "data_import_export_tab": "Data Import / Export", - "default_vis": "Default visibility scope", - "delete_account": "Delete Account", - "delete_account_description": "Permanently delete your account and all your messages.", - "delete_account_error": "There was an issue deleting your account. If this persists please contact your instance administrator.", - "delete_account_instructions": "Type your password in the input below to confirm account deletion.", - "export_theme": "Save preset", - "filtering": "Filtering", - "filtering_explanation": "All statuses containing these words will be muted, one per line", - "follow_export": "Follow export", - "follow_export_button": "Export your follows to a csv file", - "follow_export_processing": "Processing, you'll soon be asked to download your file", - "follow_import": "Follow import", - "follow_import_error": "Error importing followers", - "follows_imported": "Follows imported! Processing them will take a while.", - "foreground": "Foreground", + "cBlue": "Blau (respon, segueix)", + "cGreen": "Verd (republica)", + "cOrange": "Taronja (marca com a preferit)", + "cRed": "Vermell (canceŀla)", + "change_password": "Canvia la contrasenya", + "change_password_error": "No s'ha pogut canviar la contrasenya", + "changed_password": "S'ha canviat la contrasenya", + "collapse_subject": "Replega les entrades amb títol", + "confirm_new_password": "Confirma la nova contrasenya", + "current_avatar": "L'avatar actual", + "current_password": "La contrasenya actual", + "current_profile_banner": "El fons de perfil actual", + "data_import_export_tab": "Importa o exporta dades", + "default_vis": "Abast per defecte de les entrades", + "delete_account": "Esborra el compte", + "delete_account_description": "Esborra permanentment el teu compte i tots els missatges", + "delete_account_error": "No s'ha pogut esborrar el compte. Si continua el problema, contacta amb l'administració del node", + "delete_account_instructions": "Confirma que vols esborrar el compte escrivint la teva contrasenya aquí sota", + "export_theme": "Desa el tema", + "filtering": "Filtres", + "filtering_explanation": "Es silenciaran totes les entrades que continguin aquestes paraules. Separa-les per línies", + "follow_export": "Exporta la llista de contactes", + "follow_export_button": "Exporta tots els comptes que segueixes a un fitxer CSV", + "follow_export_processing": "S'està processant la petició. Aviat podràs descarregar el fitxer", + "follow_import": "Importa els contactes", + "follow_import_error": "No s'ha pogut importar els contactes", + "follows_imported": "S'han importat els contactes. Trigaran una estoneta en ser processats.", + "foreground": "Primer pla", "general": "General", - "hide_attachments_in_convo": "Hide attachments in conversations", - "hide_attachments_in_tl": "Hide attachments in timeline", - "import_followers_from_a_csv_file": "Import follows from a csv file", - "import_theme": "Load preset", - "inputRadius": "Input fields", + "hide_attachments_in_convo": "Amaga els adjunts en les converses", + "hide_attachments_in_tl": "Amaga els adjunts en el flux d'entrades", + "import_followers_from_a_csv_file": "Importa els contactes des d'un fitxer CSV", + "import_theme": "Carrega un tema", + "inputRadius": "Caixes d'entrada de text", "instance_default": "(default: {value})", - "interfaceLanguage": "Interface language", - "invalid_theme_imported": "The selected file is not a supported Pleroma theme. No changes to your theme were made.", - "limited_availability": "Unavailable in your browser", - "links": "Links", - "lock_account_description": "Restrict your account to approved followers only", - "loop_video": "Loop videos", - "loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")", - "name": "Name", - "name_bio": "Name & Bio", - "new_password": "New password", - "notification_visibility": "Types of notifications to show", - "notification_visibility_follows": "Follows", - "notification_visibility_likes": "Likes", - "notification_visibility_mentions": "Mentions", - "notification_visibility_repeats": "Repeats", - "no_rich_text_description": "Strip rich text formatting from all posts", - "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", - "panelRadius": "Panels", - "pause_on_unfocused": "Pause streaming when tab is not focused", - "presets": "Presets", - "profile_background": "Profile Background", - "profile_banner": "Profile Banner", - "profile_tab": "Profile", - "radii_help": "Set up interface edge rounding (in pixels)", + "interfaceLanguage": "Llengua de la interfície", + "invalid_theme_imported": "No s'ha entès l'arxiu carregat perquè no és un tema vàlid de Pleroma. No s'ha fet cap canvi als temes actuals.", + "limited_availability": "No està disponible en aquest navegador", + "links": "Enllaços", + "lock_account_description": "Restringeix el teu compte només a seguidores aprovades.", + "loop_video": "Reprodueix els vídeos en bucle", + "loop_video_silent_only": "Reprodueix en bucles només els vídeos sense so (com els \"GIF\" de Mastodon)", + "name": "Nom", + "name_bio": "Nom i presentació", + "new_password": "Contrasenya nova", + "notification_visibility": "Notifica'm quan algú", + "notification_visibility_follows": "Comença a seguir-me", + "notification_visibility_likes": "Marca com a preferida una entrada meva", + "notification_visibility_mentions": "Em menciona", + "notification_visibility_repeats": "Republica una entrada meva", + "no_rich_text_description": "Neteja el formatat de text de totes les entrades", + "nsfw_clickthrough": "Amaga el contingut NSFW darrer d'una imatge clicable", + "panelRadius": "Panells", + "pause_on_unfocused": "Pausa la reproducció en continu quan la pestanya perdi el focus", + "presets": "Temes", + "profile_background": "Fons de pantalla", + "profile_banner": "Fons de perfil", + "profile_tab": "Perfil", + "radii_help": "Configura l'arrodoniment de les vores (en píxels)", "replies_in_timeline": "Replies in timeline", - "reply_link_preview": "Enable reply-link preview on mouse hover", - "reply_visibility_all": "Show all replies", - "reply_visibility_following": "Only show replies directed at me or users I'm following", - "reply_visibility_self": "Only show replies directed at me", - "saving_err": "Error saving settings", - "saving_ok": "Settings saved", - "security_tab": "Security", - "set_new_avatar": "Set new avatar", - "set_new_profile_background": "Set new profile background", - "set_new_profile_banner": "Set new profile banner", - "settings": "Settings", - "stop_gifs": "Play-on-hover GIFs", - "streaming": "Enable automatic streaming of new posts when scrolled to the top", + "reply_link_preview": "Mostra el missatge citat en passar el ratolí per sobre de l'enllaç de resposta", + "reply_visibility_all": "Mostra totes les respostes", + "reply_visibility_following": "Mostra només les respostes a entrades meves o d'usuàries que jo segueixo", + "reply_visibility_self": "Mostra només les respostes a entrades meves", + "saving_err": "No s'ha pogut desar la configuració", + "saving_ok": "S'ha desat la configuració", + "security_tab": "Seguretat", + "set_new_avatar": "Canvia l'avatar", + "set_new_profile_background": "Canvia el fons de pantalla", + "set_new_profile_banner": "Canvia el fons del perfil", + "settings": "Configuració", + "stop_gifs": "Anima els GIF només en passar-hi el ratolí per sobre", + "streaming": "Carrega automàticament entrades noves quan estigui a dalt de tot", "text": "Text", - "theme": "Theme", - "theme_help": "Use hex color codes (#rrggbb) to customize your color theme.", - "tooltipRadius": "Tooltips/alerts", + "theme": "Tema", + "theme_help": "Personalitza els colors del tema. Escriu-los en format RGB hexadecimal (#rrggbb)", + "tooltipRadius": "Missatges sobreposats", "user_settings": "Configuració personal", "values": { "false": "no", @@ -164,12 +164,12 @@ } }, "timeline": { - "collapse": "Amaga", + "collapse": "Replega", "conversation": "Conversa", - "error_fetching": "S'ha produït un error en carregar els estats", - "load_older": "Carrera estats anteriors", - "no_retweet_hint": "L'entrada és només per a seguidores o \"directa\" i no es pot republicar", - "repeated": "repetit", + "error_fetching": "S'ha produït un error en carregar les entrades", + "load_older": "Carrega entrades anteriors", + "no_retweet_hint": "L'entrada és només per a seguidores o és \"directa\", i per tant no es pot republicar", + "repeated": "republicat", "show_new": "Mostra els nous", "up_to_date": "Actualitzat" }, diff --git a/static/timeago-ca.json b/static/timeago-ca.json new file mode 100644 index 00000000..d6fca3be --- /dev/null +++ b/static/timeago-ca.json @@ -0,0 +1,10 @@ +[ + "ara mateix", + ["fa %ss", "fa %ss"], + ["fa %smin","fa %smin"], + ["fa %sh", "fa %sh"], + ["fa %sd", "fa %sd"], + ["fa %sw", "fa %sw"], + ["fa %smo", "fa %smo"], + ["fa %sy", "fa %sy"] +] From 7c4790d1bc730ffaf5f36c2425516878cef544c9 Mon Sep 17 00:00:00 2001 From: morguldir Date: Sun, 14 Oct 2018 06:22:04 +0200 Subject: [PATCH 11/36] Update norwegian translation --- src/i18n/nb.json | 98 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 9 deletions(-) diff --git a/src/i18n/nb.json b/src/i18n/nb.json index a95879b7..0f4dca58 100644 --- a/src/i18n/nb.json +++ b/src/i18n/nb.json @@ -1,6 +1,15 @@ { "chat": { - "title": "Chat" + "title": "Nettprat" + }, + "features_panel": { + "chat": "Nettprat", + "gopher": "Gopher", + "media_proxy": "Media proxy", + "scope_options": "Velg mottakere", + "text_limit": "Tekst-grense", + "title": "Egenskaper", + "who_to_follow": "Hvem å følge" }, "finder": { "error_fetching_user": "Feil ved henting av bruker", @@ -8,7 +17,7 @@ }, "general": { "apply": "Bruk", - "submit": "Legg ut" + "submit": "Send" }, "login": { "login": "Logg inn", @@ -19,29 +28,47 @@ "username": "Brukernavn" }, "nav": { - "chat": "Lokal Chat", + "chat": "Lokal nettprat", + "friend_requests": "Følgeforespørsler", "mentions": "Nevnt", "public_tl": "Offentlig Tidslinje", "timeline": "Tidslinje", "twkn": "Det hele kjente nettverket" }, "notifications": { + "broken_favorite": "Ukjent status, leter etter den...", "favorited_you": "likte din status", "followed_you": "fulgte deg", + "load_older": "Last eldre varsler", "notifications": "Varslinger", "read": "Les!", "repeated_you": "Gjentok din status" }, "post_status": { + "account_not_locked_warning": "Kontoen din er ikke {0}. Hvem som helst kan følge deg for å se dine statuser til følgere", + "account_not_locked_warning_link": "låst", + "attachments_sensitive": "Merk vedlegg som sensitive", + "content_type": { + "plain_text": "Klar tekst" + }, + "content_warning": "Tema (valgfritt)", "default": "Landet akkurat i L.A.", - "posting": "Publiserer" + "direct_warning": "Denne statusen vil kun bli sett av nevnte brukere", + "posting": "Publiserer", + "scope": { + "direct": "Direkte, publiser bare til nevnte brukere", + "private": "Bare følgere, publiser bare til brukere som følger deg", + "public": "Offentlig, publiser til offentlige tidslinjer", + "unlisted": "Uoppført, ikke publiser til offentlige tidslinjer" + } }, "registration": { "bio": "Biografi", "email": "Epost-adresse", "fullname": "Visningsnavn", "password_confirm": "Bekreft passord", - "registration": "Registrering" + "registration": "Registrering", + "token": "Invitasjons-bevis" }, "settings": { "attachmentRadius": "Vedlegg", @@ -57,27 +84,69 @@ "cGreen": "Grønn (Gjenta)", "cOrange": "Oransje (Lik)", "cRed": "Rød (Avbryt)", + "change_password": "Endre passord", + "change_password_error": "Feil ved endring av passord", + "changed_password": "Passord endret", + "collapse_subject": "Sammenfold statuser med tema", + "confirm_new_password": "Bekreft nytt passord", "current_avatar": "Ditt nåværende profilbilde", + "current_password": "Nåværende passord", "current_profile_banner": "Din nåværende profil-banner", + "data_import_export_tab": "Data import / eksport", + "default_vis": "Standard visnings-omfang", + "delete_account": "Slett konto", + "delete_account_description": "Slett din konto og alle dine statuser", + "delete_account_error": "Det oppsto et problem ved sletting av kontoen din, hvis dette problemet forblir kontakt din administrator", + "delete_account_instructions": "Skriv inn ditt passord i feltet nedenfor for å bekrefte sletting av konto", + "export_theme": "Lagre tema", "filtering": "Filtrering", "filtering_explanation": "Alle statuser som inneholder disse ordene vil bli dempet, en kombinasjon av tegn per linje", + "follow_export": "Eksporter følginger", + "follow_export_button": "Eksporter følgingene dine til en .csv fil", + "follow_export_processing": "Jobber, du vil snart bli spurt om å laste ned filen din.", "follow_import": "Importer følginger", "follow_import_error": "Feil ved importering av følginger.", - "follows_imported": "Følginger imported! Det vil ta litt tid å behandle de.", - "foreground": "Framgrunn", + "follows_imported": "Følginger importert! Behandling vil ta litt tid.", + "foreground": "Forgrunn", + "general": "Generell", "hide_attachments_in_convo": "Gjem vedlegg i samtaler", "hide_attachments_in_tl": "Gjem vedlegg på tidslinje", "import_followers_from_a_csv_file": "Importer følginger fra en csv fil", + "import_theme": "Last tema", + "inputRadius": "Input felt", + "instance_default": "(standard: {value})", + "interfaceLanguage": "Grensesnitt-språk", + "invalid_theme_imported": "Den valgte filen er ikke ett støttet Pleroma-tema, ingen endringer til ditt tema ble gjort", + "limited_availability": "Ikke tilgjengelig i din nettleser", "links": "Linker", + "lock_account_description": "Begrens din konto til bare godkjente følgere", + "loop_video": "Gjenta videoer", + "loop_video_silent_only": "Gjenta bare videoer uten lyd, (for eksempel Mastodon sine \"gifs\")", "name": "Navn", "name_bio": "Navn & Biografi", + "new_password": "Nytt passord", + "notification_visibility": "Typer varsler som skal vises", + "notification_visibility_follows": "Følginger", + "notification_visibility_likes": "Likes", + "notification_visibility_mentions": "Nevnt", + "notification_visibility_repeats": "Gjentakelser", + "no_rich_text_description": "Fjern all formatering fra statuser", "nsfw_clickthrough": "Krev trykk for å vise statuser som kan være upassende", "panelRadius": "Panel", - "presets": "Forhåndsdefinerte fargekoder", + "pause_on_unfocused": "Stopp henting av poster når vinduet ikke er i fokus", + "presets": "Forhåndsdefinerte tema", "profile_background": "Profil-bakgrunn", "profile_banner": "Profil-banner", + "profile_tab": "Profil", "radii_help": "Bestem hvor runde hjørnene i brukergrensesnittet skal være (i piksler)", + "replies_in_timeline": "Svar på tidslinje", "reply_link_preview": "Vis en forhåndsvisning når du holder musen over svar til en status", + "reply_visibility_all": "Vis alle svar", + "reply_visibility_following": "Vis bare svar som er til meg eller folk jeg følger", + "reply_visibility_self": "Vis bare svar som er til meg", + "saving_err": "Feil ved lagring av innstillinger", + "saving_ok": "Innstillinger lagret", + "security_tab": "Sikkerhet", "set_new_avatar": "Rediger profilbilde", "set_new_profile_background": "Rediger profil-bakgrunn", "set_new_profile_banner": "Sett ny profil-banner", @@ -88,20 +157,27 @@ "theme": "Tema", "theme_help": "Bruk heksadesimale fargekoder (#rrggbb) til å endre farge-temaet ditt.", "tooltipRadius": "Verktøytips/advarsler", - "user_settings": "Brukerinstillinger" + "user_settings": "Brukerinstillinger", + "values": { + "false": "nei", + "true": "ja" + } }, "timeline": { "collapse": "Sammenfold", "conversation": "Samtale", "error_fetching": "Feil ved henting av oppdateringer", "load_older": "Last eldre statuser", + "no_retweet_hint": "Status er markert som bare til følgere eller direkte og kan ikke gjentas", "repeated": "gjentok", "show_new": "Vis nye", "up_to_date": "Oppdatert" }, "user_card": { + "approve": "Godkjenn", "block": "Blokker", "blocked": "Blokkert!", + "deny": "Avslå", "follow": "Følg", "followees": "Følger", "followers": "Følgere", @@ -115,5 +191,9 @@ }, "user_profile": { "timeline_title": "Bruker-tidslinje" + }, + "who_to_follow": { + "more": "Mer", + "who_to_follow": "Hvem å følge" } } From 0c2f4b925ebda9ce9d172c9ec26e16d88bcff95f Mon Sep 17 00:00:00 2001 From: fadelkon Date: Sun, 14 Oct 2018 11:25:20 +0200 Subject: [PATCH 12/36] Add catalan require to messages.js --- src/i18n/messages.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 3a2da643..6e304ccd 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -23,7 +23,8 @@ const messages = { pt: require('./pt.json'), ru: require('./ru.json'), nb: require('./nb.json'), - he: require('./he.json') + he: require('./he.json'), + ca: require('./ca.json') } export default messages From 2bb663f0f6925082087ec08c4a28ab9e661bae96 Mon Sep 17 00:00:00 2001 From: scarlett Date: Tue, 16 Oct 2018 14:15:04 +0100 Subject: [PATCH 13/36] satisfy lint --- src/components/favorite_button/favorite_button.js | 2 +- src/components/retweet_button/retweet_button.js | 2 +- src/components/settings/settings.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/favorite_button/favorite_button.js b/src/components/favorite_button/favorite_button.js index 1621341e..a2b4cb65 100644 --- a/src/components/favorite_button/favorite_button.js +++ b/src/components/favorite_button/favorite_button.js @@ -2,7 +2,7 @@ const FavoriteButton = { props: ['status', 'loggedIn'], data () { return { - hidePostStatsLocal: typeof this.$store.state.config.hidePostStats == 'undefined' + hidePostStatsLocal: typeof this.$store.state.config.hidePostStats === 'undefined' ? this.$store.state.instance.hidePostStats : this.$store.state.config.hidePostStats, animated: false diff --git a/src/components/retweet_button/retweet_button.js b/src/components/retweet_button/retweet_button.js index 1527afc8..eb4e4b41 100644 --- a/src/components/retweet_button/retweet_button.js +++ b/src/components/retweet_button/retweet_button.js @@ -2,7 +2,7 @@ const RetweetButton = { props: ['status', 'loggedIn', 'visibility'], data () { return { - hidePostStatsLocal: typeof this.$store.state.config.hidePostStats == 'undefined' + hidePostStatsLocal: typeof this.$store.state.config.hidePostStats === 'undefined' ? this.$store.state.instance.hidePostStats : this.$store.state.config.hidePostStats, animated: false diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js index fe8a2d9e..67110841 100644 --- a/src/components/settings/settings.js +++ b/src/components/settings/settings.js @@ -16,11 +16,11 @@ const settings = { hidePostStatsLocal: typeof user.hidePostStats === 'undefined' ? instance.hidePostStats : user.hidePostStats, - hidePostStatsDefault : this.$t('settings.values.' + instance.hidePostStats), + hidePostStatsDefault: this.$t('settings.values.' + instance.hidePostStats), hideUserStatsLocal: typeof user.hideUserStats === 'undefined' ? instance.hideUserStats : user.hideUserStats, - hideUserStatsDefault : this.$t('settings.values.' + instance.hideUserStats), + hideUserStatsDefault: this.$t('settings.values.' + instance.hideUserStats), notificationVisibilityLocal: user.notificationVisibility, replyVisibilityLocal: user.replyVisibility, loopVideoLocal: user.loopVideo, From bf3e3f8b9acf2d2bd3452894dac4df7ca6ce3605 Mon Sep 17 00:00:00 2001 From: fadelkon Date: Tue, 16 Oct 2018 18:11:49 +0200 Subject: [PATCH 14/36] Translate not only timeago prefix, but time units. Make consistent the translation for "bio" and add ellipsis to the default status text. --- src/i18n/ca.json | 6 +++--- static/timeago-ca.json | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/ca.json b/src/i18n/ca.json index d4224691..fa517e22 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -52,7 +52,7 @@ "plain_text": "Text pla" }, "content_warning": "Assumpte (opcional)", - "default": "Em sento", + "default": "Em sento…", "direct_warning": "Aquesta entrada només serà visible per les usuràries que etiquetis", "posting": "Publicació", "scope": { @@ -63,7 +63,7 @@ } }, "registration": { - "bio": "Sobre mi", + "bio": "Presentació", "email": "Correu", "fullname": "Nom per mostrar", "password_confirm": "Confirma la contrasenya", @@ -78,7 +78,7 @@ "avatarAltRadius": "Avatars en les notificacions", "avatarRadius": "Avatars", "background": "Fons de pantalla", - "bio": "Sobre l'usuari/a", + "bio": "Presentació", "btnRadius": "Botons", "cBlue": "Blau (respon, segueix)", "cGreen": "Verd (republica)", diff --git a/static/timeago-ca.json b/static/timeago-ca.json index d6fca3be..ef782caf 100644 --- a/static/timeago-ca.json +++ b/static/timeago-ca.json @@ -1,10 +1,10 @@ [ "ara mateix", - ["fa %ss", "fa %ss"], - ["fa %smin","fa %smin"], - ["fa %sh", "fa %sh"], - ["fa %sd", "fa %sd"], - ["fa %sw", "fa %sw"], - ["fa %smo", "fa %smo"], - ["fa %sy", "fa %sy"] + ["fa %s s", "fa %s s"], + ["fa %s min", "fa %s min"], + ["fa %s h", "fa %s h"], + ["fa %s dia", "fa %s dies"], + ["fa %s setm.", "fa %s setm."], + ["fa %s mes", "fa %s mesos"], + ["fa %s any", "fa %s anys"] ] From 373d6ca990843b07143a52005d32404dbcd0441d Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Sun, 21 Oct 2018 08:43:03 +0000 Subject: [PATCH 15/36] Adding arabic translation. --- src/i18n/ar.json | 201 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 src/i18n/ar.json diff --git a/src/i18n/ar.json b/src/i18n/ar.json new file mode 100644 index 00000000..ac7d0f1a --- /dev/null +++ b/src/i18n/ar.json @@ -0,0 +1,201 @@ +{ + "chat": { + "title": "الدردشة" + }, + "features_panel": { + "chat": "الدردشة", + "gopher": "غوفر", + "media_proxy": "بروكسي الوسائط", + "scope_options": "", + "text_limit": "الحد الأقصى للنص", + "title": "الميّزات", + "who_to_follow": "للمتابعة" + }, + "finder": { + "error_fetching_user": "خطأ أثناء جلب صفحة المستخدم", + "find_user": "البحث عن مستخدِم" + }, + "general": { + "apply": "تطبيق", + "submit": "إرسال" + }, + "login": { + "login": "تسجيل الدخول", + "logout": "الخروج", + "password": "الكلمة السرية", + "placeholder": "مثال lain", + "register": "انشاء حساب", + "username": "إسم المستخدم" + }, + "nav": { + "chat": "الدردشة المحلية", + "friend_requests": "طلبات المتابَعة", + "mentions": "الإشارات", + "public_tl": "الخيط الزمني العام", + "timeline": "الخيط الزمني", + "twkn": "كافة الشبكة المعروفة" + }, + "notifications": { + "broken_favorite": "منشور مجهول، جارٍ البحث عنه…", + "favorited_you": "أعجِب بمنشورك", + "followed_you": "يُتابعك", + "load_older": "تحميل الإشعارات الأقدم", + "notifications": "الإخطارات", + "read": "مقروء!", + "repeated_you": "شارَك منشورك" + }, + "post_status": { + "account_not_locked_warning": "", + "account_not_locked_warning_link": "مقفل", + "attachments_sensitive": "اعتبر المرفقات كلها كمحتوى حساس", + "content_type": { + "plain_text": "نص صافٍ" + }, + "content_warning": "الموضوع (اختياري)", + "default": "وصلت للتوّ إلى لوس أنجلس.", + "direct_warning": "", + "posting": "النشر", + "scope": { + "direct": "", + "private": "", + "public": "علني - يُنشر على الخيوط الزمنية العمومية", + "unlisted": "غير مُدرَج - لا يُنشَر على الخيوط الزمنية العمومية" + } + }, + "registration": { + "bio": "السيرة الذاتية", + "email": "عنوان البريد الإلكتروني", + "fullname": "الإسم المعروض", + "password_confirm": "تأكيد الكلمة السرية", + "registration": "التسجيل", + "token": "رمز الدعوة" + }, + "settings": { + "attachmentRadius": "المُرفَقات", + "attachments": "المُرفَقات", + "autoload": "", + "avatar": "الصورة الرمزية", + "avatarAltRadius": "الصور الرمزية (الإشعارات)", + "avatarRadius": "الصور الرمزية", + "background": "الخلفية", + "bio": "السيرة الذاتية", + "btnRadius": "الأزرار", + "cBlue": "أزرق (الرد، المتابَعة)", + "cGreen": "أخضر (إعادة النشر)", + "cOrange": "برتقالي (مفضلة)", + "cRed": "أحمر (إلغاء)", + "change_password": "تغيير كلمة السر", + "change_password_error": "وقع هناك خلل أثناء تعديل كلمتك السرية.", + "changed_password": "تم تغيير كلمة المرور بنجاح!", + "collapse_subject": "", + "confirm_new_password": "تأكيد كلمة السر الجديدة", + "current_avatar": "صورتك الرمزية الحالية", + "current_password": "كلمة السر الحالية", + "current_profile_banner": "الرأسية الحالية لصفحتك الشخصية", + "data_import_export_tab": "تصدير واستيراد البيانات", + "default_vis": "أسلوب العرض الافتراضي", + "delete_account": "حذف الحساب", + "delete_account_description": "حذف حسابك و كافة منشوراتك نهائيًا.", + "delete_account_error": "", + "delete_account_instructions": "يُرجى إدخال كلمتك السرية أدناه لتأكيد عملية حذف الحساب.", + "export_theme": "حفظ النموذج", + "filtering": "التصفية", + "filtering_explanation": "سيتم إخفاء كافة المنشورات التي تحتوي على هذه الكلمات، كلمة واحدة في كل سطر", + "follow_export": "تصدير الاشتراكات", + "follow_export_button": "تصدير الاشتراكات كملف csv", + "follow_export_processing": "التصدير جارٍ، سوف يُطلَب منك تنزيل ملفك بعد حين", + "follow_import": "استيراد الاشتراكات", + "follow_import_error": "خطأ أثناء استيراد المتابِعين", + "follows_imported": "", + "foreground": "الأمامية", + "general": "الإعدادات العامة", + "hide_attachments_in_convo": "إخفاء المرفقات على المحادثات", + "hide_attachments_in_tl": "إخفاء المرفقات على الخيط الزمني", + "hide_post_stats": "", + "hide_user_stats": "", + "import_followers_from_a_csv_file": "", + "import_theme": "تحميل نموذج", + "inputRadius": "", + "instance_default": "", + "interfaceLanguage": "لغة الواجهة", + "invalid_theme_imported": "", + "limited_availability": "غير متوفر على متصفحك", + "links": "الروابط", + "lock_account_description": "", + "loop_video": "", + "loop_video_silent_only": "", + "name": "الاسم", + "name_bio": "الاسم والسيرة الذاتية", + "new_password": "كلمة السر الجديدة", + "no_rich_text_description": "", + "notification_visibility": "نوع الإشعارات التي تريد عرضها", + "notification_visibility_follows": "يتابع", + "notification_visibility_likes": "الإعجابات", + "notification_visibility_mentions": "الإشارات", + "notification_visibility_repeats": "", + "nsfw_clickthrough": "", + "panelRadius": "", + "pause_on_unfocused": "", + "presets": "النماذج", + "profile_background": "خلفية الصفحة الشخصية", + "profile_banner": "رأسية الصفحة الشخصية", + "profile_tab": "الملف الشخصي", + "radii_help": "", + "replies_in_timeline": "الردود على الخيط الزمني", + "reply_link_preview": "", + "reply_visibility_all": "عرض كافة الردود", + "reply_visibility_following": "", + "reply_visibility_self": "", + "saving_err": "خطأ أثناء حفظ الإعدادات", + "saving_ok": "تم حفظ الإعدادات", + "security_tab": "الأمان", + "set_new_avatar": "اختيار صورة رمزية جديدة", + "set_new_profile_background": "اختيار خلفية جديدة للملف الشخصي", + "set_new_profile_banner": "اختيار رأسية جديدة للصفحة الشخصية", + "settings": "الإعدادات", + "stop_gifs": "", + "streaming": "", + "text": "النص", + "theme": "المظهر", + "theme_help": "", + "tooltipRadius": "", + "user_settings": "إعدادات المستخدم", + "values": { + "false": "لا", + "true": "نعم" + } + }, + "timeline": { + "collapse": "", + "conversation": "محادثة", + "error_fetching": "خطأ أثناء جلب التحديثات", + "load_older": "تحميل المنشورات القديمة", + "no_retweet_hint": "", + "repeated": "", + "show_new": "عرض الجديد", + "up_to_date": "تم تحديثه" + }, + "user_card": { + "approve": "قبول", + "block": "حظر", + "blocked": "تم حظره!", + "deny": "رفض", + "follow": "اتبع", + "followees": "", + "followers": "مُتابِعون", + "following": "", + "follows_you": "يتابعك!", + "mute": "كتم", + "muted": "تم كتمه", + "per_day": "في اليوم", + "remote_follow": "مُتابَعة عن بُعد", + "statuses": "المنشورات" + }, + "user_profile": { + "timeline_title": "الخيط الزمني للمستخدم" + }, + "who_to_follow": { + "more": "المزيد", + "who_to_follow": "للمتابعة" + } +} \ No newline at end of file From 131526373f4f18ee31701cc37e2dd100f8907b86 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire Date: Sun, 21 Oct 2018 08:51:22 +0000 Subject: [PATCH 16/36] Adding arabic to messages.js --- src/i18n/messages.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 3a2da643..36f4c98b 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -7,6 +7,7 @@ // There's only problem that apostrophe character ' gets replaced by \\ so you have to fix it manually, sorry. const messages = { + ar: require('./ar.json'), de: require('./de.json'), fi: require('./fi.json'), en: require('./en.json'), From d6ad08050ad0cfcf5ed4a94b5b2e8c66ef27ca0a Mon Sep 17 00:00:00 2001 From: scarlett Date: Sun, 21 Oct 2018 18:04:23 +0100 Subject: [PATCH 17/36] Fall back to instance settings consistently --- src/components/status/status.js | 15 +++++++++++---- src/modules/config.js | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/components/status/status.js b/src/components/status/status.js index 45f5ccac..f1afcac7 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -31,10 +31,17 @@ const Status = { preview: null, showPreview: false, showingTall: false, - expandingSubject: !this.$store.state.config.collapseMessageWithSubject + expandingSubject: typeof this.$store.state.config.collapseMessageWithSubject === 'undefined' + ? !this.$store.state.instance.collapseMessageWithSubject + : !this.$store.state.config.collapseMessageWithSubject } }, computed: { + localCollapseSubjectDefault () { + return typeof this.$store.state.config.collapseMessageWithSubject === 'undefined' + ? this.$store.state.instance.collapseMessageWithSubject + : this.$store.state.config.collapseMessageWithSubject + }, muteWords () { return this.$store.state.config.muteWords }, @@ -147,13 +154,13 @@ const Status = { return this.status.attentions.length > 0 }, hideSubjectStatus () { - if (this.tallStatus && !this.$store.state.config.collapseMessageWithSubject) { + if (this.tallStatus && !this.localCollapseSubjectDefault) { return false } return !this.expandingSubject && this.status.summary }, hideTallStatus () { - if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) { + if (this.status.summary && this.localCollapseSubjectDefault) { return false } if (this.showingTall) { @@ -168,7 +175,7 @@ const Status = { if (!this.status.nsfw) { return false } - if (this.status.summary && this.$store.state.config.collapseMessageWithSubject) { + if (this.status.summary && this.localCollapseSubjectDefault) { return false } return true diff --git a/src/modules/config.js b/src/modules/config.js index 375d0167..1c04845a 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -5,7 +5,6 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] const defaultState = { colors: {}, - collapseMessageWithSubject: false, hideAttachments: false, hideAttachmentsInConv: false, hideNsfw: true, From c02a9089e13ee7acf5a56818ac807dcb813aa43a Mon Sep 17 00:00:00 2001 From: scarlett Date: Sun, 21 Oct 2018 19:42:38 +0100 Subject: [PATCH 18/36] explicitly set collapseMessageWithSubject to undefined --- src/modules/config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/config.js b/src/modules/config.js index 1c04845a..522940f6 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -5,6 +5,7 @@ const browserLocale = (window.navigator.language || 'en').split('-')[0] const defaultState = { colors: {}, + collapseMessageWithSubject: undefined, hideAttachments: false, hideAttachmentsInConv: false, hideNsfw: true, From ec7b7ab49cfd831f581f94f102a1fc2d0be15550 Mon Sep 17 00:00:00 2001 From: fadelkon Date: Sun, 21 Oct 2018 22:18:38 +0200 Subject: [PATCH 19/36] Sort messages object by language code so that it's easier from the UI to browse them. --- src/i18n/messages.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/i18n/messages.js b/src/i18n/messages.js index ff7e1c98..4cd3c4e2 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -1,5 +1,6 @@ // When contributing, please sort JSON before committing so it would be easier to see what's missing and what's being added compared to English and other languages. It's not obligatory, but just an advice. // To sort json use jq https://stedolan.github.io/jq and invoke it like `jq -S . xx.json > xx.sorted.json`, AFAIK, there's no inplace edit option like in sed +// Also, when adding a new language to "messages" variable, please do it alphabetically by language code so that users can search or check their custom language easily. // For anyone contributing to old huge messages.js and in need to quickly convert it to JSON // sed command for converting currently formatted JS to JSON: @@ -8,24 +9,24 @@ const messages = { ar: require('./ar.json'), + ca: require('./ca.json'), de: require('./de.json'), - fi: require('./fi.json'), en: require('./en.json'), eo: require('./eo.json'), + es: require('./es.json'), et: require('./et.json'), - hu: require('./hu.json'), - ro: require('./ro.json'), - ja: require('./ja.json'), + fi: require('./fi.json'), fr: require('./fr.json'), + he: require('./he.json'), + hu: require('./hu.json'), it: require('./it.json'), + ja: require('./ja.json'), + nb: require('./nb.json'), oc: require('./oc.json'), pl: require('./pl.json'), - es: require('./es.json'), pt: require('./pt.json'), - ru: require('./ru.json'), - nb: require('./nb.json'), - he: require('./he.json'), - ca: require('./ca.json') + ro: require('./ro.json'), + ru: require('./ru.json') } export default messages From 8c585b0291ebc092bcac2c812fc802276183d2b8 Mon Sep 17 00:00:00 2001 From: Exilat Date: Tue, 23 Oct 2018 19:19:11 +0000 Subject: [PATCH 20/36] =?UTF-8?q?Update=20of=20the=20oc.json=20file=20Actu?= =?UTF-8?q?alizacion=20del=20fichi=C3=A8r=20oc.json?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/i18n/oc.json | 297 ++++++++++++++++++++++++++--------------------- 1 file changed, 165 insertions(+), 132 deletions(-) diff --git a/src/i18n/oc.json b/src/i18n/oc.json index 0f3320ca..788a2fac 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -1,134 +1,167 @@ { - "chat": { - "title": "Messatjariá" - }, - "finder": { - "error_fetching_user": "Error pendent la recèrca d’un utilizaire", - "find_user": "Cercar un utilizaire" - }, - "general": { - "apply": "Aplicar", - "submit": "Mandar" - }, - "login": { - "login": "Connexion", - "logout": "Desconnexion", - "password": "Senhal", - "placeholder": "e.g. lain", - "register": "Se marcar", - "username": "Nom d’utilizaire" - }, - "nav": { - "chat": "Chat local", - "mentions": "Notificacions", - "public_tl": "Estatuts locals", - "timeline": "Flux d’actualitat", - "twkn": "Lo malhum conegut" - }, - "notifications": { - "favorited_you": "a aimat vòstre estatut", - "followed_you": "vos a seguit", - "notifications": "Notficacions", - "read": "Legit!", - "repeated_you": "a repetit your vòstre estatut" - }, - "post_status": { - "content_warning": "Avís de contengut (opcional)", - "default": "Escrivètz aquí vòstre estatut.", - "posting": "Mandadís" - }, - "registration": { - "bio": "Biografia", - "email": "Adreça de corrièl", - "fullname": "Nom complèt", - "password_confirm": "Confirmar lo senhal", - "registration": "Inscripcion" - }, - "settings": { - "attachmentRadius": "Pèças juntas", - "attachments": "Pèças juntas", - "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", - "avatar": "Avatar", - "avatarAltRadius": "Avatars (Notificacions)", - "avatarRadius": "Avatars", - "background": "Rèire plan", - "bio": "Biografia", - "btnRadius": "Botons", - "cBlue": "Blau (Respondre, seguir)", - "cGreen": "Verd (Repartajar)", - "cOrange": "Irange (Aimar)", - "cRed": "Roge (Anullar)", - "change_password": "Cambiar lo senhal", - "change_password_error": "Una error s’es producha en cambiant lo senhal.", - "changed_password": "Senhal corrèctament cambiat", - "confirm_new_password": "Confirmatz lo nòu senhal", - "current_avatar": "Vòstre avatar actual", - "current_password": "Senhal actual", - "current_profile_banner": "Bandièra actuala del perfil", - "delete_account": "Suprimir lo compte", - "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", - "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", - "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", - "filtering": "Filtre", - "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha.", - "follow_export": "Exportar los abonaments", - "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", - "follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", - "follow_import": "Importar los abonaments", - "follow_import_error": "Error en important los seguidors", - "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", - "foreground": "Endavant", - "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", - "hide_attachments_in_tl": "Rescondre las pèças juntas", - "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", - "inputRadius": "Camps tèxte", - "links": "Ligams", - "name": "Nom", - "name_bio": "Nom & Bio", - "new_password": "Nòu senhal", - "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", - "panelRadius": "Panèls", - "presets": "Pre-enregistrats", - "profile_background": "Imatge de fons", - "profile_banner": "Bandièra del perfil", - "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", - "reply_link_preview": "Activar l’apercebut en passar la mirga", - "set_new_avatar": "Cambiar l’avatar", - "set_new_profile_background": "Cambiar l’imatge de fons", - "set_new_profile_banner": "Cambiar de bandièra", - "settings": "Paramètres", - "stop_gifs": "Lançar los GIFs al subrevòl", - "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", - "text": "Tèxte", - "theme": "Tèma", - "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", - "tooltipRadius": "Astúcias/Alèrta", - "user_settings": "Paramètres utilizaire" - }, - "timeline": { - "collapse": "Tampar", - "conversation": "Conversacion", - "error_fetching": "Error en cercant de mesas a jorn", - "load_older": "Ne veire mai", - "repeated": "repetit", - "show_new": "Ne veire mai", - "up_to_date": "A jorn" - }, - "user_card": { - "block": "Blocar", - "blocked": "Blocat", - "follow": "Seguir", - "followees": "Abonaments", - "followers": "Seguidors", - "following": "Seguit!", - "follows_you": "Vos sèc!", - "mute": "Amagar", - "muted": "Amagat", - "per_day": "per jorn", - "remote_follow": "Seguir a distància", - "statuses": "Estatuts" - }, - "user_profile": { - "timeline_title": "Flux utilizaire" - } + "chat.title": "Messatjariá", + "finder.error_fetching_user": "Error pendent la recèrca d’un utilizaire", + "finder.find_user": "Cercar un utilizaire", + "general.apply": "Aplicar", + "general.submit": "Mandar", + "login.login": "Connexion", + "login.logout": "Desconnexion", + "login.password": "Senhal", + "login.placeholder": "e.g. lain", + "login.register": "Se marcar", + "login.username": "Nom d’utilizaire", + "nav.chat": "Chat local", + "nav.mentions": "Notificacions", + "nav.public_tl": "Estatuts locals", + "nav.timeline": "Flux d’actualitat", + "nav.twkn": "Lo malhum conegut", + "notifications.favorited_you": "a aimat vòstre estatut", + "notifications.followed_you": "vos a seguit", + "notifications.notifications": "Notficacions", + "notifications.read": "Legit !", + "notifications.repeated_you": "a repetit vòstre estatut", + "post_status.content_warning": "Avís de contengut (opcional)", + "post_status.default": "Escrivètz aquí vòstre estatut.", + "post_status.posting": "Mandadís", + "registration.bio": "Biografia", + "registration.email": "Adreça de corrièl", + "registration.fullname": "Nom complèt", + "registration.password_confirm": "Confirmar lo senhal", + "registration.registration": "Inscripcion", + "settings.attachmentRadius": "Pèças juntas", + "settings.attachments": "Pèças juntas", + "settings.autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", + "settings.avatar": "Avatar", + "settings.avatarAltRadius": "Avatars (Notificacions)", + "settings.avatarRadius": "Avatars", + "settings.background": "Rèire plan", + "settings.bio": "Biografia", + "settings.btnRadius": "Botons", + "settings.cBlue": "Blau (Respondre, seguir)", + "settings.cGreen": "Verd (Repartajar)", + "settings.cOrange": "Irange (Aimar)", + "settings.cRed": "Roge (Anullar)", + "settings.change_password": "Cambiar lo senhal", + "settings.change_password_error": "Una error s’es producha en cambiant lo senhal.", + "settings.changed_password": "Senhal corrèctament cambiat", + "settings.confirm_new_password": "Confirmatz lo nòu senhal", + "settings.current_avatar": "Vòstre avatar actual", + "settings.current_password": "Senhal actual", + "settings.current_profile_banner": "Bandièra actuala del perfil", + "settings.delete_account": "Suprimir lo compte", + "settings.delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", + "settings.delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", + "settings.delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", + "settings.filtering": "Filtre", + "settings.filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha", + "settings.follow_export": "Exportar los abonaments", + "settings.follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", + "settings.follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", + "settings.follow_import": "Importar los abonaments", + "settings.follow_import_error": "Error en important los seguidors", + "settings.follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", + "settings.foreground": "Endavant", + "settings.hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", + "settings.hide_attachments_in_tl": "Rescondre las pèças juntas", + "settings.import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", + "settings.inputRadius": "Camps tèxte", + "settings.links": "Ligams", + "settings.name": "Nom", + "settings.name_bio": "Nom & Bio", + "settings.new_password": "Nòu senhal", + "settings.nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", + "settings.panelRadius": "Panèls", + "settings.presets": "Pre-enregistrats", + "settings.profile_background": "Imatge de fons", + "settings.profile_banner": "Bandièra del perfil", + "settings.radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", + "settings.reply_link_preview": "Activar l’apercebut en passar la mirga", + "settings.set_new_avatar": "Cambiar l’avatar", + "settings.set_new_profile_background": "Cambiar l’imatge de fons", + "settings.set_new_profile_banner": "Cambiar de bandièra", + "settings.settings": "Paramètres", + "settings.stop_gifs": "Lançar los GIFs al subrevòl", + "settings.streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", + "settings.text": "Tèxte", + "settings.theme": "Tèma", + "settings.theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", + "settings.tooltipRadius": "Astúcias/Alèrta", + "settings.user_settings": "Paramètres utilizaire", + "timeline.collapse": "Tampar", + "timeline.conversation": "Conversacion", + "timeline.error_fetching": "Error en cercant de mesas a jorn", + "timeline.load_older": "Ne veire mai", + "timeline.repeated": "repetit", + "timeline.show_new": "Ne veire mai", + "timeline.up_to_date": "A jorn", + "user_card.block": "Blocar", + "user_card.blocked": "Blocat", + "user_card.follow": "Seguir", + "user_card.followees": "Abonaments", + "user_card.followers": "Seguidors", + "user_card.following": "Seguit !", + "user_card.follows_you": "Vos sèc !", + "user_card.mute": "Amagar", + "user_card.muted": "Amagat", + "user_card.per_day": "per jorn", + "user_card.remote_follow": "Seguir a distància", + "user_card.statuses": "Estatuts", + "user_profile.timeline_title": "Flux utilizaire", + "features_panel.chat": "Discutida", + "features_panel.gopher": "Gopher", + "features_panel.media_proxy": "Servidor mandatari dels mèdias", + "features_panel.scope_options": "Opcions d'encastres", + "features_panel.text_limit": "Limit de tèxte", + "features_panel.title": "Foncionalitats", + "features_panel.who_to_follow": "Qui seguir", + "nav.friend_requests": "Demandas d'abonament", + "notifications.broken_favorite": "Estatut desconegut, sèm a lo cercar...", + "notifications.load_older": "Cargar las notificaciones mai ancianas", + "post_status.account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.", + "post_status.account_not_locked_warning_link": "clavat", + "post_status.attachments_sensitive": "Marcar las pèças juntas coma sensiblas", + "post_status.content_type.plain_text": "Tèxte brut", + "post_status.direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.", + "post_status.scope.direct": "Dirècte - Publicar pels utilizaires mencionats solament", + "post_status.scope.private": "Seguidors solament - Publicar pels sols seguidors", + "post_status.scope.public": "Public - Publicar pel flux d’actualitat public", + "post_status.scope.unlisted": "Pas listat - Publicar pas pel flux public", + "registration.token": "Geton de convidat", + "settings.collapse_subject": "Replegar las publicacions amb de subjèctes", + "settings.data_import_export_tab": "Importar / Exportar las donadas", + "settings.default_vis": "Nivèl de visibilitat per defaut", + "settings.export_theme": "Enregistrar la preconfiguracion", + "settings.general": "General", + "settings.hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)", + "settings.hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)", + "settings.import_theme": "Cargar un tèma", + "settings.instance_default": "(defaut : {value})", + "settings.interfaceLanguage": "Lenga de l’interfàcia", + "settings.invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.", + "settings.limited_availability": "Pas disponible per vòstre navigador", + "settings.lock_account_description": "Limitar vòstre compte als seguidors acceptats solament", + "settings.loop_video": "Bocla vidèo", + "settings.loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", + "settings.notification_visibility": "Tipes de notificacion de mostrar", + "settings.notification_visibility_follows": "Abonaments", + "settings.notification_visibility_likes": "Aiman", + "settings.notification_visibility_mentions": "Mencions", + "settings.notification_visibility_repeats": "Repeticions", + "settings.no_rich_text_description": "Netejar lo format tèxte de totas las publicacions", + "settings.pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat", + "settings.profile_tab": "Perfil", + "settings.replies_in_timeline": "Responsas del flux", + "settings.reply_visibility_all": "Mostrar totas las responsas", + "settings.reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi", + "settings.reply_visibility_self": "Mostrar pas que las responsas que me son destinadas", + "settings.saving_err": "Error en enregistrant los paramètres", + "settings.saving_ok": "Paramètres enregistrats", + "settings.security_tab": "Seguretat", + "settings.values.false": "non", + "settings.values.true": "òc", + "timeline.no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida", + "user_card.approve": "Validar", + "user_card.deny": "Refusar", + "who_to_follow.more": "Mai", + "who_to_follow.who_to_follow": "Qui seguir" } From 68d90684c4bc4222921d5790c02f7d4fd82ab6c9 Mon Sep 17 00:00:00 2001 From: Exilat Date: Wed, 24 Oct 2018 05:50:49 +0000 Subject: [PATCH 21/36] Update oc.json --- src/i18n/oc.json | 366 ++++++++++++++++++++++++++--------------------- 1 file changed, 200 insertions(+), 166 deletions(-) diff --git a/src/i18n/oc.json b/src/i18n/oc.json index 788a2fac..9cb34fbf 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -1,167 +1,201 @@ { - "chat.title": "Messatjariá", - "finder.error_fetching_user": "Error pendent la recèrca d’un utilizaire", - "finder.find_user": "Cercar un utilizaire", - "general.apply": "Aplicar", - "general.submit": "Mandar", - "login.login": "Connexion", - "login.logout": "Desconnexion", - "login.password": "Senhal", - "login.placeholder": "e.g. lain", - "login.register": "Se marcar", - "login.username": "Nom d’utilizaire", - "nav.chat": "Chat local", - "nav.mentions": "Notificacions", - "nav.public_tl": "Estatuts locals", - "nav.timeline": "Flux d’actualitat", - "nav.twkn": "Lo malhum conegut", - "notifications.favorited_you": "a aimat vòstre estatut", - "notifications.followed_you": "vos a seguit", - "notifications.notifications": "Notficacions", - "notifications.read": "Legit !", - "notifications.repeated_you": "a repetit vòstre estatut", - "post_status.content_warning": "Avís de contengut (opcional)", - "post_status.default": "Escrivètz aquí vòstre estatut.", - "post_status.posting": "Mandadís", - "registration.bio": "Biografia", - "registration.email": "Adreça de corrièl", - "registration.fullname": "Nom complèt", - "registration.password_confirm": "Confirmar lo senhal", - "registration.registration": "Inscripcion", - "settings.attachmentRadius": "Pèças juntas", - "settings.attachments": "Pèças juntas", - "settings.autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", - "settings.avatar": "Avatar", - "settings.avatarAltRadius": "Avatars (Notificacions)", - "settings.avatarRadius": "Avatars", - "settings.background": "Rèire plan", - "settings.bio": "Biografia", - "settings.btnRadius": "Botons", - "settings.cBlue": "Blau (Respondre, seguir)", - "settings.cGreen": "Verd (Repartajar)", - "settings.cOrange": "Irange (Aimar)", - "settings.cRed": "Roge (Anullar)", - "settings.change_password": "Cambiar lo senhal", - "settings.change_password_error": "Una error s’es producha en cambiant lo senhal.", - "settings.changed_password": "Senhal corrèctament cambiat", - "settings.confirm_new_password": "Confirmatz lo nòu senhal", - "settings.current_avatar": "Vòstre avatar actual", - "settings.current_password": "Senhal actual", - "settings.current_profile_banner": "Bandièra actuala del perfil", - "settings.delete_account": "Suprimir lo compte", - "settings.delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", - "settings.delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", - "settings.delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", - "settings.filtering": "Filtre", - "settings.filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha", - "settings.follow_export": "Exportar los abonaments", - "settings.follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", - "settings.follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", - "settings.follow_import": "Importar los abonaments", - "settings.follow_import_error": "Error en important los seguidors", - "settings.follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", - "settings.foreground": "Endavant", - "settings.hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", - "settings.hide_attachments_in_tl": "Rescondre las pèças juntas", - "settings.import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", - "settings.inputRadius": "Camps tèxte", - "settings.links": "Ligams", - "settings.name": "Nom", - "settings.name_bio": "Nom & Bio", - "settings.new_password": "Nòu senhal", - "settings.nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", - "settings.panelRadius": "Panèls", - "settings.presets": "Pre-enregistrats", - "settings.profile_background": "Imatge de fons", - "settings.profile_banner": "Bandièra del perfil", - "settings.radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", - "settings.reply_link_preview": "Activar l’apercebut en passar la mirga", - "settings.set_new_avatar": "Cambiar l’avatar", - "settings.set_new_profile_background": "Cambiar l’imatge de fons", - "settings.set_new_profile_banner": "Cambiar de bandièra", - "settings.settings": "Paramètres", - "settings.stop_gifs": "Lançar los GIFs al subrevòl", - "settings.streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", - "settings.text": "Tèxte", - "settings.theme": "Tèma", - "settings.theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", - "settings.tooltipRadius": "Astúcias/Alèrta", - "settings.user_settings": "Paramètres utilizaire", - "timeline.collapse": "Tampar", - "timeline.conversation": "Conversacion", - "timeline.error_fetching": "Error en cercant de mesas a jorn", - "timeline.load_older": "Ne veire mai", - "timeline.repeated": "repetit", - "timeline.show_new": "Ne veire mai", - "timeline.up_to_date": "A jorn", - "user_card.block": "Blocar", - "user_card.blocked": "Blocat", - "user_card.follow": "Seguir", - "user_card.followees": "Abonaments", - "user_card.followers": "Seguidors", - "user_card.following": "Seguit !", - "user_card.follows_you": "Vos sèc !", - "user_card.mute": "Amagar", - "user_card.muted": "Amagat", - "user_card.per_day": "per jorn", - "user_card.remote_follow": "Seguir a distància", - "user_card.statuses": "Estatuts", - "user_profile.timeline_title": "Flux utilizaire", - "features_panel.chat": "Discutida", - "features_panel.gopher": "Gopher", - "features_panel.media_proxy": "Servidor mandatari dels mèdias", - "features_panel.scope_options": "Opcions d'encastres", - "features_panel.text_limit": "Limit de tèxte", - "features_panel.title": "Foncionalitats", - "features_panel.who_to_follow": "Qui seguir", - "nav.friend_requests": "Demandas d'abonament", - "notifications.broken_favorite": "Estatut desconegut, sèm a lo cercar...", - "notifications.load_older": "Cargar las notificaciones mai ancianas", - "post_status.account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.", - "post_status.account_not_locked_warning_link": "clavat", - "post_status.attachments_sensitive": "Marcar las pèças juntas coma sensiblas", - "post_status.content_type.plain_text": "Tèxte brut", - "post_status.direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.", - "post_status.scope.direct": "Dirècte - Publicar pels utilizaires mencionats solament", - "post_status.scope.private": "Seguidors solament - Publicar pels sols seguidors", - "post_status.scope.public": "Public - Publicar pel flux d’actualitat public", - "post_status.scope.unlisted": "Pas listat - Publicar pas pel flux public", - "registration.token": "Geton de convidat", - "settings.collapse_subject": "Replegar las publicacions amb de subjèctes", - "settings.data_import_export_tab": "Importar / Exportar las donadas", - "settings.default_vis": "Nivèl de visibilitat per defaut", - "settings.export_theme": "Enregistrar la preconfiguracion", - "settings.general": "General", - "settings.hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)", - "settings.hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)", - "settings.import_theme": "Cargar un tèma", - "settings.instance_default": "(defaut : {value})", - "settings.interfaceLanguage": "Lenga de l’interfàcia", - "settings.invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.", - "settings.limited_availability": "Pas disponible per vòstre navigador", - "settings.lock_account_description": "Limitar vòstre compte als seguidors acceptats solament", - "settings.loop_video": "Bocla vidèo", - "settings.loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", - "settings.notification_visibility": "Tipes de notificacion de mostrar", - "settings.notification_visibility_follows": "Abonaments", - "settings.notification_visibility_likes": "Aiman", - "settings.notification_visibility_mentions": "Mencions", - "settings.notification_visibility_repeats": "Repeticions", - "settings.no_rich_text_description": "Netejar lo format tèxte de totas las publicacions", - "settings.pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat", - "settings.profile_tab": "Perfil", - "settings.replies_in_timeline": "Responsas del flux", - "settings.reply_visibility_all": "Mostrar totas las responsas", - "settings.reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi", - "settings.reply_visibility_self": "Mostrar pas que las responsas que me son destinadas", - "settings.saving_err": "Error en enregistrant los paramètres", - "settings.saving_ok": "Paramètres enregistrats", - "settings.security_tab": "Seguretat", - "settings.values.false": "non", - "settings.values.true": "òc", - "timeline.no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida", - "user_card.approve": "Validar", - "user_card.deny": "Refusar", - "who_to_follow.more": "Mai", - "who_to_follow.who_to_follow": "Qui seguir" -} + "chat": { + "title": "Messatjariá" + }, + "features_panel": { + "chat": "Discutida", + "gopher": "Gopher", + "media_proxy": "Servidor mandatari dels mèdias", + "scope_options": "Opcions d'encastres", + "text_limit": "Limit de tèxte", + "title": "Foncionalitats", + "who_to_follow": "Qui seguir" + }, + "finder": { + "error_fetching_user": "Error pendent la recèrca d’un utilizaire", + "find_user": "Cercar un utilizaire" + }, + "general": { + "apply": "Aplicar", + "submit": "Mandar" + }, + "login": { + "login": "Connexion", + "logout": "Desconnexion", + "password": "Senhal", + "placeholder": "e.g. lain", + "register": "Se marcar", + "username": "Nom d’utilizaire" + }, + "nav": { + "chat": "Chat local", + "friend_requests": "Demandas d'abonament", + "mentions": "Notificacions", + "public_tl": "Estatuts locals", + "timeline": "Flux d’actualitat", + "twkn": "Lo malhum conegut" + }, + "notifications": { + "broken_favorite": "Estatut desconegut, sèm a lo cercar...", + "favorited_you": "a aimat vòstre estatut", + "followed_you": "vos a seguit", + "load_older": "Cargar las notificaciones mai ancianas", + "notifications": "Notficacions", + "read": "Legit !", + "repeated_you": "a repetit vòstre estatut" + }, + "post_status": { + "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.", + "account_not_locked_warning_link": "clavat", + "attachments_sensitive": "Marcar las pèças juntas coma sensiblas", + "content_type": { + "plain_text": "Tèxte brut" + }, + "content_warning": "Avís de contengut (opcional)", + "default": "Escrivètz aquí vòstre estatut.", + "direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.", + "posting": "Mandadís", + "scope": { + "direct": "Dirècte - Publicar pels utilizaires mencionats solament", + "private": "Seguidors solament - Publicar pels sols seguidors", + "public": "Public - Publicar pel flux d’actualitat public", + "unlisted": "Pas listat - Publicar pas pel flux public" + } + }, + "registration": { + "bio": "Biografia", + "email": "Adreça de corrièl", + "fullname": "Nom complèt", + "password_confirm": "Confirmar lo senhal", + "registration": "Inscripcion", + "token": "Geton de convidat" + }, + "settings": { + "attachmentRadius": "Pèças juntas", + "attachments": "Pèças juntas", + "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", + "avatar": "Avatar", + "avatarAltRadius": "Avatars (Notificacions)", + "avatarRadius": "Avatars", + "background": "Rèire plan", + "bio": "Biografia", + "btnRadius": "Botons", + "cBlue": "Blau (Respondre, seguir)", + "cGreen": "Verd (Repartajar)", + "cOrange": "Irange (Aimar)", + "cRed": "Roge (Anullar)", + "change_password": "Cambiar lo senhal", + "change_password_error": "Una error s’es producha en cambiant lo senhal.", + "changed_password": "Senhal corrèctament cambiat !", + "collapse_subject": "Replegar las publicacions amb de subjèctes", + "confirm_new_password": "Confirmatz lo nòu senhal", + "current_avatar": "Vòstre avatar actual", + "current_password": "Senhal actual", + "current_profile_banner": "Bandièra actuala del perfil", + "data_import_export_tab": "Importar / Exportar las donadas", + "default_vis": "Nivèl de visibilitat per defaut", + "delete_account": "Suprimir lo compte", + "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", + "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", + "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", + "export_theme": "Enregistrar la preconfiguracion", + "filtering": "Filtre", + "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha", + "follow_export": "Exportar los abonaments", + "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", + "follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", + "follow_import": "Importar los abonaments", + "follow_import_error": "Error en important los seguidors", + "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", + "foreground": "Endavant", + "general": "General", + "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", + "hide_attachments_in_tl": "Rescondre las pèças juntas", + "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)", + "hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)", + "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", + "import_theme": "Cargar un tèma", + "inputRadius": "Camps tèxte", + "instance_default": "(defaut : {value})", + "interfaceLanguage": "Lenga de l’interfàcia", + "invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.", + "limited_availability": "Pas disponible per vòstre navigador", + "links": "Ligams", + "lock_account_description": "Limitar vòstre compte als seguidors acceptats solament", + "loop_video": "Bocla vidèo", + "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", + "name": "Nom", + "name_bio": "Nom & Bio", + "new_password": "Nòu senhal", + "no_rich_text_description": "Netejar lo format tèxte de totas las publicacions", + "notification_visibility": "Tipes de notificacion de mostrar", + "notification_visibility_follows": "Abonaments", + "notification_visibility_likes": "Aiman", + "notification_visibility_mentions": "Mencions", + "notification_visibility_repeats": "Repeticions", + "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", + "panelRadius": "Panèls", + "pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat", + "presets": "Pre-enregistrats", + "profile_background": "Imatge de fons", + "profile_banner": "Bandièra del perfil", + "profile_tab": "Perfil", + "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", + "replies_in_timeline": "Responsas del flux", + "reply_link_preview": "Activar l’apercebut en passar la mirga", + "reply_visibility_all": "Mostrar totas las responsas", + "reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi", + "reply_visibility_self": "Mostrar pas que las responsas que me son destinadas", + "saving_err": "Error en enregistrant los paramètres", + "saving_ok": "Paramètres enregistrats", + "security_tab": "Seguretat", + "set_new_avatar": "Cambiar l’avatar", + "set_new_profile_background": "Cambiar l’imatge de fons", + "set_new_profile_banner": "Cambiar de bandièra", + "settings": "Paramètres", + "stop_gifs": "Lançar los GIFs al subrevòl", + "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", + "text": "Tèxte", + "theme": "Tèma", + "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", + "tooltipRadius": "Astúcias/Alèrta", + "user_settings": "Paramètres utilizaire", + "values": { + "false": "non", + "true": "òc" + } + }, + "timeline": { + "collapse": "Tampar", + "conversation": "Conversacion", + "error_fetching": "Error en cercant de mesas a jorn", + "load_older": "Ne veire mai", + "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida", + "repeated": "repetit", + "show_new": "Ne veire mai", + "up_to_date": "A jorn" + }, + "user_card": { + "approve": "Validar", + "block": "Blocar", + "blocked": "Blocat !", + "deny": "Refusar", + "follow": "Seguir", + "followees": "Abonaments", + "followers": "Seguidors", + "following": "Seguit !", + "follows_you": "Vos sèc !", + "mute": "Amagar", + "muted": "Amagat", + "per_day": "per jorn", + "remote_follow": "Seguir a distància", + "statuses": "Estatuts" + }, + "user_profile": { + "timeline_title": "Flux utilizaire" + }, + "who_to_follow": { + "more": "Mai", + "who_to_follow": "Qui seguir" + } +} \ No newline at end of file From d1614c432f8a6e352972740cfed7a394a24ce66d Mon Sep 17 00:00:00 2001 From: Exilat Date: Thu, 25 Oct 2018 05:54:35 +0000 Subject: [PATCH 22/36] Update oc.json --- src/i18n/oc.json | 398 +++++++++++++++++++++++------------------------ 1 file changed, 199 insertions(+), 199 deletions(-) diff --git a/src/i18n/oc.json b/src/i18n/oc.json index 9cb34fbf..2ce666c6 100644 --- a/src/i18n/oc.json +++ b/src/i18n/oc.json @@ -1,201 +1,201 @@ { - "chat": { - "title": "Messatjariá" - }, - "features_panel": { - "chat": "Discutida", - "gopher": "Gopher", - "media_proxy": "Servidor mandatari dels mèdias", - "scope_options": "Opcions d'encastres", - "text_limit": "Limit de tèxte", - "title": "Foncionalitats", - "who_to_follow": "Qui seguir" - }, - "finder": { - "error_fetching_user": "Error pendent la recèrca d’un utilizaire", - "find_user": "Cercar un utilizaire" - }, - "general": { - "apply": "Aplicar", - "submit": "Mandar" - }, - "login": { - "login": "Connexion", - "logout": "Desconnexion", - "password": "Senhal", - "placeholder": "e.g. lain", - "register": "Se marcar", - "username": "Nom d’utilizaire" - }, - "nav": { - "chat": "Chat local", - "friend_requests": "Demandas d'abonament", - "mentions": "Notificacions", - "public_tl": "Estatuts locals", - "timeline": "Flux d’actualitat", - "twkn": "Lo malhum conegut" - }, - "notifications": { - "broken_favorite": "Estatut desconegut, sèm a lo cercar...", - "favorited_you": "a aimat vòstre estatut", - "followed_you": "vos a seguit", - "load_older": "Cargar las notificaciones mai ancianas", - "notifications": "Notficacions", - "read": "Legit !", - "repeated_you": "a repetit vòstre estatut" - }, - "post_status": { - "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.", - "account_not_locked_warning_link": "clavat", - "attachments_sensitive": "Marcar las pèças juntas coma sensiblas", - "content_type": { - "plain_text": "Tèxte brut" - }, - "content_warning": "Avís de contengut (opcional)", - "default": "Escrivètz aquí vòstre estatut.", - "direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.", - "posting": "Mandadís", - "scope": { - "direct": "Dirècte - Publicar pels utilizaires mencionats solament", - "private": "Seguidors solament - Publicar pels sols seguidors", - "public": "Public - Publicar pel flux d’actualitat public", - "unlisted": "Pas listat - Publicar pas pel flux public" - } - }, - "registration": { - "bio": "Biografia", - "email": "Adreça de corrièl", - "fullname": "Nom complèt", - "password_confirm": "Confirmar lo senhal", - "registration": "Inscripcion", - "token": "Geton de convidat" - }, - "settings": { - "attachmentRadius": "Pèças juntas", - "attachments": "Pèças juntas", - "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", - "avatar": "Avatar", - "avatarAltRadius": "Avatars (Notificacions)", - "avatarRadius": "Avatars", - "background": "Rèire plan", - "bio": "Biografia", - "btnRadius": "Botons", - "cBlue": "Blau (Respondre, seguir)", - "cGreen": "Verd (Repartajar)", - "cOrange": "Irange (Aimar)", - "cRed": "Roge (Anullar)", - "change_password": "Cambiar lo senhal", - "change_password_error": "Una error s’es producha en cambiant lo senhal.", - "changed_password": "Senhal corrèctament cambiat !", - "collapse_subject": "Replegar las publicacions amb de subjèctes", - "confirm_new_password": "Confirmatz lo nòu senhal", - "current_avatar": "Vòstre avatar actual", - "current_password": "Senhal actual", - "current_profile_banner": "Bandièra actuala del perfil", - "data_import_export_tab": "Importar / Exportar las donadas", - "default_vis": "Nivèl de visibilitat per defaut", - "delete_account": "Suprimir lo compte", - "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", - "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", - "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", - "export_theme": "Enregistrar la preconfiguracion", - "filtering": "Filtre", - "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha", - "follow_export": "Exportar los abonaments", - "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", - "follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", - "follow_import": "Importar los abonaments", - "follow_import_error": "Error en important los seguidors", - "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", - "foreground": "Endavant", - "general": "General", - "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", - "hide_attachments_in_tl": "Rescondre las pèças juntas", - "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)", - "hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)", - "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", - "import_theme": "Cargar un tèma", - "inputRadius": "Camps tèxte", - "instance_default": "(defaut : {value})", - "interfaceLanguage": "Lenga de l’interfàcia", - "invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.", - "limited_availability": "Pas disponible per vòstre navigador", - "links": "Ligams", - "lock_account_description": "Limitar vòstre compte als seguidors acceptats solament", - "loop_video": "Bocla vidèo", - "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", - "name": "Nom", - "name_bio": "Nom & Bio", - "new_password": "Nòu senhal", - "no_rich_text_description": "Netejar lo format tèxte de totas las publicacions", - "notification_visibility": "Tipes de notificacion de mostrar", - "notification_visibility_follows": "Abonaments", - "notification_visibility_likes": "Aiman", - "notification_visibility_mentions": "Mencions", - "notification_visibility_repeats": "Repeticions", - "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", - "panelRadius": "Panèls", - "pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat", - "presets": "Pre-enregistrats", - "profile_background": "Imatge de fons", - "profile_banner": "Bandièra del perfil", - "profile_tab": "Perfil", - "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", - "replies_in_timeline": "Responsas del flux", - "reply_link_preview": "Activar l’apercebut en passar la mirga", - "reply_visibility_all": "Mostrar totas las responsas", - "reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi", - "reply_visibility_self": "Mostrar pas que las responsas que me son destinadas", - "saving_err": "Error en enregistrant los paramètres", - "saving_ok": "Paramètres enregistrats", - "security_tab": "Seguretat", - "set_new_avatar": "Cambiar l’avatar", - "set_new_profile_background": "Cambiar l’imatge de fons", - "set_new_profile_banner": "Cambiar de bandièra", - "settings": "Paramètres", - "stop_gifs": "Lançar los GIFs al subrevòl", - "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", - "text": "Tèxte", - "theme": "Tèma", - "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", - "tooltipRadius": "Astúcias/Alèrta", - "user_settings": "Paramètres utilizaire", - "values": { - "false": "non", - "true": "òc" - } - }, - "timeline": { - "collapse": "Tampar", - "conversation": "Conversacion", - "error_fetching": "Error en cercant de mesas a jorn", - "load_older": "Ne veire mai", - "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida", - "repeated": "repetit", - "show_new": "Ne veire mai", - "up_to_date": "A jorn" - }, - "user_card": { - "approve": "Validar", - "block": "Blocar", - "blocked": "Blocat !", - "deny": "Refusar", - "follow": "Seguir", - "followees": "Abonaments", - "followers": "Seguidors", - "following": "Seguit !", - "follows_you": "Vos sèc !", - "mute": "Amagar", - "muted": "Amagat", - "per_day": "per jorn", - "remote_follow": "Seguir a distància", - "statuses": "Estatuts" - }, - "user_profile": { - "timeline_title": "Flux utilizaire" - }, - "who_to_follow": { - "more": "Mai", - "who_to_follow": "Qui seguir" - } + "chat": { + "title": "Messatjariá" + }, + "finder": { + "error_fetching_user": "Error pendent la recèrca d’un utilizaire", + "find_user": "Cercar un utilizaire" + }, + "general": { + "apply": "Aplicar", + "submit": "Mandar" + }, + "login": { + "login": "Connexion", + "logout": "Desconnexion", + "password": "Senhal", + "placeholder": "e.g. lain", + "register": "Se marcar", + "username": "Nom d’utilizaire" + }, + "nav": { + "chat": "Chat local", + "mentions": "Notificacions", + "public_tl": "Estatuts locals", + "timeline": "Flux d’actualitat", + "twkn": "Lo malhum conegut", + "friend_requests": "Demandas d'abonament" + }, + "notifications": { + "favorited_you": "a aimat vòstre estatut", + "followed_you": "vos a seguit", + "notifications": "Notficacions", + "read": "Legit !", + "repeated_you": "a repetit vòstre estatut", + "broken_favorite": "Estatut desconegut, sèm a lo cercar...", + "load_older": "Cargar las notificaciones mai ancianas" + }, + "post_status": { + "content_warning": "Avís de contengut (opcional)", + "default": "Escrivètz aquí vòstre estatut.", + "posting": "Mandadís", + "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.", + "account_not_locked_warning_link": "clavat", + "attachments_sensitive": "Marcar las pèças juntas coma sensiblas", + "content_type": { + "plain_text": "Tèxte brut" + }, + "direct_warning": "Aquesta publicacion serà pas que visibla pels utilizaires mencionats.", + "scope": { + "direct": "Dirècte - Publicar pels utilizaires mencionats solament", + "private": "Seguidors solament - Publicar pels sols seguidors", + "public": "Public - Publicar pel flux d’actualitat public", + "unlisted": "Pas listat - Publicar pas pel flux public" + } + }, + "registration": { + "bio": "Biografia", + "email": "Adreça de corrièl", + "fullname": "Nom complèt", + "password_confirm": "Confirmar lo senhal", + "registration": "Inscripcion", + "token": "Geton de convidat" + }, + "settings": { + "attachmentRadius": "Pèças juntas", + "attachments": "Pèças juntas", + "autoload": "Activar lo cargament automatic un còp arribat al cap de la pagina", + "avatar": "Avatar", + "avatarAltRadius": "Avatars (Notificacions)", + "avatarRadius": "Avatars", + "background": "Rèire plan", + "bio": "Biografia", + "btnRadius": "Botons", + "cBlue": "Blau (Respondre, seguir)", + "cGreen": "Verd (Repartajar)", + "cOrange": "Irange (Aimar)", + "cRed": "Roge (Anullar)", + "change_password": "Cambiar lo senhal", + "change_password_error": "Una error s’es producha en cambiant lo senhal.", + "changed_password": "Senhal corrèctament cambiat !", + "confirm_new_password": "Confirmatz lo nòu senhal", + "current_avatar": "Vòstre avatar actual", + "current_password": "Senhal actual", + "current_profile_banner": "Bandièra actuala del perfil", + "delete_account": "Suprimir lo compte", + "delete_account_description": "Suprimir vòstre compte e los messatges per sempre.", + "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.", + "delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.", + "filtering": "Filtre", + "filtering_explanation": "Totes los estatuts amb aqueles mots seràn en silenci, un mot per linha", + "follow_export": "Exportar los abonaments", + "follow_export_button": "Exportar vòstres abonaments dins un fichièr csv", + "follow_export_processing": "Tractament, vos demandarem lèu de telecargar lo fichièr", + "follow_import": "Importar los abonaments", + "follow_import_error": "Error en important los seguidors", + "follows_imported": "Seguidors importats. Lo tractament pòt trigar una estona.", + "foreground": "Endavant", + "hide_attachments_in_convo": "Rescondre las pèças juntas dins las conversacions", + "hide_attachments_in_tl": "Rescondre las pèças juntas", + "import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv", + "inputRadius": "Camps tèxte", + "links": "Ligams", + "name": "Nom", + "name_bio": "Nom & Bio", + "new_password": "Nòu senhal", + "nsfw_clickthrough": "Activar lo clic per mostrar los imatges marcats coma pels adults o sensibles", + "panelRadius": "Panèls", + "presets": "Pre-enregistrats", + "profile_background": "Imatge de fons", + "profile_banner": "Bandièra del perfil", + "radii_help": "Configurar los caires arredondits de l’interfàcia (en pixèls)", + "reply_link_preview": "Activar l’apercebut en passar la mirga", + "set_new_avatar": "Cambiar l’avatar", + "set_new_profile_background": "Cambiar l’imatge de fons", + "set_new_profile_banner": "Cambiar de bandièra", + "settings": "Paramètres", + "stop_gifs": "Lançar los GIFs al subrevòl", + "streaming": "Activar lo cargament automatic dels novèls estatus en anar amont", + "text": "Tèxte", + "theme": "Tèma", + "theme_help": "Emplegatz los còdis de color hex (#rrggbb) per personalizar vòstre tèma de color.", + "tooltipRadius": "Astúcias/Alèrta", + "user_settings": "Paramètres utilizaire", + "collapse_subject": "Replegar las publicacions amb de subjèctes", + "data_import_export_tab": "Importar / Exportar las donadas", + "default_vis": "Nivèl de visibilitat per defaut", + "export_theme": "Enregistrar la preconfiguracion", + "general": "General", + "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)", + "hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)", + "import_theme": "Cargar un tèma", + "instance_default": "(defaut : {value})", + "interfaceLanguage": "Lenga de l’interfàcia", + "invalid_theme_imported": "Lo fichièr seleccionat es pas un tèma Pleroma valid. Cap de cambiament es estat fach a vòstre tèma.", + "limited_availability": "Pas disponible per vòstre navigador", + "lock_account_description": "Limitar vòstre compte als seguidors acceptats solament", + "loop_video": "Bocla vidèo", + "loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)", + "notification_visibility": "Tipes de notificacion de mostrar", + "notification_visibility_follows": "Abonaments", + "notification_visibility_likes": "Aiman", + "notification_visibility_mentions": "Mencions", + "notification_visibility_repeats": "Repeticions", + "no_rich_text_description": "Netejar lo format tèxte de totas las publicacions", + "pause_on_unfocused": "Pausar la difusion quand l’onglet es pas seleccionat", + "profile_tab": "Perfil", + "replies_in_timeline": "Responsas del flux", + "reply_visibility_all": "Mostrar totas las responsas", + "reply_visibility_following": "Mostrar pas que las responsas que me son destinada a ieu o un utilizaire que seguissi", + "reply_visibility_self": "Mostrar pas que las responsas que me son destinadas", + "saving_err": "Error en enregistrant los paramètres", + "saving_ok": "Paramètres enregistrats", + "security_tab": "Seguretat", + "values": { + "false": "non", + "true": "òc" + } + }, + "timeline": { + "collapse": "Tampar", + "conversation": "Conversacion", + "error_fetching": "Error en cercant de mesas a jorn", + "load_older": "Ne veire mai", + "repeated": "repetit", + "show_new": "Ne veire mai", + "up_to_date": "A jorn", + "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida" + }, + "user_card": { + "block": "Blocar", + "blocked": "Blocat !", + "follow": "Seguir", + "followees": "Abonaments", + "followers": "Seguidors", + "following": "Seguit !", + "follows_you": "Vos sèc !", + "mute": "Amagar", + "muted": "Amagat", + "per_day": "per jorn", + "remote_follow": "Seguir a distància", + "statuses": "Estatuts", + "approve": "Validar", + "deny": "Refusar" + }, + "user_profile": { + "timeline_title": "Flux utilizaire" + }, + "features_panel": { + "chat": "Discutida", + "gopher": "Gopher", + "media_proxy": "Servidor mandatari dels mèdias", + "scope_options": "Opcions d'encastres", + "text_limit": "Limit de tèxte", + "title": "Foncionalitats", + "who_to_follow": "Qui seguir" + }, + "who_to_follow": { + "more": "Mai", + "who_to_follow": "Qui seguir" + } } \ No newline at end of file From c61e658c1d5b91fddc1851f99191a166c4b8057a Mon Sep 17 00:00:00 2001 From: silkevicious Date: Thu, 25 Oct 2018 09:36:15 +0000 Subject: [PATCH 23/36] Updated italian translation --- src/i18n/it.json | 182 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 163 insertions(+), 19 deletions(-) diff --git a/src/i18n/it.json b/src/i18n/it.json index c61e8c71..8f69e7c1 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -1,47 +1,129 @@ { "general": { - "submit": "Invia" + "submit": "Invia", + "apply": "Applica" }, "nav": { "mentions": "Menzioni", "public_tl": "Sequenza temporale pubblica", "timeline": "Sequenza temporale", - "twkn": "L'intiera rete conosciuta" + "twkn": "L'intera rete conosciuta", + "chat": "Chat Locale", + "friend_requests": "Richieste di Seguirti" }, "notifications": { - "followed_you": "ti ha seguito", + "followed_you": "ti segue", "notifications": "Notifiche", - "read": "Leggi!" + "read": "Leggi!", + "broken_favorite": "Stato sconosciuto, lo sto cercando...", + "favorited_you": "ha messo mi piace al tuo stato", + "load_older": "Carica notifiche più vecchie", + "repeated_you": "ha condiviso il tuo stato" }, "settings": { "attachments": "Allegati", - "autoload": "Abilita caricamento automatico quando si raggiunge il fondo schermo", + "autoload": "Abilita caricamento automatico quando si raggiunge fondo pagina", "avatar": "Avatar", "bio": "Introduzione", - "current_avatar": "Il tuo attuale avatar", - "current_profile_banner": "Sfondo attuale", + "current_avatar": "Il tuo avatar attuale", + "current_profile_banner": "Il tuo banner attuale", "filtering": "Filtri", - "filtering_explanation": "Filtra via le notifiche che contengono le seguenti parole (inserisci rigo per rigo le parole di innesco)", + "filtering_explanation": "Tutti i post contenenti queste parole saranno silenziati, uno per linea", "hide_attachments_in_convo": "Nascondi gli allegati presenti nelle conversazioni", "hide_attachments_in_tl": "Nascondi gli allegati presenti nella sequenza temporale", "name": "Nome", "name_bio": "Nome & Introduzione", - "nsfw_clickthrough": "Abilita la trasparenza degli allegati NSFW", + "nsfw_clickthrough": "Abilita il click per visualizzare gli allegati segnati come NSFW", "profile_background": "Sfondo della tua pagina", - "profile_banner": "Sfondo del tuo profilo", - "reply_link_preview": "Ability il reply-link preview al passaggio del mouse", + "profile_banner": "Banner del tuo profilo", + "reply_link_preview": "Abilita il link per la risposta al passaggio del mouse", "set_new_avatar": "Scegli un nuovo avatar", "set_new_profile_background": "Scegli un nuovo sfondo per la tua pagina", - "set_new_profile_banner": "Scegli un nuovo sfondo per il tuo profilo", - "settings": "Settaggi", + "set_new_profile_banner": "Scegli un nuovo banner per il tuo profilo", + "settings": "Impostazioni", "theme": "Tema", - "user_settings": "Configurazione dell'utente" + "user_settings": "Impostazioni Utente", + "attachmentRadius": "Allegati", + "avatarAltRadius": "Avatar (Notifiche)", + "avatarRadius": "Avatar", + "background": "Sfondo", + "btnRadius": "Pulsanti", + "cBlue": "Blu (Rispondere, seguire)", + "cGreen": "Verde (Condividi)", + "cOrange": "Arancio (Mi piace)", + "cRed": "Rosso (Annulla)", + "change_password": "Cambia Password", + "change_password_error": "C'è stato un problema durante il cambiamento della password.", + "changed_password": "Password cambiata correttamente!", + "collapse_subject": "Riduci post che hanno un oggetto", + "confirm_new_password": "Conferma la nuova password", + "current_password": "Password attuale", + "data_import_export_tab": "Importa / Esporta Dati", + "default_vis": "Visibilità predefinita dei post", + "delete_account": "Elimina Account", + "delete_account_description": "Elimina definitivamente il tuo account e tutti i tuoi messaggi.", + "delete_account_error": "C'è stato un problema durante l'eliminazione del tuo account. Se il problema persiste contatta l'amministratore della tua istanza.", + "delete_account_instructions": "Digita la tua password nel campo sottostante per confermare l'eliminazione dell'account.", + "export_theme": "Salva settaggi", + "follow_export": "Esporta la lista di chi segui", + "follow_export_button": "Esporta la lista di chi segui in un file csv", + "follow_export_processing": "Sto elaborando, presto ti sarà chiesto di scaricare il tuo file", + "follow_import": "Importa la lista di chi segui", + "follow_import_error": "Errore nell'importazione della lista di chi segui", + "follows_imported": "Importazione riuscita! L'elaborazione richiederà un po' di tempo.", + "foreground": "In primo piano", + "general": "Generale", + "hide_post_stats": "Nascondi statistiche dei post (es. il numero di mi piace)", + "hide_user_stats": "Nascondi statistiche dell'utente (es. il numero di chi ti segue)", + "import_followers_from_a_csv_file": "Importa una lista di chi segui da un file csv", + "import_theme": "Carica settaggi", + "inputRadius": "Campi di testo", + "instance_default": "(predefinito: {value})", + "interfaceLanguage": "Linguaggio dell'interfaccia", + "invalid_theme_imported": "Il file selezionato non è un file di tema per Pleroma supportato. Il tuo tema non è stato modificato.", + "limited_availability": "Non disponibile nel tuo browser", + "links": "Collegamenti", + "lock_account_description": "Limita il tuo account solo per contatti approvati", + "loop_video": "Riproduci video in ciclo continuo", + "loop_video_silent_only": "Riproduci solo video senza audio in ciclo continuo (es. le gif di Mastodon)", + "new_password": "Nuova password", + "notification_visibility": "Tipi di notifiche da mostrare", + "notification_visibility_follows": "Nuove persone ti seguono", + "notification_visibility_likes": "Mi piace", + "notification_visibility_mentions": "Menzioni", + "notification_visibility_repeats": "Condivisioni", + "no_rich_text_description": "Togli la formattazione del testo da tutti i post", + "panelRadius": "Pannelli", + "pause_on_unfocused": "Metti in pausa l'aggiornamento continuo quando la scheda non è in primo piano", + "presets": "Valori predefiniti", + "profile_tab": "Profilo", + "radii_help": "Imposta l'arrotondamento dei bordi (in pixel)", + "replies_in_timeline": "Risposte nella sequenza temporale", + "reply_visibility_all": "Mostra tutte le risposte", + "reply_visibility_following": "Mostra solo le risposte dirette a me o agli utenti che seguo", + "reply_visibility_self": "Mostra solo risposte dirette a me", + "saving_err": "Errore nel salvataggio delle impostazioni", + "saving_ok": "Impostazioni salvate", + "security_tab": "Sicurezza", + "stop_gifs": "Riproduci GIF al passaggio del cursore del mouse", + "streaming": "Abilita aggiornamento automatico dei nuovi post quando si è in alto alla pagina", + "text": "Testo", + "theme_help": "Usa codici colore esadecimali (#rrggbb) per personalizzare il tuo schema di colori.", + "tooltipRadius": "Descrizioni/avvisi", + "values": { + "false": "no", + "true": "si" + } }, "timeline": { - "error_fetching": "Errori nel prelievo aggiornamenti", + "error_fetching": "Errore nel prelievo aggiornamenti", "load_older": "Carica messaggi più vecchi", "show_new": "Mostra nuovi", - "up_to_date": "Aggiornato" + "up_to_date": "Aggiornato", + "collapse": "Riduci", + "conversation": "Conversazione", + "no_retweet_hint": "La visibilità del post è impostata solo per chi ti segue o messaggio diretto e non può essere condiviso", + "repeated": "condiviso" }, "user_card": { "follow": "Segui", @@ -49,9 +131,71 @@ "followers": "Chi ti segue", "following": "Lo stai seguendo!", "follows_you": "Ti segue!", - "mute": "Ammutolisci", - "muted": "Ammutoliti", + "mute": "Silenzia", + "muted": "Silenziato", "per_day": "al giorno", - "statuses": "Messaggi" + "statuses": "Messaggi", + "approve": "Approva", + "block": "Blocca", + "blocked": "Bloccato!", + "deny": "Nega", + "remote_follow": "Segui da remoto" + }, + "chat": { + "title": "Chat" + }, + "features_panel": { + "chat": "Chat", + "gopher": "Gopher", + "media_proxy": "Media proxy", + "scope_options": "Opzioni di visibilità", + "text_limit": "Lunghezza limite", + "title": "Caratteristiche", + "who_to_follow": "Chi seguire" + }, + "finder": { + "error_fetching_user": "Errore nel recupero dell'utente", + "find_user": "Trova utente" + }, + "login": { + "login": "Accedi", + "logout": "Disconnettiti", + "password": "Password", + "placeholder": "es. lain", + "register": "Registrati", + "username": "Nome utente" + }, + "post_status": { + "account_not_locked_warning": "Il tuo account non è {0}. Chiunque può seguirti e vedere i tuoi post riservati a chi ti segue.", + "account_not_locked_warning_link": "bloccato", + "attachments_sensitive": "Segna allegati come sensibili", + "content_type": { + "plain_text": "Testo normale" + }, + "content_warning": "Oggetto (facoltativo)", + "default": "Appena atterrato in L.A.", + "direct_warning": "Questo post sarà visibile solo dagli utenti menzionati.", + "posting": "Pubblica", + "scope": { + "direct": "Diretto - Pubblicato solo per gli utenti menzionati", + "private": "Solo per chi ti segue - Visibile solo da chi ti segue", + "public": "Pubblico - Visibile sulla sequenza temporale pubblica", + "unlisted": "Non elencato - Non visibile sulla sequenza temporale pubblica" + } + }, + "registration": { + "bio": "Introduzione", + "email": "Email", + "fullname": "Nome visualizzato", + "password_confirm": "Conferma password", + "registration": "Registrazione", + "token": "Codice d'invito" + }, + "user_profile": { + "timeline_title": "Sequenza Temporale dell'Utente" + }, + "who_to_follow": { + "more": "Più", + "who_to_follow": "Chi seguire" } } From 0a261d2a7d04e457b53885bca1c6c87fe953db9b Mon Sep 17 00:00:00 2001 From: Exilat Date: Thu, 25 Oct 2018 17:19:31 +0000 Subject: [PATCH 24/36] Adds Occitan locale --- static/timeago-oc.json | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 static/timeago-oc.json diff --git a/static/timeago-oc.json b/static/timeago-oc.json new file mode 100644 index 00000000..7e439871 --- /dev/null +++ b/static/timeago-oc.json @@ -0,0 +1,10 @@ +[ + "ara meteis", + ["fa %s s", "fa %s s"], + ["fa %s min", "fa %s min"], + ["fa %s h", "fa %s h"], + ["fa %s dia", "fa %s jorns"], + ["fa %s setm.", "fa %s setm."], + ["fa %s mes", "fa %s meses"], + ["fa %s any", "fa %s ans"] +] From 01aba3f9c6fa89106cf5b6322b7919f26e92b21d Mon Sep 17 00:00:00 2001 From: Hakaba Hitoyo Date: Fri, 26 Oct 2018 10:13:53 +0900 Subject: [PATCH 25/36] adapt to destructive change of api --- src/main.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/main.js b/src/main.js index 1b1780df..53cee313 100644 --- a/src/main.js +++ b/src/main.js @@ -217,9 +217,20 @@ window.fetch('/nodeinfo/2.0.json') .then((res) => res.json()) .then((data) => { const metadata = data.metadata - store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: data.metadata.mediaProxy }) - store.dispatch('setInstanceOption', { name: 'chatAvailable', value: data.metadata.chat }) - store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: data.metadata.gopher }) + + const features = metadata.features + store.dispatch('setInstanceOption', { + name: 'mediaProxyAvailable', + value: features.findIndex((element, index, array) => (element === 'media_proxy')) >= 0 + }) + store.dispatch('setInstanceOption', { + name: 'chatAvailable', + value: features.findIndex((element, index, array) => (element === 'chat')) >= 0 + }) + store.dispatch('setInstanceOption', { + name: 'gopherAvailable', + value: features.findIndex((element, index, array) => (element === 'gopher')) >= 0 + }) const suggestions = metadata.suggestions store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) From 630c6e3e4417be8d79bf3ade011f07d78bf99b44 Mon Sep 17 00:00:00 2001 From: hakabahitoyo Date: Fri, 26 Oct 2018 15:08:51 +0900 Subject: [PATCH 26/36] simplify code --- src/main.js | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/main.js b/src/main.js index 53cee313..b71ae4cb 100644 --- a/src/main.js +++ b/src/main.js @@ -219,18 +219,9 @@ window.fetch('/nodeinfo/2.0.json') const metadata = data.metadata const features = metadata.features - store.dispatch('setInstanceOption', { - name: 'mediaProxyAvailable', - value: features.findIndex((element, index, array) => (element === 'media_proxy')) >= 0 - }) - store.dispatch('setInstanceOption', { - name: 'chatAvailable', - value: features.findIndex((element, index, array) => (element === 'chat')) >= 0 - }) - store.dispatch('setInstanceOption', { - name: 'gopherAvailable', - value: features.findIndex((element, index, array) => (element === 'gopher')) >= 0 - }) + store.dispatch('setInstanceOption', { name: 'mediaProxyAvailable', value: features.includes('media_proxy') }) + store.dispatch('setInstanceOption', { name: 'chatAvailable', value: features.includes('chat') }) + store.dispatch('setInstanceOption', { name: 'gopherAvailable', value: features.includes('gopher') }) const suggestions = metadata.suggestions store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled }) From 6dd675566ed2af047e12ee6d6b4308860e708809 Mon Sep 17 00:00:00 2001 From: Exilat Date: Sun, 28 Oct 2018 12:38:40 +0000 Subject: [PATCH 27/36] Copy-Paste too fast from the Catalan file apparently. Now it's in good Occitan. --- static/timeago-oc.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/timeago-oc.json b/static/timeago-oc.json index 7e439871..a6b3932f 100644 --- a/static/timeago-oc.json +++ b/static/timeago-oc.json @@ -3,8 +3,8 @@ ["fa %s s", "fa %s s"], ["fa %s min", "fa %s min"], ["fa %s h", "fa %s h"], - ["fa %s dia", "fa %s jorns"], + ["fa %s jorn", "fa %s jorns"], ["fa %s setm.", "fa %s setm."], ["fa %s mes", "fa %s meses"], - ["fa %s any", "fa %s ans"] + ["fa %s an", "fa %s ans"] ] From 4f258b4940c68722c3c7f5127c4abc083ffd936d Mon Sep 17 00:00:00 2001 From: dgold Date: Fri, 2 Nov 2018 20:08:11 +0000 Subject: [PATCH 28/36] Added Irish (Gaeilge) Language All translations checked with tearma.ie & acmhainn.ie for language use and technical accuracy. --- src/i18n/ga.json | 201 +++++++++++++++++++++++++++++++++++++++++ src/i18n/messages.js | 1 + static/timeago-ga.json | 10 ++ 3 files changed, 212 insertions(+) create mode 100644 src/i18n/ga.json create mode 100644 static/timeago-ga.json diff --git a/src/i18n/ga.json b/src/i18n/ga.json new file mode 100644 index 00000000..64461202 --- /dev/null +++ b/src/i18n/ga.json @@ -0,0 +1,201 @@ +{ + "chat": { + "title": "Comhrá" + }, + "features_panel": { + "chat": "Comhrá", + "gopher": "Gófar", + "media_proxy": "Seachfhreastalaí meáin", + "scope_options": "Rogha scóip", + "text_limit": "Teorainn Téacs", + "title": "Gnéithe", + "who_to_follow": "Daoine le leanúint" + }, + "finder": { + "error_fetching_user": "Earráid a aimsiú d'úsáideoir", + "find_user": "Aimsigh úsáideoir" + }, + "general": { + "apply": "Feidhmigh", + "submit": "Deimhnigh" + }, + "login": { + "login": "Logáil isteach", + "logout": "Logáil amach", + "password": "Pasfhocal", + "placeholder": "m.sh. Daire", + "register": "Clárú", + "username": "Ainm Úsáideora" + }, + "nav": { + "chat": "Comhrá Áitiúil", + "friend_requests": "Iarratas ar Cairdeas", + "mentions": "Tagairt", + "public_tl": "Amlíne Poiblí", + "timeline": "Amlíne", + "twkn": "An Líonra Iomlán" + }, + "notifications": { + "broken_favorite": "Post anaithnid. Cuardach dó...", + "favorited_you": "toghadh le do phost", + "followed_you": "lean tú", + "load_older": "Luchtaigh fógraí aosta", + "notifications": "Fógraí", + "read": "Léigh!", + "repeated_you": "athphostáil tú" + }, + "post_status": { + "account_not_locked_warning": "Níl do chuntas {0}. Is féidir le duine ar bith a leanúint leat chun do phoist leantacha amháin a fheiceáil.", + "account_not_locked_warning_link": "faoi glas", + "attachments_sensitive": "Marcáil ceangaltán mar íogair", + "content_type": { + "plain_text": "Gnáth-théacs" + }, + "content_warning": "Teideal (roghnach)", + "default": "Lá iontach anseo i nGaillimh", + "direct_warning": "Ní bheidh an post seo le feiceáil ach amháin do na húsáideoirí atá luaite.", + "posting": "Post nua", + "scope": { + "direct": "Díreach - Post chuig úsáideoirí luaite amháin", + "private": "Leanúna amháin - Post chuig lucht leanúna amháin", + "public": "Poiblí - Post chuig amlínte poiblí", + "unlisted": "Neamhliostaithe - Ná cuir post chuig amlínte poiblí" + } + }, + "registration": { + "bio": "Scéal saoil", + "email": "Ríomhphost", + "fullname": "Ainm taispeána'", + "password_confirm": "Deimhnigh do pasfhocal", + "registration": "Clárú", + "token": "Cód cuireadh" + }, + "settings": { + "attachmentRadius": "Ceangaltáin", + "attachments": "Ceangaltáin", + "autoload": "Cumasaigh luchtú uathoibríoch nuair a scrollaítear go bun", + "avatar": "Phictúir phrófíle", + "avatarAltRadius": "Phictúirí phrófíle (Fograí)", + "avatarRadius": "Phictúirí phrófíle", + "background": "Cúlra", + "bio": "Scéal saoil", + "btnRadius": "Cnaipí", + "cBlue": "Gorm (Freagra, lean)", + "cGreen": "Glas (Athphóstail)", + "cOrange": "Oráiste (Cosúil)", + "cRed": "Dearg (Cealaigh)", + "change_password": "Athraigh do pasfhocal", + "change_password_error": "Bhí fadhb ann ag athrú do pasfhocail", + "changed_password": "Athraigh an pasfhocal go rathúil!", + "collapse_subject": "Poist a chosc le teidil", + "confirm_new_password": "Deimhnigh do pasfhocal nua", + "current_avatar": "Phictúir phrófíle", + "current_password": "Pasfhocal reatha", + "current_profile_banner": "Phictúir ceanntáisc", + "data_import_export_tab": "Iompórtáil / Easpórtáil Sonraí", + "default_vis": "Scóip infheicthe réamhshocraithe", + "delete_account": "Scrios cuntas", + "delete_account_description": "Do chuntas agus do chuid teachtaireachtaí go léir a scriosadh go buan.", + "delete_account_error": "Bhí fadhb ann a scriosadh do chuntas. Má leanann sé seo, téigh i dteagmháil le do riarthóir.", + "delete_account_instructions": "Scríobh do phasfhocal san ionchur thíos chun deimhniú a scriosadh.", + "export_theme": "Sábháil Téama", + "filtering": "Scagadh", + "filtering_explanation": "Beidh gach post ina bhfuil na focail seo i bhfolach, ceann in aghaidh an líne", + "follow_export": "Easpórtáil do leanann", + "follow_export_button": "Easpórtáil do leanann chuig comhad csv", + "follow_export_processing": "Próiseáil. Iarrtar ort go luath an comhad a íoslódáil.", + "follow_import": "Iompórtáil do leanann", + "follow_import_error": "Earráid agus do leanann a iompórtáil", + "follows_imported": "Do leanann iompórtáil! Tógfaidh an próiseas iad le tamall.", + "foreground": "Tulra", + "general": "Ginearálta", + "hide_attachments_in_convo": "Folaigh ceangaltáin i comhráite", + "hide_attachments_in_tl": "Folaigh ceangaltáin sa amlíne", + "hide_post_stats": "Folaigh staitisticí na bpost (m.sh. líon na n-athrá)", + "hide_user_stats": "Folaigh na staitisticí úsáideora (m.sh. líon na leantóiri)", + "import_followers_from_a_csv_file": "Iompórtáil leanann ó chomhad csv", + "import_theme": "Luchtaigh Téama", + "inputRadius": "Limistéar iontrála", + "instance_default": "(Réamhshocrú: {value})", + "interfaceLanguage": "Teanga comhéadain", + "invalid_theme_imported": "Ní téama bailí é an comhad dícheangailte. Níor rinneadh aon athruithe.", + "limited_availability": "Níl sé ar fáil i do bhrabhsálaí", + "links": "Naisc", + "lock_account_description": "Srian a chur ar do chuntas le lucht leanúna ceadaithe amháin", + "loop_video": "Lúb físeáin", + "loop_video_silent_only": "Lúb físeáin amháin gan fuaim (i.e. Mastodon's \"gifs\")", + "name": "Ainm", + "name_bio": "Ainm ⁊ Scéal", + "new_password": "Pasfhocal nua'", + "notification_visibility": "Cineálacha fógraí a thaispeáint", + "notification_visibility_follows": "Leana", + "notification_visibility_likes": "Thaithin", + "notification_visibility_mentions": "Tagairt", + "notification_visibility_repeats": "Atphostáil", + "no_rich_text_description": "Bain formáidiú téacs saibhir ó gach post", + "nsfw_clickthrough": "Cumasaigh an ceangaltán NSFW cliceáil ar an gcnaipe", + "panelRadius": "Painéil", + "pause_on_unfocused": "Sruthú ar sos nuair a bhíonn an fócas caillte", + "presets": "Réamhshocruithe", + "profile_background": "Cúlra Próifíl", + "profile_banner": "Phictúir Ceanntáisc", + "profile_tab": "Próifíl", + "radii_help": "Cruinniú imeall comhéadan a chumrú (i bpicteilíní)", + "replies_in_timeline": "Freagraí sa amlíne", + "reply_link_preview": "Cumasaigh réamhamharc nasc freagartha ar chlár na luiche", + "reply_visibility_all": "Taispeáin gach freagra", + "reply_visibility_following": "Taispeáin freagraí amháin atá dírithe ar mise nó ar úsáideoirí atá mé ag leanúint", + "reply_visibility_self": "Taispeáin freagraí amháin atá dírithe ar mise", + "saving_err": "Earráid socruithe a shábháil", + "saving_ok": "Socruithe sábháilte", + "security_tab": "Slándáil", + "set_new_avatar": "Athraigh do phictúir phrófíle", + "set_new_profile_background": "Athraigh do cúlra próifíl", + "set_new_profile_banner": "Athraigh do phictúir ceanntáisc", + "settings": "Socruithe", + "stop_gifs": "Seinn GIFs ar an scáileán", + "streaming": "Cumasaigh post nua a shruthú uathoibríoch nuair a scrollaítear go barr an leathanaigh", + "text": "Téacs", + "theme": "Téama", + "theme_help": "Úsáid cód daith hex (#rrggbb) chun do schéim a saincheapadh", + "tooltipRadius": "Bileoga eolais", + "user_settings": "Socruithe úsáideora", + "values": { + "false": "níl", + "true": "tá" + } + }, + "timeline": { + "collapse": "Folaigh", + "conversation": "Cómhra", + "error_fetching": "Earráid a thabhairt cothrom le dáta", + "load_older": "Luchtaigh níos mó", + "no_retweet_hint": "Tá an post seo marcáilte mar lucht leanúna amháin nó díreach agus ní féidir é a athphostáil", + "repeated": "athphostáil", + "show_new": "Taispeáin nua", + "up_to_date": "Nuashonraithe" + }, + "user_card": { + "approve": "Údaraigh", + "block": "Cosc", + "blocked": "Cuireadh coisc!", + "deny": "Diúltaigh", + "follow": "Lean", + "followees": "Leantóirí", + "followers": "Á Leanúint", + "following": "Á Leanúint", + "follows_you": "Leanann tú", + "mute": "Cuir i mód ciúin", + "muted": "Mód ciúin", + "per_day": "laethúil", + "remote_follow": "Leaníunt iargúlta", + "statuses": "Poist" + }, + "user_profile": { + "timeline_title": "Amlíne úsáideora" + }, + "who_to_follow": { + "more": "Feach uile", + "who_to_follow": "Daoine le leanúint" + } +} diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 4cd3c4e2..18308a72 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -17,6 +17,7 @@ const messages = { et: require('./et.json'), fi: require('./fi.json'), fr: require('./fr.json'), + ga: require('./ga.json'), he: require('./he.json'), hu: require('./hu.json'), it: require('./it.json'), diff --git a/static/timeago-ga.json b/static/timeago-ga.json new file mode 100644 index 00000000..bdb7b6c4 --- /dev/null +++ b/static/timeago-ga.json @@ -0,0 +1,10 @@ +[ + "Anois", + ["%s s", "%s s"], + ["%s n", "%s nóimeád"], + ["%s u", "%s uair"], + ["%s l", "%s lá"], + ["%s se", "%s seachtaine"], + ["%s m", "%s mí"], + ["%s b", "%s bliainta"] +] \ No newline at end of file From 6f668df6976d7210a9768931b5f4b58994289479 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Wed, 7 Nov 2018 17:20:33 +0100 Subject: [PATCH 29/36] Count spoiler text in the character count. Fixes #135. --- src/components/post_status_form/post_status_form.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index a84e764c..af7d8810 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -53,7 +53,7 @@ const PostStatusForm = { posting: false, highlighted: 0, newStatus: { - spoilerText: this.subject, + spoilerText: this.subject || '', status: statusText, contentType: 'text/plain', nsfw: false, @@ -128,6 +128,9 @@ const PostStatusForm = { statusLength () { return this.newStatus.status.length }, + spoilerTextLength () { + return this.newStatus.spoilerText.length + }, statusLengthLimit () { return this.$store.state.instance.textlimit }, @@ -135,10 +138,10 @@ const PostStatusForm = { return this.statusLengthLimit > 0 }, charactersLeft () { - return this.statusLengthLimit - this.statusLength + return this.statusLengthLimit - (this.statusLength + this.spoilerTextLength) }, isOverLengthLimit () { - return this.hasStatusLengthLimit && (this.statusLength > this.statusLengthLimit) + return this.hasStatusLengthLimit && (this.charactersLeft < 0) }, scopeOptionsEnabled () { return this.$store.state.instance.scopeOptionsEnabled From 2c2c4452b93efa53ff03e871e525b3a096855063 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Thu, 8 Nov 2018 19:34:59 +0100 Subject: [PATCH 30/36] Fix posting. --- src/components/post_status_form/post_status_form.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index af7d8810..c0e34d72 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -226,6 +226,7 @@ const PostStatusForm = { if (!data.error) { this.newStatus = { status: '', + spoilerText: '', files: [], visibility: newStatus.visibility, contentType: newStatus.contentType From e1d21512a9c841c1623f1cdf6ffabadc86a1b21f Mon Sep 17 00:00:00 2001 From: Nebula Date: Fri, 9 Nov 2018 05:42:32 +0000 Subject: [PATCH 31/36] Add Chinese language --- src/i18n/messages.js | 3 +- src/i18n/zh-CN.json | 201 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 203 insertions(+), 1 deletion(-) create mode 100644 src/i18n/zh-CN.json diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 4cd3c4e2..17a7faa7 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -26,7 +26,8 @@ const messages = { pl: require('./pl.json'), pt: require('./pt.json'), ro: require('./ro.json'), - ru: require('./ru.json') + ru: require('./ru.json'), + 'zh-CN': require('./zh-CN.json') } export default messages diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json new file mode 100644 index 00000000..f30cfe0b --- /dev/null +++ b/src/i18n/zh-CN.json @@ -0,0 +1,201 @@ +{ + "chat": { + "title": "聊天" + }, + "features_panel": { + "chat": "聊天", + "gopher": "Gopher", + "media_proxy": "媒体代理", + "scope_options": "可见范围设置", + "text_limit": "文本长度限制", + "title": "功能", + "who_to_follow": "推荐关注" + }, + "finder": { + "error_fetching_user": "获取用户时发生错误", + "find_user": "寻找用户" + }, + "general": { + "apply": "应用", + "submit": "提交" + }, + "login": { + "login": "登录", + "logout": "登出", + "password": "密码", + "placeholder": "例如：lain", + "register": "注册", + "username": "用户名" + }, + "nav": { + "chat": "本地聊天", + "friend_requests": "关注请求", + "mentions": "提及", + "public_tl": "公共时间线", + "timeline": "时间线", + "twkn": "所有已知网络" + }, + "notifications": { + "broken_favorite": "未知的状态，正在搜索中...", + "favorited_you": "收藏了你的状态", + "followed_you": "关注了你", + "load_older": "加载更早的通知", + "notifications": "通知", + "read": "Read!", + "repeated_you": "转发了你的状态" + }, + "post_status": { + "account_not_locked_warning": "你的帐号没有 {0}。任何人都可以关注你并浏览你的上锁内容。", + "account_not_locked_warning_link": "上锁", + "attachments_sensitive": "标记附件为敏感内容", + "content_type": { + "plain_text": "纯文本" + }, + "content_warning": "主题（可选）", + "default": "刚刚抵达上海", + "direct_warning": "本条内容只有被提及的用户能够看到。", + "posting": "发送", + "scope": { + "direct": "私信 - 只发送给被提及的用户", + "private": "仅关注者 - 只有关注了你的人能看到", + "public": "公共 - 发送到公共时间轴", + "unlisted": "不公开 - 所有人可见，但不会发送到公共时间轴" + } + }, + "registration": { + "bio": "简介", + "email": "电子邮箱", + "fullname": "全名", + "password_confirm": "确认密码", + "registration": "注册", + "token": "邀请码" + }, + "settings": { + "attachmentRadius": "附件", + "attachments": "附件", + "autoload": "启用滚动到底部时自动加载", + "avatar": "头像", + "avatarAltRadius": "头像（通知）", + "avatarRadius": "头像", + "background": "背景", + "bio": "简介", + "btnRadius": "按钮", + "cBlue": "蓝色（回复，关注）", + "cGreen": "绿色（转发）", + "cOrange": "橙色（收藏）", + "cRed": "红色（取消）", + "change_password": "修改密码", + "change_password_error": "修改密码的时候出了点问题。", + "changed_password": "成功修改了密码！", + "collapse_subject": "折叠带主题的内容", + "confirm_new_password": "确认新密码", + "current_avatar": "当前头像", + "current_password": "当前密码", + "current_profile_banner": "您当前的横幅图片", + "data_import_export_tab": "数据导入/导出", + "default_vis": "默认可见范围", + "delete_account": "删除账户", + "delete_account_description": "永久删除你的帐号和所有消息。", + "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。", + "delete_account_instructions": "在下面输入你的密码来确认删除账户", + "export_theme": "Save preset", + "filtering": "过滤器", + "filtering_explanation": "所有包含以下词汇的图片都会被隐藏，一行一个", + "follow_export": "导出关注", + "follow_export_button": "将关注导出成 csv 文件", + "follow_export_processing": "正在处理，过一会儿就可以下载你的文件了", + "follow_import": "导入关注", + "follow_import_error": "导入关注时错误", + "follows_imported": "关注已导入！尚需要一些时间来处理。", + "foreground": "前景", + "general": "通用", + "hide_attachments_in_convo": "在对话中隐藏附件", + "hide_attachments_in_tl": "在时间线上隐藏附件", + "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)", + "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）", + "import_followers_from_a_csv_file": "从 csv 文件中导入关注", + "import_theme": "加载预置主题", + "inputRadius": "输入框", + "instance_default": "(默认：{value})", + "interfaceLanguage": "界面语言", + "invalid_theme_imported": "你所选择的主题文件不被 Pleroma 支持，因此主题未被修改。", + "limited_availability": "在你的浏览器中无法使用", + "links": "链接", + "lock_account_description": "你需要手动审核关注请求", + "loop_video": "循环视频", + "loop_video_silent_only": "只循环没有声音的视频（例如：Mastodon 里的“GIF”）", + "name": "名字", + "name_bio": "名字及简介", + "new_password": "新密码", + "notification_visibility": "要显示的通知类型", + "notification_visibility_follows": "关注", + "notification_visibility_likes": "点赞", + "notification_visibility_mentions": "提及", + "notification_visibility_repeats": "转发", + "no_rich_text_description": "不显示富文本格式", + "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开", + "panelRadius": "面板", + "pause_on_unfocused": "在离开页面时暂停时间线推送", + "presets": "Presets", + "profile_background": "个人资料背景图", + "profile_banner": "横幅图片", + "profile_tab": "个人资料", + "radii_help": "设置界面边缘圆角 (单位：像素)", + "replies_in_timeline": "时间线中的回复", + "reply_link_preview": "启用鼠标悬停时预览回复链接", + "reply_visibility_all": "显示所有回复", + "reply_visibility_following": "只显示发送给我的回复或者发送给我关注的用户的回复", + "reply_visibility_self": "只显示发送给我的回复", + "saving_err": "保存设置时发生错误", + "saving_ok": "设置已保存", + "security_tab": "安全", + "set_new_avatar": "设置新头像", + "set_new_profile_background": "设置新的个人资料背景", + "set_new_profile_banner": "设置新的横幅图片", + "settings": "设置", + "stop_gifs": "鼠标悬停时播放GIF", + "streaming": "开启滚动到顶部时的自动推送", + "text": "文本", + "theme": "主题", + "theme_help": "使用十六进制代码（#rrggbb）来设置主题颜色。", + "tooltipRadius": "提醒", + "user_settings": "用户设置", + "values": { + "false": "否", + "true": "是" + } + }, + "timeline": { + "collapse": "折叠", + "conversation": "对话", + "error_fetching": "获取更新时发生错误", + "load_older": "加载更早的状态", + "no_retweet_hint": "这条内容仅关注者可见，或者是私信，因此不能转发。", + "repeated": "已转发", + "show_new": "显示新内容", + "up_to_date": "已是最新" + }, + "user_card": { + "approve": "允许", + "block": "屏蔽", + "blocked": "已屏蔽！", + "deny": "拒绝", + "follow": "关注", + "followees": "正在关注", + "followers": "关注者", + "following": "正在关注！", + "follows_you": "关注了你！", + "mute": "隐藏", + "muted": "已隐藏", + "per_day": "每天", + "remote_follow": "跨站关注", + "statuses": "状态" + }, + "user_profile": { + "timeline_title": "用户时间线" + }, + "who_to_follow": { + "more": "更多", + "who_to_follow": "推荐关注" + } +} \ No newline at end of file From 819e9ce6a304e2391c23f523b080d3d9b3263baa Mon Sep 17 00:00:00 2001 From: Starmancer Date: Fri, 9 Nov 2018 14:15:55 +0800 Subject: [PATCH 32/36] update Chinese translation --- src/i18n/messages.js | 2 +- src/i18n/{zh-CN.json => zh.json} | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) rename src/i18n/{zh-CN.json => zh.json} (96%) diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 17a7faa7..75801e08 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -27,7 +27,7 @@ const messages = { pt: require('./pt.json'), ro: require('./ro.json'), ru: require('./ru.json'), - 'zh-CN': require('./zh-CN.json') + zh: require('./zh.json') } export default messages diff --git a/src/i18n/zh-CN.json b/src/i18n/zh.json similarity index 96% rename from src/i18n/zh-CN.json rename to src/i18n/zh.json index f30cfe0b..a1c8ff0e 100644 --- a/src/i18n/zh-CN.json +++ b/src/i18n/zh.json @@ -98,9 +98,9 @@ "delete_account_description": "永久删除你的帐号和所有消息。", "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。", "delete_account_instructions": "在下面输入你的密码来确认删除账户", - "export_theme": "Save preset", + "export_theme": "保存预置主题", "filtering": "过滤器", - "filtering_explanation": "所有包含以下词汇的图片都会被隐藏，一行一个", + "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个", "follow_export": "导出关注", "follow_export_button": "将关注导出成 csv 文件", "follow_export_processing": "正在处理，过一会儿就可以下载你的文件了", @@ -136,15 +136,15 @@ "nsfw_clickthrough": "将不和谐附件隐藏，点击才能打开", "panelRadius": "面板", "pause_on_unfocused": "在离开页面时暂停时间线推送", - "presets": "Presets", + "presets": "预置", "profile_background": "个人资料背景图", "profile_banner": "横幅图片", "profile_tab": "个人资料", - "radii_help": "设置界面边缘圆角 (单位：像素)", + "radii_help": "设置界面边缘的圆角 (单位：像素)", "replies_in_timeline": "时间线中的回复", "reply_link_preview": "启用鼠标悬停时预览回复链接", "reply_visibility_all": "显示所有回复", - "reply_visibility_following": "只显示发送给我的回复或者发送给我关注的用户的回复", + "reply_visibility_following": "只显示发送给我的回复/发送给我关注的用户的回复", "reply_visibility_self": "只显示发送给我的回复", "saving_err": "保存设置时发生错误", "saving_ok": "设置已保存", @@ -198,4 +198,4 @@ "more": "更多", "who_to_follow": "推荐关注" } -} \ No newline at end of file +} From 4c5073a66c609af5cadad6985195748b19e4afdf Mon Sep 17 00:00:00 2001 From: Starmancer Date: Fri, 9 Nov 2018 14:29:14 +0800 Subject: [PATCH 33/36] minor modification of Chinese translation --- src/i18n/zh.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/zh.json b/src/i18n/zh.json index a1c8ff0e..7ad23c57 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -41,7 +41,7 @@ "followed_you": "关注了你", "load_older": "加载更早的通知", "notifications": "通知", - "read": "Read!", + "read": "阅读！", "repeated_you": "转发了你的状态" }, "post_status": { @@ -73,7 +73,7 @@ "settings": { "attachmentRadius": "附件", "attachments": "附件", - "autoload": "启用滚动到底部时自动加载", + "autoload": "启用滚动到底部时的自动加载", "avatar": "头像", "avatarAltRadius": "头像（通知）", "avatarRadius": "头像", @@ -98,7 +98,7 @@ "delete_account_description": "永久删除你的帐号和所有消息。", "delete_account_error": "删除账户时发生错误，如果一直删除不了，请联系实例管理员。", "delete_account_instructions": "在下面输入你的密码来确认删除账户", - "export_theme": "保存预置主题", + "export_theme": "导出预置主题", "filtering": "过滤器", "filtering_explanation": "所有包含以下词汇的内容都会被隐藏，一行一个", "follow_export": "导出关注", @@ -114,12 +114,12 @@ "hide_post_stats": "隐藏推文相关的统计数据(例如：收藏的次数)", "hide_user_stats": "隐藏用户的统计数据（例如：关注者的数量）", "import_followers_from_a_csv_file": "从 csv 文件中导入关注", - "import_theme": "加载预置主题", + "import_theme": "导入预置主题", "inputRadius": "输入框", "instance_default": "(默认：{value})", "interfaceLanguage": "界面语言", - "invalid_theme_imported": "你所选择的主题文件不被 Pleroma 支持，因此主题未被修改。", - "limited_availability": "在你的浏览器中无法使用", + "invalid_theme_imported": "您所选择的主题文件不被 Pleroma 支持，因此主题未被修改。", + "limited_availability": "在您的浏览器中无法使用", "links": "链接", "lock_account_description": "你需要手动审核关注请求", "loop_video": "循环视频", From ae927f86288e4a649de0eb4a34262c3e7429dda7 Mon Sep 17 00:00:00 2001 From: Vinzenz Vietzke Date: Mon, 12 Nov 2018 22:39:55 +0100 Subject: [PATCH 34/36] updated and completed German translation --- src/i18n/de.json | 69 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 60 insertions(+), 9 deletions(-) diff --git a/src/i18n/de.json b/src/i18n/de.json index 4e742bad..73de5949 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -2,6 +2,15 @@ "chat": { "title": "Chat" }, + "features_panel": { + "chat": "Chat", + "gopher": "Gopher", + "media_proxy": "Media Proxy", + "scope_options": "Scope options", + "text_limit": "Textlimit", + "title": "Features", + "who_to_follow": "Who to follow" + }, "finder": { "error_fetching_user": "Fehler beim Suchen des Benutzers", "find_user": "Finde Benutzer" @@ -24,11 +33,13 @@ "mentions": "Erwähnungen", "public_tl": "Lokale Zeitleiste", "timeline": "Zeitleiste", - "twkn": "Das gesamte Netzwerk" + "twkn": "Das gesamte bekannte Netzwerk" }, "notifications": { + "broken_favorite": "Unbekannte Nachricht, suche danach...", "favorited_you": "favorisierte deine Nachricht", "followed_you": "folgt dir", + "load_older": "Ältere Benachrichtigungen laden", "notifications": "Benachrichtigungen", "read": "Gelesen!", "repeated_you": "wiederholte deine Nachricht" @@ -36,6 +47,11 @@ "post_status": { "account_not_locked_warning": "Dein Profil ist nicht {0}. Wer dir folgen will, kann das jederzeit tun und dann auch deine privaten Beiträge sehen.", "account_not_locked_warning_link": "gesperrt", + "attachments_sensitive": "Anhänge als heikel markieren", + "content_type": { + "plain_text": "Nur Text" + }, + "content_warning": "Betreff (optional)", "default": "Sitze gerade im Hofbräuhaus.", "direct_warning": "Dieser Beitrag wird nur für die erwähnten Nutzer sichtbar sein.", "posting": "Veröffentlichen", @@ -71,42 +87,68 @@ "change_password": "Passwort ändern", "change_password_error": "Es gab ein Problem bei der Änderung des Passworts.", "changed_password": "Passwort erfolgreich geändert!", + "collapse_subject": "Beiträge mit Betreff einklappen", "confirm_new_password": "Neues Passwort bestätigen", "current_avatar": "Dein derzeitiger Avatar", "current_password": "Aktuelles Passwort", "current_profile_banner": "Der derzeitige Banner deines Profils", + "data_import_export_tab": "Datenimport/-export", + "default_vis": "Standard-Sichtbarkeitsumfang", "delete_account": "Account löschen", "delete_account_description": "Lösche deinen Account und alle deine Nachrichten unwiderruflich.", - "delete_account_error": "Es ist ein Fehler beim löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.", + "delete_account_error": "Es ist ein Fehler beim Löschen deines Accounts aufgetreten. Tritt dies weiterhin auf, wende dich an den Administrator der Instanz.", "delete_account_instructions": "Tippe dein Passwort unten in das Feld ein, um die Löschung deines Accounts zu bestätigen.", "export_theme": "Farbschema speichern", - "filtering": "Filter", + "filtering": "Filtern", "filtering_explanation": "Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.", "follow_export": "Follower exportieren", - "follow_export_button": "Liste (.csv) erstellen", + "follow_export_button": "Exportiere deine Follows in eine csv-Datei", "follow_export_processing": "In Bearbeitung. Die Liste steht gleich zum herunterladen bereit.", "follow_import": "Followers importieren", "follow_import_error": "Fehler beim importieren der Follower", "follows_imported": "Followers importiert! Die Bearbeitung kann eine Zeit lang dauern.", "foreground": "Vordergrund", + "general": "Allgemein", "hide_attachments_in_convo": "Anhänge in Unterhaltungen ausblenden", "hide_attachments_in_tl": "Anhänge in der Zeitleiste ausblenden", + "hide_post_stats": "Beitragsstatistiken verbergen (z.B. die Anzahl der Favoriten)", + "hide_user_stats": "Benutzerstatistiken verbergen (z.B. die Anzahl der Follower)", "import_followers_from_a_csv_file": "Importiere Follower, denen du folgen möchtest, aus einer CSV-Datei", "import_theme": "Farbschema laden", "inputRadius": "Eingabefelder", + "instance_default": "(Standard: {value})", + "interfaceLanguage": "Sprache der Oberfläche", "invalid_theme_imported": "Die ausgewählte Datei ist kein unterstütztes Pleroma-Theme. Keine Änderungen wurden vorgenommen.", + "limited_availability": "In deinem Browser nicht verfügbar", "links": "Links", "lock_account_description": "Sperre deinen Account, um neue Follower zu genehmigen oder abzulehnen", + "loop_video": "Videos wiederholen", + "loop_video_silent_only": "Nur Videos ohne Ton wiederholen (z.B. Mastodons \"gifs\")", "name": "Name", "name_bio": "Name & Bio", "new_password": "Neues Passwort", + "notification_visibility": "Benachrichtigungstypen, die angezeigt werden sollen", + "notification_visibility_follows": "Follows", + "notification_visibility_likes": "Favoriten", + "notification_visibility_mentions": "Erwähnungen", + "notification_visibility_repeats": "Wiederholungen", + "no_rich_text_description": "Rich-Text Formatierungen von allen Beiträgen entfernen", "nsfw_clickthrough": "Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind", "panelRadius": "Panel", + "pause_on_unfocused": "Streaming pausieren, wenn das Tab nicht fokussiert ist", "presets": "Voreinstellungen", - "profile_background": "Profil Hintergrund", - "profile_banner": "Profil Banner", + "profile_background": "Profilhintergrund", + "profile_banner": "Profilbanner", + "profile_tab": "Profil", "radii_help": "Kantenrundung (in Pixel) der Oberfläche anpassen", - "reply_link_preview": "Aktiviere reply-link Vorschau bei Maus-Hover", + "replies_in_timeline": "Antworten in der Zeitleiste", + "reply_link_preview": "Antwortlink-Vorschau beim Überfahren mit der Maus aktivieren", + "reply_visibility_all": "Alle Antworten zeigen", + "reply_visibility_following": "Zeige nur Antworten an mich oder an Benutzer, denen ich folge", + "reply_visibility_self": "Nur Antworten an mich anzeigen", + "saving_err": "Fehler beim Speichern der Einstellungen", + "saving_ok": "Einstellungen gespeichert", + "security_tab": "Sicherheit", "set_new_avatar": "Setze einen neuen Avatar", "set_new_profile_background": "Setze einen neuen Hintergrund für dein Profil", "set_new_profile_banner": "Setze einen neuen Banner für dein Profil", @@ -115,15 +157,20 @@ "streaming": "Aktiviere automatisches Laden (Streaming) von neuen Beiträgen", "text": "Text", "theme": "Farbschema", - "theme_help": "Benutze HTML Farbcodes (#rrggbb) um dein Farbschema anzupassen", + "theme_help": "Benutze HTML-Farbcodes (#rrggbb) um dein Farbschema anzupassen", "tooltipRadius": "Tooltips/Warnungen", - "user_settings": "Benutzereinstellungen" + "user_settings": "Benutzereinstellungen", + "values": { + "false": "nein", + "true": "Ja" + } }, "timeline": { "collapse": "Einklappen", "conversation": "Unterhaltung", "error_fetching": "Fehler beim Laden", "load_older": "Lade ältere Beiträge", + "no_retweet_hint": "Der Beitrag ist als nur-für-Follower oder als Direktnachricht markiert und kann nicht wiederholt werden.", "repeated": "wiederholte", "show_new": "Zeige Neuere", "up_to_date": "Aktuell" @@ -146,5 +193,9 @@ }, "user_profile": { "timeline_title": "Beiträge" + }, + "who_to_follow": { + "more": "Mehr", + "who_to_follow": "Wem soll ich folgen" } } From ee29bca60a3979715370fcc8c6794db054eda959 Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Tue, 13 Nov 2018 14:14:48 +0100 Subject: [PATCH 35/36] remove deploy stage --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 694b77f9..b6c1b909 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,6 @@ stages: - lint - build - test - - deploy lint: stage: lint From e9b68b8c972e25df852543e9aa6670088bee06bb Mon Sep 17 00:00:00 2001 From: Roger Braun Date: Tue, 13 Nov 2018 14:16:02 +0100 Subject: [PATCH 36/36] remove deploy stage --- .gitlab-ci.yml | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6c1b909..6c83a123 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,27 +3,6 @@ # https://hub.docker.com/r/library/node/tags/ image: node:7 -before_script: - # Install ssh-agent if not already installed, it is required by Docker. - # (change apt-get to yum if you use a CentOS-based image) - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - - # Run ssh-agent (inside the build environment) - - eval $(ssh-agent -s) - - # For Docker builds disable host key checking. Be aware that by adding that - # you are suspectible to man-in-the-middle attacks. - # WARNING: Use this only with the Docker executor, if you use it with shell - # you will overwrite your user's SSH config. - - mkdir -p ~/.ssh - - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - -# This folder is cached between builds -# http://docs.gitlab.com/ce/ci/yaml/README.html#cache -#cache: -# paths: -# - node_modules/ - stages: - lint - build @@ -49,14 +28,3 @@ build: artifacts: paths: - dist/ - -deploy: - stage: deploy - environment: dev - only: - - develop - script: - - yarn - - npm run build - - ssh-add <(echo "$SSH_PRIVATE_KEY") - - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma