From 3d52f690b3e4241d0a46f1fb1941c5da3ca27c8d Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Mon, 28 Jan 2019 22:51:06 +0530 Subject: [PATCH 01/44] UX: Add post action text in non-JS topic view --- app/views/topics/show.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 138646bd43..456135d668 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -47,10 +47,16 @@
- <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %> - + <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %> + <% + who_username = post.custom_fields["action_code_who"] || "" + if post.action_code + %> + <%= t("js.action_codes.#{post.action_code}", when: "", who: who_username).html_safe %> + <% end %> + #<%= post.post_number %>
From 51fdf7a11d61d8913e4c6d38687c858e174ea9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 28 Jan 2019 18:40:52 +0100 Subject: [PATCH 02/44] FIX: don't duplicate attachments --- lib/email/receiver.rb | 1 + spec/components/email/receiver_spec.rb | 29 +++++++++++++++----------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index 7a5bc22efe..736626194d 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -939,6 +939,7 @@ module Email attachments << part if part.attachment? && is_whitelisted_attachment?(part) end + attachments.uniq! attachments end end diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index d70631665e..75ac46d6db 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -524,47 +524,52 @@ describe Email::Receiver do it "supports attachments" do SiteSetting.authorized_extensions = "txt|jpg" expect { process(:attached_txt_file) }.to change { topic.posts.count } - expect(topic.posts.last.raw).to match(/]*>text\.txt<\/a>/) - expect(topic.posts.last.uploads.length).to eq 1 + post = topic.posts.last + expect(post.raw).to match(/\APlease find some text file attached\.\s+text\.txt<\/a> \(20 Bytes\)\z/) + expect(post.uploads.size).to eq 1 expect { process(:apple_mail_attachment) }.to change { topic.posts.count } - expect(topic.posts.last.raw).to match /\s+Picture above\.\z/) + expect(post.uploads.size).to eq 1 end it "supports eml attachments" do SiteSetting.authorized_extensions = "eml" expect { process(:attached_eml_file) }.to change { topic.posts.count } - expect(topic.posts.last.raw).to match(/]*>sample\.eml<\/a>/) - expect(topic.posts.last.uploads.length).to eq 1 + post = topic.posts.last + expect(post.raw).to match(/\APlease find the eml file attached\.\s+sample\.eml<\/a> \(193 Bytes\)\z/) + expect(post.uploads.size).to eq 1 end context "when attachment is rejected" do it "sends out the warning email" do expect { process(:attached_txt_file) }.to change { EmailLog.count }.by(1) expect(EmailLog.last.email_type).to eq("email_reject_attachment") - expect(topic.posts.last.uploads.length).to eq 0 + expect(topic.posts.last.uploads.size).to eq 0 end it "doesn't send out the warning email if sender is staged user" do user.update_columns(staged: true) expect { process(:attached_txt_file) }.not_to change { EmailLog.count } - expect(topic.posts.last.uploads.length).to eq 0 + expect(topic.posts.last.uploads.size).to eq 0 end it "creates the post with attachment missing message" do missing_attachment_regex = Regexp.escape(I18n.t('emails.incoming.missing_attachment', filename: "text.txt")) expect { process(:attached_txt_file) }.to change { topic.posts.count } - expect(topic.posts.last.raw).to match(/#{missing_attachment_regex}/) - expect(topic.posts.last.uploads.length).to eq 0 + post = topic.posts.last + expect(post.raw).to match(/#{missing_attachment_regex}/) + expect(post.uploads.size).to eq 0 end end it "supports emails with just an attachment" do SiteSetting.authorized_extensions = "pdf" expect { process(:attached_pdf_file) }.to change { topic.posts.count } - expect(topic.posts.last.raw).to match(/]*>discourse\.pdf<\/a>/) - expect(topic.posts.last.uploads.length).to eq 1 + post = topic.posts.last + expect(post.raw).to match(/\A\s+discourse\.pdf<\/a> \(64 KB\)\z/) + expect(post.uploads.size).to eq 1 end it "supports liking via email" do From 62a0f88e97007d2999c34ccbc5336d5c3651f7d8 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Tue, 29 Jan 2019 02:26:55 +0530 Subject: [PATCH 03/44] FIX: More link in topic page search shouldn't navigate to full page result --- app/assets/javascripts/discourse/lib/search.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6 index 8fab105cfe..a3f47f7a12 100644 --- a/app/assets/javascripts/discourse/lib/search.js.es6 +++ b/app/assets/javascripts/discourse/lib/search.js.es6 @@ -80,7 +80,7 @@ export function translateResults(results, opts) { more: groupedSearchResult[`more_${name}`] }; - if (result.more && name === "posts" && opts.fullSearchUrl) { + if (result.more && componentName === "topic" && opts.fullSearchUrl) { result.more = false; result.moreUrl = opts.fullSearchUrl; } From f7deb52c90095eefe1822e4ce15d15ae8a8de2cb Mon Sep 17 00:00:00 2001 From: Kris Date: Mon, 28 Jan 2019 17:15:36 -0500 Subject: [PATCH 04/44] FIX: Class name for external-link on customize page --- .../javascripts/admin/templates/customize-themes-index.hbs | 2 +- app/assets/stylesheets/common/admin/customize.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/templates/customize-themes-index.hbs b/app/assets/javascripts/admin/templates/customize-themes-index.hbs index 39bdfc7c85..565d0024db 100644 --- a/app/assets/javascripts/admin/templates/customize-themes-index.hbs +++ b/app/assets/javascripts/admin/templates/customize-themes-index.hbs @@ -4,7 +4,7 @@

{{I18n "admin.customize.theme.themes_intro"}}

{{#each externalResources as |resource|}} - + {{d-icon resource.icon}} {{I18n resource.key}} diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index a552dd0293..3da2b22e0c 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -208,7 +208,6 @@ } } .external-link { - display: inline-block; display: block; margin-bottom: 5px; } From 530eeba855414d098ef61b84c8d770076e73ef3f Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Mon, 28 Jan 2019 22:30:01 -0500 Subject: [PATCH 05/44] Add test for user drafts stream Followup to 84a3da4b18d6dd5c2a0940fe04b339ebc1605123 --- .../acceptance/user-drafts-stream-test.js.es6 | 12 ++++++++++++ test/javascripts/fixtures/drafts.js.es6 | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 test/javascripts/acceptance/user-drafts-stream-test.js.es6 diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js.es6 new file mode 100644 index 0000000000..06f7d9f4d2 --- /dev/null +++ b/test/javascripts/acceptance/user-drafts-stream-test.js.es6 @@ -0,0 +1,12 @@ +import { acceptance } from "helpers/qunit-helpers"; + +acceptance("User Drafts", { loggedIn: true }); + +QUnit.test("Stream", async assert => { + await visit("/u/eviltrout/activity/drafts"); + assert.ok(find(".user-stream-item").length === 3, "has drafts"); + + await click(".user-stream-item:last-child .remove-draft"); + assert.ok(find(".user-stream-item").length === 2, "draft removed, list length diminished by one"); + +}); diff --git a/test/javascripts/fixtures/drafts.js.es6 b/test/javascripts/fixtures/drafts.js.es6 index 8aaa88289c..f5f31958f6 100644 --- a/test/javascripts/fixtures/drafts.js.es6 +++ b/test/javascripts/fixtures/drafts.js.es6 @@ -43,7 +43,7 @@ export default { excerpt: "here goes a reply to a PM.", created_at: "2018-07-20T16:58:47.433Z", draft_key: "topic_93", - sequence: 1, + sequence: 0, draft_username: "eviltrout", avatar_template: "/user_avatar/localhost/eviltrout/{size}/2_1.png", data: From ee437ef53bf8b4ccec098817281045d406d57a3f Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Mon, 28 Jan 2019 22:47:11 -0500 Subject: [PATCH 06/44] Fix prettier offence --- test/javascripts/acceptance/user-drafts-stream-test.js.es6 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 b/test/javascripts/acceptance/user-drafts-stream-test.js.es6 index 06f7d9f4d2..f3fbcdf0ea 100644 --- a/test/javascripts/acceptance/user-drafts-stream-test.js.es6 +++ b/test/javascripts/acceptance/user-drafts-stream-test.js.es6 @@ -7,6 +7,8 @@ QUnit.test("Stream", async assert => { assert.ok(find(".user-stream-item").length === 3, "has drafts"); await click(".user-stream-item:last-child .remove-draft"); - assert.ok(find(".user-stream-item").length === 2, "draft removed, list length diminished by one"); - + assert.ok( + find(".user-stream-item").length === 2, + "draft removed, list length diminished by one" + ); }); From 82b7795f368e59817ca1b78f002dffdcbb1235f2 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 29 Jan 2019 11:49:42 +0530 Subject: [PATCH 07/44] Revert "don't run specs on code-review for now" This reverts commit cb493b66e0e333b5d08d526f53ebcc3811447709. --- lib/tasks/plugin.rake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tasks/plugin.rake b/lib/tasks/plugin.rake index 600fac6e94..c77525038f 100644 --- a/lib/tasks/plugin.rake +++ b/lib/tasks/plugin.rake @@ -7,8 +7,7 @@ task 'plugin:install_all_official' do 'discourse-nginx-performance-report', 'lazyYT', 'poll', - 'discourse-calendar', - 'discourse-code-review' + 'discourse-calendar' ]) map = { From 32f9fd1e511e5a43cba107aacded613b2675e5d4 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Tue, 29 Jan 2019 15:05:29 +0200 Subject: [PATCH 08/44] FIX: add autocomplete=off to composer textarea Somehow a plugin or some new Chrome bug is causing its heuristic to detect our textarea for the composer as a target for address autocomplete This is likely a chrome bug but this change is very safe regardless. --- .../javascripts/discourse/templates/components/d-editor.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/components/d-editor.hbs b/app/assets/javascripts/discourse/templates/components/d-editor.hbs index 4391669a79..41694e0b9d 100644 --- a/app/assets/javascripts/discourse/templates/components/d-editor.hbs +++ b/app/assets/javascripts/discourse/templates/components/d-editor.hbs @@ -39,7 +39,7 @@
{{conditional-loading-spinner condition=loading}} - {{textarea tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}} + {{textarea autocomplete="off" tabindex=tabindex value=value class="d-editor-input" placeholder=placeholderTranslated disabled=disabled}} {{popup-input-tip validation=validation}} {{plugin-outlet name="after-d-editor" tagName="" args=outletArgs}} From fb7f21fbe90a00af7d4533da8546aa0ebf1649de Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 29 Jan 2019 10:24:32 -0500 Subject: [PATCH 09/44] Clearer syntax in migration Following up on 1c1fd205 --- ...0110142917_enable_content_security_policy_for_new_sites.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db/migrate/20190110142917_enable_content_security_policy_for_new_sites.rb b/db/migrate/20190110142917_enable_content_security_policy_for_new_sites.rb index bf7af9faec..abe55353a0 100644 --- a/db/migrate/20190110142917_enable_content_security_policy_for_new_sites.rb +++ b/db/migrate/20190110142917_enable_content_security_policy_for_new_sites.rb @@ -18,8 +18,8 @@ class EnableContentSecurityPolicyForNewSites < ActiveRecord::Migration[5.2] end def instance_is_new? - post = DB.query_single("SELECT created_at FROM posts ORDER BY created_at ASC LIMIT 1") - return post.blank? || (post.present? && post.first > 1.week.ago) + dates = DB.query_single("SELECT created_at FROM posts ORDER BY created_at ASC LIMIT 1") + dates.empty? || dates.first > 1.week.ago end end From 0d0303e7eae193cff439933bd24328b4d4927d43 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Tue, 29 Jan 2019 16:54:04 +0100 Subject: [PATCH 10/44] FIX: more resilient lookup in plugin-api (#6961) Ember3 is more picky about having a container being destroyed and it's easier to cause exceptions, especially in tests. This fix has been initially created for an exception occuring in tests when running discourse-code-review and discourse-polls tests at the same time. `getCurrentUser` method body was failing as the container was destroyed. Original stacktrace: ``` "Error: Assertion Failed: expected container not to be destroyed at new EmberError (ember:2929:31) at assert (ember:1793:23) at Container.lookup (ember:17736:64) at PluginApi.getCurrentUser (discourse/lib/plugin-api:56:31) at allowUser (javascripts/discourse/initializers/init-code-review:38:29) at eval (javascripts/discourse/initializers/init-code-review:78:11) at eval (select-kit/mixins/plugin-api:86:19) at Array.forEach () at eval (select-kit/mixins/plugin-api:85:44) at Array.forEach ()" ``` --- .../discourse/lib/plugin-api.js.es6 | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 34a607d93e..a44548c175 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -55,7 +55,19 @@ class PluginApi { * If the user is not logged in, it will be `null`. **/ getCurrentUser() { - return this.container.lookup("current-user:main"); + return this._lookupContainer("current-user:main"); + } + + _lookupContainer(path) { + if ( + !this.container || + this.container.isDestroying || + this.container.isDestroyed + ) { + return; + } + + return this.container.lookup(path); } _resolveClass(resolverName, opts) { @@ -222,7 +234,7 @@ class PluginApi { * ``` **/ addPosterIcon(cb) { - const site = this.container.lookup("site:main"); + const site = this._lookupContainer("site:main"); const loc = site && site.mobileView ? "before" : "after"; decorateWidget(`poster-name:${loc}`, dec => { @@ -424,8 +436,8 @@ class PluginApi { ``` **/ onAppEvent(name, fn) { - let appEvents = this.container.lookup("app-events:main"); - appEvents.on(name, fn); + const appEvents = this._lookupContainer("app-events:main"); + appEvents && appEvents.on(name, fn); } /** @@ -562,7 +574,8 @@ class PluginApi { * will issue a request to `/mice.json` **/ addStorePluralization(thing, plural) { - this.container.lookup("service:store").addPluralization(thing, plural); + const store = this._lookupContainer("service:store"); + store && store.addPluralization(thing, plural); } /** From 6f656f6e7d2af94fae9e6b10b54b9285fb6844b1 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 29 Jan 2019 16:47:25 -0500 Subject: [PATCH 11/44] FIX: Better error handling if a file cannot be sent If for some reason `Discourse.store.path_for` returns `nil`, the forum would throw an error rather than returning 404. Why would it be `nil`? One cause could be changing the type of file store and having the `url` field no longer be relative. --- app/controllers/uploads_controller.rb | 6 +++++- spec/requests/uploads_controller_spec.rb | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 64d08d4e1a..481d5d9c29 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -75,7 +75,11 @@ class UploadsController < ApplicationController } opts[:disposition] = "inline" if params[:inline] opts[:disposition] ||= "attachment" unless FileHelper.is_supported_image?(upload.original_filename) - send_file(Discourse.store.path_for(upload), opts) + + file_path = Discourse.store.path_for(upload) + return render_404 unless file_path + + send_file(file_path, opts) else render_404 end diff --git a/spec/requests/uploads_controller_spec.rb b/spec/requests/uploads_controller_spec.rb index db79aabdad..9128d8515e 100644 --- a/spec/requests/uploads_controller_spec.rb +++ b/spec/requests/uploads_controller_spec.rb @@ -226,6 +226,14 @@ describe UploadsController do expect(response.status).to eq(404) end + it "returns 404 when the path is nil" do + upload = upload_file("logo.png") + upload.update_column(:url, "invalid-url") + + get "/uploads/#{site}/#{upload.sha1}.#{upload.extension}" + expect(response.status).to eq(404) + end + it 'uses send_file' do upload = upload_file("logo.png") get "/uploads/#{site}/#{upload.sha1}.#{upload.extension}" From fc5b2de85d86da2bd9fc90eecbff82d7c20b8400 Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Fri, 25 Jan 2019 09:43:27 -0800 Subject: [PATCH 12/44] FEATURE: add topic list before status plugin outlet for mobile --- .../discourse/templates/mobile/list/topic-list-item.raw.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs index 2363ec4371..7333de7d55 100644 --- a/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/list/topic-list-item.raw.hbs @@ -8,6 +8,7 @@
{{/unless~}}
+ {{~raw-plugin-outlet name="topic-list-before-status"}} {{~raw "topic-status" topic=topic~}} {{~topic-link topic~}} {{~#if topic.featured_link~}} From ac004297fa708d9fc0bb61be2b01832e06406c8a Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 30 Jan 2019 09:33:53 +0800 Subject: [PATCH 13/44] PERF: Add index on `user_id` to `single_sign_on_records`. --- app/models/single_sign_on_record.rb | 1 + ...0013015_add_index_on_user_id_to_single_sign_on_records.rb | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 db/migrate/20190130013015_add_index_on_user_id_to_single_sign_on_records.rb diff --git a/app/models/single_sign_on_record.rb b/app/models/single_sign_on_record.rb index 1ceeacf5d6..417a5f3590 100644 --- a/app/models/single_sign_on_record.rb +++ b/app/models/single_sign_on_record.rb @@ -24,4 +24,5 @@ end # Indexes # # index_single_sign_on_records_on_external_id (external_id) UNIQUE +# index_single_sign_on_records_on_user_id (user_id) # diff --git a/db/migrate/20190130013015_add_index_on_user_id_to_single_sign_on_records.rb b/db/migrate/20190130013015_add_index_on_user_id_to_single_sign_on_records.rb new file mode 100644 index 0000000000..2eb26d5ca5 --- /dev/null +++ b/db/migrate/20190130013015_add_index_on_user_id_to_single_sign_on_records.rb @@ -0,0 +1,5 @@ +class AddIndexOnUserIdToSingleSignOnRecords < ActiveRecord::Migration[5.2] + def change + add_index :single_sign_on_records, :user_id + end +end From 0e5c7f5da7467fd62be874101525aec4e490828f Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 30 Jan 2019 09:34:51 +0800 Subject: [PATCH 14/44] DEV: Update annotations. --- app/models/remote_theme.rb | 30 +++++++++++++++++------------- app/models/user_option.rb | 1 + 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 0e89c160da..5e74f325df 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -228,17 +228,21 @@ end # # Table name: remote_themes # -# id :integer not null, primary key -# remote_url :string not null -# remote_version :string -# local_version :string -# about_url :string -# license_url :string -# commits_behind :integer -# remote_updated_at :datetime -# created_at :datetime not null -# updated_at :datetime not null -# private_key :text -# branch :string -# last_error_text :text +# id :integer not null, primary key +# remote_url :string not null +# remote_version :string +# local_version :string +# about_url :string +# license_url :string +# commits_behind :integer +# remote_updated_at :datetime +# created_at :datetime not null +# updated_at :datetime not null +# private_key :text +# branch :string +# last_error_text :text +# authors :string +# theme_version :string +# minimum_discourse_version :string +# maximum_discourse_version :string # diff --git a/app/models/user_option.rb b/app/models/user_option.rb index e51f10b3fe..aa86004975 100644 --- a/app/models/user_option.rb +++ b/app/models/user_option.rb @@ -202,6 +202,7 @@ end # theme_ids :integer default([]), not null, is an Array # hide_profile_and_presence :boolean default(FALSE), not null # text_size_key :integer default(0), not null +# text_size_seq :integer default(0), not null # # Indexes # From 421d47da1ed626913810baafe7ed3de7d9bf717b Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Tue, 29 Jan 2019 21:54:29 -0500 Subject: [PATCH 15/44] FIX: user and group mentions in subfolder installs --- lib/pretty_text.rb | 4 ++-- spec/components/pretty_text_spec.rb | 17 +++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 249196fcd1..bad230f57d 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -440,10 +440,10 @@ module PrettyText case type when USER_TYPE - element['href'] = "/u/#{name}" + element['href'] = "#{Discourse::base_uri}/u/#{name}" when GROUP_TYPE element['class'] = 'mention-group' - element['href'] = "/groups/#{name}" + element['href'] = "#{Discourse::base_uri}/groups/#{name}" end end end diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 1e0cfe9c73..1490e38b3a 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -265,6 +265,23 @@ describe PrettyText do end end + context 'subfolder' do + before do + GlobalSetting.stubs(:relative_url_root).returns('/forum') + Discourse.stubs(:base_uri).returns("/forum") + end + + it "handles user and group mentions correctly" do + Fabricate(:user, username: 'user1') + Fabricate(:group, name: 'groupA', mentionable_level: Group::ALIAS_LEVELS[:everyone]) + + input = 'hi there @user1 and @groupA' + expected = '

hi there @user1 and @groupA

' + + expect(PrettyText.cook(input)).to eq(expected) + end + end + it "does not create mention for a non mentionable group" do group = Fabricate(:group, mentionable_level: Group::ALIAS_LEVELS[:nobody]) From 60c1cd9f81ce826620eeba471076abce327fd947 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 30 Jan 2019 16:04:47 +0800 Subject: [PATCH 16/44] FIX: Return 400 when username params is invalid. --- app/controllers/admin/email_controller.rb | 2 ++ spec/requests/admin/email_controller_spec.rb | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 2415546005..148b364dc0 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -89,6 +89,8 @@ class Admin::EmailController < Admin::AdminController params.require(:last_seen_at) params.require(:username) user = User.find_by_username(params[:username]) + raise Discourse::InvalidParameters unless user + renderer = Email::Renderer.new(UserNotifications.digest(user, since: params[:last_seen_at])) render json: MultiJson.dump(html_content: renderer.html, text_content: renderer.text) end diff --git a/spec/requests/admin/email_controller_spec.rb b/spec/requests/admin/email_controller_spec.rb index 97cdef075c..3ff6bedca4 100644 --- a/spec/requests/admin/email_controller_spec.rb +++ b/spec/requests/admin/email_controller_spec.rb @@ -175,6 +175,14 @@ describe Admin::EmailController do expect(response.status).to eq(400) end + it "returns the right response when username is invalid" do + get "/admin/email/preview-digest.json", params: { + last_seen_at: 1.week.ago, username: "somerandomeusername" + } + + expect(response.status).to eq(400) + end + it "previews the digest" do get "/admin/email/preview-digest.json", params: { last_seen_at: 1.week.ago, username: admin.username From 096974d1783e95e2f7e35c37826f3d9810dc2926 Mon Sep 17 00:00:00 2001 From: Vinoth Kannan Date: Wed, 30 Jan 2019 15:27:23 +0530 Subject: [PATCH 17/44] FIX: user_id attribute not found in posters array --- app/assets/javascripts/discourse/models/topic.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index af6cc421bf..489333e588 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -78,7 +78,7 @@ const Topic = RestModel.extend({ } } - const poster_ids = _.pluck(posters, "user_id"); + const poster_ids = posters.map(p => p.user && p.user.id).filter(id => id); participants.some(p => { if (!poster_ids.includes(p.user_id)) { users.splice(users.length - pushOffset, 0, p); From 1e98929501629a4bbbde5f53a8187fae7d15f931 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Wed, 30 Jan 2019 15:14:36 +0100 Subject: [PATCH 18/44] FIX: Email domain whitelist prevented user anonymizing FIX: Secondary email addresses were not deleted during anonymizing --- app/services/user_anonymizer.rb | 9 +++++---- spec/services/user_anonymizer_spec.rb | 18 ++++++++++++++++-- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/services/user_anonymizer.rb b/app/services/user_anonymizer.rb index d87c7e6da7..ae480252b5 100644 --- a/app/services/user_anonymizer.rb +++ b/app/services/user_anonymizer.rb @@ -26,7 +26,6 @@ class UserAnonymizer @user.reload @user.password = SecureRandom.hex - @user.email = "#{@user.username}@anonymized.invalid" @user.name = SiteSetting.full_name_required ? @user.username : nil @user.date_of_birth = nil @user.title = nil @@ -37,7 +36,8 @@ class UserAnonymizer @user.registration_ip_address = @opts[:anonymize_ip] end - @user.save + @user.save! + @user.primary_email.update_attribute(:email, "#{@user.username}@anonymized.invalid") options = @user.user_option options.email_always = false @@ -45,7 +45,7 @@ class UserAnonymizer options.email_digests = false options.email_private_messages = false options.email_direct = false - options.save + options.save! if profile = @user.user_profile profile.update(location: nil, website: nil, bio_raw: nil, bio_cooked: nil, @@ -61,6 +61,7 @@ class UserAnonymizer @user.instagram_user_info.try(:destroy) @user.user_open_ids.find_each { |x| x.destroy } @user.api_key.try(:destroy) + @user.user_emails.secondary.destroy_all @user_history = log_action end @@ -101,6 +102,6 @@ class UserAnonymizer history_details[:details] = "username: #{@prev_username}" end - UserHistory.create(history_details) + UserHistory.create!(history_details) end end diff --git a/spec/services/user_anonymizer_spec.rb b/spec/services/user_anonymizer_spec.rb index 9d43e6c18e..6f1e3483be 100644 --- a/spec/services/user_anonymizer_spec.rb +++ b/spec/services/user_anonymizer_spec.rb @@ -24,7 +24,7 @@ describe UserAnonymizer do describe "make_anonymous" do let(:original_email) { "edward@example.net" } - let(:user) { Fabricate(:user, username: "edward", email: original_email) } + let(:user) { Fabricate(:user_single_email, username: "edward", email: original_email) } let(:another_user) { Fabricate(:evil_trout) } subject(:make_anonymous) { described_class.make_anonymous(user, admin) } @@ -33,11 +33,25 @@ describe UserAnonymizer do expect(user.reload.username).to match(/^anon\d{3,}$/) end - it "changes email address" do + it "changes the primary email address" do make_anonymous expect(user.reload.email).to eq("#{user.username}@anonymized.invalid") end + it "changes the primary email address when there is an email domain whitelist" do + SiteSetting.email_domains_whitelist = 'example.net|wayne.com|discourse.org' + + make_anonymous + expect(user.reload.email).to eq("#{user.username}@anonymized.invalid") + end + + it "deletes secondary email addresses" do + Fabricate(:secondary_email, user: user, email: "secondary_email@example.com") + + make_anonymous + expect(user.reload.secondary_emails).to be_blank + end + it "turns off all notifications" do user.user_option.update_columns( email_always: true From d8bd3c32ca43407499dea414c4f17e5c37d6d71d Mon Sep 17 00:00:00 2001 From: David Taylor Date: Wed, 30 Jan 2019 14:17:04 +0000 Subject: [PATCH 19/44] DEV: Allow theme CLI to specify which theme to synchronize (#6963) Currently the theme is matched by name, which can be fragile when there are many themes with the same name. This functionality will be used by the next version of theme CLI. --- app/controllers/admin/themes_controller.rb | 6 ++-- app/models/remote_theme.rb | 5 +-- spec/requests/admin/themes_controller_spec.rb | 36 ++++++++++++++++++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/controllers/admin/themes_controller.rb b/app/controllers/admin/themes_controller.rb index 15027da7ff..f927eee337 100644 --- a/app/controllers/admin/themes_controller.rb +++ b/app/controllers/admin/themes_controller.rb @@ -84,11 +84,13 @@ class Admin::ThemesController < Admin::AdminController rescue RemoteTheme::ImportError => e render_json_error e.message end - elsif params[:bundle] || params[:theme] && ["application/x-gzip", "application/gzip"].include?(params[:theme].content_type) + elsif params[:bundle] || (params[:theme] && ["application/x-gzip", "application/gzip"].include?(params[:theme].content_type)) # params[:bundle] used by theme CLI. params[:theme] used by admin UI bundle = params[:bundle] || params[:theme] + theme_id = params[:theme_id] + match_theme_by_name = !!params[:bundle] && !params.key?(:theme_id) # Old theme CLI behavior, match by name. Remove Jan 2020 begin - @theme = RemoteTheme.update_tgz_theme(bundle.path, match_theme: !!params[:bundle], user: current_user) + @theme = RemoteTheme.update_tgz_theme(bundle.path, match_theme: match_theme_by_name, user: current_user, theme_id: theme_id) log_theme_change(nil, @theme) render json: @theme, status: :created rescue RemoteTheme::ImportError => e diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 5e74f325df..9e8f3ef7cd 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -32,12 +32,13 @@ class RemoteTheme < ActiveRecord::Base raise ImportError.new I18n.t("themes.import_error.about_json") end - def self.update_tgz_theme(filename, match_theme: false, user: Discourse.system_user) + def self.update_tgz_theme(filename, match_theme: false, user: Discourse.system_user, theme_id: nil) importer = ThemeStore::TgzImporter.new(filename) importer.import! theme_info = RemoteTheme.extract_theme_info(importer) - theme = Theme.find_by(name: theme_info["name"]) if match_theme + theme = Theme.find_by(name: theme_info["name"]) if match_theme # Old theme CLI method, remove Jan 2020 + theme = Theme.find_by(id: theme_id) if theme_id # New theme CLI method theme ||= Theme.new(user_id: user&.id || -1, name: theme_info["name"]) theme.component = theme_info["component"].to_s == "true" diff --git a/spec/requests/admin/themes_controller_spec.rb b/spec/requests/admin/themes_controller_spec.rb index 55204bf370..dc25e12513 100644 --- a/spec/requests/admin/themes_controller_spec.rb +++ b/spec/requests/admin/themes_controller_spec.rb @@ -113,7 +113,8 @@ describe Admin::ThemesController do expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1) end - it 'updates an existing theme from an archive' do + it 'updates an existing theme from an archive by name' do + # Old theme CLI method, remove Jan 2020 existing_theme = Fabricate(:theme, name: "Header Icons") expect do @@ -126,6 +127,39 @@ describe Admin::ThemesController do expect(json["theme"]["theme_fields"].length).to eq(5) expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1) end + + it 'updates an existing theme from an archive by id' do + # Used by theme CLI + existing_theme = Fabricate(:theme, name: "Header Icons") + other_existing_theme = Fabricate(:theme, name: "Some other name") + + expect do + post "/admin/themes/import.json", params: { bundle: theme_archive, theme_id: other_existing_theme.id } + end.to change { Theme.count }.by (0) + expect(response.status).to eq(201) + json = ::JSON.parse(response.body) + + expect(json["theme"]["name"]).to eq("Some other name") + expect(json["theme"]["id"]).to eq(other_existing_theme.id) + expect(json["theme"]["theme_fields"].length).to eq(5) + expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1) + end + + it 'creates a new theme when id specified as nil' do + # Used by theme CLI + existing_theme = Fabricate(:theme, name: "Header Icons") + + expect do + post "/admin/themes/import.json", params: { bundle: theme_archive, theme_id: nil } + end.to change { Theme.count }.by (1) + expect(response.status).to eq(201) + json = ::JSON.parse(response.body) + + expect(json["theme"]["name"]).to eq("Header Icons") + expect(json["theme"]["id"]).not_to eq(existing_theme.id) + expect(json["theme"]["theme_fields"].length).to eq(5) + expect(UserHistory.where(action: UserHistory.actions[:change_theme]).count).to eq(1) + end end describe '#index' do From c02e81fe016982a12654a027155be0525cfd65ea Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 30 Jan 2019 11:37:16 -0500 Subject: [PATCH 20/44] FIX: regression with composer warnings Fixes composer warnings when: a) mentioning groups ("By mentioning @group, you are about to notify x people...") and b) mentioning users in a PM ("You mentioned @user but they won`t be notified...") --- app/assets/javascripts/discourse/templates/composer.hbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/composer.hbs b/app/assets/javascripts/discourse/templates/composer.hbs index c59c4b5760..4f313982e7 100644 --- a/app/assets/javascripts/discourse/templates/composer.hbs +++ b/app/assets/javascripts/discourse/templates/composer.hbs @@ -106,8 +106,8 @@ uploadIcon=uploadIcon isCancellable=isCancellable uploadProgress=uploadProgress - groupsMentioned="groupsMentioned" - cannotSeeMention="cannotSeeMention" + groupsMentioned=(action "groupsMentioned") + cannotSeeMention=(action "cannotSeeMention") importQuote=(action "importQuote") togglePreview=(action "togglePreview") showToolbar=showToolbar From f7b7bc8abe6455ec8da543eb64d98d5d711d0773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 30 Jan 2019 17:45:50 +0100 Subject: [PATCH 21/44] DEV: move 'default_scope' to default sort on 'has_many' relation --- plugins/poll/app/models/poll.rb | 2 +- plugins/poll/app/models/poll_option.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/poll/app/models/poll.rb b/plugins/poll/app/models/poll.rb index fd5422a620..3c21f880cc 100644 --- a/plugins/poll/app/models/poll.rb +++ b/plugins/poll/app/models/poll.rb @@ -4,7 +4,7 @@ class Poll < ActiveRecord::Base belongs_to :post - has_many :poll_options, dependent: :destroy + has_many :poll_options, -> { order(:id) }, dependent: :destroy has_many :poll_votes enum type: { diff --git a/plugins/poll/app/models/poll_option.rb b/plugins/poll/app/models/poll_option.rb index 96a8d9372b..027c97710b 100644 --- a/plugins/poll/app/models/poll_option.rb +++ b/plugins/poll/app/models/poll_option.rb @@ -1,8 +1,6 @@ class PollOption < ActiveRecord::Base belongs_to :poll has_many :poll_votes, dependent: :delete_all - - default_scope { order(:id) } end # == Schema Information From dca5486b78df21a97c8806dd4aa0e8c4e6e167c4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 30 Jan 2019 14:29:45 -0500 Subject: [PATCH 22/44] REFACTOR: Prefer `this` over `self` --- .../javascripts/discourse/models/store.js.es6 | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index d1af36337e..a2d53affad 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -83,12 +83,9 @@ export default Ember.Object.extend({ // Mostly for legacy, things like TopicList without ResultSets findFiltered(type, findArgs) { - const self = this; return this.adapterFor(type) .find(this, type, findArgs) - .then(function(result) { - return self._build(type, result); - }); + .then(result => this._build(type, result)); }, _hydrateFindResults(result, type, findArgs) { @@ -149,28 +146,25 @@ export default Ember.Object.extend({ }, refreshResults(resultSet, type, url) { - const self = this; return ajax(url).then(result => { - const typeName = Ember.String.underscore(self.pluralize(type)); + const typeName = Ember.String.underscore(this.pluralize(type)); const content = result[typeName].map(obj => - self._hydrate(type, obj, result) + this._hydrate(type, obj, result) ); resultSet.set("content", content); }); }, appendResults(resultSet, type, url) { - const self = this; - return ajax(url).then(function(result) { - let typeName = Ember.String.underscore(self.pluralize(type)); + let typeName = Ember.String.underscore(this.pluralize(type)); let pageTarget = result.meta || result; let totalRows = pageTarget["total_rows_" + typeName] || resultSet.get("totalRows"); let loadMoreUrl = pageTarget["load_more_" + typeName]; let content = result[typeName].map(obj => - self._hydrate(type, obj, result) + this._hydrate(type, obj, result) ); resultSet.setProperties({ totalRows, loadMoreUrl }); @@ -300,20 +294,19 @@ export default Ember.Object.extend({ }, _hydrateEmbedded(type, obj, root) { - const self = this; - Object.keys(obj).forEach(function(k) { + Object.keys(obj).forEach(k => { const m = /(.+)\_id(s?)$/.exec(k); if (m) { const subType = m[1]; if (m[2]) { - const hydrated = obj[k].map(function(id) { - return self._lookupSubType(subType, type, id, root); - }); - obj[self.pluralize(subType)] = hydrated || []; + const hydrated = obj[k].map(id => + this._lookupSubType(subType, type, id, root) + ); + obj[this.pluralize(subType)] = hydrated || []; delete obj[k]; } else { - const hydrated = self._lookupSubType(subType, type, obj[k], root); + const hydrated = this._lookupSubType(subType, type, obj[k], root); if (hydrated) { obj[subType] = hydrated; delete obj[k]; From bb8808985a4882511562d428e53188311f00848f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 30 Jan 2019 14:41:49 -0500 Subject: [PATCH 23/44] REFACTOR: Remove a couple more `self` uses --- .../javascripts/discourse/models/result-set.js.es6 | 10 ++-------- app/assets/javascripts/discourse/models/store.js.es6 | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/discourse/models/result-set.js.es6 b/app/assets/javascripts/discourse/models/result-set.js.es6 index 527477957a..5f85ce9417 100644 --- a/app/assets/javascripts/discourse/models/result-set.js.es6 +++ b/app/assets/javascripts/discourse/models/result-set.js.es6 @@ -25,12 +25,9 @@ export default Ember.ArrayProxy.extend({ if (this.get("length") < totalRows && !this.get("loadingMore")) { this.set("loadingMore", true); - const self = this; return this.store .appendResults(this, this.get("__type"), loadMoreUrl) - .finally(function() { - self.set("loadingMore", false); - }); + .finally(() => this.set("loadingMore", false)); } return Ember.RSVP.resolve(); @@ -46,12 +43,9 @@ export default Ember.ArrayProxy.extend({ return; } - const self = this; this.set("refreshing", true); return this.store .refreshResults(this, this.get("__type"), refreshUrl) - .finally(function() { - self.set("refreshing", false); - }); + .finally(() => this.set("refreshing", false)); } }); diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index a2d53affad..f5b97f3856 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -156,7 +156,7 @@ export default Ember.Object.extend({ }, appendResults(resultSet, type, url) { - return ajax(url).then(function(result) { + return ajax(url).then(result => { let typeName = Ember.String.underscore(this.pluralize(type)); let pageTarget = result.meta || result; From 4763d6c9d7f891eca02916816bc335c6dacdbdf6 Mon Sep 17 00:00:00 2001 From: Jeff Wong Date: Wed, 30 Jan 2019 14:56:14 -0800 Subject: [PATCH 24/44] FEATURE: add the show user action to the user-card-after-username plugin outlet --- .../discourse/templates/components/user-card-contents.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs index 33da28314e..a7fc8cac35 100644 --- a/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs +++ b/app/assets/javascripts/discourse/templates/components/user-card-contents.hbs @@ -17,7 +17,7 @@

{{if nameFirst user.name (format-username username)}} {{user-status user currentUser=currentUser}}

- {{plugin-outlet name="user-card-after-username" args=(hash user=user) tagName=''}} + {{plugin-outlet name="user-card-after-username" args=(hash user=user showUser=(action "showUser")) tagName=''}} {{#unless nameFirst}} {{#if user.name}} From 3c5fbd3ce1f0980fe6490c1720201ce223ec8355 Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Wed, 30 Jan 2019 18:03:16 -0500 Subject: [PATCH 25/44] FIX: do not send welcome message to staged users --- plugins/discourse-narrative-bot/plugin.rb | 2 +- .../spec/requests/discobot_welcome_post_spec.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/plugins/discourse-narrative-bot/plugin.rb b/plugins/discourse-narrative-bot/plugin.rb index b51e318147..e44a8ae1d2 100644 --- a/plugins/discourse-narrative-bot/plugin.rb +++ b/plugins/discourse-narrative-bot/plugin.rb @@ -119,7 +119,7 @@ after_initialize do end self.add_model_callback(User, :after_commit, on: :create) do - if SiteSetting.discourse_narrative_bot_welcome_post_delay == 0 + if SiteSetting.discourse_narrative_bot_welcome_post_delay == 0 && !self.staged self.enqueue_bot_welcome_post end end diff --git a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb index f9087b7459..48113a40b3 100644 --- a/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb +++ b/plugins/discourse-narrative-bot/spec/requests/discobot_welcome_post_spec.rb @@ -43,6 +43,17 @@ describe "Discobot welcome post" do expect(Jobs::NarrativeInit.jobs.first["args"].first["user_id"]).to eq(User.last.id) end end + end + context 'when user is staged' do + let(:staged_user) { Fabricate(:user, staged: true) } + + before do + SiteSetting.discourse_narrative_bot_welcome_post_type = 'welcome_message' + end + + it 'should not send welcome message' do + expect { staged_user }.to_not change { Jobs::SendDefaultWelcomeMessage.jobs.count } + end end end From f83533e1cb5ff262cb25d9392bc2dcc1621fb0ab Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 31 Jan 2019 10:19:26 +0530 Subject: [PATCH 26/44] FIX: use absolute url for `/images/example.png` links FEATURE: fallback to logo_url as last resort for opengraph image url --- app/helpers/application_helper.rb | 4 ++++ spec/helpers/application_helper_spec.rb | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 8ca6e21fea..810cfe146e 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -222,6 +222,8 @@ module ApplicationHelper opts[:image] = opengraph_image_url.present? ? opengraph_image_url : twitter_summary_large_image_url elsif opts[:image].blank? && SiteSetting.site_apple_touch_icon_url.present? opts[:image] = SiteSetting.site_apple_touch_icon_url + elsif opts[:image].blank? && SiteSetting.logo_url.present? + opts[:image] = SiteSetting.logo_url end # Use the correct scheme for opengraph/twitter image @@ -478,6 +480,8 @@ module ApplicationHelper absolute_url = "#{uri.scheme}:#{link}" elsif link.start_with?("/uploads/") absolute_url = "#{Discourse.base_url}#{link}" + elsif link.start_with?("/images/") + absolute_url = "#{Discourse.base_url}#{link}" elsif GlobalSetting.relative_url_root && link.start_with?(GlobalSetting.relative_url_root) absolute_url = "#{Discourse.base_url_no_prefix}#{link}" end diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 5186ddd202..23bb27761c 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -229,4 +229,22 @@ describe ApplicationHelper do expect(helper.preloaded_json).to eq(%{{"test":"[\\"\\u003c \uFFFD\\"]"}}) end end + + describe 'crawlable_meta_data' do + context "opengraph image" do + it 'returns default_opengraph_image_url' do + SiteSetting.default_opengraph_image_url = "/images/og-image.png" + expect(helper.crawlable_meta_data).to include("/images/og-image.png") + end + + it 'returns apple_touch_icon_url if default_opengraph_image_url is blank' do + expect(helper.crawlable_meta_data).to include("/images/default-apple-touch-icon.png") + end + + it 'returns logo_url if apple_touch_icon_url is blank' do + SiteSetting.apple_touch_icon_url = "" + expect(helper.crawlable_meta_data).to include("/images/d-logo-sketch.png") + end + end + end end From 4786b7ff812ae2e2563ec10df6cf4ba46645b49e Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 31 Jan 2019 11:23:04 +0530 Subject: [PATCH 27/44] FEATURE: when only option is "existing topic", autofocus input field --- .../javascripts/discourse/controllers/move-to-topic.js.es6 | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 index 6df047caa5..5e47258f7c 100644 --- a/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/move-to-topic.js.es6 @@ -71,6 +71,7 @@ export default Ember.Controller.extend(ModalFunctionality, { this.set("selection", canSplitTopic ? "new_message" : "existing_message"); } else if (!canSplitTopic) { this.set("selection", "existing_topic"); + Ember.run.next(() => $("#choose-topic-title").focus()); } }, From a09b20f934706092bbd6fb6a2ebc96b076d33614 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 31 Jan 2019 10:05:25 +0000 Subject: [PATCH 28/44] FIX: Google `HD` and `Prompt` settings should be checked at runtime Previously a server restart was required after settings changes, and it did not work in multisite environments --- lib/auth/google_oauth2_authenticator.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/auth/google_oauth2_authenticator.rb b/lib/auth/google_oauth2_authenticator.rb index 6498715ffc..297fa50976 100644 --- a/lib/auth/google_oauth2_authenticator.rb +++ b/lib/auth/google_oauth2_authenticator.rb @@ -85,19 +85,19 @@ class Auth::GoogleOAuth2Authenticator < Auth::Authenticator options = { setup: lambda { |env| strategy = env["omniauth.strategy"] - strategy.options[:client_id] = SiteSetting.google_oauth2_client_id - strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret + strategy.options[:client_id] = SiteSetting.google_oauth2_client_id + strategy.options[:client_secret] = SiteSetting.google_oauth2_client_secret + + if (google_oauth2_hd = SiteSetting.google_oauth2_hd).present? + strategy.options[:hd] = google_oauth2_hd + end + + if (google_oauth2_prompt = SiteSetting.google_oauth2_prompt).present? + strategy.options[:prompt] = google_oauth2_prompt.gsub("|", " ") + end }, skip_jwt: true } - - if (google_oauth2_prompt = SiteSetting.google_oauth2_prompt).present? - options[:prompt] = google_oauth2_prompt.gsub("|", " ") - end - - google_oauth2_hd = SiteSetting.google_oauth2_hd - options[:hd] = google_oauth2_hd if google_oauth2_hd.present? - # jwt encoding is causing auth to fail in quite a few conditions # skipping omniauth.provider :google_oauth2, options From 1021a42b223648200cae55b1a204e6566946371f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Thu, 31 Jan 2019 17:52:33 +0100 Subject: [PATCH 29/44] FIX: new mailgun webhooks --- app/controllers/webhooks_controller.rb | 89 ++++++++++++++--------- spec/requests/webhooks_controller_spec.rb | 58 +++++++++++---- 2 files changed, 99 insertions(+), 48 deletions(-) diff --git a/app/controllers/webhooks_controller.rb b/app/controllers/webhooks_controller.rb index 5480fe3368..b5f3fdd4f6 100644 --- a/app/controllers/webhooks_controller.rb +++ b/app/controllers/webhooks_controller.rb @@ -3,39 +3,9 @@ require "openssl" class WebhooksController < ActionController::Base def mailgun - # can't verify data without an API key return mailgun_failure if SiteSetting.mailgun_api_key.blank? - # token is a random string of 50 characters - token = params["token"] - return mailgun_failure if token.blank? || token.size != 50 - - # prevent replay attack - key = "mailgun_token_#{token}" - return mailgun_failure unless $redis.setnx(key, 1) - $redis.expire(key, 10.minutes) - - # ensure timestamp isn't too far from current time - timestamp = params["timestamp"] - return mailgun_failure if (Time.at(timestamp.to_i) - Time.now).abs > 24.hours.to_i - - # check the signature - return mailgun_failure unless mailgun_verify(timestamp, token, params["signature"]) - - event = params["event"] - message_id = params["Message-Id"].tr("<>", "") - to_address = params["recipient"] - - # only handle soft bounces, because hard bounces are also handled - # by the "dropped" event and we don't want to increase bounce score twice - # for the same message - if event == "bounced".freeze && params["error"]["4."] - process_bounce(message_id, to_address, SiteSetting.soft_bounce_score) - elsif event == "dropped".freeze - process_bounce(message_id, to_address, SiteSetting.hard_bounce_score) - end - - mailgun_success + params["event-data"] ? handle_mailgun_new(params) : handle_mailgun_legacy(params) end def sendgrid @@ -127,10 +97,59 @@ class WebhooksController < ActionController::Base render body: nil, status: 200 end - def mailgun_verify(timestamp, token, signature) - digest = OpenSSL::Digest::SHA256.new - data = "#{timestamp}#{token}" - signature == OpenSSL::HMAC.hexdigest(digest, SiteSetting.mailgun_api_key, data) + def valid_mailgun_signature?(token, timestamp, signature) + # token is a random 50 characters string + return false if token.blank? || token.size != 50 + + # prevent replay attacks + key = "mailgun_token_#{token}" + return false unless $redis.setnx(key, 1) + $redis.expire(key, 10.minutes) + + # ensure timestamp isn't too far from current time + return false if (Time.at(timestamp.to_i) - Time.now).abs > 12.hours.to_i + + # check the signature + signature == OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, "#{timestamp}#{token}") + end + + def handle_mailgun_legacy(params) + return mailgun_failure unless valid_mailgun_signature?(params["token"], params["timestamp"], params["signature"]) + + event = params["event"] + message_id = params["Message-Id"].tr("<>", "") + to_address = params["recipient"] + + # only handle soft bounces, because hard bounces are also handled + # by the "dropped" event and we don't want to increase bounce score twice + # for the same message + if event == "bounced".freeze && params["error"]["4."] + process_bounce(message_id, to_address, SiteSetting.soft_bounce_score) + elsif event == "dropped".freeze + process_bounce(message_id, to_address, SiteSetting.hard_bounce_score) + end + + mailgun_success + end + + def handle_mailgun_new(params) + signature = params["signature"] + return mailgun_failure unless valid_mailgun_signature?(signature["token"], signature["timestamp"], signature["signature"]) + + data = params["event-data"] + message_id = data.dig("message", "headers", "message-id") + to_address = data["recipient"] + severity = data["severity"] + + if data["event"] == "failed".freeze + if severity == "temporary".freeze + process_bounce(message_id, to_address, SiteSetting.soft_bounce_score) + elsif severity == "permanent".freeze + process_bounce(message_id, to_address, SiteSetting.hard_bounce_score) + end + end + + mailgun_success end def process_bounce(message_id, to_address, bounce_score) diff --git a/spec/requests/webhooks_controller_spec.rb b/spec/requests/webhooks_controller_spec.rb index 0162b0a849..17c51362a1 100644 --- a/spec/requests/webhooks_controller_spec.rb +++ b/spec/requests/webhooks_controller_spec.rb @@ -7,23 +7,26 @@ describe WebhooksController do let(:message_id) { "12345@il.com" } context "mailgun" do - it "works" do - SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493" + let(:token) { "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de" } + let(:timestamp) { Time.now.to_i } + let(:data) { "#{timestamp}#{token}" } + let(:signature) { OpenSSL::HMAC.hexdigest("SHA256", SiteSetting.mailgun_api_key, data) } + + before do + SiteSetting.mailgun_api_key = "key-8221462f0c915af3f6f2e2df7aa5a493" + end + + it "works (deprecated)" do user = Fabricate(:user, email: email) email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email) - token = "705a8ccd2ce932be8e98c221fe701c1b4a0afcb8bbd57726de" - timestamp = Time.now.to_i - data = "#{timestamp}#{token}" - signature = OpenSSL::HMAC.hexdigest(OpenSSL::Digest::SHA256.new, SiteSetting.mailgun_api_key, data) - post "/webhooks/mailgun.json", params: { "token" => token, "timestamp" => timestamp, "event" => "dropped", "recipient" => email, - "Message-Id" => "<12345@il.com>", + "Message-Id" => "<#{message_id}>", "signature" => signature } @@ -31,7 +34,36 @@ describe WebhooksController do email_log.reload expect(email_log.bounced).to eq(true) - expect(email_log.user.user_stat.bounce_score).to eq(2) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score) + end + + it "works (new)" do + user = Fabricate(:user, email: email) + email_log = Fabricate(:email_log, user: user, message_id: message_id, to_address: email) + + post "/webhooks/mailgun.json", params: { + "signature" => { + "token" => token, + "timestamp" => timestamp, + "signature" => signature, + }, + "event-data" => { + "event" => "failed", + "severity" => "temporary", + "recipient" => email, + "message" => { + "headers" => { + "message-id" => message_id, + } + } + } + } + + expect(response.status).to eq(200) + + email_log.reload + expect(email_log.bounced).to eq(true) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.soft_bounce_score) end end @@ -55,7 +87,7 @@ describe WebhooksController do email_log.reload expect(email_log.bounced).to eq(true) - expect(email_log.user.user_stat.bounce_score).to eq(2) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score) end end @@ -75,7 +107,7 @@ describe WebhooksController do email_log.reload expect(email_log.bounced).to eq(true) - expect(email_log.user.user_stat.bounce_score).to eq(2) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score) end end @@ -100,7 +132,7 @@ describe WebhooksController do email_log.reload expect(email_log.bounced).to eq(true) - expect(email_log.user.user_stat.bounce_score).to eq(2) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score) end end @@ -127,7 +159,7 @@ describe WebhooksController do email_log.reload expect(email_log.bounced).to eq(true) - expect(email_log.user.user_stat.bounce_score).to eq(2) + expect(email_log.user.user_stat.bounce_score).to eq(SiteSetting.hard_bounce_score) end end end From b3a41878ec85180a5c62bfa8e3ff54b05be5628e Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 31 Jan 2019 17:34:34 +0000 Subject: [PATCH 30/44] FIX: Exporting themes when uploads are on S3 --- lib/theme_store/tgz_exporter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/theme_store/tgz_exporter.rb b/lib/theme_store/tgz_exporter.rb index deeaadbd53..7487e82692 100644 --- a/lib/theme_store/tgz_exporter.rb +++ b/lib/theme_store/tgz_exporter.rb @@ -38,7 +38,7 @@ class ThemeStore::TgzExporter if ThemeField.types[field.type_id] == :theme_upload_var filename = Discourse.store.path_for(field.upload) - content = filename ? File.read(filename) : Discourse.store.download(object.upload).read + content = filename ? File.read(filename) : Discourse.store.download(field.upload).read else content = field.value end From 43f3bf71ba939caa4846fa64bff4e0cb4d4eb5f0 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 31 Jan 2019 17:45:11 +0000 Subject: [PATCH 31/44] FIX: Imported themes should set their color scheme automatically --- app/models/remote_theme.rb | 7 +++++++ spec/models/remote_theme_spec.rb | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/app/models/remote_theme.rb b/app/models/remote_theme.rb index 9e8f3ef7cd..363656c642 100644 --- a/app/models/remote_theme.rb +++ b/app/models/remote_theme.rb @@ -177,6 +177,7 @@ class RemoteTheme < ActiveRecord::Base def update_theme_color_schemes(theme, schemes) missing_scheme_names = Hash[*theme.color_schemes.pluck(:name, :id).flatten] + ordered_schemes = [] schemes&.each do |name, colors| missing_scheme_names.delete(name) @@ -189,12 +190,14 @@ class RemoteTheme < ActiveRecord::Base theme.notify_color_change(c) end end + ordered_schemes << existing else scheme = theme.color_schemes.build(name: name) ColorScheme.base.colors_hashes.each do |color| override = normalize_override(colors[color[:name]]) scheme.color_scheme_colors << ColorSchemeColor.new(name: color[:name], hex: override || color[:hex]) end + ordered_schemes << scheme end end @@ -202,6 +205,10 @@ class RemoteTheme < ActiveRecord::Base ColorScheme.where(id: missing_scheme_names.values).delete_all # we may have stuff pointed at the incorrect scheme? end + + if theme.new_record? + theme.color_scheme = ordered_schemes.first + end end def github_diff_link diff --git a/spec/models/remote_theme_spec.rb b/spec/models/remote_theme_spec.rb index 1e9f23c98a..42e85dc262 100644 --- a/spec/models/remote_theme_spec.rb +++ b/spec/models/remote_theme_spec.rb @@ -102,6 +102,9 @@ describe RemoteTheme do expect(scheme.name).to eq("Amazing") expect(scheme.colors.find_by(name: 'love').hex).to eq('fafafa') + expect(@theme.color_scheme_id).to eq(scheme.id) + @theme.update(color_scheme_id: nil) + File.write("#{initial_repo}/common/header.html", "I AM UPDATED") File.write("#{initial_repo}/about.json", about_json(love_color: "EAEAEA", about_url: "https://newsite.com/about")) @@ -125,6 +128,7 @@ describe RemoteTheme do scheme = ColorScheme.find_by(theme_id: @theme.id) expect(scheme.name).to eq("Amazing") expect(scheme.colors.find_by(name: 'love').hex).to eq('eaeaea') + expect(@theme.color_scheme_id).to eq(nil) # Should only be set on first import mapped = Hash[*@theme.theme_fields.map { |f| ["#{f.target_id}-#{f.name}", f.value] }.flatten] From c0b1a1a914bae9aff9bf5e20404ba941e2f48741 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 31 Jan 2019 17:46:39 +0000 Subject: [PATCH 32/44] DEV: Do not add `-theme` suffix to theme exports This could be confusing if the theme name already ended in "theme" or "theme-component" --- lib/theme_store/tgz_exporter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/theme_store/tgz_exporter.rb b/lib/theme_store/tgz_exporter.rb index 7487e82692..3e1260e86e 100644 --- a/lib/theme_store/tgz_exporter.rb +++ b/lib/theme_store/tgz_exporter.rb @@ -5,7 +5,7 @@ class ThemeStore::TgzExporter def initialize(theme) @theme = theme @temp_folder = "#{Pathname.new(Dir.tmpdir).realpath}/discourse_theme_#{SecureRandom.hex}" - @export_name = "#{@theme.name.downcase.gsub(/[^0-9a-z.\-]/, '-')}-theme" + @export_name = @theme.name.downcase.gsub(/[^0-9a-z.\-]/, '-') @export_name = "discourse-#{@export_name}" unless @export_name.starts_with?("discourse") end From 886ba9dff981f618ac056005a507db598f7328c4 Mon Sep 17 00:00:00 2001 From: David Taylor Date: Thu, 31 Jan 2019 17:52:03 +0000 Subject: [PATCH 33/44] DEV: Correct spec for theme export change --- spec/components/theme_store/tgz_exporter_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/components/theme_store/tgz_exporter_spec.rb b/spec/components/theme_store/tgz_exporter_spec.rb index fb9f32d44f..94df8a8826 100644 --- a/spec/components/theme_store/tgz_exporter_spec.rb +++ b/spec/components/theme_store/tgz_exporter_spec.rb @@ -50,15 +50,15 @@ describe ThemeStore::TgzExporter do filename = exporter.package_filename FileUtils.cp(filename, dir) exporter.cleanup! - "#{dir}/discourse-header-icons-theme.tar.gz" + "#{dir}/discourse-header-icons.tar.gz" end it "exports the theme correctly" do package Dir.chdir("#{dir}") do - `tar -xzf discourse-header-icons-theme.tar.gz` + `tar -xzf discourse-header-icons.tar.gz` end - Dir.chdir("#{dir}/discourse-header-icons-theme") do + Dir.chdir("#{dir}/discourse-header-icons") do folders = Dir.glob("**/*").reject { |f| File.file?(f) } expect(folders).to contain_exactly("assets", "common", "locales", "mobile") @@ -115,7 +115,7 @@ describe ThemeStore::TgzExporter do exporter = ThemeStore::TgzExporter.new(theme) filename = exporter.package_filename exporter.cleanup! - expect(filename).to end_with "/discourse-header-icons-theme.tar.gz" + expect(filename).to end_with "/discourse-header-icons.tar.gz" end end From 94f16ba9318318ef27a55a2cb0667a18649b23c3 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 13:59:49 -0500 Subject: [PATCH 34/44] UX: Make button icons use lighter color instead of opacity --- .../templates/logs/screened-ip-addresses.hbs | 5 +- .../discourse/controllers/history.js.es6 | 6 +-- .../stylesheets/common/admin/customize.scss | 4 ++ .../stylesheets/common/base/compose.scss | 2 +- .../stylesheets/common/base/header.scss | 11 ++--- .../stylesheets/common/base/menu-panel.scss | 7 +-- app/assets/stylesheets/common/base/modal.scss | 3 ++ .../common/components/buttons.scss | 47 ++++++++++++++++--- app/assets/stylesheets/common/d-editor.scss | 4 +- .../common/foundation/variables.scss | 10 ++++ .../common/select-kit/select-kit.scss | 2 +- app/assets/stylesheets/desktop/history.scss | 9 ---- .../stylesheets/desktop/topic-post.scss | 22 +++++++-- 13 files changed, 93 insertions(+), 39 deletions(-) diff --git a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs index c5819da791..109e7e32e1 100644 --- a/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs +++ b/app/assets/javascripts/admin/templates/logs/screened-ip-addresses.hbs @@ -78,11 +78,10 @@ {{#unless item.editing}} {{d-button - class="btn-default" + class="btn-default btn-danger" action=(action "destroy") actionParam=item - icon="far-trash-alt" - class="btn-danger"}} + icon="far-trash-alt"}} {{d-button class="btn-default" action=(action "edit") diff --git a/app/assets/javascripts/discourse/controllers/history.js.es6 b/app/assets/javascripts/discourse/controllers/history.js.es6 index b42a99f1dd..369b37bbd4 100644 --- a/app/assets/javascripts/discourse/controllers/history.js.es6 +++ b/app/assets/javascripts/discourse/controllers/history.js.es6 @@ -199,17 +199,17 @@ export default Ember.Controller.extend(ModalFunctionality, { @computed("displayingInline") inlineClass(displayingInline) { - return displayingInline ? "btn-primary" : ""; + return displayingInline ? "btn-danger" : "btn-flat"; }, @computed("displayingSideBySide") sideBySideClass(displayingSideBySide) { - return displayingSideBySide ? "btn-primary" : ""; + return displayingSideBySide ? "btn-danger" : "btn-flat"; }, @computed("displayingSideBySideMarkdown") sideBySideMarkdownClass(displayingSideBySideMarkdown) { - return displayingSideBySideMarkdown ? "btn-primary" : ""; + return displayingSideBySideMarkdown ? "btn-danger" : "btn-flat"; }, @computed("model.category_id_changes") diff --git a/app/assets/stylesheets/common/admin/customize.scss b/app/assets/stylesheets/common/admin/customize.scss index 3da2b22e0c..e6654ac80e 100644 --- a/app/assets/stylesheets/common/admin/customize.scss +++ b/app/assets/stylesheets/common/admin/customize.scss @@ -137,6 +137,10 @@ display: inline-block; vertical-align: top; + .btn { + line-height: $line-height-medium; // Temporary button-height fix + } + .title { font-size: $font-up-4; font-weight: bold; diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index b00124a639..f57cac9d6e 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -98,7 +98,7 @@ display: flex; align-items: center; .d-icon { - color: $primary-high; + color: $primary-medium; } .reply-details { max-width: calc(100% - 175px); diff --git a/app/assets/stylesheets/common/base/header.scss b/app/assets/stylesheets/common/base/header.scss index 14828be01e..b31d29a4a3 100644 --- a/app/assets/stylesheets/common/base/header.scss +++ b/app/assets/stylesheets/common/base/header.scss @@ -100,10 +100,6 @@ width: 2.2857em; height: 2.2857em; padding: 0.2143em; - color: dark-light-choose( - scale-color($header_primary, $lightness: 50%), - $header_primary - ); text-decoration: none; cursor: pointer; border-top: 1px solid transparent; @@ -117,7 +113,6 @@ } &:hover, &:focus { - color: $primary; background-color: $primary-low; border-top: 1px solid transparent; border-left: 1px solid transparent; @@ -131,13 +126,14 @@ .drop-down-mode & { .active .icon { position: relative; - color: #7b7b7b; background-color: $secondary; cursor: default; border-top: 1px solid $primary-low; border-left: 1px solid $primary-low; border-right: 1px solid $primary-low; - + .d-icon { + color: $primary-medium; + } &:after { display: block; position: absolute; @@ -160,6 +156,7 @@ font-size: $font-up-4; line-height: $line-height-large; display: inline-block; + color: $header_primary-low-mid; } .notifications { position: relative; diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss index b2eb86b284..41cc397501 100644 --- a/app/assets/stylesheets/common/base/menu-panel.scss +++ b/app/assets/stylesheets/common/base/menu-panel.scss @@ -153,11 +153,12 @@ margin: 0.5em 0; } - .fa { - color: dark-light-choose($primary-medium, $secondary-medium); + .d-icon, + &:hover .d-icon { + color: $primary-medium; } .icon { - color: dark-light-choose($primary-high, $secondary-low); + color: $primary-high; } li { background-color: $tertiary-low; diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 391f724a48..848b5cd4d0 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -318,6 +318,9 @@ .d-modal-cancel { margin-left: 1em; color: $primary-medium; + &:hover { + color: $danger; + } } .delete-user-modal { diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss index f9cf292688..d285e4c98f 100644 --- a/app/assets/stylesheets/common/components/buttons.scss +++ b/app/assets/stylesheets/common/components/buttons.scss @@ -17,7 +17,9 @@ transition: all 0.25s; box-sizing: border-box; min-height: 30px; - + .d-icon { + transition: color 0.25s; + } &:active, &.btn-active { text-shadow: none; @@ -49,6 +51,9 @@ color: $primary; font-weight: normal; background: $primary-low; + .d-icon { + color: $primary-high; + } &[href] { color: $primary; @@ -60,24 +65,29 @@ &.btn-hover { background: $primary-medium; color: $secondary; + .d-icon { + color: $secondary-very-high; + } } } &[disabled], &.disabled { background: $primary-low; + .d-icon { + color: $primary-medium; + } &:hover { color: dark-light-choose($primary-low-mid, $secondary-high); + .d-icon { + color: $primary-low-mid; + } } cursor: not-allowed; } .d-icon { - opacity: 0.7; line-height: $line-height-medium; // Match button text line-height } - &.btn-primary .d-icon { - opacity: 1; - } } // Primary button @@ -88,7 +98,9 @@ font-weight: normal; color: $secondary; background: $tertiary; - + .d-icon { + color: currentColor; + } &[href] { color: $secondary; } @@ -100,6 +112,9 @@ scale-color($tertiary, $lightness: -20%), scale-color($tertiary, $lightness: 20%) ); + .d-icon { + color: currentColor; + } } } &:active, @@ -112,6 +127,9 @@ &[disabled], &.disabled { background: $tertiary; + .d-icon { + color: currentColor; + } } } @@ -122,6 +140,9 @@ color: $secondary; font-weight: normal; background: $danger; + .d-icon { + color: $danger-low; + } &[href] { color: $secondary; } @@ -133,6 +154,9 @@ scale-color($danger, $lightness: -20%), scale-color($danger, $lightness: 20%) ); + .d-icon { + color: $danger-low; + } } } &:active, @@ -142,6 +166,9 @@ &[disabled], &.disabled { background: $danger; + .d-icon { + color: $danger-low; + } } } @@ -214,7 +241,13 @@ border: 0; outline: 0; line-height: $line-height-small; + transition: color .25s, background .25s; .d-icon { - opacity: 0.7; + color: $primary-low-mid; + } + &:hover { + .d-icon { + color: $primary; + } } } diff --git a/app/assets/stylesheets/common/d-editor.scss b/app/assets/stylesheets/common/d-editor.scss index 8d8307d882..5b402bfa80 100644 --- a/app/assets/stylesheets/common/d-editor.scss +++ b/app/assets/stylesheets/common/d-editor.scss @@ -82,9 +82,11 @@ .btn, .btn-default { background-color: transparent; - color: $primary-high; padding: 4px 8px; display: inline-block; + .d-icon { + color: $primary-medium; + } @media all and (max-width: 800px) { padding: 5px; } diff --git a/app/assets/stylesheets/common/foundation/variables.scss b/app/assets/stylesheets/common/foundation/variables.scss index 2e56e48654..1bbd8c1aa2 100644 --- a/app/assets/stylesheets/common/foundation/variables.scss +++ b/app/assets/stylesheets/common/foundation/variables.scss @@ -203,9 +203,12 @@ $primary-low: dark-light-diff($primary, $secondary, 90%, -78%); $primary-low-mid: dark-light-diff($primary, $secondary, 70%, -45%); $primary-medium: dark-light-diff($primary, $secondary, 50%, -35%); $primary-high: dark-light-diff($primary, $secondary, 30%, -25%); +$primary-very-high: dark-light-diff($primary, $secondary, 15%, -10%); //header_primary $header_primary-low: dark-light-diff($header_primary, $secondary, 90%, -78%); +$header_primary-low-mid: dark-light-diff($primary, $secondary, 70%, -45%); + $header_primary-medium: dark-light-diff($header_primary, $secondary, 50%, -35%); $header_primary-high: dark-light-diff( $header_primary, @@ -213,11 +216,18 @@ $header_primary-high: dark-light-diff( 30%, -25% ); +$header_primary-very-high: dark-light-diff( + $header_primary, + $header_background, + 15%, + -10% +); //secondary $secondary-low: dark-light-diff($secondary, $primary, 70%, -70%); $secondary-medium: dark-light-diff($secondary, $primary, 50%, -50%); $secondary-high: dark-light-diff($secondary, $primary, 30%, -35%); +$secondary-very-high: dark-light-diff($secondary, $primary, 7%, -7%); //tertiary $tertiary-low: dark-light-diff($tertiary, $secondary, 85%, -65%); diff --git a/app/assets/stylesheets/common/select-kit/select-kit.scss b/app/assets/stylesheets/common/select-kit/select-kit.scss index 874dd6dd7c..87497e62c8 100644 --- a/app/assets/stylesheets/common/select-kit/select-kit.scss +++ b/app/assets/stylesheets/common/select-kit/select-kit.scss @@ -55,7 +55,7 @@ } .d-icon { - opacity: 0.7; + color: $primary-high; } .select-kit-header { diff --git a/app/assets/stylesheets/desktop/history.scss b/app/assets/stylesheets/desktop/history.scss index 9f08fadb88..afb62814f6 100644 --- a/app/assets/stylesheets/desktop/history.scss +++ b/app/assets/stylesheets/desktop/history.scss @@ -20,15 +20,6 @@ text-align: right; display: inline-block; float: right; - - .btn { - background-color: inherit; - color: blend-primary-secondary(50%); - } - .btn-primary { - color: $primary; - font-weight: bold; - } } #revisions { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index a605c4db5f..a6d836b956 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -23,7 +23,7 @@ .actions .fade-out { .discourse-no-touch & { opacity: 0.7; - transition: opacity 0.7s ease-in-out; + transition: background 0.25s, opacity 0.7s ease-in-out; } .discourse-touch & { opacity: 1; @@ -65,6 +65,9 @@ nav.post-controls { .d-hover { background: none; } + .d-icon { + color: $love; + } } &:active { box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.4); @@ -146,6 +149,9 @@ nav.post-controls { margin-right: 0; color: dark-light-choose($primary-high, $secondary-low); margin-left: 10px; + .d-icon { + color: dark-light-choose($primary-high, $secondary-low); + } } .create .d-icon { margin-right: 5px; @@ -172,16 +178,23 @@ nav.post-controls { position: relative; } &.delete.d-hover, + &.delete:hover, &.delete:focus { background: $danger; color: $secondary; + .d-icon { + color: $secondary; + } } &.like.d-hover, &.like:focus { color: $love; background: $love-low; + .d-icon { + color: $love; + } } - &.has-like { + &.has-like .d-icon { color: $love; } &.has-like[disabled]:hover { @@ -192,7 +205,7 @@ nav.post-controls { } &.bookmark { padding: 8px 11px; - &.bookmarked { + &.bookmarked .d-icon { color: $tertiary; } } @@ -364,7 +377,8 @@ nav.post-controls { font-size: $font-up-2; line-height: $line-height-medium; } - button .d-icon { + button .d-icon, + button:hover .d-icon { color: $primary-high; } .avatar a { From 3eb000a9686f089c232a93d83e2236e1866be8b7 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 14:03:11 -0500 Subject: [PATCH 35/44] UX: Overflow hidden was causing some icons to be cropped --- app/assets/stylesheets/vendor/normalize.scss | 8 -------- 1 file changed, 8 deletions(-) diff --git a/app/assets/stylesheets/vendor/normalize.scss b/app/assets/stylesheets/vendor/normalize.scss index b694193cd7..ad7de2bd8a 100644 --- a/app/assets/stylesheets/vendor/normalize.scss +++ b/app/assets/stylesheets/vendor/normalize.scss @@ -184,14 +184,6 @@ img { border: 0; } -/** - * Correct overflow not hidden in IE 9/10/11. - */ - -svg:not(:root) { - overflow: hidden; -} - /* Grouping content ========================================================================== */ From 3d394a61441c6571a92aac3849218d5fab9d351f Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 14:06:32 -0500 Subject: [PATCH 36/44] prettier --- app/assets/stylesheets/common/components/buttons.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss index d285e4c98f..c63f3848e1 100644 --- a/app/assets/stylesheets/common/components/buttons.scss +++ b/app/assets/stylesheets/common/components/buttons.scss @@ -241,7 +241,7 @@ border: 0; outline: 0; line-height: $line-height-small; - transition: color .25s, background .25s; + transition: color 0.25s, background 0.25s; .d-icon { color: $primary-low-mid; } From 0dfcbdeb54213105dfcb58c0f4550224e0b2a115 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 14:20:27 -0500 Subject: [PATCH 37/44] ok/cancel button fix --- app/assets/stylesheets/common/base/discourse.scss | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index 24a7bc1661..be05dfd9a8 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -73,7 +73,9 @@ button { &.ok { background: $success; color: $secondary; - + .d-icon { + color: currentColor; + } @include hover { background: lighten($success, 10%); color: $secondary; @@ -83,7 +85,9 @@ button { &.cancel { background: $danger; color: $secondary; - + .d-icon { + color: currentColor; + } @include hover { background: lighten($danger, 10%); color: $secondary; From 3500acf2f61d9b1c64b7ab48c174fef6734813dd Mon Sep 17 00:00:00 2001 From: Penar Musaraj Date: Thu, 31 Jan 2019 14:29:09 -0500 Subject: [PATCH 38/44] FIX: refresh admin/customize/themes route after import Fixes an issue where the imported color schemes of a theme were not available immediately in the UI. --- .../javascripts/admin/routes/admin-customize-themes.js.es6 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 index 24ee2312f3..49a74bc281 100644 --- a/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-customize-themes.js.es6 @@ -16,8 +16,7 @@ export default Ember.Route.extend({ }, addTheme(theme) { - const all = this.modelFor("adminCustomizeThemes"); - all.pushObject(theme); + this.refresh(); this.transitionTo("adminCustomizeThemes.show", theme.get("id")); }, From ec7f418a22188bcdf7749c8bb75d8d3ddc2927b0 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Thu, 31 Jan 2019 20:44:20 +0100 Subject: [PATCH 39/44] REFACTOR: Simplify finding the opengraph image * removes deprecation warnings for "logo url" * adds the "large icon" as fallback before the "apple touch icon" --- app/helpers/application_helper.rb | 20 +++++++++---------- spec/helpers/application_helper_spec.rb | 26 ++++++++++++++++++------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 810cfe146e..4963b95832 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -212,18 +212,18 @@ module ApplicationHelper opts ||= {} opts[:url] ||= "#{Discourse.base_url_no_prefix}#{request.fullpath}" - twitter_summary_large_image_url = - SiteSetting.site_twitter_summary_large_image_url + if opts[:image].blank? + twitter_summary_large_image_url = SiteSetting.site_twitter_summary_large_image_url - opengraph_image_url = SiteSetting.opengraph_image_url + if twitter_summary_large_image_url.present? + opts[:twitter_summary_large_image] = twitter_summary_large_image_url + end - if opts[:image].blank? && (opengraph_image_url.present? || twitter_summary_large_image_url.present?) - opts[:twitter_summary_large_image] = twitter_summary_large_image_url if twitter_summary_large_image_url.present? - opts[:image] = opengraph_image_url.present? ? opengraph_image_url : twitter_summary_large_image_url - elsif opts[:image].blank? && SiteSetting.site_apple_touch_icon_url.present? - opts[:image] = SiteSetting.site_apple_touch_icon_url - elsif opts[:image].blank? && SiteSetting.logo_url.present? - opts[:image] = SiteSetting.logo_url + opts[:image] = SiteSetting.opengraph_image_url.presence || + twitter_summary_large_image_url.presence || + SiteSetting.site_large_icon_url.presence || + SiteSetting.site_apple_touch_icon_url.presence || + SiteSetting.site_logo_url.presence end # Use the correct scheme for opengraph/twitter image diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb index 23bb27761c..b769cadb3a 100644 --- a/spec/helpers/application_helper_spec.rb +++ b/spec/helpers/application_helper_spec.rb @@ -232,18 +232,30 @@ describe ApplicationHelper do describe 'crawlable_meta_data' do context "opengraph image" do - it 'returns default_opengraph_image_url' do - SiteSetting.default_opengraph_image_url = "/images/og-image.png" + it 'returns the correct image' do + SiteSetting.default_opengraph_image_url = '/images/og-image.png' + SiteSetting.twitter_summary_large_image_url = '/images/twitter.png' + SiteSetting.large_icon_url = '/images/large_icon.png' + SiteSetting.apple_touch_icon_url = '/images/default-apple-touch-icon.png' + SiteSetting.logo_url = '/images/d-logo-sketch.png' + + expect(helper.crawlable_meta_data(image: "some-image.png")).to include("some-image.png") expect(helper.crawlable_meta_data).to include("/images/og-image.png") - end - it 'returns apple_touch_icon_url if default_opengraph_image_url is blank' do + SiteSetting.default_opengraph_image_url = '' + expect(helper.crawlable_meta_data).to include("/images/twitter.png") + + SiteSetting.twitter_summary_large_image_url = '' + expect(helper.crawlable_meta_data).to include("/images/large_icon.png") + + SiteSetting.large_icon_url = '' expect(helper.crawlable_meta_data).to include("/images/default-apple-touch-icon.png") - end - it 'returns logo_url if apple_touch_icon_url is blank' do - SiteSetting.apple_touch_icon_url = "" + SiteSetting.apple_touch_icon_url = '' expect(helper.crawlable_meta_data).to include("/images/d-logo-sketch.png") + + SiteSetting.logo_url = '' + expect(helper.crawlable_meta_data).to_not include("/images") end end end From 720e896e17929ffdba9720baf86f952a6a21179b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 31 Jan 2019 14:47:41 -0500 Subject: [PATCH 40/44] FIX: `PostActionCreator` was not checking the guardian properly It also exposed a bug in the EmailReceiver spec, where a test had a user liking their own post and was not failing. --- lib/post_action_creator.rb | 2 +- spec/components/email/receiver_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/post_action_creator.rb b/lib/post_action_creator.rb index 32e4b2aa13..21b951a638 100644 --- a/lib/post_action_creator.rb +++ b/lib/post_action_creator.rb @@ -7,7 +7,7 @@ class PostActionCreator end def perform(action) - guardian.ensure_post_can_act!(@post, action, opts: { + guardian.ensure_post_can_act!(@post, PostActionType.types[action], opts: { taken_actions: PostAction.counts_for([@post].compact, @user)[@post&.id] }) diff --git a/spec/components/email/receiver_spec.rb b/spec/components/email/receiver_spec.rb index 75ac46d6db..f243065e49 100644 --- a/spec/components/email/receiver_spec.rb +++ b/spec/components/email/receiver_spec.rb @@ -241,7 +241,7 @@ describe Email::Receiver do let(:category) { Fabricate(:category) } let(:user) { Fabricate(:user, email: "discourse@bar.com") } let(:topic) { create_topic(category: category, user: user) } - let(:post) { create_post(topic: topic, user: user) } + let(:post) { create_post(topic: topic) } let!(:post_reply_key) do Fabricate(:post_reply_key, From 614129039973196b85e1eb4d3b65ed67cc04aab0 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 15:13:22 -0500 Subject: [PATCH 41/44] FIX: Mobile button colors --- .../stylesheets/common/components/buttons.scss | 8 +++++--- app/assets/stylesheets/mobile/topic-post.scss | 12 +++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/common/components/buttons.scss b/app/assets/stylesheets/common/components/buttons.scss index c63f3848e1..6b45685f60 100644 --- a/app/assets/stylesheets/common/components/buttons.scss +++ b/app/assets/stylesheets/common/components/buttons.scss @@ -245,9 +245,11 @@ .d-icon { color: $primary-low-mid; } - &:hover { - .d-icon { - color: $primary; + .discourse-no-touch & { + &:hover { + .d-icon { + color: $primary; + } } } } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index cc062ce6d9..811eabbc0c 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -83,14 +83,20 @@ span.badge-posts { margin: 10px 0 10px 0; } &.reply { - color: $primary-high; + .d-icon { + color: $primary-high; + } margin-left: auto; } &.has-like { - color: $love; + .d-icon { + color: $love; + } } &.bookmarked { - color: $tertiary; + .d-icon { + color: $tertiary; + } } } } From 95e16ab0a6f896d7871e6b5430fc760e17e52903 Mon Sep 17 00:00:00 2001 From: Kris Date: Thu, 31 Jan 2019 15:27:46 -0500 Subject: [PATCH 42/44] UX: Badge checkmarks should be round --- app/assets/stylesheets/common/base/user-badges.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/common/base/user-badges.scss b/app/assets/stylesheets/common/base/user-badges.scss index 79033dda03..304274f055 100644 --- a/app/assets/stylesheets/common/base/user-badges.scss +++ b/app/assets/stylesheets/common/base/user-badges.scss @@ -328,7 +328,7 @@ .check-display { display: inline-block; - width: 18px; + padding: 0 0.25em; border-radius: 10px; text-align: center; .fa { From 6bfd2b6eafa8c01b0bbd4da24d726410569f0fc4 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 31 Jan 2019 16:27:07 -0500 Subject: [PATCH 43/44] Update translations --- config/locales/client.de.yml | 18 + config/locales/client.es.yml | 58 +- config/locales/client.fi.yml | 10 +- config/locales/client.fr.yml | 10 + config/locales/client.nl.yml | 218 +++++ config/locales/client.ru.yml | 16 +- config/locales/client.sk.yml | 26 + config/locales/client.sl.yml | 751 +++++++++++------- config/locales/server.de.yml | 23 + config/locales/server.es.yml | 316 +++++++- config/locales/server.fi.yml | 2 + config/locales/server.fr.yml | 15 + config/locales/server.ru.yml | 181 +++++ config/locales/server.sl.yml | 432 +++++++++- .../config/locales/client.sl.yml | 4 +- .../config/locales/client.fi.yml | 5 + .../config/locales/client.sl.yml | 15 + .../config/locales/server.bg.yml | 4 +- .../config/locales/server.es.yml | 1 + .../config/locales/server.fi.yml | 7 +- .../config/locales/server.es.yml | 2 +- .../config/locales/server.fi.yml | 8 + .../config/locales/server.sl.yml | 42 + 23 files changed, 1804 insertions(+), 360 deletions(-) diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 1e40693b44..51ef58d9a4 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -597,6 +597,8 @@ de: first_notification: "Deine erste Benachrichtigung! Wähle sie aus um fortzufahren." disable_jump_reply: "Springe nicht zu meinem Beitrag, nachdem ich geantwortet habe" dynamic_favicon: "Zeige die Anzahl der neuen und geänderten Themen im Browser-Symbol an" + theme_default_on_all_devices: "Mache dieses Theme zum Standard für alle meine Geräte" + text_size_default_on_all_devices: "Mache diese Schriftgröße zum Standard für alle meine Geräte" allow_private_messages: "Anderen Benutzern erlauben, mir persönliche Nachrichten zu schicken" external_links_in_new_tab: "Öffne alle externen Links in einem neuen Tab" enable_quoting: "Aktiviere Zitatantwort mit dem hervorgehobenen Text" @@ -2635,6 +2637,7 @@ de: version_check_pending: "Sieht so aus, als hättest du vor Kurzem aktualisiert. Großartig!" installed_version: "Installiert" latest_version: "Neueste" + problems_found: "Ein paar Ratschläge basierend auf deinen aktuellen Website-Einstellungen" last_checked: "Zuletzt geprüft" refresh_problems: "Aktualisieren" no_problems: "Es wurden keine Probleme gefunden." @@ -3093,6 +3096,7 @@ de: convert_theme_alert: "Bist Du sicher, dass du dieses Theme in eine Komponente umwandeln möchtest? Sie wird als übergeordnetes Element entfernt von %{relatives}." convert_theme_tooltip: "Wandle dieses Theme in eine Komponente um" inactive_themes: "Inaktive Themes:" + inactive_components: "Nicht verwendete Komponenten:" broken_theme_tooltip: "Dieses Theme hat fehlerhaftes CSS, HTML oder YAML." default_theme_tooltip: "Dieses Theme ist das Standardtheme der Seite." updates_available_tooltip: "Updates sind verfügbar für dieses Theme" @@ -3118,10 +3122,19 @@ de: edit_css_html_help: "Du hast kein CSS oder HTML bearbeitet" delete_upload_confirm: "Upload löschen? (Theme-CSS funktioniert eventuell nicht mehr!)" import_web_tip: "Repository mit dem Theme" + import_file_tip: ".tar.gz oder .dcstyle.json Datei mit dem Theme" is_private: "Theme ist in einem privaten Git-Repository" remote_branch: "Branch-Name (optional)" public_key: "Gewähre dem folgenden öffentlichen Schlüssel den Zugriff auf das Repository:" + about_theme: "Über uns" license: "Lizenz" + version: "Version:" + authors: "Erstellt von:" + source_url: "Quelle" + required_version: + error: "Dieses Theme wurde automatisch deaktiviert, weil es mit dieser Discourse-Version nicht kompatibel ist." + minimum: "Erfordert Discourse-Version {{version}} oder höher" + maximum: "Erfordert Discourse-Version {{version}} oder niedriger." component_of: "Komponente von:" update_to_latest: "Aktualisieren auf neueste Version" check_for_updates: "Nach Aktualisierungen suchen" @@ -3137,6 +3150,7 @@ de: other: "Theme liegt {{count}} Commits zurück!" compare_commits: "(Siehe neue Beiträge)" repo_unreachable: "Das Git-Repository dieses Themes konnte nicht kontaktiert werden. Fehlermeldung:" + imported_from_archive: "Dieses Theme wurde aus einer .tar.gz-Datei importiert." scss: text: "CSS" title: "Gib benutzerdefiniertes CSS ein, wir akzeptieren alle gültigen CSS und SCSS-Stile" @@ -3834,6 +3848,10 @@ de: with_post: "%{username} für Beitrag in %{link}" with_post_time: "%{username} für Beitrag in %{link} um %{time}" with_time: "%{username} um %{time}" + badge_intro: + title: 'Wähle ein bestehendes Abzeichen oder erstelle ein neues, um loszulegen' + what_are_badges_title: 'Was sind Abzeichen?' + badge_query_examples_title: 'Beispiele für Abzeichen-Abfragen' emoji: title: "Emoji" help: "Neues Emoji hinzufügen, das für alle verfügbar sein wird. (Tipp: per Drag & Drop kannst du gleichzeitig mehrere Dateien hinzufügen)" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 93c415226e..c7d88e90c8 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -660,7 +660,7 @@ es: undo_revoke_access: "Deshacer revocación de acceso" api_approved: "Aprobado:" api_last_used_at: "Fecha de último uso:" - theme: "Theme" + theme: "Tema" home: "Página de inicio por defecto" staged: "Temporal" staff_counters: @@ -1390,7 +1390,7 @@ es: one: "{{username}}, {{username2}} and 1 mas {{description}}" other: "{{username}}, {{username2}} y otros {{count}} {{description}}" liked_consolidated_description: - one: "le ha dado me gusta a 1 de tus mensaje" + one: "le ha dado me gusta a {{count}} de tus mensajes" other: "le ha dado me gusta a {{count}} de tus mensajes" liked_consolidated: "{{username}} {{description}}" private_message: "{{username}} {{description}}" @@ -1667,7 +1667,7 @@ es: auto_delete: title: "Auto-Eliminar Tema" auto_bump: - title: "Actualizar automáticamente la fecha de este tema" + title: "Tema Auto-Bump" reminder: title: "Recordarme" status_update_notice: @@ -3041,13 +3041,13 @@ es: title: "Personalizar" long_title: "Personalizaciones del sitio" preview: "vista previa" - explain_preview: "Ver el sitio con el theme habilitado" + explain_preview: "Ver el sitio con el tema habilitado" save: "Guardar" new: "Nuevo" new_style: "Nuevo Estilo" import: "Importar" delete: "Eliminar" - delete_confirm: "¿Eliminar este theme?" + delete_confirm: "¿Eliminar este tema?" color: "Color" opacity: "Opacidad" copy: "Copiar" @@ -3073,31 +3073,31 @@ es: beginners_guide_title: "Guía para novatos usando temas de Discourse" developers_guide_title: "Guía para desarrolladores para temas de Discourse" browse_themes: "Ver temas de la comunidad" - import_theme: "Importar Theme" + import_theme: "Importar tema" customize_desc: "Personalizar:" - title: "Themes" + title: "Tema" create: "Crear" create_type: "Tipo:" create_name: "Nombre:" name_too_short: "El nombre debe tener al menos 4 caracteres de largo." long_title: "Modifique los colores, los CSS y los contenidos HTML de su sitio" edit: "Editar" - edit_confirm: "Este es un theme remoto, si editas CSS/HTML, los cambios serán borrados en la próxima actualización al theme." + edit_confirm: "Este es un tema remoto, si editas CSS/HTML, los cambios serán borrados en la próxima actualización del tema." common: "Común" desktop: "Escritorio" mobile: "Móvil" settings: "Ajustes" preview: "Vista previa" - is_default: "Theme habilitado por defecto" - user_selectable: "Theme puede ser seleccionado por usuarios" + is_default: "Tema habilitado por defecto" + user_selectable: "Tema puede ser seleccionado por usuarios" color_scheme: "Esquema de color" - color_scheme_select: "Selecciona colores para ser usados en el theme" + color_scheme_select: "Selecciona colores para ser usados en el tema" custom_sections: "Personalizaciones:" - theme_components: "Componentes del Theme" + theme_components: "Componentes del tem" convert: "Convertir" convert_component_alert: "¿Estás seguro de que quieres convertir este componente en tema? Será eliminado como componente desde %{relatives}." convert_component_tooltip: "Convertir este componente en tema" - convert_theme_alert: "¿Estás seguro que quieres convertir este theme en componente? Será eliminado como principal desde %{relatives}." + convert_theme_alert: "¿Estás seguro que quieres convertir este tema en componente? Será eliminado como principal desde %{relatives}." convert_theme_tooltip: "Convertir este tema en componente" inactive_themes: "Tema inactivos:" inactive_components: "Componentes sin usar:" @@ -3107,7 +3107,7 @@ es: and_x_more: "y {{count}} más." collapse: Colapsar uploads: "Subidos" - no_uploads: "Puedes subir archivos asociados con tu theme como fuentes e imágenes " + no_uploads: "Puedes subir archivos asociados con tu tema como fuentes e imágenes " add_upload: "Agregar Subido" upload_file_tip: "Selecciona un archivo a subir (png, woff2, etc...)" variable_name: "Nombre de variable SCSS:" @@ -3124,10 +3124,10 @@ es: css_html: "Personalizar CSS/HTML" edit_css_html: "Editar CSS/HTML" edit_css_html_help: "No has editado ningún CSS o HTML" - delete_upload_confirm: "Borrar este upload? (El theme CSS puede dejar de funcionar!)" - import_web_tip: "Repositorio que contiene el theme" + delete_upload_confirm: "¿Borrar este archivo? (¡El tema CSS puede dejar de funcionar!)" + import_web_tip: "Repositorio que contiene el tema" import_file_tip: "archivo .tar.gz o .dcstyle.json que contenga el tema" - is_private: "El theme está en un repositorio privado de git" + is_private: "El tema está en un repositorio privado de git" remote_branch: "Nombre del Branch (opcional)" public_key: "Conceda la siguiente clave pública de acceso para el repositorio:" about_theme: "Acerca de" @@ -3143,15 +3143,15 @@ es: update_to_latest: "Actualizar a lo último" check_for_updates: "Verificar por Actualizaciones" updating: "Actualizando..." - up_to_date: "Theme actualizado, última verificación:" + up_to_date: "Tema actualizado, última comprobación:" add: "Agregar" - theme_settings: "Ajustes del Theme" - no_settings: "Este theme no tiene ajustes." + theme_settings: "Ajustes del tem" + no_settings: "Este tema no tiene ajustes." theme_translations: "Traducciones del tema" empty: "Sin items" commits_behind: - one: "Theme está 1 commit detrás!" - other: "Theme está {{count}} commits detrás!" + one: "¡El tema está 1 commit detrás!" + other: "¡El tema está {{count}} commits detrás!" compare_commits: "(Ver nuevos commits)" repo_unreachable: "No se ha podido contactar con el repositorio Git de este tema. Mensaje de error:" imported_from_archive: "Este tema fue importado de un archivo .tar.gz" @@ -3178,7 +3178,7 @@ es: title: "HTML que será insertado antes del tag " yaml: text: "YAML" - title: "Definir ajustes al theme en formato YAML" + title: "Definir ajustes al tema en formato YAML" colors: select_base: title: "Selecciona esquema base de color" @@ -3186,7 +3186,7 @@ es: title: "Colores" edit: "Editar esquemas de color" long_title: "Esquemas de color" - about: "Modifica los colores utilizados en tu theme. Crea un nuevo esquema de color para empezar." + about: "Modifica los colores utilizados en tu tema. Crea un nuevo esquema de color para empezar." new_name: "Nuevo esquema de color" copy_name_prefix: "Copia de" delete_confirm: "¿Eliminar este esquema de color?" @@ -3342,8 +3342,8 @@ es: change_trust_level: "cambiar nivel de confianza" change_username: "cambiar nombre de usuario" change_site_setting: "cambiar configuración del sitio" - change_theme: "cambiar theme" - delete_theme: "borrar theme" + change_theme: "cambiar tema" + delete_theme: "borrar tema" change_site_text: "cambiar textos" suspend_user: "suspender usuario" unsuspend_user: "desbloquear usuario" @@ -3853,9 +3853,9 @@ es: with_post_time: "%{username} por publicar en %{link} el %{time}" with_time: "%{username} el %{time}" badge_intro: - title: 'Selecciona una medalla existente o crea una para empezar' - what_are_badges_title: '¿Qué son las medallas?' - badge_query_examples_title: 'Ejemplos de queries de medalla' + title: 'Selecciona un distintivo existente o crea uno para empezar' + what_are_badges_title: '¿Qué son los distintivos?' + badge_query_examples_title: 'Ejemplos de consultas de distintivos' emoji: title: "Emoji" help: "Añade nuevos emojis que estarán disponibles para todos. (CONSEJO: arrasta varios archivos a la vez)" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index b8669b887e..02dfd56143 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -2772,14 +2772,14 @@ fi: one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} lippu yhteensä)" other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} lippua yhteensä)" agreed: - one: "{{count}} samaa mieltä" + one: "{{count}} % samaa mieltä" other: "{{count}}% samaa mieltä" disagreed: - one: "{{count}} eri mieltä" - other: "{{count}} eri mieltä" + one: "{{count}} % eri mieltä" + other: "{{count}} % eri mieltä" ignored: - one: "{{count}} sivuutettu" - other: "{{count}} sivuutettu" + one: "{{count}} % sivuutettu" + other: "{{count}} % sivuutettu" details: "yksityiskohdat" flagged_topics: topic: "Ketju" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 52bad00b44..65af88be57 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -597,6 +597,8 @@ fr: first_notification: "Votre première notification ! Cliquez-la pour démarrer." disable_jump_reply: "Ne pas aller à mon nouveau message après avoir répondu" dynamic_favicon: "Faire apparaître le nombre de sujets récemment créés ou mis à jour sur l'icône navigateur" + theme_default_on_all_devices: "En faire mon thème par défaut sur tous mes périphériques" + text_size_default_on_all_devices: "En faire la taille de texte par défaut sur tous mes périphériques" allow_private_messages: "Permettre aux autres utilisateurs de m’envoyer des messages directs" external_links_in_new_tab: "Ouvrir tous les liens externes dans un nouvel onglet" enable_quoting: "Proposer de citer le texte sélectionné" @@ -3142,7 +3144,15 @@ fr: is_private: "Le thème est dans un dépôt git privé" remote_branch: "Nom de branche (optionnel)" public_key: "Accorder un accès dépôt à la clef publique suivante :" + about_theme: "À propos" license: "Licence" + version: "Version :" + authors: "Auteur :" + source_url: "Source" + required_version: + error: "Ce thème a été désactivé automatiquement car il n'est pas compatible avec cette version de Discourse." + minimum: "Nécessite version {{version}} ou supérieur de Discourse." + maximum: "Nécessite version {{version}} ou inférieur de Discourse." component_of: "Composant de :" update_to_latest: "Mettre à jour" check_for_updates: "Vérifier les mises à jour" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index b51d9ed81f..9ada507120 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -381,6 +381,7 @@ nl: profile: title: Profiel interaction: + title: Interactie posting: Plaatsen notification: Melding membership: @@ -476,6 +477,7 @@ nl: description: "U ontvangt een melding bij elk nieuw bericht, en het aantal nieuwe antwoorden wordt weergeven." watching_first_post: title: "Eerste bericht in de gaten houden" + description: "Je wordt genotificeerd over nieuwe topics in deze groep, niet voor reacties voor de topics." tracking: title: "Volgen" description: "U ontvangt een melding wanneer iemand uw @naam noemt of een bericht van u beantwoordt, en het aantal nieuwe antwoorden wordt weergeven." @@ -487,6 +489,7 @@ nl: description: "U ontvangt geen enkele melding over nieuwe topics in deze groep." flair_url: "Afbeelding voor avatar-flair" flair_url_placeholder: "(Optioneel) Afbeeldings-URL of Font Awesome-klasse" + flair_url_description: 'Gebruik vierkante plaatjes die niet kleiner zijn dan 20 bij 20 pixels of FontAwesome icoontjes (geaccepteerde formats: "fa-icon", "far fa-icon" of "fab fa-icon").' flair_bg_color: "Achtergrondkleur van avatar-flair" flair_bg_color_placeholder: "(Optioneel) Hex-kleurwaarde" flair_color: "Kleur van avatar-flair" @@ -506,8 +509,10 @@ nl: "12": "Verzonden items" "13": "Inbox" "14": "In wachtrij" + "15": "Concepten" categories: all: "Alle categorieën" + all_subcategories: "alles" no_subcategory: "geen" category: "Categorie" category_list: "Categorielijst weergeven" @@ -526,6 +531,13 @@ nl: topic_sentence: one: "1 topic" other: "%{count} topics" + topic_stat_sentence_week: + one: "%{count} nieuw topic in de afgelopen week." + other: "%{count} nieuwe topics in de afgelopen week." + topic_stat_sentence_month: + one: "%{count} nieuw topic in de afgelopen maand." + other: "%{count} nieuwe topics in de afgelopen maand." + n_more: "Categorieën (%{count} meer) ..." ip_lookup: title: IP-adres zoeken hostname: Hostnaam @@ -541,6 +553,7 @@ nl: topics_entered: "topics ingevoerd" post_count: "# berichten" confirm_delete_other_accounts: "Weet u zeker dat u deze accounts wilt verwijderen?" + powered_by: "gebruikt MaxMindDB" copied: "gekopieerd" user_fields: none: "(selecteer een optie)" @@ -569,6 +582,7 @@ nl: notifications: "Meldingen" statistics: "Statistieken " desktop_notifications: + label: "Live notificaties" not_supported: "Meldingen worden in deze browser niet ondersteund. Sorry." perm_default: "Meldingen inschakelen" perm_denied_btn: "Toestemming geweigerd" @@ -576,12 +590,16 @@ nl: disable: "Meldingen uitschakelen" enable: "Meldingen inschakelen" each_browser_note: "Opmerking: u moet deze instelling in elke browser die u gebruikt wijzigen." + consent_prompt: "Wil je live notificaties ontvangen als mensen reageren op jouw posts?" dismiss: "Negeren" dismiss_notifications: "Alle verwijderen" dismiss_notifications_tooltip: "Alle ongelezen meldingen markeren als gelezen" first_notification: "Uw eerste melding! Selecteer deze om te beginnen." disable_jump_reply: "Niet naar mijn bericht gaan nadat ik antwoord" dynamic_favicon: "Aantal nieuwe / bijgewerkte topics tonen in browserpictogram" + theme_default_on_all_devices: "Maak dit het standaard thema op al mijn apparaten" + text_size_default_on_all_devices: "Maak dit de standaard text grootte op al mijn apparaten" + allow_private_messages: "Toestaan dat andere gebruikers mij persoonlijke berichten kunnen sturen" external_links_in_new_tab: "Alle externe koppelingen openen in een nieuw tabblad" enable_quoting: "Antwoord-met-citaat voor geselecteerde tekst inschakelen" change: "wijzigen" @@ -589,6 +607,7 @@ nl: admin: "{{user}} is een beheerder" moderator_tooltip: "Deze gebruiker is een moderator" admin_tooltip: "Deze gebruiker is een beheerder" + silenced_tooltip: "Deze gebruiker is tot zwijgen gebracht" suspended_notice: "Deze gebruiker is geschorst tot {{date}}." suspended_permanently: "Deze gebruiker is geschorst." suspended_reason: "Reden: " @@ -604,6 +623,7 @@ nl: individual_no_echo: "Een e-mail voor elk nieuw bericht verzenden, behalve die van mezelf" many_per_day: "Mij een e-mail voor elk nieuw bericht sturen (ongeveer {{dailyEmailEstimate}} per dag)" few_per_day: "Mij een e-mail voor elk nieuw bericht sturen (ongeveer 2 per dag)" + warning: "Mail lijst modus staat aan. E-mail notificatie instellingen zijn overschreven." tag_settings: "Tags" watched_tags: "In de gaten gehouden" watched_tags_instructions: "U houdt automatisch alle nieuwe topics met deze tags in de gaten. U ontvangt meldingen bij alle nieuwe berichten en topics, en het aantal nieuwe berichten verschijnt ook naast het topic." @@ -620,10 +640,12 @@ nl: watched_first_post_tags: "Eerste bericht in de gaten houden" watched_first_post_tags_instructions: "U ontvangt een melding bij het eerste bericht in elk nieuw topic met deze tags." muted_categories: "Genegeerd" + muted_categories_instructions: "Je wordt genotificeerd voor alle nieuwe topics in deze categorieën, en ze worden niet weergegeven op de categorie of nieuwste pagina's." no_category_access: "Als een beheerder heeft u beperkte toegang tot categorieën, opslaan is uitgeschakeld." delete_account: "Mijn account verwijderen" delete_account_confirm: "Weet u zeker dat u uw account definitief wilt verwijderen? Deze actie kan niet ongedaan worden gemaakt!" deleted_yourself: "Uw account is met succes verwijderd." + delete_yourself_not_allowed: "Neem contact op met een personeelslid als je je account verwijderd wilt hebben." unread_message_count: "Berichten" admin_delete: "Verwijderen" users: "Gebruikers" @@ -639,6 +661,8 @@ nl: api_approved: "Goedgekeurd:" api_last_used_at: "Laatst gebruikt op:" theme: "Thema" + home: "Standaard Home Pagina" + staged: "Opvoeren" staff_counters: flags_given: "behulpzame markeringen" flagged_posts: "gemarkeerde berichten" @@ -656,6 +680,7 @@ nl: move_to_archive: "Archiveren" failed_to_move: "Het verplaatsen van geselecteerde berichten is niet gelukt (misschien is uw netwerkverbinding verbroken)" select_all: "Alles selecteren" + tags: "Tags" preferences_nav: account: "Account" profile: "Profiel" @@ -673,13 +698,39 @@ nl: set_password: "Wachtwoord instellen" choose_new: "Kies een nieuw wachtwoord" choose: "Kies een wachtwoord" + second_factor_backup: + title: "Twee Factor Backup Codes" + regenerate: "Hergenereren " + disable: "Uitschakelen" + enable: "Inschakelen" + enable_long: "Backup codes inschakelen" + manage: "Backup codes beheren" + copied_to_clipboard: "Naar klembord gekopieerd" + copy_to_clipboard_error: "Probleem met het kopiëren naar het klembord" + remaining_codes: "Je hebt {{count}} backup codes over." + codes: + title: "Backup codes gegenereerd" + description: "Elke backup code kan maar één keer gebruikt worden. Bewaar ze ergens veilig maar makkelijk beschikbaar." second_factor: + title: "Twee Factor Authenticatie" + disable: "Zet twee factor authenticatie uit" + enable: "Zet twee factor authenticatie aan voor betere account beveiliging" + confirm_password_description: "Bevestig je wachtwoord om door te gaan" label: "Code" + rate_limit: "Wacht even voor het gebruiken van een andere authenticatie code." + enable_description: | + Scan deze QR code in een ondersteunde app (Android - iOS) en voer je authenticatie code in. + disable_description: "Voer de authenticatie code in vanuit je app" + show_key_description: "Voer handmatig in" + extended_description: | + Twee factor authenticatie voegt extra beveiliging toe aan jouw account door elke keer een eenmalige code in te voeren naast je wachtwoord. Deze code kan gegeneerd worden op Android en iOS apparaten. + oauth_enabled_warning: "Hou er rekening mee dat sociale media inlog uit worden gezet als je twee factor authenticatie aanzet op jouw account." change_about: title: "Over mij wijzigen" error: "Er is een fout opgetreden bij het wijzigen van deze waarde." change_username: title: "Gebruikersnaam wijzigen" + confirm: "Weet je zeker dat je je gebruikersnaam wilt wijzigen?" taken: "Sorry, maar die gebruikersnaam is al in gebruik." invalid: "Die gebruikersnaam is ongeldig. Hij mag alleen cijfers en letters bevatten." change_email: @@ -692,6 +743,7 @@ nl: title: "Uw profielafbeelding wijzigen" gravatar: "Gravatar, gebaseerd op" gravatar_title: "Wijzig uw avatar op de website van Gravatar" + gravatar_failed: "We konden geen Gravatar voor dat e-mailadres vinden." refresh_gravatar_title: "Uw gravatar vernieuwen" letter_based: "Door systeem toegekende profielafbeelding" uploaded_avatar: "Eigen afbeelding" @@ -707,6 +759,9 @@ nl: instructions: "Achtergrondafbeeldingen worden gecentreerd en hebben een standaardbreedte van 590px." email: title: "E-mail" + primary: "Hoofd e-mailadres" + secondary: "Extra e-mailadressen" + no_secondary: "Geen tweede e-maildressen" instructions: "nooit openbaar zichtbaar" ok: "We sturen een e-mail ter bevestiging" invalid: "Voer een geldig e-mailadres in " @@ -715,6 +770,11 @@ nl: frequency: one: "We sturen alleen een e-mail als we u de laatste minuut niet hebben gezien." other: "We sturen alleen een e-mail als we u de laatste {{count}} minuten niet hebben gezien." + associated_accounts: + title: "Geassocieerde accounts" + connect: "Verbinden" + revoke: "Intrekken" + not_connected: "(niet verbonden)" name: title: "Naam" instructions: "uw volledige naam (optioneel)" @@ -740,8 +800,19 @@ nl: password_confirmation: title: "Nogmaals het wachtwoord" auth_tokens: + title: "Recentelijk gebruikte apparaten" + ip: "IP" + details: "Details" + log_out_all: "Log alles uit" active: "nu actief" + not_you: "Niet jij?" + show_all: "Laat alles zien ({{count}})" show_few: "Laat minder zien" + was_this_you: "Was jij dit?" + was_this_you_description: "Als jij dit niet was, Daan raden we aan om je wachtwoord te veranderen en overal uit te loggen." + browser_and_device: "{{browser}} op {{device}}" + secure_account: "Beveilig mijn account" + latest_post: "Je hebt laatst geplaatst..." last_posted: "Laatste bericht" last_emailed: "Laatst gemaild" last_seen: "Gezien" @@ -750,8 +821,10 @@ nl: location: "Locatie" website: "Website" email_settings: "E-mail" + hide_profile_and_presence: "Verberg mijn openbaar profiel en aanwezigheid functies" text_size: title: "Tekstgrootte" + smaller: "Kleiner" normal: "Normaal" larger: "Groter" largest: "Grootst" @@ -767,6 +840,7 @@ nl: always: "altijd" never: "nooit" email_digests: + title: "Als ik hier niet kom, stuur mij een email met de samenvatting van populaire topics en reacties." every_30_minutes: "elke 30 minuten" every_hour: "elk uur" daily: "dagelijks" @@ -805,6 +879,7 @@ nl: title: "Uitnodigingen" user: "Uitgenodigde gebruiker" sent: "Verzonden" + none: "Geen uitnodigingen om te weergeven." truncated: one: "De eerste uitnodiging wordt getoond." other: "De eerste {{count}} uitnodigingen worden getoond." @@ -840,6 +915,7 @@ nl: text: "Groepsuitnodiging via bestand" success: "Het bestand is met succes geüpload. U ontvangt een melding via een bericht zodra het proces is voltooid." error: "Sorry, bestand dient de CSV-indeling te hebben." + confirmation_message: "Jij staat op het moment om uitnodigingen naar iedereen in het geüpload bestand te sturen via de mail." password: title: "Wachtwoord" too_short: "Uw wachtwoord is te kort." @@ -852,6 +928,7 @@ nl: title: "Samenvatting " stats: "Statistieken " time_read: "leestijd" + recent_time_read: "recente lees tijd" topic_count: one: "Onderwerp gemaakt" other: "topics gemaakt" @@ -867,6 +944,9 @@ nl: days_visited: one: "dag bezocht" other: "dagen bezocht" + topics_entered: + one: "topic bekeken" + other: "topics bekeken" posts_read: one: "bericht gelezen" other: "berichten gelezen" @@ -888,6 +968,9 @@ nl: most_liked_users: "Meest geliket" most_replied_to_users: "Meest geantwoord op" no_likes: "Nog geen likes." + top_categories: "Top categorieën" + topics: "Topics" + replies: "Reacties" ip_address: title: "Laatste IP-adres" registration_ip_address: @@ -897,6 +980,7 @@ nl: header_title: "profiel, berichten, bladwijzers en voorkeuren" title: title: "Titel" + none: "(geen)" filters: all: "Alle" stream: @@ -951,7 +1035,10 @@ nl: first_post: Eerste bericht mute: Negeren unmute: Tonen + last_post: Geplaatst time_read: Gelezen + time_read_recently: "%{time_read} recent" + time_read_tooltip: "%{time_read} totale lees tijd" last_reply_lowercase: laatste antwoord replies_lowercase: one: antwoord @@ -974,6 +1061,9 @@ nl: disable: "Verwijderde berichten tonen" private_message_info: title: "Bericht" + invite: "Anderen uitnodigen ..." + edit: "Voeg toe of verwijder ..." + leave_message: "Weet je zeker dat je dit bericht wilt verlaten?" remove_allowed_user: "Wilt u {{naam}} echt uit dit bericht verwijderen?" remove_allowed_group: "Wilt u {{name}} echt uit dit bericht verwijderen?" email: "E-mailadres" @@ -1001,14 +1091,25 @@ nl: help: "Komt de e-mail niet aan? Controleer eerst je spam map.

Weet je niet zeker welk e-mailadres je gebruikt hebt? Voer een e-mailadres in en we laten je weten of het hier bestaat.

Als je niet langer toegang hebt tot het e-mailadres van je account, neem alsjeblieft contact op met onze hulpvolle staf.

" button_ok: "OK" button_help: "Help" + email_login: + link_label: "E-mail me een login link" + button_label: "Met e-mail" login: title: "Aanmelden" username: "Gebruiker" password: "Wachtwoord" + second_factor_title: "Twee Stap Authenticatie" + second_factor_description: "Voer alsjeblieft de authenticatie code in van jouw app:" + second_factor_backup: "Aanmelden met een backup code" + second_factor_backup_title: "Twee Stap Backup" + second_factor_backup_description: "Voer een van de backup codes in:" + second_factor: "Aanmelden met authenticatie app" email_placeholder: "e-mailadres of gebruikersnaam" caps_lock_warning: "Caps Lock staat aan" error: "Onbekende fout" + cookies_error: "Het lijkt erop dat jouw browsers geen cookies toestaat. Je kan misschien niet aanmelden als je ze niet eerst toestaat." rate_limit: "Wacht even voordat u zich opnieuw probeert aan te melden." + blank_username: "Voer je e-mailadres of gebruikers naam in." blank_username_or_password: "Voer uw e-mailadres of gebruikersnaam en wachtwoord in." reset_password: "Wachtwoord herinitialiseren" logging_in: "Aanmelden..." @@ -1021,6 +1122,7 @@ nl: not_allowed_from_ip_address: "U kunt zich niet aanmelden vanaf dat IP-adres." admin_not_allowed_from_ip_address: "U kunt zich niet aanmelden als beheerder vanaf dat IP-adres." resend_activation_email: "Klik hier om de activeringsmail opnieuw te versturen." + omniauth_disallow_totp: "Jouw account heeft twee stap authenticatie aanstaan. Gebruik je wachtwoord om aan te melden." resend_title: "Activeringsmail opnieuw versturen" change_email: "E-mailadres wijzigen" provide_new_email: "Geef een nieuw adres op en we sturen uw bevestigingsmail opnieuw." @@ -1031,21 +1133,27 @@ nl: forgot: "Ik kan me de details van mijn gebruikersaccount niet herinneren." not_approved: "Uw account is nog niet goedgekeurd. U ontvangt een melding via e-mail zodra u zich kunt aanmelden." google_oauth2: + name: "Google" title: "met Google" message: "Authenticeren met Google (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" twitter: + name: "Twitter" title: "met Twitter" message: "Authenticeren met Twitter (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" instagram: + name: "Instagram" title: "met Instagram" message: "Authenticeren met Instagram (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" facebook: + name: "Facebook" title: "met Facebook" message: "Authenticeren met Facebook (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" yahoo: + name: "Yahoo" title: "met Yahoo" message: "Authenticeren met Yahoo (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" github: + name: "GitHub" title: "met Github" message: "Authenticeren met GitHub (zorg ervoor dat pop-upblokkeringen zijn uitgeschakeld)" invites: @@ -1073,10 +1181,27 @@ nl: categories_only: "Alleen categorieën" categories_with_featured_topics: "Categorieën met aanbevolen topics" categories_and_latest_topics: "Categorieën en nieuwste topics" + categories_and_top_topics: "Categorieën en top topics" + categories_boxes: "Boxjes met subcategorieën" + categories_boxes_with_topics: "Boxjes met aanbevolen topics" shortcut_modifier_key: shift: "Shift" ctrl: "Ctrl" alt: "Alt" + conditional_loading_section: + loading: Laden... + select_kit: + default_header_text: Selecteren... + no_content: Geen overeenkomsten gevonden + filter_placeholder: Zoeken... + filter_placeholder_with_any: Zoek of maak aan... + create: "Aanmaken: '{{content}}'" + max_content_reached: + one: "Je kan maar {{count}} item selecteren." + other: "Je kan maar {{count}} items selecteren." + min_content_not_reached: + one: "Selecteer minstens {{count}} item." + other: "Selecteer minstens {{count}} items." emoji_picker: filter_placeholder: Zoek naar emoji people: Mensen @@ -1094,6 +1219,12 @@ nl: medium_tone: Gemiddilde huidskleur medium_dark_tone: Donker gemiddelde huidskleur dark_tone: Donkere huidskleur + shared_drafts: + title: "Gedeelde concepten" + destination_category: "Bestemmingscategorie" + publish: "Publiceer Gedeeld Concept" + confirm_publish: "Weet je zeker dat je dit concept wilt publiceren?" + publishing: "Topic publiceren..." composer: emoji: "Emoji :)" more_emoji: "meer..." @@ -1110,6 +1241,7 @@ nl: saved_local_draft_tip: "lokaal opgeslagen" similar_topics: "Uw topic lijkt op..." drafts_offline: "concepten offline" + edit_conflict: "conflict bewerken" group_mentioned: one: "Door {{group}} te vermelden, gaat u 1 persoon op de hoogte brengen – weet u dit zeker?" other: "Door {{group}} te vermelden, gaat u {{count}} personen op de hoogte brengen – weet u dit zeker?" @@ -1123,14 +1255,20 @@ nl: title_too_long: "Titel kan niet langer zijn dan {{max}} tekens" post_missing: "Bericht kan niet leeg zijn" post_length: "Bericht moet minstens {{min}} tekens bevatten" + try_like: "Heb je de {{heart}} knop geprobeerd?" category_missing: "U moet een categorie kiezen" + tags_missing: "Je moet minimaal {{count}} tags kiezen" save_edit: "Bewerking opslaan" + overwrite_edit: "Bewerking overschrijven" reply_original: "Antwoorden op oorspronkelijke topic" reply_here: "Hier antwoorden" reply: "Antwoorden" cancel: "Annuleren" create_topic: "Topic maken" create_pm: "Bericht" + create_whisper: "Fluisteren" + create_shared_draft: "Gedeeld concept maken" + edit_shared_draft: "Gedeeld concept bewerken" title: "Of druk op Ctrl+Enter" users_placeholder: "Een gebruiker toevoegen" title_placeholder: "Waar gaat deze discussie over in één korte zin?" @@ -1138,7 +1276,10 @@ nl: edit_reason_placeholder: "vanwaar deze bewerking?" show_edit_reason: "(geef een reden)" topic_featured_link_placeholder: "Voer koppeling in die met titel wordt getoond." + remove_featured_link: "Link verwijderen van de topic." reply_placeholder: "Typ hier. Gebruik Markdown, BBCode of HTML voor opmaak. Sleep of plak afbeeldingen." + reply_placeholder_no_images: "Typ hier. Gebruik Markdown, BBCode, of HTML om het te formatteren." + reply_placeholder_choose_category: "Je moet een categorie selecteren voordat je hier kan typen." view_new_post: "Uw nieuwe bericht bekijken" saving: "Opslaan" saved: "Opgeslagen!" @@ -1157,6 +1298,7 @@ nl: link_description: "voer hier een omschrijving in" link_dialog_title: "Hyperlink invoegen" link_optional_text: "optionele titel" + link_url_placeholder: "https://example.com" quote_title: "Citaat" quote_text: "Citaat" code_title: "Vooraf opgemaakte tekst" @@ -1167,7 +1309,13 @@ nl: olist_title: "Genummerde lijst" ulist_title: "Opsommingslijst" list_item: "Lijstitem" + toggle_direction: "Richting omschakelen" help: "Hulp voor Markdown" + collapse: "Minimaliseer het paneel" + open: "Open het paneel" + abandon: "Sluit het paneel en verwijder het concept" + enter_fullscreen: "Maak het scherm de volledige grote" + exit_fullscreen: "Maak het scherm klein" modal_ok: "OK" modal_cancel: "Annuleren" cant_send_pm: "Sorry, u kunt geen bericht naar %{username} sturen." @@ -1175,6 +1323,32 @@ nl: title: "Bent u ontvangers vergeten toe te voegen?" body: "Het bericht wordt nu alleen naar uzelf verstuurd!" admin_options_title: "Optionele stafinstellingen voor dit topic" + composer_actions: + reply: Reageer + draft: Concept + edit: Bewerken + reply_to_post: + desc: Reageer op een specifiek bericht + reply_as_new_topic: + label: Reageer als een gelinkte topic + desc: Maak een nieuwe topic die naar deze topic linkt. + reply_as_private_message: + label: Nieuw bericht + desc: Maak een nieuw persoonlijk bericht + reply_to_topic: + label: Reageer op de topic + desc: "Reageer op de topic, niet een specifiek bericht" + toggle_whisper: + label: Zet fluistermodus uit of aan + desc: Fluisterberichten zijn alleen zichtbaar voor personeel + create_topic: + label: "Nieuwe topic" + shared_draft: + label: "Gedeeld concept" + desc: "Maak een concept topic die alleen beschikbaar is voor personeel." + toggle_topic_bump: + label: "Zet topic bump aan of uit" + desc: "Reageer zonder de laatste reactie datum te veranderen." notifications: title: "meldingen van @naam-vermeldingen, reacties op uw berichten en topics, berichten, etc." none: "Meldingen kunnen momenteel niet worden geladen." @@ -1211,6 +1385,7 @@ nl: replied: '{{username}} heeft op u geantwoord in ''{{topic}}'' - {{site_title}}' posted: '{{username}} heeft een bericht geplaatst in ''{{topic}}'' - {{site_title}}' linked: '{{username}} heeft een koppeling naar uw bericht geplaatst vanaf ''{{topic}}'' - {{site_title}}' + confirm_body: "Success! Notificaties staan aan." upload_selector: title: "Een afbeelding toevoegen" title_with_attachments: "Een afbeelding of bestand toevoegen" @@ -1225,6 +1400,7 @@ nl: uploading: "Uploaden" select_file: "Bestand selecteren" image_link: "koppeling waarnaar uw afbeelding verwijst" + default_image_alt_text: afbeelding search: sort_by: "Sorteren op" relevance: "Relevantie" @@ -1236,6 +1412,7 @@ nl: clear_all: "Alles wissen" too_short: "Uw zoekterm is te kort." title: "zoeken naar topics, berichten, gebruikers of categorieën" + full_page_title: "Zoek topics of berichten" no_results: "Geen resultaten gevonden." no_more_results: "Geen resultaten meer gevonden." searching: "Zoeken..." @@ -1256,20 +1433,28 @@ nl: title: Geavanceerd zoeken posted_by: label: Geplaatst door + in_category: + label: Gecategoriseerd in_group: label: In groep with_badge: label: Met badge + with_tags: + label: Getagged filters: likes: die ik heb geliket posted: waarin ik iets heb geplaatst watching: die ik in de gaten houd tracking: die ik volg + bookmarks: Ik heb een bladwijzer aangemaakt first: die het eerste bericht zijn pinned: die zijn vastgemaakt unpinned: die niet zijn vastgemaakt + seen: Ik heb gelezen unseen: die ik niet heb gelezen wiki: die een wiki zijn + images: Plaatje(s) bijvoegen + all_tags: Alle bovenstaande tags statuses: label: Waarin topics open: open zijn @@ -1350,6 +1535,7 @@ nl: other: "{{count}} berichten in topic" create: "Nieuw topic" create_long: "Een nieuw topic maken" + open_draft: "Open concept" private_message: "Een bericht sturen" archive_message: help: "Bericht naar uw archief verplaatsen" @@ -1357,6 +1543,9 @@ nl: move_to_inbox: title: "Verplaatsen naar Postvak IN" help: "Bericht weer naar Postvak IN verplaatsen" + edit_message: + help: "Het eerste bericht van het bericht bewerken" + title: "Bericht bewerken" list: "Topics" new: "nieuw topic" unread: "ongelezen" @@ -1412,6 +1601,7 @@ nl: public_timer_types: Topic Timers private_timer_types: Gebruiker Topic Timers auto_update_input: + none: "Selecteer een tijdsspanne" later_today: "Later vandaag" tomorrow: "Morgen" later_this_week: "Later deze week" @@ -1419,6 +1609,9 @@ nl: next_week: "Volgende week" two_weeks: "Twee Weken" next_month: "Volgende maand" + three_months: "Drie maanden" + six_months: "Zes maanden" + one_year: "Één jaar" forever: "Voor altijd" pick_date_and_time: "Kies datum en tijd" set_based_on_last_post: "Sluiten op basis van laatste bericht" @@ -1437,6 +1630,8 @@ nl: based_on_last_post: "Pas sluiten als het laatste bericht in het topic minstens zo oud is" auto_delete: title: "Topic automatisch verwijderen" + auto_bump: + title: "Automatisch topic omhoog zetten" reminder: title: "Herinner mij" status_update_notice: @@ -1464,6 +1659,8 @@ nl: jump_prompt_of: "van %{count} berichten" jump_prompt_long: "Naar welk bericht wilt u springen?" jump_bottom_with_number: "naar bericht %{post_number}" + jump_prompt_to_date: "tot datum" + jump_prompt_or: "of" total: totale aantal berichten current: huidige bericht notifications: @@ -1606,9 +1803,15 @@ nl: one: "1 bericht" other: "{{count}} berichten" cancel: "Filter verwijderen" + move_to: + title: "Verplaats naar" + action: "verplaats naar" + error: "Er was een probleem met het verplaatsen van de berichten." split_topic: title: "Verplaatsen naar nieuw topic" action: "verplaatsen naar nieuw topic" + topic_name: "Nieuwe Topic Titel" + radio_label: "Nieuwe Topic" error: "Er is een fout opgetreden bij het verplaatsen van berichten naar het nieuwe topic." instructions: one: "U gaat een nieuw topic aanmaken en met het geselecteerde bericht vullen." @@ -1617,14 +1820,24 @@ nl: title: "Verplaatsen naar bestaand topic" action: "verplaatsen naar bestaand topic" error: "Er is een fout opgetreden bij het verplaatsen van berichten naar dat topic." + radio_label: "Bestaande Topic" instructions: one: "Selecteer het topic waarnaar u dat bericht wilt verplaatsen." other: "Selecteer het topic waarnaar u de {{count}} berichten wilt verplaatsen." + move_to_new_message: + title: "Verplaats naar een nieuw bericht" + action: "Verplaats naar een nieuw bericht" + message_title: "Nieuw bericht titel" + radio_label: "Nieuw bericht" + participants: "Deelnemers" + move_to_existing_message: + participants: "Deelnemers" merge_posts: title: "Geselecteerde berichten samenvoegen" action: "geselecteerde berichten samenvoegen" error: "Er is een fout opgetreden bij het samenvoegen van de geselecteerde berichten." change_owner: + title: "Verander eigenaar" action: "eigendom wijzigen" error: "Er is een fout opgetreden bij het wijzigen van het eigendom van de berichten." placeholder: "gebruikersnaam van nieuwe eigenaar" @@ -1637,6 +1850,11 @@ nl: multi_select: select: "selecteren" selected: "geselecteerd ({{count}})" + select_post: + label: "selecteren" + title: "Voeg bericht toe aan de selectie" + selected_post: + label: "geselecteerd" delete: geselecteerde verwijderen cancel: selecteren annuleren select_all: alles selecteren diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 74ac921eb0..3aeb25af57 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -891,7 +891,7 @@ ru: title: "Размер текста" smaller: "Маленький" normal: "Нормальный" - larger: "Больше" + larger: "Большой" largest: "Самый большой" like_notification_frequency: title: "Уведомлять при получении симпатии" @@ -1185,7 +1185,7 @@ ru: button_ok: "ОК" button_help: "Помощь" email_login: - button_label: "с email" + button_label: "E-mail" complete_username: "Если учетная запись совпадает с именем пользователя %{username}, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время." complete_email: "Если данные аккаунта совпадают с %{email}, вы должны получить электронное письмо со ссылкой для входа в систему в ближайшее время." complete_username_found: "Мы нашли учетную запись, которая соответствует имени пользователя %{username}, в ближайшее время вы получите электронное письмо со ссылкой для входа." @@ -1233,19 +1233,19 @@ ru: not_approved: "Ваша учетная запись еще не прошла проверку. После успешной проверки мы отправим вам письмо с уведомлением, и вы сможете входить в свою учетную запись." google_oauth2: name: "Google" - title: "Через Google" + title: "Google" message: "Вход с помощью учетной записи Google (убедитесь, что блокировщик всплывающих окон отключен)" twitter: name: "Twitter" - title: "Через Twitter" + title: "Twitter" message: "Вход с помощью учетной записи Twitter (убедитесь, что блокировщик всплывающих окон отключен)" instagram: name: "Instagram" - title: "Через Instagram" + title: "Instagram" message: "Вход с помощью учетной записи Instagram (убедитесь, что блокировщик всплывающих окон отключен)" facebook: name: "Facebook" - title: "Через Facebook" + title: "Facebook" message: "Вход с помощью учетной записи Facebook (всплывающие окна должны быть разрешены)" yahoo: name: "Yahoo" @@ -1253,7 +1253,7 @@ ru: message: "Вход с помощью учетной записи Yahoo (убедитесь, что блокировщик всплывающих окон отключен)" github: name: "GitHub" - title: "Через GitHub" + title: "GitHub" message: "Вход с помощью учетной записи GitHub (убедитесь, что блокировщик всплывающих окон отключен)" invites: accept_title: "Приглашение" @@ -3052,7 +3052,7 @@ ru: as_owner: "Установить пользователя (ей) в качестве владельца (ов) этой группы" manage: interaction: - email: Email + email: E-mail incoming_email: "Специальный входящий адрес e-mail" incoming_email_placeholder: "введите e-mail адрес" visibility: Видимость diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index d85cff7f1c..9873fdccc3 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -219,6 +219,7 @@ sk: submit: "Odoslať" generic_error: "Ľutujeme, nastala chyba." generic_error_with_reason: "Nastala chyba: %{error}" + go_ahead: "Pokračujte" sign_up: "Registrácia" log_in: "Prihlásenie" age: "Vek" @@ -298,6 +299,9 @@ sk: resume: "Pokračovať" remove: "Odstrániť" new_topic: "Nová téma" + abandon: + yes_value: "Áno, opustiť" + no_value: "Nie, ponechať" topic_count_latest: one: "Pozri si {{count}} novú alebo upravenú tému." few: "Pozri si {{count}} nových alebo upravených tém." @@ -320,6 +324,7 @@ sk: saved: "Zmeny uložené." upload: "Upload" uploading: "Upload prebieha..." + uploading_filename: "Nahrávam: {{filename}}..." clipboard: "schránka" uploaded: "Upload úspešne dokončený." pasting: "Vkladám..." @@ -338,6 +343,8 @@ sk: none_found: "Nenašli sa žiadne témy." title: placeholder: "sem napíšte názov témy" + choose_message: + none_found: "Žiadne správy." queue: topic: "Téma:" approve: "Schváliť" @@ -807,6 +814,10 @@ sk: few: "Odošleme vám email iba ak sme vás nevideli posledné {{count}} minúty." many: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút" other: "Odošleme vám email iba ak sme vás nevideli posledných {{count}} minút" + associated_accounts: + connect: "Pripojiť" + revoke: "Odobrať" + not_connected: "(nepripojený)" name: title: "Meno" instructions: "vaše celé meno (nepovinné)" @@ -831,6 +842,11 @@ sk: any: "hocijaký" password_confirmation: title: "Heslo znova" + auth_tokens: + ip: "IP adresa" + details: "Detaily" + log_out_all: "Odhlásiť všetky" + secure_account: "Zabezpečiť moje konto" last_posted: "Posledný príspevok" last_emailed: "Posledný odemailovaný" last_seen: "Videný" @@ -839,6 +855,12 @@ sk: location: "Poloha" website: "Webová stránka" email_settings: "Email" + text_size: + title: "Veľkosť textu" + smaller: "Menšie" + normal: "Normálne" + larger: "Väčšie" + largest: "Najväčšie" like_notification_frequency: title: "Oznámiť pri lajknutí" always: "Vždy" @@ -977,6 +999,7 @@ sk: most_liked_users: "Najviac lajkované" most_replied_to_users: "Najviac reakcií na" no_likes: "Zatiaľ žiadne lajky." + top_categories: "Top kategórie" topics: "Témy" replies: "Odpovede" ip_address: @@ -1039,6 +1062,7 @@ sk: mute: Ignorovať unmute: Prestať ignorovať last_post: Odoslané + time_read: Prečítané last_reply_lowercase: posledná odpoveď replies_lowercase: one: odpoveď @@ -1063,6 +1087,8 @@ sk: disable: "Zobraziť zmazané príspevky" private_message_info: title: "Správa" + invite: "Pozvať ďalších" + edit: "Pridať alebo odobrať" remove_allowed_user: "Skutočne chcete odstrániť {{name}} z tejto správy?" email: "Email" username: "Používateľské meno" diff --git a/config/locales/client.sl.yml b/config/locales/client.sl.yml index b9c47e5208..58552502c4 100644 --- a/config/locales/client.sl.yml +++ b/config/locales/client.sl.yml @@ -55,7 +55,7 @@ sl: few: "%{count} s" other: "%{count} s" less_than_x_minutes: - one: "< 1 min" + one: "< %{count} min" two: "< %{count} min" few: "< %{count} min" other: "< %{count} min" @@ -75,7 +75,7 @@ sl: few: "%{count} d" other: "%{count} d" x_months: - one: "1 mes" + one: "%{count} mes" two: "%{count} mes" few: "%{count} mes" other: "%{count} mes" @@ -181,7 +181,7 @@ sl: enabled: "globalno pripeto %{when}" disabled: "odpeta" visible: - enabled: "objavljeno %{when}" + enabled: "uvrščeno %{when}" disabled: "izločeno %{when}" banner: enabled: "je ustvaril ta oglasni trak %{when}. Pojavil se bo na vrhu vsake strani, dokler ga uporabnik ne odstrani." @@ -218,7 +218,7 @@ sl: sign_up: "Registracija" log_in: "Prijava" age: "Starost" - joined: "Pridružitev" + joined: "Pridružen" flags_title: "Prijave" show_more: "Več" show_help: "možnosti" @@ -227,7 +227,7 @@ sl: one: "povezava" two: "povezavi" few: "povezave" - other: "povezave" + other: "povezav" faq: "FAQ" guidelines: "Navodila" privacy_policy: "Pravilnik o zasebnosti" @@ -254,7 +254,7 @@ sl: character_count: one: "{{count}} znak" two: "{{count}} znaka" - few: "{{count}} znakov" + few: "{{count}} znaki" other: "{{count}} znakov" related_messages: title: "Povezana sporočila" @@ -264,7 +264,7 @@ sl: about: simple_title: "O nas" title: "O %{title}" - stats: "Statistike strani" + stats: "Statistika strani" our_admins: "Naši administratorji" our_moderators: "Naši moderatorji" stat: @@ -274,10 +274,10 @@ sl: like_count: "Všečki" topic_count: "Teme" post_count: "Prispevki" - user_count: "Uporabnikov" + user_count: "Uporabniki" active_user_count: "Aktivni uporabniki" contact: "Kontaktirajte nas" - contact_info: "V primeru kritične težave glede strani nas prosim kontaktirajte na %{contact_info}." + contact_info: "V primeru kritične napake na strani ali nujne zadeve nas kontaktirajte na %{contact_info}." bookmarked: title: "Zaznamek" clear_bookmarks: "Odstrani zaznamke" @@ -341,6 +341,11 @@ sl: title: search: "Išči temo po naslovu, URLju ali IDju:" placeholder: "vpiši naslov teme tukaj" + choose_message: + none_found: "Ne najdem sporočila." + title: + search: "Poišči sporočilo po naslovu:" + placeholder: "vnesite naslov sporočila tukaj" queue: topic: "Tema:" approve: "Odobri" @@ -354,7 +359,7 @@ sl: has_pending_posts: one: "Ta tema ima 1 prispevek, ki čaka odobritev" two: "Ta tema ima 2 prispevka, ki čakata odobritev" - few: "Ta tema ima {{count}} prispevkov, ki čakajo odobritev" + few: "Ta tema ima {{count}} prispevke, ki čakajo odobritev" other: "Ta tema ima {{count}} prispevkov, ki čakajo odobritev" confirm: "Shrani spremembe" delete_prompt: "Ali ste prepričani, da želite izbrisati %{username}? To bo odstranilo vse njihove prispevke ter blokiralo njihov e-poštni naslov in IP naslov." @@ -362,9 +367,9 @@ sl: title: "Prispevek potrebuje odobritev." description: "Prejeli smo vaš nov prispevek, vendar potrebuje odobritev s strani moderatorja preden bo objavljen. Prosimo za potrpežljivost." pending_posts: - one: "Imate 1 čakajoči prispevek." + one: "Imate {{count}} čakajoči prispevek." two: "Imate {{count}} čakajoča prispevka." - few: "Imate {{count}} čakajočih prispevkov." + few: "Imate {{count}} čakajoče prispevke." other: "Imate {{count}} čakajočih prispevkov." ok: "V redu" user_action: @@ -394,12 +399,12 @@ sl: post_count: "Odgovorov" post_count_long: "Objavljenih odgovorov" no_results: "Noben rezultat ni bil najden." - days_visited: "Obiski" + days_visited: "Obiskov" days_visited_long: "Dni prisotnosti" posts_read: "Prebrano" posts_read_long: "Prebranih prispevkov" total_rows: - one: "1 uporabnik" + one: "%{count} uporabnik" two: "%{count} uporabnika" few: "%{count} uporabniki" other: "%{count} uporabnikov" @@ -408,8 +413,8 @@ sl: change_group_setting: "Spremeni nastavitve za skupino" add_user_to_group: "Dodaj uporabnika" remove_user_from_group: "Odstrani uporabnika" - make_user_group_owner: "Spremeni v lastnika" - remove_user_as_group_owner: "Odstrani lastništvo" + make_user_group_owner: "Spremeni v skrbnika" + remove_user_as_group_owner: "Odstrani skrbnika" groups: member_added: "Dodano" add_members: @@ -418,13 +423,14 @@ sl: usernames: "Uporabniška imena" manage: title: "Upravljaj" - name: "Ime" + name: "Ime skupine" full_name: "Polno ime" add_members: "Dodaj člane" delete_member_confirm: "Odstrani '%{username}' iz skupine '%{group}'?" profile: title: Profil interaction: + title: Interakcija posting: Objave notification: Obvestila membership: @@ -454,19 +460,19 @@ sl: leave: "Zapusti" request: "Zahteva" message: "Sporočilo" - allow_membership_requests: "Dovoli uporabnikom, da zaprosijo za članstvo pri lastnikih skupine" + allow_membership_requests: "Dovoli uporabnikom, da zaprosijo za članstvo pri skrbniku skupine" membership_request_template: "Predloga za prikaz uporabnikom, ko zaprosijo za članstvo" membership_request: submit: "Zaprosi za članstvo" title: "Prošnja za pridružitev @%{group_name}" - reason: "Sporoči lastnikom skupine zakaj spadaš v to skupino" + reason: "Sporoči skrbniku skupine zakaj spadaš v to skupino" membership: "Članstvo" name: "Ime" group_name: "Ime skupine" user_count: "Uporabniki" bio: "O skupini" selector_placeholder: "vnesi uporabniško ime" - owner: "lastnik" + owner: "skrbnik" index: title: "Skupine" all: "Vse skupine" @@ -489,8 +495,8 @@ sl: title: one: "Skupina" two: "Skupini" - few: "Skupin" - other: "Skupin" + few: "Skupine" + other: "Skupine" activity: "Aktivnost" members: title: "Člani" @@ -518,14 +524,14 @@ sl: everyone: "Vsi" notifications: watching: - title: "Spremlja" + title: "Opazujem" description: "Obveščeni boste o vsakem novem prispevku v vsakem sporočilu in prikazan bo število novih odgovorov." watching_first_post: - title: "Opazuješ prvi prispevek" + title: "Opazujem prvi prispevek" description: "Obveščeni boste o novih temah v tej skupini, ne pa tudi o odgovorih na temo." tracking: - title: "Sledi" - description: "Obveščeni boste ko nekdo omeni vaše @ime ali vam odgovori. Prikazano bo tudi število novih odgovorov." + title: "Sledim" + description: "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori. Ob temi bo prikazano število novih odgovorov." regular: title: "Običajno" description: "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori." @@ -553,7 +559,7 @@ sl: categories: all: "vse kategorije" all_subcategories: "vse" - no_subcategory: "nič" + no_subcategory: "brez" category: "Kategorija" category_list: "Prikaži seznam kategorij" reorder: @@ -569,19 +575,19 @@ sl: toggle_ordering: "preklop nadzora razvrščanja" subcategories: "Pod Kategorija" topic_sentence: - one: "1 tema" - two: "1 tema" - few: "%{count} tem" + one: "%{count} tema" + two: "%{count} temi" + few: "%{count} teme" other: "%{count} tem" topic_stat_sentence_week: one: "%{count} nova tema v preteklem tednu." two: "%{count} novi temi v preteklem tednu." - few: "%{count} novih tem v preteklem tednu." + few: "%{count} nove teme v preteklem tednu." other: "%{count} novih tem v preteklem tednu." topic_stat_sentence_month: one: "%{count} nova tema v preteklem mesecu." two: "%{count} novi temi v preteklem mesecu." - few: "%{count} novih tem v preteklem mesecu." + few: "%{count} nove teme v preteklem mesecu." other: "%{count} novih tem v preteklem mesecu." n_more: "Kategorije (še %{count} več) ..." ip_lookup: @@ -610,7 +616,7 @@ sl: confirm: "Ste prepričani, da želite prenesti svoje prispevke?" success: "Prenos se je začel, obveščen/a boš s sporočilom, ki bo prenos končan." rate_limit_error: "Prispevki so lahko prevešene enkrat dnevno, poskusi ponovno jutri." - new_private_message: "Novo zasebno sporočilo" + new_private_message: "Novo ZS" private_message: "Zasebno sporočilo" private_messages: "Zasebna sporočila" activity_stream: "Aktivnost" @@ -628,14 +634,14 @@ sl: label: "Obvestila v brskalniku" not_supported: "Oprostite, obvestila niso podprta v tem brskalniku." perm_default: "Vklopi obvestila" - perm_denied_btn: "Dovoljenje Zavrnjeno" + perm_denied_btn: "Dovoljenje zavrnjeno" perm_denied_expl: "Zavrnili ste dovoljenje za obvestila. Omogočite obvestila v nastavitvah vašega brskalnika." disable: "Onemogoči obvestila" enable: "Omogoči obvestila" - each_browser_note: "Opomba: To nastavitev morate spremeniti v vseh brskalnikih, ki jih uporabljate." + each_browser_note: "Opomba: to nastavitev morate spremeniti v vseh brskalnikih, ki jih uporabljate." consent_prompt: "Ali hočete obvestila v brskalniku, ko prejmete odgovore na vaše prispevke?" - dismiss: "Zavrži" - dismiss_notifications: "Zavrži vse" + dismiss: "Prebrano" + dismiss_notifications: "Prebrano vse" dismiss_notifications_tooltip: "Označi vsa neprebrana sporočila kot Prebrana" first_notification: "Vaše prvo obvestilo! Izberite ga za začetek." disable_jump_reply: "Ne skoči na moj prispevek po tem ko odgovorim" @@ -669,18 +675,18 @@ sl: warning: "Vkopljeno pošiljanje e-sporočila za vsak prispevek. Povzetek aktivnosti izklopljen." tag_settings: "Oznake" watched_tags: "Opazovano" - watched_tags_instructions: "Samodejno boste spremljali vse teme v teh kategorijah. Obveščeni boste o vseh novih temah in prispevkih. Število novih prispevkov bo prikazano ob imenu teme." + watched_tags_instructions: "Samodejno boste spremljali vse teme v teh kategorijah. Obveščeni boste o vseh novih temah in prispevkih. Ob temi bo prikazano število novih prispevkov." tracked_tags: "Sledeno" - tracked_tags_instructions: "Samodejno boste sledili vse teme v teh kategorijah. Število novih prispevkov bo prikazano ob imenu teme." + tracked_tags_instructions: "Samodejno boste sledili vse teme v teh kategorijah. Ob temi bo prikazano število novih prispevkov." muted_tags: "Utišano" muted_tags_instructions: "Nikoli ne boste obveščeni o novih temah s temi oznakami in ne bodo se prikazovale med najnovejšimi." watched_categories: "Spremljano" watched_categories_instructions: "Samodejno boste spremljali vse teme v teh kategorijah. Obveščeni boste o vseh novih prispevkih in temah in število novih prispevkov se bo prikazovalo ob imenu teme." tracked_categories: "Sledena" tracked_categories_instructions: "Samodejno boste sledili vsem temam v teh kategorijah. Število novih prispevkov se bo prikazovalo ob imenu teme." - watched_first_post_categories: "Opazuješ prvi prispevek" + watched_first_post_categories: "Opazujem prvi prispevek" watched_first_post_categories_instructions: "Obveščeni boste ob prvem prispevku v novi temi v teh kategorijah." - watched_first_post_tags: "Opazuješ prvi prispevek" + watched_first_post_tags: "Opazujem prvi prispevek" watched_first_post_tags_instructions: "Obveščeni boste ob prvem prispevku v novi temi s to oznako." muted_categories: "Utišano" muted_categories_instructions: "Nikoli ne boste obveščeni o novih temah v teh kategorijah in ne bodo se prikazovale med najnovejšimi." @@ -779,7 +785,7 @@ sl: title: "Menjaj profilno sliko" gravatar: "Gravatar od" gravatar_title: "Spremeni svoj avatar na Gravatar strani" - gravatar_failed: "Nismo našli Gravatar z tem e-naslovom." + gravatar_failed: "Nismo našli Gravatar s tem e-naslovom." refresh_gravatar_title: "Osveži svoj Gravatar" letter_based: "Sistemsko privzeta profilna slika" uploaded_avatar: "Slika po meri" @@ -804,14 +810,14 @@ sl: authenticated: "Vaša e-naslov je bil potrjen pri {{provider}}" frequency: one: "E-sporočilo bo poslano samo če niste bili aktivni v zadnji minuti." - two: "E-sporočilo bo poslano samo če niste bili aktivni v zadnji minuti." - few: "E-sporočilo bo poslano samo če niste bili aktivni v zadnji minuti." - other: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minut." + two: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minuti." + few: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minute." + other: "E-sporočilo bo poslano samo če niste bili aktivni vsaj {{count}} minut." associated_accounts: title: "Povezani računi" connect: "Poveži" name: - title: "Ime" + title: "Polno ime" instructions: "vaše polno ime (neobvezno)" instructions_required: "Vaše polno ime" too_short: "Ime je prekratko" @@ -846,7 +852,7 @@ sl: last_posted: "Zadnji prispevek" last_emailed: "Zadnja e-pošta" last_seen: "Prisotnost" - created: "Pridružitev" + created: "Pridružen" log_out: "Odjava" location: "Lokacija" website: "Spletna stran" @@ -879,7 +885,7 @@ sl: every_two_weeks: "vsaka dva tedna" include_tl0_in_digests: "V e-sporočilo s povzetki vključi vsebino, ki so jo dodali novi uporabniki " email_in_reply_to: "Vključi povzetek prispevka v e-sporočilo" - email_direct: "Pošlji mi e-sporočilo, kadar me kdo citira, odgovori na moj prispevek, omeni moje @uporabniško ime ali pa me povabi k temi" + email_direct: "Pošlji mi e-sporočilo, kadar me kdo citira, odgovori na moj prispevek, omeni moje @ime ali me povabi k temi" email_private_messages: "Pošlji mi e-sporočilo, kadar prejmem zasebno sporočilo" email_always: "Pošlji mi e-sporočilo tudi kadar sem aktiven na strani" other_settings: "Ostalo" @@ -913,12 +919,12 @@ sl: truncated: one: "Prikazano prvo povabilo." two: "Prikazana prva {{count}} povabila." - few: "Prikazanih prvih {{count}} povabil." + few: "Prikazanih prva {{count}} povabila." other: "Prikazanih prvih {{count}} povabil." redeemed: "Sprejeta povabila" - redeemed_tab: "Sprejeta" - redeemed_tab_with_count: "Sprejeta ({{count}})" - redeemed_at: "Sprejeta" + redeemed_tab: "Sprejeto" + redeemed_tab_with_count: "Sprejeto ({{count}})" + redeemed_at: "Sprejeto" pending: "Povabila v teku" pending_tab: "V teku" pending_tab_with_count: "V teku ({{count}})" @@ -927,11 +933,11 @@ sl: expired: "To povabilo je poteklo." rescind: "Odstrani" rescinded: "Povabilo odstranjeno" - rescind_all: "Odstrani vsa povabila" + rescind_all: "Odstrani vsa" rescinded_all: "Vsa povabila so odstranjena!" rescind_all_confirm: "Ste prepričani, da želite odstraniti vsa povabila?" - reinvite: "Ponovno pošlji povabilo" - reinvite_all: "Ponovno pošlji vsa povabila" + reinvite: "Ponovno povabi" + reinvite_all: "Ponovno pošlji vsa" reinvite_all_confirm: "Ste prepričani, da želite ponovno poslati vsa povabila?" reinvited: "Povabilo ponovno poslano" reinvited_all: "Vsa povabila ponovno poslana!" @@ -940,10 +946,10 @@ sl: account_age_days: "Starost računa v dnevih" create: "Pošlji povabilo" generate_link: "Kopiraj povezavo s povabilom" - link_generated: "Povezava z povabilom ustvarjena!" - valid_for: "Povezava z povabilom je veljavna samo za e-naslov: %{email}" + link_generated: "Povezava s povabilom ustvarjena!" + valid_for: "Povezava s povabilom je veljavna samo za e-naslov: %{email}" bulk_invite: - none: "Niste povabili še nikogar. Pošljite posamična povabila ali povabite več ljudi naenkrat tako da naložite CSV datoteko." + none: "Niste povabili še nikogar. Pošljite posamična povabila ali povabite več oseb naenkrat tako da naložite CSV datoteko." text: "Množično povabilo iz datoteke" success: "Datoteka uspešno prenešena. Obveščeni boste, ko je postopek zaključen." error: "Datoteka mora biti v CSV obliki." @@ -964,47 +970,48 @@ sl: topic_count: one: "ustvarjena tema" two: "ustvarjeni temi" - few: "ustvarjenih tem" + few: "ustvarjene teme" other: "ustvarjenih tem" post_count: - one: "ustvarjena objava" - two: "ustvarjeni objavi" - few: "ustvarjenih objav" - other: "ustvarjenih prispevkov" + one: "prispevek" + two: "prispevka" + few: "prispevki" + other: "prispevkov" likes_given: one: "dan" two: "dana" - few: "danih" + few: "dani" other: "danih" likes_received: one: "sprejet" two: "sprejeta" - few: "sprejetih" + few: "sprejeti" other: "sprejetih" days_visited: - one: "dan obiska" - two: "dni obiska" - few: "dni obiskov" + one: "dan prisotnosti" + two: "dneva prisotnosti" + few: "dnevi prisotnosti" other: "dni prisotnosti" topics_entered: one: "ogledana tema" two: "ogledani temi" - few: "ogledanih tem" + few: "ogledane teme" other: "ogledanih tem" posts_read: - one: "prebrana objava" - two: "prebrani objavi" - few: "prebranih objav" + one: "prebran prispevek" + two: "prebrana prispevka" + few: "prebrani prispevki" other: "prebranih prispevkov" bookmark_count: one: "zaznamek" two: "zaznamka" few: "zaznamki" - other: "zaznamki" + other: "zaznamkov" top_replies: "Najboljši odgovori" no_replies: "Ni odgovorov." + more_replies: "Več odgovorov" top_topics: "Najboljše teme" - no_topics: "Ni tem." + no_topics: "Ni prispevkov." more_topics: "Več tem" top_badges: "Najboljše značke" no_badges: "Ni značk." @@ -1015,16 +1022,21 @@ sl: most_liked_users: "Največ všečkov za" most_replied_to_users: "NAJVEČKRAT ODGOVORJENO" no_likes: "Ni všečkov." + top_categories: "Najboljše kategorije" topics: "Teme" + replies: "Odgovorov" avatar: title: "Profilna slika" header_title: "profil, zasebna sporočila, zaznamki in nastavitve" + title: + none: "(brez)" filters: all: "Vse" stream: posted_by: "Avtor" private_message: "zasebno sporočilo" the_topic: "tema" + loading: "Nalagam..." errors: reasons: forbidden: "Dostop Zavrnjen" @@ -1034,9 +1046,16 @@ sl: unknown: "Nekaj je šlo narobe." buttons: back: "Nazaj" + again: "Poskusi ponovno" close: "Zapri" logout: "Bili ste odjavljeni." refresh: "Osveži" + logs_error_rate_notice: + rate: + one: "%{count} napaka/%{duration}" + two: "%{count} napaki/%{duration}" + few: "%{count} napake/%{duration}" + other: "%{count} napak/%{duration}" all_time: "tem" all_time_desc: "skupaj ustvarjenih tem" year: "leto" @@ -1047,21 +1066,27 @@ sl: first_post: Prvi prispevek mute: Utišano unmute: Povrni glasnost - last_post: Objavljeno + last_post: Zadnji prispevek + time_read: Čas branja + time_read_recently: "%{time_read} nedavno" + time_read_tooltip: "%{time_read} branja skupaj" + time_read_recently_tooltip: "%{time_read} branja skupaj (%{recent_time_read} v zadnjih 60 dneh)" last_reply_lowercase: zadnji odgovor replies_lowercase: one: odgovor two: odgovora - few: odgovorov + few: odgovori other: odgovorov signup_cta: sign_up: "Registracija" hide_session: "Spomni me jutri" hide_forever: "ne, hvala" intro: "Pozdravljeni! Vidimo da uživate v branju debate, vendar se še niste registrirali kot uporabnik." - value_prop: "Ko ustvarite uporabniški račun, si lahko zapomnimo točno kaj ste že prebrali, tako da boste naslednjič lahko nadaljevali od tam, kjer ste končali. Lahko boste tudi prejemali obvestila, tukaj ali preko e-sporočila, vsakič ko vam nekdo odgovori. In lahko boste všečkali prispevke, ki so vam všeč. :heartpulse:" + value_prop: "Ko registrirate uporabniški račun, si lahko zapomnimo točno kaj ste že prebrali, tako da boste naslednjič lahko nadaljevali od tam, kjer ste končali. Lahko boste tudi prejemali obvestila, tukaj ali preko e-sporočila, vsakič ko vam nekdo odgovori. In lahko boste všečkali prispevke, ki so vam všeč. :heartpulse:" summary: enabled_description: "Ogledujete si povzetek teme: najbolj zanimive prispevke, kot jih je določila skupnost." + description: "Obstaja {{replyCount}} odgovorov." + description_time: "Obstaja {{replyCount}} odgovorov z ocenjenim časom branja {{readingTime}} minut." enable: "Pripravi povzetek teme" disable: "Prikaži vse prispevke" deleted_filter: @@ -1071,6 +1096,8 @@ sl: disable: "Prikaži izbrisane prispevke" private_message_info: edit: "Dodaj ali odstrani..." + remove_allowed_user: "Ali resnično želite odstraniti {{name}} s tega sporočila?" + remove_allowed_group: "Ali resnično želite odstraniti {{name}} s tega sporočila?" email: "E-naslov" username: "Uporabniško ime" last_seen: "Prisotnost" @@ -1080,7 +1107,7 @@ sl: search_hint: "uporabniško ime, e-naslov ali IP naslov" create_account: disclaimer: "Z odprtjem računa sprejemate pravilnik o zasebnosti in pogoje uporabe." - title: "Registracija uporabniškega računa" + title: "Registracija uporabnika" failed: "Nekaj je šlo narobe, morda je ta e-naslov že registriran, poskusite povezavo za pozabljeno geslo" forgot_password: title: "Zamenjava gesla" @@ -1114,6 +1141,7 @@ sl: second_factor_backup_description: "Vnesite eno od rezervnih potrditvenih kod:" second_factor: "Prijava preko Authenticator " email_placeholder: "e-naslov ali uporabniško ime" + rate_limit: "Prosimo počakajte preden se poskusite ponovno prijaviti." blank_username: "Vnesite uporabniško ime ali e-naslov." blank_username_or_password: "Vpišite e-naslov ali uporabniško ime in geslo." reset_password: "Zamenjaj geslo" @@ -1160,13 +1188,42 @@ sl: categories_and_latest_topics: "Kategorije in najnovejše teme" categories_and_top_topics: "Kategorije in najboljše teme" categories_boxes_with_topics: "Škatle z izpostavljenimi temami" + conditional_loading_section: + loading: Nalagam... select_kit: + no_content: Ni zadetkov filter_placeholder: Išči... + max_content_reached: + one: "Izberete lahko samo {{count}} stvar." + two: "Izberete lahko samo {{count}} stvari." + few: "Izberete lahko samo {{count}} stvari." + other: "Izberete lahko samo {{count}} stvari." + min_content_not_reached: + one: "Izberite vsaj {{count}} stvar." + two: "Izberite vsaj {{count}} stvari." + few: "Izberite vsaj {{count}} stvari." + other: "Izberite vsaj {{count}} stvari." emoji_picker: + filter_placeholder: Išči emoji + people: Ljudje + nature: Narava + food: Hrana activity: Aktivnost + travel: Potovanje + objects: Stvari + celebration: Praznovanje + custom: Po meri emoji + recent: Nedavno uporabljeni + default_tone: Brez barve kože + light_tone: Svetla barva kože + medium_light_tone: Srednje svetla barva kože + medium_tone: Srednja barva kože + medium_dark_tone: Srednje temna barva kože + dark_tone: Temna barva kože shared_drafts: notice: "Ta tema je vidna samo tistim, ki lahko vidijo kategorijo {{category}}." composer: + more_emoji: "več..." options: "Možnosti" unlist: "izločeno" blockquote_text: "Citirano" @@ -1177,9 +1234,15 @@ sl: saved_draft_tip: "shranjeno" saved_local_draft_tip: "shranjeno lokalno" similar_topics: "Vaša tema je podobna kot..." + group_mentioned: + one: "Z omembo {{group}} boste obvestili {{count}} osebo – ali ste prepričani?" + two: "Z omembo {{group}}boste obvestili {{count}} osebi – ali ste prepričani?" + few: "Z omembo {{group}} boste obvestili {{count}} osebe – ali ste prepričani?" + other: "Z omembo {{group}} boste obvestili {{count}} oseb – ali ste prepričani?" cannot_see_mention: category: "Omenil si uporabnika {{username}}, a ta ne bo obveščen saj nima dostopa do te kategorije. Dodati ga je potrebno v skupino ki lahko dostopa do kategorije." private: "Omenili ste uporabnika {{username}}, a ta ne bo obveščen, ker ne more videti tega zasebnega sporočila. Moraii ga boste povabiti v to zasebno sporočilo." + duplicate_link: "Povezava do {{domain}} bila že objavljena v temi od @{{username}} v odgovoru {{ago}} – ali ste prepričani, da jo želite objaviti še enkrat?" error: title_missing: "Naslov je obvezen" title_too_short: "Naslov mora vsebovati vsaj {{min}} znakov" @@ -1210,6 +1273,7 @@ sl: view_new_post: "Oglej si tvoj nov prispevek " saved: "Shranjeno!" saved_draft: "Osnutek prispevka v pripravi. Izberi za nadaljevanje." + uploading: "Nalagam..." show_preview: "prikaži predogled »" hide_preview: "« skrij predogled" quote_post_title: "Citiraj cel prispevek" @@ -1225,6 +1289,7 @@ sl: code_title: "Preformatirano besedilo" code_text: "zamakni preformatirano besedilo s 4 presledki" paste_code_text: "vpiši ali prilepi kodo" + upload_title: "Naloži" olist_title: "Oštevilčen seznam" ulist_title: "Seznam" list_item: "Element seznama" @@ -1241,8 +1306,8 @@ sl: label: Odgovori v novi povezani temi desc: Ustvari novo temo povezano na to temo reply_as_private_message: - label: Novo zasebno sporočilo - desc: Novo zasebno sporočilo + label: Novo ZS + desc: Odgovori v zasebno sporočilo reply_to_topic: label: Odgovori v temi desc: "Odgovori v temi, ne na posamezen prispevek" @@ -1256,7 +1321,21 @@ sl: label: "Preklopi izpostavljanje teme" desc: "Odgovori brez da spremeniš čas zadnjega odgovora" notifications: + tooltip: + regular: + one: "{{count}} neprebrano obvestilo" + two: "{{count}} neprebrani obvestili" + few: "{{count}} neprebrana obvestila" + other: "{{count}} neprebranih obvestil" + message: + one: "{{count}} neprebrano sporočilo" + two: "{{count}} neprebrani sporočili" + few: "{{count}} neprebrana sporočila" + other: "{{count}} neprebranih sporočil" + title: "obvestila ko omeni vaše @ime, odgovorih na vaše prispevke in teme, zasebna sporočila" + none: "Ta trenutek ne moremo naložiti obvestil." empty: "Ni obvestil." + more: "prikaži starejša obvestila" total_flagged: "vseh prijavljenih prispevkov" mentioned: "{{username}} {{description}}" group_mentioned: "{{username}} {{description}}" @@ -1267,33 +1346,56 @@ sl: liked: "{{username}} {{description}}" liked_2: "{{username}}, {{username2}} {{description}}" liked_many: - one: "{{username}}, {{username2}} in še 1 {{description}}" - two: "{{username}}, {{username2}} in 2 druga {{description}}" - few: "{{username}}, {{username2}} in {{count}} drugih {{description}}" + one: "{{username}}, {{username2}} in {{count}} drug {{description}}" + two: "{{username}}, {{username2}} in {{count}} druga {{description}}" + few: "{{username}}, {{username2}} in {{count}} drugi {{description}}" other: "{{username}}, {{username2}} in {{count}} drugih {{description}}" + liked_consolidated_description: + one: "je všečkal {{count}} vaš prispevek" + two: "je všečkal {{count}} vaša prispevka" + few: "je všečkal {{count}} vaše prispevke" + other: "je všečkal {{count}} vaših prispevkov" private_message: "{{username}} {{description}}" invited_to_private_message: "

{{username}} {{description}}" invited_to_topic: "{{username}} {{description}}" invitee_accepted: "{{username}} je sprejel tvoje povabilo." moved_post: "{{username}} premaknil {{description}}" linked: "{{username}} {{description}}" - granted_badge: "Osvojili '{{description}}'" + granted_badge: "Prislužili '{{description}}'" topic_reminder: "{{username}} {{description}}" watching_first_post: "Nova tema {{description}}" + group_message_summary: + one: "{{count}} sporočilo v{{group_name}} predalu" + two: "{{count}} sporočili v {{group_name}} predalu" + few: "{{count}} sporočila v {{group_name}} predalu" + other: "{{count}} sporočil v {{group_name}} predalu" popup: + mentioned: '{{username}} vas je omenil v"{{topic}}" - {{site_title}}' + group_mentioned: '{{username}} vas je omenil v "{{topic}}" - {{site_title}}' + quoted: '{{username}} vas je citiral v "{{topic}}" - {{site_title}}' + replied: '{{username}} vam je odgovoril v "{{topic}}" - {{site_title}}' posted: '{{username}} objavil v "{{topic}}" - {{site_title}}' + private_message: '{{username}} vam je poslal zasebno sporočilo "{{topic}}" - {{site_title}}' + linked: '{{username}} je dodal povezavo na vaš prispevek iz "{{topic}}" - {{site_title}}' + confirm_title: "Obvestila omogočena - %{site_title}" + confirm_body: "Uspelo! Obvestila so bila omogočena." upload_selector: title: "Dodaj sliko" title_with_attachments: "Dodaj sliko ali datoteko" + from_my_computer: "Iz moje naprave" from_the_web: "Iz spletne strani" remote_tip: "povezava do slike" remote_tip_with_attachments: "povezava do slike ali datoteke {{authorized_extensions}}" + local_tip: "izberite slike iz vaše naprave" local_tip_with_attachments: "izberite slike na svoji napravi {{authorized_extensions}}" - hint: "(sliko lahko tudi naložite tudi tako da jo povlečete in spustite v urejevalnik) " - hint_for_supported_browsers: "(sliko lahko tudi naložite tudi tako da jo povlečete in spustite v urejevalnik) " + hint: "(slike lahko naložite tudi tako, da jih povlečete in spustite v urejevalnik) " + hint_for_supported_browsers: "slike lahko naložite tudi tako, da jih povlečete in spustite v urejevalnik" + uploading: "Nalagam" + select_file: "Izberite datoteko" + default_image_alt_text: slika search: sort_by: "Uredi po" - relevance: "Relevanci" + relevance: "Pomembnosti" latest_post: "Najnovejšem prispevku" latest_topic: "Najnovejši temi" most_viewed: "Številu ogledov" @@ -1302,9 +1404,9 @@ sl: clear_all: "Počisti vse" too_short: "Niz za iskanje je prekratek" result_count: - one: "1 zadetek za{{term}}" - two: "1 zadetek za{{term}}" - few: "1 zadetek za{{term}}" + one: "{{count}} zadetek za{{term}}" + two: "{{count}}{{plus}} zadetka za{{term}}" + few: "{{count}}{{plus}} zadetki za{{term}}" other: "{{count}}{{plus}} zadetkov za{{term}}" title: "išči po temah, prispevkih, uporabnikih ali kategorijah" full_page_title: "išči teme ali prispevke" @@ -1384,7 +1486,7 @@ sl: dismiss_read: "Zavrni vse neprebrane" dismiss_button: "Zavrni" dismiss_tooltip: "Opusti samo nove teme ali prenehaj slediti temam" - also_dismiss_topics: "Prenehaj slediti tem temam tako da se ne prikaže več kot neprebrano" + also_dismiss_topics: "Prenehaj slediti tem temam tako da se ne prikažejo več kot neprebrane" dismiss_new: "Zavrni nove" toggle: "preklopi množično izbiro tem" actions: "Množična dejanja" @@ -1394,9 +1496,9 @@ sl: notification_level: "Obvestila" choose_new_category: "Izberi novo kategorijo za temo:" selected: - one: "Izbrali ste 1 temo." + one: "Izbrali ste {{count}} temo." two: "Izbrali ste {{count}} temi." - few: "Izbrali ste {{count}} tem." + few: "Izbrali ste {{count}} teme." other: "Izbrali ste {{count}} tem." change_tags: "Zamenjaj oznake" append_tags: "Dodaj oznake" @@ -1416,7 +1518,7 @@ sl: search: "Ni rezultatov iskanja." educate: new: '

Tu se prikažejo vaše nove teme.

Privzeto se teme prikažejo kot nove in bodo imele oznako novo če so bile ustvarjene v zadnjih 2 dneh.

Obiščite nastavitve če želite spremembo.

' - unread: '

Tu se prikažejo vaše neprebrane teme.

Privzeto se teme prikažejo kot neprebrane z prikazom števila 1 če ste:

  • Ustvarili temo
  • Odgovorili na temo
  • Brali temo več kot 4 minute

Izrecno nastavili temo kot "Opazovano" ali "Sledeno" preko nastavitev obveščenja na dnu teme.

Pojdite na nastavitve če želite spremembo.

' + unread: '

Tu se prikažejo vaše neprebrane teme.

Privzeto se teme prikažejo kot neprebrane s prikazom števila 1 če ste:

  • Ustvarili temo
  • Odgovorili na temo
  • Brali temo več kot 4 minute

Izrecno nastavili temo kot "Opazovano" ali "Sledeno" preko nastavitev obveščenja na dnu teme.

Pojdite na nastavitve če želite spremembo.

' bottom: latest: "Ni več najnovejših tem." hot: "Ni več vročih tem." @@ -1430,9 +1532,9 @@ sl: search: "Ni več rezultatov iskanja." topic: filter_to: - one: "1 prispevek v temi" + one: "{{count}} prispevek v temi" two: "{{count}} prispevka v temi" - few: "{{count}} prispevkov v temi" + few: "{{count}} prispevki v temi" other: "{{count}} prispevkov v temi" create: "Nova tema" create_long: "Ustvari novo temo" @@ -1451,14 +1553,14 @@ sl: new: "nova tema" unread: "neprebrana" new_topics: - one: "1 nova tema" - two: "2 novi temi" - few: "{{count}} novih tem" + one: "{{count}} nova tema" + two: "{{count}} novi temi" + few: "{{count}} nove teme" other: "{{count}} novih tem" unread_topics: - one: "1 neprebrana tema" - two: "2 neprebrani temi" - few: "{{count}} neprebranih tem" + one: "{{count}} neprebrana tema" + two: "{{count}} neprebrani temi" + few: "{{count}} neprebrane teme" other: "{{count}} neprebranih tem" title: "Tema" invalid_access: @@ -1467,29 +1569,29 @@ sl: login_required: "Morate biti prijavljeni da lahko dostopate do te teme." server_error: title: "Tema se ni uspela naložiti." - description: "Oprostite, ni nam uspelo naložiti te teme, verjetno zaradi napake na omrežju. Poiskusite ponovno. Če se napaka ponavlja, nam sporočite." + description: "Oprostite, ni nam uspelo naložiti te teme, verjetno zaradi napake na omrežju. Poskusite ponovno. Če se napaka ponavlja, nam sporočite." not_found: title: "Ne najdemo temo." description: "Oprostite, ne najdemo te teme. Mogoče jo je odstranil moderator?" total_unread_posts: - one: "imate 1 neprebran prispevek v tej temi" + one: "imate {{count}} neprebran prispevek v tej temi" two: "imate {{count}} neprebrana prispevka v tej temi" - few: "imate {{count}} neprebranih prispevkov v tej temi" + few: "imate {{count}} neprebrane prispevke v tej temi" other: "imate {{count}} neprebranih prispevkov v tej temi" unread_posts: - one: "imate 1 neprebran star prispevek v tej temi" + one: "imate {{count}} neprebran star prispevek v tej temi" two: "imate {{count}} neprebrana stara prispevka v tej temi" - few: "imate {{count}} neprebranih starih prispevkov v tej temi" + few: "imate {{count}} neprebrane stare prispevke v tej temi" other: "imate {{count}} neprebranih starih prispevkov v tej temi" new_posts: - one: "1 nov prispevek v tej temi od kar ste jo zadnjič brali" + one: "{{count}} nov prispevek v tej temi od kar ste jo zadnjič brali" two: "{{count}} nova prispevka v tej temi od kar ste jo zadnjič brali" - few: "{{count}} novih prispevkov v tej temi od kar ste jo zadnjič brali" + few: "{{count}} novi prispevki v tej temi od kar ste jo zadnjič brali" other: "{{count}} novih prispevkov v tej temi od kar ste jo zadnjič brali" likes: - one: "1 všeček na tej temi" + one: "{{count}} všeček na tej temi" two: "{{count}} všečka na tej temi" - few: "{{count}} všečkov na tej temi" + few: "{{count}} všečki na tej temi" other: "{{count}} všečkov na tej temi" back_to_list: "Nazaj na seznam tem" options: "Možnosti teme" @@ -1557,9 +1659,9 @@ sl: auto_reminder: "Opomnili vas bomo o tej temi %{timeLeft}." auto_close_title: "Samodejno zapri nastavitve" auto_close_immediate: - one: "Zadnji prispevek v tej temi je star že 1 uro, zato da bo tema zaprta nemudoma." + one: "Zadnji prispevek v tej temi je star že %{count} uro, zato da bo tema zaprta nemudoma." two: "Zadnji prispevek v tej temi je star že %{count} uri, zato da bo tema zaprta nemudoma." - few: "Zadnji prispevek v tej temi je star že %{count} ur, zato da bo tema zaprta nemudoma." + few: "Zadnji prispevek v tej temi je star že %{count} ure, zato da bo tema zaprta nemudoma." other: "Zadnji prispevek v tej temi je star že %{count} ur, zato da bo tema zaprta nemudoma." timeline: back: "Nazaj" @@ -1599,10 +1701,10 @@ sl: "0": "Ne boste prejemali obvestil o tej temi." watching_pm: title: "Opazujem" - description: "Obveščeni boste o vsakem novem odgovoru v tem sporočilu. Prikazano bo tudi število novih odgovorov." + description: "Obveščeni boste o vsakem novem odgovoru v tem sporočilu. Ob temi bo prikazano število novih odgovorov." watching: title: "Opazujem" - description: "Obveščeni boste o vsakem novem odgovoru v tej temi. Prikazano bo tudi število novih odgovorov." + description: "Obveščeni boste o vsakem novem odgovoru v tej temi. Ob temi bo prikazano število novih odgovorov." tracking_pm: title: "Sledim" description: "Število novih odgovorov bo prikazano za to sporočilo. Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori." @@ -1673,7 +1775,7 @@ sl: one: "Trenutno pripeta tema v {{categoryLink}}: {{count}}" two: "Trenutno pripeti temi v {{categoryLink}}: {{count}}" few: "Trenutno pripete teme v {{categoryLink}}: {{count}}" - other: "Trenutno pripete teme v {{categoryLink}}: {{count}}" + other: "Trenutno pripetih tem v {{categoryLink}}: {{count}}" pin_globally: "Ta tema naj se pojavi na vrhu vseh seznamov tem do" confirm_pin_globally: "Trenutno imate {{count}} globalno pripetih tem. Preveč pripetih tem je lahko breme za nove in anonimne uporabnike. Ali ste prepričani da želite pripeti še eno globalno temo?" unpin_globally: "Odstrani to temo z vrha vseh seznamov tem." @@ -1681,10 +1783,10 @@ sl: global_pin_note: "Uporabniki lahko samostojno odpnejo temo." not_pinned_globally: "Ni globalno pripetih tem." already_pinned_globally: - one: "Trenutno globalno pripeta tema: 1" - two: "Trenutno globalno pripeti temi: 2" + one: "Trenutno globalno pripeta tema: {{count}}" + two: "Trenutno globalno pripeti temi: {{count}}" few: "Trenutno globalno pripete teme: {{count}}" - other: "Trenutno globalno pripete teme: {{count}}" + other: "Trenutno globalno pripetih tem: {{count}}" make_banner: "Naredi to temo v oglasni trak, ki se bo prikazoval na vrhu vseh strani." remove_banner: "Odstrani oglasni trak, ki se pojavlja na vrhu vseh strani." banner_note: "Uporabniki lahko odstranijo oglasni trak tako da ga zaprejo. Naenkrat je lahko samo ena tema v oglasnem traku." @@ -1712,7 +1814,7 @@ sl: to_topic_blank: "Vnesite uporabniško ime ali e-naslov osebe, ki bi ga radi povabili v to temo." to_topic_email: "Vnesli ste e-naslov. Poslali bomo vabilo preko e-sporočila, ki bo vašemu prijatelju omogočila, da bo neposredno odgovoril v temo." to_topic_username: "Vnesli ste uporabniško ime. Poslali mu bomo obvestilo s povezavo na to temo." - to_username: "Vnesite uporabniško ime osebe, ki bi jo povabili v to temo. Poslali mu bomo obvestilo z povezavo na to temo." + to_username: "Vnesite uporabniško ime osebe, ki bi jo povabili v to temo. Poslali mu bomo obvestilo s povezavo na to temo." success_email: "Poslali smo povabilo na {{emailOrUsername}}. Obvestili vas bomo, ko se bo uporabnik prvič prijavil. Na vaši uporabniški strani lahko v zavihku Povabila spremljate stanje vaših povabil." success_username: "Povabili smo uporabnika, da sodeluje v tej temi." error: "Nismo mogli povabiti to osebo. Mogoče je ta oseba že povabljena? (povabila so omejena)" @@ -1720,9 +1822,9 @@ sl: login_reply: "Za odgovor je potrebna prijava" filters: n_posts: - one: "1 prispevek" + one: "{{count}} prispevek" two: "{{count}} prispevka" - few: "{{count}} prispevkov" + few: "{{count}} prispevki" other: "{{count}} prispevkov" cancel: "Odstrani filter" move_to: @@ -1736,7 +1838,7 @@ sl: radio_label: "Nova tema" error: "Med prestavljanjem prispevkov v novo temo je prišlo do napake." instructions: - one: "Ustvarili boste novo temo in jo napolnili z izbranim prispevkom." + one: "Ustvarili boste novo temo in jo napolnili z {{count}} izbranim prispevkom." two: "Ustvarili boste novo temo in jo napolnili z {{count}} izbranima prispevkoma." few: "Ustvarili boste novo temo in jo napolnili z {{count}} izbranimi prispevki." other: "Ustvarili boste novo temo in jo napolnili z {{count}} izbranimi prispevki." @@ -1746,18 +1848,18 @@ sl: error: "Med prestavljanjem prispevkov v to temo je prišlo do napake." radio_label: "Obstoječa tema" instructions: - one: "Izberite temo v katero bi prestavili prispevek." + one: "Izberite temo v katero bi prestavili {{count}} prispevek." two: "Izberite temo v katero bi prestavili {{count}} prispevka." - few: "Izberite temo v katero bi prestavili {{count}} prispevkov." - other: "Izberite temo v katero bi prestavili {{count}} prispevek." + few: "Izberite temo v katero bi prestavili {{count}} prispevke." + other: "Izberite temo v katero bi prestavili {{count}} prispevkov." move_to_new_message: - title: "Prestavi v novo zasebno sporočilo" - action: "prestavi v novo zasebno sporočilo" + title: "Prestavi v novo ZS" + action: "prestavi v novo ZS" message_title: "Naslov novega sporočila" radio_label: "Novo zasebno sporočilo" participants: "Udeleženci" instructions: - one: "Ustvarili boste novo sporočilo in ga napolnili z izbranim prispevkom." + one: "Ustvarili boste novo sporočilo in ga napolnili z {{count}} izbranim prispevkom." two: "Ustvarili boste novo sporočilo in ga napolnili z {{count}} izbranima prispevkoma." few: "Ustvarili boste novo sporočilo in ga napolnili z {{count}} izbranimi prispevki." other: "Ustvarili boste novo sporočilo in ga napolnili z {{count}} izbranimi prispevki." @@ -1767,9 +1869,9 @@ sl: radio_label: "Obstoječe zasebno sporočilo" participants: "Udeleženci" instructions: - one: "Izberite sporočilo v katero bi radi premaknili prispevek." + one: "Izberite sporočilo v katero bi radi premaknili {{count}} prispevek." two: "Izberite sporočilo v katero bi radi premaknili {{count}} prispevka." - few: "Izberite sporočilo v katero bi radi premaknili {{count}} prispevkov." + few: "Izberite sporočilo v katero bi radi premaknili {{count}} prispevke." other: "Izberite sporočilo v katero bi radi premaknili {{count}} prispevkov." merge_posts: title: "Združi izbrane prispevke" @@ -1777,13 +1879,13 @@ sl: error: "Med združevanjem izbranih prispevkov je prišlo do napake." change_owner: title: "Spremeni lastnika" - action: "spremeni lastništvo" + action: "spremeni lastnika" error: "Med spreminjanjem lastništva prispevkov je prišlo do napake." placeholder: "uporabniško ime novega lastnika" instructions: - one: "Izberite novega lastnika za prispevek od @{{old_user}}" + one: "Izberite novega lastnika za {{count}} prispevek od @{{old_user}}" two: "Izberite novega lastnika za {{count}} prispevka od @{{old_user}}" - few: "Izberite novega lastnika za {{count}} prispevkov od @{{old_user}}" + few: "Izberite novega lastnika za {{count}} prispevke od @{{old_user}}" other: "Izberite novega lastnika za {{count}} prispevkov od @{{old_user}}" change_timestamp: title: "Spremeni čas objave..." @@ -1811,9 +1913,9 @@ sl: select_all: izberi vse deselect_all: odznači vse description: - one: Izbrali ste 1 prispevek. + one: Izbrali ste {{count}} prispevek. two: "Izbrali ste {{count}} prispevka." - few: "Izbrali ste {{count}} prispevkov." + few: "Izbrali ste {{count}} prispevke." other: "Izbrali ste {{count}} prispevkov." post: quote_reply: "Citiraj" @@ -1828,53 +1930,53 @@ sl: show_full: "Prikaži cel prispevek" show_hidden: "Prikaži skrito vsebino." deleted_by_author: - one: "(objava umaknjena s strani avtorja se bo avtomatično izbrisala po %{count} uri če ni prijave)" - two: "(objava umaknjena s strani avtorja se bo avtomatično izbrisala po %{count} urah če ni prijave)" - few: "(objava umaknjena s strani avtorja se bo avtomatično izbrisala po %{count} urah če ni prijave)" + one: "(prispevek umaknjen s strani avtorja se bo samodejno izbrisal po %{count} uri, če ni prijavljen moderatorju)" + two: "(prispevek umaknjen s strani avtorja se bo samodejno izbrisal po %{count} urah, če ni prijavljen moderatorju)" + few: "(prispevek umaknjen s strani avtorja se bo samodejno izbrisal po %{count} urah, če ni prijavljen moderatorju)" other: "(prispevek umaknjen s strani avtorja se bo samodejno izbrisal po %{count} urah, če ni prijavljen moderatorju)" collapse: "skrči" expand_collapse: "razširi/skrči" locked: "član osebja je zaklenil ta prispevek za urejanje" gap: - one: "poglej 1 skriti odgovor" + one: "poglej {{count}} skriti odgovor" two: "poglej {{count}} skrita odgovora" - few: "poglej {{count}} skritih odgovorov" + few: "poglej {{count}} skrite odgovore" other: "poglej {{count}} skritih odgovorov" unread: "Prispevek je neprebran" has_replies: one: "{{count}} odgovor" two: "{{count}} odgovora" - few: "{{count}} odgovorov" + few: "{{count}} odgovore" other: "{{count}} odgovorov" has_likes: one: "{{count}} všeček" two: "{{count}} všečka" - few: "{{count}} všečkov" + few: "{{count}} všečki" other: "{{count}} všečkov" has_likes_title: - one: "1 uporabniku je všeč objava" - two: "{{count}} uporabnikoma je všeč objava" - few: "{{count}} uporabnikom je všeč objava" + one: "{{count}} uporabniku je prispevek všeč" + two: "{{count}} uporabnikoma je prispevek všeč" + few: "{{count}} uporabnikom je prispevek všeč" other: "{{count}} uporabnikom je prispevek všeč" has_likes_title_only_you: "všečkali ste prispevek" has_likes_title_you: - one: "vam in 1 drugemu uporabniku je všeč objava" - two: "vam in {{count}} drugim uporabnikom je všeč objava" - few: "vam in {{count}} drugim uporabnikom je všeč objava" - other: "vam in {{count}} drugim uporabnikom je prispevek všeč " + one: "vam in {{count}} drugemu uporabniku je prispevek všeč" + two: "vam in {{count}} drugima uporabnikoma je prispevek všeč" + few: "vam in {{count}} drugim uporabnikom je prispevek všeč" + other: "vam in {{count}} drugim uporabnikom je prispevek všeč" errors: - create: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite znova." - edit: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite znova." - upload: "Oprostite, pri prenosu datoteke je prišlo do napake. Poskusite znova." + create: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite ponovno." + edit: "Oprostite, pri ustvarjanju vašega prispevka je prišlo do napake. Poskusite ponovno." + upload: "Oprostite, pri prenosu datoteke je prišlo do napake. Poskusite ponovno." file_too_large: "Datoteka je prevelika (največja dovoljena velikost je {{max_size_kb}}kb). Naložite vašo veliko datoteko na drugo spletno storitev in delite samo povezavo." too_many_uploads: "Oprostite, naenkrat lahko naložite samo eno datoteko." too_many_dragged_and_dropped_files: "Oprostite, naenkrat lahko naložite samo {{max}} datotek." upload_not_authorized: "Oprostite, datoteka ki ste jo hoteli naložiti ni podprta (podprte pripone:{{authorized_extensions}})." - image_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morajo nalagati datotek." - attachment_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morajo nalagati priponk." + image_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati datotek." + attachment_upload_not_allowed_for_new_user: "Oprostite, novi uporabniki ne morejo nalagati priponk." attachment_download_requires_login: "Oprostite, morate biti prijavljeni da lahko prenesete priponke." abandon: - confirm: "Ali ste prepričani, da hočete zavrči vaš prispevek?" + confirm: "Ali ste prepričani, da hočete zavreči vaš prispevek?" no_value: "Ne, ohrani" yes_value: "Da, zavrži" via_email: "ta prispevek je prispel preko e-sporočila" @@ -1901,14 +2003,14 @@ sl: delete_replies: confirm: "Ali hočete izbrisati tudi vse odgovore na tem prispevku?" direct_replies: - one: "Da, in 1 neposreden odgovor" + one: "Da, in {{count}} neposreden odgovor" two: "Da, in {{count}} neposredna odgovora" - few: "Da, in {{count}} neposrednih odgovorov" + few: "Da, in {{count}} neposredne odgovore" other: "Da, in {{count}} neposrednih odgovorov" all_replies: - one: "Da, in 1 odgovor" + one: "Da, in {{count}} odgovor" two: "Da, in {{count}} odgovora" - few: "Da, in vseh {{count}} odgovorov" + few: "Da, in vse {{count}} odgovore" other: "Da, in vseh {{count}} odgovorov" just_the_post: "Ne, samo ta prispevek" admin: "ukrepi administratorja" @@ -1931,8 +2033,8 @@ sl: flag: "Prijavi" defer_flags: one: "Ne upoštevaj prijavo" - two: "Ne upoštevaj prijave" - few: "Ne upoštevaj prijav" + two: "Ne upoštevaj prijavi" + few: "Ne upoštevaj prijave" other: "Ne upoštevaj prijav" undo: off_topic: "Razveljavi prijavo" @@ -1947,9 +2049,9 @@ sl: bookmark: "je zaznamovalo" like: "je všeč" like_capped: - one: "in {{count}} drugemu uporabniku je všeč objava" - two: "in {{count}} drugim uporabnikom je všeč objava" - few: "in {{count}} drugim uporabnikom je všeč objava" + one: "in {{count}} drugemu uporabniku je prispevek všeč" + two: "in {{count}} drugima uporabnikoma je prispevek všeč" + few: "in {{count}} drugim uporabnikom je prispevek všeč" other: "in {{count}} drugim uporabnikom je prispevek všeč" by_you: off_topic: "Vi ste prijavili da ne ustreza temi" @@ -1961,87 +2063,87 @@ sl: like: "Vam je všeč" by_you_and_others: off_topic: - one: "Vi in 1 uporabnik sta prijavila kot ne ustreza temi" + one: "Vi in {{count}} uporabnik sta prijavila kot ne ustreza temi" two: "Vi in {{count}} uporabnika ste prijavili kot ne ustreza temi" - few: "Vi in {{count}} uporabnikov ste prijavili kot ne ustreza temi" + few: "Vi in {{count}} uporabniki ste prijavili kot ne ustreza temi" other: "Vi in {{count}} uporabnikov ste prijavili kot ne ustreza temi" spam: - one: "Vi in 1 uporabnik ste prijavili kot neželeno" + one: "Vi in {{count}} uporabnik sta prijavila kot neželeno" two: "Vi in {{count}} uporabnika ste prijavili kot neželeno" - few: "Vi in {{count}} uporabnikov ste prijavili kot neželeno" + few: "Vi in {{count}} uporabniki ste prijavili kot neželeno" other: "Vi in {{count}} uporabnikov ste prijavili kot neželeno" inappropriate: - one: "Vi in 1 uporabnik je prijavil kot neprimerno" - two: "Vi in {{count}} uporabnika sta prijavila kot neprimerno" - few: "Vi in {{count}} uporabnik ste prijavili kot neprimerno" - other: "Vi in {{count}} uporabnik ste prijavili kot neprimerno" + one: "Vi in {{count}} uporabnik sta prijavila kot neprimerno" + two: "Vi in {{count}} uporabnika ste prijavili kot neprimerno" + few: "Vi in {{count}} uporabniki ste prijavili kot neprimerno" + other: "Vi in {{count}} uporabnikov ste prijavili kot neprimerno" notify_moderators: - one: "Vi in 1 drug uporabnik je prijavil to objavo moderatorjem" - two: "Vi in {{count}} druga uporabnika sta prijavila to objavo moderatorjem" - few: "Vi in {{count}} drugih uporabnikov ste prijavili to objavo moderatorjem" - other: "Vi in {{count}} drugih uporabnikov je prispevek prijavilo moderatorjem" + one: "Vi in {{count}} drug uporabnik sta prispevek prijavila moderatorjem" + two: "Vi in {{count}} druga uporabnika ste prispevek prijavili moderatorjem" + few: "Vi in {{count}} drugi uporabniki ste prispevek prijavili moderatorjem" + other: "Vi in {{count}} drugih uporabnikov ste prispevek prijavili moderatorjem" notify_user: - one: "Vi in še 1 drug uporabnik je poslal opozorilo avtorju" - two: "Vi in še {{count}} druga uporabnika sta poslala opozorilo avtorju" - few: "Vi in še {{count}} drugih uporabnikov ste poslali opozorilo avtorju" + one: "Vi in še {{count}} drug uporabnik sta poslala opozorilo avtorju" + two: "Vi in še {{count}} druga uporabnika ste poslali opozorilo avtorju" + few: "Vi in še {{count}} drugi uporabniki ste poslali opozorilo avtorju" other: "Vi in še {{count}} drugih uporabnikov ste poslali opozorilo avtorju" bookmark: - one: "Vi in 1 drug uporabnik je zaznamoval ta prispevek" + one: "Vi in {{count}} drug uporabnik je zaznamoval ta prispevek" two: "Vi in {{count}} druga uporabnika sta zaznamovala ta prispevek" - few: "Vi in {{count}} drugih uporabnikov je zaznamovalo ta prispevek" + few: "Vi in {{count}} drugi uporabniki je zaznamovalo ta prispevek" other: "Vi in {{count}} drugih uporabnikov je zaznamovalo ta prispevek" like: - one: "Vam in 1 drugemu uporabniku je všeč objava" - two: "Vam in {{count}} drugim uporabnikom je všeč objava" - few: "Vam in {{count}} drugim uporabnikom je všeč objava" - other: "Vam in {{count}} drugim uporabnikom je prispevek všeč " + one: "Vam in {{count}} drugemu uporabniku je prispevek všeč" + two: "Vam in {{count}} drugima uporabnikoma je prispevek všeč" + few: "Vam in {{count}} drugim uporabnikom je prispevek všeč" + other: "Vam in {{count}} drugim uporabnikom je prispevek všeč" by_others: off_topic: - one: "1 uporabnik je prijavil kot ne ustreza temi" + one: "{{count}} uporabnik je prijavil kot ne ustreza temi" two: "{{count}} uporabnika sta prijavila kot ne ustreza temi" - few: "{{count}} uporabnikov je prijavilo kot ne ustreza temi" + few: "{{count}} uporabniki so prijavili kot ne ustreza temi" other: "{{count}} uporabnikov je prijavilo kot ne ustreza temi" spam: - one: "1 uporabnik je prijavil kot neželeno" + one: "{{count}} uporabnik je prijavil kot neželeno" two: "{{count}} uporabnika sta prijavila kot neželeno" - few: "{{count}} uporabnikov je prijavilo kot neželeno" + few: "{{count}} uporabniki so prijavili kot neželeno" other: "{{count}} uporabnikov je prijavilo kot neželeno" inappropriate: - one: "1 uporabnik je prijavil kot neprimerno" + one: "{{count}} uporabnik je prijavil kot neprimerno" two: "{{count}} uporabnika sta prijavila kot neprimerno" - few: "{{count}} uporabnikov je prijavilo kot neprimerno" + few: "{{count}} uporabniki so prijavili kot neprimerno" other: "{{count}} uporabnikov je prijavilo kot neprimerno" notify_moderators: - one: "1 uporabnik je prijavil to objavo moderatorjem" - two: "{{count}} uporabnika sta prijavila to objavo moderatorjem" - few: "{{count}} uporabnikov je prijavilo to objavo moderatorjem" + one: "{{count}} uporabnik je ta prispevek prijavil moderatorjem" + two: "{{count}} uporabnika sta ta prispevek prijavila moderatorjem" + few: "{{count}} uporabniki so ta prispevek prijavili moderatorjem" other: "{{count}} uporabnikov je ta prispevek prijavilo moderatorjem" notify_user: - one: "1 uporabnik je opozoril avtorja" + one: "{{count}} uporabnik je opozoril avtorja" two: "{{count}} uporabnika sta opozorila avtorja" - few: "{{count}} uporabnikov je opozorilo avtorja" + few: "{{count}} uporabniki so opozorili avtorja" other: "{{count}} uporabnikov je opozorilo avtorja" bookmark: - one: "1 uporabnik je zaznamoval ta prispevek" + one: "{{count}} uporabnik je zaznamoval ta prispevek" two: "{{count}} uporabnika sta zaznamovala ta prispevek" - few: "{{count}} uporabnikov je zaznamovalo ta prispevek" + few: "{{count}} uporabniki so zaznamovali ta prispevek" other: "{{count}} uporabnikov je zaznamovalo ta prispevek" like: - one: "1 uporabniku je všeč" + one: "{{count}} uporabniku je všeč" two: "{{count}} uporabnikoma je všeč" few: "{{count}} uporabnikom je všeč" other: "{{count}} uporabnikom je všeč" delete: confirm: - one: "Ali ste prepričani da hočete izbrisati ta prispevek?" + one: "Ali ste prepričani da hočete izbrisati ta {{count}} prispevek?" two: "Ali ste prepričani da hočete izbrisati ta {{count}} prispevka?" - few: "Ali ste prepričani da hočete izbrisati teh {{count}} prispevkov?" + few: "Ali ste prepričani da hočete izbrisati te {{count}} prispevke?" other: "Ali ste prepričani da hočete izbrisati teh {{count}} prispevkov?" merge: confirm: - one: "Ali ste prepričani da hočete združiti te prispevke?" + one: "Ali ste prepričani da hočete združiti ta {{count}} prispevek?" two: "Ali ste prepričani da hočete združiti ta {{count}} prispevka?" - few: "Ali ste prepričani da hočete združiti teh {{count}} prispevkov?" + few: "Ali ste prepričani da hočete združiti te {{count}} prispevke?" other: "Ali ste prepričani da hočete združiti teh {{count}} prispevkov?" revisions: controls: @@ -2118,6 +2220,7 @@ sl: subcategory_list_style: "Stil seznama podkategorij:" allow_badges_label: "Omogoči nagrajevanje z značkami v tej kategoriji" require_topic_approval: "Zahtevaj moderatorjevo potrditev vseh novih tem" + require_reply_approval: "Zahteva odobritev moderatorja za vse nove odgovore" this_year: "to leto" position_disabled: "Kategorije bodo razvrščene glede na aktivnost. Za kontrolo razvrščanja kategorij na seznamih, " position_disabled_click: 'omogoči nastavitev "fiksnih položajev kategorij"' @@ -2125,11 +2228,15 @@ sl: num_auto_bump_daily: "Število odprtih tem, ki se samodejno izpostavijo vsak dan:" navigate_to_first_post_after_read: "Premakni se na prvi prispevek ko so vse teme prebrane" notifications: + watching: + title: "Opazujem" + description: "Samodejno boste opazovali vse teme v teh kategorijah. Obveščeni boste za vsak nov prispevek v vsaki temi. Ob temi bo prikazano število novih odgovorov." watching_first_post: - title: "Opazuješ prvi prispevek" + title: "Opazujem prvi prispevek" description: "Obveščeni boste o novih temah v tej kategoriji, ne pa tudi o odgovorih v temi." tracking: - description: "Samodejno boste sledili vsem temam v teh kategorijah. Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori. Prikazano bo tudi število novih odgovorov." + title: "Sledim" + description: "Samodejno boste sledili vsem temam v teh kategorijah. Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori. Ob temi bo prikazano število novih odgovorov." regular: title: "Običajno" description: "Obveščeni boste, če nekdo omeni vaše @ime ali vam odgovori." @@ -2175,19 +2282,19 @@ sl: custom_placeholder_notify_moderators: "Napišite kaj vas konkretno moti na prispevku in napišite konkretne primere ter dodajte povezave na motečo vsebino." custom_message: at_least: - one: "vnesite vsaj 1 znak" + one: "vnesite vsaj {{count}} znak" two: "vnesite vsaj {{count}} znaka" - few: "vnesite vsaj {{count}} znakov" + few: "vnesite vsaj {{count}} znake" other: "vnesite vsaj {{count}} znakov" more: - one: "1 do konca..." + one: "{{count}} do konca..." two: "{{count}} do konca..." few: "{{count}} do konca..." other: "{{count}} do konca..." left: - one: "1 preostal" + one: "{{count}} preostal" two: "{{count}} preostala" - few: "{{count}} preostalih" + few: "{{count}} preostali" other: "{{count}} preostalih" flagging_topic: title: "Hvala, da pomagate ohraniti prijazno skupnost!" @@ -2198,10 +2305,15 @@ sl: participants_title: "Pogosto objavljajo" links_title: "Popularne povezave" links_shown: "prikaži več povezav..." + clicks: + one: "%{count} klik" + two: "%{count} klika" + few: "%{count} kliki" + other: "%{count} klikov" post_links: about: "razširi več povezav za to temo" title: - one: "1 več" + one: "{{count}} več" two: "%{count} več" few: "%{count} več" other: "%{count} več" @@ -2229,7 +2341,7 @@ sl: help: "Ta tema je izločena; ne bo se prikazovala na seznamih tem in se jo lahko dostopa samo preko neposredne povezave." posts: "Prispevki" posts_likes_MF: | - Ta tema ima {count, plural, one {1 odgovor} one {2 odgovora} other {# odgovorov}} {ratio, select, + Ta tema ima {count, plural, one {1 odgovor} two {2 odgovora} other {# odgovorov}} {ratio, select, low {z visokim razmerjem med všečki in prispevki} med {z zelo visokim razmerjem med všečki in prispevki} high {z skrajno visokim razmerjem med všečki in prispevki} @@ -2239,21 +2351,26 @@ sl: views_lowercase: one: "ogled" two: "ogleda" - few: "ogledov" + few: "ogledi" other: "ogledov" replies: "Odgovori" + views_long: + one: "ta tema je bila ogledna {{number}} krat" + two: "ta tema je bila ogledna {{number}} krat" + few: "ta tema je bila ogledna {{number}} krat" + other: "ta tema je bila ogledna {{number}} krat" activity: "Aktivnost" likes: "Všečki" likes_lowercase: one: "všeček" two: "všečka" few: "všečki" - other: "všečki" + other: "všečkov" users: "Uporabniki" users_lowercase: one: "uporabnik" two: "uporabnika" - few: "uporabnikov" + few: "uporabniki" other: "uporabnikov" category_title: "Kategorija" history: "Zgodovina" @@ -2263,10 +2380,10 @@ sl: latest: title: "Najnovejše" title_with_count: - one: "Zadnji (1)" - two: "Zadnja ({{count}})" - few: "Zadnjih ({{count}})" - other: "Zadnjih ({{count}})" + one: "Najnovejša ({{count}})" + two: "Najnovejši ({{count}})" + few: "Najnovejše ({{count}})" + other: "Najnovejših ({{count}})" help: "teme z nedavnimi prispevki" hot: title: "Vroče" @@ -2282,31 +2399,31 @@ sl: title_in: "Kategorija - {{categoryName}}" help: "vse teme združene po kategorijah" unread: - title: "Neprebrano" + title: "Neprebrane" title_with_count: - one: "Neprebrani (1)" - two: "Neprebrani (2)" - few: "Neprebrani ({{count}})" + one: "Neprebrana ({{count}})" + two: "Neprebrani ({{count}})" + few: "Neprebrane ({{count}})" other: "Neprebranih ({{count}})" - help: "teme, ki jih spremljate ali jim sledite z neprebranimi sporočili" + help: "teme, ki jih opazujete ali jim sledite z neprebranimi sporočili" lower_title_with_count: - one: "1 neprebran" - two: "{{count}} neprebrana" - few: "{{count}} neprebranih" + one: "{{count}} neprebrana" + two: "{{count}} neprebrani" + few: "{{count}} neprebrane" other: "{{count}} neprebranih" new: lower_title_with_count: - one: "1 nova" - two: "2 nove" - few: "{{count}} novih" + one: "{{count}} nova" + two: "{{count}} novi" + few: "{{count}} nove" other: "{{count}} novih" lower_title: "novo" title: "Nove" title_with_count: - one: "Nova (1)" + one: "Nova ({{count}})" two: "Novi ({{count}})" few: "Nove ({{count}})" - other: "Nove ({{count}})" + other: "Novih ({{count}})" help: "teme ustvarjene v zadnjih dneh" posted: title: "Moji prispevki" @@ -2317,7 +2434,7 @@ sl: category: title: "{{categoryName}}" title_with_count: - one: "{{categoryName}} (1)" + one: "{{categoryName}} ({{count}})" two: "{{categoryName}} ({{count}})" few: "{{categoryName}} ({{count}})" other: "{{categoryName}} ({{count}})" @@ -2354,7 +2471,7 @@ sl: home: "g, h Domov" latest: "g, l Najnovejše" new: "g, n Novo" - unread: "g, u Neprebrano" + unread: "g, u Neprebrane" categories: "g, c Kategorije" top: "g, t Na vrh" bookmarks: "g, b Zaznamki" @@ -2387,7 +2504,7 @@ sl: actions: title: "Akcije" bookmark_topic: "fDodaj/odstrani zaznamek na temi" - pin_unpin_topic: "shift+p Pripni/Odpni temo" + pin_unpin_topic: "shift+p Pripni/odpni temo" share_topic: "shift+sDeli temo" share_post: "s Deli prispevek" reply_as_new_topic: "t Odgovori v novi povezani temi" @@ -2406,36 +2523,36 @@ sl: print: "ctrl+p Natisni temo" badges: earned_n_times: - one: "Osvojili to značko 1 krat" - two: "Osvojili to značko %{count} krat" - few: "Osvojili to značko %{count} krat" - other: "Osvojili to značko %{count} krat" + one: "Prislužili to značko 1 krat" + two: "Prislužili to značko %{count} krat" + few: "Prislužili to značko %{count} krat" + other: "Prislužili to značko %{count} krat" granted_on: "Podeljeno %{date}" - others_count: "Drugih s to značko (%{count})" + others_count: "Drugi s to značko (%{count})" title: Značke allow_title: "To značko lahko uporabite kot naziv" - multiple_grant: "To lahko osvojite večkrat." + multiple_grant: "To lahko prislužite večkrat." badge_count: - one: "1 značka" + one: "%{count} značka" two: "%{count} znački" - few: "%{count} značk" + few: "%{count} značke" other: "%{count} značk" more_badges: - one: "+1 več" + one: "+%{count} več" two: "+%{count} več" few: "+%{count} več" other: "+%{count} več" granted: - one: "1 podeljena" + one: "%{count} podeljena" two: "%{count} podeljeni" - few: "%{count} podeljenih" + few: "%{count} podeljene" other: "%{count} podeljenih" select_badge_for_title: Izberite značko za svoj naziv - none: "(nobene)" + none: "(brez)" successfully_granted: "%{badge} uspešno podeljena %{username}" badge_grouping: getting_started: - name: Kako začeti + name: Začetki community: name: Skupnost trust_level: @@ -2457,20 +2574,42 @@ sl: all_tags: "Vse oznake" selector_all_tags: "vse oznake" choose_for_topic: "neobvezne oznake" + delete_confirm: + one: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} teme s to oznako?" + two: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?" + few: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?" + other: "Ali ste prepričani, da želite izbrisati to oznako in jo umaknili iz {{count}} tem s to oznako?" delete_confirm_no_topics: "Ali ste prepričani da hočete izbrisati to oznako?" upload_description: "Naloži datoteko CSV za množično ustvarjanje oznak" + delete_unused_confirmation: + one: "%{count} oznaka bod izbrisana: %{tags}" + two: "%{count} oznaki bosta izbrisani: %{tags}" + few: "%{count} oznake bodo izbrisane: %{tags}" + other: "%{count} oznak bo izbrisano: %{tags}" + delete_unused_confirmation_more_tags: + one: "%{tags} in %{count} druga" + two: "%{tags} in %{count} drugi" + few: "%{tags} in %{count} druge" + other: "%{tags} in %{count} drugih" cancel_delete_unused: "Prekliči" filters: with_category: "%{filter} %{tag} tem v %{category}" untagged_with_category: "%{filter} neoznačenih tem v %{category}" notifications: + watching: + title: "Opazujem" + description: "Samodejno boste opazovali vse teme s to oznako. Obveščeni boste za vsak nov prispevek v vsaki temi. Ob temi bo prikazano število novih odgovorov." watching_first_post: - title: "Opazuješ prvi prispevek" + title: "Opazujem prvi prispevek" description: "Obveščeni boste o novih temah z to oznako, ne pa tudi o odgovorih v temah." + tracking: + title: "Sledim" + description: "Samodejno boste sledili vsem temam s to oznako. Ob temi bo prikazano število novih odgovorov." regular: description: "Obveščeni boste, če nekdo omeni vaše @ime ali odgovori na vaš prispevek." muted: title: "Utišano" + description: "Ne boste obveščeni o temah s to oznako in ne bodo se pojavile v seznamu neprebrane." groups: new: "Nova skupina" parent_tag_placeholder: "Neobvezno" @@ -2517,8 +2656,14 @@ sl: silenced: "Utišan:" suspended: "Suspendirani:" private_messages_title: "Zasebna sporočila" + backup_count: + one: "%{count} varnostna kopija na %{location}" + two: "%{count} varnostni kopiji na %{location}" + few: "%{count} varnostne kopije na %{location}" + other: "%{count} varnostnih kopij na %{location}" page_views: "Ogledov strani" page_views_short: "Ogledov strani" + too_many_requests: To dejanje ste izvedli prevečkrat. Prosimo počakajte preden poskusite ponovno. reports: today: "Danes" yesterday: "Včeraj" @@ -2534,7 +2679,7 @@ sl: flags: title: "Prijave" active_posts: "Prijavljeni prispevki" - old_posts: "Stare prijavljeni prispevki" + old_posts: "Stari prijavljeni prispevki" topics: "Prijavljene teme" moderation_history: "Zgodovina moderiranja" agree_flag_hide_post: "Skrij prispevek" @@ -2560,10 +2705,15 @@ sl: more: "(več odgovorov...)" suspend_user: "Suspendiraj uporabnika" replies: - one: "[1 odgovor]" + one: "[%{count} odgovor]" two: "[%{count} odgovora]" - few: "[%{count} odgovorov]" + few: "[%{count} odgovori]" other: "[%{count} odgovorov]" + delete_replies: + one: "Pobrišemo tudi %{count} odgovor na ta prispevek?" + two: "Pobrišemo tudi %{count} odgovora na ta prispevek?" + few: "Pobrišemo tudi %{count} odgovore na ta prispevek?" + other: "Pobrišemo tudi %{count} odgovorov na ta prispevek?" flagged_by: "Prijavljen od" system: "Sistem" error: "Prišlo je do napake" @@ -2578,7 +2728,7 @@ sl: summary: one: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} prijava)" two: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} prijavi)" - few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} prijav)" + few: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} prijave)" other: "{{agreed}}, {{disagreed}}, {{ignored}} ({{count}} prijav)" details: "podrobnosti" flagged_topics: @@ -2596,29 +2746,57 @@ sl: groups: new: title: "Nova skupina" + create: "Ustvari skupino" + name: + too_short: "Ime skupine je prekratko" + too_long: "Ime skupine je preveč dolgo" + checking: "Preverjamo ime skupine..." + available: "Ime skupine je na voljo" + not_available: "Ime skupine ni na voljo" + blank: "Ime skupine ne more biti prazno" bulk_add: title: "Množično dodajanje v skupino" + add_members: + as_owner: "Dodaj uporabnike in skrbnike za to skupino" manage: interaction: email: E-naslov + incoming_email: "Dohodni e-naslov po meri" + incoming_email_placeholder: "vnesite e-naslov" + visibility: Vidljivost visibility_levels: - members: "člani skupine, moderatorji in administratorji" - owners: "člani skupine in administratorji" + title: "Kdo lahko vidi to skupino?" + public: "Vsi" + members: "Skrbniki skupine, člani in administratorji" + staff: "Skrbniki skupine in osebje foruma" + owners: "Skrbniki skupine in administratorji" membership: + automatic: Samodejno + trust_level: Nivo zaupanja trust_levels_title: "Stopnja zaupanja, ki je samodejno dodeljena članom, ko so dodani:" + trust_levels_none: "Brez" + automatic_membership_email_domains: "Uporabniki, ki se prijavijo z e-naslovom, ki se točno ujema s to domeno, bodo samodejno dodani v to skupino:" + automatic_membership_retroactive: "Uporabi enako pravilo za e-naslov domene za dodajanje obstoječih uporabnikov" + primary_group: "Samodejno nastavi za primarno skupino" + name_placeholder: "Ime skupine, brez presledkov, enaka pravila kot za uporabniško ime" primary: "Primarna skupina" no_primary: "(ni primarne skupine)" title: "Skupine" edit: "Uredi skupino" refresh: "Osveži" + about: "Uredite svoje članstvo v skupinah in imena tukaj" group_members: "Člani skupine" delete: "Izbriši" delete_confirm: "Izbriši skupino?" + delete_owner_confirm: "Odstrani vlogo skrbnika uporabniku '%{username}'?" add: "Dodaj" custom: "Po meri" automatic: "Samodejno" - group_owners: Lastniki - add_owners: Dodaj lastnike + default_title: "Privzet naziv" + default_title_description: "bo dodeljen vsem uporabnikom v skupini" + group_owners: Skrbniki + add_owners: Dodaj skrbnike + no_custom_groups: "Ustvari novo skupino po meri" api: user: "Uporabnik" title: "API" @@ -2662,6 +2840,9 @@ sl: upload: label: "Naloži" uploading: "Nalagam..." + uploading_progress: "Nalagam... {{progress}}%" + success: "'{{filename}}' je bila uspečno prenešena. Datoteka se procesira, zato bo potrebnih nekaj minut, preden se bo pojavila na seznamu." + error: "Prišlo je do napake med prenašanjem '{{filename}}': {{message}}" operations: cancel: label: "Prekliči" @@ -2706,6 +2887,7 @@ sl: import_theme: "Uvozi izgled" customize_desc: "Prilagodi:" title: "Izgledi" + create: "Ustvari" name_too_short: "Ime mora imeti najmanj 4 znake." edit: "Uredi" common: "Skupno" @@ -2753,6 +2935,7 @@ sl: settings: "Nastavitve" templates: "Predloge" sending_test: "Pošiljam testno e-sporočilo..." + test_error: "Prišlo je do napake med pošiljanjem testnega e-sporočila. Prosimo da ponovno preverite vaše nastavitve e-pošte in preverite, da vaš ponudnik ne blokira povezav za e-pošto. Potem poskusite ponovno." sent: "Poslano" received: "Prejeto" rejected: "Zavrnjeno" @@ -2882,9 +3065,9 @@ sl: clear_filter: "Počisti" show_words: "pokaži besede" word_count: - one: "1 beseda" - two: "2 besedi" - few: "%{count} besed" + one: "%{count} beseda" + two: "%{count} besedi" + few: "%{count} besede" other: "%{count} besed" actions: block: "Blokiraj" @@ -2893,7 +3076,7 @@ sl: flag: "Prijavi" action_descriptions: block: "Onemogoči objavo prispevkov, ki vsebujejo te besede. Uporabnik bo dobil sporočilo o napaki, ko bodo hoteli objaviti prispevek. " - censor: "Dovoli prispevke z temi besedami, ampak jih zamenjaj z znaki, ki skrijejo cenzurirane besede." + censor: "Dovoli prispevke s temi besedami, ampak jih zamenjaj z znaki, ki skrijejo cenzurirane besede." require_approval: "Prispevki, ki vsebujejo te besede bodo zahtevali potrditev s strani osebja preden jih lahko kdo vidi." flag: "Dovoli prispevke, ki vsebujejo te besede, vendar jih prijavi kot neprimerne, tako da jih lahko moderatorji preverijo." form: @@ -2909,7 +3092,7 @@ sl: active: "Aktiviran" show_emails: "Pokaži e-naslove" nav: - new: "Nove" + new: "Nov" active: "Aktivni" pending: "Za potrditev" staff: "Osebje" @@ -2917,6 +3100,16 @@ sl: silenced: "Utišani" suspect: "Sumljivi" approved: "Potrjen?" + approved_selected: + one: "potrdi uporabnika" + two: "potrdi uporabnika ({{count}})" + few: "potrdi uporabnike ({{count}})" + other: "potrdi uporabnike ({{count}})" + reject_selected: + one: "zavrni uporabnika" + two: "zavrni uporabnika ({{count}})" + few: "zavrni uporabnike ({{count}})" + other: "zavrni uporabnike ({{count}})" titles: active: "Aktivni uporabniki" new: "Novi uporabniki" @@ -2925,6 +3118,16 @@ sl: silenced: "Utišani uporabniki" suspended: "Suspendirani uporabniki" suspect: "Sumljivi uporabniki" + reject_successful: + one: "Uspešno zavrnili %{count} uporabnika." + two: "Uspešno zavrnili %{count} uporabnika." + few: "Uspešno zavrnili %{count} uporabnike." + other: "Uspešno zavrnili %{count} uporabnikov." + reject_failures: + one: "Ni uspelo zavrniti %{count} uporabnika." + two: "Ni uspelo zavrniti %{count} uporabnika." + few: "Ni uspelo zavrniti %{count} uporabnike." + other: "Ni uspelo zavrniti %{count} uporabnikov." check_email: text: "Prikaži" user: @@ -3009,6 +3212,11 @@ sl: suspended_explanation: "Supsendiran uporabnik se ne more prijaviti." silence_explanation: "Utišan uporabnik ne more odgovarjati ali ustvariti novo temo." tl3_requirements: + table_title: + one: "V zadnjem dnevu:" + two: "V zadnjih %{count} dnevih:" + few: "V zadnjih %{count} dneh:" + other: "V zadnjih %{count} dneh:" days: "dni" topics_replied_to: "Odgovorjenih tem" topics_viewed: "Ogledanih tem" @@ -3059,6 +3267,8 @@ sl: search: "Išči besedilo, ki bi ga rad/a uredil/a" title: "Vsebina besedila" edit: "uredi" + settings: + none: "brez" badges: title: Značke new_badge: Nova značka @@ -3085,7 +3295,7 @@ sl: edit_badges: Uredi značke grant_badge: Podeli značko granted_badges: Podeljene značke - grant: Podelitev + grant: Podeli no_user_badges: "%{name} ni bila podeljena nobena značka." no_badges: "Ni značk, ki bi lahko bile podeljene." none_selected: "Izberi značko za začetek" @@ -3113,9 +3323,9 @@ sl: header: "POZOR!" no_grant_count: "Ni značk za podelitev." grant_count: - one: "1 značka za podelitev." + one: "%{count} značka za podelitev." two: "%{count} znački za podelitev." - few: "%{count} značk za podelitev." + few: "%{count} značke za podelitev." other: "%{count} značk za podelitev." sample: "Primer:" grant: @@ -3128,8 +3338,11 @@ sl: badge_query_examples_title: 'Primeri poizvedb SQL za značke' emoji: title: "Emoji" + help: "Dodaj nov emoji, ki bo na voljo vsem. (lahko prestavite in spustite več datotek naenkrat)" add: "Dodaj nov emoji" name: "Ime" + image: "Slika" + delete_confirm: "Ali ste prepričani, da hočete izbrisati emoji :%{name}:?" embedding: edit: "uredi" category: "Objavi v kategorijo" @@ -3155,7 +3368,13 @@ sl: next: "Naprej" upload: "Naloži" uploading: "Nalagam..." + upload_error: "Prišlo je do napake med nalaganjem te datoteke. Poskusite ponovno." quit: "Morda kasneje" + staff_count: + one: "Vaša skupnost ima 1 člana osebja (vas)." + two: "Vaša skupnost ima %{count} člana osebja, vključno z vami." + few: "Vaša skupnost ima %{count} člane osebja, vključno z vami." + other: "Vaša skupnost ima %{count} članov osebja, vključno z vami." invites: add_user: "dodaj" roles: diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index db31883db5..502a16222e 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -39,6 +39,13 @@ de: themes: bad_color_scheme: "Kann Motiv nicht aktualisieren, ungültiges Farbschema" other_error: "Etwas ist schief gelaufen beim Aktualisieren des Theme" + import_error: + generic: Beim Importieren dieses Themes ist ein Fehler aufgetreten + about_json: "Importfehler: about.json existiert nicht, oder ist ungültig" + about_json_values: "about.json enthält ungültige Werte: %{errors}" + git: "Fehler beim Klonen des git-Repository, Zugriff verboten oder Repository nicht gefunden." + unpack_failed: "Fehler beim Entpacken der Datei" + unknown_file_type: "Die Datei, die du hochgeladen hast, scheint kein gültiges Discourse-Theme zu sein." errors: component_no_user_selectable: "Theme Komponenten können nicht Benutzer auswählbar sein " component_no_default: "Theme Komponenten können nicht Standard Theme sein" @@ -824,6 +831,7 @@ de: post_count: Erstellte Beiträge pm_count: Erstellte Nachrichten revision_count: Revisionen + description: "Liste der Moderator-Aktivität einschließlich gesichteter Meldungen, Lesezeit, erstellter Themen, erstellter Beiträge, erstellter Nachrichten und Bearbeitungen." flags_status: title: "Meldungsstatus" values: @@ -941,18 +949,22 @@ de: title: "Benutzer-an-Benutzer (ohne Antworten)" xaxis: "Tag" yaxis: "Anzahl der Nachrichten" + description: "Anzahl neu angefangener Nachrichten." user_to_user_private_messages_with_replies: title: "Benutzer-zu-Benutzer (mit Antworten)" xaxis: "Tag" yaxis: "Anzahl der Nachrichten" + description: "Anzahl aller neuen Nachrichten und Antworten." system_private_messages: title: "System" xaxis: "Tag" yaxis: "Anzahl der Nachrichten" + description: "Anzahl der automatischen Nachrichten durch das System." moderator_warning_private_messages: title: "Warnungen von Moderatoren" xaxis: "Tag" yaxis: "Anzahl der Nachrichten" + description: "Anzahl der Warnungen, die von Moderatoren als Nachricht geschickt wurden." notify_moderators_private_messages: title: "Meldungen an Moderatoren" xaxis: "Tag" @@ -1001,8 +1013,10 @@ de: yaxis: "Seitenaufrufe durch angemeldete Benutzer" description: "Anzahl neuer Seitenaufrufe von angemeldeten Benutzern." page_view_crawler_reqs: + title: "Aufrufe durch Suchmaschinen" xaxis: "Tag" yaxis: "Aufrufe durch Suchmaschinen" + description: "Suchmaschinen-Seitenaufrufe insgesamt im Zeitverlauf." page_view_total_reqs: title: "Seitenaufrufe" xaxis: "Tag" @@ -1058,9 +1072,11 @@ de: yaxis: "Anzahl der Besuche" description: "Anzahl der eindeutigen Benutzern, die die Seite mit einem mobilen Endgerät besucht haben." web_crawlers: + title: "Suchmaschinen-Browserkennungen" labels: user_agent: "Browserkennung" page_views: "Seitenaufrufe" + description: "Liste von Suchmaschinen-Browserkennungen, sortiert nach Seitenaufrufen." suspicious_logins: title: "Verdächtige Anmeldungen" labels: @@ -1073,10 +1089,12 @@ de: login_time: Anmeldezeitpunkt description: "Details neuer Anmeldungen, die verdächtig von vorherigen Anmeldungen abweichen." staff_logins: + title: "Administrator-Anmeldungen" labels: user: Benutzer location: Standort login_at: Anmeldung um + description: "Liste der Anmeldungen von Administratoren mit Standort." top_uploads: title: "Top-Uploads" labels: @@ -1308,6 +1326,8 @@ de: google_oauth2_prompt: "Eine optionale Leerzeichen getrennte Liste von Zeichen Werten die angeben ob der Berechtigungsserver den Benutzer zur Re-Authentifizierung auffordert. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#prompt für mögliche Werte." google_oauth2_hd: "Eine optionale Google Apps gehostete Domain zu welches das Anmelden limitiert sein wird. Siehe https://developers.google.com/identity/protocols/OpenIDConnect#hd-param für weitere Informationen." enable_twitter_logins: "Twitter-Authentifizierung aktivieren, erfordert twitter_consumer_key und twitter_consumer_secret. Siehe Configuring Twitter login (and rich embeds) for Discourse." + twitter_consumer_key: "Consumer Key für Twitter-Authentifizierung, registriert unter https://developer.twitter.com/apps" + twitter_consumer_secret: "Consumer Secret für Twitter-Authentifizierung, registriert unter https://developer.twitter.com/apps" enable_instagram_logins: "Aktiviere Instagram-Authentifizierung (benötigt instagram_consumer_key und instagram_consumer_secret)." instagram_consumer_key: "Consumer Key für Instagram-Authentifizierung" instagram_consumer_secret: "Consumer Secret für Instagram-Authentifizierung" @@ -1558,6 +1578,8 @@ de: email_link_color: "Die Farbe von Links in HTML-Mails. Gib’ einen Namen ('blue') oder einen Hex-Wert ('#0000FF') der Farbe an." detect_custom_avatars: "Aktiviere diese Option, um zu überprüfen, ob Benutzer eigene Profilbilder hochgeladen haben." max_daily_gravatar_crawls: "Wie oft pro Tag Discourse höchstens auf Gravatar nach benuterdefinierten Avataren suchen soll." + public_user_custom_fields: "Eine Liste von benutzerdefinertern Feldern, die über die API-Schnittstelle abgerufen werden können." + staff_user_custom_fields: "Eine Liste von benutzerdefinertern Feldern, die von Teammitgliedern über die API-Schnittstelle abgerufen werden können." enable_user_directory: "Aktiviert ein durchsuchbares Benutzerverzeichnis" enable_group_directory: "Aktiviert ein durchsuchbares Gruppenverzeichnis" group_in_subject: "Setze %%{optional_pm} im E-Mail-Betreff auf die erste Gruppe in der Nachricht, siehe: Customize subject format for standard emails" @@ -1578,6 +1600,7 @@ de: suppress_uncategorized_badge: "Zeige kein Abzeichen für unkategorisierte Themen in der Themenliste." header_dropdown_category_count: "Wie viele Kategorien im der Header Dropdown-Liste angezeigt werden können." permalink_normalizations: "Diesen regulären Ausdruck anwenden, bevor Permalinks verarbeitet werden; Beispiel: /(topic.*)\\?.*/\\1 wird Query-Strings von Themen-Routen entfernen. Format: regulärer Ausdruck + String, benutze \\1 usw. um Teilausdrücke zu verwenden" + global_notice: "Zeigt allen Besuchern eine DRINGENDE NOTFALL-Meldung in Form eines nicht ausblendbaren, global sichtbaren Banners an. Leere den Inhalt, um sie wieder auszublenden (HTML ist erlaubt)." disable_edit_notifications: "Unterdrückt Bearbeitungshinweise durch den System-Benutzer, wenn die 'download_remote_images_to_local' Einstellung aktiviert ist." likes_notification_consolidation_threshold: "Anzahl der Like-Benachrichtigungen, bevor die Benachrichtigungen in eine einzelne zusammengeführt werden. Ein Wert von 0 deaktiviert die Funktion. Das Zeitfenster kann via ``SiteSetting.likes_notification_consolidation_window_mins` eingestellt werden." likes_notification_consolidation_window_mins: "Zeitfenster in Minuten, in dem mehrere Like-Benachrichtigungen in eine einzelne Benachrichtigung zusammengeführt werden, sobald der Schwellenwert erreicht wird. Der Schwellenwert kann via `SiteSetting.likes_notification_consolidation_threshold` eingestellt werden." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index c207242caa..ed9be61e7c 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -45,6 +45,7 @@ es: about_json_values: "El archivo about.json contiene valores no válidos: %{errors}" git: "Error al clonar el repositorio de git, el acceso ha sido denegado o el repositorio no existe" unpack_failed: "No se ha podido descomprimir el archivo" + unknown_file_type: "El archivo que has subido no parece ser un tema válido de Discourse." errors: component_no_user_selectable: "Los componentes de tema no pueden ser seleccionables por los usuarios" component_no_default: "Los componentes de temas no pueden ser el tema por defecto" @@ -67,6 +68,7 @@ es: string_value_not_valid_min: "Debe ser al menos de %{min} caracteres de longitud." string_value_not_valid_max: "Debe ser como máximo de %{max} caracteres de longitud." locale_errors: + top_level_locale: "La clave de nivel superior en un archivo local debe coincidir con el nombre local" invalid_yaml: "YAML de traducción no válido" emails: incoming: @@ -880,7 +882,7 @@ es: yaxis: "Número de nuevos colaboradores" description: "Número de usuarios que han publicado su primer mensaje durante este periodo." consolidated_page_views: - title: "Número de páginas vistas consolidado" + title: "Impresiones de páginas consolidadas" xaxis: page_view_crawler: "Crawlers" page_view_anon: "Usuarios anónimos" @@ -967,18 +969,22 @@ es: title: "Usuario a usuario (respuestas excluidas)" xaxis: "Día" yaxis: "Número de mensajes" + description: "Número de nuevos mensajes personales iniciados." user_to_user_private_messages_with_replies: title: "Usuario a usuario (con respuestas)" xaxis: "Día" yaxis: "Número de mensajes" + description: "Número de todos los mensajes personales y respuestas." system_private_messages: title: "Sistema" xaxis: "Día" yaxis: "Número de mensajes" + description: "Número de mensajes personales enviados automáticamente por el sistema." moderator_warning_private_messages: title: "Advertencias al moderador" xaxis: "Día" yaxis: "Número de mensajes" + description: "Número de advertencias enviadas por mensaje personal por moderadores." notify_moderators_private_messages: title: "Notificaciones a moderadores" xaxis: "Día" @@ -1027,8 +1033,10 @@ es: yaxis: "Páginas vistas de usuarios logueados" description: "Número de impresiones de página de usuarios con sesión iniciada." page_view_crawler_reqs: + title: "Impresiones de página de crawlers" xaxis: "Día" yaxis: "Páginas vistas de rastreadores web" + description: "Impresiones totales de página de crawlers en el tiempo." page_view_total_reqs: title: "Páginas vistas" xaxis: "Día" @@ -1084,9 +1092,11 @@ es: yaxis: "Número de visita" description: "Número de usuarios únicos que han visitado desde dispositivos móviles." web_crawlers: + title: "User agent de crawlers" labels: user_agent: "Agente de usuario" page_views: "Páginas vistas" + description: "Lista de agente de usuario de crawlers ordenado por impresiones de página." suspicious_logins: title: "Inicios de sesión sospechosos" labels: @@ -1099,10 +1109,12 @@ es: login_time: Fecha y hora de inicio de sesión description: "Detalles de nuevos inicios de sesión marcados como sospechosos." staff_logins: + title: "Inicios de sesión de administradore" labels: user: Usuario location: Ubicación login_at: Inicio de sesión el + description: "Lista de inicios de sesión de administradores con su ubicación" top_uploads: title: "Top archivos subido" labels: @@ -1122,6 +1134,8 @@ es: facebook_config_warning: 'El servidor está configurado para permitir crear una cuenta e ingresar utilizando Facebook (enable_facebook_logins), pero los valores id y secreto de la app no están configurados. Ingresa a la Configuración del Sitio y actualiza la configuración. Revisa la guía para aprender más.' twitter_config_warning: 'El servidor está configurado para permitir crear una cuenta e ingresar utilizando Twitter (enable_twitter_logins), pero los valores clave y secreto de la app no están configurados. Ingresa a la Configuración del Sitio y actualiza la configuración. Revisa la guía para aprender más.' github_config_warning: 'El servidor está configurado para permitir crear una cuenta e ingresar utilizando GitHub (enable_github_logins), pero los valores de cliente clave y cliente secreto no están configurados. Ingresa a la Configuración del Sitio y actualiza la configuración. Revisa la guía para aprender más.' + pwa_config_icon_warning: 'Tu página no tiene un icono de 512 x 512, lo que permitiría a los usuarios de dispositivos Android añadir un atajo a este sitio en su página de inicio. Puedes ir a href="%{base_path}/admin/site_settings/category/all_results?filter=large_icon">ajustes y subir un icono de 512 x 512.' + pwa_config_title_warning: 'Al servidor le falta un título corto que permita a los usuarios agregar un acceso directo en dispositivos Android. Ir a los Ajustes del Sitio y configurar un título con el largo recomendado.' s3_config_warning: 'El servidor está configurado para permitir subir los archivos a s3, pero por al menos una de las siguientes configuraciones no está realizada: s3_access_key_id, s3_secret_access_key o s3_upload_bucket. Ve a la Configuración del Sitio y actualiza la configuración. Revisa "How to set up image uploads to S3?" para aprender más.' s3_backup_config_warning: 'El servidor está configurado para permitir subir los archivos a s3, pero por al menos una de las siguientes configuraciones no está realizada: s3_access_key_id, s3_secret_access_key o s3_upload_bucket. Ve a la Configuración del Sitio y actualiza la configuración. Revisa "How to set up image uploads to S3?" para aprender más.' image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o descárgate la última versión.' @@ -1198,8 +1212,15 @@ es: inline_onebox_domains_whitelist: "Lista de dominios que serán oneboxed en miniatura si son enlazados sin un título" enable_inline_onebox_on_all_domains: "Ignorar configuración inline_onebox_domain_whitelist site y permitir inline onebox en todos los dominios." max_oneboxes_per_post: "Número máximo de oneboxes en un tema." + logo: "La imagen del logotipo en la parte superior izquierda de su sitio. Utilice una imagen rectangular ancha con una altura de 120 y una relación de aspecto superior a 3:1. Si se deja en blanco, se mostrará el texto del título del sitio." + logo_small: "La pequeña imagen del logotipo en la parte superior izquierda de su sitio debe ser una forma cuadrada de 120 por 120. Si se deja en blanco, se mostrará el home glyph." + digest_logo: "La imagen de logotipo alternativa utilizada en la parte superior del resumen de correo electrónico de su sitio. Debe ser una forma de rectángulo ancho. No debe ser una imagen SVG. Si se deja en blanco, se utilizará la del `logo`." + mobile_logo: "El logo utilizado en la versión móvil de su sitio. Use una imagen rectangular ancha de 120 y un ratio mayor a 3:1. Si se deja en blanco, se usará la imagen que se configuró en `logo`." + large_icon: "Imagen utilizada como logotipo o imagen de bienvenida en Android. El tamaño requerido es de 512 x 512." favicon: "El favicon para tu sitio, lee https://es.wikipedia.org/wiki/Favicon. Para trabajar correctamente sobre un CDN debe ser un png." + apple_touch_icon: "Icono utilizado para dispositivos táctiles de Apple. El tamaño requerido es de 144 x 144." opengraph_image: "Imagen opengraph predeterminada, utilizada cuando la página no tiene otra imagen adecuada o logotipo del sitio." + twitter_summary_large_image: "Imagen de la tarjeta de resumen de Twitter predeterminada (debe tener al menos de 280 de ancho y al menos 150 de altura)." notification_email: "La dirección de correo electrónico \"remitente\", utilizada al enviar todos los emails esenciales de sistema. El dominio especificado debe tener correctamente configurados los registros SPF, DKIM y PTR inversos para que los emails se reciban correctamente." email_custom_headers: "Lista de emails separados por una barra" email_subject: "Formato de asunto personalizable para emails estándar. Lee https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801" @@ -1230,6 +1251,7 @@ es: num_tl3_flags_to_silence_new_user: "Si los posts de un nuevo usuario obtienen este número de reportes de num_tl3_users_to_silence_new_user diferentes usuarios con nivel de confianza 3, se ocultarán todos sus posts y no podrá publicar más en un futuro. 0 para deshabilitar." num_tl3_users_to_silence_new_user: "Si los posts de un nuevo usuario reciben num_tl3_flags_to_silence_new_user reportes de este número de usuarios de nivel 3 de confianza, ocultar todos sus posts y prevenir futuras publicaciones. 0 para desactivar esta opción." notify_mods_when_user_silenced: "Si un usuario es silenciado automáticamente, enviar un mensaje a todos los moderadores." + flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia." traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea." enable_markdown_typographer: "Utilice reglas de tipografía para mejorar la legibilidad de texto: remplace citas rectas 'con comillas', (c) (tm) con símbolos, - con emdash -, etc." enable_markdown_linkify: "Trate automáticamente el texto que se ve como un enlace como un enlace: www.ejemplo.com y https://ejemplo.com se vincularán automáticamente" @@ -1241,6 +1263,7 @@ es: ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita https://google.com/analytics" ga_universal_domain_name: "Nombre del dominio establecido en Google Universal Analytics (analytics.js), ejemplo: misitio.com; visita https://google.com/analytics" ga_universal_auto_link_domains: "Habilitar el seguimiento multidominio de Google Universal Analytics (analytics.js). Enlaces salientes de estos dominios serán del client id agregados. Leer Google's Cross-Domain Tracking guide." + gtm_container_id: "Google Tag Manager container id. ejempo: GTM-ABCDEF.
Nota: los script de terceros que cargan a través de GTM puede que sea necesario ponerlos en la lista blanca en 'content security policy script src'." enable_escaped_fragments: "Ir a la API Ajax-Crawling de Google si no se detecta ningún webcrawler. Mira https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" allow_moderators_to_create_categories: "Permitir a los moderadores crear nuevas categorías" cors_origins: "Orígenes permitidos para las cross-origin requests (CORS). Cada origen debe incluir http:// or https://. La variable env DISCOURSE_ENABLE_CORS debe establecerse a verdadero para activar CORS." @@ -1252,6 +1275,8 @@ es: blacklisted_crawler_user_agents: "Palabra única insensible a mayúsculas y minúsculas en la cadena del user agent que identifica rastreadores web a los que no se debe permitir el acceso al sitio. No se aplica si se define una lista blanca." slow_down_crawler_user_agents: "User agents de rastreadores web a los que se debe aplicar una tarifa limitada en robots.txt utilizando la directiva de retardo de rastreo" slow_down_crawler_rate: "Si slow_down_crawler_user_agents es especificado, este ratio aplicará para todos los crawlers (la solicitud demora número de segundos)" + content_security_policy: "Activar la política de seguridad de contenido (CSP)" + content_security_policy_report_only: "Activar solo el informe de la política de seguridad de contenido (CPS)" content_security_policy_collect_reports: "Habilitar CSP violation report collection en /csp_reports" content_security_policy_script_src: "Fuentes adicionales de script en la lista blanca. El host actual y CDN se incluyen de forma predeterminada." invalidate_inactive_admin_email_after_days: "Las cuentas administrativas que no hayan visitado la página en este número de días deberán validar de nuevo su dirección de correo electrónico antes de iniciar sesión. Establecer a 0 para desactivar." @@ -1285,6 +1310,7 @@ es: version_checks: "Ping el Discourse Hub para actualizaciones de versión y mostrar mensajes del número de versión en el dashboard /admin." new_version_emails: "Enviar un email a la dirección contact_email cuando esté disponible una nueva versión de Discourse." invite_expiry_days: "Durante cuánto tiempo son válidas las claves de invitación de usuarios, en días" + invite_only: "Los registros públicos están desactivados, todos los nuevos usuarios deben ser invitados por usuarios de confianza o staff." login_required: "Se requiere haber iniciado sesión para leer el contenido de este sitio, deshabilita el acceso anónimo." min_username_length: "Longitud mínima del nombre de usuario en caracteres. ADVERTENCIA: si existen usuarios o grupos con nombres de menor longitud que ésta, tu sitio se romperá." max_username_length: "Longitud máxima del nombre de usuario en caracteres. ADVERTENCIA: si tienes usuarios o grupos con mayor cantidad de caracteres que ésta, tu sitio se romperá." @@ -1317,9 +1343,20 @@ es: enable_google_oauth2_logins: "Habilita la autenticación con Google Oauth2. Este es el método de autenticación a la que Google da soporte actualmente. Requiere de una clave de cliente y una clave secreta. Ver Configuring Google login for Discourse." google_oauth2_client_id: "Client ID de tu aplicación Google." google_oauth2_client_secret: "Client secret de tu aplicación Google." + google_oauth2_prompt: "Una lista opcional delimitada por espacios de valores de cadena que especifica si el servidor de autorizaciones solicita al usuario la reautenticación y el consentimiento. Ver https://developers.google.com/identity/protocols/OpenIDConnect#prompt para los valores posibles." + google_oauth2_hd: "Un dominio opcional hospedado de Google Apps al que se limitará el inicio de sesión. Ver https://developers.google.com/identity/protocols/OpenIDConnect#hd-param para más detalles." + enable_twitter_logins: "Activar autenticación por Twitter, requiere una twitter_consumer_key y un twitter_consumer_secret. Leer Configuring Twitter login (and rich embeds) for Discourse." + twitter_consumer_key: "Clave del consumidor para la autenticación de Twitter, registrado en https://developer.twitter.com/apps" + twitter_consumer_secret: "Secreto del consumidor para la autenticación de Twitter, registrado en https://developer.twitter.com/apps" enable_instagram_logins: "Activar la autenticación por Instagram, requiere instagram_consumer_key y instagram_consumer_secret" instagram_consumer_key: "Consumer key para autenticación por Instagram" instagram_consumer_secret: "Consumer secret para autenticación por Instagram" + enable_facebook_logins: "Activar autenticación por Facebook, requiere una facebook_app_id y un facebook_app_secret. Leer Configuring Facebook login for Discourse." + facebook_app_id: "App id para la autenticación por Facebook, registrado en https://developers.facebook.com/apps" + facebook_app_secret: "App secret para autenticación por Facebook, registrado en https://developers.facebook.com/apps" + enable_github_logins: "Activar autenticación por Github, requiere una github_client_id y un github_client_secret. Ver Configuring GitHub login for Discourse." + github_client_id: "Client id para la autenticación por Github, registrado en https://github.com/settings/developers" + github_client_secret: "Client secret para la autenticación por Github, registrado en https://github.com/settings/developers" readonly_mode_during_backup: "Habilitar el modo de 'solo-lectura' mientras se hace el backup" enable_backups: "Permitir a los administradores crear backups del foro" allow_restore: "Permitir restauración, la cual puede sobreescribir TODOS los datos del sitio! Dejela en falso a menos que tenga planeado recuperar sus datos desde una copia de respaldo. " @@ -1329,9 +1366,11 @@ es: s3_backup_bucket: "El bucket remoto para mantener copias de seguridad. AVISO: Asegúrate de que es un bucket privado." s3_endpoint: "El punto final se puede modificar para realizar una copia de seguridad en un servicio compatible con S3 como DigitalOcean Spaces o Minio. ADVERTENCIA: utilice el valor predeterminado si usa AWS S3" s3_force_path_style: "Haga cumplir el direccionamiento de estilo de ruta para su punto final personalizado. IMPORTANTE: se requiere para usar cargas y copias de seguridad desde Minio." + s3_configure_tombstone_policy: "Habilitar la política de eliminación automática para cargas tombstone. IMPORTANTE: si está deshabilitado, no se reclamará ningún espacio después de eliminar las cargas." s3_disable_cleanup: "Desactivar el eliminado de backups de S3 cuando se eliminen de forma local." backup_time_of_day: "Hora UTC del día cuando debería ejecutarse el backup." backup_with_uploads: "Incluir archivos adjuntos en los backups programados. Desactivando esta opción tan solo se ejecutará una copia de seguridad de la base de datos." + backup_location: "Ubicación donde se almacenan las copias de seguridad. IMPORTANTE: S3 requiere credenciales S3 válidas ingresadas en la configuración de Archivos." active_user_rate_limit_secs: "Con qué frecuencia actualizaremos el campo 'last_seen_at', en segundos" verbose_localization: "Mostrar sugerencias de localización extendida en la interface de usuario " previous_visit_timeout_hours: "Cuanto tiempo debe pasar antes de que una visita sea considerada la 'visita previa', en horas" @@ -1440,6 +1479,7 @@ es: body_min_entropy: "La mínima entropía permitida (caracteres únicos) requerida para el cuerpo de un post." allow_uppercase_posts: "Permite todas mayúsculas en el título de un tema o en el cuerpo del mensaje" max_consecutive_replies: "Número de mensajes que un usuario debe hacer seguidos antes de que se le prohíba añadir una nueva respuesta." + title_fancy_entities: "Convertir caracteres ASCII comunes en entidades HTML de adorno en el título de los temas, como SmartyPants https://daringfireball.net/projects/smartypants/" min_title_similar_length: "La extensión mínima que un título debe tener antes de revisar temas similares." desktop_category_page_style: "Estilo visual de la página de /categorías." category_colors: "Una lista de valores en hexadecimal de los colores para las categorías." @@ -1558,8 +1598,11 @@ es: email_link_color: "El color de los enlaces en el HTML de los emails. Introduce un nombre de color ('blue') o un valor hexadecimal ('#0000FF')." detect_custom_avatars: "Verificar o no que los usuarios han subido una imagen de perfil." max_daily_gravatar_crawls: "Máximo número de veces que Discourse comprobará Gravatar en busca de avatares personalizados en un día" + public_user_custom_fields: "Una lista con campos personalizados para el usuario que pueden ser traídos con el API." + staff_user_custom_fields: "Una lista con campos personalizados para el usuario que pueden ser traídos a los moderadores o admin a través del API." enable_user_directory: "Proporcionar un directorio de usuarios" enable_group_directory: "Activa un directorio de grupos para explorar" + group_in_subject: "Configura %%{optional_pm} en el título del email para nombrar el primer grupo en MP, ver: Customize subject format for standard emails" allow_anonymous_posting: "Permitir a los usuarios cambiar a modo anónimo" anonymous_posting_min_trust_level: "Nivel de confianza mínimo requerido para activar el modo anónimo" anonymous_account_duration_minutes: "Para proteger el anonimato, crear una nueva cuenta anónima cada N minutos para cada usuario. Ejemplo: si se establece en 600, tan pronto como pasen 600 minutos desde el último post Y el usuario cambie a anónimo, se creará una nueva cuenta anónima." @@ -1577,7 +1620,10 @@ es: suppress_uncategorized_badge: "No mostrar la etiqueta de los temas sin categoría en la lista de temas." header_dropdown_category_count: "Cuántas categorías pueden ser mostradas en el dropdown menú de encabezado." permalink_normalizations: "Aplicar la siguiente expresión regular antes de los enlaces, por ejemplo: /(topic.*)\\?.*/\\1 despojará las cadenas de consulta de las rutas de los temas. El formato es regex+string usa \\1 etc. para acceder a capturas" + global_notice: "Mostrar un global banner de URGENCIA o EMERGENCIA que no puedan ocultar, para todos los visitantes. Deja este campo en blanco para ocultarla (se puede utilizar código HTML)." disable_edit_notifications: "Inhabilitar editar notificaciones por el usuario system cuando 'download_remote_images_to_local' este activo." + likes_notification_consolidation_threshold: "Número de notificaciones de \"me gusta\" recibidas antes de que las notificaciones se consoliden en una sola. Pon 0 para deshabilitar. La ventana se puede configurar a través de `SiteSetting.likes_notification_consolidation_window_mins`." + likes_notification_consolidation_window_mins: "Duración en minutos donde se consolidan las notificaciones preferidas en una sola notificación una vez que se ha alcanzado el umbral. El umbral se puede configurar a través de `SiteSetting.likes_notification_consolidation_threshold`." automatically_unpin_topics: "Quitar destacado automáticamente cuando el usuario llega al final del tema." read_time_word_count: "Número de palabras por minuto para calcular el tiempo de lectura estimado." topic_page_title_includes_category: "El título de la página del tema incluye el nombre de la categoría." @@ -1594,6 +1640,7 @@ es: default_code_lang: "Lenguaje de programación por defecto para aplicar el resaltado de la sintaxis en los bloques de código de GitHub (lang-auto, ruby, python etc.)" warn_reviving_old_topic_age: "Cuando alguien publica en un tema cuya última respuesta fue hace este número de días o más, se le mostrará un aviso para desalentar el hecho de revivir una antigua discusión. Deshabilita esta opción introduciendo el valor 0." autohighlight_all_code: "Forzar el resaltado de código a los bloques de código preformateado cuando no se especifique el lenguaje del código." + highlighted_languages: "Reglas de resaltado de sintaxis incluidas. (Aviso: incluir demasiados lenguajes puede afectar al rendimiento) mira: https://highlightjs.org/static/demo para un demo." embed_truncate: "Truncar los posts embebidos." embed_support_markdown: "Soporte de formato Markdown para publicaciones incrustadas." allowed_href_schemes: "Esquemas permitidos en enlaces además de http y https." @@ -1643,7 +1690,9 @@ es: default_categories_tracking: "Lista de categorías que están seguidas por defecto" default_categories_muted: "Lista de categorías que están silenciadas por defecto." default_categories_watching_first_post: "Lista de categorías en las que el mensaje de cada nuevo tema será vigilado por defecto." + default_text_size: "Tamaño de texto seleccionado por defecto" retain_web_hook_events_period_days: "Número de días para retener registros de eventos de web hook." + retry_web_hook_events: "Reintentar automáticamente 4 veces los eventos web fallidos. Los intervalos de tiempo entre los reintentos son 1, 5, 25 y 125 minutos." allow_user_api_keys: "Permitir que se generen claves de API de usuario" allow_user_api_key_scopes: "Lista de ámbitos permitidos para las claves API de usuario" max_api_keys_per_user: "Número máximo de claves de usuario por usuario" @@ -1669,7 +1718,10 @@ es: company_name: "Nombre de Compañía" governing_law: "Ley que rige" city_for_disputes: "Ciudad de Disputas" + shared_drafts_category: "Habilite la característica de Borradores Compartidos designando una categoría para borradores de temas. Los temas de esta categoría se eliminarán de las listas de temas para los miembros del staff." push_notifications_prompt: "Mostrar aviso del consentimiento del usuario." + push_notifications_icon: "El icono de la insignia que aparece en la esquina de notificación. El tamaño requerido es de 96 × 96." + short_title: "El título breve se utilizará en la pantalla de inicio del usuario, el iniciador u otros lugares donde el espacio puede ser limitado. Debe estar limitado a 12 caracteres." dashboard_general_tab_activity_metrics: "Selecciona qué reportes se mostrarán como medidas de actividad en la pestaña general." errors: invalid_email: "Dirección de correo electrónico inválida. " @@ -1700,7 +1752,9 @@ es: reply_by_email_disabled: "Primero debes habilitar 'reply by email' antes de habilitar esta configuración." sso_url_is_empty: "Debe establecer una 'sso url' antes de habilitar esta configuración." enable_local_logins_disabled: "Primero debes habilitar 'enable local logins'  antes de habilitar esta configuración." + min_username_length_exists: "No puede establecer la longitud de usuario mínima por encima del nombre de usuario más corto (%{username})" min_username_length_range: "No puedes establecer el mínimo por encima del máximo." + max_username_length_exists: "No puede establecer la longitud de usuario máxima por debajo del nombre de usuario más largo (%{username})." max_username_length_range: "No puedes establecer el máximo por debajo del mínimo." placeholder: sso_provider_secrets: @@ -1974,12 +2028,79 @@ es: test_mailer: title: "Mail de prueba" subject_template: "[%{email_prefix}] Prueba de envío de email" + text_body_template: | + Este es un correo electrónico de prueba de + + [**%{base_url}**][0] + + La entrega de correo electrónico es complicada. Aquí hay unas cuantas cosas importantes que deberías comprobar primero: + + - *Asegúrate* de configurar la dirección correctamente en los ajustes de tu sitio de `notification email`. **El dominio especificado en la dirección "from" de los emails que envíes es el dominio contra el que se validará tu email**. + + - Entérate de como ver el código fuente del email desde tu cliente de correo, para que así puedas examinar las cabeceras para ver pistas importantes. En Gmail está la opción "mostrar original" en el menú de lista desplegable en la parte superior derecha de cada email. + + - **IMPORTANTE:** ¿Tu ISP tiene registros de DNS inversa para asociar los nombres de dominio y las direcciones IP desde donde envías los correos? [Comprueba tu registro PTR Inverso][2] aquí. Si tu ISP no introduce el puntero de registro DNS inverso adecuado, es muy improbable que cualquiera de tus correos pueda ser entregado. + + - ¿Es el [registro SPF][8] de tu dominio correcto? [Comprueba tu registro SPF][1] aquí. Ten en cuenta que TXT es el tipo de registro oficial correcto para SPF. + + - ¿Es el [registro DKIM][3] de tu dominio correcto? Esto puede mejorar significativamente la entregabilidad de correos. [Comprueba tu registro DKIM][7] aquí. + + - Si estás corriendo tu propio servidor de correo, asegúrate de que las IPs de tu servidor de correo [no están en ninguna lista negra de correos][4]. También verifica que definitivamente se está enviando un nombre de huésped "hostname" completamente cualificado que resuelva en DNS en su mensaje HELO. Si no es así, esto causará que tu correo sea denegado por muchos servicios de correo. + + - Recomendamos **enviar un email de prueba a [mail-tester.com][mt]** para verificar que todo está funcionando correctamente. + + (La forma *fácil* es crear una cuenta gratuita en [Sendgrip][sg], [SparkPost][sp], [Mailgun][mg] o [Mailjet][mj], que proveen generosamente planes de mailing gratuitos y serán adecuados para pequeñas comunidades. ¡De todas formas todavía tendrás que configurar los registros SPF y DKIM en tus DNS!) + + ¡Esperamos que recibas esta prueba de entregabilidad de correo electrónico correctamente! + + Buena suerte, + + Tus amigos de [Discourse](https://www.discourse.org) + + [0]: %{base_url} + [1]: https://www.kitterman.com/spf/validate.html + [2]: https://mxtoolbox.com/ReverseLookup.aspx + [3]: https://www.dkim.org/ + [4]: https://whatismyipaddress.com/blacklist-check + [7]: https://www.mail-tester.com/spf-dkim-check + [8]: http://www.openspf.org/SPF_Record_Syntax + [sg]: https://goo.gl/r1WMF6 + [sp]: https://www.sparkpost.com/ + [mg]: https://www.mailgun.com/ + [mj]: https://www.mailjet.com/pricing + [mt]: https://www.mail-tester.com/ new_version_mailer: title: "Email de Nueva versión" subject_template: "[%{email_prefix}] Nueva versión de Discourse, actualización disponible" + text_body_template: | + ¡Genial, una nueva versión de [Discourse](https://www.discourse.org) está disponible! + + Tu versión: %{installed_version} + Nueva versión: **%{new_version}** + + - Actualiza usando nuestro sencillo **[sistema de un clic para actualizar](%{base_url}/admin/upgrade)** + + - Echa un vistazo a los cambios en [las notas de versión](https://meta.discourse.org/tags/release-notes) o en el [changelog de GitHub](https://github.com/discourse/discourse/commits/master) + + - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, debates y ayuda para Discourse. new_version_mailer_with_notes: title: "Email de Nueva versión con notas" subject_template: "[%{email_prefix}] actualización disponible" + text_body_template: | + ¡Genial, una nueva versión de [Discourse](https://www.discourse.org) está disponible! + + Tu versión: %{installed_version} + Nueva versión: **%{new_version}** + + - Actualiza usando nuestro sencillo **[sistema de un clic para actualizar](%{base_url}/admin/upgrade)** + + - Echa un vistazo a los cambios en [las notas de versión](https://meta.discourse.org/tags/release-notes) o en el [changelog de GitHub](https://github.com/discourse/discourse/commits/master) + + - Visita [meta.discourse.org](https://meta.discourse.org) para noticias, debates y ayuda para Discourse. + + ### Detalles de la versión + + %{notes} flag_reasons: off_topic: "Tu post fue reportado como **off-topic**: la comunidad piensa que no se ajusta debidamente al tema, definido por el título o el primer post." inappropriate: "Tu post fue reportado como **inapropiado**: la comunidad piensa que es ofensivo, abusivo o que vulnera alguna de [nuestros consejos de uso](%{base_path}/guidelines)." @@ -2032,6 +2153,22 @@ es: flags_agreed_and_post_deleted: title: "Tema reportado y eliminado por el staff" subject_template: "Tema reportado y eliminado por el staff" + text_body_template: | + Hola, + + Esto es un mensaje automático de %{site_name} para hacerte saber que [tu publicación](%{base_url}%{url}) ha sido eliminada. + + %{flag_reason} + + La publicación ha sido reportada por la comunidad y un miembro del equipo de la página ha decidido eliminarlo. + + [details="Haz clic para expandir la publicación eliminada"] + ``` markdown + %{flagged_post_raw_content} + ``` + [/details] + + Por favor, revisa las [directrices de la comunidad](%{base_url}/guidelines) para más información. usage_tips: text_body_template: | Si quieres unos consejos para empezar, [echa un vistazo a esta entrada de blog](https://blog.discourse.org/2016/12/discourse-new-user-tips-and-tricks/). @@ -2077,15 +2214,49 @@ es: backup_succeeded: title: "Copia de seguridad completada con éxito" subject_template: "La copia de seguridad se completo exitosamente" + text_body_template: | + Copia de seguridad realizada con éxito. + + Visita la sección [admin > copias de seguridad](%{base_url}/admin/backups) para descargar tu nuevo backup. + + Aquí está el registro: + + ```text + %{logs} + ``` backup_failed: title: "Error en la copia de seguridad" subject_template: "La copia de seguridad falló" + text_body_template: | + La copia de seguridad ha fallado. + + Aquí está el registro: + + ```text + %{logs} + ``` restore_succeeded: title: "Restauración completada con éxito" subject_template: "Restauración completada exitosamente." + text_body_template: | + La restauración se ha completado con éxito. + + Aquí está el registro: + + ```text + %{logs} + ``` restore_failed: title: "Error en la restauración" subject_template: "La restauración falló." + text_body_template: | + La restauración ha fallado. + + Aquí está el registro: + + ```text + %{logs} + ``` bulk_invite_succeeded: title: "Invitación en masa completada con éxito" subject_template: "Invitación masiva procesada con éxito" @@ -2093,6 +2264,14 @@ es: bulk_invite_failed: title: "Error en la invitación en masa" subject_template: "Invitación masiva procesada con algunos errores" + text_body_template: | + Tu archivo de invitación masiva ha sido procesada, se han enviado %{sent} invitaciones con %{failed} error(es). + + Este es el registro: + + ```text + %{logs} + ``` csv_export_succeeded: title: "Exportación de datos en CSV completada con éxito" subject_template: "[%{export_title}] exportación de datos completa" @@ -2312,6 +2491,14 @@ es: Lo sentimos, pero estamos teniendo problemas para contactarte por correo. Nuestros últimos mensajes nos han sido devueltos como imposibles de entregar. ¿Podrías comprobar que [tu dirección de email](%{base_url}/my/preferences/email) es válida y funciona? También puedes añadir nuestra dirección a tu agenda para mejorar la entregabilidad. + email_bounced: | + El mensaje a %{email} ha rebotado. + + ### Detalles + + ```text + %{raw} + ``` too_many_spam_flags: title: "Demasiadas banderas por Spam" subject_template: "Nueva cuenta retenida" @@ -2363,6 +2550,14 @@ es: spam_post_blocked: title: "Post con Spam Bloqueado" subject_template: "Nuevo usuario %{username} posts bloqueados debido a repetición de enlaces." + text_body_template: | + Este es un mensaje automático. + + El usuario nuevo [%{username}](%{user_url}) ha intentado crear múltiples temas con enlaces a %{domains}, pero han sido bloqueados para evitar spam. El usuario todavía puede crear temas, siempre y cuando no contengan enlaces a %{domains}. + + Por favor, [echa un vistazo al usuario](%{user_url}). + + Esto puede ser modificado con los ajustes `newuser_spam_host_threshold` y `white_listed_spam_host_domains`. Considera agregar los %{domains} a la lista blanca para que queden exceptuados. unsilenced: title: "Dejar de silenciar" subject_template: "Cuenta no retenida" @@ -2396,13 +2591,12 @@ es: new_user_of_the_month: title: "¡Eres el Nuevo Usuario del Mes!" subject_template: "¡Eres el Nuevo Usuario del Mes!" - text_body_template: |2 + text_body_template: | + ¡Enhorabuena, has ganado el **premio Nuevo Usuario del Mes para %{month_year}**. :trophy:! - ¡Felicitaciones, has ganado el **premio Nuevo Usuario del Mes para %{month_year}**. :trophy: ! + Este premio solo lo ganan dos de los nuevos miembros de cada mes, y será visible permanentemente en [la página de distintivos](%{url}). - Este premio solo lo ganan dos de los nuevos miembros por mes, y será visible permanentemente en [la página de distintivos](%{url}). - - Te has convertido rápidamente en un miembro de valor para nuestra comunidad. ¡Gracias por unirte, y sigue con este excelente trabajo! + Te has convertido rápidamente en un miembro de gran valor para nuestra comunidad. ¡Gracias por unirte, y sigue así! queued_posts_reminder: title: "Recordatorio de post en revisión" subject_template: @@ -2841,6 +3035,9 @@ es: ## [Bienvenido a %{title}](#welcome) Hace falta una cuenta para usar el sitio. Por favor crea una o inicia sesión para continuar. + welcome_message_invite_only: | + ## [Te damos la bienvenida a %{title}](#welcome) + Hace falta una cuenta para continuar. Por favor, pídele a uno de los miembros actuales que te invite o inicia sesión. terms_of_service: title: "Condiciones Generales de Uso" signup_form_message: 'He leído y acepto los Términos del Servicio.' @@ -3029,6 +3226,102 @@ es: Sí, estos temas aburren, pero debemos protegernos – y, por extensión, a ti y a tus datos – frente a gente poco amigable. Tenemos unos [Términos del Servicio](%{base_path}/tos) que describen nuestra forma de actuar (y la tuya), y los derechos con relación al contenido, la privacidad y las leyes, Para usar nuestros servicios, debes aceptar nuestros [Términos y Condiciones](%{base_path}/tos). tos_topic: title: "Términos de Servicio" + body: | + Estos términos regulan el uso del foro de Internet en <%{base_url}>. Para utilizar el foro, debe aceptar estos términos con %{company_name}, la compañía que maneja este foro. + La compañía puede ofrecer otros productos y servicios, bajo diferentes términos. Estos términos se aplican únicamente al uso del foro. + Saltar a: + - [Términos Importantes](#heading--terminos-importantes) + - [Tus permisos para usar el foro](#heading--permisos) + - [Condiciones para usar el foro](#heading--condiciones) + - [Uso Aceptable](#heading--uso-aceptable) + - [Estándares de Contenido](#heading--estandares-contenido) + - [Ley Aplicable](#heading--enforcement) + - [Tu cuenta](#heading--tu-cuenta) + - [Tu contenido](#heading--tu-contenido) + - [Tu Responsabilidad](#heading--tu-responsabilidad) + - [Renuncias](#heading--renuncias) + - [Límites de Responsabilidad](#heading--limites-responsabilidad) + - [Retroalimentación](#heading--feedback) + - [Terminación](#heading--terminacion) + - [Disputas](#heading--disputas) + - [Términos Generales](#heading--general) + - [Contacto](#heading--contacto) + - [Cambios](#heading--cambios) +

Términos Importantes

+ ***Estos términos incluyen una serie de disposiciones importantes que afectan sus derechos y responsabilidades, como las exenciones de responsabilidad en [Descargo de responsabilidad](#heading--renuncias), límites de la responsabilidad de la empresa con usted en [Límites de responsabilidad](#heading--limites-responsabilidad), su acuerdo de cubrir a la compañía por los daños causados ​​por su mal uso del foro en [Responsabilidad de su uso](#heading--tu-responsabilidad), y un acuerdo para arbitrar disputas en [Disputes](#heading--disputas).*** +

Tus permisos para usar el foro

+ Sujeto a estos términos, la compañía le da permiso para usar el foro. Todos deben aceptar estos términos para utilizar el foro. +

Condiciones para el uso del foro

+ Su permiso para utilizar el foro está sujeto a las siguientes condiciones: + 1. Debes tener al menos trece años de edad. + 2. Ya no puede usar el foro si la compañía lo contacta directamente para decirle que no puede. + 3. Debe utilizar el foro de acuerdo con [Uso aceptable](#heading--uso-aceptable) y [Estándares de Contenido](#heading--estandares-contenido). +

Uso Aceptable

+ 1. No puedes violar la ley usando el foro. + 2. No puede usar o intentar usar la cuenta de otra persona en el foro sin su permiso específico. + 3. No puede comprar, vender o intercambiar nombres de usuario u otros identificadores únicos en el foro. + 4. No puede enviar anuncios publicitarios, cartas en cadena u otras solicitudes a través del foro, o utilizar el foro para recopilar direcciones u otros datos personales para listas de correo comerciales o bases de datos. + 5. No puede automatizar el acceso al foro, ni monitorear el foro, como con un rastreador web, un complemento o complemento del navegador u otro programa de computadora que no sea un navegador web. Puede rastrear el foro para indexarlo para un motor de búsqueda disponible públicamente, si ejecuta uno. + 6. No puede usar el foro para enviar correos electrónicos a listas de distribución, grupos de noticias o alias de correo grupales. + 7. No puede implicar falsamente que está afiliado o respaldado por la compañía. + 8. No puede hacer hipervínculo a imágenes u otro contenido que no sea hipertexto en el foro en otras páginas web. + 9. No puede eliminar ninguna marca que demuestre propiedad exclusiva de los materiales que descargue del foro. + 10. No puede mostrar ninguna parte del foro en otros sitios web con `