From e234a7821d9b7c429f4dde49268c1cad1da7e94e Mon Sep 17 00:00:00 2001 From: ElTipejoLoco Date: Fri, 17 Mar 2017 08:05:21 -0500 Subject: [PATCH 001/124] Add "Show tracked topics" to User Preferences Does what it says on the tin. Minor clean-up. --- app/assets/javascripts/discourse/models/user.js.es6 | 5 +++++ app/assets/javascripts/discourse/templates/preferences.hbs | 4 +++- config/locales/client.en.yml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 5086c54cbc..7fecf9eb30 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -146,6 +146,11 @@ const User = RestModel.extend({ return defaultHomepage() === "latest" ? Discourse.getURL('/?state=watching') : Discourse.getURL('/latest?state=watching'); }, + @computed() + trackingTopicsPath() { + return defaultHomepage() === "latest" ? Discourse.getURL('/?state=tracking') : Discourse.getURL('/latest?state=tracking'); + }, + @computed("username") username_lower(username) { return username.toLowerCase(); diff --git a/app/assets/javascripts/discourse/templates/preferences.hbs b/app/assets/javascripts/discourse/templates/preferences.hbs index 4be554bdf6..6fea4f7f6f 100644 --- a/app/assets/javascripts/discourse/templates/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/preferences.hbs @@ -263,12 +263,14 @@
{{i18n 'user.watched_topics_link'}}
-
{{category-selector categories=model.trackedCategories blacklist=selectedCategories}}
{{i18n 'user.tracked_categories_instructions'}}
+
+ {{i18n 'user.tracked_topics_link'}} +
{{category-selector categories=model.watchedFirstPostCategories}} diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index cd3f3d15b1..6c500a5984 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -627,6 +627,7 @@ en: muted_users_instructions: "Suppress all notifications from these users." muted_topics_link: "Show muted topics" watched_topics_link: "Show watched topics" + tracked_topics_link: "Show tracked topics" automatically_unpin_topics: "Automatically unpin topics when I reach the bottom." apps: "Apps" revoke_access: "Revoke Access" From d073f582eb242d086af0970940281816985f9691 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Fri, 24 Mar 2017 09:19:25 +1300 Subject: [PATCH 002/124] Allow plugins to add panels to header more easily --- app/assets/javascripts/discourse/widgets/header.js.es6 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 1f66b5eec6..78017055b8 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -214,6 +214,8 @@ export default createWidget('header', { panels.push(this.attach('user-menu')); } + this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel) }) + const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), h('div.panel.clearfix', panels) ]; @@ -224,6 +226,11 @@ export default createWidget('header', { return h('div.wrap', h('div.contents.clearfix', contents)); }, + // override to allow plugins to append additional panels + additionalPanels(attrs, state) { + return [] + }, + updateHighlight() { if (!this.state.searchVisible) { const service = this.register.lookup('search-service:main'); From 569785c55529c22a9046ad0ba14929024d6b5293 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Fri, 24 Mar 2017 09:48:51 +1300 Subject: [PATCH 003/124] Add semicolon --- app/assets/javascripts/discourse/widgets/header.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 78017055b8..8f5a9bfde4 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -214,7 +214,7 @@ export default createWidget('header', { panels.push(this.attach('user-menu')); } - this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel) }) + this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel) }); const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), h('div.panel.clearfix', panels) ]; From 9f969b402e0b7df8f05965bd10623a1a8405bc73 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Fri, 24 Mar 2017 09:54:53 +1300 Subject: [PATCH 004/124] More stylistic fixes --- app/assets/javascripts/discourse/widgets/header.js.es6 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 8f5a9bfde4..a2a4ce3979 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -214,7 +214,7 @@ export default createWidget('header', { panels.push(this.attach('user-menu')); } - this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel) }); + this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel); }); const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), h('div.panel.clearfix', panels) ]; @@ -227,8 +227,8 @@ export default createWidget('header', { }, // override to allow plugins to append additional panels - additionalPanels(attrs, state) { - return [] + additionalPanels() { + return []; }, updateHighlight() { From a4127a8f71dcf91e749dbc0b7cee9dfdd0c9bc22 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Sat, 25 Mar 2017 21:33:55 +1300 Subject: [PATCH 005/124] Add addAdditionalHeader widget to pluginApi --- .../discourse/lib/plugin-api.js.es6 | 19 ++++++++++++++++++- .../discourse/widgets/header.js.es6 | 16 ++++++++++------ 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 0b3e85739b..ca1d1ce289 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -18,9 +18,10 @@ import { addTagsHtmlCallback } from 'discourse/lib/render-tags'; import { addUserMenuGlyph } from 'discourse/widgets/user-menu'; import { addPostClassesCallback } from 'discourse/widgets/post'; import { addPostTransformCallback } from 'discourse/widgets/post-stream'; +import { queryRegistry } from 'discourse/widgets/widget'; // If you add any methods to the API ensure you bump up this number -const PLUGIN_API_VERSION = '0.8.5'; +const PLUGIN_API_VERSION = '0.8.6'; class PluginApi { constructor(version, container) { @@ -333,6 +334,22 @@ class PluginApi { return addFlagProperty(property); } + /** + * Adds a panel to the header + * + * takes a widget name, a value to toggle on, and a function which returns the attrs for the widget + * Example: + * ```javascript + * api.addHeaderPanel('widget-name', 'widgetVisible', function(attrs, state) { return {}; }); + * ``` + * note that 'toggle' is an attribute on the state of the header widget, + * and the attrFn receives the current attrs and state of the header as arguments, + * and returns a hash of attrs to pass to the widget + **/ + addHeaderPanel(name, toggle, attrFn) { + queryRegistry('header').prototype.attachAdditionalPanel(name, toggle, attrFn) + } + /** * Adds a pluralization to the store * diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index a2a4ce3979..842e0674f2 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -169,6 +169,7 @@ const forceContextEnabled = ['category', 'user', 'private_messages']; export default createWidget('header', { tagName: 'header.d-header.clearfix', buildKey: () => `header`, + additionalPanels: [], defaultState() { let states = { @@ -185,6 +186,10 @@ export default createWidget('header', { return states; }, + attachAdditionalPanel(name, toggle, attrFn) { + this.additionalPanels.push({ name, toggle, attrFn }) + }, + html(attrs, state) { const panels = [this.attach('header-buttons', attrs), this.attach('header-icons', { hamburgerVisible: state.hamburgerVisible, @@ -214,7 +219,11 @@ export default createWidget('header', { panels.push(this.attach('user-menu')); } - this.additionalPanels(attrs, state).map(function(panel) { panels.push(panel); }); + this.additionalPanels.map((panel) => { + if (this.state[panel.toggle]) { + panels.push(this.attach(panel.name, panel.attrFn.call(this, attrs, state))); + } + }); const contents = [ this.attach('home-logo', { minimized: !!attrs.topic }), h('div.panel.clearfix', panels) ]; @@ -226,11 +235,6 @@ export default createWidget('header', { return h('div.wrap', h('div.contents.clearfix', contents)); }, - // override to allow plugins to append additional panels - additionalPanels() { - return []; - }, - updateHighlight() { if (!this.state.searchVisible) { const service = this.register.lookup('search-service:main'); From c99883cf656fcfdbe186aa2a446f98f5cf6d4aa2 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Sat, 25 Mar 2017 21:44:28 +1300 Subject: [PATCH 006/124] SEMICOLONS ;.; --- app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 2 +- app/assets/javascripts/discourse/widgets/header.js.es6 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index ca1d1ce289..91603a7f0c 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -347,7 +347,7 @@ class PluginApi { * and returns a hash of attrs to pass to the widget **/ addHeaderPanel(name, toggle, attrFn) { - queryRegistry('header').prototype.attachAdditionalPanel(name, toggle, attrFn) + queryRegistry('header').prototype.attachAdditionalPanel(name, toggle, attrFn); } /** diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index 842e0674f2..ec93b0f230 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -187,7 +187,7 @@ export default createWidget('header', { }, attachAdditionalPanel(name, toggle, attrFn) { - this.additionalPanels.push({ name, toggle, attrFn }) + this.additionalPanels.push({ name, toggle, attrFn }); }, html(attrs, state) { From 322ed7124ee96ea6f2f42e737b1aff95e4e7c6e8 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Tue, 28 Mar 2017 23:42:26 +0530 Subject: [PATCH 007/124] UX: add a link to bulk invite howto --- app/assets/javascripts/discourse/templates/user-invited-show.hbs | 1 + 1 file changed, 1 insertion(+) diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index fc8657b0d4..0a78d6e64f 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -17,6 +17,7 @@ {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} {{#if canBulkInvite}} {{csv-uploader uploading=uploading}} + {{fa-icon "question-circle"}} {{/if}} {{#if showReinviteAllButton}} {{#if reinvitedAll}} From f3540332a880f1a92842e6b1563360892fd42389 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 28 Mar 2017 16:28:26 -0400 Subject: [PATCH 008/124] FIX: Topic title wasn't showing properly when entering lower in topics --- .../discourse/components/discourse-topic.js.es6 | 5 ++++- .../discourse/components/topic-entrance.js.es6 | 8 ++++++-- .../javascripts/discourse/models/post-stream.js.es6 | 4 ++++ 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 index 5a07d9516d..4c717b3049 100644 --- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 @@ -142,7 +142,10 @@ export default Ember.Component.extend(AddArchetypeClass, Scrolling, { this.appEvents.trigger('header:show-topic', topic); } else { if (!DiscourseURL.isJumpScheduled()) { - this.appEvents.trigger('header:hide-topic'); + const loadingNear = topic.get('postStream.loadingNearPost') || 1; + if (loadingNear === 1) { + this.appEvents.trigger('header:hide-topic'); + } } } } diff --git a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 b/app/assets/javascripts/discourse/components/topic-entrance.js.es6 index d3b5983ce4..6e4ba25d14 100644 --- a/app/assets/javascripts/discourse/components/topic-entrance.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-entrance.js.es6 @@ -94,11 +94,15 @@ export default Ember.Component.extend(CleansUp, { actions: { enterTop() { - DiscourseURL.routeTo(this.get('topic.url')); + const topic = this.get('topic'); + this.appEvents.trigger('header:update-topic', topic); + DiscourseURL.routeTo(topic.get('url')); }, enterBottom() { - DiscourseURL.routeTo(this.get('topic.lastPostUrl')); + const topic = this.get('topic'); + this.appEvents.trigger('header:update-topic', topic); + DiscourseURL.routeTo(topic.get('lastPostUrl')); } } }); diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 32cfa6427f..0e9a586303 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -15,6 +15,7 @@ export default RestModel.extend({ loadingAbove: null, loadingBelow: null, loadingFilter: null, + loadingNearPost: null, stagingPost: null, postsWithPlaceholders: null, timelineLookup: null, @@ -206,6 +207,7 @@ export default RestModel.extend({ // TODO: if we have all the posts in the filter, don't go to the server for them. this.set('loadingFilter', true); + this.set('loadingNearPost', opts.nearPost); opts = _.merge(opts, this.get('streamFilters')); @@ -216,6 +218,8 @@ export default RestModel.extend({ }).catch(result => { this.errorLoading(result); throw result; + }).finally(() => { + this.set('loadingNearPost', null); }); }, From 86f11955cf931f536a3f646ffd1a755c8a8b7629 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 28 Mar 2017 17:05:07 -0400 Subject: [PATCH 009/124] FIX: Clicking on the title was doubling up the title --- app/assets/javascripts/discourse/lib/url.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 203126a6c8..e4dbd44f03 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -47,8 +47,8 @@ const DiscourseURL = Ember.Object.extend({ opts = opts || {}; const holderId = `#post_${postNumber}`; - _transitioning = true; - Em.run.schedule('afterRender', () => { + _transitioning = postNumber > 1; + Ember.run.schedule('afterRender', () => { let elementId; let holder; From 3b55ceffb39b6d1bc27effb31aa7167e8f526df4 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Wed, 29 Mar 2017 08:52:50 +0900 Subject: [PATCH 010/124] Use local var for additionalPanels --- .../discourse/lib/plugin-api.js.es6 | 19 ++++++++++++------- .../discourse/widgets/header.js.es6 | 13 +++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 91603a7f0c..1bc7638c83 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -18,7 +18,8 @@ import { addTagsHtmlCallback } from 'discourse/lib/render-tags'; import { addUserMenuGlyph } from 'discourse/widgets/user-menu'; import { addPostClassesCallback } from 'discourse/widgets/post'; import { addPostTransformCallback } from 'discourse/widgets/post-stream'; -import { queryRegistry } from 'discourse/widgets/widget'; +import { attachAdditionalPanel } from 'discourse/widgets/header'; + // If you add any methods to the API ensure you bump up this number const PLUGIN_API_VERSION = '0.8.6'; @@ -340,14 +341,18 @@ class PluginApi { * takes a widget name, a value to toggle on, and a function which returns the attrs for the widget * Example: * ```javascript - * api.addHeaderPanel('widget-name', 'widgetVisible', function(attrs, state) { return {}; }); + * api.addHeaderPanel('widget-name', 'widgetVisible', function(attrs, state) { + * return { name: attrs.name, description: state.description }; + * }); * ``` - * note that 'toggle' is an attribute on the state of the header widget, - * and the attrFn receives the current attrs and state of the header as arguments, - * and returns a hash of attrs to pass to the widget + * 'toggle' is an attribute on the state of the header widget, + * + * 'transformAttrs' is a function which is passed the current attrs and state of the widget, + * and returns a hash of values to pass to attach + * **/ - addHeaderPanel(name, toggle, attrFn) { - queryRegistry('header').prototype.attachAdditionalPanel(name, toggle, attrFn); + addHeaderPanel(name, toggle, transformAttrs) { + attachAdditionalPanel(name, toggle, transformAttrs); } /** diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index ec93b0f230..c90954978f 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -166,6 +166,11 @@ createWidget('header-buttons', { const forceContextEnabled = ['category', 'user', 'private_messages']; +let additionalPanels = [] +export function attachAdditionalPanel(name, toggle, transformAttrs) { + additionalPanels.push({ name, toggle, transformAttrs }); +} + export default createWidget('header', { tagName: 'header.d-header.clearfix', buildKey: () => `header`, @@ -186,10 +191,6 @@ export default createWidget('header', { return states; }, - attachAdditionalPanel(name, toggle, attrFn) { - this.additionalPanels.push({ name, toggle, attrFn }); - }, - html(attrs, state) { const panels = [this.attach('header-buttons', attrs), this.attach('header-icons', { hamburgerVisible: state.hamburgerVisible, @@ -219,9 +220,9 @@ export default createWidget('header', { panels.push(this.attach('user-menu')); } - this.additionalPanels.map((panel) => { + additionalPanels.map((panel) => { if (this.state[panel.toggle]) { - panels.push(this.attach(panel.name, panel.attrFn.call(this, attrs, state))); + panels.push(this.attach(panel.name, panel.transformAttrs.call(this, attrs, state))); } }); From 7cf0f39066ef76444795299aacf03a7a318536f0 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 29 Mar 2017 11:10:25 +0800 Subject: [PATCH 011/124] Require `Sidekiq::Testing` in rails helper. --- spec/integration/topic_auto_close_spec.rb | 1 - spec/jobs/jobs_spec.rb | 2 -- spec/models/discourse_single_sign_on_spec.rb | 1 - spec/models/web_hook_spec.rb | 1 - spec/rails_helper.rb | 1 + 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spec/integration/topic_auto_close_spec.rb b/spec/integration/topic_auto_close_spec.rb index c69d710832..c57c505c65 100644 --- a/spec/integration/topic_auto_close_spec.rb +++ b/spec/integration/topic_auto_close_spec.rb @@ -1,7 +1,6 @@ # encoding: UTF-8 require 'rails_helper' -require 'sidekiq/testing' describe Topic do diff --git a/spec/jobs/jobs_spec.rb b/spec/jobs/jobs_spec.rb index 64de988b71..a5e6203ac3 100644 --- a/spec/jobs/jobs_spec.rb +++ b/spec/jobs/jobs_spec.rb @@ -1,4 +1,3 @@ -require "sidekiq/testing" require 'rails_helper' require_dependency 'jobs/base' @@ -123,4 +122,3 @@ describe Jobs do end end - diff --git a/spec/models/discourse_single_sign_on_spec.rb b/spec/models/discourse_single_sign_on_spec.rb index 534cfb857f..fedab67aba 100644 --- a/spec/models/discourse_single_sign_on_spec.rb +++ b/spec/models/discourse_single_sign_on_spec.rb @@ -1,5 +1,4 @@ require "rails_helper" -require 'sidekiq/testing' describe DiscourseSingleSignOn do before do diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb index f71ac30e11..d65641ea7e 100644 --- a/spec/models/web_hook_spec.rb +++ b/spec/models/web_hook_spec.rb @@ -1,5 +1,4 @@ require 'rails_helper' -require 'sidekiq/testing' describe WebHook do it { is_expected.to validate_presence_of :payload_url } diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index d6a66b9ee7..cc2ac9b91b 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -25,6 +25,7 @@ Spork.prefork do require File.expand_path("../../config/environment", __FILE__) require 'rspec/rails' require 'shoulda' + require 'sidekiq/testing' # Requires supporting ruby files with custom matchers and macros, etc, # in spec/support/ and its subdirectories. From bb0fa5abbc6da2ad32ec52264796ee78d1cf3a45 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 29 Mar 2017 18:19:28 +0530 Subject: [PATCH 012/124] FIX: suggested username should not be more than setting max_username_length --- lib/user_name_suggester.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/user_name_suggester.rb b/lib/user_name_suggester.rb index f26b3f36d1..2069113cfd 100644 --- a/lib/user_name_suggester.rb +++ b/lib/user_name_suggester.rb @@ -28,7 +28,7 @@ module UserNameSuggester i += 1 end until attempt == allow_username || User.username_available?(attempt) || i > 200 - attempt = SecureRandom.hex[0..SiteSetting.max_username_length] + attempt = SecureRandom.hex[1..SiteSetting.max_username_length] i += 1 end attempt From 3914f746b882bc3e78c72089098c615cb4974e66 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 29 Mar 2017 13:03:35 -0400 Subject: [PATCH 013/124] FIX: Missing semicolon --- app/assets/javascripts/discourse/widgets/header.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index c90954978f..f0d522bc00 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -166,7 +166,7 @@ createWidget('header-buttons', { const forceContextEnabled = ['category', 'user', 'private_messages']; -let additionalPanels = [] +let additionalPanels = []; export function attachAdditionalPanel(name, toggle, transformAttrs) { additionalPanels.push({ name, toggle, transformAttrs }); } From cd2d2f16e5c2164a5f32bf2683e42f9316775f7a Mon Sep 17 00:00:00 2001 From: Yana Agun Siswanto Date: Thu, 30 Mar 2017 00:33:23 +0700 Subject: [PATCH 014/124] Allow to order search results by the topic creation date based on: https://meta.discourse.org/t/allow-to-order-search-results-by-the-topic-creation-date/38544 --- .../controllers/full-page-search.js.es6 | 6 +++++- config/locales/client.en.yml | 1 + lib/search.rb | 9 ++++++++ spec/components/search_spec.rb | 21 +++++++++++++++++++ 4 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index 91e5b907d2..c6379ba1ab 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -11,6 +11,8 @@ const SortOrders = [ {name: I18n.t('search.latest_post'), id: 1, term: 'order:latest'}, {name: I18n.t('search.most_liked'), id: 2, term: 'order:likes'}, {name: I18n.t('search.most_viewed'), id: 3, term: 'order:views'}, + {name: I18n.t('search.latest_topic'), id: 4, term: 'order:latest_topic'}, + ]; export default Ember.Controller.extend({ @@ -90,7 +92,9 @@ export default Ember.Controller.extend({ this._searchOnSortChange = false; if (term) { SortOrders.forEach(order => { - if (term.indexOf(order.term) > -1){ + let term_start = term.indexOf(order.term) + let char_after_term = term[term_start + (order.term || '').length] + if (term_start > -1 && (!char_after_term || char_after_term.match(/\s/))){ this.set('sortOrder', order.id); term = term.replace(order.term, ""); term = term.trim(); diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 85ad37d345..20c77e4535 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1276,6 +1276,7 @@ en: sort_by: "Sort by" relevance: "Relevance" latest_post: "Latest Post" + latest_topic: "Latest Topic" most_viewed: "Most Viewed" most_liked: "Most Liked" select_all: "Select All" diff --git a/lib/search.rb b/lib/search.rb index 7c055e0a40..81c924df44 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -477,6 +477,9 @@ class Search if word == 'order:latest' @order = :latest nil + elsif word == 'order:latest_topic' + @order = :latest_topic + nil elsif word =~ /topic:(\d+)/ topic_id = $1.to_i if topic_id > 1 @@ -680,6 +683,12 @@ class Search else posts = posts.order("posts.created_at DESC") end + elsif @order == :latest_topic + if opts[:aggregate_search] + posts = posts.order("MAX(topics.created_at) DESC") + else + posts = posts.order("topics.created_at DESC") + end elsif @order == :views if opts[:aggregate_search] posts = posts.order("MAX(topics.views) DESC") diff --git a/spec/components/search_spec.rb b/spec/components/search_spec.rb index 0cf29c59aa..892e5b3dd9 100644 --- a/spec/components/search_spec.rb +++ b/spec/components/search_spec.rb @@ -613,7 +613,28 @@ describe Search do expect(Search.execute('sam').posts.map(&:id)).to eq([post1.id, post2.id]) expect(Search.execute('sam order:latest').posts.map(&:id)).to eq([post2.id, post1.id]) + end + it 'can order by topic creation' do + today = Date.today + yesterday = 1.day.ago + two_days_ago = 2.days.ago + + old_topic = Fabricate(:topic, + title: 'First Topic, testing the created_at sort', + created_at: two_days_ago) + latest_topic = Fabricate(:topic, + title: 'Second Topic, testing the created_at sort', + created_at: yesterday) + + old_relevant_topic_post = Fabricate(:post, topic: old_topic, created_at: yesterday, raw: 'Relevant Topic') + latest_irelevant_topic_post = Fabricate(:post, topic: latest_topic, created_at: today, raw: 'Not Relevant') + + # Expecting the default results + expect(Search.execute('Topic').posts.map(&:id)).to eq([old_relevant_topic_post.id, latest_irelevant_topic_post.id]) + + # Expecting the ordered by topic creation results + expect(Search.execute('Topic order:latest_topic').posts.map(&:id)).to eq([latest_irelevant_topic_post.id, old_relevant_topic_post.id]) end it 'can tokenize dots' do From 47c1cc95dd532dee4bebb7caaafcf2bf4927a63f Mon Sep 17 00:00:00 2001 From: Yana Agun Siswanto Date: Thu, 30 Mar 2017 01:49:54 +0700 Subject: [PATCH 015/124] Refactor `setSearchTerm`, to be reused on `noSortQ` --- .../controllers/full-page-search.js.es6 | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 index c6379ba1ab..a6751b639e 100644 --- a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -75,14 +75,7 @@ export default Ember.Controller.extend({ @computed('q') noSortQ(q) { - if (q) { - SortOrders.forEach((order) => { - if (q.indexOf(order.term) > -1){ - q = q.replace(order.term, ""); - q = q.trim(); - } - }); - } + q = this.cleanTerm(q); return escapeExpression(q); }, @@ -90,19 +83,23 @@ export default Ember.Controller.extend({ setSearchTerm(term) { this._searchOnSortChange = false; + term = this.cleanTerm(term); + this._searchOnSortChange = true; + this.set('searchTerm', term); + }, + + cleanTerm(term) { if (term) { SortOrders.forEach(order => { - let term_start = term.indexOf(order.term) - let char_after_term = term[term_start + (order.term || '').length] - if (term_start > -1 && (!char_after_term || char_after_term.match(/\s/))){ + let matches = term.match(new RegExp(`${order.term}\\b`)); + if (matches) { this.set('sortOrder', order.id); - term = term.replace(order.term, ""); + term = term.replace(new RegExp(`${order.term}\\b`, 'g'), ""); term = term.trim(); } }); } - this._searchOnSortChange = true; - this.set('searchTerm', term); + return term; }, @observes('sortOrder') From 8742f5176f5bc72d4f1514e5423135712e219e87 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Wed, 29 Mar 2017 16:48:53 -0400 Subject: [PATCH 016/124] FIX: tags and topic links rendered outside of page header --- app/assets/stylesheets/common/base/tagging.scss | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/assets/stylesheets/common/base/tagging.scss b/app/assets/stylesheets/common/base/tagging.scss index aa13934ae5..7fb5f4813e 100644 --- a/app/assets/stylesheets/common/base/tagging.scss +++ b/app/assets/stylesheets/common/base/tagging.scss @@ -93,6 +93,12 @@ $tag-color: scale-color($primary, $lightness: 40%); } } +.d-header .topic-header-extra { + display: inline-block; + .discourse-tags { display: inline-block; } + .topic-featured-link { margin-left: 8px; } +} + .select2-container-multi .select2-choices .select2-search-choice.discourse-tag-select2 { padding-top: 5px; -webkit-box-shadow: none; From 47182d34412c6358ca3dc725b288c9f8a1164112 Mon Sep 17 00:00:00 2001 From: James Kiesel Date: Thu, 30 Mar 2017 08:16:00 +0900 Subject: [PATCH 017/124] Remove stray reference to additionalPanels --- app/assets/javascripts/discourse/widgets/header.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/widgets/header.js.es6 b/app/assets/javascripts/discourse/widgets/header.js.es6 index f0d522bc00..5b67b1bda3 100644 --- a/app/assets/javascripts/discourse/widgets/header.js.es6 +++ b/app/assets/javascripts/discourse/widgets/header.js.es6 @@ -174,7 +174,6 @@ export function attachAdditionalPanel(name, toggle, transformAttrs) { export default createWidget('header', { tagName: 'header.d-header.clearfix', buildKey: () => `header`, - additionalPanels: [], defaultState() { let states = { From a818fa9831a85430231661171a4787e3847e3416 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 30 Mar 2017 09:46:39 +0800 Subject: [PATCH 018/124] FIX: Show stats of the last 30 days be default for admin reports. * `1.month.ago + 1.month` uses the calendar month for calculations such that `1.month.ago` from the 30th of March 2017 will give us the 28th of February 2017. Adding one month ahead from 28th February 2017 will be 28th of March 2017. --- app/controllers/admin/reports_controller.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index f24ee3f528..8a47b8a9d1 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -7,12 +7,9 @@ class Admin::ReportsController < Admin::AdminController raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/ - start_date = 1.month.ago - start_date = Time.parse(params[:start_date]) if params[:start_date].present? - - end_date = start_date + 1.month - end_date = Time.parse(params[:end_date]) if params[:end_date].present? - + start_date = params[:start_date].present? ? Time.parse(params[:start_date]) : 30.days.ago + end_date = params[:end_date].present? ? Time.parse(params[:end_date]) : start_date + 30.days + if params.has_key?(:category_id) && params[:category_id].to_i > 0 category_id = params[:category_id].to_i else From 99abbc2e2d8a5a9050688c346b02d1e21b3c221d Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 30 Mar 2017 13:24:18 +0800 Subject: [PATCH 019/124] UX: Order custom emojis by name. --- app/models/emoji.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/emoji.rb b/app/models/emoji.rb index e098719b0a..54cac0c4b2 100644 --- a/app/models/emoji.rb +++ b/app/models/emoji.rb @@ -92,7 +92,7 @@ class Emoji def self.load_custom result = [] - CustomEmoji.all.each do |emoji| + CustomEmoji.order(:name).all.each do |emoji| result << Emoji.new.tap do |e| e.name = emoji.name e.url = emoji.upload.url From 6b976433c9b918f31a646534140af99b7dc2f92a Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 27 Mar 2017 15:34:54 -0400 Subject: [PATCH 020/124] Support for both `/users/` and `/u/` paths --- .../initializers/url-redirects.js.es6 | 6 +- .../discourse/lib/discourse-location.js.es6 | 2 - .../javascripts/discourse/lib/url.js.es6 | 20 +++- .../discourse/mapping-router.js.es6 | 4 + .../discourse/routes/app-route-map.js.es6 | 6 +- config/routes.rb | 107 ++++++++++++++---- spec/controllers/email_controller_spec.rb | 2 +- spec/controllers/users_controller_spec.rb | 2 +- .../acceptance/user-anonymous-test.js.es6 | 2 +- test/javascripts/helpers/qunit-helpers.js.es6 | 2 + 10 files changed, 119 insertions(+), 34 deletions(-) diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 index b0e9c79c10..e183bda742 100644 --- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 +++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 @@ -12,12 +12,14 @@ export default { DiscourseURL.rewrite(/^\/category\//, "/c/"); DiscourseURL.rewrite(/^\/group\//, "/groups/"); DiscourseURL.rewrite(/\/private-messages\/$/, "/messages/"); + DiscourseURL.rewrite(/^\/users$/, "/u"); + DiscourseURL.rewrite(/^\/users\//, "/u/"); if (currentUser) { const username = currentUser.get('username'); - DiscourseURL.rewrite(new RegExp(`^/users/${username}/?$`, "i"), `/users/${username}/activity`); + DiscourseURL.rewrite(new RegExp(`^/u/${username}/?$`, "i"), `/u/${username}/activity`); } - DiscourseURL.rewrite(/^\/users\/([^\/]+)\/?$/, "/users/$1/activity"); + DiscourseURL.rewrite(/^\/u\/([^\/]+)\/?$/, "/u/$1/summary"); } }; diff --git a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 b/app/assets/javascripts/discourse/lib/discourse-location.js.es6 index 43b74ab1ef..c2e4fe0437 100644 --- a/app/assets/javascripts/discourse/lib/discourse-location.js.es6 +++ b/app/assets/javascripts/discourse/lib/discourse-location.js.es6 @@ -66,12 +66,10 @@ const DiscourseLocation = Ember.Object.extend({ getURL() { const location = get(this, 'location'); let url = location.pathname; - url = url.replace(Discourse.BaseUri, ''); const search = location.search || ''; url += search; - return url; }, diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index e4dbd44f03..f4858447db 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -18,6 +18,23 @@ const SERVER_SIDE_ONLY = [ /\.json$/, ]; +export function rewritePath(path) { + const params = path.split("?"); + + let result = params[0]; + rewrites.forEach(rw => result = result.replace(rw.regexp, rw.replacement)); + + if (params.length > 1) { + result += `?${params[1]}`; + } + + return result; +} + +export function clearRewrites() { + rewrites.length = 0; +} + let _jumpScheduled = false; export function jumpToElement(elementId) { if (_jumpScheduled || Ember.isEmpty(elementId)) { return; } @@ -180,8 +197,7 @@ const DiscourseURL = Ember.Object.extend({ } } - rewrites.forEach(rw => path = path.replace(rw.regexp, rw.replacement)); - + path = rewritePath(path); if (this.navigatedToPost(oldPath, path, opts)) { return; } if (oldPath === path) { diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6 index e88b7f746d..e1428039d9 100644 --- a/app/assets/javascripts/discourse/mapping-router.js.es6 +++ b/app/assets/javascripts/discourse/mapping-router.js.es6 @@ -1,4 +1,6 @@ import { defaultHomepage } from 'discourse/lib/utilities'; +import { rewritePath } from 'discourse/lib/url'; + const rootURL = Discourse.BaseUri; const BareRouter = Ember.Router.extend({ @@ -6,6 +8,7 @@ const BareRouter = Ember.Router.extend({ location: Ember.testing ? 'none': 'discourse-location', handleURL(url) { + url = rewritePath(url); const params = url.split('?'); if (params[0] === "/") { @@ -14,6 +17,7 @@ const BareRouter = Ember.Router.extend({ url = `${url}?${params[1]}`; } } + console.log(url); return this._super(url); } }); diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index 99a2aa0886..cb0bdb8d5d 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -62,9 +62,9 @@ export default function() { }); // User routes - this.route('users', { resetNamespace: true }); - this.route('password-reset', { path: '/users/password-reset/:token' }); - this.route('user', { path: '/users/:username', resetNamespace: true }, function() { + this.route('users', { resetNamespace: true, path: '/u' }); + this.route('password-reset', { path: '/u/password-reset/:token' }); + this.route('user', { path: '/u/:username', resetNamespace: true }, function() { this.route('summary'); this.route('userActivity', { path: '/activity', resetNamespace: true }, function() { this.route('topics'); diff --git a/config/routes.rb b/config/routes.rb index 292824ec6e..2a239f1526 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -286,13 +286,6 @@ Discourse::Application.routes.draw do get "session/csrf" => "session#csrf" get "composer_messages" => "composer_messages#index" - resources :users, except: [:show, :update, :destroy] do - collection do - get "check_username" - get "is_local_username" - end - end - resources :static post "login" => "static#enter", constraints: { format: /(json|html)/ } get "login" => "static#show", id: "login", constraints: { format: /(json|html)/ } @@ -304,10 +297,90 @@ Discourse::Application.routes.draw do get "signup" => "static#show", id: "signup", constraints: { format: /(json|html)/ } get "login-preferences" => "static#show", id: "login", constraints: { format: /(json|html)/ } + get "my/*path", to: 'users#my_redirect' + get "user_preferences" => "users#user_preferences_redirect" + + # New /u/ routes + get 'u' => 'users#index' + get 'u/check_username' => 'users#check_username' + get 'u/is_local_username' => 'users#is_local_username' + post 'u' => 'users#create' + + get "u/admin-login" => "users#admin_login" + put "u/admin-login" => "users#admin_login" + get "u/admin-login/:token" => "users#admin_login" + + post "u/toggle-anon" => "users#toggle_anon" + post "u/read-faq" => "users#read_faq" + get "u/search/users" => "users#search_users" + get "u/account-created/" => "users#account_created" + get "u/password-reset/:token" => "users#password_reset" + get "u/confirm-email-token/:token" => "users#confirm_email_token", constraints: { format: 'json' } + put "u/password-reset/:token" => "users#password_reset" + get "u/activate-account/:token" => "users#activate_account" + put "u/activate-account/:token" => "users#perform_account_activation", as: 'perform_activate_account' + get "u/authorize-email/:token" => "users_email#confirm" + get "u/hp" => "users#get_honeypot_value" + + get "u/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT} + + get "u/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT} + + get "u/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json} + get "u/:username" => "users#show", as: 'user', constraints: {username: USERNAME_ROUTE_FORMAT, format: /(json|html)/} + put "u/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: { format: :json } + get "u/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/preferences" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}, as: :email_preferences + get "u/:username/preferences/email" => "users_email#index", constraints: {username: USERNAME_ROUTE_FORMAT} + put "u/:username/preferences/email" => "users_email#update", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/preferences/about-me" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/preferences/badge_title" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT} + put "u/:username/preferences/badge_title" => "users#badge_title", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/preferences/username" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT} + put "u/:username/preferences/username" => "users#username", constraints: {username: USERNAME_ROUTE_FORMAT} + delete "u/:username/preferences/user_image" => "users#destroy_user_image", constraints: {username: USERNAME_ROUTE_FORMAT} + put "u/:username/preferences/avatar/pick" => "users#pick_avatar", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/preferences/card-badge" => "users#card_badge", constraints: {username: USERNAME_ROUTE_FORMAT} + put "u/:username/preferences/card-badge" => "users#update_card_badge", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/staff-info" => "users#staff_info", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/summary" => "users#summary", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/invited" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/invited_count" => "users#invited_count", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/invited/:filter" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT} + post "u/action/send_activation_email" => "users#send_activation_email" + get "u/:username/summary" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + + # user activity RSS feed + get "u/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT} + + get "u/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/badges" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/notifications/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/activity/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + delete "u/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT} + # The external_id constraint is to allow periods to be used in the value without becoming part of the format. ie: foo.bar.json + get "u/by-external/:external_id" => "users#show", constraints: {external_id: /[^\/]+/} + get "u/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + get "u/:username/deleted-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} + + get "u/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: {username: USERNAME_ROUTE_FORMAT} + + # Old User routes, will be removed when /u/ is everywhere + get 'users' => 'users#index' + get 'users/check_username' => 'users#check_username' + get 'users/is_local_username' => 'users#is_local_username' + post 'users' => 'users#create' + get "users/admin-login" => "users#admin_login" put "users/admin-login" => "users#admin_login" get "users/admin-login/:token" => "users#admin_login" - post "users/toggle-anon" => "users#toggle_anon" post "users/read-faq" => "users#read_faq" get "users/search/users" => "users#search_users" @@ -316,25 +389,19 @@ Discourse::Application.routes.draw do get "users/confirm-email-token/:token" => "users#confirm_email_token", constraints: { format: 'json' } put "users/password-reset/:token" => "users#password_reset" get "users/activate-account/:token" => "users#activate_account" - put "users/activate-account/:token" => "users#perform_account_activation", as: 'perform_activate_account' + put "users/activate-account/:token" => "users#perform_account_activation" get "users/authorize-email/:token" => "users_email#confirm" - get "users/hp" => "users#get_honeypot_value" - get "my/*path", to: 'users#my_redirect' - - get "user_preferences" => "users#user_preferences_redirect" get "users/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/messages/group/:group_name" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT} - get "users/:username/messages/group/:group_name/archive" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT, group_name: USERNAME_ROUTE_FORMAT} - get "users/:username.json" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json} - get "users/:username" => "users#show", as: 'user', constraints: {username: USERNAME_ROUTE_FORMAT, format: /(json|html)/} + get "users/:username" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT, format: /(json|html)/} put "users/:username" => "users#update", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: { format: :json } get "users/:username/emails" => "users#check_emails", constraints: {username: USERNAME_ROUTE_FORMAT} - get "users/:username/preferences" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT}, as: :email_preferences + get "users/:username/preferences" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/preferences/email" => "users_email#index", constraints: {username: USERNAME_ROUTE_FORMAT} put "users/:username/preferences/email" => "users_email#update", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/preferences/about-me" => "users#preferences", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -353,11 +420,8 @@ Discourse::Application.routes.draw do get "users/:username/invited/:filter" => "users#invited", constraints: {username: USERNAME_ROUTE_FORMAT} post "users/action/send_activation_email" => "users#send_activation_email" get "users/:username/summary" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} - - # user activity RSS feed get "users/:username/activity/topics.rss" => "list#user_topics_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/activity.rss" => "posts#user_posts_feed", format: :rss, constraints: {username: USERNAME_ROUTE_FORMAT} - get "users/:username/activity" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/activity/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/badges" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -365,12 +429,11 @@ Discourse::Application.routes.draw do get "users/:username/notifications/:filter" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/activity/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} delete "users/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT} - # The external_id constraint is to allow periods to be used in the value without becoming part of the format. ie: foo.bar.json get "users/by-external/:external_id" => "users#show", constraints: {external_id: /[^\/]+/} get "users/:username/flagged-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/deleted-posts" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} - get "users/:username/topic-tracking-state" => "users#topic_tracking_state", constraints: {username: USERNAME_ROUTE_FORMAT} + # -- end of old users paths get "user-badges/:username.json" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT}, defaults: {format: :json} get "user-badges/:username" => "user_badges#username", constraints: {username: USERNAME_ROUTE_FORMAT} diff --git a/spec/controllers/email_controller_spec.rb b/spec/controllers/email_controller_spec.rb index 03c0df3c3e..63fd6865ad 100644 --- a/spec/controllers/email_controller_spec.rb +++ b/spec/controllers/email_controller_spec.rb @@ -13,7 +13,7 @@ describe EmailController do it 'redirects to your user preferences' do get :preferences_redirect - expect(response).to redirect_to("/users/#{user.username}/preferences") + expect(response).to redirect_to("/u/#{user.username}/preferences") end end diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index d69165c35f..119859d3f5 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -100,7 +100,7 @@ describe UsersController do it "redirects to their profile when logged in" do user = log_in get :user_preferences_redirect - expect(response).to redirect_to("/users/#{user.username_lower}/preferences") + expect(response).to redirect_to("/u/#{user.username_lower}/preferences") end end diff --git a/test/javascripts/acceptance/user-anonymous-test.js.es6 b/test/javascripts/acceptance/user-anonymous-test.js.es6 index 62e458cea5..2d93a45c3b 100644 --- a/test/javascripts/acceptance/user-anonymous-test.js.es6 +++ b/test/javascripts/acceptance/user-anonymous-test.js.es6 @@ -49,6 +49,6 @@ test("Restricted Routes", () => { visit("/users/eviltrout/preferences"); andThen(() => { - equal(currentURL(), '/users/eviltrout/activity', "it redirects from preferences"); + equal(currentURL(), '/u/eviltrout/activity', "it redirects from preferences"); }); }); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 1fdc796b69..32747f9c5a 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -8,6 +8,7 @@ import { resetPluginApi } from 'discourse/lib/plugin-api'; import { clearCache as clearOutletCache, resetExtraClasses } from 'discourse/lib/plugin-connectors'; import { clearHTMLCache } from 'discourse/helpers/custom-html'; import { flushMap } from 'discourse/models/store'; +import { clearRewrites } from 'discourse/lib/url'; function currentUser() { @@ -88,6 +89,7 @@ function acceptance(name, options) { clearOutletCache(); clearHTMLCache(); resetPluginApi(); + clearRewrites(); Discourse.reset(); } }); From 45a257815a0181059de91101fa4f9c6f8aa9b3c7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 28 Mar 2017 12:16:58 -0400 Subject: [PATCH 021/124] Convert front end paths from `/users/` to `/u/` --- .../admin/controllers/admin-user-index.js.es6 | 3 +- .../discourse/components/small-action.js.es6 | 3 +- .../components/user-card-contents.js.es6 | 3 +- .../discourse/components/user-info.js.es6 | 8 +++-- .../controllers/create-account.js.es6 | 5 +-- .../controllers/discovery/topics.js.es6 | 5 +-- .../controllers/not-activated.js.es6 | 3 +- .../controllers/password-reset.js.es6 | 3 +- .../controllers/preferences/username.js.es6 | 3 +- .../discourse/controllers/static.js.es6 | 3 +- .../discourse/controllers/topic.js.es6 | 3 +- .../discourse/lib/link-mentions.js.es6 | 5 +-- .../javascripts/discourse/lib/search.js.es6 | 3 +- .../discourse/lib/transform-post.js.es6 | 4 ++- .../javascripts/discourse/lib/url.js.es6 | 6 +++- .../discourse/lib/user-search.js.es6 | 3 +- .../discourse/lib/utilities.js.es6 | 4 --- .../discourse/mapping-router.js.es6 | 1 - .../discourse/models/invite.js.es6 | 5 +-- .../javascripts/discourse/models/post.js.es6 | 8 +++-- .../javascripts/discourse/models/topic.js.es6 | 8 +++-- .../discourse/models/user-action.js.es6 | 13 +++++-- .../javascripts/discourse/models/user.js.es6 | 34 +++++++++---------- .../discourse/routes/application.js.es6 | 3 +- .../discourse/routes/password-reset.js.es6 | 3 +- .../discourse/widgets/actions-summary.js.es6 | 3 +- .../discourse/widgets/hamburger-menu.js.es6 | 3 +- .../widgets/notification-item.js.es6 | 5 +-- .../discourse-markdown/mentions.js.es6 | 2 +- app/models/post_analyzer.rb | 3 +- app/views/users/activate_account.html.erb | 2 +- config/routes.rb | 3 +- spec/models/post_spec.rb | 2 +- .../acceptance/password-reset-test.js.es6 | 4 +-- .../acceptance/search-full-test.js.es6 | 2 +- .../javascripts/fixtures/user_fixtures.js.es6 | 2 +- .../helpers/create-pretender.js.es6 | 24 ++++++------- test/javascripts/lib/pretty-text-test.js.es6 | 6 ++-- test/javascripts/lib/url-test.js.es6 | 8 ++++- test/javascripts/lib/user-search-test.js.es6 | 2 +- 40 files changed, 129 insertions(+), 84 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 14bc031c0a..91717cf8f0 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -1,6 +1,7 @@ import { ajax } from 'discourse/lib/ajax'; import CanCheckEmails from 'discourse/mixins/can-check-emails'; import { propertyNotEqual, setting } from 'discourse/lib/computed'; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(CanCheckEmails, { editingTitle: false, @@ -62,7 +63,7 @@ export default Ember.Controller.extend(CanCheckEmails, { saveTitle() { const self = this; - return ajax(`/users/${this.get('model.username').toLowerCase()}.json`, { + return ajax(userPath(`${this.get('model.username').toLowerCase()}.json`), { data: {title: this.get('userTitleValue')}, type: 'PUT' }).catch(function(e) { diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6 index 8a17c41031..114d35801c 100644 --- a/app/assets/javascripts/discourse/components/small-action.js.es6 +++ b/app/assets/javascripts/discourse/components/small-action.js.es6 @@ -1,4 +1,5 @@ import { autoUpdatingRelativeAge } from 'discourse/lib/formatter'; +import { userPath } from 'discourse/lib/url'; export function actionDescriptionHtml(actionCode, createdAt, username) { const dt = new Date(createdAt); @@ -9,7 +10,7 @@ export function actionDescriptionHtml(actionCode, createdAt, username) { if (actionCode === "invited_group" || actionCode === "removed_group") { who = `@${username}`; } else { - who = `@${username}`; + who = `@${username}`; } } return I18n.t(`action_codes.${actionCode}`, { who, when }).htmlSafe(); diff --git a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 b/app/assets/javascripts/discourse/components/user-card-contents.js.es6 index 6aefcaa2f2..969a6a931c 100644 --- a/app/assets/javascripts/discourse/components/user-card-contents.js.es6 +++ b/app/assets/javascripts/discourse/components/user-card-contents.js.es6 @@ -5,6 +5,7 @@ import afterTransition from 'discourse/lib/after-transition'; import { default as computed, observes } from 'ember-addons/ember-computed-decorators'; import DiscourseURL from 'discourse/lib/url'; import User from 'discourse/models/user'; +import { userPath } from 'discourse/lib/url'; const clickOutsideEventName = "mousedown.outside-user-card"; const clickDataExpand = "click.discourse-user-card"; @@ -92,7 +93,7 @@ export default Ember.Component.extend(CleansUp, { // Don't show on mobile if (this.site.mobileView) { - DiscourseURL.routeTo(`/users/${username}`); + DiscourseURL.routeTo(userPath(username)); return false; } diff --git a/app/assets/javascripts/discourse/components/user-info.js.es6 b/app/assets/javascripts/discourse/components/user-info.js.es6 index 05dde9fffe..3293e4d46e 100644 --- a/app/assets/javascripts/discourse/components/user-info.js.es6 +++ b/app/assets/javascripts/discourse/components/user-info.js.es6 @@ -1,5 +1,5 @@ -import { url } from 'discourse/lib/computed'; import computed from 'ember-addons/ember-computed-decorators'; +import { userPath } from 'discourse/lib/url'; function normalize(name) { return name.replace(/[\-\_ \.]/g, '').toLowerCase(); @@ -8,7 +8,11 @@ function normalize(name) { export default Ember.Component.extend({ classNameBindings: [':user-info', 'size'], size: 'small', - userPath: url('user.username', '/users/%@'), + + @computed('user.username') + userPath(username) { + return userPath(username); + }, // TODO: In later ember releases `hasBlock` works without this hasBlock: Ember.computed.alias('template'), diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index d04a03821c..d77a4db489 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -6,6 +6,7 @@ import { emailValid } from 'discourse/lib/utilities'; import InputValidation from 'discourse/models/input-validation'; import PasswordValidation from "discourse/mixins/password-validation"; import UsernameValidation from "discourse/mixins/username-validation"; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, UsernameValidation, { login: Ember.inject.controller(), @@ -164,7 +165,7 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U @on('init') fetchConfirmationValue() { - return ajax('/users/hp.json').then(json => { + return ajax(userPath('hp.json')).then(json => { this.set('accountPasswordConfirm', json.value); this.set('accountChallenge', json.challenge.split("").reverse().join("")); }); @@ -196,7 +197,7 @@ export default Ember.Controller.extend(ModalFunctionality, PasswordValidation, U const $hidden_login_form = $('#hidden-login-form'); $hidden_login_form.find('input[name=username]').val(attrs.accountUsername); $hidden_login_form.find('input[name=password]').val(attrs.accountPassword); - $hidden_login_form.find('input[name=redirect]').val(Discourse.getURL('/users/account-created')); + $hidden_login_form.find('input[name=redirect]').val(userPath('account-created')); $hidden_login_form.submit(); } else { self.flash(result.message || I18n.t('create_account.failed'), 'error'); diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index 516c53daf4..706ee73241 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -3,6 +3,7 @@ import { queryParams } from 'discourse/controllers/discovery-sortable'; import BulkTopicSelection from 'discourse/mixins/bulk-topic-selection'; import { endWith } from 'discourse/lib/computed'; import showModal from 'discourse/lib/show-modal'; +import { userPath } from 'discourse/lib/url'; const controllerOpts = { discovery: Ember.inject.controller(), @@ -133,14 +134,14 @@ const controllerOpts = { }.property('allLoaded', 'model.topics.length'), footerEducation: function() { - if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !Discourse.User.current()) { return; } + if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !this.currentUser) { return; } const split = (this.get('model.filter') || '').split('/'); if (split[0] !== 'new' && split[0] !== 'unread') { return; } return I18n.t("topics.none.educate." + split[0], { - userPrefsUrl: Discourse.getURL("/users/") + (Discourse.User.currentProp("username_lower")) + "/preferences" + userPrefsUrl: userPath(`${this.currentUser.get('username_lower')}/preferences`) }); }.property('allLoaded', 'model.topics.length') diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 index 86afe2ddd7..cf0164b0e6 100644 --- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 +++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 @@ -1,6 +1,7 @@ import { ajax } from 'discourse/lib/ajax'; import { popupAjaxError } from 'discourse/lib/ajax-error'; import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(ModalFunctionality, { emailSent: false, @@ -11,7 +12,7 @@ export default Ember.Controller.extend(ModalFunctionality, { actions: { sendActivationEmail() { - ajax('/users/action/send_activation_email', { + ajax(userPath('action/send_activation_email'), { data: { username: this.get('username') }, type: 'POST' }).then(() => { diff --git a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 b/app/assets/javascripts/discourse/controllers/password-reset.js.es6 index 34b911c23d..e7694a2301 100644 --- a/app/assets/javascripts/discourse/controllers/password-reset.js.es6 +++ b/app/assets/javascripts/discourse/controllers/password-reset.js.es6 @@ -3,6 +3,7 @@ import getUrl from 'discourse-common/lib/get-url'; import DiscourseURL from 'discourse/lib/url'; import { ajax } from 'discourse/lib/ajax'; import PasswordValidation from "discourse/mixins/password-validation"; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(PasswordValidation, { isDeveloper: Ember.computed.alias('model.is_developer'), @@ -27,7 +28,7 @@ export default Ember.Controller.extend(PasswordValidation, { actions: { submit() { ajax({ - url: `/users/password-reset/${this.get('model.token')}.json`, + url: userPath(`password-reset/${this.get('model.token')}.json`), type: 'PUT', data: { password: this.get('accountPassword') diff --git a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 index a597df810a..f6cfa7be70 100644 --- a/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences/username.js.es6 @@ -1,5 +1,6 @@ import { setting, propertyEqual } from 'discourse/lib/computed'; import DiscourseURL from 'discourse/lib/url'; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend({ taken: false, @@ -48,7 +49,7 @@ export default Ember.Controller.extend({ if (result) { this.set('saving', true); this.get('content').changeUsername(this.get('newUsername')).then(() => { - DiscourseURL.redirectTo("/users/" + this.get('newUsername').toLowerCase() + "/preferences"); + DiscourseURL.redirectTo(userPath(this.get('newUsername').toLowerCase() + "/preferences")); }) .catch(() => this.set('error', true)) .finally(() => this.set('saving', false)); diff --git a/app/assets/javascripts/discourse/controllers/static.js.es6 b/app/assets/javascripts/discourse/controllers/static.js.es6 index 166a0676a7..369c6bddf5 100644 --- a/app/assets/javascripts/discourse/controllers/static.js.es6 +++ b/app/assets/javascripts/discourse/controllers/static.js.es6 @@ -1,5 +1,6 @@ import { ajax } from 'discourse/lib/ajax'; import computed from 'ember-addons/ember-computed-decorators'; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend({ application: Ember.inject.controller(), @@ -18,7 +19,7 @@ export default Ember.Controller.extend({ markFaqRead() { const currentUser = this.currentUser; if (currentUser) { - ajax("/users/read-faq", { method: "POST" }).then(() => { + ajax(userPath("read-faq"), { method: "POST" }).then(() => { currentUser.set('read_faq', true); }); } diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 32b824fc25..7d1c98142b 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -12,6 +12,7 @@ import Post from 'discourse/models/post'; import debounce from 'discourse/lib/debounce'; import isElementInViewport from "discourse/lib/is-element-in-viewport"; import QuoteState from 'discourse/lib/quote-state'; +import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { composer: Ember.inject.controller(), @@ -126,7 +127,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { showCategoryChooser: Ember.computed.not("model.isPrivateMessage"), gotoInbox(name) { - var url = '/users/' + this.get('currentUser.username_lower') + '/messages'; + let url = userPath(this.get('currentUser.username_lower') + '/messages'); if (name) { url = url + '/group/' + name; } diff --git a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 b/app/assets/javascripts/discourse/lib/link-mentions.js.es6 index 20876bd72e..d8cd970299 100644 --- a/app/assets/javascripts/discourse/lib/link-mentions.js.es6 +++ b/app/assets/javascripts/discourse/lib/link-mentions.js.es6 @@ -1,4 +1,5 @@ import { ajax } from 'discourse/lib/ajax'; +import { userPath } from 'discourse/lib/url'; function replaceSpan($e, username, opts) { let extra = ""; @@ -15,7 +16,7 @@ function replaceSpan($e, username, opts) { extra = `data-name='${username}'`; extraClass = "cannot-see"; } - $e.replaceWith(`@${username}`); + $e.replaceWith(`@${username}`); } } @@ -54,7 +55,7 @@ export function linkSeenMentions($elem, siteSettings) { // 'Create a New Topic' scenario is not supported (per conversation with codinghorror) // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7 export function fetchUnseenMentions(usernames, topic_id) { - return ajax("/users/is_local_username", { data: { usernames, topic_id } }).then(r => { + return ajax(userPath("is_local_username"), { data: { usernames, topic_id } }).then(r => { r.valid.forEach(v => found[v] = true); r.valid_groups.forEach(vg => foundGroups[vg] = true); r.mentionable_groups.forEach(mg => mentionableGroups[mg.name] = mg); diff --git a/app/assets/javascripts/discourse/lib/search.js.es6 b/app/assets/javascripts/discourse/lib/search.js.es6 index 0824f8edca..30ab32629f 100644 --- a/app/assets/javascripts/discourse/lib/search.js.es6 +++ b/app/assets/javascripts/discourse/lib/search.js.es6 @@ -5,6 +5,7 @@ import { SEPARATOR } from 'discourse/lib/category-hashtags'; import Category from 'discourse/models/category'; import { search as searchCategoryTag } from 'discourse/lib/category-tag-search'; import userSearch from 'discourse/lib/user-search'; +import { userPath } from 'discourse/lib/url'; export function translateResults(results, opts) { @@ -29,7 +30,7 @@ export function translateResults(results, opts) { results.posts = results.posts.map(post => { if (post.username) { - post.userPath = Discourse.getURL(`/users/${post.username.toLowerCase()}`); + post.userPath = userPath(post.username.toLowerCase()); } post = Post.create(post); post.set('topic', topicMap[post.topic_id]); diff --git a/app/assets/javascripts/discourse/lib/transform-post.js.es6 b/app/assets/javascripts/discourse/lib/transform-post.js.es6 index d9742501d6..7df3954b30 100644 --- a/app/assets/javascripts/discourse/lib/transform-post.js.es6 +++ b/app/assets/javascripts/discourse/lib/transform-post.js.es6 @@ -1,3 +1,5 @@ +import { userPath } from 'discourse/lib/url'; + function actionDescription(action, acted, count) { if (acted) { if (count <= 1) { @@ -39,7 +41,7 @@ export function transformBasicPost(post) { via_email: post.via_email, isAutoGenerated: post.is_auto_generated, user_id: post.user_id, - usernameUrl: Discourse.getURL(`/users/${post.username}`), + usernameUrl: userPath(post.username), username: post.username, avatar_template: post.avatar_template, bookmarked: post.bookmarked, diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index f4858447db..80dbdef6d2 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -35,6 +35,10 @@ export function clearRewrites() { rewrites.length = 0; } +export function userPath(subPath) { + return Discourse.getURL(subPath ? `/u/${subPath}` : '/u'); +} + let _jumpScheduled = false; export function jumpToElement(elementId) { if (_jumpScheduled || Ember.isEmpty(elementId)) { return; } @@ -190,7 +194,7 @@ const DiscourseURL = Ember.Object.extend({ if (path.indexOf('/my/') === 0) { const currentUser = Discourse.User.current(); if (currentUser) { - path = path.replace('/my/', '/users/' + currentUser.get('username_lower') + "/"); + path = path.replace('/my/', userPath(currentUser.get('username_lower') + "/")); } else { document.location.href = "/404"; return; diff --git a/app/assets/javascripts/discourse/lib/user-search.js.es6 b/app/assets/javascripts/discourse/lib/user-search.js.es6 index 6f99fa0699..36612631f5 100644 --- a/app/assets/javascripts/discourse/lib/user-search.js.es6 +++ b/app/assets/javascripts/discourse/lib/user-search.js.es6 @@ -1,4 +1,5 @@ import { CANCELLED_STATUS } from 'discourse/lib/autocomplete'; +import { userPath } from 'discourse/lib/url'; var cache = {}, cacheTopicId, @@ -14,7 +15,7 @@ function performSearch(term, topicId, includeGroups, includeMentionableGroups, a } // need to be able to cancel this - oldSearch = $.ajax(Discourse.getURL('/users/search/users'), { + oldSearch = $.ajax(userPath('search/users'), { data: { term: term, topic_id: topicId, include_groups: includeGroups, diff --git a/app/assets/javascripts/discourse/lib/utilities.js.es6 b/app/assets/javascripts/discourse/lib/utilities.js.es6 index 67f795bf3d..d80b84cabc 100644 --- a/app/assets/javascripts/discourse/lib/utilities.js.es6 +++ b/app/assets/javascripts/discourse/lib/utilities.js.es6 @@ -65,10 +65,6 @@ export function postUrl(slug, topicId, postNumber) { return url; } -export function userUrl(username) { - return Discourse.getURL("/users/" + username.toLowerCase()); -} - export function emailValid(email) { // see: http://stackoverflow.com/questions/46155/validate-email-address-in-javascript const re = /^[a-zA-Z0-9!#$%&'*+\/=?\^_`{|}~\-]+(?:\.[a-zA-Z0-9!#$%&'\*+\/=?\^_`{|}~\-]+)*@(?:[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?\.)+[a-zA-Z0-9](?:[a-zA-Z0-9\-]*[a-zA-Z0-9])?$/; diff --git a/app/assets/javascripts/discourse/mapping-router.js.es6 b/app/assets/javascripts/discourse/mapping-router.js.es6 index e1428039d9..6d30be749c 100644 --- a/app/assets/javascripts/discourse/mapping-router.js.es6 +++ b/app/assets/javascripts/discourse/mapping-router.js.es6 @@ -17,7 +17,6 @@ const BareRouter = Ember.Router.extend({ url = `${url}?${params[1]}`; } } - console.log(url); return this._super(url); } }); diff --git a/app/assets/javascripts/discourse/models/invite.js.es6 b/app/assets/javascripts/discourse/models/invite.js.es6 index 8f89cfc684..1425e63b25 100644 --- a/app/assets/javascripts/discourse/models/invite.js.es6 +++ b/app/assets/javascripts/discourse/models/invite.js.es6 @@ -1,5 +1,6 @@ import { ajax } from 'discourse/lib/ajax'; import { popupAjaxError } from 'discourse/lib/ajax-error'; +import { userPath } from 'discourse/lib/url'; const Invite = Discourse.Model.extend({ @@ -41,7 +42,7 @@ Invite.reopenClass({ if (!Em.isNone(search)) { data.search = search; } data.offset = offset || 0; - return ajax("/users/" + user.get('username_lower') + "/invited.json", {data}).then(function (result) { + return ajax(userPath(user.get('username_lower') + "/invited.json"), {data}).then(function (result) { result.invites = result.invites.map(function (i) { return Invite.create(i); }); @@ -52,7 +53,7 @@ Invite.reopenClass({ findInvitedCount(user) { if (!user) { return Em.RSVP.resolve(); } - return ajax("/users/" + user.get('username_lower') + "/invited_count.json").then(result => Em.Object.create(result.counts)); + return ajax(userPath(user.get('username_lower') + "/invited_count.json")).then(result => Em.Object.create(result.counts)); }, reinviteAll() { diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 127b81f861..7800d3be38 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -2,11 +2,12 @@ import { ajax } from 'discourse/lib/ajax'; import RestModel from 'discourse/models/rest'; import { popupAjaxError } from 'discourse/lib/ajax-error'; import ActionSummary from 'discourse/models/action-summary'; -import { url, propertyEqual } from 'discourse/lib/computed'; +import { propertyEqual } from 'discourse/lib/computed'; import Quote from 'discourse/lib/quote'; import computed from 'ember-addons/ember-computed-decorators'; import { postUrl } from 'discourse/lib/utilities'; import { cook } from 'discourse/lib/text'; +import { userPath } from 'discourse/lib/url'; const Post = RestModel.extend({ @@ -60,7 +61,10 @@ const Post = RestModel.extend({ return postNumber === 1 ? baseUrl + "/1" : baseUrl; }, - usernameUrl: url('username', '/users/%@'), + @computed('username') + usernameUrl(username) { + return userPath(username); + }, topicOwner: propertyEqual('topic.details.created_by.id', 'user_id'), diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 139b2ddcf7..84545aa9ea 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -9,6 +9,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import { censor } from 'pretty-text/censored-words'; import { emojiUnescape } from 'discourse/lib/text'; import PreloadStore from 'preload-store'; +import { userPath } from 'discourse/lib/url'; export function loadTopicView(topic, args) { const topicId = topic.get('id'); @@ -182,9 +183,10 @@ const Topic = RestModel.extend({ return this.urlForPostNumber(1) + (this.get('has_summary') ? "?filter=summary" : ""); }.property('url'), - lastPosterUrl: function() { - return Discourse.getURL("/users/") + this.get("last_poster.username"); - }.property('last_poster'), + @computed('last_poster.username') + lastPosterUrl(username) { + return userPath(username); + }, // The amount of new posts to display. It might be different than what the server // tells us if we are still asynchronously flushing our "recently read" data. diff --git a/app/assets/javascripts/discourse/models/user-action.js.es6 b/app/assets/javascripts/discourse/models/user-action.js.es6 index ebc4be7381..c4d5b7a161 100644 --- a/app/assets/javascripts/discourse/models/user-action.js.es6 +++ b/app/assets/javascripts/discourse/models/user-action.js.es6 @@ -1,9 +1,9 @@ import RestModel from 'discourse/models/rest'; -import { url } from 'discourse/lib/computed'; import { on } from 'ember-addons/ember-computed-decorators'; import computed from 'ember-addons/ember-computed-decorators'; import UserActionGroup from 'discourse/models/user-action-group'; import { postUrl } from 'discourse/lib/utilities'; +import { userPath } from 'discourse/lib/url'; const UserActionTypes = { likes_given: 1, @@ -79,14 +79,21 @@ const UserAction = RestModel.extend({ presentName: Ember.computed.or('name', 'username'), targetDisplayName: Ember.computed.or('target_name', 'target_username'), actingDisplayName: Ember.computed.or('acting_name', 'acting_username'), - targetUserUrl: url('target_username', '/users/%@'), + + @computed('target_username') + targetUserUrl(username) { + return userPath(username); + }, @computed("username") usernameLower(username) { return username.toLowerCase(); }, - userUrl: url('usernameLower', '/users/%@'), + @computed('usernameLower') + userUrl(usernameLower) { + return userPath(usernameLower); + }, @computed() postUrl() { diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index 5086c54cbc..e2589b8e47 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -15,6 +15,7 @@ import Topic from 'discourse/models/topic'; import { emojiUnescape } from 'discourse/lib/text'; import PreloadStore from 'preload-store'; import { defaultHomepage } from 'discourse/lib/utilities'; +import { userPath } from 'discourse/lib/url'; const User = RestModel.extend({ @@ -71,7 +72,7 @@ const User = RestModel.extend({ @computed() path() { // no need to observe, requires a hard refresh to update - return Discourse.getURL(`/users/${this.get('username_lower')}`); + return userPath(this.get('username_lower')); }, @computed() @@ -124,11 +125,10 @@ const User = RestModel.extend({ // directly targetted so go to inbox if (!groups || (allowedUsers && allowedUsers.findBy("id", userId))) { - return Discourse.getURL(`/users/${username}/messages`); + return userPath(`${username}/messages`); } else { - if (groups && groups[0]) - { - return Discourse.getURL(`/users/${username}/messages/group/${groups[0].name}`); + if (groups && groups[0]) { + return userPath(`${username}/messages/group/${groups[0].name}`); } } @@ -179,14 +179,14 @@ const User = RestModel.extend({ }, changeUsername(new_username) { - return ajax(`/users/${this.get('username_lower')}/preferences/username`, { + return ajax(userPath(`${this.get('username_lower')}/preferences/username`), { type: 'PUT', data: { new_username } }); }, changeEmail(email) { - return ajax(`/users/${this.get('username_lower')}/preferences/email`, { + return ajax(userPath(`${this.get('username_lower')}/preferences/email`), { type: 'PUT', data: { email } }); @@ -254,7 +254,7 @@ const User = RestModel.extend({ // TODO: We can remove this when migrated fully to rest model. this.set('isSaving', true); - return ajax(`/users/${this.get('username_lower')}.json`, { + return ajax(userPath(`${this.get('username_lower')}.json`), { data: data, type: 'PUT' }).then(result => { @@ -330,7 +330,7 @@ const User = RestModel.extend({ const user = this; return PreloadStore.getAndRemove(`user_${user.get('username')}`, () => { - return ajax(`/users/${user.get('username')}.json`, { data: options }); + return ajax(userPath(`${user.get('username')}.json`), { data: options }); }).then(json => { if (!Em.isEmpty(json.user.stats)) { @@ -375,13 +375,13 @@ const User = RestModel.extend({ findStaffInfo() { if (!Discourse.User.currentProp("staff")) { return Ember.RSVP.resolve(null); } - return ajax(`/users/${this.get("username_lower")}/staff-info.json`).then(info => { + return ajax(userPath(`${this.get("username_lower")}/staff-info.json`)).then(info => { this.setProperties(info); }); }, pickAvatar(upload_id, type, avatar_template) { - return ajax(`/users/${this.get("username_lower")}/preferences/avatar/pick`, { + return ajax(userPath(`${this.get("username_lower")}/preferences/avatar/pick`), { type: 'PUT', data: { upload_id, type } }).then(() => this.setProperties({ @@ -437,7 +437,7 @@ const User = RestModel.extend({ "delete": function() { if (this.get('can_delete_account')) { - return ajax("/users/" + this.get('username'), { + return ajax(userPath(this.get('username')), { type: 'DELETE', data: {context: window.location.pathname} }); @@ -448,14 +448,14 @@ const User = RestModel.extend({ dismissBanner(bannerKey) { this.set("dismissed_banner_key", bannerKey); - ajax(`/users/${this.get('username')}`, { + ajax(userPath(this.get('username')), { type: 'PUT', data: { dismissed_banner_key: bannerKey } }); }, checkEmail() { - return ajax(`/users/${this.get("username_lower")}/emails.json`, { + return ajax(userPath(`${this.get("username_lower")}/emails.json`), { data: { context: window.location.pathname } }).then(result => { if (result) { @@ -468,7 +468,7 @@ const User = RestModel.extend({ }, summary() { - return ajax(`/users/${this.get("username_lower")}/summary.json`) + return ajax(userPath(`${this.get("username_lower")}/summary.json`)) .then(json => { const summary = json["user_summary"]; const topicMap = {}; @@ -526,7 +526,7 @@ User.reopenClass(Singleton, { }, checkUsername(username, email, for_user_id) { - return ajax('/users/check_username', { + return ajax(userPath('check_username'), { data: { username, email, for_user_id } }); }, @@ -557,7 +557,7 @@ User.reopenClass(Singleton, { }, createAccount(attrs) { - return ajax("/users", { + return ajax(userPath(), { data: { name: attrs.accountName, email: attrs.accountEmail, diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6 index 1c3fed9a6b..2c800ff199 100644 --- a/app/assets/javascripts/discourse/routes/application.js.es6 +++ b/app/assets/javascripts/discourse/routes/application.js.es6 @@ -7,6 +7,7 @@ import Category from 'discourse/models/category'; import mobile from 'discourse/lib/mobile'; import { findAll } from 'discourse/models/login-method'; import { getOwner } from 'discourse-common/lib/get-owner'; +import { userPath } from 'discourse/lib/url'; function unlessReadOnly(method, message) { return function() { @@ -23,7 +24,7 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, { actions: { toggleAnonymous() { - ajax("/users/toggle-anon", {method: 'POST'}).then(() => { + ajax(userPath("toggle-anon"), {method: 'POST'}).then(() => { window.location.reload(); }); }, diff --git a/app/assets/javascripts/discourse/routes/password-reset.js.es6 b/app/assets/javascripts/discourse/routes/password-reset.js.es6 index 1f4cf2102c..ff5fde0fad 100644 --- a/app/assets/javascripts/discourse/routes/password-reset.js.es6 +++ b/app/assets/javascripts/discourse/routes/password-reset.js.es6 @@ -1,5 +1,6 @@ import PreloadStore from 'preload-store'; import { ajax } from 'discourse/lib/ajax'; +import { userPath } from 'discourse/lib/url'; export default Discourse.Route.extend({ titleToken() { @@ -15,7 +16,7 @@ export default Discourse.Route.extend({ afterModel(model) { // confirm token here so email clients who crawl URLs don't invalidate the link if (model) { - return ajax({ url: `/users/confirm-email-token/${model.token}.json`, dataType: 'json' }); + return ajax({ url: userPath(`confirm-email-token/${model.token}.json`), dataType: 'json' }); } } }); diff --git a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 index bf09613c73..df852621b9 100644 --- a/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 +++ b/app/assets/javascripts/discourse/widgets/actions-summary.js.es6 @@ -3,12 +3,13 @@ import { avatarFor } from 'discourse/widgets/post'; import { iconNode } from 'discourse/helpers/fa-icon-node'; import { h } from 'virtual-dom'; import { dateNode } from 'discourse/helpers/node'; +import { userPath } from 'discourse/lib/url'; export function avatarAtts(user) { return { template: user.avatar_template, username: user.username, post_url: user.post_url, - url: Discourse.getURL('/users/') + user.username_lower }; + url: userPath(user.username_lower) }; } createWidget('small-user-list', { diff --git a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 index 7b95c36328..3e9979cad1 100644 --- a/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 +++ b/app/assets/javascripts/discourse/widgets/hamburger-menu.js.es6 @@ -2,6 +2,7 @@ import { createWidget, applyDecorators } from 'discourse/widgets/widget'; import { h } from 'virtual-dom'; import DiscourseURL from 'discourse/lib/url'; import { ajax } from 'discourse/lib/ajax'; +import { userPath } from 'discourse/lib/url'; const flatten = array => [].concat.apply([], array); @@ -19,7 +20,7 @@ createWidget('priority-faq-link', { click(e) { e.preventDefault(); if (this.siteSettings.faq_url === this.attrs.href) { - ajax("/users/read-faq", { method: "POST" }).then(() => { + ajax(userPath("read-faq"), { method: "POST" }).then(() => { this.currentUser.set('read_faq', true); DiscourseURL.routeToTag($(e.target).closest('a')[0]); }); diff --git a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 index 7cb5ce028a..187a090ce0 100644 --- a/app/assets/javascripts/discourse/widgets/notification-item.js.es6 +++ b/app/assets/javascripts/discourse/widgets/notification-item.js.es6 @@ -6,6 +6,7 @@ import { h } from 'virtual-dom'; import { emojiUnescape } from 'discourse/lib/text'; import { postUrl, escapeExpression } from 'discourse/lib/utilities'; import { setTransientHeader } from 'discourse/lib/ajax'; +import { userPath } from 'discourse/lib/url'; const LIKED_TYPE = 5; const INVITED_TYPE = 8; @@ -45,11 +46,11 @@ createWidget('notification-item', { } if (attrs.notification_type === INVITED_TYPE) { - return Discourse.getURL('/users/' + data.display_username); + return userPath(data.display_username); } if (data.group_id) { - return Discourse.getURL('/users/' + data.username + '/messages/group/' + data.group_name); + return userPath(data.username + '/messages/group/' + data.group_name); } }, diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 index 177c322cca..115f58997d 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/mentions.js.es6 @@ -38,7 +38,7 @@ export function setup(helper) { const type = mentionLookup && mentionLookup(name); if (type === "user") { - return ['a', {'class': 'mention', href: opts.getURL("/users/") + name.toLowerCase()}, mention]; + return ['a', {'class': 'mention', href: opts.getURL("/u/") + name.toLowerCase()}, mention]; } else if (type === "group") { return ['a', {'class': 'mention-group', href: opts.getURL("/groups/") + name}, mention]; } else { diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index 09f7cd9932..53296c8e59 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -124,7 +124,8 @@ class PostAnalyzer def link_is_a_mention?(l) html_class = l['class'] return false if html_class.blank? - html_class.to_s['mention'] && l['href'].to_s[/^\/users\//] + href = l['href'].to_s + html_class.to_s['mention'] && href[/^\/u\//] || href[/^\/users\//] end end diff --git a/app/views/users/activate_account.html.erb b/app/views/users/activate_account.html.erb index 6723d66ed5..97cf7faecf 100644 --- a/app/views/users/activate_account.html.erb +++ b/app/views/users/activate_account.html.erb @@ -19,7 +19,7 @@ (function() { function activateAccount() { $('#activate-account-button').prop('disabled', true); - $.ajax("<%= path "/users/hp" %>").then(function(hp) { + $.ajax("<%= path "/u/hp" %>").then(function(hp) { $('#password_confirmation').val(hp.value); $('#challenge').val(hp.challenge.split("").reverse().join("")); $('#activate-account-form').submit(); diff --git a/config/routes.rb b/config/routes.rb index 2a239f1526..a20d2cd576 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -305,6 +305,7 @@ Discourse::Application.routes.draw do get 'u/check_username' => 'users#check_username' get 'u/is_local_username' => 'users#is_local_username' post 'u' => 'users#create' + get "u/hp" => "users#get_honeypot_value" get "u/admin-login" => "users#admin_login" put "u/admin-login" => "users#admin_login" @@ -320,7 +321,6 @@ Discourse::Application.routes.draw do get "u/activate-account/:token" => "users#activate_account" put "u/activate-account/:token" => "users#perform_account_activation", as: 'perform_activate_account' get "u/authorize-email/:token" => "users_email#confirm" - get "u/hp" => "users#get_honeypot_value" get "u/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "u/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} @@ -377,6 +377,7 @@ Discourse::Application.routes.draw do get 'users/check_username' => 'users#check_username' get 'users/is_local_username' => 'users#is_local_username' post 'users' => 'users#create' + get "users/hp" => "users#get_honeypot_value" get "users/admin-login" => "users#admin_login" put "users/admin-login" => "users#admin_login" diff --git a/spec/models/post_spec.rb b/spec/models/post_spec.rb index 73c18249eb..208414e1a9 100644 --- a/spec/models/post_spec.rb +++ b/spec/models/post_spec.rb @@ -952,7 +952,7 @@ describe Post do it "will unhide the post but will keep the topic invisible/unlisted" do hidden_topic = Fabricate(:topic, visible: false) - first_post = create_post(topic: hidden_topic) + _first_post = create_post(topic: hidden_topic) second_post = create_post(topic: hidden_topic) second_post.update_columns(hidden: true, hidden_at: Time.now, hidden_reason_id: 1) diff --git a/test/javascripts/acceptance/password-reset-test.js.es6 b/test/javascripts/acceptance/password-reset-test.js.es6 index 8bfe33d512..7c627069c2 100644 --- a/test/javascripts/acceptance/password-reset-test.js.es6 +++ b/test/javascripts/acceptance/password-reset-test.js.es6 @@ -12,11 +12,11 @@ acceptance("Password Reset", { ]; }; - server.get('/users/confirm-email-token/myvalidtoken.json', () => { //eslint-disable-line + server.get('/u/confirm-email-token/myvalidtoken.json', () => { //eslint-disable-line return response({success: "OK"}); }); - server.put('/users/password-reset/myvalidtoken.json', request => { //eslint-disable-line + server.put('/u/password-reset/myvalidtoken.json', request => { //eslint-disable-line const body = parsePostData(request.requestBody); if (body.password === "jonesyAlienSlayer") { return response({success: false, errors: {password: ["is the name of your cat"]}}); diff --git a/test/javascripts/acceptance/search-full-test.js.es6 b/test/javascripts/acceptance/search-full-test.js.es6 index 886dd4b13d..d8050d72f4 100644 --- a/test/javascripts/acceptance/search-full-test.js.es6 +++ b/test/javascripts/acceptance/search-full-test.js.es6 @@ -14,7 +14,7 @@ acceptance("Search - Full Page", { return response({results: [{text: 'monkey', count: 1}]}); }); - server.get('/users/search/users', () => { //eslint-disable-line + server.get('/u/search/users', () => { //eslint-disable-line return response({users: [{username: "admin", name: "admin", avatar_template: "/images/avatar.png"}]}); }); diff --git a/test/javascripts/fixtures/user_fixtures.js.es6 b/test/javascripts/fixtures/user_fixtures.js.es6 index abfb5e2fd1..28e5a9cf04 100644 --- a/test/javascripts/fixtures/user_fixtures.js.es6 +++ b/test/javascripts/fixtures/user_fixtures.js.es6 @@ -1,6 +1,6 @@ /*jshint maxlen:10000000 */ export default { -"/users/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@example.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","bio_cooked":"

Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.

","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_minutes":10080,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"/images/avatar.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"/images/avatar.png","image":"/images/avatar.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}}, +"/u/eviltrout.json": {"user_badges":[{"id":5870,"granted_at":"2014-05-16T02:39:38.388Z","badge_id":4,"user_id":19,"granted_by_id":-1},{"id":40673,"granted_at":"2014-03-31T14:23:18.060Z","post_id":7241,"post_number":19,"badge_id":23,"user_id":19,"granted_by_id":-1,"topic_id":3153},{"id":5868,"granted_at":"2014-05-16T02:39:38.380Z","badge_id":3,"user_id":19,"granted_by_id":-1}],"badges":[{"id":4,"name":"Leader","description":null,"grant_count":7,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":1},{"id":23,"name":"Great Share","description":null,"grant_count":14,"allow_title":false,"multiple_grant":true,"icon":"fa-certificate","image":null,"listable":true,"enabled":true,"badge_grouping_id":2,"system":true,"badge_type_id":1},{"id":3,"name":"Regular","description":null,"grant_count":30,"allow_title":true,"multiple_grant":false,"icon":"fa-user","image":null,"listable":true,"enabled":true,"badge_grouping_id":4,"system":true,"badge_type_id":2}],"badge_types":[{"id":1,"name":"Gold","sort_order":9},{"id":2,"name":"Silver","sort_order":8},{"id":3,"name":"Bronze","sort_order":7}],"users":[{"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},{"id":-1,"username":"system","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/system/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"}],"topics":[{"id":3153,"title":"Is it better for Discourse to use JavaScript or CoffeeScript?","fancy_title":"Is it better for Discourse to use JavaScript or CoffeeScript?","slug":"is-it-better-for-discourse-to-use-javascript-or-coffeescript","posts_count":56}],"user":{"user_option":{},"id":19,"username":"eviltrout","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/eviltrout/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png","name":"Robin Ward","email":"robin.ward@example.com","last_posted_at":"2015-05-07T15:23:35.074Z","last_seen_at":"2015-05-13T14:34:23.188Z","bio_raw":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","bio_cooked":"

Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.

","created_at":"2013-02-03T15:19:22.704Z","website":"http://eviltrout.com","location":"Toronto","can_edit":false,"can_edit_username":true,"can_edit_email":true,"can_edit_name":true,"stats":[{"action_type":13,"count":342,"id":null},{"action_type":12,"count":109,"id":null},{"action_type":4,"count":27,"id":null},{"action_type":5,"count":1607,"id":null},{"action_type":6,"count":771,"id":null},{"action_type":1,"count":333,"id":null},{"action_type":2,"count":2671,"id":null},{"action_type":7,"count":949,"id":null},{"action_type":9,"count":42,"id":null},{"action_type":3,"count":8,"id":null},{"action_type":11,"count":20,"id":null}],"can_send_private_messages":true,"can_send_private_message_to_user":false,"bio_excerpt":"Co-founder of Discourse. Previously, I created Forumwarz. Follow me on Twitter.","trust_level":4,"moderator":true,"admin":true,"title":"co-founder","badge_count":23,"notification_count":3244,"has_title_badges":true,"custom_fields":{},"user_fields":{"1":"33"},"pending_count":0,"post_count":1987,"can_be_deleted":false,"can_delete_all_posts":false,"locale":"","email_digests":true,"email_private_messages":true,"email_direct":true,"email_always":true,"digest_after_minutes":10080,"mailing_list_mode":false,"auto_track_topics_after_msecs":60000,"new_topic_duration_minutes":1440,"external_links_in_new_tab":false,"dynamic_favicon":true,"enable_quoting":true,"muted_category_ids":[],"tracked_category_ids":[],"watched_category_ids":[3],"private_messages_stats":{"all":101,"mine":13,"unread":3},"disable_jump_reply":false,"gravatar_avatar_upload_id":5275,"custom_avatar_upload_id":1573,"card_image_badge":"/images/avatar.png","card_image_badge_id":120,"muted_usernames":[],"invited_by":{"id":1,"username":"sam","uploaded_avatar_id":null,"avatar_template":"/letter_avatar/sam/{size}/3_f9720745f5ce6dfc2b5641fca999d934.png"},"custom_groups":[{"id":44,"automatic":false,"name":"ubuntu","user_count":11,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null},{"id":47,"automatic":false,"name":"discourse","user_count":7,"alias_level":0,"visible":true,"automatic_membership_email_domains":null,"automatic_membership_retroactive":false,"primary_group":false,"title":null}],"featured_user_badge_ids":[5870,40673,5868],"card_badge":{"id":120,"name":"Garbage Man","description":"This Discourse developer successfully called something \"garbage!\"","grant_count":3,"allow_title":false,"multiple_grant":false,"icon":"/images/avatar.png","image":"/images/avatar.png","listable":false,"enabled":false,"badge_grouping_id":8,"system":false,"badge_type_id":3}}}, "/user_actions.json": {"user_actions":[{"action_type":7,"created_at":"2014-01-16T14:13:05Z","excerpt":"So again, \n\nWhat is the problem?\n\nI need to check user_trust_level , i get the 'username' from a form via ajax, i need to check what level he is on discourse \n\nAlso, if possible, i would like to get other details as well, like email address etc. \n\nI took a look at : https://github.com/discourse/dis…","avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/bdab7e61b3191e483492fd680f563fed.png?s={size}&r=pg&d=identicon","slug":"how-to-check-the-user-level-via-ajax","topic_id":11993,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"Abhishek_Gupta","name":"Abhishek Gupta","user_id":8021,"acting_username":"Abhishek_Gupta","acting_name":"Abhishek Gupta","acting_user_id":8021,"title":"How to check the user level via ajax?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T16:53:49Z","excerpt":"A good fix would be to have the ERB template do an if statement. We'd happily accept a PR that did this if you feel up to it: \n\n <% if SiteSetting.logo_url.present? %>\n display logo html\n<% else %>\n display title html\n<% end %>","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-15T15:21:37Z","excerpt":"A good fix would be to have the ERB template do an if statement. We'd happily accept a PR that did this if you feel up to it: \n\n <% if SiteSetting.logo_url.present? %>\n display logo html\n<% else %>\n display title html\n<% end %>","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"users-activate-account-pulling-blank-logo-instead-of-defaulting-to-h2","topic_id":10911,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"/users/activate-account pulling blank logo instead of defaulting to h2","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-15T12:22:12Z","excerpt":"OK - i see what you mean. From the piwik code I should add: \n\n_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);\n\n? \n\nUnfortunately I have had to give up on Piwik for now because I have switched the forum to SSL on a free cert and have used up the free subdomain for the forum. …","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":26,"reply_to_post_number":25,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T11:16:36Z","excerpt":"@eviltrout recently added support for multiple API keys [wink] \n\n[]","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"allow-for-multiple-api-keys","topic_id":7444,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Allow for multiple API Keys","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:58:46Z","excerpt":"@eviltrout added a tooltip when you click on the user's avatar which allows you to show the posts made by that user \n\n[image]","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"to-group-posts-by-a-user","topic_id":7412,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"To group posts by a user","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T10:36:15Z","excerpt":"@eviltrout implemented per-user API key a while ago [wink] \n\n [image]\nTopics_-_Discourse_Meta-5.png884x339 29.6 KB\n","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"auth-using-rest-api","topic_id":5937,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Auth using REST API?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-15T09:55:17Z","excerpt":"@eviltrout has recently introduced this feature and has even blogged about it: \n\n \n \n \n \n eviltrout.com\n \n \n \n \n \n Hiding Offscreen Content in Ember.js - Evil Trout's Blog","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"infinite-scrolling-reusing-dom-nodes","topic_id":5186,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"zogstrip","name":"Régis Hanol","user_id":1995,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Infinite scrolling: Reusing DOM nodes","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-15T00:54:32Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:59:51Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:46:50Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T21:43:28Z","excerpt":"Thanks for your help @eviltrout! I will consider making that change and sending a pull request. I may not get to it for a while. \n\nI am embedding Discourse on another site and it is mostly going well. I have indeed been using your blog for inspiration.","avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/9cfd2536afac32d209335b092094c12c.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"znation","name":"znation","user_id":8163,"acting_username":"znation","acting_name":"znation","acting_user_id":8163,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T21:21:52Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T21:03:07Z","excerpt":"Okay I've fixed the https [point_right] http links on the server side and in the Javascript click tracking as @BhaelOchon pointed out. \n\nLet me know if you find anything else broken.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"broken-links-possibly-related-to-https","topic_id":11831,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Broken links, possibly related to HTTPS","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T20:42:51Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T20:29:23Z","excerpt":"You can retrieve a user's JSON by making a call to /users/username.json but that assumes you know the user's username. If that's impossible, I would be happy to accept a PR that would return the current user JSON from /session/current-user or something like that. \n\nAdditionally, if you're looking to…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"get-current-user-information-via-json","topic_id":11959,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Get current user information via JSON","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:20:28Z","excerpt":"Perhaps the ['trackpageView'] is not the correct API call? We can probably send more information across such as the URL.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":25,"reply_to_post_number":24,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T19:19:46Z","excerpt":"Nope but I bet you can find one!","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":3,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T18:37:05Z","excerpt":"I'd be glad to write a pull request to take use there. Is there a specific part of their documentation you have in mind?","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-14T16:04:28Z","excerpt":"Thanks @eviltrout , the code in the 'bottom of pages' now reads: \n\n<script type="text/javascript">\nDiscourse.PageTracker.current().on('change', function() {\n console.log('tracked!')\n _paq.push(['trackPageView']);\n});\n</script>\n\nThe console is logging 'tracked!' and piwik is logging for each page c…","avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/2a8/a3c/8fddcac642/{size}.jpg","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"citkane","name":"Michael Jonker","user_id":7604,"acting_username":"citkane","acting_name":"Michael Jonker","acting_user_id":7604,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:58:27Z","excerpt":"This topic is now archived. It is frozen and cannot be changed in any way.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"regression-cannot-sort-topic-list","topic_id":11944,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Regression: Cannot sort topic list","deleted":false,"hidden":false,"moderator_action":true,"edit_reason":null},{"action_type":5,"created_at":"2014-01-14T15:26:57Z","excerpt":"I do think that leading them into the official rails documentation at that point is not a bad idea. Like "congratulations, everything is ready but now you'll need to understand the platform we built it in to be productive."","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-14T08:28:00Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-14T00:21:26Z","excerpt":"In pull request 1821, @eviltrout asked: \n\n "About rails s: I wouldn't be against adding it but at what point do we stop holding their hand and expect them to know how rails works? I'm sure rails documentation could do a better job than us. Actually maybe we should just link to that? \n\nWhat point to …","avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/035d12bad251759d8fbc9fb10574d1f6.png?s={size}&r=pg&d=identicon","slug":"how-far-to-take-user-documentation","topic_id":11943,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"watchmanmonitor","name":"Watchman Monitoring","user_id":8085,"acting_username":"watchmanmonitor","acting_name":"Watchman Monitoring","acting_user_id":8085,"title":"How far to take user documentation?","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:58:28Z","excerpt":"It looks uneeded, but you need to review a fair amount of code to confirm it is not needed. \n\nI am going to keep it for now cause its safer under some weird edge conditions.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":2,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T21:11:32Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-13T21:10:57Z","excerpt":"Having a look, the fix is a bit scary imho, we should fix the root issue.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":11,"reply_to_post_number":10,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:50:34Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T20:44:56Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T20:40:21Z","excerpt":"I had to fix an issue with Google analytics so I added a new API hook that can be used. \n\nIf you add the following it should work: \n\n Discourse.PageTracker.current().on('change', function() {\n _paq.push(['trackPageView']);\n});","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:52:04Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T19:01:19Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T18:50:14Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:47:33Z","excerpt":"I am pretty sure that the denizens of SO are correct and the variable is unneeded. @sam can confirm but it seems like it was once needed for something that has since been removed and the variable declaration was left intact.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"ruby-question-about-use-of-klass-self-in-the-site-customization-rb","topic_id":11889,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Ruby question about use of klass=self in the site_customization.rb","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T18:45:41Z","excerpt":"I've just added the ability to list reply counts on your blog index and archive pages as you can see here. \n\nIt works with a similar API to embedding comments: \n\n <script type="text/javascript">\n var discourseUrl = "http://fishtank.eviltrout.com/";\n\n (function() {\n var d = document.createEleme…","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"discourse-plugin-for-static-site-generators-like-jekyll-or-octopress","topic_id":7965,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":98,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Discourse plugin for static site generators like Jekyll or Octopress","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T17:19:08Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T16:41:31Z","excerpt":"I'd love to see API support. @sam and @eviltrout, I can facilitate an intro to the piwik guys if you want—I've written about them before and they're typically super-responsive. Because I know you guys are totally hunting for new stuff to do [wink]","avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/95a/06d/c337428568/{size}.png","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":20,"reply_to_post_number":null,"username":"Lee_Ars","name":"Lee_Ars","user_id":4457,"acting_username":"Lee_Ars","acting_name":"Lee_Ars","acting_user_id":4457,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-13T16:15:51Z","excerpt":"The code looks okay but it's hard to debug this way. \n\nOne thing you could do is add a: console.log('tracked!') just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:10:41Z","excerpt":"This is really interesting. I'd like to hear your findings.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":9,"reply_to_post_number":8,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T15:02:45Z","excerpt":"The code looks okay but it's hard to debug this way. \n\nOne thing you could do is add a: console.log('tracked!') just before line 8. Then open a developer console and see if the javascript is running properly.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":18,"reply_to_post_number":16,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":5,"created_at":"2014-01-13T14:53:13Z","excerpt":"@Sam do you have any idea why only some people are getting this issue? I dont' mind the proposed fix but I'd prefer to know why it happens in the first place.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"error-after-update-to-0-9-8-1","topic_id":11903,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":10,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Error after update to 0.9.8.1","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T06:27:26Z","excerpt":"Can this be archived @eviltrout?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"search-not-working-for-staff-users","topic_id":11371,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":13,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Search not working for Staff users","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T05:32:46Z","excerpt":"When you navigate to another topic using the "suggested topics" area we are not registering a page view with Google. \n\n@eviltrout perhaps we should do this from discourse location instead of application controller?","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"google-analytics-is-not-registering-page-views","topic_id":11914,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":1,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Google analytics is not registering page views","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-13T02:50:25Z","excerpt":"@eviltrout any ideas here, the code seems correct","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"support-for-piwik-analytics-as-an-alternative-to-google-analytics","topic_id":7512,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":17,"reply_to_post_number":16,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Support for Piwik Analytics as an alternative to Google Analytics","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T22:31:35Z","excerpt":"This is an interesting approach an an interesting feature. @eviltrout your thoughts. Essentially allows us to have notifications cross tabs.","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"focus-events-track-which-window-is-the-last-active-instance-of-a-forum-edit","topic_id":11872,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":4,"reply_to_post_number":1,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Focus events: Track which window is the last active instance of a forum Edit","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-12T18:01:04Z","excerpt":"This was the link \n\nmetric_fu \n\n[metric_fu](https://github.com/metricfu/metric_fu/blob/b1bf8feb921916fc265f041efa3157a6a6530a9b/lib/metric_fu/logging/mf_debugger.rb#L24)\n\nSeems to work fine now that @eviltrout worked so hard to get us MDTest 1.1 compliant.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"underscores-in-linked-text-can-cause-markdown-bug","topic_id":10848,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Underscores in linked text can cause markdown bug","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-12T04:14:06Z","excerpt":"Awesome plugin, but doesn't seem to work out of the box with images \n\nhttps://github.com/discourse/discourse-spoiler-alert/issues/2","avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","acting_avatar_template":"//localhost:3000/uploads/default/avatars/276/f19/3826efe463/{size}.jpg","slug":"brand-new-plugin-interface","topic_id":8793,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":64,"reply_to_post_number":44,"username":"xrvk","name":"Eero Heikkinen","user_id":8068,"acting_username":"xrvk","acting_name":"Eero Heikkinen","acting_user_id":8068,"title":"Brand new plugin interface","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T23:36:11Z","excerpt":"A few things, \n\n@eviltrout myself and many others have discourse_docker hosted on DigitalOcean, my user cpu is usually around 2% I have plenty of capacity. \n\nI know that stonehearth and other larger scale discourse work on DigitalOcean fine. Officially we strongly recommend a 2GB instance, thoug…","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon","slug":"performance-issue-on-digital-ocean-with-discourse-docker","topic_id":11895,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":2,"reply_to_post_number":null,"username":"sam","name":"Sam Saffron","user_id":1,"acting_username":"sam","acting_name":"Sam Saffron","acting_user_id":1,"title":"Performance issue on DigitalOcean with discourse_docker","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:58:23Z","excerpt":"Confirmed on try.discourse.org, this is still an issue. \n\n@eviltrout can you add that to your list -- unless you are a staff member you should not be able to delete (your own) posts from an archived topic.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"archived-discussions-still-allow-posts-to-be-deleted","topic_id":6479,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":3,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Archived discussions still allow posts to be deleted","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:35:38Z","excerpt":"Agree, @eviltrout can you make sure the usercard is using the same logic as the user page in displaying profile info?","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"usercard-does-not-resize-for-obnoxiously-large-images","topic_id":11007,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Usercard does not resize for obnoxiously large images","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-11T00:34:06Z","excerpt":"@eviltrout can you make sure the "import post" button is suppressed on the user page when editing "about me"? \n\n(I agree it is like a "lose all my work" button on that page if you happen to press it..) \n\nThen I can archive this.","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"quote-post-button-should-be-disabled-or-raise-an-error-when-creating-a-new-topic","topic_id":834,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":4,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"\"Quote Post\" button should be disabled or raise an error when creating a new topic","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":7,"created_at":"2014-01-10T21:00:11Z","excerpt":">\n\nLooks good now. Thanks for these fixes @eviltrout, we (and markdown-js) are now MDTest 1.1 compliant!","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"text-editor-issue-with-the-code-block","topic_id":10050,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":5,"reply_to_post_number":null,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Text Editor issue with the code block","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":1,"created_at":"2014-01-10T20:07:46Z","excerpt":"We can't repro that one, also seems a bit obscure. But thank you very much for all the reports, whenever I see a bug entry from YOU I always know it is going to be a good one based on experience here and elsewhere. [trophy]","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","slug":"security-error-on-console-noticed-on-meta","topic_id":11825,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"codinghorror","name":"Jeff Atwood","user_id":32,"acting_username":"eviltrout","acting_name":"Robin Ward","acting_user_id":19,"title":"Security Error on console (noticed on meta)","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:48:08Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"codinghorror","acting_name":"Jeff Atwood","acting_user_id":32,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T19:47:17Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/42776c4982dff1fa45ee8248532f8ad0.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"neil","acting_name":"Neil","acting_user_id":2,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:39:24Z","excerpt":"We should consider doing what Google Drive does: they intercept cmd-f and pop up a box that allows you to dynamically search.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"ctrl-f-search-is-interrupted-by-quotation-popup","topic_id":7114,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":12,"reply_to_post_number":11,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Ctrl+F search is interrupted by quotation popup","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:29:15Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/5120fc4e345db0d1a964888272073819.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"riking","acting_name":"Kane York","acting_user_id":6626,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T17:24:37Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"zogstrip","acting_name":"Régis Hanol","acting_user_id":1995,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":6,"created_at":"2014-01-10T17:02:35Z","excerpt":"Fixed [smile] \n\ntop - 12:02:00 up 12 days, 2:16, 1 user, load average: 0.28, 0.92, 0.97\nTasks: 115 total, 1 running, 114 sleeping, 0 stopped, 0 zombie\nCpu0 : 0.7%us, 0.3%sy, 0.0%ni, 99.0%id, 0.0%wa, 0.0%hi, 0.0%si, 0.0%st\nCpu1 : 0.7%us, 0.3%sy, 0.0%ni, 99.0%id, 0.0%wa, 0.0%hi,…","avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","acting_avatar_template":"//localhost:3000/uploads/default/avatars/886/ea8/e533d87fd9/{size}.png","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":23,"reply_to_post_number":22,"username":"michaeld","name":"Michael","user_id":6548,"acting_username":"michaeld","acting_name":"Michael","acting_user_id":6548,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null},{"action_type":2,"created_at":"2014-01-10T16:58:12Z","excerpt":"Thanks for letting us know. It turns out that by using minutely(5) instead of minutely causes ice_cube to peg a core at 100% usage. I've pushed out a fix in master.","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon","acting_avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg","slug":"sidekiq-cpu-load-since-latest-release","topic_id":9515,"target_user_id":19,"target_name":"Robin Ward","target_username":"eviltrout","post_number":22,"reply_to_post_number":null,"username":"eviltrout","name":"Robin Ward","user_id":19,"acting_username":"trident","acting_name":"Ben T","acting_user_id":5707,"title":"Sidekiq CPU load since latest release","deleted":false,"hidden":false,"moderator_action":false,"edit_reason":null}]}, "/topics/created-by/eviltrout.json": {"users":[{"id":19,"username":"eviltrout","avatar_template":"//www.gravatar.com/avatar/c6e17f2ae2a215e87ff9e878a4e63cd9.png?s={size}&r=pg&d=identicon"},{"id":5460,"username":"ned","avatar_template":"//localhost:3000/uploads/default/avatars/06b/90d/3b3ea7e56b/{size}.png"},{"id":402,"username":"thebrianbarlow","avatar_template":"//www.gravatar.com/avatar/5ddf2459e8edd6cf52dfff6cb41ca70d.png?s={size}&r=pg&d=identicon"},{"id":5707,"username":"trident","avatar_template":"//localhost:3000/uploads/default/avatars/527/614/d16e1504d9/{size}.jpg"},{"id":32,"username":"codinghorror","avatar_template":"//www.gravatar.com/avatar/51d623f33f8b83095db84ff35e15dbe8.png?s={size}&r=pg&d=identicon"},{"id":1995,"username":"zogstrip","avatar_template":"//www.gravatar.com/avatar/b7797beb47cfb7aa0fe60d09604aaa09.png?s={size}&r=pg&d=identicon"},{"id":2702,"username":"ryanflorence","avatar_template":"//www.gravatar.com/avatar/749001c9fe6927c4b069a45c2a3d68f7.png?s={size}&r=pg&d=identicon"},{"id":9,"username":"tms","avatar_template":"//www.gravatar.com/avatar/3981cd271c302f5cba628c6b6d2b32ee.png?s={size}&r=pg&d=identicon"},{"id":1,"username":"sam","avatar_template":"//www.gravatar.com/avatar/3dcae8378d46c244172a115c28ca49ce.png?s={size}&r=pg&d=identicon"},{"id":2636,"username":"lonnon","avatar_template":"//www.gravatar.com/avatar/9489ef302fbff6c19bba507d09f8cd1d.png?s={size}&r=pg&d=identicon"}],"topic_list":{"can_create_topic":false,"draft":null,"draft_key":"new_topic","draft_sequence":null,"topics":[{"id":7764,"title":"New: Reply via Email Support!","fancy_title":"New: Reply via Email Support!","slug":"new-reply-via-email-support","posts_count":32,"reply_count":24,"highest_post_number":35,"image_url":"/uploads/meta_discourse/1227/8f4e5818dfaa56c7.png","created_at":"2013-06-25T11:58:39.000-04:00","last_posted_at":"2014-01-09T18:53:06.000-05:00","bumped":true,"bumped_at":"2014-01-09T17:09:40.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":2201,"like_count":46,"has_summary":false,"archetype":"regular","last_poster_username":"codinghorror","category_id":2,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":5460},{"extras":null,"description":"Frequent Poster","user_id":402},{"extras":null,"description":"Frequent Poster","user_id":5707},{"extras":"latest","description":"Most Recent Poster","user_id":32}]},{"id":9318,"title":"Discourse has a new Markdown Parser!","fancy_title":"Discourse has a new Markdown Parser!","slug":"discourse-has-a-new-markdown-parser","posts_count":1,"reply_count":0,"highest_post_number":1,"image_url":null,"created_at":"2013-08-24T14:08:06.000-04:00","last_posted_at":"2013-08-24T14:08:06.000-04:00","bumped":true,"bumped_at":"2013-08-24T14:13:25.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":812,"like_count":13,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19}]},{"id":7019,"title":"Discourse Ember Refactorings","fancy_title":"Discourse Ember Refactorings","slug":"discourse-ember-refactorings","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":null,"created_at":"2013-05-30T11:16:36.000-04:00","last_posted_at":"2013-06-02T11:22:58.000-04:00","bumped":true,"bumped_at":"2013-06-02T11:22:58.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":1075,"like_count":15,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":7,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":2702}]},{"id":4650,"title":"Migrating off Active Record Observers","fancy_title":"Migrating off Active Record Observers","slug":"migrating-off-active-record-observers","posts_count":8,"reply_count":7,"highest_post_number":8,"image_url":null,"created_at":"2013-03-11T11:26:13.000-04:00","last_posted_at":"2013-05-14T18:40:16.000-04:00","bumped":true,"bumped_at":"2013-05-14T18:40:16.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":377,"like_count":3,"has_summary":false,"archetype":"regular","last_poster_username":"sam","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":9},{"extras":null,"description":"Frequent Poster","user_id":1995},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1}]},{"id":4960,"title":"Vagrant Updates!","fancy_title":"Vagrant Updates!","slug":"vagrant-updates","posts_count":5,"reply_count":3,"highest_post_number":5,"image_url":"/plugins/emoji/images/fish.png","created_at":"2013-03-20T22:29:22.000-04:00","last_posted_at":"2013-03-21T19:06:40.000-04:00","bumped":true,"bumped_at":"2013-03-21T19:06:40.000-04:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":500,"like_count":4,"has_summary":false,"archetype":"regular","last_poster_username":"zogstrip","category_id":7,"posters":[{"extras":null,"description":"Original Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":1},{"extras":null,"description":"Frequent Poster","user_id":32},{"extras":"latest","description":"Most Recent Poster","user_id":1995}]},{"id":2918,"title":"New: Updated Docs","fancy_title":"New: Updated Docs","slug":"new-updated-docs","posts_count":3,"reply_count":2,"highest_post_number":3,"image_url":null,"created_at":"2013-02-12T12:13:02.000-05:00","last_posted_at":"2013-02-15T17:57:19.000-05:00","bumped":true,"bumped_at":"2013-02-15T17:57:19.000-05:00","unseen":false,"pinned":false,"visible":true,"closed":false,"archived":false,"views":457,"like_count":10,"has_summary":false,"archetype":"regular","last_poster_username":"eviltrout","category_id":10,"posters":[{"extras":"latest","description":"Original Poster, Most Recent Poster","user_id":19},{"extras":null,"description":"Most Posts","user_id":2636}]}]}} }; diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index 8ed14ff788..a704196dce 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -63,17 +63,17 @@ export default function() { }] }); }); - this.get(`/users/eviltrout/emails.json`, () => { + this.get(`/u/eviltrout/emails.json`, () => { return response({ email: 'eviltrout@example.com' }); }); - this.get('/users/eviltrout.json', () => { - const json = fixturesByUrl['/users/eviltrout.json']; + this.get('/u/eviltrout.json', () => { + const json = fixturesByUrl['/u/eviltrout.json']; json.user.can_edit = loggedIn(); return response(json); }); - this.get('/users/eviltrout/summary.json', () => { + this.get('/u/eviltrout/summary.json', () => { return response({ user_summary: { topics: [], @@ -85,13 +85,13 @@ export default function() { }); }); - this.get('/users/eviltrout/invited_count.json', () => { + this.get('/u/eviltrout/invited_count.json', () => { return response({ "counts": { "pending": 1, "redeemed": 0, "total": 0 } }); }); - this.get('/users/eviltrout/invited.json', () => { + this.get('/u/eviltrout/invited.json', () => { return response({ "invites": [ {id: 1} ] }); }); @@ -113,7 +113,7 @@ export default function() { return response({}); }); - this.put('/users/eviltrout.json', () => response({ user: {} })); + this.put('/u/eviltrout.json', () => response({ user: {} })); this.get("/t/280.json", () => response(fixturesByUrl['/t/280/1.json'])); this.get("/t/28830.json", () => response(fixturesByUrl['/t/28830/1.json'])); @@ -134,7 +134,7 @@ export default function() { this.delete('/draft.json', success); this.post('/draft.json', success); - this.get('/users/:username/staff-info.json', () => response({})); + this.get('/u/:username/staff-info.json', () => response({})); this.get('/post_action_users', () => { return response({ @@ -198,9 +198,9 @@ export default function() { return response(400, {error: 'invalid login'}); }); - this.post('/users/action/send_activation_email', success); + this.post('/u/action/send_activation_email', success); - this.get('/users/hp.json', function() { + this.get('/u/hp.json', function() { return response({"value":"32faff1b1ef1ac3","challenge":"61a3de0ccf086fb9604b76e884d75801"}); }); @@ -208,14 +208,14 @@ export default function() { return response({"csrf":"mgk906YLagHo2gOgM1ddYjAN4hQolBdJCqlY6jYzAYs="}); }); - this.get('/users/check_username', function(request) { + this.get('/u/check_username', function(request) { if (request.queryParams.username === 'taken') { return response({available: false, suggestion: 'nottaken'}); } return response({available: true}); }); - this.post('/users', () => response({success: true})); + this.post('/u', () => response({success: true})); this.get('/login.html', () => [200, {}, 'LOGIN PAGE']); diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6 index 5ec6d6dead..6b95c6c5f3 100644 --- a/test/javascripts/lib/pretty-text-test.js.es6 +++ b/test/javascripts/lib/pretty-text-test.js.es6 @@ -227,7 +227,7 @@ test("Mentions", function() { const alwaysTrue = { mentionLookup: (function() { return "user"; }) }; cookedOptions("Hello @sam", alwaysTrue, - "

Hello @sam

", + "

Hello @sam

", "translates mentions to links"); cooked("[@codinghorror](https://twitter.com/codinghorror)", @@ -303,11 +303,11 @@ test("Mentions", function() { "handles mentions separated by a slash."); cookedOptions("@eviltrout", alwaysTrue, - "

@eviltrout

", + "

@eviltrout

", "it doesn't onebox mentions"); cookedOptions("a @sam c", alwaysTrue, - "

a @sam c

", + "

a @sam c

", "it allows mentions within HTML tags"); }); diff --git a/test/javascripts/lib/url-test.js.es6 b/test/javascripts/lib/url-test.js.es6 index 7c420b58cc..d64adb6e38 100644 --- a/test/javascripts/lib/url-test.js.es6 +++ b/test/javascripts/lib/url-test.js.es6 @@ -1,4 +1,4 @@ -import DiscourseURL from 'discourse/lib/url'; +import { default as DiscourseURL, userPath } from 'discourse/lib/url'; module("lib:url"); @@ -25,3 +25,9 @@ test("isInternal on subfolder install", function() { not(DiscourseURL.isInternal("http://eviltrout.com/tophat"), "a url on the same host but on a different folder is not internal"); ok(DiscourseURL.isInternal("http://eviltrout.com/forum/moustache"), "a url on the same host and on the same folder is internal"); }); + +test("userPath", assert => { + assert.equal(userPath(), '/u'); + assert.equal(userPath('eviltrout'), '/u/eviltrout'); + assert.equal(userPath('hp.json'), '/u/hp.json'); +}); diff --git a/test/javascripts/lib/user-search-test.js.es6 b/test/javascripts/lib/user-search-test.js.es6 index 2b72910bff..662aa6d626 100644 --- a/test/javascripts/lib/user-search-test.js.es6 +++ b/test/javascripts/lib/user-search-test.js.es6 @@ -10,7 +10,7 @@ module("lib:user-search", { ]; }; - server.get('/users/search/users', () => { //eslint-disable-line + server.get('/u/search/users', () => { //eslint-disable-line return response( { users: [ From 14410b71fbfab6f2980f9d7d532df4a95dbcc8e9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 28 Mar 2017 14:27:54 -0400 Subject: [PATCH 022/124] Convert server side paths to use `/u/` --- .../admin/models/admin-user.js.es6 | 3 ++- .../javascripts/discourse/routes/user.js.es6 | 4 ++-- app/controllers/admin/users_controller.rb | 4 +++- app/controllers/list_controller.rb | 4 ++-- app/controllers/posts_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/models/user_action.rb | 2 +- app/views/email/_post.html.erb | 4 ++-- app/views/embed/comments.html.erb | 4 ++-- app/views/list/list.rss.erb | 2 +- app/views/robots_txt/index.erb | 1 + app/views/topics/show.html.erb | 2 +- .../user_notifications/mailing_list.html.erb | 2 +- config/locales/client.en.yml | 2 +- config/locales/server.en.yml | 24 +++++++++---------- config/routes.rb | 2 +- lib/composer_messages_finder.rb | 2 +- lib/system_message.rb | 2 +- lib/tasks/integration.rake | 2 +- script/bench.rb | 2 +- script/import_scripts/mylittleforum.rb | 4 +--- spec/components/post_creator_spec.rb | 6 ++--- spec/components/pretty_text_spec.rb | 4 ++-- spec/integration/users_spec.rb | 8 +++---- spec/models/topic_link_spec.rb | 2 +- .../acceptance/password-reset-test.js.es6 | 2 +- .../plugin-outlet-connector-class-test.js.es6 | 2 +- .../plugin-outlet-multi-template-test.js.es6 | 2 +- .../plugin-outlet-single-template-test.js.es6 | 2 +- .../acceptance/preferences-test.js.es6 | 10 ++++---- .../javascripts/acceptance/search-test.js.es6 | 2 +- .../acceptance/user-anonymous-test.js.es6 | 12 +++++----- test/javascripts/acceptance/user-test.js.es6 | 8 +++---- .../fixtures/group-fixtures.js.es6 | 8 +++---- test/javascripts/lib/computed-test.js.es6 | 6 ++--- test/javascripts/lib/discourse-test.js.es6 | 4 ++-- test/javascripts/lib/pretty-text-test.js.es6 | 4 ++-- .../widgets/poster-name-test.js.es6 | 4 ++-- 38 files changed, 82 insertions(+), 80 deletions(-) diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6 index 48764b671d..4c952d953f 100644 --- a/app/assets/javascripts/admin/models/admin-user.js.es6 +++ b/app/assets/javascripts/admin/models/admin-user.js.es6 @@ -5,6 +5,7 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; import ApiKey from 'admin/models/api-key'; import Group from 'discourse/models/group'; import TL3Requirements from 'admin/models/tl3-requirements'; +import { userPath } from 'discourse/lib/url'; const AdminUser = Discourse.User.extend({ @@ -346,7 +347,7 @@ const AdminUser = Discourse.User.extend({ }, sendActivationEmail() { - return ajax('/users/action/send_activation_email', { + return ajax(userPath('action/send_activation_email'), { type: 'POST', data: { username: this.get('username') } }).then(function() { diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6 index 936ebadfcc..2ab3296925 100644 --- a/app/assets/javascripts/discourse/routes/user.js.es6 +++ b/app/assets/javascripts/discourse/routes/user.js.es6 @@ -83,14 +83,14 @@ export default Discourse.Route.extend({ activate() { this._super(); const user = this.modelFor('user'); - this.messageBus.subscribe("/users/" + user.get('username_lower'), function(data) { + this.messageBus.subscribe("/u/" + user.get('username_lower'), function(data) { user.loadUserAction(data); }); }, deactivate() { this._super(); - this.messageBus.unsubscribe("/users/" + this.modelFor('user').get('username_lower')); + this.messageBus.unsubscribe("/u/" + this.modelFor('user').get('username_lower')); // Remove the search context this.searchService.set('searchContext', null); diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 8fdd4b9536..c0e9791116 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -348,7 +348,9 @@ class Admin::UsersController < Admin::AdminController email_token: email_token.token) end - render json: success_json.merge!(password_url: "#{Discourse.base_url}/users/password-reset/#{email_token.token}") + render json: success_json.merge!( + password_url: "#{Discourse.base_url}#{password_reset_token_path(token: email_token.token)}" + ) end diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 69391459d8..b0f9efcf31 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -192,8 +192,8 @@ class ListController < ApplicationController target_user = fetch_user_from_params @title = "#{SiteSetting.title} - #{I18n.t("rss_description.user_topics", username: target_user.username)}" - @link = "#{Discourse.base_url}/users/#{target_user.username}/activity/topics" - @atom_link = "#{Discourse.base_url}/users/#{target_user.username}/activity/topics.rss" + @link = "#{Discourse.base_url}/u/#{target_user.username}/activity/topics" + @atom_link = "#{Discourse.base_url}/u/#{target_user.username}/activity/topics.rss" @description = I18n.t("rss_description.user_topics", username: target_user.username) @topic_list = TopicQuery.new(nil, order: 'created').send("list_topics_by", target_user) diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 225b01f1d6..8531c42e92 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -103,7 +103,7 @@ class PostsController < ApplicationController @posts = posts @title = "#{SiteSetting.title} - #{I18n.t("rss_description.user_posts", username: user.username)}" - @link = "#{Discourse.base_url}/users/#{user.username}/activity" + @link = "#{Discourse.base_url}/u/#{user.username}/activity" @description = I18n.t("rss_description.user_posts", username: user.username) render 'posts/latest', formats: [:rss] end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6874fff56d..13eddab750 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -189,7 +189,7 @@ class UsersController < ApplicationController cookies[:destination_url] = "/my/#{params[:path]}" redirect_to "/login-preferences" else - redirect_to(path("/users/#{current_user.username}/#{params[:path]}")) + redirect_to(path("/u/#{current_user.username}/#{params[:path]}")) end end diff --git a/app/models/user_action.rb b/app/models/user_action.rb index 13e4dea91a..5e3599a381 100644 --- a/app/models/user_action.rb +++ b/app/models/user_action.rb @@ -260,7 +260,7 @@ SQL end if action.user - MessageBus.publish("/users/#{action.user.username.downcase}", action.id, user_ids: [user_id], group_ids: group_ids) + MessageBus.publish("/u/#{action.user.username.downcase}", action.id, user_ids: [user_id], group_ids: group_ids) end action diff --git a/app/views/email/_post.html.erb b/app/views/email/_post.html.erb index 3f0d21580f..569a12e058 100644 --- a/app/views/email/_post.html.erb +++ b/app/views/email/_post.html.erb @@ -9,10 +9,10 @@ <%- if show_username_on_post(post) %> - <%= post.user.username %> + <%= post.user.username %> <% end %> <%- if show_name_on_post(post) %> - <%= post.user.name %> + <%= post.user.name %> <% end %> <%- if post.user.title.present? %> <%= post.user.title %> diff --git a/app/views/embed/comments.html.erb b/app/views/embed/comments.html.erb index 29ab277232..23f69584fe 100644 --- a/app/views/embed/comments.html.erb +++ b/app/views/embed/comments.html.erb @@ -16,11 +16,11 @@ <%- end %>
- +

- <%= post.user.username %> + <%= post.user.username %> <%- if post.user.title.present? %> <%= post.user.title %> <%- end %> diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb index d0f6c14957..69799bc593 100644 --- a/app/views/list/list.rss.erb +++ b/app/views/list/list.rss.erb @@ -20,7 +20,7 @@ <%= topic.category.name %> -

<%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/users/#{topic.user.username_lower}")).html_safe %>

+

<%= t('author_wrote', author: link_to("@#{username}", "#{Discourse.base_url}/u/#{topic.user.username_lower}")).html_safe %>

<% end %>
<%= topic.posts.first.cooked.html_safe %> diff --git a/app/views/robots_txt/index.erb b/app/views/robots_txt/index.erb index 8ae193da42..e4c6a446bc 100644 --- a/app/views/robots_txt/index.erb +++ b/app/views/robots_txt/index.erb @@ -10,6 +10,7 @@ Disallow: /auth/github/callback Disallow: /auth/cas/callback Disallow: /assets/browser-update*.js Disallow: /users/ +Disallow: /u/ Disallow: /badges/ Disallow: /search Disallow: /search/ diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 73ef1724b6..e24626f203 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -46,7 +46,7 @@ <% if (u = post.user) %>
- + <%= "(#{u.name})" if (SiteSetting.display_name_on_posts && SiteSetting.enable_names? && !u.name.blank?) %>
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 044a99738a..749f98cdba 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1481,8 +1481,12 @@ en: all: units: "" examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).' + temp_open: + title: "Open Temporarily" auto_reopen: title: "Auto-open Topic" + temp_close: + title: "Close Temporarily" auto_close: title: "Auto-Close Topic" label: "Auto-close topic time:" From ed577fbff8fbfdc81379421d9bfb694ee5e2d1d8 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 14:35:05 +0800 Subject: [PATCH 031/124] FEATURE: Pause a topic instead of permanently closing when flag threshold is reached. --- app/models/post_action.rb | 14 ++++++++++++-- config/locales/server.en.yml | 5 ++++- config/site_settings.yml | 3 +++ spec/models/post_action_spec.rb | 15 ++++++++++----- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index e90767a087..39d36c2242 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -497,8 +497,18 @@ SQL return if flags.sum { |f| f[1] } < SiteSetting.num_flags_to_close_topic # the threshold has been reached, we will close the topic waiting for intervention - message = I18n.t("temporarily_closed_due_to_flags") - topic.update_status("closed", true, Discourse.system_user, message: message) + topic.update_status("closed", true, Discourse.system_user, + message: I18n.t( + "temporarily_closed_due_to_flags", + count: SiteSetting.num_hours_to_close_topic + ) + ) + + topic.set_or_create_status_update( + TopicStatusUpdate.types[:open], + SiteSetting.num_hours_to_close_topic, + by_user: Discourse.system_user + ) end def self.auto_hide_if_needed(acting_user, post, post_action_type) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 12ee021f74..9108c34887 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1286,6 +1286,7 @@ en: num_flaggers_to_close_topic: "Minimum number of unique flaggers that is required to automatically pause a topic for intervention" num_flags_to_close_topic: "Minimum number of active flags that is required to automatically pause a topic for intervention" + num_hours_to_close_topic: "Number of hours to pause a topic for intervention." auto_respond_to_flag_actions: "Enable automatic reply when disposing a flag." min_first_post_typing_time: "Minimum amount of time in milliseconds a user must type during first post, if threshold is not met post will automatically enter the needs approval queue. Set to 0 to disable (not recommended)" @@ -1912,7 +1913,9 @@ en: deferred: "Thanks for letting us know. We're looking into it." deferred_and_deleted: "Thanks for letting us know. We've removed the post." - temporarily_closed_due_to_flags: "This topic is temporarily closed due to a large number of community flags." + temporarily_closed_due_to_flags: + one: "This topic is temporarily closed for 1 hour due to a large number of community flags." + other: "This topic is temporarily closed for %{count} hours due to a large number of community flags." system_messages: post_hidden: diff --git a/config/site_settings.yml b/config/site_settings.yml index 7302d23e90..eb36c891b4 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -944,6 +944,9 @@ spam: max_age_unmatched_ips: 365 num_flaggers_to_close_topic: 5 num_flags_to_close_topic: 12 + num_hours_to_close_topic: + default: 4 + min: 1 auto_respond_to_flag_actions: true min_first_post_typing_time: 3000 auto_block_fast_typers_on_first_post: true diff --git a/spec/models/post_action_spec.rb b/spec/models/post_action_spec.rb index aa7daba215..9ed0e70499 100644 --- a/spec/models/post_action_spec.rb +++ b/spec/models/post_action_spec.rb @@ -447,11 +447,11 @@ describe PostAction do expect(post.hidden).to eq(false) end - it "will automatically close a topic due to large community flagging" do - SiteSetting.stubs(:flags_required_to_hide_post).returns(0) - - SiteSetting.stubs(:num_flags_to_close_topic).returns(3) - SiteSetting.stubs(:num_flaggers_to_close_topic).returns(2) + it "will automatically pause a topic due to large community flagging" do + SiteSetting.flags_required_to_hide_post = 0 + SiteSetting.num_flags_to_close_topic = 3 + SiteSetting.num_flaggers_to_close_topic = 2 + SiteSetting.num_hours_to_close_topic = 1 topic = Fabricate(:topic) post1 = create_post(topic: topic) @@ -490,6 +490,11 @@ describe PostAction do expect(topic.reload.closed).to eq(true) + topic_status_update = TopicStatusUpdate.last + + expect(topic_status_update.topic).to eq(topic) + expect(topic_status_update.execute_at).to be_within(1.second).of(1.hour.from_now) + expect(topic_status_update.status_type).to eq(TopicStatusUpdate.types[:open]) end end From b6e9871b4b48d2e5b176accf921014f7b447b721 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 15:02:36 +0800 Subject: [PATCH 032/124] Update `Topic#closed` client side when closing/opening a topic temporarily. --- .../discourse/controllers/edit-topic-status-update.js.es6 | 1 + app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 | 1 - app/controllers/topics_controller.rb | 3 ++- spec/integration/managing_topic_status_spec.rb | 2 ++ 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 index b07fcd2f3e..27c3a13c16 100644 --- a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 @@ -71,6 +71,7 @@ export default Ember.Controller.extend(ModalFunctionality, { this.send('closeModal'); this.set('topicStatusUpdate.execute_at', result.execute_at); this.set('topicStatusUpdate.duration', result.duration); + this.set('model.closed', result.closed); } else { this.set('topicStatusUpdate', Ember.Object.create({})); this.set('selection', null); diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index ca925d343d..6b927c05fc 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -347,7 +347,6 @@ export default createWidget('topic-timeline', { result.push(h('div.title', elems)); } - if (!attrs.fullScreen && currentUser && currentUser.get('canManageTopic')) { result.push(h('div.timeline-controls', this.attach('topic-admin-menu-button', { topic }))); } diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 257744a359..42d76310f3 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -310,7 +310,8 @@ class TopicsController < ApplicationController render json: success_json.merge!({ execute_at: topic_status_update&.execute_at, duration: topic_status_update&.duration, - based_on_last_post: topic_status_update&.based_on_last_post + based_on_last_post: topic_status_update&.based_on_last_post, + closed: topic.closed }) else render_json_error(topic) diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb index 4e59f9c3df..a70f2141d0 100644 --- a/spec/integration/managing_topic_status_spec.rb +++ b/spec/integration/managing_topic_status_spec.rb @@ -56,6 +56,7 @@ RSpec.describe "Managing a topic's status update", type: :request do .to be_within(1.seconds).of(DateTime.parse(topic_status_update.execute_at.to_s)) expect(json['duration']).to eq(topic_status_update.duration) + expect(json['closed']).to eq(topic.reload.closed) end it 'should be able to delete a topic status update' do @@ -72,6 +73,7 @@ RSpec.describe "Managing a topic's status update", type: :request do expect(json['execute_at']).to eq(nil) expect(json['duration']).to eq(nil) + expect(json['closed']).to eq(topic.closed) end describe 'invalid status type' do From 2fd1c49b88dcae814eef6244c01f3cca6f75cd49 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 31 Mar 2017 00:12:07 -0700 Subject: [PATCH 033/124] we don't need this IE 10 tag any more, see http://stackoverflow.com/questions/26346917/why-use-x-ua-compatible-ie-edge-anymore --- config/nginx.sample.conf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf index 46a865e334..f36d290f4e 100644 --- a/config/nginx.sample.conf +++ b/config/nginx.sample.conf @@ -63,13 +63,6 @@ server { # path to discourse's public directory set $public /var/www/discourse/public; - # Prevent Internet Explorer 10 "compatibility mode", which breaks Discourse. - # If other subdomains under your domain are supposed to use Internet Explorer Compatibility mode, - # it may be used for this one too, unless you explicitly tell IE not to use it. Alternatively, - # some people have reported having compatibility mode "stuck" on for some reason. - # (This will also prevent compatibility mode in IE 8 and 9, but those browsers aren't supported anyway. - add_header X-UA-Compatible "IE=edge"; - # without weak etags we get zero benefit from etags on dynamically compressed content # further more etags are based on the file in nginx not sha of data # use dates, it solves the problem fine even cross server From 0bbad5040a209a2ca04289aa7e8176aa7cc25184 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 15:56:09 +0800 Subject: [PATCH 034/124] `topic-status-info` component wasn't updated when topic is closed/opened. --- .../components/topic-status-info.js.es6 | 11 ++++++----- .../discourse/controllers/topic.js.es6 | 6 +++++- .../javascripts/discourse/models/topic.js.es6 | 2 +- app/controllers/topics_controller.rb | 7 ++++++- spec/controllers/topics_controller_spec.rb | 19 ++++++++++++------- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 index 9545a022a0..86bf080069 100644 --- a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 @@ -4,13 +4,14 @@ export default Ember.Component.extend(bufferedRender({ elementId: 'topic-status-info', delayedRerender: null, - rerenderTriggers: ['topic.closed', - 'topic.topic_status_update.execute_at', - 'topic.topic_status_update.based_on_last_post', - 'topic.topic_status_update.duration'], + rerenderTriggers: [ + 'topic.topic_status_update', + 'topic.topic_status_update.execute_at', + 'topic.topic_status_update.based_on_last_post', + 'topic.topic_status_update.duration' + ], buildBuffer(buffer) { - if (Ember.isEmpty(this.get('topic.topic_status_update.execute_at'))) return; if (!this.get('topic.topic_status_update')) return; let statusUpdateAt = moment(this.get('topic.topic_status_update.execute_at')); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index a774cb8ad0..28c929189d 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -588,7 +588,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { }, toggleClosed() { - this.get('content').toggleStatus('closed'); + const topic = this.get('content'); + + this.get('content').toggleStatus('closed').then(result => { + topic.set('topic_status_update', result.topic_status_update); + }); }, recoverTopic() { diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index a40aecc3f7..67c6a9b40b 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -223,7 +223,7 @@ const Topic = RestModel.extend({ toggleStatus(property) { this.toggleProperty(property); - this.saveStatus(property, !!this.get(property)); + return this.saveStatus(property, !!this.get(property)); }, saveStatus(property, value, until) { diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 42d76310f3..e7ca1a34c1 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -273,7 +273,12 @@ class TopicsController < ApplicationController @topic = Topic.find_by(id: topic_id) guardian.ensure_can_moderate!(@topic) @topic.update_status(status, enabled, current_user, until: params[:until]) - render nothing: true + + render json: success_json.merge!( + topic_status_update: TopicStatusUpdateSerializer.new( + TopicStatusUpdate.find_by(topic: @topic), root: false + ) + ) end def mute diff --git a/spec/controllers/topics_controller_spec.rb b/spec/controllers/topics_controller_spec.rb index 6377403e32..4aad6443d7 100644 --- a/spec/controllers/topics_controller_spec.rb +++ b/spec/controllers/topics_controller_spec.rb @@ -412,14 +412,19 @@ describe TopicsController do expect { xhr :put, :status, topic_id: @topic.id, status: 'title', enabled: 'true' }.to raise_error(Discourse::InvalidParameters) end - it 'calls update_status on the forum topic with false' do - Topic.any_instance.expects(:update_status).with('closed', false, @user, until: nil) - xhr :put, :status, topic_id: @topic.id, status: 'closed', enabled: 'false' - end + it 'should update the status of the topic correctly' do + @topic = Fabricate(:topic, user: @user, closed: true, topic_status_updates: [ + Fabricate(:topic_status_update, status_type: TopicStatusUpdate.types[:open]) + ]) - it 'calls update_status on the forum topic with true' do - Topic.any_instance.expects(:update_status).with('closed', true, @user, until: nil) - xhr :put, :status, topic_id: @topic.id, status: 'closed', enabled: 'true' + xhr :put, :status, topic_id: @topic.id, status: 'closed', enabled: 'false' + + expect(response).to be_success + expect(@topic.reload.closed).to eq(false) + + body = JSON.parse(response.body) + + expect(body['topic_status_update']).to eq(nil) end end From 78d87a79eb5a2497d008f2550568e4a8e794a188 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 16:47:49 +0800 Subject: [PATCH 035/124] UX: Improve `.modal-header` style on mobile. --- .../javascripts/discourse/templates/modal.hbs | 7 +++++-- app/assets/stylesheets/desktop/modal.scss | 9 +++++++-- app/assets/stylesheets/mobile/modal.scss | 17 +++++++++-------- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/app/assets/javascripts/discourse/templates/modal.hbs b/app/assets/javascripts/discourse/templates/modal.hbs index 3d778a0476..5783f544aa 100644 --- a/app/assets/javascripts/discourse/templates/modal.hbs +++ b/app/assets/javascripts/discourse/templates/modal.hbs @@ -3,10 +3,13 @@
- {{fa-icon "times"}}

{{title}}

-
+ +
+ {{fa-icon "times"}} +
+ {{outlet "modalBody"}} {{#each errors as |error|}} diff --git a/app/assets/stylesheets/desktop/modal.scss b/app/assets/stylesheets/desktop/modal.scss index fd82268119..cf751ad717 100644 --- a/app/assets/stylesheets/desktop/modal.scss +++ b/app/assets/stylesheets/desktop/modal.scss @@ -46,15 +46,20 @@ margin-left: -1px; } +.modal-close { + display: inline-block; + float: right; + margin: 7px; +} + .modal-header { h3 { + display: inline-block;; font-size: 1.429em; padding: 10px 15px 7px; } - .close {margin: 10px;} } .close { - float: right; font-size: 1.429em; text-decoration: none; color: dark-light-choose(scale-color($primary, $lightness: 35%), scale-color($secondary, $lightness: 65%)); diff --git a/app/assets/stylesheets/mobile/modal.scss b/app/assets/stylesheets/mobile/modal.scss index f94a9facd5..8b2498f1bc 100644 --- a/app/assets/stylesheets/mobile/modal.scss +++ b/app/assets/stylesheets/mobile/modal.scss @@ -49,23 +49,24 @@ margin-bottom: 5px; } +.modal-close { + display: inline-block; + float: right; +} + .modal-header { - // we need tighter spacing on mobile for header - // this clearfix under the modal title h3 pushes it way down - .clearfix { - display:none; - } + padding: 10px 0px; + h3 { + display: inline-block; font-size: 1.286em; padding-left: 15px; - margin-bottom: 5px; + margin: 0px; } } .close { - float: right; font-size: 1.714em; padding: 10px 15px 5px 5px; - margin: -15px 0 0 0; color: $primary; } From 04edbea6936c039c551bd98bbc95dc70de19ad46 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 17:13:20 +0800 Subject: [PATCH 036/124] UX: Remove width on `.auto-update-input`. --- app/assets/stylesheets/common/base/compose.scss | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index b0076abdb0..de5b4f6f01 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -140,9 +140,6 @@ div.ac-wrap { label { font-size: 1em; } - input { - width: 150px; - } .examples { color: lighten($primary, 40%); } @@ -187,5 +184,3 @@ div.ac-wrap { .cooked > *:first-child { margin-top: 0; } - - From 7690cc6ca50d48c86449dd9c7bf16301aa31ebc4 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 31 Mar 2017 17:24:24 +0800 Subject: [PATCH 037/124] UX: Don't try to figure out root domain. --- app/assets/javascripts/discourse/widgets/topic-map.js.es6 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 index 7d4c89c0b3..aca0c8aae2 100644 --- a/app/assets/javascripts/discourse/widgets/topic-map.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-map.js.es6 @@ -159,8 +159,7 @@ createWidget('topic-map-expanded', { if (l.title && l.title.length) { const domain = l.domain; if (domain && domain.length) { - const s = domain.split('.'); - host = h('span.domain', s[s.length-2] + "." + s[s.length-1]); + host = h('span.domain', domain); } } From 2418daeb634ed40fcef1a272bde0f45d6b63b335 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 31 Mar 2017 17:57:46 +0530 Subject: [PATCH 038/124] FIX: check if post exists in topic --- app/models/topic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index e5a95d70ee..2cd63d151f 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -970,7 +970,7 @@ SQL num_hours = time.to_f if num_hours > 0 - last_post_created_at = self.ordered_posts.last.created_at || time_now + last_post_created_at = self.ordered_posts.last.present? ? self.ordered_posts.last.created_at : time_now topic_status_update.execute_at = last_post_created_at + num_hours.hours topic_status_update.created_at = last_post_created_at end From d5d5cfc2f4ccd2767ac949e101b2a73f7daa4941 Mon Sep 17 00:00:00 2001 From: jomaxro Date: Fri, 31 Mar 2017 12:48:32 -0400 Subject: [PATCH 039/124] Mobile CSS for deleted topics is inconsistent with desktop css - mobile targets a less specific class --- app/assets/stylesheets/mobile/topic-post.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index c13be8a7c4..1c06d3d379 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -475,7 +475,9 @@ button.select-post { .deleted { - background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); + .topic-body { + background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); + } } .deleted-user-avatar { From 62be1213285a8eb1c4e8375fe6c0bda4f0ca49c7 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 31 Mar 2017 13:00:52 -0400 Subject: [PATCH 040/124] FIX: On long browsers, you could get a double title --- .../discourse/components/discourse-topic.js.es6 | 7 ++++--- app/assets/javascripts/discourse/lib/lock-on.js.es6 | 2 ++ app/assets/javascripts/discourse/lib/url.js.es6 | 4 ++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 index 4c717b3049..ba81a63bf3 100644 --- a/app/assets/javascripts/discourse/components/discourse-topic.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-topic.js.es6 @@ -37,7 +37,7 @@ export default Ember.Component.extend(AddArchetypeClass, Scrolling, { const enteredAt = this.get('enteredAt'); if (enteredAt && (this.get('lastEnteredAt') !== enteredAt)) { this._lastShowTopic = null; - this.scrolled(); + Ember.run.schedule('afterRender', () => this.scrolled()); this.set('lastEnteredAt', enteredAt); } }, @@ -131,20 +131,21 @@ export default Ember.Component.extend(AddArchetypeClass, Scrolling, { } } + this.set('hasScrolled', offset > 0); const topic = this.get('topic'); const showTopic = this.showTopicInHeader(topic, offset); if (showTopic !== this._lastShowTopic) { - this._lastShowTopic = showTopic; - if (showTopic) { this.appEvents.trigger('header:show-topic', topic); + this._lastShowTopic = true; } else { if (!DiscourseURL.isJumpScheduled()) { const loadingNear = topic.get('postStream.loadingNearPost') || 1; if (loadingNear === 1) { this.appEvents.trigger('header:hide-topic'); + this._lastShowTopic = false; } } } diff --git a/app/assets/javascripts/discourse/lib/lock-on.js.es6 b/app/assets/javascripts/discourse/lib/lock-on.js.es6 index d6b9594584..10c3542670 100644 --- a/app/assets/javascripts/discourse/lib/lock-on.js.es6 +++ b/app/assets/javascripts/discourse/lib/lock-on.js.es6 @@ -55,6 +55,8 @@ export default class LockOn { const interval = setInterval(() => { let top = this.elementTop(); + if (top < 0) { top = 0; } + const scrollTop = $(window).scrollTop(); if (typeof(top) === "undefined" || isNaN(top)) { diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 80dbdef6d2..84d319a6a9 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -108,6 +108,10 @@ const DiscourseURL = Ember.Object.extend({ } lockon.lock(); + if (lockon.elementTop() < 1) { + _transitioning = false; + return; + } }); }, From f42b6054e6588a37a91b48087d91075351ed2b77 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 31 Mar 2017 13:17:12 -0400 Subject: [PATCH 041/124] FIX: Class names should be dasherized, not underscored --- .../discourse/components/notifications-button.js.es6 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/components/notifications-button.js.es6 b/app/assets/javascripts/discourse/components/notifications-button.js.es6 index 2695cfc918..10f5d54f26 100644 --- a/app/assets/javascripts/discourse/components/notifications-button.js.es6 +++ b/app/assets/javascripts/discourse/components/notifications-button.js.es6 @@ -22,7 +22,7 @@ export default DropdownButton.extend({ id: l.id, title: I18n.t(`${start}.title`), description: I18n.t(`${start}.description`), - styleClasses: `${l.key} fa fa-${l.icon}` + styleClasses: `${l.key.dasherize()} fa fa-${l.icon}` }; }); }, @@ -31,7 +31,7 @@ export default DropdownButton.extend({ text(notificationLevel) { const details = buttonDetails(notificationLevel); const { key } = details; - const icon = iconHTML(details.icon, { class: key }); + const icon = iconHTML(details.icon, { class: key.dasherize() }); if (this.get('buttonIncludesText')) { const prefix = this.get('i18nPrefix'); From 893e93dfbeef78593e6775f71a1c34f92c6c1665 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 30 Mar 2017 15:19:51 -0400 Subject: [PATCH 042/124] New badge, Rookie of the Month, for two new high quality users. --- app/jobs/scheduled/calculate_avg_time.rb | 1 - app/jobs/scheduled/grant_rookie_badges.rb | 63 +++++++++++++++++++++ app/models/badge.rb | 2 + config/locales/server.en.yml | 5 ++ db/fixtures/006_badges.rb | 14 +++++ spec/jobs/grant_rookie_badges_spec.rb | 68 +++++++++++++++++++++++ 6 files changed, 152 insertions(+), 1 deletion(-) create mode 100644 app/jobs/scheduled/grant_rookie_badges.rb create mode 100644 spec/jobs/grant_rookie_badges_spec.rb diff --git a/app/jobs/scheduled/calculate_avg_time.rb b/app/jobs/scheduled/calculate_avg_time.rb index e842285ab4..c0bc9387e4 100644 --- a/app/jobs/scheduled/calculate_avg_time.rb +++ b/app/jobs/scheduled/calculate_avg_time.rb @@ -1,5 +1,4 @@ module Jobs - class CalculateAvgTime < Jobs::Scheduled every 1.day diff --git a/app/jobs/scheduled/grant_rookie_badges.rb b/app/jobs/scheduled/grant_rookie_badges.rb new file mode 100644 index 0000000000..7913cc0ead --- /dev/null +++ b/app/jobs/scheduled/grant_rookie_badges.rb @@ -0,0 +1,63 @@ +require 'badge_granter' + +module Jobs + class GrantRookieBadges < Jobs::Scheduled + every 1.month + + MAX_AWARDED = 2 + + def execute(args) + badge = Badge.find(Badge::RookieOfTheMonth) + scores.each do |user_id, score| + # Don't bother awarding to users who haven't received any likes + if score > 0.0 + BadgeGranter.grant(badge, User.find(user_id)) + end + end + end + + def scores + scores = {} + + # Find recent accounts and come up with a score based on how many likes they + # received, based on how much they posted and how old the accounts of the people + # who voted on them are. + sql = <<~SQL + SELECT u.id, + SUM(CASE + WHEN pa.id IS NOT NULL THEN + CASE + WHEN liked_by.created_at > (CURRENT_TIMESTAMP - '1 week'::INTERVAL) THEN 0.1 + WHEN liked_by.created_at > (CURRENT_TIMESTAMP - '1 month'::INTERVAL) THEN 0.5 + ELSE 1.0 + END + ELSE 0 + END) / COUNT(DISTINCT p.id) AS score + FROM users AS u + INNER JOIN user_stats AS us ON u.id = us.user_id + LEFT OUTER JOIN posts AS p ON p.user_id = u.id + LEFT OUTER JOIN post_actions AS pa ON + pa.post_id = p.id AND pa.post_action_type_id = :like + LEFT OUTER JOIN users AS liked_by ON liked_by.id = pa.user_id + WHERE u.active AND + u.id > 0 AND + NOT(u.admin) AND + NOT(u.moderator) AND + u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL + GROUP BY u.id + HAVING COUNT(p.id) > 0 + ORDER BY score DESC + LIMIT :max_awarded + SQL + + User.exec_sql(sql, { + like: PostActionType.types[:like], + max_awarded: MAX_AWARDED + }).each do |row| + scores[row['id'].to_i] = row['score'].to_f + end + scores + end + + end +end diff --git a/app/models/badge.rb b/app/models/badge.rb index ae554c4d40..d3966729d2 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -56,6 +56,8 @@ class Badge < ActiveRecord::Base GivesBack = 32 Empathetic = 39 + RookieOfTheMonth = 44 + # other consts AutobiographerMinBioLength = 10 diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 9108c34887..7d0f5635c3 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3290,6 +3290,11 @@ en: description: Replied to a Post via email long_description: | This badge is granted the first time you reply to a post via email :e-mail:. + rookie_of_the_month: + name: "Rookie of the Month" + description: Contributed a lot of value in their first month + long_description: | + This badge is granted to two high quality users who joined in the last month. The quality is determined by how many of their posts were liked and by whom. admin_login: success: "Email Sent" diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb index bccee60e10..e956ad37cc 100644 --- a/db/fixtures/006_badges.rb +++ b/db/fixtures/006_badges.rb @@ -401,6 +401,20 @@ Badge.seed do |b| b.system = true end +Badge.seed do |b| + b.id = Badge::RookieOfTheMonth + b.name = "Rookie of the Month" + b.badge_type_id = BadgeType::Bronze + b.multiple_grant = false + b.target_posts = false + b.show_posts = false + b.query = nil + b.badge_grouping_id = BadgeGrouping::GettingStarted + b.default_badge_grouping_id = BadgeGrouping::GettingStarted + b.trigger = Badge::Trigger::None + b.system = true +end + Badge.where("NOT system AND id < 100").each do |badge| new_id = [Badge.maximum(:id) + 1, 100].max old_id = badge.id diff --git a/spec/jobs/grant_rookie_badges_spec.rb b/spec/jobs/grant_rookie_badges_spec.rb new file mode 100644 index 0000000000..4ba2edbf0b --- /dev/null +++ b/spec/jobs/grant_rookie_badges_spec.rb @@ -0,0 +1,68 @@ +require 'rails_helper' +require_dependency 'jobs/scheduled/grant_rookie_badges' + +describe Jobs::GrantRookieBadges do + + let(:granter) { described_class.new } + + it "runs correctly" do + user = Fabricate(:user, created_at: 1.week.ago) + p = Fabricate(:post, user: user) + + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + + granter.execute({}) + + badge = user.user_badges.where(badge_id: Badge::RookieOfTheMonth) + expect(badge).to be_present + + end + + describe '.scores' do + + it "doesn't award it to accounts over a month old" do + user = Fabricate(:user, created_at: 2.months.ago) + Fabricate(:post, user: user) + expect(granter.scores.keys).not_to include(user.id) + end + + it "returns active accounts created in the last month" do + user = Fabricate(:user, created_at: 1.week.ago) + Fabricate(:post, user: user) + expect(granter.scores.keys).to include(user.id) + end + + it "likes from older accounts are scored higher" do + user = Fabricate(:user, created_at: 1.week.ago) + p = Fabricate(:post, user: user) + + new_user = Fabricate(:user, created_at: 2.days.ago) + med_user = Fabricate(:user, created_at: 3.weeks.ago) + old_user = Fabricate(:user, created_at: 6.months.ago) + + PostAction.act(new_user, p, PostActionType.types[:like]) + PostAction.act(med_user, p, PostActionType.types[:like]) + PostAction.act(old_user, p, PostActionType.types[:like]) + expect(granter.scores[user.id]).to eq(1.6) + + # It goes down the more they post + Fabricate(:post, user: user) + expect(granter.scores[user.id]).to eq(0.8) + end + + it "is limited to two accounts" do + u1 = Fabricate(:user, created_at: 1.week.ago) + u2 = Fabricate(:user, created_at: 2.weeks.ago) + u3 = Fabricate(:user, created_at: 3.weeks.ago) + + Fabricate(:post, user: u1) + Fabricate(:post, user: u2) + Fabricate(:post, user: u3) + + expect(granter.scores.keys.size).to eq(2) + end + + end + +end From e6f6bd34d8ef8f13b1fd2a9052aa2b5e129e8f47 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Thu, 30 Mar 2017 16:48:09 -0400 Subject: [PATCH 043/124] Send the user a notice when they've received rookie of the month --- app/jobs/scheduled/grant_rookie_badges.rb | 8 +++++++- config/locales/server.en.yml | 10 ++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/jobs/scheduled/grant_rookie_badges.rb b/app/jobs/scheduled/grant_rookie_badges.rb index 7913cc0ead..4312bc283a 100644 --- a/app/jobs/scheduled/grant_rookie_badges.rb +++ b/app/jobs/scheduled/grant_rookie_badges.rb @@ -11,7 +11,13 @@ module Jobs scores.each do |user_id, score| # Don't bother awarding to users who haven't received any likes if score > 0.0 - BadgeGranter.grant(badge, User.find(user_id)) + user = User.find(user_id) + if user.badges.where(id: Badge::RookieOfTheMonth).blank? + BadgeGranter.grant(badge, user) + SystemMessage.new(user).create('rookie_of_the_month', { + month_year: Time.now.strftime("%B %Y") + }) + end end end end diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 7d0f5635c3..8203bfa6d6 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2319,6 +2319,16 @@ en: [Please review and fix them](%{base_url}/admin). + rookie_of_the_month: + title: "You're a Rookie of the Month!" + subject_template: "You're a Rookie of the Month!" + text_body_template: | + Congratulations, you've been awarded the **Rookie of the Month award for %{month_year}**. + + You received this because you've quickly become a valuable member of the community and other members are really enjoying your posts. + + Thanks and keep up the great work! + unsubscribe_link: | To unsubscribe from these emails, [click here](%{unsubscribe_url}). From fc7fa4c0ad94fe5ef8faf37db574013bf4887e5b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 31 Mar 2017 16:30:30 -0400 Subject: [PATCH 044/124] Rename "Rookie of the Month" to "New User of the Month" --- ...dges.rb => grant_new_user_of_the_month_badges.rb} | 8 ++++---- app/models/badge.rb | 2 +- config/locales/server.en.yml | 12 ++++++------ db/fixtures/006_badges.rb | 4 ++-- ...rb => grant_new_user_of_the_month_badges_spec.rb} | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) rename app/jobs/scheduled/{grant_rookie_badges.rb => grant_new_user_of_the_month_badges.rb} (88%) rename spec/jobs/{grant_rookie_badges_spec.rb => grant_new_user_of_the_month_badges_spec.rb} (90%) diff --git a/app/jobs/scheduled/grant_rookie_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb similarity index 88% rename from app/jobs/scheduled/grant_rookie_badges.rb rename to app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 4312bc283a..2094ceb9cb 100644 --- a/app/jobs/scheduled/grant_rookie_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -1,20 +1,20 @@ require 'badge_granter' module Jobs - class GrantRookieBadges < Jobs::Scheduled + class GrantNewUserOfTheMonthBadges < Jobs::Scheduled every 1.month MAX_AWARDED = 2 def execute(args) - badge = Badge.find(Badge::RookieOfTheMonth) + badge = Badge.find(Badge::NewUserOfTheMonth) scores.each do |user_id, score| # Don't bother awarding to users who haven't received any likes if score > 0.0 user = User.find(user_id) - if user.badges.where(id: Badge::RookieOfTheMonth).blank? + if user.badges.where(id: Badge::NewUserOfTheMonth).blank? BadgeGranter.grant(badge, user) - SystemMessage.new(user).create('rookie_of_the_month', { + SystemMessage.new(user).create('new_user_of_the_month', { month_year: Time.now.strftime("%B %Y") }) end diff --git a/app/models/badge.rb b/app/models/badge.rb index d3966729d2..5ffde4726b 100644 --- a/app/models/badge.rb +++ b/app/models/badge.rb @@ -56,7 +56,7 @@ class Badge < ActiveRecord::Base GivesBack = 32 Empathetic = 39 - RookieOfTheMonth = 44 + NewUserOfTheMonth = 44 # other consts AutobiographerMinBioLength = 10 diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 8203bfa6d6..8028b728b8 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2319,11 +2319,11 @@ en: [Please review and fix them](%{base_url}/admin). - rookie_of_the_month: - title: "You're a Rookie of the Month!" - subject_template: "You're a Rookie of the Month!" + new_user_of_the_month: + title: "You're a New User of the Month!" + subject_template: "You're a New User of the Month!" text_body_template: | - Congratulations, you've been awarded the **Rookie of the Month award for %{month_year}**. + Congratulations, you've been awarded the **New User of the Month award for %{month_year}**. You received this because you've quickly become a valuable member of the community and other members are really enjoying your posts. @@ -3300,8 +3300,8 @@ en: description: Replied to a Post via email long_description: | This badge is granted the first time you reply to a post via email :e-mail:. - rookie_of_the_month: - name: "Rookie of the Month" + new_user_of_the_month: + name: "New User of the Month" description: Contributed a lot of value in their first month long_description: | This badge is granted to two high quality users who joined in the last month. The quality is determined by how many of their posts were liked and by whom. diff --git a/db/fixtures/006_badges.rb b/db/fixtures/006_badges.rb index e956ad37cc..88364c4fc7 100644 --- a/db/fixtures/006_badges.rb +++ b/db/fixtures/006_badges.rb @@ -402,8 +402,8 @@ Badge.seed do |b| end Badge.seed do |b| - b.id = Badge::RookieOfTheMonth - b.name = "Rookie of the Month" + b.id = Badge::NewUserOfTheMonth + b.name = "New User of the Month" b.badge_type_id = BadgeType::Bronze b.multiple_grant = false b.target_posts = false diff --git a/spec/jobs/grant_rookie_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb similarity index 90% rename from spec/jobs/grant_rookie_badges_spec.rb rename to spec/jobs/grant_new_user_of_the_month_badges_spec.rb index 4ba2edbf0b..f4abe6e9e7 100644 --- a/spec/jobs/grant_rookie_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -1,7 +1,7 @@ require 'rails_helper' -require_dependency 'jobs/scheduled/grant_rookie_badges' +require_dependency 'jobs/scheduled/grant_new_user_of_the_month_badges' -describe Jobs::GrantRookieBadges do +describe Jobs::GrantNewUserOfTheMonthBadges do let(:granter) { described_class.new } @@ -14,7 +14,7 @@ describe Jobs::GrantRookieBadges do granter.execute({}) - badge = user.user_badges.where(badge_id: Badge::RookieOfTheMonth) + badge = user.user_badges.where(badge_id: Badge::NewUserOfTheMonth) expect(badge).to be_present end From a8d3779f0bb6ee6d48d2c49b158c0a9547f8bc28 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 31 Mar 2017 16:49:10 -0400 Subject: [PATCH 045/124] Update New User of the Month badge to require 4 posts in 2 topics --- .../grant_new_user_of_the_month_badges.rb | 2 +- ...grant_new_user_of_the_month_badges_spec.rb | 37 +++++++++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 2094ceb9cb..38f3350f78 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -51,7 +51,7 @@ module Jobs NOT(u.moderator) AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL GROUP BY u.id - HAVING COUNT(p.id) > 0 + HAVING COUNT(DISTINCT p.id) > 3 AND COUNT(DISTINCT p.topic_id) > 1 ORDER BY score DESC LIMIT :max_awarded SQL diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index f4abe6e9e7..a727edbe88 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -8,6 +8,9 @@ describe Jobs::GrantNewUserOfTheMonthBadges do it "runs correctly" do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) old_user = Fabricate(:user, created_at: 6.months.ago) PostAction.act(old_user, p, PostActionType.types[:like]) @@ -16,7 +19,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do badge = user.user_badges.where(badge_id: Badge::NewUserOfTheMonth) expect(badge).to be_present - end describe '.scores' do @@ -24,11 +26,26 @@ describe Jobs::GrantNewUserOfTheMonthBadges do it "doesn't award it to accounts over a month old" do user = Fabricate(:user, created_at: 2.months.ago) Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) expect(granter.scores.keys).not_to include(user.id) end - it "returns active accounts created in the last month" do + it "doesn't score users who haven't posted in two topics" do user = Fabricate(:user, created_at: 1.week.ago) + p = Fabricate(:post, user: user) + Fabricate(:post, topic_id: p.topic_id, user: user) + Fabricate(:post, topic_id: p.topic_id, user: user) + Fabricate(:post, topic_id: p.topic_id, user: user) + expect(granter.scores.keys).not_to include(user.id) + end + + it "returns scores for accounts created within the last month" do + user = Fabricate(:user, created_at: 1.week.ago) + Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) Fabricate(:post, user: user) expect(granter.scores.keys).to include(user.id) end @@ -36,6 +53,9 @@ describe Jobs::GrantNewUserOfTheMonthBadges do it "likes from older accounts are scored higher" do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) + Fabricate(:post, user: user) new_user = Fabricate(:user, created_at: 2.days.ago) med_user = Fabricate(:user, created_at: 3.weeks.ago) @@ -44,11 +64,11 @@ describe Jobs::GrantNewUserOfTheMonthBadges do PostAction.act(new_user, p, PostActionType.types[:like]) PostAction.act(med_user, p, PostActionType.types[:like]) PostAction.act(old_user, p, PostActionType.types[:like]) - expect(granter.scores[user.id]).to eq(1.6) + expect(granter.scores[user.id]).to eq(0.4) # It goes down the more they post Fabricate(:post, user: user) - expect(granter.scores[user.id]).to eq(0.8) + expect(granter.scores[user.id]).to eq(0.32) end it "is limited to two accounts" do @@ -56,8 +76,17 @@ describe Jobs::GrantNewUserOfTheMonthBadges do u2 = Fabricate(:user, created_at: 2.weeks.ago) u3 = Fabricate(:user, created_at: 3.weeks.ago) + Fabricate(:post, user: u1) + Fabricate(:post, user: u1) + Fabricate(:post, user: u1) Fabricate(:post, user: u1) Fabricate(:post, user: u2) + Fabricate(:post, user: u2) + Fabricate(:post, user: u2) + Fabricate(:post, user: u2) + Fabricate(:post, user: u3) + Fabricate(:post, user: u3) + Fabricate(:post, user: u3) Fabricate(:post, user: u3) expect(granter.scores.keys.size).to eq(2) From e4b1376146d825a1a910e357987cce9b81a7286b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 31 Mar 2017 16:56:58 -0400 Subject: [PATCH 046/124] Change New User of the Month Badge to use trust level rather than age --- app/jobs/scheduled/grant_new_user_of_the_month_badges.rb | 7 +++++-- spec/jobs/grant_new_user_of_the_month_badges_spec.rb | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 38f3350f78..1bc257ee2a 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -33,8 +33,11 @@ module Jobs SUM(CASE WHEN pa.id IS NOT NULL THEN CASE - WHEN liked_by.created_at > (CURRENT_TIMESTAMP - '1 week'::INTERVAL) THEN 0.1 - WHEN liked_by.created_at > (CURRENT_TIMESTAMP - '1 month'::INTERVAL) THEN 0.5 + WHEN liked_by.trust_level = 0 THEN 0.1 + WHEN liked_by.trust_level = 1 THEN 0.25 + WHEN liked_by.trust_level = 2 THEN 1.0 + WHEN liked_by.trust_level = 3 THEN 1.5 + WHEN liked_by.trust_level = 4 THEN 2.0 ELSE 1.0 END ELSE 0 diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index a727edbe88..122c8762a4 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -64,11 +64,11 @@ describe Jobs::GrantNewUserOfTheMonthBadges do PostAction.act(new_user, p, PostActionType.types[:like]) PostAction.act(med_user, p, PostActionType.types[:like]) PostAction.act(old_user, p, PostActionType.types[:like]) - expect(granter.scores[user.id]).to eq(0.4) + expect(granter.scores[user.id]).to eq(0.1875) # It goes down the more they post Fabricate(:post, user: user) - expect(granter.scores[user.id]).to eq(0.32) + expect(granter.scores[user.id]).to eq(0.15) end it "is limited to two accounts" do From 03373a0e843b606ef13462424c90cb63d11b507a Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 31 Mar 2017 23:30:59 +0100 Subject: [PATCH 047/124] Add a user_seen DiscourseEvent for plugins to hook into --- app/models/user.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 5a0679508d..a206e5ac93 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -521,6 +521,8 @@ class User < ActiveRecord::Base # using update_column to avoid the AR transaction update_column(:last_seen_at, now) update_column(:first_seen_at, now) unless self.first_seen_at + + DiscourseEvent.trigger(:user_seen, self) end def self.gravatar_template(email) From c58f9d37ae7dc00ce4f3563d0352a529c9bcbeec Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 31 Mar 2017 16:28:29 -0700 Subject: [PATCH 048/124] copyedits on New User of the Month --- config/locales/server.en.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 8028b728b8..4fc978ea17 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2323,11 +2323,13 @@ en: title: "You're a New User of the Month!" subject_template: "You're a New User of the Month!" text_body_template: | - Congratulations, you've been awarded the **New User of the Month award for %{month_year}**. + Congratulations, you've been awarded the **New User of the Month award for %{month_year}**. :trophy: - You received this because you've quickly become a valuable member of the community and other members are really enjoying your posts. + You've quickly become a valuable member of our community and everyone is really enjoying your posts. - Thanks and keep up the great work! + This award will be permamently visible as a badge on [your user page](/my/badges). + + Thanks, and keep up the great work! unsubscribe_link: | To unsubscribe from these emails, [click here](%{unsubscribe_url}). @@ -3289,7 +3291,7 @@ en: This badge is granted the first time you add an Emoji to your post :thumbsup:. Emoji let you convey emotion in your posts, from happiness :smiley: to sadness :anguished: to anger :angry: and everything in between :sunglasses: . Just type a : (colon) or press the Emoji toolbar button in the editor to select from hundreds of choices :ok_hand: first_mention: name: First Mention - description: Mentioned a user in a Post + description: Mentioned a user in a post long_description: This badge is granted the first time you mention someone's @username in your post. Each mention generates a notification to that person, so they know about your post. Just begin typing @ (at symbol) to mention any user or, if allowed, group – it's a convenient way to bring something to their attention. first_onebox: name: First Onebox @@ -3297,14 +3299,14 @@ en: long_description: This badge is granted the first time you post a link on a line by itself, which was then automatically expanded into a onebox with a brief summary of the link, a title, and (when available) a picture. first_reply_by_email: name: First Reply By Email - description: Replied to a Post via email + description: Replied to a post via email long_description: | This badge is granted the first time you reply to a post via email :e-mail:. new_user_of_the_month: name: "New User of the Month" - description: Contributed a lot of value in their first month + description: Outstanding contributions in their first month long_description: | - This badge is granted to two high quality users who joined in the last month. The quality is determined by how many of their posts were liked and by whom. + This badge is granted to congratulate two new users each month for their excellent overall contributions, as measured by how often their posts were liked, and by whom. admin_login: success: "Email Sent" From 3b64aeaf21c278dd25916c15e501dc6ef00f0594 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 31 Mar 2017 16:33:50 -0700 Subject: [PATCH 049/124] loosen new user of the month criteria slightly --- app/jobs/scheduled/grant_new_user_of_the_month_badges.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 1bc257ee2a..c06f183dbb 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -54,7 +54,7 @@ module Jobs NOT(u.moderator) AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL GROUP BY u.id - HAVING COUNT(DISTINCT p.id) > 3 AND COUNT(DISTINCT p.topic_id) > 1 + HAVING COUNT(DISTINCT p.id) > 1 AND COUNT(DISTINCT p.topic_id) > 1 ORDER BY score DESC LIMIT :max_awarded SQL From 549aa9204c1452a553a3f83995b09a29fd2ec869 Mon Sep 17 00:00:00 2001 From: Jeff Atwood Date: Fri, 31 Mar 2017 23:37:48 -0700 Subject: [PATCH 050/124] typo fix --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4fc978ea17..d83e26658a 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -2327,7 +2327,7 @@ en: You've quickly become a valuable member of our community and everyone is really enjoying your posts. - This award will be permamently visible as a badge on [your user page](/my/badges). + This award will be permanently visible as a badge on [your user page](/my/badges). Thanks, and keep up the great work! From e788ac335191bff4997da8e8c9278c76cccae94d Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:23:03 +0000 Subject: [PATCH 051/124] Add permalinks creator for PrettyURL plugin --- script/import_scripts/smf2.rb | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 2ee607a228..96cabaf0c5 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -65,6 +65,7 @@ class ImportScripts::Smf2 < ImportScripts::Base import_categories import_posts postprocess_posts + make_prettyurl_permalinks('/forum') end def import_groups @@ -662,6 +663,31 @@ class ImportScripts::Smf2 < ImportScripts::Base end #MessageDependencyGraph + def make_prettyurl_permalinks(prefix) + puts 'creating permalinks for prettyurl plugin' + begin + serialized = query(<<-SQL, as: :single) + SELECT value FROM {prefix}settings + WHERE variable='pretty_board_urls'; + SQL + board_slugs = Array.new + ser = /\{(.*)\}/.match(serialized)[1] + ser.scan(/i:(\d+);s:\d+:\"(.*?)\";/).each do |nv| + board_slugs[nv[0].to_i] = nv[1] + end + topic_urls = query(<<-SQL, as: :array) + SELECT t.id_first_msg, t.id_board,u.pretty_url + FROM smf_topics t + LEFT JOIN smf_pretty_topic_urls u ON u.id_topic = t.id_topic ; + SQL + topic_urls.each do |url| + t = topic_lookup_from_imported_post_id(url[:id_first_msg]) + Permalink.create(url: "#{prefix}/#{board_slugs[url[:id_board]]}/#{url[:pretty_url]}", topic_id: t[:topic_id]) + end + rescue + end + end + end ImportScripts::Smf2.run From 332d655a1db0db4e82a28932b8fca887c15cfbad Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:25:08 +0000 Subject: [PATCH 052/124] Use html_for_upload instead of broken v8 stuff --- script/import_scripts/smf2.rb | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 96cabaf0c5..059e4a4be3 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -391,30 +391,8 @@ class ImportScripts::Smf2 < ImportScripts::Base return opts[:ignore_quotes] ? body : convert_quotes(body) end - def v8 - @ctx ||= begin - ctx = PrettyText.create_new_context - PrettyText.decorate_context(ctx) - # provides toHumanSize but restores I18n.t which we need to fix again - ctx.load(Rails.root + "app/assets/javascripts/locales/i18n.js") - helper = PrettyText::Helpers.new - ctx['I18n']['t'] = proc {|_,key,opts| helper.t(key, opts) } - # from i18n_helpers.js -- can't load it directly because Ember is missing - ctx.eval(<<-'end') - var oldI18ntoHumanSize = I18n.toHumanSize; - I18n.toHumanSize = function(number, options) { - options = options || {}; - options.format = I18n.t("number.human.storage_units.format"); - return oldI18ntoHumanSize.apply(this, [number, options]); - }; - end - ctx - end - end - def get_upload_markdown(upload) - @func ||= v8.eval("Discourse.Utilities.getUploadMarkdown") - return @func.call(upload).to_s + html_for_upload(upload, upload.original_filename) end def convert_quotes(body) From a72f56c3a7c4ca375098dff7ca1ad8528b8493a9 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:27:57 +0000 Subject: [PATCH 053/124] Add migratepassword plugin hash --- script/import_scripts/smf2.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 059e4a4be3..638c6e7078 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -94,6 +94,7 @@ class ImportScripts::Smf2 < ImportScripts::Base create_users(query(<<-SQL), total: total) do |member| SELECT a.id_member, a.member_name, a.date_registered, a.real_name, a.email_address, + CONCAT(LCASE(a.member_name),':', a.passwd) AS password, a.is_activated, a.last_login, a.birthdate, a.member_ip, a.id_group, a.additional_groups, b.id_attach, b.file_hash, b.filename FROM {prefix}members AS a @@ -106,6 +107,7 @@ class ImportScripts::Smf2 < ImportScripts::Base { id: member[:id_member], username: member[:member_name], + password: member[:password], created_at: create_time, name: member[:real_name], email: member[:email_address], From 7d09af141e2cecc525ee2d360be89bd869e339e7 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:28:16 +0000 Subject: [PATCH 054/124] Apparently need to save --- script/import_scripts/smf2.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 638c6e7078..9512135016 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -121,6 +121,7 @@ class ImportScripts::Smf2 < ImportScripts::Base post_create_action: proc do |user| user.update(created_at: create_time) if create_time < user.created_at + user.save GroupUser.transaction do group_ids.each do |gid| group_id = group_id_from_imported_group_id(gid) and From 60be3e0d38343cb367fb1611a16e7311caf303e1 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:31:06 +0000 Subject: [PATCH 055/124] Get rid of the weird and broken message graph --- script/import_scripts/smf2.rb | 55 +---------------------------------- 1 file changed, 1 insertion(+), 54 deletions(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 9512135016..74a273cff8 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -184,58 +184,6 @@ class ImportScripts::Smf2 < ImportScripts::Base end end - topics = Enumerator.new do |y| - last_topic_id = nil - topic_messages = nil - query("SELECT id_msg, id_topic, body FROM {prefix}messages ORDER BY id_topic ASC, id_msg ASC") do |message| - if last_topic_id != message[:id_topic] - y << topic_messages - last_topic_id = message[:id_topic] - topic_messages = [ message ] - else - topic_messages << message - end - end - y << topic_messages - end - - graph = MessageDependencyGraph.new - topics.each do |messages| - next unless messages.present? - (messages.reverse << nil).each_cons(2) do |message, prev| - graph.add_message(message[:id_msg], prev ? prev[:id_msg] : nil, - extract_quoted_message_ids(message[:body]).to_a) - end - print "\r#{spinner.next}" - end - - begin - cycles = graph.cycles - print "\r#{spinner.next}" - cycles.each do |cycle| - candidate = cycle.detect {|n| ((cycle - [n]) & n.quoted).present? } - candidate.ignore_quotes = true - end - end while cycles.present? - message_order = graph.tsort - print "\r#{spinner.next}" - - query(<<-SQL, as: :array) - CREATE TEMPORARY TABLE {prefix}import_message_order ( - message_id int(11) NOT NULL, - message_order int(11) NOT NULL AUTO_INCREMENT, - ignore_quotes tinyint(1) NOT NULL, - PRIMARY KEY (message_id), - UNIQUE KEY message_order (message_order) - ) ENGINE=MEMORY - SQL - message_order.each_slice(100) do |nodes| - query(<<-SQL, as: :array) - INSERT INTO {prefix}import_message_order (message_id, ignore_quotes) - VALUES #{ nodes.map {|n| "(#{n.id}, #{n.ignore_quotes? ? 1 : 0})" }.join(',') } - SQL - print "\r#{spinner.next}" - end db2 = create_db_connection @@ -243,11 +191,10 @@ class ImportScripts::Smf2 < ImportScripts::Base SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body, o.ignore_quotes, m.subject, t.id_board, t.id_first_msg, COUNT(a.id_attach) AS attachment_count FROM {prefix}messages AS m - LEFT JOIN {prefix}import_message_order AS o ON o.message_id = m.id_msg LEFT JOIN {prefix}topics AS t ON t.id_topic = m.id_topic LEFT JOIN {prefix}attachments AS a ON a.id_msg = m.id_msg AND a.attachment_type = 0 GROUP BY m.id_msg - ORDER BY o.message_order ASC + ORDER BY m.id_topic ASC, m.id_msg ASC SQL skip = false ignore_quotes = (message[:ignore_quotes] == 1) From 7e27559f3e7fd5c096ba17a731cd73b2a3a20a38 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:33:48 +0000 Subject: [PATCH 056/124] We need to get rid of the ignore_quotes thing as well --- script/import_scripts/smf2.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 74a273cff8..7f1ffd9186 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -188,7 +188,7 @@ class ImportScripts::Smf2 < ImportScripts::Base db2 = create_db_connection create_posts(query(<<-SQL), total: total) do |message| - SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body, o.ignore_quotes, + SELECT m.id_msg, m.id_topic, m.id_member, m.poster_time, m.body, m.subject, t.id_board, t.id_first_msg, COUNT(a.id_attach) AS attachment_count FROM {prefix}messages AS m LEFT JOIN {prefix}topics AS t ON t.id_topic = m.id_topic @@ -197,7 +197,7 @@ class ImportScripts::Smf2 < ImportScripts::Base ORDER BY m.id_topic ASC, m.id_msg ASC SQL skip = false - ignore_quotes = (message[:ignore_quotes] == 1) + ignore_quotes = false post = { id: message[:id_msg], user_id: user_id_from_imported_user_id(message[:id_member]) || -1, From 6168bcb4c4a7aa096b064eb0e3fbdd10bb2b0143 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:35:43 +0000 Subject: [PATCH 057/124] Someone broke/disabled? the php check --- script/import_scripts/smf2.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 7f1ffd9186..2f1be2eed3 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -465,7 +465,7 @@ class ImportScripts::Smf2 < ImportScripts::Base private def get_php_timezone - phpinfo, status = Open3.capture2('phpnope', '-i') + phpinfo, status = Open3.capture2('php', '-i') phpinfo.lines.each do |line| key, *vals = line.split(' => ').map(&:strip) break vals[0] if key == 'Default timezone' From 17b5303449ede7284de59621de048a69f3e492a7 Mon Sep 17 00:00:00 2001 From: "michael@discoursehosting.com" Date: Sun, 2 Apr 2017 20:38:23 +0000 Subject: [PATCH 058/124] Convert nested quotes --- script/import_scripts/smf2.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/import_scripts/smf2.rb b/script/import_scripts/smf2.rb index 2f1be2eed3..c65d13bedb 100644 --- a/script/import_scripts/smf2.rb +++ b/script/import_scripts/smf2.rb @@ -355,9 +355,9 @@ class ImportScripts::Smf2 < ImportScripts::Base tl = topic_lookup_from_imported_post_id($~[:msg].to_i) quote << ", post:#{tl[:post_number]}, topic:#{tl[:topic_id]}" if tl end - quote << "\"]#{inner}[/quote]" + quote << "\"]#{convert_quotes(inner)}[/quote]" else - "
#{inner}
" + "
#{convert_quotes(inner)}
" end end end From 5cf75c67dff5803288642ca2606095b6ca8895e2 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 3 Apr 2017 09:06:15 +0800 Subject: [PATCH 059/124] FIX: Callback `undefined` error when topic has been deleted. --- app/models/topic_status_update.rb | 24 ++++---- spec/models/topic_status_update_spec.rb | 80 +++++++++++++++++-------- 2 files changed, 68 insertions(+), 36 deletions(-) diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index 7c8417423b..a6948abb71 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -70,21 +70,25 @@ class TopicStatusUpdate < ActiveRecord::Base alias_method :cancel_auto_open_job, :cancel_auto_close_job def schedule_auto_open_job(time) - topic.update_status('closed', true, user) if !topic.closed + if topic + topic.update_status('closed', true, user) if !topic.closed - Jobs.enqueue_at(time, :toggle_topic_closed, - topic_status_update_id: id, - state: false - ) + Jobs.enqueue_at(time, :toggle_topic_closed, + topic_status_update_id: id, + state: false + ) + end end def schedule_auto_close_job(time) - topic.update_status('closed', false, user) if topic.closed + if topic + topic.update_status('closed', false, user) if topic.closed - Jobs.enqueue_at(time, :toggle_topic_closed, - topic_status_update_id: id, - state: true - ) + Jobs.enqueue_at(time, :toggle_topic_closed, + topic_status_update_id: id, + state: true + ) + end end end diff --git a/spec/models/topic_status_update_spec.rb b/spec/models/topic_status_update_spec.rb index f9b1c9a895..ebf368a472 100644 --- a/spec/models/topic_status_update_spec.rb +++ b/spec/models/topic_status_update_spec.rb @@ -4,6 +4,10 @@ RSpec.describe TopicStatusUpdate, type: :model do let(:topic_status_update) { Fabricate(:topic_status_update) } let(:topic) { Fabricate(:topic) } + before do + Jobs::ToggleTopicClosed.jobs.clear + end + context "validations" do describe '#status_type' do it 'should ensure that only one active topic status update exists' do @@ -122,6 +126,56 @@ RSpec.describe TopicStatusUpdate, type: :model do end end end + + describe 'when a open topic status update is created for an open topic' do + let(:topic) { Fabricate(:topic, closed: false) } + + let(:topic_status_update) do + Fabricate(:topic_status_update, + status_type: described_class.types[:open], + topic: topic + ) + end + + it 'should close the topic' do + topic_status_update + expect(topic.reload.closed).to eq(true) + end + + describe 'when topic has been deleted' do + it 'should not queue the job' do + topic.trash! + topic_status_update + + expect(Jobs::ToggleTopicClosed.jobs).to eq([]) + end + end + end + + describe 'when a close topic status update is created for a closed topic' do + let(:topic) { Fabricate(:topic, closed: true) } + + let(:topic_status_update) do + Fabricate(:topic_status_update, + status_type: described_class.types[:close], + topic: topic + ) + end + + it 'should open the topic' do + topic_status_update + expect(topic.reload.closed).to eq(false) + end + + describe 'when topic has been deleted' do + it 'should not queue the job' do + topic.trash! + topic_status_update + + expect(Jobs::ToggleTopicClosed.jobs).to eq([]) + end + end + end end describe '.ensure_consistency!' do @@ -158,30 +212,4 @@ RSpec.describe TopicStatusUpdate, type: :model do expect(job_args["state"]).to eq(false) end end - - describe 'when a open topic status update is created for an open topic' do - it 'should close the topic' do - topic = Fabricate(:topic, closed: false) - - Fabricate(:topic_status_update, - status_type: described_class.types[:open], - topic: topic - ) - - expect(topic.reload.closed).to eq(true) - end - end - - describe 'when a close topic status update is created for a closed topic' do - it 'should open the topic' do - topic = Fabricate(:topic, closed: true) - - Fabricate(:topic_status_update, - status_type: described_class.types[:close], - topic: topic - ) - - expect(topic.reload.closed).to eq(false) - end - end end From 9ab5f1761075cd540e47c2f93a598ca1afacc1ab Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 3 Apr 2017 10:31:40 +0800 Subject: [PATCH 060/124] FIX: Broekn translation on `topic-status-info` component. --- .../javascripts/discourse/components/topic-status-info.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 index 86bf080069..e204db09a7 100644 --- a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 @@ -12,7 +12,7 @@ export default Ember.Component.extend(bufferedRender({ ], buildBuffer(buffer) { - if (!this.get('topic.topic_status_update')) return; + if (!this.get('topic.topic_status_update.execute_at')) return; let statusUpdateAt = moment(this.get('topic.topic_status_update.execute_at')); if (statusUpdateAt < new Date()) return; From ac051d70efb1a97895fea12e614f54c6083cde9c Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 3 Apr 2017 14:19:05 +0530 Subject: [PATCH 061/124] FIX: use enum values for trust level settings --- config/site_settings.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/site_settings.yml b/config/site_settings.yml index eb36c891b4..09bead2a13 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -409,6 +409,7 @@ users: client: true anonymous_posting_min_trust_level: default: 1 + enum: 'TrustLevelSetting' client: true anonymous_account_duration_minutes: default: 10080 @@ -1383,6 +1384,7 @@ user_api: hidden: true min_trust_level_for_user_api_key: default: 1 + enum: 'TrustLevelSetting' allowed_user_api_push_urls: default: '' type: list From 15268657f41535bc106015194c84c6ec22af0b44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 3 Apr 2017 12:12:36 +0200 Subject: [PATCH 062/124] Requiring it once is more than enough ;) --- app/assets/javascripts/application.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 6f7f08f23b..ce7addad87 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -26,7 +26,6 @@ //= require ./discourse/lib/formatter //= require ./discourse/lib/eyeline //= require ./discourse/mixins/scrolling -//= require ./discourse/mixins/scrolling //= require ./discourse/models/model //= require ./discourse/models/rest //= require ./discourse/models/badge-grouping From dc5a6e7cda29c34135101c3717e4e268e4518c18 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 3 Apr 2017 21:12:00 +0800 Subject: [PATCH 063/124] Remove empty test. --- spec/integration/managing_topic_status_spec.rb | 6 ------ 1 file changed, 6 deletions(-) diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb index a70f2141d0..f6ca7f517b 100644 --- a/spec/integration/managing_topic_status_spec.rb +++ b/spec/integration/managing_topic_status_spec.rb @@ -85,11 +85,5 @@ RSpec.describe "Managing a topic's status update", type: :request do end.to raise_error(Discourse::InvalidParameters) end end - - describe 'when the last post is old enough' do - it 'should close the topic immediately' do - - end - end end end From b189486fc05391f701eedb242f7cbaf17e4e0503 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 3 Apr 2017 12:15:24 -0400 Subject: [PATCH 064/124] We can do a lot less work in the test since we eased the criteria --- ...grant_new_user_of_the_month_badges_spec.rb | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index 122c8762a4..82a467c40e 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -9,8 +9,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) Fabricate(:post, user: user) - Fabricate(:post, user: user) - Fabricate(:post, user: user) old_user = Fabricate(:user, created_at: 6.months.ago) PostAction.act(old_user, p, PostActionType.types[:like]) @@ -26,9 +24,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do it "doesn't award it to accounts over a month old" do user = Fabricate(:user, created_at: 2.months.ago) Fabricate(:post, user: user) - Fabricate(:post, user: user) - Fabricate(:post, user: user) - Fabricate(:post, user: user) expect(granter.scores.keys).not_to include(user.id) end @@ -36,8 +31,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) Fabricate(:post, topic_id: p.topic_id, user: user) - Fabricate(:post, topic_id: p.topic_id, user: user) - Fabricate(:post, topic_id: p.topic_id, user: user) expect(granter.scores.keys).not_to include(user.id) end @@ -45,8 +38,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do user = Fabricate(:user, created_at: 1.week.ago) Fabricate(:post, user: user) Fabricate(:post, user: user) - Fabricate(:post, user: user) - Fabricate(:post, user: user) expect(granter.scores.keys).to include(user.id) end @@ -54,8 +45,6 @@ describe Jobs::GrantNewUserOfTheMonthBadges do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) Fabricate(:post, user: user) - Fabricate(:post, user: user) - Fabricate(:post, user: user) new_user = Fabricate(:user, created_at: 2.days.ago) med_user = Fabricate(:user, created_at: 3.weeks.ago) @@ -64,11 +53,11 @@ describe Jobs::GrantNewUserOfTheMonthBadges do PostAction.act(new_user, p, PostActionType.types[:like]) PostAction.act(med_user, p, PostActionType.types[:like]) PostAction.act(old_user, p, PostActionType.types[:like]) - expect(granter.scores[user.id]).to eq(0.1875) + expect(granter.scores[user.id]).to eq(0.375) # It goes down the more they post Fabricate(:post, user: user) - expect(granter.scores[user.id]).to eq(0.15) + expect(granter.scores[user.id]).to eq(0.25) end it "is limited to two accounts" do @@ -76,16 +65,10 @@ describe Jobs::GrantNewUserOfTheMonthBadges do u2 = Fabricate(:user, created_at: 2.weeks.ago) u3 = Fabricate(:user, created_at: 3.weeks.ago) - Fabricate(:post, user: u1) - Fabricate(:post, user: u1) Fabricate(:post, user: u1) Fabricate(:post, user: u1) Fabricate(:post, user: u2) Fabricate(:post, user: u2) - Fabricate(:post, user: u2) - Fabricate(:post, user: u2) - Fabricate(:post, user: u3) - Fabricate(:post, user: u3) Fabricate(:post, user: u3) Fabricate(:post, user: u3) From 3d64f33d403f569908e17ee27d1ecd0ad96d6fb3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 3 Apr 2017 13:03:28 -0400 Subject: [PATCH 065/124] Require at least two likes to get the "New User of the Month" badge --- .../grant_new_user_of_the_month_badges.rb | 4 +- ...grant_new_user_of_the_month_badges_spec.rb | 48 +++++++++++++++++-- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index c06f183dbb..e9078124de 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -54,7 +54,9 @@ module Jobs NOT(u.moderator) AND u.created_at >= CURRENT_TIMESTAMP - '1 month'::INTERVAL GROUP BY u.id - HAVING COUNT(DISTINCT p.id) > 1 AND COUNT(DISTINCT p.topic_id) > 1 + HAVING COUNT(DISTINCT p.id) > 1 + AND COUNT(DISTINCT p.topic_id) > 1 + AND COUNT(pa.id) > 1 ORDER BY score DESC LIMIT :max_awarded SQL diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index 82a467c40e..8f8993dc65 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -10,6 +10,8 @@ describe Jobs::GrantNewUserOfTheMonthBadges do p = Fabricate(:post, user: user) Fabricate(:post, user: user) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) old_user = Fabricate(:user, created_at: 6.months.ago) PostAction.act(old_user, p, PostActionType.types[:like]) @@ -24,20 +26,45 @@ describe Jobs::GrantNewUserOfTheMonthBadges do it "doesn't award it to accounts over a month old" do user = Fabricate(:user, created_at: 2.months.ago) Fabricate(:post, user: user) + p = Fabricate(:post, user: user) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + expect(granter.scores.keys).not_to include(user.id) end it "doesn't score users who haven't posted in two topics" do user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) - Fabricate(:post, topic_id: p.topic_id, user: user) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + + expect(granter.scores.keys).not_to include(user.id) + end + + it "requires at least two likes to be considered" do + user = Fabricate(:user, created_at: 1.week.ago) + Fabricate(:post, user: user) + p = Fabricate(:post, user: user) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + expect(granter.scores.keys).not_to include(user.id) end it "returns scores for accounts created within the last month" do user = Fabricate(:user, created_at: 1.week.ago) Fabricate(:post, user: user) - Fabricate(:post, user: user) + p = Fabricate(:post, user: user) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + expect(granter.scores.keys).to include(user.id) end @@ -65,12 +92,23 @@ describe Jobs::GrantNewUserOfTheMonthBadges do u2 = Fabricate(:user, created_at: 2.weeks.ago) u3 = Fabricate(:user, created_at: 3.weeks.ago) + ou1 = Fabricate(:user, created_at: 6.months.ago) + ou2 = Fabricate(:user, created_at: 6.months.ago) + + p = Fabricate(:post, user: u1) Fabricate(:post, user: u1) - Fabricate(:post, user: u1) - Fabricate(:post, user: u2) + PostAction.act(ou1, p, PostActionType.types[:like]) + PostAction.act(ou2, p, PostActionType.types[:like]) + + p = Fabricate(:post, user: u2) Fabricate(:post, user: u2) + PostAction.act(ou1, p, PostActionType.types[:like]) + PostAction.act(ou2, p, PostActionType.types[:like]) + + p = Fabricate(:post, user: u3) Fabricate(:post, user: u3) - Fabricate(:post, user: u3) + PostAction.act(ou1, p, PostActionType.types[:like]) + PostAction.act(ou2, p, PostActionType.types[:like]) expect(granter.scores.keys.size).to eq(2) end From 5ff29ce32121b20952d6bccd16da0f8062535382 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 3 Apr 2017 22:33:11 +0530 Subject: [PATCH 066/124] add test case for topic status update based on last post --- spec/models/topic_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 41916d78a8..6d53fdaa14 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -1138,6 +1138,13 @@ describe Topic do end end + it 'can take a number of hours as a string and can handle based on last post' do + Timecop.freeze(now) do + topic.set_or_create_status_update(TopicStatusUpdate.types[:close], '18', {by_user: admin, based_on_last_post: true}) + expect(topic.topic_status_updates.first.execute_at).to eq(18.hours.from_now) + end + end + it "can take a time later in the day" do Timecop.freeze(now) do topic.set_or_create_status_update(TopicStatusUpdate.types[:close], '13:00', {by_user: admin}) From a13a8dc96cbc58ecb76a361cce41e2410cb5c2c3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 3 Apr 2017 13:26:22 -0400 Subject: [PATCH 067/124] FIX: Safeguard to not award NewUserOfTheMonth if it hasn't been a month --- .../grant_new_user_of_the_month_badges.rb | 7 ++++++ ...grant_new_user_of_the_month_badges_spec.rb | 22 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index e9078124de..554710d7ff 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -8,6 +8,13 @@ module Jobs def execute(args) badge = Badge.find(Badge::NewUserOfTheMonth) + + # Don't award it if a month hasn't gone by + return if UserBadge.where("badge_id = ? AND granted_at >= ?", + badge.id, + (1.month.ago + 1.day) # give it a day slack just in case + ).exists? + scores.each do |user_id, score| # Don't bother awarding to users who haven't received any likes if score > 0.0 diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index 8f8993dc65..414f7be0ac 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -6,6 +6,9 @@ describe Jobs::GrantNewUserOfTheMonthBadges do let(:granter) { described_class.new } it "runs correctly" do + u0 = Fabricate(:user, created_at: 2.weeks.ago) + BadgeGranter.grant(Badge.find(Badge::NewUserOfTheMonth), u0, created_at: 1.month.ago) + user = Fabricate(:user, created_at: 1.week.ago) p = Fabricate(:post, user: user) Fabricate(:post, user: user) @@ -21,6 +24,25 @@ describe Jobs::GrantNewUserOfTheMonthBadges do expect(badge).to be_present end + it "does nothing if it's been awarded recently" do + u0 = Fabricate(:user, created_at: 2.weeks.ago) + BadgeGranter.grant(Badge.find(Badge::NewUserOfTheMonth), u0) + + user = Fabricate(:user, created_at: 1.week.ago) + p = Fabricate(:post, user: user) + Fabricate(:post, user: user) + + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + old_user = Fabricate(:user, created_at: 6.months.ago) + PostAction.act(old_user, p, PostActionType.types[:like]) + + granter.execute({}) + + badge = user.user_badges.where(badge_id: Badge::NewUserOfTheMonth) + expect(badge).to be_blank + end + describe '.scores' do it "doesn't award it to accounts over a month old" do From 0829671963098b0ab6477454e275b14c3540a4fe Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 3 Apr 2017 14:38:30 -0400 Subject: [PATCH 068/124] FIX: Nested quotes weren't rendered properly with BBCode --- .../pretty-text/engines/discourse-markdown/bbcode.js.es6 | 8 +++++++- .../pretty-text/engines/discourse-markdown/quote.js.es6 | 1 + test/javascripts/lib/pretty-text-test.js.es6 | 5 +++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 index bc15c40fb2..52e0ecba1e 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/bbcode.js.es6 @@ -9,6 +9,8 @@ export function register(helper, codeName, args, emitter) { start: new RegExp("\\[" + codeName + "(=[^\\[\\]]+)?\\]([\\s\\S]*)", "igm"), stop: new RegExp("\\[\\/" + codeName + "\\]", "igm"), emitter(blockContents, matches) { + + const options = helper.getOptions(); while (blockContents.length && (typeof blockContents[0] === "string" || blockContents[0] instanceof String)) { blockContents[0] = String(blockContents[0]).replace(/^\s+/, ''); @@ -22,7 +24,11 @@ export function register(helper, codeName, args, emitter) { let contents = []; if (blockContents.length) { const nextContents = blockContents.slice(1); - blockContents = this.processBlock(blockContents[0], nextContents).concat(nextContents); + blockContents = this.processBlock(blockContents[0], nextContents); + + nextContents.forEach(nc => { + blockContents = blockContents.concat(this.processBlock(nc, [])); + }); blockContents.forEach(bc => { if (typeof bc === "string" || bc instanceof String) { diff --git a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 index 96b798a326..87bc948d69 100644 --- a/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 +++ b/app/assets/javascripts/pretty-text/engines/discourse-markdown/quote.js.es6 @@ -10,6 +10,7 @@ registerOption((siteSettings, opts) => { export function setup(helper) { register(helper, 'quote', {noWrap: true, singlePara: true}, (contents, bbParams, options) => { + const params = {'class': 'quote'}; let username = null; const opts = helper.getOptions(); diff --git a/test/javascripts/lib/pretty-text-test.js.es6 b/test/javascripts/lib/pretty-text-test.js.es6 index 2d10f0c0d0..72c1adf30b 100644 --- a/test/javascripts/lib/pretty-text-test.js.es6 +++ b/test/javascripts/lib/pretty-text-test.js.es6 @@ -220,6 +220,11 @@ test("Quotes", function() { "

1

\n\n\n\n

2

", "includes no avatar if none is found"); + + cooked(`[quote]\na\n\n[quote]\nb\n[/quote]\n[/quote]`, + "

", + "handles nested quotes properly"); + }); test("Mentions", function() { From ebe232da4717ceca25f4cad30daafcb21c8f2dc4 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Mon, 3 Apr 2017 16:52:31 -0400 Subject: [PATCH 069/124] Weigh staff votes more for New User of the Month badges --- .../grant_new_user_of_the_month_badges.rb | 1 + ...grant_new_user_of_the_month_badges_spec.rb | 24 ++++++++++++------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb index 554710d7ff..7842175fa3 100644 --- a/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb +++ b/app/jobs/scheduled/grant_new_user_of_the_month_badges.rb @@ -40,6 +40,7 @@ module Jobs SUM(CASE WHEN pa.id IS NOT NULL THEN CASE + WHEN liked_by.admin OR liked_by.moderator THEN 2.0 WHEN liked_by.trust_level = 0 THEN 0.1 WHEN liked_by.trust_level = 1 THEN 0.25 WHEN liked_by.trust_level = 2 THEN 1.0 diff --git a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb index 414f7be0ac..748a834383 100644 --- a/spec/jobs/grant_new_user_of_the_month_badges_spec.rb +++ b/spec/jobs/grant_new_user_of_the_month_badges_spec.rb @@ -95,18 +95,26 @@ describe Jobs::GrantNewUserOfTheMonthBadges do p = Fabricate(:post, user: user) Fabricate(:post, user: user) - new_user = Fabricate(:user, created_at: 2.days.ago) - med_user = Fabricate(:user, created_at: 3.weeks.ago) - old_user = Fabricate(:user, created_at: 6.months.ago) + u0 = Fabricate(:user, trust_level: 0) + u1 = Fabricate(:user, trust_level: 1) + u2 = Fabricate(:user, trust_level: 2) + u3 = Fabricate(:user, trust_level: 3) + u4 = Fabricate(:user, trust_level: 4) + um = Fabricate(:user, trust_level: 3, moderator: true) + ua = Fabricate(:user, trust_level: 0, admin: true) - PostAction.act(new_user, p, PostActionType.types[:like]) - PostAction.act(med_user, p, PostActionType.types[:like]) - PostAction.act(old_user, p, PostActionType.types[:like]) - expect(granter.scores[user.id]).to eq(0.375) + PostAction.act(u0, p, PostActionType.types[:like]) + PostAction.act(u1, p, PostActionType.types[:like]) + PostAction.act(u2, p, PostActionType.types[:like]) + PostAction.act(u3, p, PostActionType.types[:like]) + PostAction.act(u4, p, PostActionType.types[:like]) + PostAction.act(um, p, PostActionType.types[:like]) + PostAction.act(ua, p, PostActionType.types[:like]) + expect(granter.scores[user.id]).to eq(4.425) # It goes down the more they post Fabricate(:post, user: user) - expect(granter.scores[user.id]).to eq(0.25) + expect(granter.scores[user.id]).to eq(2.95) end it "is limited to two accounts" do From f4758a4c4de1f011fb5409df8ff8b4ea00f73824 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 3 Apr 2017 17:28:41 +0800 Subject: [PATCH 070/124] FEATURE: Allow admins to schedule a topic to be published in the future. --- .../components/auto-update-input.js.es6 | 9 +- .../components/category-chooser.js.es6 | 22 ++-- .../components/topic-status-info.js.es6 | 22 +++- .../edit-topic-status-update.js.es6 | 38 +++++-- .../models/topic-status-update.js.es6 | 3 +- .../javascripts/discourse/routes/topic.js.es6 | 2 +- .../components/auto-update-input.hbs | 17 ++- .../modal/edit-topic-status-update.hbs | 72 ++++++++---- .../stylesheets/common/base/compose.scss | 6 - app/assets/stylesheets/common/base/modal.scss | 36 ------ .../common/base/topic-close-modal.scss | 29 +++++ app/controllers/topics_controller.rb | 17 ++- app/jobs/regular/publish_topic_to_category.rb | 15 +++ app/models/topic.rb | 105 ++++++++++-------- app/models/topic_status_update.rb | 42 +++---- .../topic_status_update_serializer.rb | 3 +- app/services/post_timestamp_changer.rb | 4 +- config/locales/client.en.yml | 5 +- ...add_category_id_to_topic_status_updates.rb | 5 + spec/components/post_creator_spec.rb | 5 +- .../integration/managing_topic_status_spec.rb | 25 +++++ spec/jobs/publish_topic_to_category_spec.rb | 52 +++++++++ spec/models/topic_spec.rb | 2 +- 23 files changed, 359 insertions(+), 177 deletions(-) create mode 100644 app/assets/stylesheets/common/base/topic-close-modal.scss create mode 100644 app/jobs/regular/publish_topic_to_category.rb create mode 100644 db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb create mode 100644 spec/jobs/publish_topic_to_category_spec.rb diff --git a/app/assets/javascripts/discourse/components/auto-update-input.js.es6 b/app/assets/javascripts/discourse/components/auto-update-input.js.es6 index 7541d4988e..1d44119778 100644 --- a/app/assets/javascripts/discourse/components/auto-update-input.js.es6 +++ b/app/assets/javascripts/discourse/components/auto-update-input.js.es6 @@ -1,9 +1,12 @@ -import computed from "ember-addons/ember-computed-decorators"; -import { observes } from "ember-addons/ember-computed-decorators"; +import { default as computed, observes } from "ember-addons/ember-computed-decorators"; export default Ember.Component.extend({ limited: false, - inputValid: false, + + didInsertElement() { + this._super(); + this._updateInputValid(); + }, @computed("limited") inputUnitsKey(limited) { diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6 index ab0c704b59..7b031e354f 100644 --- a/app/assets/javascripts/discourse/components/category-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6 @@ -3,6 +3,7 @@ import { categoryBadgeHTML } from 'discourse/helpers/category-link'; import computed from 'ember-addons/ember-computed-decorators'; import { observes, on } from 'ember-addons/ember-computed-decorators'; import PermissionType from 'discourse/models/permission-type'; +import Category from 'discourse/models/category'; export default ComboboxView.extend({ classNames: ['combobox category-combobox'], @@ -14,13 +15,16 @@ export default ComboboxView.extend({ content(scopedCategoryId, categories) { // Always scope to the parent of a category, if present if (scopedCategoryId) { - const scopedCat = Discourse.Category.findById(scopedCategoryId); + const scopedCat = Category.findById(scopedCategoryId); scopedCategoryId = scopedCat.get('parent_category_id') || scopedCat.get('id'); } + const excludeCategoryId = this.get('excludeCategoryId'); + return categories.filter(c => { - if (scopedCategoryId && c.get('id') !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; } - if (c.get('isUncategorizedCategory')) { return false; } + const categoryId = c.get('id'); + if (scopedCategoryId && categoryId !== scopedCategoryId && c.get('parent_category_id') !== scopedCategoryId) { return false; } + if (c.get('isUncategorizedCategory') || excludeCategoryId === categoryId) { return false; } return c.get('permission') === PermissionType.FULL; }); }, @@ -30,8 +34,8 @@ export default ComboboxView.extend({ _updateCategories() { if (!this.get('categories')) { const categories = Discourse.SiteSettings.fixed_category_positions_on_create ? - Discourse.Category.list() : - Discourse.Category.listByActivity(); + Category.list() : + Category.listByActivity(); this.set('categories', categories); } }, @@ -42,7 +46,7 @@ export default ComboboxView.extend({ if (rootNone) { return "category.none"; } else { - return Discourse.Category.findUncategorized(); + return Category.findUncategorized(); } } else { return 'category.choose'; @@ -54,12 +58,12 @@ export default ComboboxView.extend({ // If we have no id, but text with the uncategorized name, we can use that badge. if (Ember.isEmpty(item.id)) { - const uncat = Discourse.Category.findUncategorized(); + const uncat = Category.findUncategorized(); if (uncat && uncat.get('name') === item.text) { category = uncat; } } else { - category = Discourse.Category.findById(parseInt(item.id,10)); + category = Category.findById(parseInt(item.id,10)); } if (!category) return item.text; @@ -67,7 +71,7 @@ export default ComboboxView.extend({ const parentCategoryId = category.get('parent_category_id'); if (parentCategoryId) { - result = categoryBadgeHTML(Discourse.Category.findById(parentCategoryId), {link: false}) + " " + result; + result = categoryBadgeHTML(Category.findById(parentCategoryId), {link: false}) + " " + result; } result += ` × ${category.get('topic_count')}`; diff --git a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 index e204db09a7..a7b5d784b0 100644 --- a/app/assets/javascripts/discourse/components/topic-status-info.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-status-info.js.es6 @@ -1,4 +1,5 @@ import { bufferedRender } from 'discourse-common/lib/buffered-render'; +import Category from 'discourse/models/category'; export default Ember.Component.extend(bufferedRender({ elementId: 'topic-status-info', @@ -8,7 +9,8 @@ export default Ember.Component.extend(bufferedRender({ 'topic.topic_status_update', 'topic.topic_status_update.execute_at', 'topic.topic_status_update.based_on_last_post', - 'topic.topic_status_update.duration' + 'topic.topic_status_update.duration', + 'topic.topic_status_update.category_id', ], buildBuffer(buffer) { @@ -35,11 +37,23 @@ export default Ember.Component.extend(bufferedRender({ buffer.push('

'); - buffer.push(I18n.t(this._noticeKey(), { + let options = { timeLeft: duration.humanize(true), - duration: moment.duration(autoCloseHours, "hours").humanize() - })); + duration: moment.duration(autoCloseHours, "hours").humanize(), + }; + const categoryId = this.get('topic.topic_status_update.category_id'); + + if (categoryId) { + const category = Category.findById(categoryId); + + options = _.assign({ + categoryName: category.get('slug'), + categoryUrl: category.get('url') + }, options); + } + + buffer.push(I18n.t(this._noticeKey(), options)); buffer.push('

'); // TODO Sam: concerned this can cause a heavy rerender loop diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 index 27c3a13c16..de3b147324 100644 --- a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 @@ -5,18 +5,36 @@ import { popupAjaxError } from 'discourse/lib/ajax-error'; const CLOSE_STATUS_TYPE = 'close'; const OPEN_STATUS_TYPE = 'open'; +const PUBLISH_TO_CATEGORY_STATUS_TYPE = 'publish_to_category'; export default Ember.Controller.extend(ModalFunctionality, { + closeStatusType: CLOSE_STATUS_TYPE, + openStatusType: OPEN_STATUS_TYPE, + publishToCategoryStatusType: PUBLISH_TO_CATEGORY_STATUS_TYPE, updateTimeValid: null, updateTimeInvalid: Em.computed.not('updateTimeValid'), loading: false, updateTime: null, topicStatusUpdate: Ember.computed.alias("model.topic_status_update"), selection: Ember.computed.alias('model.topic_status_update.status_type'), - autoReopen: Ember.computed.equal('selection', OPEN_STATUS_TYPE), + autoOpen: Ember.computed.equal('selection', OPEN_STATUS_TYPE), autoClose: Ember.computed.equal('selection', CLOSE_STATUS_TYPE), - disableAutoReopen: Ember.computed.and('autoClose', 'updateTime'), - disableAutoClose: Ember.computed.and('autoReopen', 'updateTime'), + publishToCategory: Ember.computed.equal('selection', PUBLISH_TO_CATEGORY_STATUS_TYPE), + + @computed('autoClose', 'updateTime') + disableAutoClose(autoClose, updateTime) { + return updateTime && !autoClose; + }, + + @computed('autoOpen', 'updateTime') + disableAutoOpen(autoOpen, updateTime) { + return updateTime && !autoOpen; + }, + + @computed('publishToCatgory', 'updateTime') + disablePublishToCategory(publishToCatgory, updateTime) { + return updateTime && !publishToCatgory; + }, @computed('topicStatusUpdate.based_on_last_post', 'updateTime', 'model.last_posted_at') willCloseImmediately(basedOnLastPost, updateTime, lastPostedAt) { @@ -42,7 +60,7 @@ export default Ember.Controller.extend(ModalFunctionality, { }, @observes("topicStatusUpdate.execute_at", "topicStatusUpdate.duration") - setAutoCloseTime() { + _setUpdateTime() { let time = null; if (this.get("topicStatusUpdate.based_on_last_post")) { @@ -65,12 +83,18 @@ export default Ember.Controller.extend(ModalFunctionality, { this.get('model.id'), time, this.get('topicStatusUpdate.based_on_last_post'), - status_type + status_type, + this.get('categoryId') ).then(result => { if (time) { this.send('closeModal'); - this.set('topicStatusUpdate.execute_at', result.execute_at); - this.set('topicStatusUpdate.duration', result.duration); + + this.get("topicStatusUpdate").setProperties({ + execute_at: result.execute_at, + duration: result.duration, + category_id: result.category_id + }); + this.set('model.closed', result.closed); } else { this.set('topicStatusUpdate', Ember.Object.create({})); diff --git a/app/assets/javascripts/discourse/models/topic-status-update.js.es6 b/app/assets/javascripts/discourse/models/topic-status-update.js.es6 index cec7eb91a0..fae76de94b 100644 --- a/app/assets/javascripts/discourse/models/topic-status-update.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-status-update.js.es6 @@ -4,7 +4,7 @@ import RestModel from 'discourse/models/rest'; const TopicStatusUpdate = RestModel.extend({}); TopicStatusUpdate.reopenClass({ - updateStatus(topicId, time, basedOnLastPost, statusType) { + updateStatus(topicId, time, basedOnLastPost, statusType, categoryId) { let data = { time: time, timezone_offset: (new Date().getTimezoneOffset()), @@ -12,6 +12,7 @@ TopicStatusUpdate.reopenClass({ }; if (basedOnLastPost) data.based_on_last_post = basedOnLastPost; + if (categoryId) data.category_id = categoryId; return ajax({ url: `/t/${topicId}/status_update`, diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index edcbaba332..3fcb115fbf 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -52,7 +52,7 @@ const TopicRoute = Discourse.Route.extend({ showTopicStatusUpdate() { const model = this.modelFor('topic'); - if (!model.get('topic_status_update')) model.set('topic_status_update', Ember.Object.create()); + model.set('topic_status_update', Ember.Object.create(model.get('topic_status_update'))); showModal('edit-topic-status-update', { model }); this.controllerFor('modal').set('modalClass', 'topic-close-modal'); }, diff --git a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs b/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs index d9b9cec0e9..455f17eea3 100644 --- a/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs +++ b/app/assets/javascripts/discourse/templates/components/auto-update-input.hbs @@ -1,21 +1,20 @@
-
+
+ + {{#if inputExamplesKey}} +
+ {{i18n inputExamplesKey}} +
+ {{/if}}
- {{#if inputExamplesKey}} -
- {{i18n inputExamplesKey}} -
- {{/if}} - - {{#unless hideBasedOnLastPost}} -
+
- {{#if autoReopen}} - {{auto-update-input - inputLabelKey='topic.topic_status_update.time' - input=updateTime - inputValid=updateTimeValid - hideBasedOnLastPost=true - basedOnLastPost=false}} - {{else if autoClose}} - {{auto-update-input - inputLabelKey='topic.topic_status_update.time' - input=updateTime - inputValid=updateTimeValid - limited=topicStatusUpdate.based_on_last_post - basedOnLastPost=topicStatusUpdate.based_on_last_post}} - - {{#if willCloseImmediately}} -
- {{fa-icon "warning"}} - {{willCloseI18n}} +
+ {{#if autoOpen}} + {{auto-update-input + inputLabelKey='topic.topic_status_update.time' + input=updateTime + inputValid=updateTimeValid + hideBasedOnLastPost=true + basedOnLastPost=false}} + {{else if publishToCategory}} +
+ + {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=model.category_id}}
+ + {{auto-update-input + inputLabelKey='topic.topic_status_update.time' + input=updateTime + inputValid=updateTimeValid + hideBasedOnLastPost=true + basedOnLastPost=false}} + {{else if autoClose}} + {{auto-update-input + inputLabelKey='topic.topic_status_update.time' + input=updateTime + inputValid=updateTimeValid + limited=topicStatusUpdate.based_on_last_post + basedOnLastPost=topicStatusUpdate.based_on_last_post}} + + {{#if willCloseImmediately}} +
+ {{fa-icon "warning"}} + {{willCloseI18n}} +
+ {{/if}} {{/if}} - {{/if}} +
{{/d-modal-body}}
diff --git a/app/assets/stylesheets/common/base/compose.scss b/app/assets/stylesheets/common/base/compose.scss index de5b4f6f01..9f86c23d94 100644 --- a/app/assets/stylesheets/common/base/compose.scss +++ b/app/assets/stylesheets/common/base/compose.scss @@ -134,12 +134,6 @@ div.ac-wrap { } .auto-update-input { - div:not(:first-child) { - margin-top: 10px; - } - label { - font-size: 1em; - } .examples { color: lighten($primary, 40%); } diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 5aaca0e35e..8fd7eff32a 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -295,38 +295,6 @@ } } -.topic-close-modal { - .radios { - padding-bottom: 20px; - display: inline-block; - - input[type='radio'] { - vertical-align: middle; - margin: 0px; - } - - label { - padding: 0 10px 0px 5px; - display: inline-block; - } - } - - .btn.pull-right { - margin-right: 10px; - } - form { - margin: 0; - } - .auto-update-input { - i.fa-clock-o { - font-size: 1.143em; - } - input { - margin: 0; - } - } -} - .edit-category-modal { .auto-update-input, .num-featured-topics-fields, .position-fields { input[type=text] { @@ -334,10 +302,6 @@ } } - .auto-update-input label { - font-size: .929em; - } - .subcategory-list-style-field { margin-left: 16px; } diff --git a/app/assets/stylesheets/common/base/topic-close-modal.scss b/app/assets/stylesheets/common/base/topic-close-modal.scss new file mode 100644 index 0000000000..0a638b6f81 --- /dev/null +++ b/app/assets/stylesheets/common/base/topic-close-modal.scss @@ -0,0 +1,29 @@ +.topic-close-modal { + label { + display: inline-block; + } + + .radios { + padding-bottom: 20px; + display: inline-block; + + input[type='radio'] { + vertical-align: middle; + margin: 0px; + } + + label { + padding: 0 10px 0px 5px; + } + } + + .btn.pull-right { + margin-right: 10px; + } + + .auto-update-input { + input { + margin: 0; + } + } +} diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index e7ca1a34c1..33b88966a7 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -290,7 +290,7 @@ class TopicsController < ApplicationController end def status_update - params.permit(:time, :timezone_offset, :based_on_last_post) + params.permit(:time, :timezone_offset, :based_on_last_post, :category_id) params.require(:status_type) status_type = @@ -303,12 +303,18 @@ class TopicsController < ApplicationController topic = Topic.find_by(id: params[:topic_id]) guardian.ensure_can_moderate!(topic) - topic_status_update = topic.set_or_create_status_update( - status_type, - params[:time], + options = { by_user: current_user, timezone_offset: params[:timezone_offset]&.to_i, based_on_last_post: params[:based_on_last_post] + } + + options.merge!(category_id: params[:category_id]) if !params[:category_id].blank? + + topic_status_update = topic.set_or_create_status_update( + status_type, + params[:time], + options ) if topic.save @@ -316,7 +322,8 @@ class TopicsController < ApplicationController execute_at: topic_status_update&.execute_at, duration: topic_status_update&.duration, based_on_last_post: topic_status_update&.based_on_last_post, - closed: topic.closed + closed: topic.closed, + category_id: topic_status_update&.category_id }) else render_json_error(topic) diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb new file mode 100644 index 0000000000..fe96de346b --- /dev/null +++ b/app/jobs/regular/publish_topic_to_category.rb @@ -0,0 +1,15 @@ +module Jobs + class PublishTopicToCategory < Jobs::Base + def execute(args) + topic_status_update = TopicStatusUpdate.find_by(id: args[:topic_status_update_id]) + raise Discourse::InvalidParameters.new(:topic_status_update_id) if topic_status_update.blank? + + topic = topic_status_update.topic + return if topic.blank? + + PostTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do + topic.change_category_to_id(topic_status_update.category_id) + end + end + end +end diff --git a/app/models/topic.rb b/app/models/topic.rb index 2cd63d151f..12198addaa 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -951,8 +951,10 @@ SQL # * `nil` to delete the topic's status update. # Options: # * by_user: User who is setting the topic's status update. - # * timezone_offset: (Integer) offset from UTC in minutes of the given argument. Default 0. - def set_or_create_status_update(status_type, time, by_user: nil, timezone_offset: 0, based_on_last_post: false) + # * timezone_offset: (Integer) offset from UTC in minutes of the given argument. + # * based_on_last_post: True if time should be based on timestamp of the last post. + # * category_id: Category that the update will apply to. + def set_or_create_status_update(status_type, time, by_user: nil, timezone_offset: 0, based_on_last_post: false, category_id: SiteSetting.uncategorized_category_id) topic_status_update = TopicStatusUpdate.find_or_initialize_by( status_type: status_type, topic: self @@ -966,6 +968,10 @@ SQL time_now = Time.zone.now topic_status_update.based_on_last_post = !based_on_last_post.blank? + if status_type == TopicStatusUpdate.types[:publish_to_category] + topic_status_update.category_id = category_id + end + if topic_status_update.based_on_last_post num_hours = time.to_f @@ -1191,51 +1197,56 @@ end # # Table name: topics # -# id :integer not null, primary key -# title :string not null -# last_posted_at :datetime -# created_at :datetime not null -# updated_at :datetime not null -# views :integer default(0), not null -# posts_count :integer default(0), not null -# user_id :integer -# last_post_user_id :integer not null -# reply_count :integer default(0), not null -# featured_user1_id :integer -# featured_user2_id :integer -# featured_user3_id :integer -# avg_time :integer -# deleted_at :datetime -# highest_post_number :integer default(0), not null -# image_url :string -# like_count :integer default(0), not null -# incoming_link_count :integer default(0), not null -# category_id :integer -# visible :boolean default(TRUE), not null -# moderator_posts_count :integer default(0), not null -# closed :boolean default(FALSE), not null -# archived :boolean default(FALSE), not null -# bumped_at :datetime not null -# has_summary :boolean default(FALSE), not null -# vote_count :integer default(0), not null -# archetype :string default("regular"), not null -# featured_user4_id :integer -# notify_moderators_count :integer default(0), not null -# spam_count :integer default(0), not null -# pinned_at :datetime -# score :float -# percent_rank :float default(1.0), not null -# subtype :string -# slug :string -# deleted_by_id :integer -# participant_count :integer default(1) -# word_count :integer -# excerpt :string(1000) -# pinned_globally :boolean default(FALSE), not null -# pinned_until :datetime -# fancy_title :string(400) -# highest_staff_post_number :integer default(0), not null -# featured_link :string +# id :integer not null, primary key +# title :string not null +# last_posted_at :datetime +# created_at :datetime not null +# updated_at :datetime not null +# views :integer default(0), not null +# posts_count :integer default(0), not null +# user_id :integer +# last_post_user_id :integer not null +# reply_count :integer default(0), not null +# featured_user1_id :integer +# featured_user2_id :integer +# featured_user3_id :integer +# avg_time :integer +# deleted_at :datetime +# highest_post_number :integer default(0), not null +# image_url :string +# like_count :integer default(0), not null +# incoming_link_count :integer default(0), not null +# category_id :integer +# visible :boolean default(TRUE), not null +# moderator_posts_count :integer default(0), not null +# closed :boolean default(FALSE), not null +# archived :boolean default(FALSE), not null +# bumped_at :datetime not null +# has_summary :boolean default(FALSE), not null +# vote_count :integer default(0), not null +# archetype :string default("regular"), not null +# featured_user4_id :integer +# notify_moderators_count :integer default(0), not null +# spam_count :integer default(0), not null +# pinned_at :datetime +# score :float +# percent_rank :float default(1.0), not null +# subtype :string +# slug :string +# auto_close_at :datetime +# auto_close_user_id :integer +# auto_close_started_at :datetime +# deleted_by_id :integer +# participant_count :integer default(1) +# word_count :integer +# excerpt :string(1000) +# pinned_globally :boolean default(FALSE), not null +# auto_close_based_on_last_post :boolean default(FALSE) +# auto_close_hours :float +# pinned_until :datetime +# fancy_title :string(400) +# highest_staff_post_number :integer default(0), not null +# featured_link :string # # Indexes # diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index a6948abb71..1e87540bde 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -8,9 +8,7 @@ class TopicStatusUpdate < ActiveRecord::Base validates :topic_id, presence: true validates :execute_at, presence: true validates :status_type, presence: true - validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at] } - validate :ensure_update_will_happen before_save do @@ -22,7 +20,7 @@ class TopicStatusUpdate < ActiveRecord::Base end after_save do - if execute_at_changed? || user_id_changed? + if (execute_at_changed? || user_id_changed?) && topic now = Time.zone.now time = execute_at < now ? now : execute_at @@ -33,7 +31,8 @@ class TopicStatusUpdate < ActiveRecord::Base def self.types @types ||= Enum.new( close: 1, - open: 2 + open: 2, + publish_to_category: 3 ) end @@ -69,26 +68,30 @@ class TopicStatusUpdate < ActiveRecord::Base end alias_method :cancel_auto_open_job, :cancel_auto_close_job - def schedule_auto_open_job(time) - if topic - topic.update_status('closed', true, user) if !topic.closed + def cancel_auto_publish_to_category_job + Jobs.cancel_scheduled_job(:publish_topic_to_category, topic_status_update_id: id) + end - Jobs.enqueue_at(time, :toggle_topic_closed, - topic_status_update_id: id, - state: false - ) - end + def schedule_auto_open_job(time) + topic.update_status('closed', true, user) if !topic.closed + + Jobs.enqueue_at(time, :toggle_topic_closed, + topic_status_update_id: id, + state: false + ) end def schedule_auto_close_job(time) - if topic - topic.update_status('closed', false, user) if topic.closed + topic.update_status('closed', false, user) if topic.closed - Jobs.enqueue_at(time, :toggle_topic_closed, - topic_status_update_id: id, - state: true - ) - end + Jobs.enqueue_at(time, :toggle_topic_closed, + topic_status_update_id: id, + state: true + ) + end + + def schedule_auto_publish_to_category_job(time) + Jobs.enqueue_at(time, :publish_topic_to_category, topic_status_update_id: id) end end @@ -106,6 +109,7 @@ end # deleted_by_id :integer # created_at :datetime # updated_at :datetime +# category_id :integer # # Indexes # diff --git a/app/serializers/topic_status_update_serializer.rb b/app/serializers/topic_status_update_serializer.rb index 4b6335d2a6..c2fcd8a586 100644 --- a/app/serializers/topic_status_update_serializer.rb +++ b/app/serializers/topic_status_update_serializer.rb @@ -3,7 +3,8 @@ class TopicStatusUpdateSerializer < ApplicationSerializer :execute_at, :duration, :based_on_last_post, - :status_type + :status_type, + :category_id def status_type TopicStatusUpdate.types[object.status_type] diff --git a/app/services/post_timestamp_changer.rb b/app/services/post_timestamp_changer.rb index 2364c12472..f2a9b3682a 100644 --- a/app/services/post_timestamp_changer.rb +++ b/app/services/post_timestamp_changer.rb @@ -1,6 +1,6 @@ class PostTimestampChanger def initialize(params) - @topic = Topic.with_deleted.find(params[:topic_id]) + @topic = params[:topic] || Topic.with_deleted.find(params[:topic_id]) @posts = @topic.posts @timestamp = Time.at(params[:timestamp]) @time_difference = calculate_time_difference @@ -21,6 +21,8 @@ class PostTimestampChanger end update_topic(last_posted_at) + + yield(@topic) if block_given? end # Burst the cache for stats diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 749f98cdba..9850258dcc 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1474,6 +1474,7 @@ en: save: "Set Timer" time: "Time:" remove: "Remove Timer" + publish_to: "Publish To:" auto_update_input: limited: units: "(# of hours)" @@ -1481,6 +1482,8 @@ en: all: units: "" examples: 'Enter number of hours (24), absolute time (17:30) or timestamp (2013-11-22 14:00).' + publish_to_category: + title: "Schedule Publishing" temp_open: title: "Open Temporarily" auto_reopen: @@ -1496,7 +1499,7 @@ en: status_update_notice: auto_open: "This topic will automatically open %{timeLeft}." auto_close: "This topic will automatically close %{timeLeft}." - auto_open_based_on_last_post: "This topic will open %{duration} after the last reply." + auto_publish_to_category: "This topic will be published to #%{categoryName} %{timeLeft}." auto_close_based_on_last_post: "This topic will close %{duration} after the last reply." auto_close_title: 'Auto-Close Settings' auto_close_immediate: diff --git a/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb b/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb new file mode 100644 index 0000000000..33147680bb --- /dev/null +++ b/db/migrate/20170403062717_add_category_id_to_topic_status_updates.rb @@ -0,0 +1,5 @@ +class AddCategoryIdToTopicStatusUpdates < ActiveRecord::Migration + def change + add_column :topic_status_updates, :category_id, :integer + end +end diff --git a/spec/components/post_creator_spec.rb b/spec/components/post_creator_spec.rb index 65085906b6..899ff969ab 100644 --- a/spec/components/post_creator_spec.rb +++ b/spec/components/post_creator_spec.rb @@ -260,6 +260,9 @@ describe PostCreator do end describe "topic's auto close" do + before do + SiteSetting.queue_jobs = true + end it "doesn't update topic's auto close when it's not based on last post" do Timecop.freeze do @@ -275,8 +278,6 @@ describe PostCreator do end it "updates topic's auto close date when it's based on last post" do - SiteSetting.queue_jobs = true - Timecop.freeze do topic = Fabricate(:topic, topic_status_updates: [Fabricate(:topic_status_update, diff --git a/spec/integration/managing_topic_status_spec.rb b/spec/integration/managing_topic_status_spec.rb index f6ca7f517b..c283ed60c1 100644 --- a/spec/integration/managing_topic_status_spec.rb +++ b/spec/integration/managing_topic_status_spec.rb @@ -76,6 +76,31 @@ RSpec.describe "Managing a topic's status update", type: :request do expect(json['closed']).to eq(topic.closed) end + describe 'publishing topic to category in the future' do + it 'should be able to create the topic status update' do + post "/t/#{topic.id}/status_update.json", + time: 24, + status_type: TopicStatusUpdate.types[3], + category_id: topic.category_id + + expect(response).to be_success + + topic_status_update = TopicStatusUpdate.last + + expect(topic_status_update.topic).to eq(topic) + + expect(topic_status_update.execute_at) + .to be_within(1.second).of(24.hours.from_now) + + expect(topic_status_update.status_type) + .to eq(TopicStatusUpdate.types[:publish_to_category]) + + json = JSON.parse(response.body) + + expect(json['category_id']).to eq(topic.category_id) + end + end + describe 'invalid status type' do it 'should raise the right error' do expect do diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb new file mode 100644 index 0000000000..bda35cc3f5 --- /dev/null +++ b/spec/jobs/publish_topic_to_category_spec.rb @@ -0,0 +1,52 @@ +require 'rails_helper' + +RSpec.describe Jobs::PublishTopicToCategory do + let(:category) { Fabricate(:category) } + let(:another_category) { Fabricate(:category) } + + let(:topic) do + Fabricate(:topic, category: category, topic_status_updates: [ + Fabricate(:topic_status_update, + status_type: TopicStatusUpdate.types[:publish_to_category], + category_id: another_category.id + ) + ]) + end + + before do + SiteSetting.queue_jobs = true + end + + describe 'when topic_status_update_id is invalid' do + it 'should raise the right error' do + expect { described_class.new.execute(topic_status_update_id: -1) } + .to raise_error(Discourse::InvalidParameters) + end + end + + describe 'when topic has been deleted' do + it 'should not publish the topic to the new category' do + Timecop.travel(1.hour.ago) { topic } + topic.trash! + + described_class.new.execute(topic_status_update_id: topic.topic_status_update.id) + + topic.reload + expect(topic.category).to eq(category) + expect(topic.created_at).to be_within(1.second).of(Time.zone.now - 1.hour) + end + end + + it 'should publish the topic to the new category correctly' do + Timecop.travel(1.hour.ago) { topic } + + described_class.new.execute(topic_status_update_id: topic.topic_status_update.id) + + topic.reload + expect(topic.category).to eq(another_category) + + %w{created_at bumped_at updated_at last_posted_at}.each do |attribute| + expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now) + end + end +end diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 41916d78a8..9d7fe427cc 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -1258,7 +1258,7 @@ describe Topic do expect(topic.reload.closed).to eq(false) - Timecop.freeze(3.hours.from_now) do + Timecop.travel(3.hours.from_now) do TopicStatusUpdate.ensure_consistency! expect(topic.reload.closed).to eq(true) end From 7f1c474e5b35496f6fc98291216cec5b1db4046c Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 13:06:07 +0800 Subject: [PATCH 071/124] FIX: Selections getting deselected on FireFox. --- .../javascripts/discourse/components/quote-button.js.es6 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/quote-button.js.es6 b/app/assets/javascripts/discourse/components/quote-button.js.es6 index a8c8f5cfa5..41de3de0c6 100644 --- a/app/assets/javascripts/discourse/components/quote-button.js.es6 +++ b/app/assets/javascripts/discourse/components/quote-button.js.es6 @@ -55,7 +55,8 @@ export default Ember.Component.extend({ const { isIOS, isAndroid, isSafari } = this.capabilities; const showAtEnd = isMobileDevice || isIOS || isAndroid; - // used to work around Safari losing selection + // Don't mess with the original range as it results in weird behaviours + // where certain browsers will deselect the selection const clone = firstRange.cloneRange(); // create a marker element containing a single invisible character @@ -63,9 +64,9 @@ export default Ember.Component.extend({ markerElement.appendChild(document.createTextNode("\ufeff")); // on mobile, collapse the range at the end of the selection - if (showAtEnd) { firstRange.collapse(); } + if (showAtEnd) { clone.collapse(); } // insert the marker - firstRange.insertNode(markerElement); + clone.insertNode(markerElement); // retrieve the position of the marker const $markerElement = $(markerElement); From aca972c08b6ee4d4168cddb3bc95eb49f292938d Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 14:13:18 +0800 Subject: [PATCH 072/124] FIX: Skip validations when updating group mentions. --- app/services/group_mentions_updater.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/group_mentions_updater.rb b/app/services/group_mentions_updater.rb index 0bd07a6425..92dd565098 100644 --- a/app/services/group_mentions_updater.rb +++ b/app/services/group_mentions_updater.rb @@ -7,7 +7,7 @@ class GroupMentionsUpdater posts.each do |post| post.raw.gsub!(/(^|\s)(@#{previous_name})(\s|$)/, "\\1@#{current_name}\\3") - post.save! + post.save!(validate: false) end end end From 406d721f1160cc890dd3f5d6cb3cf5352923dc8e Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 14:17:45 +0800 Subject: [PATCH 073/124] Fix `NilClass` error in `UsersController`. --- app/controllers/users_controller.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 13eddab750..28f53334e1 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -392,12 +392,12 @@ class UsersController < ApplicationController token = params[:token] if EmailToken.valid_token_format?(token) - if request.put? - @user = EmailToken.confirm(token) - else - email_token = EmailToken.confirmable(token) - @user = email_token.try(:user) - end + @user = + if request.put? + EmailToken.confirm(token) + else + EmailToken.confirmable(token)&.user + end if @user secure_session["password-#{token}"] = @user.id @@ -438,11 +438,11 @@ class UsersController < ApplicationController format.json do if request.put? - if @error || @user.errors&.any? + if @error || @user&.errors&.any? render json: { success: false, message: @error, - errors: @user.errors.to_hash, + errors: @user&.errors.to_hash, is_developer: UsernameCheckerService.is_developer?(@user.email) } else From 69661be500bb01c0be7fa2c1ff402fcf8ba3c45b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 14:29:47 +0800 Subject: [PATCH 074/124] FIX: Don't raise an error if `TopicStatusUpdate` has been deleted. --- app/jobs/regular/toggle_topic_closed.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/jobs/regular/toggle_topic_closed.rb b/app/jobs/regular/toggle_topic_closed.rb index 84b946fd8a..150df7625c 100644 --- a/app/jobs/regular/toggle_topic_closed.rb +++ b/app/jobs/regular/toggle_topic_closed.rb @@ -2,15 +2,15 @@ module Jobs class ToggleTopicClosed < Jobs::Base def execute(args) topic_status_update = TopicStatusUpdate.find_by(id: args[:topic_status_update_id]) - raise Discourse::InvalidParameters.new(:topic_status_update_id) if topic_status_update.blank? - - return if topic_status_update.execute_at > Time.zone.now - - topic = topic_status_update.topic - return if topic.blank? - state = !!args[:state] - return if topic.closed == state + + if topic_status_update.blank? || + topic_status_update.execute_at > Time.zone.now || + (topic = topic_status_update.topic).blank? || + topic.closed == state + + return + end user = topic_status_update.user From e4d7e4fbe3cdf8e930faab090c200e70efe306d0 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 17:19:14 +0800 Subject: [PATCH 075/124] Improve error messages. --- lib/post_creator.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 06a0c651b5..864ea578a7 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -182,7 +182,7 @@ class PostCreator create if !self.errors.full_messages.empty? - raise ActiveRecord::RecordNotSaved.new("Failed to create post", self) + raise ActiveRecord::RecordNotSaved.new("Failed to create post: #{self.errors.full_messages}") end @post From a248ebde3cefbb370df61194673f433f36b379ed Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 4 Apr 2017 17:19:55 +0800 Subject: [PATCH 076/124] Allow custom empty label for `category-chooser`. --- .../discourse/components/category-chooser.js.es6 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/category-chooser.js.es6 b/app/assets/javascripts/discourse/components/category-chooser.js.es6 index 7b031e354f..b79e8ef188 100644 --- a/app/assets/javascripts/discourse/components/category-chooser.js.es6 +++ b/app/assets/javascripts/discourse/components/category-chooser.js.es6 @@ -40,11 +40,11 @@ export default ComboboxView.extend({ } }, - @computed("rootNone") - none(rootNone) { + @computed("rootNone", "rootNoneLabel") + none(rootNone, rootNoneLabel) { if (Discourse.SiteSettings.allow_uncategorized_topics || this.get('allowUncategorized')) { if (rootNone) { - return "category.none"; + return rootNoneLabel || "category.none"; } else { return Category.findUncategorized(); } From a649014adf7543f18f652045052bfb9b0248812f Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 4 Apr 2017 11:22:39 -0400 Subject: [PATCH 077/124] Add spec for validation on group mention updater --- spec/services/group_mentions_updater_spec.rb | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/spec/services/group_mentions_updater_spec.rb b/spec/services/group_mentions_updater_spec.rb index 688e672c04..301fa134d5 100644 --- a/spec/services/group_mentions_updater_spec.rb +++ b/spec/services/group_mentions_updater_spec.rb @@ -35,5 +35,18 @@ RSpec.describe GroupMentionsUpdater do expect(post.reload.raw_mentions).to eq([]) end + + it "should ignore validations" do + Fabricate(:group, name: "awesome_team") + Fabricate(:group, name: "pro_team") + post.update!(raw: "@awesome_team is cool and so is @pro_team") + + SiteSetting.max_mentions_per_post = 1 + GroupMentionsUpdater.update('cool_team', 'awesome_team') + + post.reload + expect(post.raw_mentions).to match_array(['cool_team', 'pro_team']) + end + end end From 17f2974d0a99a6c38b1aa90abe68c9f8b69dc567 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 4 Apr 2017 13:59:22 -0400 Subject: [PATCH 078/124] SECURITY: Confirm new administrator accounts via email --- .../admin/models/admin-user.js.es6 | 18 ++--- app/controllers/admin/users_controller.rb | 8 +-- app/controllers/users_controller.rb | 21 +++++- app/jobs/regular/admin_confirmation_email.rb | 21 ++++++ app/mailers/admin_confirmation_mailer.rb | 15 +++++ app/views/users/confirm_admin.html.erb | 20 ++++++ config/locales/client.en.yml | 1 + config/locales/server.en.yml | 14 ++++ config/routes.rb | 5 ++ lib/admin_confirmation.rb | 59 +++++++++++++++++ spec/components/admin_confirmation_spec.rb | 54 +++++++++++++++ .../admin/users_controller_spec.rb | 12 +++- spec/controllers/users_controller_spec.rb | 65 +++++++++++++++++++ 13 files changed, 293 insertions(+), 20 deletions(-) create mode 100644 app/jobs/regular/admin_confirmation_email.rb create mode 100644 app/mailers/admin_confirmation_mailer.rb create mode 100644 app/views/users/confirm_admin.html.erb create mode 100644 lib/admin_confirmation.rb create mode 100644 spec/components/admin_confirmation_spec.rb diff --git a/app/assets/javascripts/admin/models/admin-user.js.es6 b/app/assets/javascripts/admin/models/admin-user.js.es6 index 4c952d953f..b1e1202a90 100644 --- a/app/assets/javascripts/admin/models/admin-user.js.es6 +++ b/app/assets/javascripts/admin/models/admin-user.js.es6 @@ -115,11 +115,10 @@ const AdminUser = Discourse.User.extend({ }, revokeAdmin() { - const self = this; - return ajax("/admin/users/" + this.get('id') + "/revoke_admin", { + return ajax(`/admin/users/${this.get('id')}/revoke_admin`, { type: 'PUT' - }).then(function() { - self.setProperties({ + }).then(() => { + this.setProperties({ admin: false, can_grant_admin: true, can_revoke_admin: false @@ -128,15 +127,10 @@ const AdminUser = Discourse.User.extend({ }, grantAdmin() { - const self = this; - return ajax("/admin/users/" + this.get('id') + "/grant_admin", { + return ajax(`/admin/users/${this.get('id')}/grant_admin`, { type: 'PUT' - }).then(function() { - self.setProperties({ - admin: true, - can_grant_admin: false, - can_revoke_admin: true - }); + }).then(() => { + bootbox.alert(I18n.t("admin.user.grant_admin_confirm")); }).catch(popupAjaxError); }, diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index c0e9791116..3f007d48c5 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,5 +1,6 @@ require_dependency 'user_destroyer' require_dependency 'admin_user_index_query' +require_dependency 'admin_confirmation' class Admin::UsersController < Admin::AdminController @@ -103,10 +104,8 @@ class Admin::UsersController < Admin::AdminController end def grant_admin - guardian.ensure_can_grant_admin!(@user) - @user.grant_admin! - StaffActionLogger.new(current_user).log_grant_admin(@user) - render_serialized(@user, AdminUserSerializer) + AdminConfirmation.new(@user, current_user).create_confirmation + render json: success_json end def revoke_moderation @@ -321,6 +320,7 @@ class Admin::UsersController < Admin::AdminController end def invite_admin + raise Discourse::InvalidAccess.new unless is_api? email = params[:email] unless user = User.find_by_email(email) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 28f53334e1..7ca6f0d380 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -3,11 +3,12 @@ require_dependency 'user_name_suggester' require_dependency 'rate_limiter' require_dependency 'wizard' require_dependency 'wizard/builder' +require_dependency 'admin_confirmation' class UsersController < ApplicationController skip_before_filter :authorize_mini_profiler, only: [:avatar] - skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login] + skip_before_filter :check_xhr, only: [:show, :password_reset, :update, :account_created, :activate_account, :perform_account_activation, :user_preferences_redirect, :avatar, :my_redirect, :toggle_anon, :admin_login, :confirm_admin] before_filter :ensure_logged_in, only: [:username, :update, :user_preferences_redirect, :upload_user_image, :pick_avatar, :destroy_user_image, :destroy, :check_emails, :topic_tracking_state] @@ -27,7 +28,8 @@ class UsersController < ApplicationController :send_activation_email, :password_reset, :confirm_email_token, - :admin_login] + :admin_login, + :confirm_admin] def index end @@ -726,6 +728,21 @@ class UsersController < ApplicationController render json: result end + def confirm_admin + @confirmation = AdminConfirmation.find_by_code(params[:token]) + + raise Discourse::NotFound unless @confirmation + raise Discourse::InvalidAccess.new unless + @confirmation.performed_by.id == (current_user&.id || @confirmation.performed_by.id) + + if request.post? + @confirmation.email_confirmed! + @confirmed = true + end + + render layout: 'no_ember' + end + private def honeypot_value diff --git a/app/jobs/regular/admin_confirmation_email.rb b/app/jobs/regular/admin_confirmation_email.rb new file mode 100644 index 0000000000..dbebf60962 --- /dev/null +++ b/app/jobs/regular/admin_confirmation_email.rb @@ -0,0 +1,21 @@ +require_dependency 'email/sender' + +module Jobs + class AdminConfirmationEmail < Jobs::Base + sidekiq_options queue: 'critical' + + def execute(args) + to_address = args[:to_address] + token = args[:token] + target_username = args[:target_username] + + raise Discourse::InvalidParameters.new(:to_address) if to_address.blank? + raise Discourse::InvalidParameters.new(:token) if token.blank? + raise Discourse::InvalidParameters.new(:target_username) if target_username.blank? + + message = AdminConfirmationMailer.send_email(to_address, target_username, token) + Email::Sender.new(message, :admin_confirmation_message).send + end + + end +end diff --git a/app/mailers/admin_confirmation_mailer.rb b/app/mailers/admin_confirmation_mailer.rb new file mode 100644 index 0000000000..ea4d444ad8 --- /dev/null +++ b/app/mailers/admin_confirmation_mailer.rb @@ -0,0 +1,15 @@ +require_dependency 'email/message_builder' + +class AdminConfirmationMailer < ActionMailer::Base + include Email::BuildEmailHelper + + def send_email(to_address, target_username, token) + build_email( + to_address, + template: 'admin_confirmation_mailer', + target_username: target_username, + admin_confirm_url: confirm_admin_url(token: token, host: Discourse.base_url_no_prefix) + ) + end +end + diff --git a/app/views/users/confirm_admin.html.erb b/app/views/users/confirm_admin.html.erb new file mode 100644 index 0000000000..4e996da74a --- /dev/null +++ b/app/views/users/confirm_admin.html.erb @@ -0,0 +1,20 @@ +
+

<%= t 'activation.admin_confirm.title' %>

+
+ + <%- unless @confirmed %> + <%=raw (t('activation.admin_confirm.description', target_username: @confirmation.target_user.username)) %> +
+
+ + <%= form_tag do %> + <%= submit_tag t('activation.admin_confirm.grant'), class: 'btn btn-primary' %> + <% end %> + <% else %> + <%=raw (t('activation.admin_confirm.complete', target_username: @confirmation.target_user.username)) %> +
+
+ <%= link_to t("activation.admin_confirm.back_to", title: SiteSetting.title), "/", class: 'btn btn-primary' %> + <% end %> + +
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 9850258dcc..ab0caede55 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3111,6 +3111,7 @@ en: logged_out: "User was logged out on all devices" revoke_admin: 'Revoke Admin' grant_admin: 'Grant Admin' + grant_admin_confirm: "We've sent you an email to verify the new administrator. Please open it and follow the instructions." revoke_moderation: 'Revoke Moderation' grant_moderation: 'Grant Moderation' unblock: 'Unblock' diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index d83e26658a..e952de369d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -624,6 +624,12 @@ en: approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" missing_session: "We cannot detect if your account was created, please ensure you have cookies enabled." activated: "Sorry, this account has already been activated." + admin_confirm: + title: "Confirm Admin Account" + description: "Are you sure you want %{target_username} to be an administrator?" + grant: "Grant Admin Access" + complete: "%{target_username} is now an administrator." + back_to: "Return to %{title}" post_action_types: off_topic: title: 'Off-Topic' @@ -1811,6 +1817,14 @@ en: no_token: | Sorry, this backup download link has already been used or has expired. + admin_confirmation_mailer: + title: "Admin Confirmation" + subject_template: "[%{email_prefix}] Confirm new Admin Account" + text_body_template: | + Please confirm that you'd like to add **%{target_username}** as an administrator for your forum. + + [Confirm Administrator Account](%{admin_confirm_url}) + test_mailer: title: "Test Mailer" subject_template: "[%{email_prefix}] Email Deliverability Test" diff --git a/config/routes.rb b/config/routes.rb index b33b21830c..8456bbb50b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -322,6 +322,11 @@ Discourse::Application.routes.draw do get "#{root_path}/activate-account/:token" => "users#activate_account" put({ "#{root_path}/activate-account/:token" => "users#perform_account_activation" }.merge(index == 1 ? { as: 'perform_activate_account' } : {})) get "#{root_path}/authorize-email/:token" => "users_email#confirm" + get({ + "#{root_path}/confirm-admin/:token" => "users#confirm_admin", + constraints: { token: /[0-9a-f]+/ } + }.merge(index == 1 ? { as: 'confirm_admin' } : {})) + post "#{root_path}/confirm-admin/:token" => "users#confirm_admin", constraints: { token: /[0-9a-f]+/ } get "#{root_path}/:username/private-messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "#{root_path}/:username/private-messages/:filter" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} get "#{root_path}/:username/messages" => "user_actions#private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} diff --git a/lib/admin_confirmation.rb b/lib/admin_confirmation.rb new file mode 100644 index 0000000000..cb75675052 --- /dev/null +++ b/lib/admin_confirmation.rb @@ -0,0 +1,59 @@ +class AdminConfirmation + attr_accessor :token + attr_reader :performed_by + attr_reader :target_user + + def initialize(target_user, performed_by) + @target_user = target_user + @performed_by = performed_by + end + + def create_confirmation + guardian = Guardian.new(@performed_by) + guardian.ensure_can_grant_admin!(@target_user) + + @token = SecureRandom.hex + $redis.setex("admin-confirmation:#{@target_user.id}", 3.hours.to_i, @token) + + payload = { + target_user_id: @target_user.id, + performed_by: @performed_by.id + } + $redis.setex("admin-confirmation-token:#{@token}", 3.hours.to_i, payload.to_json) + + Jobs.enqueue( + :admin_confirmation_email, + to_address: @performed_by.email, + target_username: @target_user.username, + token: @token + ) + end + + def email_confirmed! + guardian = Guardian.new(@performed_by) + guardian.ensure_can_grant_admin!(@target_user) + + @target_user.grant_admin! + StaffActionLogger.new(@performed_by).log_grant_admin(@target_user) + $redis.del "admin-confirmation:#{@target_user.id}" + $redis.del "admin-confirmation-token:#{@token}" + end + + def self.exists_for?(user_id) + $redis.exists "admin-confirmation:#{user_id}" + end + + def self.find_by_code(token) + json = $redis.get("admin-confirmation-token:#{token}") + return nil unless json + + parsed = JSON.parse(json) + target_user = User.find(parsed['target_user_id'].to_i) + performed_by = User.find(parsed['performed_by'].to_i) + + ac = AdminConfirmation.new(target_user, performed_by) + ac.token = token + ac + end + +end diff --git a/spec/components/admin_confirmation_spec.rb b/spec/components/admin_confirmation_spec.rb new file mode 100644 index 0000000000..20d74fec96 --- /dev/null +++ b/spec/components/admin_confirmation_spec.rb @@ -0,0 +1,54 @@ +require 'admin_confirmation' +require 'rails_helper' + +describe AdminConfirmation do + + let(:admin) { Fabricate(:admin) } + let(:user) { Fabricate(:user) } + + describe "create_confirmation" do + it "raises an error for non-admins" do + ac = AdminConfirmation.new(user, Fabricate(:moderator)) + expect { ac.create_confirmation }.to raise_error(Discourse::InvalidAccess) + end + end + + describe "email_confirmed!" do + before do + ac = AdminConfirmation.new(user, admin) + ac.create_confirmation + @token = ac.token + end + + it "cannot confirm if the user loses admin access" do + ac = AdminConfirmation.find_by_code(@token) + ac.performed_by.update_column(:admin, false) + expect { ac.email_confirmed! }.to raise_error(Discourse::InvalidAccess) + end + + it "can confirm admin accounts" do + ac = AdminConfirmation.find_by_code(@token) + expect(ac.performed_by).to eq(admin) + expect(ac.target_user).to eq(user) + expect(ac.token).to eq(@token) + ac.email_confirmed! + + user.reload + expect(user.admin?).to eq(true) + + # It creates a staff log + logs = UserHistory.where( + action: UserHistory.actions[:grant_admin], + target_user_id: user.id + ) + expect(logs).to be_present + + # It removes the redis keys for another user + expect(AdminConfirmation.find_by_code(ac.token)).to eq(nil) + expect(AdminConfirmation.exists_for?(user.id)).to eq(false) + end + + end + +end + diff --git a/spec/controllers/admin/users_controller_spec.rb b/spec/controllers/admin/users_controller_spec.rb index 912338f262..23bb1ebe8c 100644 --- a/spec/controllers/admin/users_controller_spec.rb +++ b/spec/controllers/admin/users_controller_spec.rb @@ -166,9 +166,9 @@ describe Admin::UsersController do end it 'updates the admin flag' do + expect(AdminConfirmation.exists_for?(@another_user.id)).to eq(false) xhr :put, :grant_admin, user_id: @another_user.id - @another_user.reload - expect(@another_user).to be_admin + expect(AdminConfirmation.exists_for?(@another_user.id)).to eq(true) end end @@ -491,7 +491,14 @@ describe Admin::UsersController do end context ".invite_admin" do + it "doesn't work when not via API" do + controller.stubs(:is_api?).returns(false) + xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com' + expect(response).not_to be_success + end + it 'should invite admin' do + controller.stubs(:is_api?).returns(true) Jobs.expects(:enqueue).with(:critical_user_email, anything).returns(true) xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com' expect(response).to be_success @@ -503,6 +510,7 @@ describe Admin::UsersController do end it "doesn't send the email with send_email falsy" do + controller.stubs(:is_api?).returns(true) Jobs.expects(:enqueue).with(:user_email, anything).never xhr :post, :invite_admin, name: 'Bill', username: 'bill22', email: 'bill@bill.com', send_email: '0' expect(response).to be_success diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 119859d3f5..5d6ed23105 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1807,4 +1807,69 @@ describe UsersController do end end + + describe ".confirm_admin" do + it "fails without a valid token" do + expect { + get :confirm_admin, token: 'invalid-token' + }.to raise_error(ActionController::UrlGenerationError) + end + + it "fails with a missing token" do + get :confirm_admin, token: 'a0a0a0a0a0' + expect(response).to_not be_success + end + + it "succeeds with a valid code as anonymous" do + user = Fabricate(:user) + ac = AdminConfirmation.new(user, Fabricate(:admin)) + ac.create_confirmation + get :confirm_admin, token: ac.token + expect(response).to be_success + + user.reload + expect(user.admin?).to eq(false) + end + + it "succeeds with a valid code when logged in as that user" do + admin = log_in(:admin) + user = Fabricate(:user) + + ac = AdminConfirmation.new(user, admin) + ac.create_confirmation + get :confirm_admin, token: ac.token + expect(response).to be_success + + user.reload + expect(user.admin?).to eq(false) + end + + it "fails if you're logged in as a different account" do + log_in(:admin) + user = Fabricate(:user) + + ac = AdminConfirmation.new(user, Fabricate(:admin)) + ac.create_confirmation + get :confirm_admin, token: ac.token + expect(response).to_not be_success + + user.reload + expect(user.admin?).to eq(false) + end + + describe "post" do + it "gives the user admin access when POSTed" do + user = Fabricate(:user) + ac = AdminConfirmation.new(user, Fabricate(:admin)) + ac.create_confirmation + post :confirm_admin, token: ac.token + expect(response).to be_success + + user.reload + expect(user.admin?).to eq(true) + end + end + + end + end From 3839206317bc78efd9f4872776d95c6a380f7323 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 4 Apr 2017 16:22:14 -0400 Subject: [PATCH 079/124] FIX: Return JSON errors for `by-external` if JSON requested --- app/controllers/application_controller.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index eeb1ca1e78..2c39073208 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -147,7 +147,11 @@ class ApplicationController < ActionController::Base def rescue_discourse_actions(type, status_code, include_ember=false) - if (request.format && request.format.json?) || (request.xhr?) + show_json_errors = (request.format && request.format.json?) || + (request.xhr?) || + ((params[:external_id] || '').ends_with? '.json') + + if show_json_errors # HACK: do not use render_json_error for topics#show if request.params[:controller] == 'topics' && request.params[:action] == 'show' return render status: status_code, layout: false, text: (status_code == 404 || status_code == 410) ? build_not_found_page(status_code) : I18n.t(type) From 8b383bb26a2130005eef380f81f99499cac9305b Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Wed, 5 Apr 2017 00:15:39 -0300 Subject: [PATCH 080/124] FIX: Poll builder validation was incorrect --- .../controllers/poll-ui-builder.js.es6 | 35 +++++++++++-------- .../templates/modal/poll-ui-builder.hbs | 3 +- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 index 19cfc33d6d..6458c65028 100644 --- a/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 +++ b/plugins/poll/assets/javascripts/controllers/poll-ui-builder.js.es6 @@ -2,6 +2,7 @@ import { default as computed, observes } from 'ember-addons/ember-computed-decor import InputValidation from 'discourse/models/input-validation'; export default Ember.Controller.extend({ + regularPollType: 'regular', numberPollType: 'number', multiplePollType: 'multiple', @@ -10,16 +11,22 @@ export default Ember.Controller.extend({ this._setupPoll(); }, - @computed("numberPollType", "multiplePollType") - pollTypes(numberPollType, multiplePollType) { + @computed("regularPollType", "numberPollType", "multiplePollType") + pollTypes(regularPollType, numberPollType, multiplePollType) { let types = []; + types.push({ name: I18n.t("poll.ui_builder.poll_type.regular"), value: regularPollType }); types.push({ name: I18n.t("poll.ui_builder.poll_type.number"), value: numberPollType }); types.push({ name: I18n.t("poll.ui_builder.poll_type.multiple"), value: multiplePollType }); return types; }, + @computed("pollType", "regularPollType") + isRegular(pollType, regularPollType) { + return pollType === regularPollType; + }, + @computed("pollType", "pollOptionsCount", "multiplePollType") isMultiple(pollType, count, multiplePollType) { return (pollType === multiplePollType) && count > 0; @@ -30,9 +37,9 @@ export default Ember.Controller.extend({ return pollType === numberPollType; }, - @computed("isNumber", "isMultiple") - showMinMax(isNumber, isMultiple) { - return isNumber || isMultiple; + @computed("isRegular") + showMinMax(isRegular) { + return !isRegular; }, @computed("pollOptions") @@ -61,9 +68,9 @@ export default Ember.Controller.extend({ } }, - @computed("isMultiple", "isNumber", "pollOptionsCount") - pollMinOptions(isMultiple, isNumber, count) { - if (!isMultiple && !isNumber) return; + @computed("isRegular", "isMultiple", "isNumber", "pollOptionsCount") + pollMinOptions(isRegular, isMultiple, isNumber, count) { + if (isRegular) return; if (isMultiple) { return this._comboboxOptions(1, count + 1); @@ -72,9 +79,9 @@ export default Ember.Controller.extend({ } }, - @computed("isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") - pollMaxOptions(isMultiple, isNumber, count, pollMin, pollStep) { - if (!isMultiple && !isNumber) return; + @computed("isRegular", "isMultiple", "isNumber", "pollOptionsCount", "pollMin", "pollStep") + pollMaxOptions(isRegular, isMultiple, isNumber, count, pollMin, pollStep) { + if (isRegular) return; const pollMinInt = parseInt(pollMin) || 1; if (isMultiple) { @@ -120,9 +127,9 @@ export default Ember.Controller.extend({ return output; }, - @computed("pollOptionsCount", "isNumber", "pollMin", "pollMax") - disableInsert(count, isNumber, pollMin, pollMax) { - return (pollMin >= pollMax) || (isNumber ? false : (count < 2)); + @computed("pollOptionsCount", "isRegular", "isMultiple", "isNumber", "pollMin", "pollMax") + disableInsert(count, isRegular, isMultiple, isNumber, pollMin, pollMax) { + return (isRegular && count < 2) || (isMultiple && count < pollMin && pollMin >= pollMax) || (isNumber ? false : (count < 2)); }, @computed("pollMin", "pollMax") diff --git a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs index 50ed74ce9b..81a25f4b04 100644 --- a/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs +++ b/plugins/poll/assets/javascripts/discourse/templates/modal/poll-ui-builder.hbs @@ -4,8 +4,7 @@ {{combo-box content=pollTypes value=pollType - valueAttribute="value" - none="poll.ui_builder.poll_type.regular"}} + valueAttribute="value"}}
{{#if showMinMax}} From c43c78cb8a69d9485ab74b971acbc7e7a2a9abd2 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Wed, 5 Apr 2017 13:57:34 +0530 Subject: [PATCH 081/124] FIX: do not add order param to user list unless required --- .../javascripts/admin/controllers/admin-users-list-show.js.es6 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 index 0d8aec0771..43af644266 100644 --- a/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-users-list-show.js.es6 @@ -7,7 +7,7 @@ import { observes } from 'ember-addons/ember-computed-decorators'; export default Ember.Controller.extend({ query: null, queryParams: ['order', 'ascending'], - order: 'seen', + order: null, ascending: null, showEmails: false, refreshing: false, From 10fb13d2047bbea85434851e942ce29c76d9c912 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Wed, 5 Apr 2017 16:43:47 +0800 Subject: [PATCH 082/124] Start running tests for slack plugin on Travis. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index cb8c3c021c..465c6366df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ before_install: - git clone --depth=1 https://github.com/discourse/discourse-spoiler-alert.git plugins/discourse-spoiler-alert - git clone --depth=1 https://github.com/discourse/discourse-cakeday.git plugins/discourse-cakeday - git clone --depth=1 https://github.com/discourse/discourse-canned-replies.git plugins/discourse-canned-replies + - git clone --depth=1 https://github.com/discourse/discourse-slack-official.git plugins/discourse-slack-official - npm i -g eslint babel-eslint - eslint app/assets/javascripts - eslint --ext .es6 app/assets/javascripts From 9065df76ade33f763ef9b7dc5d225f874433d4f4 Mon Sep 17 00:00:00 2001 From: Bianca Nenciu Date: Sun, 2 Apr 2017 20:35:30 +0300 Subject: [PATCH 083/124] FEATURE: Change name from admin page. https://github.com/discourse/discourse/pull/4770 --- .../admin/controllers/admin-user-index.js.es6 | 52 ++++++++++++++++--- .../admin/templates/user-index.hbs | 38 +++++++++++--- config/locales/client.en.yml | 2 - 3 files changed, 75 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 91717cf8f0..175463c0a1 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -2,8 +2,11 @@ import { ajax } from 'discourse/lib/ajax'; import CanCheckEmails from 'discourse/mixins/can-check-emails'; import { propertyNotEqual, setting } from 'discourse/lib/computed'; import { userPath } from 'discourse/lib/url'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; export default Ember.Controller.extend(CanCheckEmails, { + editingUsername: false, + editingName: false, editingTitle: false, originalPrimaryGroupId: null, availableGroups: null, @@ -55,23 +58,58 @@ export default Ember.Controller.extend(CanCheckEmails, { anonymize() { return this.get('model').anonymize(); }, destroy() { return this.get('model').destroy(); }, + toggleUsernameEdit() { + this.set('userUsernameValue', this.get('model.username')); + this.toggleProperty('editingUsername'); + }, + + saveUsername() { + const oldUsername = this.get('model.username'); + this.set('model.username', this.get('userUsernameValue')); + + return ajax(`/users/${oldUsername.toLowerCase()}/preferences/username`, { + data: { new_username: this.get('userUsernameValue') }, + type: 'PUT' + }).catch(e => { + this.set('model.username', oldUsername); + popupAjaxError(e); + }).finally(() => this.toggleProperty('editingUsername')); + }, + + toggleNameEdit() { + this.set('userNameValue', this.get('model.name')); + this.toggleProperty('editingName'); + }, + + saveName() { + const oldName = this.get('model.name'); + this.set('model.name', this.get('userNameValue')); + + return ajax(userPath(`${this.get('model.username').toLowerCase()}.json`), { + data: { name: this.get('userNameValue') }, + type: 'PUT' + }).catch(e => { + this.set('model.name', oldName); + popupAjaxError(e); + }).finally(() => this.toggleProperty('editingName')); + }, + toggleTitleEdit() { this.set('userTitleValue', this.get('model.title')); this.toggleProperty('editingTitle'); }, saveTitle() { - const self = this; + const prevTitle = this.get('userTitleValue'); + this.set('model.title', this.get('userTitleValue')); return ajax(userPath(`${this.get('model.username').toLowerCase()}.json`), { data: {title: this.get('userTitleValue')}, type: 'PUT' - }).catch(function(e) { - bootbox.alert(I18n.t("generic_error_with_reason", {error: "http: " + e.status + " - " + e.body})); - }).finally(function() { - self.set('model.title', self.get('userTitleValue')); - self.toggleProperty('editingTitle'); - }); + }).catch(e => { + this.set('model.title', prevTitle); + popupAjaxError(e); + }).finally(() => this.toggleProperty('editingTitle')); }, generateApiKey() { diff --git a/app/assets/javascripts/admin/templates/user-index.hbs b/app/assets/javascripts/admin/templates/user-index.hbs index 923fb1c09b..f172c65124 100644 --- a/app/assets/javascripts/admin/templates/user-index.hbs +++ b/app/assets/javascripts/admin/templates/user-index.hbs @@ -22,18 +22,40 @@
{{i18n 'user.username.title'}}
-
{{model.username}}
+
+ {{#if editingUsername}} + {{text-field value=userUsernameValue autofocus="autofocus"}} + {{else}} + {{model.username}} + {{/if}} +
- {{#link-to 'preferences.username' model class="btn"}} - {{fa-icon "pencil"}} - {{i18n 'user.change_username.title'}} - {{/link-to}} + {{#if editingUsername}} + {{d-button action="saveUsername" label="admin.user_fields.save"}} + {{i18n 'cancel'}} + {{else}} + {{d-button action="toggleUsernameEdit" icon="pencil"}} + {{/if}}
{{i18n 'user.name.title'}}
-
{{model.name}}
+
+ {{#if editingName}} + {{text-field value=userNameValue autofocus="autofocus"}} + {{else}} + {{model.name}} + {{/if}} +
+
+ {{#if editingName}} + {{d-button action="saveName" label="admin.user_fields.save"}} + {{i18n 'cancel'}} + {{else}} + {{d-button action="toggleNameEdit" icon="pencil"}} + {{/if}} +
{{#if canCheckEmails}} @@ -90,10 +112,10 @@
{{#if editingTitle}} - {{d-button action="saveTitle" label="admin.user.save_title"}} + {{d-button action="saveTitle" label="admin.user_fields.save"}} {{i18n 'cancel'}} {{else}} - {{d-button action="toggleTitleEdit" icon="pencil" label="admin.user.edit_title"}} + {{d-button action="toggleTitleEdit" icon="pencil"}} {{/if}}
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index ab0caede55..29b0d2a179 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -3099,8 +3099,6 @@ en: blocked: "Blocked?" staged: "Staged?" show_admin_profile: "Admin" - edit_title: "Edit Title" - save_title: "Save Title" refresh_browsers: "Force browser refresh" refresh_browsers_message: "Message sent to all clients!" show_public_profile: "Show Public Profile" From cd3904926238ebaa53d7be1724b9f2d9e86200fd Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 5 Apr 2017 08:28:24 -0400 Subject: [PATCH 084/124] SECURITY: do not send push notifications to suspended users --- app/services/post_alerter.rb | 2 +- spec/services/post_alerter_spec.rb | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 4f2d9026a7..014f5d0cfe 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -373,7 +373,7 @@ class PostAlerter post_action_id: opts[:post_action_id], data: notification_data.to_json) - if !existing_notification && NOTIFIABLE_TYPES.include?(type) + if !existing_notification && NOTIFIABLE_TYPES.include?(type) && !user.suspended? # we may have an invalid post somehow, dont blow up post_url = original_post.url rescue nil if post_url diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index ff160244f3..0b724d09a1 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -328,6 +328,26 @@ describe PostAlerter do let(:mention_post) { create_post_with_alerts(user: user, raw: 'Hello @eviltrout :heart:')} let(:topic) { mention_post.topic } + it "pushes nothing to suspended users" do + + SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push" + + evil_trout.update_columns(suspended_till: 1.year.from_now) + + 2.times do |i| + UserApiKey.create!(user_id: evil_trout.id, + client_id: "xxx#{i}", + key: "yyy#{i}", + application_name: "iPhone#{i}", + scopes: ['notifications'], + push_url: "https://site2.com/push") + end + + # should only happen once even though we are using 2 keys + RestClient.expects(:post).never + mention_post + end + it "correctly pushes notifications if configured correctly" do SiteSetting.allowed_user_api_push_urls = "https://site.com/push|https://site2.com/push" From 48d9c69117469c090f1b67cf5f34180e58f8521f Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 5 Apr 2017 08:46:35 -0400 Subject: [PATCH 085/124] remove confusing comment --- spec/services/post_alerter_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/services/post_alerter_spec.rb b/spec/services/post_alerter_spec.rb index 0b724d09a1..c53e47977e 100644 --- a/spec/services/post_alerter_spec.rb +++ b/spec/services/post_alerter_spec.rb @@ -343,7 +343,6 @@ describe PostAlerter do push_url: "https://site2.com/push") end - # should only happen once even though we are using 2 keys RestClient.expects(:post).never mention_post end From d1c79372d76f5ad96bf30125e62bdc629a1bfcea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Wed, 5 Apr 2017 18:45:01 +0200 Subject: [PATCH 086/124] fix permalinks serializer with subfolder setups --- app/serializers/permalink_serializer.rb | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb index 98f2062f79..467e07c586 100644 --- a/app/serializers/permalink_serializer.rb +++ b/app/serializers/permalink_serializer.rb @@ -1,31 +1,34 @@ class PermalinkSerializer < ApplicationSerializer - attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :post_number, :post_topic_title, :category_id, :category_name, :category_url, :external_url + attributes :id, :url, :topic_id, :topic_title, :topic_url, + :post_id, :post_url, :post_number, :post_topic_title, + :category_id, :category_name, :category_url, :external_url def topic_title - object.try(:topic).try(:title) + object&.topic&.title end def topic_url - object.try(:topic).try(:url) + object&.topic&.url end def post_url - object.try(:post).try(:url) + # use `full_url` to support subfolder setups + object&.post&.full_url end def post_number - object.try(:post).try(:post_number) + object&.post&.post_number end def post_topic_title - object.try(:post).try(:topic).try(:title) + object&.post&.topic&.title end def category_name - object.try(:category).try(:name) + object&.category&.name end def category_url - object.try(:category).try(:url) + object&.category&.url end end From 40ab2e56677625ee2d97ea7cce1607c521f38fbb Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 5 Apr 2017 16:14:22 -0400 Subject: [PATCH 087/124] FEATURE: Let users update their emails before confirming This allows users who entered a typo or invalid email address when signing up an opportunity to fix it and resending the confirmation email to that address. --- app/assets/javascripts/application.js | 2 +- .../controllers/activation-edit.js.es6 | 36 +++++++++ .../controllers/basic-modal-body.js.es6 | 5 ++ .../controllers/not-activated.js.es6 | 18 +++-- .../discourse/lib/show-modal.js.es6 | 24 +++--- .../mixins/modal-functionality.js.es6 | 12 +++ .../components/modal-footer-close.hbs | 3 + .../templates/modal/activation-edit.hbs | 12 +++ .../templates/modal/activation-resent.hbs | 5 ++ .../templates/modal/not-activated.hbs | 16 ++-- app/assets/stylesheets/common/base/modal.scss | 8 ++ app/controllers/users_controller.rb | 23 ++++++ config/locales/client.en.yml | 6 ++ config/locales/server.en.yml | 2 +- config/routes.rb | 1 + spec/controllers/users_controller_spec.rb | 73 +++++++++++++++++++ spec/fabricators/user_fabricator.rb | 1 + .../acceptance/sign-in-test.js.es6 | 30 +++++++- .../helpers/create-pretender.js.es6 | 8 ++ 19 files changed, 255 insertions(+), 30 deletions(-) create mode 100644 app/assets/javascripts/discourse/controllers/activation-edit.js.es6 create mode 100644 app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 create mode 100644 app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs create mode 100644 app/assets/javascripts/discourse/templates/modal/activation-edit.hbs create mode 100644 app/assets/javascripts/discourse/templates/modal/activation-resent.hbs diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index ce7addad87..29c8e300b1 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -25,6 +25,7 @@ //= require ./discourse/lib/computed //= require ./discourse/lib/formatter //= require ./discourse/lib/eyeline +//= require ./discourse/lib/show-modal //= require ./discourse/mixins/scrolling //= require ./discourse/models/model //= require ./discourse/models/rest @@ -68,7 +69,6 @@ //= require ./discourse/lib/emoji/groups //= require ./discourse/lib/emoji/toolbar //= require ./discourse/components/d-editor -//= require ./discourse/lib/show-modal //= require ./discourse/lib/screen-track //= require ./discourse/routes/discourse //= require ./discourse/routes/build-topic-route diff --git a/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 new file mode 100644 index 0000000000..ddd8a2a562 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/activation-edit.js.es6 @@ -0,0 +1,36 @@ +import computed from 'ember-addons/ember-computed-decorators'; +import ModalFunctionality from 'discourse/mixins/modal-functionality'; +import { ajax } from 'discourse/lib/ajax'; +import { extractError } from 'discourse/lib/ajax-error'; +import { userPath } from 'discourse/lib/url'; + +export default Ember.Controller.extend(ModalFunctionality, { + login: Ember.inject.controller(), + + currentEmail: null, + newEmail: null, + password: null, + + @computed('newEmail', 'currentEmail') + submitDisabled(newEmail, currentEmail) { + return newEmail === currentEmail; + }, + + actions: { + changeEmail() { + const login = this.get('login'); + + ajax(userPath('update-activation-email'), { + data: { + username: login.get('loginName'), + password: login.get('loginPassword'), + email: this.get('newEmail') + }, + type: 'PUT' + }).then(() => { + const modal = this.showModal('activation-resent', {title: 'log_in'}); + modal.set('currentEmail', this.get('newEmail')); + }).catch(err => this.flash(extractError(err), 'error')); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 new file mode 100644 index 0000000000..f7001555a9 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/basic-modal-body.js.es6 @@ -0,0 +1,5 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; + +export default Ember.Controller.extend(ModalFunctionality, { + modal: null +}); diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 index cf0164b0e6..976e1311bd 100644 --- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 +++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 @@ -4,21 +4,23 @@ import ModalFunctionality from 'discourse/mixins/modal-functionality'; import { userPath } from 'discourse/lib/url'; export default Ember.Controller.extend(ModalFunctionality, { - emailSent: false, - - onShow() { - this.set("emailSent", false); - }, - actions: { sendActivationEmail() { ajax(userPath('action/send_activation_email'), { data: { username: this.get('username') }, type: 'POST' }).then(() => { - this.set('emailSent', true); + const modal = this.showModal('activation-resent', {title: 'log_in'}); + modal.set('currentEmail', this.get('currentEmail')); }).catch(popupAjaxError); + }, + + editActivationEmail() { + const modal = this.showModal('activation-edit', {title: 'login.change_email'}); + + const currentEmail = this.get('currentEmail'); + modal.set('currentEmail', currentEmail); + modal.set('newEmail', currentEmail); } } - }); diff --git a/app/assets/javascripts/discourse/lib/show-modal.js.es6 b/app/assets/javascripts/discourse/lib/show-modal.js.es6 index ed2457e065..739fdd17b3 100644 --- a/app/assets/javascripts/discourse/lib/show-modal.js.es6 +++ b/app/assets/javascripts/discourse/lib/show-modal.js.es6 @@ -11,17 +11,23 @@ export default function(name, opts) { const controllerName = opts.admin ? `modals/${name}` : name; - const controller = container.lookup('controller:' + controllerName); + let controller = container.lookup('controller:' + controllerName); const templateName = opts.templateName || Ember.String.dasherize(name); const renderArgs = { into: 'modal', outlet: 'modalBody'}; - if (controller) { renderArgs.controller = controllerName; } + if (controller) { + renderArgs.controller = controllerName; + } else { + // use a basic controller + renderArgs.controller = 'basic-modal-body'; + controller = container.lookup(`controller:${renderArgs.controller}`); + } + if (opts.addModalBodyView) { renderArgs.view = 'modal-body'; } - const modalName = `modal/${templateName}`; const fullName = opts.admin ? `admin/templates/${modalName}` : modalName; route.render(fullName, renderArgs); @@ -29,13 +35,11 @@ export default function(name, opts) { modalController.set('title', I18n.t(opts.title)); } - if (controller) { - controller.set('modal', modalController); - const model = opts.model; - if (model) { controller.set('model', model); } - if (controller.onShow) { controller.onShow(); } - controller.set('flashMessage', null); - } + controller.set('modal', modalController); + const model = opts.model; + if (model) { controller.set('model', model); } + if (controller.onShow) { controller.onShow(); } + controller.set('flashMessage', null); return controller; }; diff --git a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 index 23bc790e15..d78478dae6 100644 --- a/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 +++ b/app/assets/javascripts/discourse/mixins/modal-functionality.js.es6 @@ -1,5 +1,17 @@ +import showModal from 'discourse/lib/show-modal'; + export default Ember.Mixin.create({ flash(text, messageClass) { this.appEvents.trigger('modal-body:flash', { text, messageClass }); + }, + + showModal(...args) { + return showModal(...args); + }, + + actions: { + closeModal() { + this.get('modal').send('closeModal'); + } } }); diff --git a/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs new file mode 100644 index 0000000000..a1e59ab16b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/modal-footer-close.hbs @@ -0,0 +1,3 @@ +
+ +
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs new file mode 100644 index 0000000000..735f4912a7 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/activation-edit.hbs @@ -0,0 +1,12 @@ +{{#d-modal-body}} +

{{i18n "login.provide_new_email"}}

+ {{input value=newEmail class="activate-new-email"}} +{{/d-modal-body}} + +
+ {{d-button action="changeEmail" + label="login.submit_new_email" + disabled=submitDisabled + class="btn-primary"}} + {{d-button action="closeModal" label="close"}} +
diff --git a/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs new file mode 100644 index 0000000000..e694c838bf --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/activation-resent.hbs @@ -0,0 +1,5 @@ +{{#d-modal-body}} + {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}} +{{/d-modal-body}} + +{{modal-footer-close closeModal=(action "closeModal")}} diff --git a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs index f8e4aeee29..4ed586628b 100644 --- a/app/assets/javascripts/discourse/templates/modal/not-activated.hbs +++ b/app/assets/javascripts/discourse/templates/modal/not-activated.hbs @@ -1,12 +1,14 @@ {{#d-modal-body}} - {{#if emailSent}} - {{{i18n 'login.sent_activation_email_again' currentEmail=currentEmail}}} - {{else}} - {{{i18n 'login.not_activated' sentTo=sentTo}}} - {{i18n 'login.resend_activation_email'}} - {{/if}} + {{{i18n 'login.not_activated' sentTo=sentTo}}} {{/d-modal-body}}
- + {{d-button action="sendActivationEmail" + label="login.resend_title" + icon="envelope" + class="btn-primary resend"}} + {{d-button action="editActivationEmail" + label="login.change_email" + icon="pencil" + class="edit-email"}}
diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 8fd7eff32a..c69d4a4058 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -376,3 +376,11 @@ } } } + +.modal-button-bar { + margin-top: 1em; + + button { + margin-right: 0.5em; + } +} diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7ca6f0d380..c548d232a2 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -26,6 +26,7 @@ class UsersController < ApplicationController :activate_account, :perform_account_activation, :send_activation_email, + :update_activation_email, :password_reset, :confirm_email_token, :admin_login, @@ -569,6 +570,28 @@ class UsersController < ApplicationController render layout: 'no_ember' end + def update_activation_email + RateLimiter.new(nil, "activate-edit-email-hr-#{request.remote_ip}", 5, 1.hour).performed! + + @user = User.find_by_username_or_email(params[:username]) + raise Discourse::InvalidAccess.new unless @user.present? + raise Discourse::InvalidAccess.new if @user.active? + raise Discourse::InvalidAccess.new if current_user.present? + + raise Discourse::InvalidAccess.new unless @user.confirm_password?(params[:password]) + + User.transaction do + @user.email = params[:email] + if @user.save + @user.email_tokens.create(email: @user.email) + enqueue_activation_email + render json: success_json + else + render_json_error(@user) + end + end + end + def send_activation_email if current_user.blank? || !current_user.staff? RateLimiter.new(nil, "activate-hr-#{request.remote_ip}", 30, 1.hour).performed! diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 29b0d2a179..f3db3d5853 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -1040,6 +1040,12 @@ en: not_allowed_from_ip_address: "You can't login from that IP address." admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." resend_activation_email: "Click here to send the activation email again." + + resend_title: "Resend Activation Email" + change_email: "Change Email Address" + provide_new_email: "Provide a new address and we'll resend your confirmation email." + submit_new_email: "Update Email Address" + sent_activation_email_again: "We sent another activation email to you at {{currentEmail}}. It might take a few minutes for it to arrive; be sure to check your spam folder." to_continue: "Please Log In" preferences: "You need to be logged in to change your user preferences." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index e952de369d..4fccc2ace2 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1655,7 +1655,7 @@ en: incorrect_username_email_or_password: "Incorrect username, email or password" wait_approval: "Thanks for signing up. We will notify you when your account has been approved." active: "Your account is activated and ready to use." - activate_email: "

You're almost done! We sent an activation mail to %{email}. Please follow the instructions in the email to activate your account.

If it doesn't arrive, check your spam folder, or try to log in again to send another activation mail.

" + activate_email: "

You're almost done! We sent an activation mail to %{email}. Please follow the instructions in the email to activate your account.

If it doesn't arrive, check your spam folder, or try to log in again to send another activation mail or to input a new email address.

" not_activated: "You can't log in yet. We sent an activation email to you. Please follow the instructions in the email to activate your account." not_allowed_from_ip_address: "You can't log in as %{username} from that IP address." admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." diff --git a/config/routes.rb b/config/routes.rb index 8456bbb50b..b8091c7939 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -308,6 +308,7 @@ Discourse::Application.routes.draw do end end + put "#{root_path}/update-activation-email" => "users#update_activation_email" get "#{root_path}/hp" => "users#get_honeypot_value" get "#{root_path}/admin-login" => "users#admin_login" put "#{root_path}/admin-login" => "users#admin_login" diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 5d6ed23105..3b2f5f0d5a 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1872,4 +1872,77 @@ describe UsersController do end + + describe '.update_activation_email' do + + it "raises an error with an invalid username" do + xhr :put, :update_activation_email, { + username: 'eviltrout', + password: 'invalid-password', + email: 'updatedemail@example.com' + } + expect(response).to_not be_success + end + + it "raises an error with an invalid password" do + xhr :put, :update_activation_email, { + username: Fabricate(:inactive_user).username, + password: 'invalid-password', + email: 'updatedemail@example.com' + } + expect(response).to_not be_success + end + + it "raises an error for an active user" do + xhr :put, :update_activation_email, { + username: Fabricate(:walter_white).username, + password: 'letscook', + email: 'updatedemail@example.com' + } + expect(response).to_not be_success + end + + it "raises an error when logged in" do + log_in(:moderator) + + xhr :put, :update_activation_email, { + username: Fabricate(:inactive_user).username, + password: 'qwerqwer123', + email: 'updatedemail@example.com' + } + expect(response).to_not be_success + end + + it "raises an error when the new email is taken" do + user = Fabricate(:user) + + xhr :put, :update_activation_email, { + username: Fabricate(:inactive_user).username, + password: 'qwerqwer123', + email: user.email + } + expect(response).to_not be_success + end + + it "can be updated" do + user = Fabricate(:inactive_user) + token = user.email_tokens.first + + xhr :put, :update_activation_email, { + username: user.username, + password: 'qwerqwer123', + email: 'updatedemail@example.com' + } + + expect(response).to be_success + + user.reload + expect(user.email).to eq('updatedemail@example.com') + expect(user.email_tokens.where(email: 'updatedemail@example.com', expired: false)).to be_present + + token.reload + expect(token.expired?).to eq(true) + end + end + end diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb index 5cad8011f9..a635af3289 100644 --- a/spec/fabricators/user_fabricator.rb +++ b/spec/fabricators/user_fabricator.rb @@ -36,6 +36,7 @@ Fabricator(:inactive_user, from: :user) do name 'Inactive User' username 'inactive_user' email 'inactive@idontexist.com' + password 'qwerqwer123' active false end diff --git a/test/javascripts/acceptance/sign-in-test.js.es6 b/test/javascripts/acceptance/sign-in-test.js.es6 index d8efb4be18..21403770ba 100644 --- a/test/javascripts/acceptance/sign-in-test.js.es6 +++ b/test/javascripts/acceptance/sign-in-test.js.es6 @@ -41,16 +41,40 @@ test("sign in - not activated", () => { ok(!exists('.modal-body small'), 'it escapes the email address'); }); - click('.modal-body .resend-link'); + click('.modal-footer button.resend'); andThen(() => { equal(find('.modal-body b').text(), 'current@example.com'); ok(!exists('.modal-body small'), 'it escapes the email address'); }); - - }); }); +test("sign in - not activated - edit email", () => { + visit("/"); + andThen(() => { + click("header .login-button"); + andThen(() => { + ok(exists('.login-modal'), "it shows the login modal"); + }); + + fillIn('#login-account-name', 'eviltrout'); + fillIn('#login-account-password', 'not-activated-edit'); + click('.modal-footer .btn-primary'); + click('.modal-footer button.edit-email'); + andThen(() => { + equal(find('.activate-new-email').val(), 'current@example.com'); + equal(find('.modal-footer .btn-primary:disabled').length, 1, "must change email"); + }); + fillIn('.activate-new-email', 'different@example.com'); + andThen(() => { + equal(find('.modal-footer .btn-primary:disabled').length, 0); + }); + click(".modal-footer .btn-primary"); + andThen(() => { + equal(find('.modal-body b').text(), 'different@example.com'); + }); + }); +}); test("create account", () => { visit("/"); diff --git a/test/javascripts/helpers/create-pretender.js.es6 b/test/javascripts/helpers/create-pretender.js.es6 index a704196dce..8ae140d922 100644 --- a/test/javascripts/helpers/create-pretender.js.es6 +++ b/test/javascripts/helpers/create-pretender.js.es6 @@ -195,10 +195,18 @@ export default function() { current_email: 'current@example.com' }); } + if (data.password === 'not-activated-edit') { + return response({ error: "not active", + reason: "not_activated", + sent_to_email: 'eviltrout@example.com', + current_email: 'current@example.com' }); + } + return response(400, {error: 'invalid login'}); }); this.post('/u/action/send_activation_email', success); + this.put('/u/update-activation-email', success); this.get('/u/hp.json', function() { return response({"value":"32faff1b1ef1ac3","challenge":"61a3de0ccf086fb9604b76e884d75801"}); From 3eb125c39bd35b81af6ff6995e6fd2d6d3d0201a Mon Sep 17 00:00:00 2001 From: Rafael dos Santos Silva Date: Wed, 5 Apr 2017 18:07:50 -0300 Subject: [PATCH 088/124] FIX: Fix poll builder qunit tests --- .../controllers/poll-ui-builder-test.js.es6 | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 index 60c50ca58f..61373127de 100644 --- a/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 +++ b/plugins/poll/test/javascripts/controllers/poll-ui-builder-test.js.es6 @@ -59,6 +59,14 @@ test("showMinMax", function() { }); equal(controller.get("showMinMax"), true, "it should be true"); + + controller.setProperties({ + isNumber: false, + isMultiple: false, + isRegular: true + }); + + equal(controller.get("showMinMax"), false, "it should be false"); }); test("pollOptionsCount", function() { @@ -147,6 +155,14 @@ test("disableInsert", function() { const controller = this.subject(); controller.siteSettings = Discourse.SiteSettings; + controller.setProperties({ isRegular: true }); + + equal(controller.get("disableInsert"), true, "it should be true"); + + controller.setProperties({ isRegular: true, pollOptionsCount: 2 }); + + equal(controller.get("disableInsert"), false, "it should be false"); + controller.setProperties({ isNumber: true }); equal(controller.get("disableInsert"), false, "it should be false"); @@ -188,12 +204,16 @@ test("regular pollOutput", function() { controller.siteSettings.poll_maximum_options = 20; controller.set("pollOptions", "1\n2"); + controller.setProperties({ + pollOptions: "1\n2", + pollType: controller.get("regularPollType") + }); - equal(controller.get("pollOutput"), "[poll]\n* 1\n* 2\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll type=regular]\n* 1\n* 2\n[/poll]", "it should return the right output"); controller.set("publicPoll", "true"); - equal(controller.get("pollOutput"), "[poll public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); + equal(controller.get("pollOutput"), "[poll type=regular public=true]\n* 1\n* 2\n[/poll]", "it should return the right output"); }); From e8eaffbd724e8618bfb58b6f0fba88bae4c8ee1b Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 6 Apr 2017 10:52:13 +0800 Subject: [PATCH 089/124] FIX: Add onceoff job to remove old auto close topic sidekiq jobs. --- app/jobs/onceoff/remove_old_auto_close_jobs.rb | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 app/jobs/onceoff/remove_old_auto_close_jobs.rb diff --git a/app/jobs/onceoff/remove_old_auto_close_jobs.rb b/app/jobs/onceoff/remove_old_auto_close_jobs.rb new file mode 100644 index 0000000000..17dbfc9284 --- /dev/null +++ b/app/jobs/onceoff/remove_old_auto_close_jobs.rb @@ -0,0 +1,10 @@ +module Jobs + class RemoveOldAutoCloseJobs < Jobs::Onceoff + def execute_onceoff(args) + Jobs.cancel_scheduled_for(:close_topic) + + # No need to enqueue new jobs since we have a scheduled job that will + # automatically enqueue the new jobs. + end + end +end From e15d11df1856b0bf64ff66b1280c034ca47903a2 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 5 Apr 2017 02:32:50 -0400 Subject: [PATCH 090/124] Added an API to ask if an incoming email should be dropped at the SMTP level. This lets an SMTP server optionally decide if it should reject a mail without passing it on to Discourse at all, possibly before even reading the email's payload, to prevent spam-induced backscatter and save resources. This just does the bare minimum sanity checking that could prevent obvious backscatter. For legit errors from legit users, Discourse will still send a much more pleasant reply email. --- app/controllers/admin/email_controller.rb | 13 +++++++++++++ config/routes.rb | 1 + 2 files changed, 14 insertions(+) diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index df400de93e..ca7dd112c0 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -69,6 +69,19 @@ class Admin::EmailController < Admin::AdminController end end + def smtp_should_reject + params.require(:from) + params.require(:to) + # These strings aren't localized; they are sent to an anonymous SMTP user. + if User.find_by_email(params[:from]).nil? && !SiteSetting.enable_staged_users + render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } + elsif Email::Receiver.new(params[:from]).check_address(params[:to]).nil? + render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } + else + render json: { reject: false } + end + end + def handle_mail params.require(:email) Email::Processor.process!(params[:email]) diff --git a/config/routes.rb b/config/routes.rb index b8091c7939..e6c3d9ed71 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -155,6 +155,7 @@ Discourse::Application.routes.draw do get "/incoming_from_bounced/:id" => "email#incoming_from_bounced" get "preview-digest" => "email#preview_digest" get "send-digest" => "email#send_digest" + get "smtp_should_reject" post "handle_mail" end end From a51c191a665c592711232c9f2010522f0af2f55d Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 5 Apr 2017 12:45:58 -0400 Subject: [PATCH 091/124] Make Email::Receiver.check_address() into a class method. --- app/controllers/admin/email_controller.rb | 2 +- lib/email/receiver.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index ca7dd112c0..0d9d0aca26 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -75,7 +75,7 @@ class Admin::EmailController < Admin::AdminController # These strings aren't localized; they are sent to an anonymous SMTP user. if User.find_by_email(params[:from]).nil? && !SiteSetting.enable_staged_users render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } - elsif Email::Receiver.new(params[:from]).check_address(params[:to]).nil? + elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil? render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } else render json: { reject: false } diff --git a/lib/email/receiver.rb b/lib/email/receiver.rb index ec113b504a..2322970bae 100644 --- a/lib/email/receiver.rb +++ b/lib/email/receiver.rb @@ -302,11 +302,11 @@ module Email def destinations all_destinations - .map { |d| check_address(d) } + .map { |d| Email::Receiver.check_address(d) } .drop_while(&:blank?) end - def check_address(address) + def self.check_address(address) # only check for a group/category when 'email_in' is enabled if SiteSetting.email_in group = Group.find_by_email(address) @@ -317,7 +317,7 @@ module Email end # reply - match = reply_by_email_address_regex.match(address) + match = Email::Receiver.reply_by_email_address_regex.match(address) if match && match.captures match.captures.each do |c| next if c.blank? @@ -443,7 +443,7 @@ module Email true end - def reply_by_email_address_regex + def self.reply_by_email_address_regex @reply_by_email_address_regex ||= begin reply_addresses = [ SiteSetting.reply_by_email_address, @@ -652,7 +652,7 @@ module Email end def should_invite?(email) - email !~ reply_by_email_address_regex && + email !~ Email::Receiver.reply_by_email_address_regex && email !~ group_incoming_emails_regex && email !~ category_email_in_regex end From c51af1333806b9d7e2de165b00b0dca5d8cd5dce Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Wed, 5 Apr 2017 12:46:56 -0400 Subject: [PATCH 092/124] smtp_should_reject API: use better approach to find user email. --- app/controllers/admin/email_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 0d9d0aca26..f77c64d778 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -73,7 +73,7 @@ class Admin::EmailController < Admin::AdminController params.require(:from) params.require(:to) # These strings aren't localized; they are sent to an anonymous SMTP user. - if User.find_by_email(params[:from]).nil? && !SiteSetting.enable_staged_users + if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil? render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } From aeb169bd0ef2e77cb205d00c6fbca91f91bac56b Mon Sep 17 00:00:00 2001 From: cpradio Date: Thu, 16 Mar 2017 15:22:53 -0400 Subject: [PATCH 093/124] FIX: Do not show User Cannot See Mention dialog when crafting a new topic or a new message Use the model/composer topic.id to determine what users cannot be mentioned and what message to show as a warning. --- .../components/composer-editor.js.es6 | 21 +++++++++++++++---- .../discourse/controllers/composer.js.es6 | 2 +- .../discourse/mixins/open-composer.js.es6 | 2 +- .../discourse/models/composer.js.es6 | 2 ++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/discourse/components/composer-editor.js.es6 b/app/assets/javascripts/discourse/components/composer-editor.js.es6 index a851ae8860..b0213647fe 100644 --- a/app/assets/javascripts/discourse/components/composer-editor.js.es6 +++ b/app/assets/javascripts/discourse/components/composer-editor.js.es6 @@ -3,6 +3,7 @@ import { default as computed, on } from 'ember-addons/ember-computed-decorators' import { linkSeenMentions, fetchUnseenMentions } from 'discourse/lib/link-mentions'; import { linkSeenCategoryHashtags, fetchUnseenCategoryHashtags } from 'discourse/lib/link-category-hashtags'; import { linkSeenTagHashtags, fetchUnseenTagHashtags } from 'discourse/lib/link-tag-hashtag'; +import Composer from 'discourse/models/composer'; import { load } from 'pretty-text/oneboxer'; import { ajax } from 'discourse/lib/ajax'; import InputValidation from 'discourse/models/input-validation'; @@ -138,7 +139,7 @@ export default Ember.Component.extend({ _renderUnseenMentions($preview, unseen) { // 'Create a New Topic' scenario is not supported (per conversation with codinghorror) // https://meta.discourse.org/t/taking-another-1-7-release-task/51986/7 - fetchUnseenMentions(unseen, this.get('topic.id')).then(() => { + fetchUnseenMentions(unseen, this.get('composer.topic.id')).then(() => { linkSeenMentions($preview, this.siteSettings); this._warnMentionedGroups($preview); this._warnCannotSeeMention($preview); @@ -187,13 +188,25 @@ export default Ember.Component.extend({ }, _warnCannotSeeMention($preview) { + const composerDraftKey = this.get('composer.draftKey'); + + if (composerDraftKey === Composer.CREATE_TOPIC || + composerDraftKey === Composer.NEW_PRIVATE_MESSAGE_KEY || + composerDraftKey === Composer.REPLY_AS_NEW_TOPIC_KEY || + composerDraftKey === Composer.REPLY_AS_NEW_PRIVATE_MESSAGE_KEY) { + + return; + } + Ember.run.scheduleOnce('afterRender', () => { - var found = this.get('warnedCannotSeeMentions') || []; + let found = this.get('warnedCannotSeeMentions') || []; + $preview.find('.mention.cannot-see').each((idx,e) => { const $e = $(e); - var name = $e.data('name'); + let name = $e.data('name'); + if (found.indexOf(name) === -1) { - this.sendAction('cannotSeeMention', [{name: name}]); + this.sendAction('cannotSeeMention', [{ name: name }]); found.push(name); } }); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 13d3f291b9..b40f7efdc8 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -367,7 +367,7 @@ export default Ember.Controller.extend({ cannotSeeMention(mentions) { mentions.forEach(mention => { - const translation = (this.get('topic.isPrivateMessage')) ? + const translation = (this.get('model.topic.isPrivateMessage')) ? 'composer.cannot_see_mention.private' : 'composer.cannot_see_mention.category'; const body = I18n.t(translation, { diff --git a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 b/app/assets/javascripts/discourse/mixins/open-composer.js.es6 index 13f7000da9..2303281b63 100644 --- a/app/assets/javascripts/discourse/mixins/open-composer.js.es6 +++ b/app/assets/javascripts/discourse/mixins/open-composer.js.es6 @@ -32,7 +32,7 @@ export default Ember.Mixin.create({ topicTitle, topicBody, archetypeId: 'private_message', - draftKey: 'new_private_message' + draftKey: Composer.NEW_PRIVATE_MESSAGE_KEY }); } diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index b0897c0203..68ec25cfdd 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -15,6 +15,7 @@ const CLOSED = 'closed', // The actions the composer can take CREATE_TOPIC = 'createTopic', PRIVATE_MESSAGE = 'privateMessage', + NEW_PRIVATE_MESSAGE_KEY = 'new_private_message', REPLY = 'reply', EDIT = 'edit', REPLY_AS_NEW_TOPIC_KEY = "reply_as_new_topic", @@ -815,6 +816,7 @@ Composer.reopenClass({ EDIT, // Draft key + NEW_PRIVATE_MESSAGE_KEY, REPLY_AS_NEW_TOPIC_KEY, REPLY_AS_NEW_PRIVATE_MESSAGE_KEY }); From 5943543ec30fe5194b0126bd05477e7969b20036 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Tue, 14 Mar 2017 14:33:06 +0800 Subject: [PATCH 094/124] FIX: Improve checks for non-human users. --- app/controllers/session_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/jobs/scheduled/disable_bootstrap_mode.rb | 2 +- app/models/draft_sequence.rb | 2 +- app/models/post_action.rb | 9 ++++++--- app/models/topic_converter.rb | 2 +- app/models/user.rb | 4 ++-- app/services/post_alerter.rb | 4 ++-- 8 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index 45f2ab46f4..b915c1401a 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -243,7 +243,7 @@ class SessionController < ApplicationController RateLimiter.new(nil, "forgot-password-login-min-#{params[:login].to_s[0..100]}", 3, 1.minute).performed! user = User.find_by_username_or_email(params[:login]) - user_presence = user.present? && user.id != Discourse::SYSTEM_USER_ID && !user.staged + user_presence = user.present? && user.id > 0 && !user.staged if user_presence email_token = user.email_tokens.create(email: user.email) Jobs.enqueue(:critical_user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c548d232a2..eb69ce7d3c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -491,7 +491,7 @@ class UsersController < ApplicationController RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed! RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed! - user = User.where(email: params[:email], admin: true).where.not(id: Discourse::SYSTEM_USER_ID).first + user = User.where(email: params[:email], admin: true).human_users.first if user email_token = user.email_tokens.create(email: user.email) Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token) diff --git a/app/jobs/scheduled/disable_bootstrap_mode.rb b/app/jobs/scheduled/disable_bootstrap_mode.rb index 16028bac87..108a293062 100644 --- a/app/jobs/scheduled/disable_bootstrap_mode.rb +++ b/app/jobs/scheduled/disable_bootstrap_mode.rb @@ -4,7 +4,7 @@ module Jobs def execute(args) return unless SiteSetting.bootstrap_mode_enabled - total_users = User.where.not(id: Discourse::SYSTEM_USER_ID).count + total_users = User.human_users.count if SiteSetting.bootstrap_mode_min_users == 0 || total_users > SiteSetting.bootstrap_mode_min_users SiteSetting.set_and_log('default_trust_level', TrustLevel[0]) if SiteSetting.send('default_trust_level') == TrustLevel[1] diff --git a/app/models/draft_sequence.rb b/app/models/draft_sequence.rb index 9a2e16cbe0..0e1c44359e 100644 --- a/app/models/draft_sequence.rb +++ b/app/models/draft_sequence.rb @@ -3,7 +3,7 @@ class DraftSequence < ActiveRecord::Base user_id = user user_id = user.id unless user.class == Fixnum - return 0 if user_id == Discourse::SYSTEM_USER_ID + return 0 if user_id < 0 h = { user_id: user_id, draft_key: key } c = DraftSequence.find_by(h) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 39d36c2242..7c0e7e2164 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -160,9 +160,12 @@ SQL def self.clear_flags!(post, moderator) # -1 is the automatic system cleary - action_type_ids = moderator.id == -1 ? - PostActionType.auto_action_flag_types.values : + action_type_ids = + if moderator.id == Discourse::SYSTEM_USER_ID + PostActionType.auto_action_flag_types.values + else PostActionType.flag_types.values + end actions = PostAction.where(post_id: post.id) .where(post_action_type_id: action_type_ids) @@ -487,7 +490,7 @@ SQL .flags .joins(:post) .where("posts.topic_id = ?", topic.id) - .where.not(user_id: Discourse::SYSTEM_USER_ID) + .where("post_actions.user_id > 0") .group("post_actions.user_id") .pluck("post_actions.user_id, COUNT(post_id)") diff --git a/app/models/topic_converter.rb b/app/models/topic_converter.rb index 4e40c28342..ddbda3a690 100644 --- a/app/models/topic_converter.rb +++ b/app/models/topic_converter.rb @@ -61,7 +61,7 @@ class TopicConverter @topic.notifier.watch_topic!(topic.user_id) @topic.topic_allowed_users(true).each do |tau| - next if tau.user_id == -1 || tau.user_id == topic.user_id + next if tau.user_id < 0 || tau.user_id == topic.user_id topic.notifier.watch!(tau.user_id) end end diff --git a/app/models/user.rb b/app/models/user.rb index 5a0679508d..c4cfcfc3e8 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -900,7 +900,7 @@ class User < ActiveRecord::Base end def is_singular_admin? - User.where(admin: true).where.not(id: id).where.not(id: Discourse::SYSTEM_USER_ID).blank? + User.where(admin: true).where.not(id: id).human_users.blank? end def logged_out @@ -925,7 +925,7 @@ class User < ActiveRecord::Base end def clear_global_notice_if_needed - return if id == Discourse::SYSTEM_USER_ID + return if id < 0 if admin && SiteSetting.has_login_hint SiteSetting.has_login_hint = false diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 014f5d0cfe..6b5eb909d5 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -8,7 +8,7 @@ class PostAlerter def not_allowed?(user, post) user.blank? || - user.id == Discourse::SYSTEM_USER_ID || + user.id < 0 || user.id == post.user_id end @@ -269,7 +269,7 @@ class PostAlerter def create_notification(user, type, post, opts=nil) return if user.blank? - return if user.id == Discourse::SYSTEM_USER_ID + return if user.id < 0 return if type == Notification.types[:liked] && user.user_option.like_notification_frequency == UserOption.like_notification_frequency_type[:never] From 402eaaa7733405f926d04f23704b1a69e8088890 Mon Sep 17 00:00:00 2001 From: Aashaka Shah Date: Thu, 6 Apr 2017 09:32:53 +0530 Subject: [PATCH 095/124] FEATURE: add og tags to metadata in individual badges page --- app/controllers/badges_controller.rb | 8 ++++---- app/views/badges/show.html.erb | 3 +++ 2 files changed, 7 insertions(+), 4 deletions(-) create mode 100644 app/views/badges/show.html.erb diff --git a/app/controllers/badges_controller.rb b/app/controllers/badges_controller.rb index e7991c9de9..432489a3d4 100644 --- a/app/controllers/badges_controller.rb +++ b/app/controllers/badges_controller.rb @@ -38,20 +38,20 @@ class BadgesController < ApplicationController raise Discourse::NotFound unless SiteSetting.enable_badges params.require(:id) - badge = Badge.enabled.find(params[:id]) + @badge = Badge.enabled.find(params[:id]) if current_user - user_badge = UserBadge.find_by(user_id: current_user.id, badge_id: badge.id) + user_badge = UserBadge.find_by(user_id: current_user.id, badge_id: @badge.id) if user_badge && user_badge.notification user_badge.notification.update_attributes read: true end end - serialized = MultiJson.dump(serialize_data(badge, BadgeSerializer, root: "badge", include_long_description: true)) + serialized = MultiJson.dump(serialize_data(@badge, BadgeSerializer, root: "badge", include_long_description: true)) respond_to do |format| format.html do store_preloaded "badge", serialized - render "default/empty" + render :show end format.json { render json: serialized } end diff --git a/app/views/badges/show.html.erb b/app/views/badges/show.html.erb new file mode 100644 index 0000000000..964870488f --- /dev/null +++ b/app/views/badges/show.html.erb @@ -0,0 +1,3 @@ +<% content_for :head do %> + <%= raw crawlable_meta_data(title: "#{@badge.display_name} badge on #{SiteSetting.title}", description: @badge.long_description) %> +<% end %> From 934bff43d9c69820b60879931fd40890f290a59e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rodr=C3=ADguez?= Date: Fri, 10 Feb 2017 12:35:04 -0200 Subject: [PATCH 096/124] FIX: Copy post actions when moving a topic. --- app/models/post_action.rb | 13 +++++++++++++ app/models/post_mover.rb | 6 ++++-- spec/models/post_mover_spec.rb | 18 +++++++++++++----- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 7c0e7e2164..92310d30cd 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -308,6 +308,19 @@ SQL PostAction.where(where_attrs).first end + def self.copy(original_post, target_post) + cols_to_copy = (column_names - %w{id post_id}).join(', ') + + exec_sql <<~SQL + INSERT INTO post_actions(post_id, #{cols_to_copy}) + SELECT #{target_post.id}, #{cols_to_copy} + FROM post_actions + WHERE post_id = #{original_post.id} + SQL + + target_post.post_actions.each { |post_action| post_action.update_counters } + end + def self.remove_act(user, post, post_action_type_id) limit_action!(user,post,post_action_type_id) diff --git a/app/models/post_mover.rb b/app/models/post_mover.rb index 78a19ba179..793bfcc59a 100644 --- a/app/models/post_mover.rb +++ b/app/models/post_mover.rb @@ -85,14 +85,16 @@ class PostMover end def create_first_post(post) - p = PostCreator.create( + new_post = PostCreator.create( post.user, raw: post.raw, topic_id: destination_topic.id, acting_user: user, skip_validations: true ) - p.update_column(:reply_count, @reply_count[1] || 0) + + PostAction.copy(post, new_post) + new_post.update_column(:reply_count, @reply_count[1] || 0) end def move(post) diff --git a/spec/models/post_mover_spec.rb b/spec/models/post_mover_spec.rb index f67122fec4..16d3a4f4fe 100644 --- a/spec/models/post_mover_spec.rb +++ b/spec/models/post_mover_spec.rb @@ -273,10 +273,7 @@ describe PostMover do new_topic = topic.move_posts(user, [p1.id, p2.id], title: "new testing topic name") expect(new_topic).to be_present - new_topic.posts.reload expect(new_topic.posts.by_post_number.first.raw).to eq(p1.raw) - - new_topic.reload expect(new_topic.posts_count).to eq(2) expect(new_topic.highest_post_number).to eq(2) @@ -284,7 +281,7 @@ describe PostMover do p1.reload expect(p1.sort_order).to eq(1) expect(p1.post_number).to eq(1) - p1.topic_id == topic.id + expect(p1.topic_id).to eq(topic.id) expect(p1.reply_count).to eq(0) # New first post @@ -295,7 +292,7 @@ describe PostMover do p2.reload expect(p2.post_number).to eq(2) expect(p2.sort_order).to eq(2) - p2.topic_id == new_topic.id + expect(p2.topic_id).to eq(new_topic.id) expect(p2.reply_to_post_number).to eq(1) expect(p2.reply_count).to eq(0) @@ -304,6 +301,17 @@ describe PostMover do expect(topic.highest_post_number).to eq(p4.post_number) end + it "preserves post actions in the new post" do + PostAction.act(another_user, p1, PostActionType.types[:like]) + + new_topic = topic.move_posts(user, [p1.id], title: "new testing topic name") + new_post = new_topic.posts.where(post_number: 1).first + + expect(new_topic.like_count).to eq(1) + expect(new_post.like_count).to eq(1) + expect(new_post.post_actions.size).to eq(1) + end + end context "to an existing topic with a deleted post" do From f9605053593160b983ec8fea9dd21dc209c82318 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Thu, 6 Apr 2017 09:56:13 +0530 Subject: [PATCH 097/124] FIX: translate badge metadata title --- app/views/badges/show.html.erb | 2 +- config/locales/server.en.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/badges/show.html.erb b/app/views/badges/show.html.erb index 964870488f..6fc281b9dd 100644 --- a/app/views/badges/show.html.erb +++ b/app/views/badges/show.html.erb @@ -1,3 +1,3 @@ <% content_for :head do %> - <%= raw crawlable_meta_data(title: "#{@badge.display_name} badge on #{SiteSetting.title}", description: @badge.long_description) %> + <%= raw crawlable_meta_data(title: I18n.t('badges.badge_title_metadata', display_name: @badge.display_name, site_title: SiteSetting.title), description: @badge.long_description) %> <% end %> diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4fccc2ace2..a98b6cd037 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -3321,6 +3321,7 @@ en: description: Outstanding contributions in their first month long_description: | This badge is granted to congratulate two new users each month for their excellent overall contributions, as measured by how often their posts were liked, and by whom. + badge_title_metadata: "%{display_name} badge on %{site_title}" admin_login: success: "Email Sent" From 8e794070d233dd0355b8f165e81f9ec6917ef3d7 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 6 Apr 2017 13:45:59 +0800 Subject: [PATCH 098/124] Fix incorrect method name. --- app/jobs/onceoff/remove_old_auto_close_jobs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/jobs/onceoff/remove_old_auto_close_jobs.rb b/app/jobs/onceoff/remove_old_auto_close_jobs.rb index 17dbfc9284..756cb26d04 100644 --- a/app/jobs/onceoff/remove_old_auto_close_jobs.rb +++ b/app/jobs/onceoff/remove_old_auto_close_jobs.rb @@ -1,7 +1,7 @@ module Jobs class RemoveOldAutoCloseJobs < Jobs::Onceoff def execute_onceoff(args) - Jobs.cancel_scheduled_for(:close_topic) + Jobs.cancel_scheduled_job(:close_topic) # No need to enqueue new jobs since we have a scheduled job that will # automatically enqueue the new jobs. From 888d1512ecfde37e62df008e7bb592e6c9ba8580 Mon Sep 17 00:00:00 2001 From: "Ryan C. Gordon" Date: Thu, 6 Apr 2017 01:49:34 -0400 Subject: [PATCH 099/124] Corrected indentation. --- app/controllers/admin/email_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index f77c64d778..416e0c1b94 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -74,11 +74,11 @@ class Admin::EmailController < Admin::AdminController params.require(:to) # These strings aren't localized; they are sent to an anonymous SMTP user. if !User.exists?(email: Email.downcase(params[:from])) && !SiteSetting.enable_staged_users - render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } + render json: { reject: true, reason: "Mail from your address is not accepted. Do you have an account here?" } elsif Email::Receiver.check_address(Email.downcase(params[:to])).nil? - render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } + render json: { reject: true, reason: "Mail to this address is not accepted. Check the address and try to send again?" } else - render json: { reject: false } + render json: { reject: false } end end From 8e23b7fbc95c780c9a0d561b7c32ba5af56db3ca Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Thu, 6 Apr 2017 15:14:15 +0800 Subject: [PATCH 100/124] UX: Remove copy that is no longer valid. --- config/locales/client.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 4eb9d2e3a0..caa2c4e0c5 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -421,7 +421,7 @@ en: automatic_group: Automatic Group closed_group: Closed Group is_group_user: "You are a member of this group" - allow_membership_requests: "Allow users to send membership requests to group owners (Requires everyone to be able to mention the group)" + allow_membership_requests: "Allow users to send membership requests to group owners" membership: "Membership" name: "Name" user_count: "Number of Members" From 708f65f740aeaf89444477134732ace0d78db2a1 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Thu, 6 Apr 2017 14:52:06 -0400 Subject: [PATCH 101/124] FIX: web crawlers getting 404 on category pages --- app/controllers/list_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index b0f9efcf31..ec901ddb63 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -79,8 +79,8 @@ class ListController < ApplicationController # Note the first is the default and we don't add a title if (filter.to_s != current_homepage) && use_crawler_layout? filter_title = I18n.t("js.filters.#{filter.to_s}.title", count: 0) - if list_opts[:category] - @title = I18n.t('js.filters.with_category', filter: filter_title, category: Category.find(list_opts[:category]).name) + if list_opts[:category] && @category + @title = I18n.t('js.filters.with_category', filter: filter_title, category: @category.name) else @title = I18n.t('js.filters.with_topics', filter: filter_title) end From 48a9860f07f69cb9e2fec357413b9c01b893f603 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 13:58:52 +0800 Subject: [PATCH 102/124] FIX: Publish topic to a category should unlist it as well. --- app/jobs/regular/publish_topic_to_category.rb | 1 + spec/jobs/publish_topic_to_category_spec.rb | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb index fe96de346b..ab88d5e6ae 100644 --- a/app/jobs/regular/publish_topic_to_category.rb +++ b/app/jobs/regular/publish_topic_to_category.rb @@ -9,6 +9,7 @@ module Jobs PostTimestampChanger.new(timestamp: Time.zone.now, topic: topic).change! do topic.change_category_to_id(topic_status_update.category_id) + topic.update_columns(visible: true) end end end diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb index bda35cc3f5..98226ac671 100644 --- a/spec/jobs/publish_topic_to_category_spec.rb +++ b/spec/jobs/publish_topic_to_category_spec.rb @@ -38,12 +38,13 @@ RSpec.describe Jobs::PublishTopicToCategory do end it 'should publish the topic to the new category correctly' do - Timecop.travel(1.hour.ago) { topic } + Timecop.travel(1.hour.ago) { topic.update!(visible: false) } described_class.new.execute(topic_status_update_id: topic.topic_status_update.id) topic.reload expect(topic.category).to eq(another_category) + expect(topic.visible).to eq(true) %w{created_at bumped_at updated_at last_posted_at}.each do |attribute| expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now) From 690d2f4bd33027795f422fc37fbe439f636c69b1 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 15:05:03 +0800 Subject: [PATCH 103/124] UX: Publish topic changes when topic is published. --- .../discourse/controllers/topic.js.es6 | 42 ++++++++++--------- .../javascripts/discourse/models/topic.js.es6 | 5 +-- app/jobs/regular/publish_topic_to_category.rb | 2 + spec/jobs/publish_topic_to_category_spec.rb | 7 +++- 4 files changed, 33 insertions(+), 23 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 28c929189d..d5b6852685 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -868,7 +868,7 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { const refresh = (args) => this.appEvents.trigger('post-stream:refresh', args); - this.messageBus.subscribe("/topic/" + this.get('model.id'), data => { + this.messageBus.subscribe(`/topic/${this.get('model.id')}`, data => { const topic = this.get('model'); if (data.notification_level_change) { @@ -878,6 +878,17 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } const postStream = this.get('model.postStream'); + + if (data.reload_topic) { + topic.reload().then(() => { + this.send('postChangedRoute', topic.get('post_number') || 1); + this.appEvents.trigger('header:update-topic', topic); + if (data.refresh_stream) postStream.refresh(); + }); + + return; + } + switch (data.type) { case "acted": postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh({ id: data.id, refreshLikes: true })); @@ -915,27 +926,20 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { } } - if (data.reload_topic) { - topic.reload().then(() => { - this.send('postChangedRoute', topic.get('post_number') || 1); - this.appEvents.trigger('header:update-topic', topic); - }); - } else { - if (topic.get('isPrivateMessage') && - this.currentUser && - this.currentUser.get('id') !== data.user_id && - data.type === 'created') { + if (topic.get('isPrivateMessage') && + this.currentUser && + this.currentUser.get('id') !== data.user_id && + data.type === 'created') { - const postNumber = data.post_number; - const notInPostStream = topic.get('highest_post_number') <= postNumber; - const postNumberDifference = postNumber - topic.get('currentPost'); + const postNumber = data.post_number; + const notInPostStream = topic.get('highest_post_number') <= postNumber; + const postNumberDifference = postNumber - topic.get('currentPost'); - if (notInPostStream && - postNumberDifference > 0 && - postNumberDifference < 7) { + if (notInPostStream && + postNumberDifference > 0 && + postNumberDifference < 7) { - this._scrollToPost(data.post_number); - } + this._scrollToPost(data.post_number); } } }); diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 67c6a9b40b..34bb795a8b 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -376,9 +376,8 @@ const Topic = RestModel.extend({ }, reload() { - const self = this; - return ajax('/t/' + this.get('id'), { type: 'GET' }).then(function(topic_json) { - self.updateFromJson(topic_json); + return ajax(`/t/${this.get('id')}`, { type: 'GET' }).then(topic_json => { + this.updateFromJson(topic_json); }); }, diff --git a/app/jobs/regular/publish_topic_to_category.rb b/app/jobs/regular/publish_topic_to_category.rb index ab88d5e6ae..11424dd32f 100644 --- a/app/jobs/regular/publish_topic_to_category.rb +++ b/app/jobs/regular/publish_topic_to_category.rb @@ -11,6 +11,8 @@ module Jobs topic.change_category_to_id(topic_status_update.category_id) topic.update_columns(visible: true) end + + MessageBus.publish("/topic/#{topic.id}", reload_topic: true, refresh_stream: true) end end end diff --git a/spec/jobs/publish_topic_to_category_spec.rb b/spec/jobs/publish_topic_to_category_spec.rb index 98226ac671..e628d71998 100644 --- a/spec/jobs/publish_topic_to_category_spec.rb +++ b/spec/jobs/publish_topic_to_category_spec.rb @@ -40,7 +40,9 @@ RSpec.describe Jobs::PublishTopicToCategory do it 'should publish the topic to the new category correctly' do Timecop.travel(1.hour.ago) { topic.update!(visible: false) } - described_class.new.execute(topic_status_update_id: topic.topic_status_update.id) + message = MessageBus.track_publish do + described_class.new.execute(topic_status_update_id: topic.topic_status_update.id) + end.first topic.reload expect(topic.category).to eq(another_category) @@ -49,5 +51,8 @@ RSpec.describe Jobs::PublishTopicToCategory do %w{created_at bumped_at updated_at last_posted_at}.each do |attribute| expect(topic.public_send(attribute)).to be_within(1.second).of(Time.zone.now) end + + expect(message.data[:reload_topic]).to be_present + expect(message.data[:refresh_stream]).to be_present end end From cd59db5aa3f06ebaa23064fd83494fe840b4a462 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 15:09:12 +0800 Subject: [PATCH 104/124] UX: Allow topic to be published to the same category when unlisted. --- .../discourse/controllers/edit-topic-status-update.js.es6 | 5 +++++ .../discourse/templates/modal/edit-topic-status-update.hbs | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 index de3b147324..3dbeddeca5 100644 --- a/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 +++ b/app/assets/javascripts/discourse/controllers/edit-topic-status-update.js.es6 @@ -59,6 +59,11 @@ export default Ember.Controller.extend(ModalFunctionality, { return Ember.isEmpty(updateTime) || updateTimeInvalid || loading; }, + @computed("model.visible") + excludeCategoryId(visible) { + if (visible) return this.get('model.category_id'); + }, + @observes("topicStatusUpdate.execute_at", "topicStatusUpdate.duration") _setUpdateTime() { let time = null; diff --git a/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs index 60e417f607..8fca98f413 100644 --- a/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs +++ b/app/assets/javascripts/discourse/templates/modal/edit-topic-status-update.hbs @@ -58,7 +58,7 @@ {{else if publishToCategory}}
- {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=model.category_id}} + {{category-chooser valueAttribute="id" value=categoryId excludeCategoryId=excludeCategoryId}}
{{auto-update-input From 71501feaf33d0894a3a638c77cbf2e5e930c9ad1 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 15:26:15 +0800 Subject: [PATCH 105/124] Improve validation for `TopicStatusUpdate`. --- app/models/topic.rb | 2 +- app/models/topic_status_update.rb | 6 ++++++ spec/models/topic_status_update_spec.rb | 28 +++++++++++++++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 12198addaa..29d47aa851 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -969,7 +969,7 @@ SQL topic_status_update.based_on_last_post = !based_on_last_post.blank? if status_type == TopicStatusUpdate.types[:publish_to_category] - topic_status_update.category_id = category_id + topic_status_update.category = Category.find_by(category_id) end if topic_status_update.based_on_last_post diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index 1e87540bde..3a10d19c9c 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -9,6 +9,8 @@ class TopicStatusUpdate < ActiveRecord::Base validates :execute_at, presence: true validates :status_type, presence: true validates :status_type, uniqueness: { scope: [:topic_id, :deleted_at] } + validates :category_id, presence: true, if: :publishing_to_category? + validate :ensure_update_will_happen before_save do @@ -93,6 +95,10 @@ class TopicStatusUpdate < ActiveRecord::Base def schedule_auto_publish_to_category_job(time) Jobs.enqueue_at(time, :publish_topic_to_category, topic_status_update_id: id) end + + def publishing_to_category? + self.status_type.to_i == TopicStatusUpdate.types[:publish_to_category] + end end # == Schema Information diff --git a/spec/models/topic_status_update_spec.rb b/spec/models/topic_status_update_spec.rb index ebf368a472..6880ddc2ec 100644 --- a/spec/models/topic_status_update_spec.rb +++ b/spec/models/topic_status_update_spec.rb @@ -45,6 +45,34 @@ RSpec.describe TopicStatusUpdate, type: :model do end end end + + describe '#category_id' do + describe 'when #status_type is publish_to_category' do + describe 'when #category_id is not present' do + it 'should not be valid' do + topic_status_update = Fabricate.build(:topic_status_update, + status_type: TopicStatusUpdate.types[:publish_to_category] + ) + + expect(topic_status_update).to_not be_valid + expect(topic_status_update.errors.keys).to include(:category_id) + end + end + + describe 'when #category_id is present' do + it 'should be valid' do + topic_status_update = Fabricate.build(:topic_status_update, + status_type: TopicStatusUpdate.types[:publish_to_category], + category_id: Fabricate(:category).id, + user: Fabricate(:user), + topic: Fabricate(:topic) + ) + + expect(topic_status_update).to be_valid + end + end + end + end end context 'callbacks' do From f534f041a033a3f7ac1afa687527d591057e5adc Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 15:50:17 +0800 Subject: [PATCH 106/124] FIX: Ensure directory exists. --- lib/file_store/local_store.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/file_store/local_store.rb b/lib/file_store/local_store.rb index 3e5931ae8a..9b7148efc8 100644 --- a/lib/file_store/local_store.rb +++ b/lib/file_store/local_store.rb @@ -59,7 +59,11 @@ module FileStore end def purge_tombstone(grace_period) - Discourse::Utils.execute_command('find', tombstone_dir, '-mtime', "+#{grace_period}", '-type', 'f', '-delete') + if Dir.exists?(Discourse.store.tombstone_dir) + Discourse::Utils.execute_command( + 'find', tombstone_dir, '-mtime', "+#{grace_period}", '-type', 'f', '-delete' + ) + end end def get_path_for(type, upload_id, sha, extension) From ae1d6e74215a10336a21b2d277049f4ed9adcf52 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 15:52:08 +0800 Subject: [PATCH 107/124] Fix incorrect method usage. --- app/models/topic.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/topic.rb b/app/models/topic.rb index 29d47aa851..4f1367fa07 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -969,7 +969,7 @@ SQL topic_status_update.based_on_last_post = !based_on_last_post.blank? if status_type == TopicStatusUpdate.types[:publish_to_category] - topic_status_update.category = Category.find_by(category_id) + topic_status_update.category = Category.find_by(id: category_id) end if topic_status_update.based_on_last_post From 96a070d73d71d2a6d2c6ea98b54479d543769121 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 7 Apr 2017 13:29:18 +0530 Subject: [PATCH 108/124] FIX: incorrect title for custom_invite_forum_mailer --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index a98b6cd037..6e8ec39fac 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1777,7 +1777,7 @@ en: %{invite_link} custom_invite_forum_mailer: - title: "Invite Forum Mailer" + title: "Custom Invite Forum Mailer" subject_template: "%{invitee_name} invited you to join %{site_domain_name}" text_body_template: | %{invitee_name} invited you to join From fad04aad6ca9a163f2e6b7df947136e0f64588d3 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 17:05:58 +0800 Subject: [PATCH 109/124] Missing association. --- app/models/topic_status_update.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index 3a10d19c9c..c8461bd2b7 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -3,6 +3,7 @@ class TopicStatusUpdate < ActiveRecord::Base belongs_to :user belongs_to :topic + belongs_to :category validates :user_id, presence: true validates :topic_id, presence: true From 9663a74445e61b4eacaaa0f1129584fc6dd886a6 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Fri, 7 Apr 2017 17:32:13 +0800 Subject: [PATCH 110/124] FIX: Ensure `username` param is valid in `NotificationsController`. --- app/controllers/notifications_controller.rb | 10 +++- .../notifications_controller_spec.rb | 59 +++++++++++-------- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb index 7d2f0da89b..e6c82e01ec 100644 --- a/app/controllers/notifications_controller.rb +++ b/app/controllers/notifications_controller.rb @@ -5,8 +5,14 @@ class NotificationsController < ApplicationController before_filter :ensure_logged_in def index - user = current_user - user = User.find_by_username(params[:username].to_s) if params[:username] + user = + if params[:username] && !params[:recent] + user_record = User.find_by(username: params[:username].to_s) + raise Discourse::InvalidParameters.new(:username) if !user_record + user_record + else + current_user + end guardian.ensure_can_see_notifications!(user) diff --git a/spec/controllers/notifications_controller_spec.rb b/spec/controllers/notifications_controller_spec.rb index dbf8066639..9995437519 100644 --- a/spec/controllers/notifications_controller_spec.rb +++ b/spec/controllers/notifications_controller_spec.rb @@ -5,14 +5,41 @@ describe NotificationsController do context 'when logged in' do let!(:user) { log_in } - it 'should succeed for recent' do - xhr :get, :index, recent: true - expect(response).to be_success - end + describe '#index' do + it 'should succeed for recent' do + xhr :get, :index, recent: true + expect(response).to be_success + end - it 'should succeed for history' do - xhr :get, :index - expect(response).to be_success + it 'should succeed for history' do + xhr :get, :index + expect(response).to be_success + end + + it 'should mark notifications as viewed' do + notification = Fabricate(:notification, user: user) + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + xhr :get, :index, recent: true + expect(user.reload.unread_notifications).to eq(0) + expect(user.reload.total_unread_notifications).to eq(1) + end + + it 'should not mark notifications as viewed if silent param is present' do + notification = Fabricate(:notification, user: user) + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + xhr :get, :index, recent: true, silent: true + expect(user.reload.unread_notifications).to eq(1) + expect(user.reload.total_unread_notifications).to eq(1) + end + + context 'when username params is not valid' do + it 'should raise the right error' do + expect { xhr :get, :index, username: 'somedude' } + .to raise_error(Discourse::InvalidParameters) + end + end end it 'should succeed' do @@ -20,24 +47,6 @@ describe NotificationsController do expect(response).to be_success end - it 'should mark notifications as viewed' do - notification = Fabricate(:notification, user: user) - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - xhr :get, :index, recent: true - expect(user.reload.unread_notifications).to eq(0) - expect(user.reload.total_unread_notifications).to eq(1) - end - - it 'should not mark notifications as viewed if silent param is present' do - notification = Fabricate(:notification, user: user) - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - xhr :get, :index, recent: true, silent: true - expect(user.reload.unread_notifications).to eq(1) - expect(user.reload.total_unread_notifications).to eq(1) - end - it "can update a single notification" do notification = Fabricate(:notification, user: user) notification2 = Fabricate(:notification, user: user) From 397e850fbac25e03dab19b91476a2290a9eabce9 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 7 Apr 2017 11:29:49 -0400 Subject: [PATCH 111/124] FIX: Allow `replaceState` to run on iOS. Removes a test for unsupported versions. --- app/assets/javascripts/discourse/lib/url.js.es6 | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6 index 84d319a6a9..a08aa5810c 100644 --- a/app/assets/javascripts/discourse/lib/url.js.es6 +++ b/app/assets/javascripts/discourse/lib/url.js.es6 @@ -120,7 +120,6 @@ const DiscourseURL = Ember.Object.extend({ if (window.history && window.history.pushState && window.history.replaceState && - !navigator.userAgent.match(/((iPod|iPhone|iPad).+\bOS\s+[1-4]|WebApps\/.+CFNetwork)/) && (window.location.pathname !== path)) { // Always use replaceState in the next runloop to prevent weird routes changing From ff530d6fb336a48ac36052e79f8ef14470db5d47 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Fri, 7 Apr 2017 22:23:39 +0530 Subject: [PATCH 112/124] Update Translations --- config/locales/client.ar.yml | 93 +- config/locales/client.bs_BA.yml | 5 - config/locales/client.cs.yml | 6 - config/locales/client.da.yml | 17 +- config/locales/client.de.yml | 64 +- config/locales/client.et.yml | 5 - config/locales/client.fa_IR.yml | 3 - config/locales/client.fi.yml | 1 + config/locales/client.fr.yml | 5 - config/locales/client.gl.yml | 4 - config/locales/client.he.yml | 1 + config/locales/client.it.yml | 5 - config/locales/client.ja.yml | 4 - config/locales/client.ko.yml | 4 - config/locales/client.nl.yml | 1 + config/locales/client.pl_PL.yml | 2 - config/locales/client.pt.yml | 6 - config/locales/client.pt_BR.yml | 6 +- config/locales/client.ro.yml | 6 - config/locales/client.ru.yml | 3 - config/locales/client.sk.yml | 107 ++- config/locales/client.sq.yml | 5 - config/locales/client.sv.yml | 16 +- config/locales/client.te.yml | 4 - config/locales/client.tr_TR.yml | 6 - config/locales/client.uk.yml | 3 - config/locales/client.ur.yml | 856 ++++++++++++++++++- config/locales/client.vi.yml | 6 - config/locales/client.zh_CN.yml | 6 +- config/locales/client.zh_TW.yml | 5 - config/locales/server.ar.yml | 124 +-- config/locales/server.bs_BA.yml | 36 +- config/locales/server.cs.yml | 24 - config/locales/server.da.yml | 34 - config/locales/server.de.yml | 196 ++--- config/locales/server.el.yml | 154 ---- config/locales/server.es.yml | 152 ---- config/locales/server.et.yml | 16 - config/locales/server.fa_IR.yml | 53 +- config/locales/server.fi.yml | 8 +- config/locales/server.fr.yml | 163 ---- config/locales/server.he.yml | 104 --- config/locales/server.id.yml | 4 - config/locales/server.it.yml | 55 -- config/locales/server.ja.yml | 55 -- config/locales/server.ko.yml | 49 -- config/locales/server.nb_NO.yml | 111 --- config/locales/server.nl.yml | 57 -- config/locales/server.pl_PL.yml | 63 -- config/locales/server.pt.yml | 162 ---- config/locales/server.pt_BR.yml | 57 -- config/locales/server.ro.yml | 162 ---- config/locales/server.ru.yml | 69 -- config/locales/server.sk.yml | 168 +--- config/locales/server.sq.yml | 155 ---- config/locales/server.sv.yml | 162 ---- config/locales/server.te.yml | 5 - config/locales/server.tr_TR.yml | 83 -- config/locales/server.uk.yml | 18 - config/locales/server.vi.yml | 160 ---- config/locales/server.zh_CN.yml | 159 ---- config/locales/server.zh_TW.yml | 152 ---- plugins/poll/config/locales/client.da.yml | 1 + plugins/poll/config/locales/client.de.yml | 1 + plugins/poll/config/locales/client.pl_PL.yml | 1 + plugins/poll/config/locales/client.sk.yml | 11 +- plugins/poll/config/locales/client.sv.yml | 1 + 67 files changed, 1135 insertions(+), 3105 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index dceb4c5043..c4f9767899 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -304,9 +304,10 @@ ar: bookmark: "انقر لتعليم أوّل مشاركة في هذا الموضوع" unbookmark: "انقر لإزالة كلّ العلامات في هذا الموضوع" bookmarks: + not_logged_in: "نأسف، عليك الولوج لتعليم المشاركات" created: "لقد علّمت هذه المشاركة" - not_bookmarked: "لقد قرأتَ هذا المنشور، انقر لتعليمه" - last_read: "هذا آخر منشور قرأته، انقر لتعليمه" + not_bookmarked: "لقد قرأتَ هذه المشاركة، انقر لتعليمها" + last_read: "هذا آخر مشاركة قرأتها، انقر لتعليمها" remove: "أزل العلامة" confirm_clear: "أمتأكّد من إزالة كلّ العلامات في هذا الموضوع؟" topic_count_latest: @@ -594,10 +595,10 @@ ar: mute: "كتم" edit: "تعديل التفضيلات" download_archive: - button_text: "تحميل مواضيعي" + button_text: "نزّل مشاركاتي" confirm: "أمتأكّد من تنزيل مشاركاتك؟" success: "بدأ التحميل, سيتم إعلامك برسالة عند اكتمال العملية." - rate_limit_error: "المشاركات يمكن تحميلها لمرة واحدة في اليوم , الرجاء المحاولة غدا." + rate_limit_error: "يمكن تنزيل المشاركات مرّة واحدة يوميًّا فقط. رجاءً أعد المحاولة غدًا." new_private_message: "رسالة جديدة" private_message: "رسالة خاصة" private_messages: "الرسائل" @@ -667,7 +668,7 @@ ar: delete_account: "حذف الحساب" delete_account_confirm: "أمتأكّد من حذف حسابك للأبد؟ هذا إجراء لا عودة فيه!" deleted_yourself: "حُذف حسابك بنجاح." - delete_yourself_not_allowed: "لايمكنك حذف حسابك الان , تواصل مع المدير ليحذف حسابك " + delete_yourself_not_allowed: "لا يمكنك حذف حسابك الآن. راسل أحد المدراء لحذف حسابك." unread_message_count: "الرسائل" admin_delete: "حذف" users: "الأعضاء" @@ -681,8 +682,6 @@ ar: undo_revoke_access: "رفع توقيف صلاحيات الوصول" api_approved: "موافق عليه:" staff_counters: - flags_given: "علامات مساعدة" - flagged_posts: "# مشاركات" deleted_posts: "حذف جميع المشاركات" suspensions: "موقوف" warnings_received: "تحذيرات" @@ -779,7 +778,7 @@ ar: last_emailed: "أخر مراسلة" last_seen: "آخر تواجد مُنذ " created: "إنضم" - log_out: "تسجيل الخروج" + log_out: "اخرج" location: "الموقع" card_badge: title: "وسام بطاقة المستخدم" @@ -899,19 +898,19 @@ ar: many: "عدد المواضيع" other: "عدد المواضيع" likes_given: - zero: "لم يعطي اي إعجاب. " - one: "أعطى " - two: "أعطى " - few: "أعطى " - many: "أعطى " - other: "أعطى " + zero: "ما أعطى من " + one: "ما أعطى من " + two: "ما أعطى من " + few: "ما أعطى من " + many: "ما أعطى من " + other: "ما أعطى من " likes_received: - zero: " لم يتلقى أي اعجاب." - one: "تلقى " - two: "تلقى " - few: "تلقى " - many: "تلقى " - other: "تلقى " + zero: "ما استقبل من " + one: "ما استقبل من " + two: "ما استقبل من " + few: "ما استقبل من " + many: "ما استقبل من " + other: "ما استقبل من " days_visited: zero: "اجمالي الأيام التي زار فيها الموقع" one: "اجمالي الأيام التي زار فيها الموقع" @@ -993,8 +992,8 @@ ar: enabled: "هذا الموقع في وضع القراءة فقط. نأمل أن تتابع تصفّحه، ولكنّ الرّدّ، والإعجاب وغيرها من إجراءات معطّلة حاليًّا." login_disabled: "الولوج معطّل في حال كان الموقع في وضع القراءة فقط." logout_disabled: "الخروج معطّل في حال كان الموقع في وضع القراءة فقط." - too_few_topics_and_posts_notice: "دعونا الحصول على هذه المناقشة بدأت! يوجد حاليا%{currentTopics} / %{requiredTopics} المواضيع و %{currentPosts} / %{requiredPosts} المشاركات. الزوار الجدد بحاجة إلى بعض الأحاديث لقراءة والرد على." - too_few_topics_notice: "دعونا الحصول على هذه المناقشة التي! وهناك حاليا %{currentTopics} / %{requiredTopics} المواضيع. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها." + too_few_topics_and_posts_notice: " يوجد حاليا%{currentTopics} / %{requiredTopics} المواضيع و %{currentPosts} / %{requiredPosts} المشاركات. " + too_few_topics_notice: "قم بإنشاء على الاقل 5 مواضيع عامة و %{posts} عامة للبدء بالمناقشة , المستخدمين الجدد لايمكن أن يحصلوا على مستوى الثقة حتى يكون هناك محتوى لهم , هذه الرسالة تظهر فقط للمدير" too_few_posts_notice: "دعونا الحصول على هذه المناقشة التي بدأت! يوجد حاليا %{currentPosts} / %{requiredPosts} مشاركات. الزوار الجديدة بحاجة إلى بعض الأحاديث قراءة والرد عليها." logs_error_rate_notice: reached: "%{relativeAge} – %{rate} وصل الحد الأعلى لإعدادت الموقع %{siteSettingRate}." @@ -1076,7 +1075,7 @@ ar: rate_limit: "رجاءً انتظر قبل أن تلج مرّة أخرى." blank_username_or_password: "رجاءً أدخل اسم المستخدم (أو البريد الإلكترونيّ) وكلمة السّرّ." reset_password: 'صفّر كلمة السّرّ' - logging_in: "...تسجيل الدخول " + logging_in: "يلج..." or: "أو " authenticating: "يستوثق..." awaiting_approval: "لم يوافق أيّ من أعضاء الطّاقم على حسابك بعد. سيُرسل إليك بريد حالما يتمّ ذلك." @@ -1114,8 +1113,8 @@ ar: invites: accept_title: "دعوة" welcome_to: "مرحباً بك في %{site_name}!" - invited_by: "لقد تمت دعوتك بواسطة" - social_login_available: "سيمكنك ايضاً تسجيل دخولك باستخدام الشبكات الإجتماعية بواسطة هذا الإيميل" + invited_by: "لقد دعاك:" + social_login_available: "يمكنك أيضًا الولوج عبر أيّ شبكة اجتماعيّة مستخدمًا هذا البريد." your_email: "بريدك الإلكتروني %{email}." accept_invite: "قُبول الدعوة " success: "أُنشئ حسابك وقد ولجت الآن." @@ -1177,6 +1176,7 @@ ar: title: "أو اضغط Ctrl+Enter" users_placeholder: "أضف مستخدما" title_placeholder: "بجملة واحدة، ما الذي تود النقاش عنه؟" + title_or_link_placeholder: "اكتب عنوانًا أو ألصق رابطًا" edit_reason_placeholder: "لماذا تعدّل النص؟" show_edit_reason: "(أضف سبب التعديل)" reply_placeholder: "اكتب ما تريد هنا. استخدم Markdown، أو BBCode، أو HTML للتنسيق. اسحب الصور أو ألصقها." @@ -1324,11 +1324,11 @@ ar: with_tags: label: مع أوسمة filters: - label: ابحث عن المواضيع والمنشورات التي... + label: ابحث عن المواضيع والمشاركات التي... likes: أعجبتني posted: شاركت فيها - watching: التي أراقبها - tracking: التي اتابعها + watching: أراقبها + tracking: أتابعها private: موجودة في رسائلي bookmarks: علّمتُها first: تلك المشاركة الاولى @@ -1639,7 +1639,7 @@ ar: action: "دعوة" success: "لقد دعونا ذلك المستخدم للمشاركة في هذه الرسالة." success_group: "لقد دعونا تلك المجموعة للمشاركة في هذه الرسالة." - error: "آسفون، حدثت مشكلة في دعوة المستخدم." + error: "نأسف، حدث عطل أثناء دعوة هذا المستخدم." group_name: "اسم المجموعة" controls: "خصائص الموضوع" invite_reply: @@ -1657,7 +1657,7 @@ ar: success_email: "قمنا بإرسال دعوة بالبريد لـ {{emailOrUsername}} . سيتم تنبيهك عند قبول الدعوة , تحقق من تبويب الدعوات في صفحتك الشخصية لمتابعة دعوتك." success_username: "دعونا هذا العضو للمشاركة في هذا الموضوع." error: "نأسف لا يمكنك دعوة هذا المُستَخدم , ربما لأنه مُسَجِل لدينا مسبقاً (الدعوات محدودة)" - login_reply: 'لِج لتردّ' + login_reply: 'عليك الولوج للرّدّ' filters: n_posts: zero: "لا مشاركات" @@ -1693,13 +1693,13 @@ ar: merge_posts: title: "ادمج المشاركات المحدّدة" action: "ادمج المشاركات المحددة" - error: "حدث خطأ في دمج المشاركات المحددة." + error: "حدث عطل أثناء دمج المشاركات المحدّدة." change_owner: title: "تغيير صاحب المشاركة" action: "تغيير العضوية " - error: "هناك خطأ في نغيير العضوية" + error: "حدث عطل أثناء تغيير مالك المشاركات." label: "عضوية جديدة للمشاركات" - placeholder: "اسم مستخدم للعضوية الجديدة" + placeholder: "اسم مستخدم المالك الجديد" instructions: zero: "لم يتم تحديد أي مشاركة!" one: "الرجاء اختيار المالك الجديد لمشاركة نُشرت بواسطة {{old_user}}." @@ -1709,10 +1709,10 @@ ar: other: "الرجاء اختيار المالك الجديد لـ {{count}} مشاركة نُشرت بواسطة {{old_user}}." instructions_warn: "ملاحطة لن يتم نقل الاشعارت القديمة للمشاركة للمسخدم الجديد
تحذير: اي بيانات تتعلق بالمشاركة هذه لن يتم نقلها للمستخدم الجديد. استعملها بحذر." change_timestamp: - title: "تغيير الطابع الزمني" - action: "تغيير الطابع الزمني" - invalid_timestamp: "الطابع الزمني لا يمكن أن يكون في المستقبل." - error: "هناك خطأ في نغيير الطابع الزمني للموضوع." + title: "غيّر الختم الزّمنيّ" + action: "غيّر الختم الزّمنيّ" + invalid_timestamp: "لا يمكن أن يكون الختم الزمنيّ مستقبليّ." + error: "حدث عطل أثناء تغيير ختم الموضوع الزّمنيّ." instructions: "من فضلك اختر الطابع الزمني الجديد للموضوع. ستُحدّث المشاركات فيه لألا يختلف فرق تاريخ نشرها ووقته." multi_select: select: 'حددها' @@ -1813,7 +1813,7 @@ ar: has_liked: "أعجبتك هذه المشاركة" undo_like: "ألغِ الإعجاب" edit: "عدّل المشاركة" - edit_anonymous: "آسفون، عليك الولوج لتعديل المشاركة." + edit_anonymous: "نأسف، عليك الولوج لتعديل المشاركة." flag: "بلَغ عن هذا الموضوع او ارسل تنبيه خاص لأدارة الموقع." delete: "احذف المشاركة" undelete: "التراجع عن حذف المشاركة" @@ -2364,7 +2364,7 @@ ar: help: '? فتح مساعدة لوحة المفاتيح' dismiss_new_posts: 'تجاهل جديد / المشاركات x, r' dismiss_topics: 'x, t تجاهل المواضيع' - log_out: 'shift+z shift+z تسجيل خروج' + log_out: 'shift+z shift+z الخروج' actions: title: 'إجراءات' bookmark_topic: 'f تبديل علامة مرجعية الموضوع' @@ -2688,6 +2688,7 @@ ar: all_users: "جميع المستخدمين" note_html: "حافظ على سرية هذا المفتاح، اي شخص يحصل عليه يستطيع انشاء مواضيع باسم اي مستخدم اخر" web_hooks: + detailed_instruction: "سيُرسل طلب POST إلى العنوان الموفّر عندما يحدث الحدث المنتقى." create: "أنشئ" save: "حفظ" destroy: "مسح" @@ -2707,6 +2708,13 @@ ar: successful: "نجاح" events: none: "لا يوجد أحداث مماثلة" + incoming: + zero: "لا أحداث جديدة." + one: "هناك حدث واحد جديد." + two: "هناك حدثان جديدان." + few: "هناك {{count}} أحداث جديدة." + many: "هناك {{count}} حدثًا جديدًا." + other: "هناك {{count}} حدث جديد." request: "طلب" response: "الرد" headers: "الرؤوس" @@ -2813,6 +2821,7 @@ ar: body_tag: text: "" title: "رقْم HTML الذي سيُدرج قبل وسم ‎‎" + override_default: "لا تضمّن ورقة الأنماط القياسيّة" enabled: "مفعّل؟" preview: "معاينة" undo_preview: "ازالة المعاينة" @@ -3137,8 +3146,8 @@ ar: impersonate: 'انتحال شخصية' action_logs: "سجلات الاجراء" ip_lookup: "جدول \"IP\"" - log_out: "تسجيل الخروج" - logged_out: "أخرجنا العضو من كل أجهزته" + log_out: "اخرج" + logged_out: "أخرجنا العضو من كلّ أجهزته" revoke_admin: 'سحب الإدارة' grant_admin: 'منحة إدارية' revoke_moderation: 'سحب المراقبة' @@ -3329,7 +3338,7 @@ ar: legal: "قانوني" uncategorized: 'أخرى' backups: "النسخ الإحتياطية" - login: "تسجيل الدخول" + login: "الولوج" plugins: "الإضافات " user_preferences: "تفضيلات العضو" tags: "الوسوم" diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index efec736c69..83f7bf5e1d 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -130,7 +130,6 @@ bs_BA: enabled: 'izlistan %{when}' disabled: 'sklonjen %{when}' topic_admin_menu: "topic admin actions" - wizard_required: "Vrijeme je za kofiguraciju vašeg foruma! Startajte Setup Postavke!" emails_are_disabled: "Sve odlazeće email poruke su globalno onemogućene od strane administratora. Niti jedna notifikacija bilo kakve vrste neće biti poslana." bootstrap_mode_enabled: "Kako bi lakše lansirali svoj novi sajt, trenutno ste u bootstrap modu. Svi novi korisnici će dobiti razinu povjerenja 1 i imati uključen sistematizovani dnevni e-mail pregleda promjena. Naknadno će biti automatski isključeno nakon što ukupan broj korisnika pređe brojku od %{min_users}." bootstrap_mode_disabled: "Bootstrap mod će biti ugašen u sljedećih 24 sata." @@ -889,7 +888,6 @@ bs_BA: logging_in: "Ulogujem se..." or: "Or" authenticating: "Autorizacija..." - awaiting_confirmation: "Vaš nalog čeka aktivaciju, koristite opciju za ponovno slanje aktivacije." awaiting_approval: "Your account has not been approved by a staff member yet. You will be sent an email when it is approved." requires_invite: "Sorry, access to this forum is by invite only." not_activated: "You can't log in yet. We previously sent an activation email to you at {{sentTo}}. Please follow the instructions in that email to activate your account." @@ -1163,7 +1161,6 @@ bs_BA: archive_topics: "Archive Topics" notification_level: "Change Notification Level" choose_new_category: "Izaberi novu kategoriju za temu:" - change_tags: "Izmijeni tagove" choose_new_tags: "Odaberi nove tagove za ove teme:" changed_tags: "Tagovi ovih tema su izmijenjeni." none: @@ -1818,8 +1815,6 @@ bs_BA: title: "Create a backup" confirm: "Do you want to start a new backup?" without_uploads: "Yes (do not include files)" - download: - title: "Download the backup" destroy: title: "Remove the backup" confirm: "Are you sure you want to destroy this backup?" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 3d172de817..011bf2519b 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -154,7 +154,6 @@ cs: enabled: 'uvedeno %{when}' disabled: 'neuvedeno %{when}' topic_admin_menu: "akce administrátora tématu" - wizard_required: "Je čas nastavit vaše fórum! Spustit průvodce nastavením!" emails_are_disabled: "Všechny odchozí emaily byly administrátorem vypnuty. Žádné odchozí emaily nebudou odeslány." bootstrap_mode_enabled: "Aby se váš web jednodušeji rozjel, nachází se v režimu bootstrap. Všichni noví uživatelé začínají s důveryhodností 1 a mají povolené denní odesílání souhrnných emailů. Tento režim se automaticky vypne, jakmile počet registrovaných uživatelů překročí %{min_users}." bootstrap_mode_disabled: "Režim bootstrap bude deaktivován v následujících 24 hodinách." @@ -916,7 +915,6 @@ cs: logging_in: "Přihlašuji..." or: "Nebo" authenticating: "Autorizuji..." - awaiting_confirmation: "Váš účet nyní čeká na aktivaci, použijte odkaz pro zapomené heslo, jestli chcete, abychom vám zaslali další aktivační email." awaiting_approval: "Váš účet zatím nebyl schválen členem redakce. Až se tak stane, budeme vás informovat emailem." requires_invite: "Promiňte, toto fórum je pouze pro zvané." not_activated: "Ještě se nemůžete přihlásit. Zaslali jsme vám aktivační email v {{sentTo}}. Prosím následujte instrukce v tomto emailu, abychom mohli váš účet aktivovat." @@ -1214,7 +1212,6 @@ cs: one: "Vybrali jste 1 téma." few: "Vybrali jste {{count}} témata." other: "Vybrali jste {{count}} témat." - change_tags: "Změnit štítky" choose_new_tags: "Zvolte nové tagy pro témata:" changed_tags: "Tagy témat byly změněny." none: @@ -1782,7 +1779,6 @@ cs: email_in_disabled: "Přidávání nových témat před email je zakázáno v Nastavení fóra. K povolení nových témat přes email," email_in_disabled_click: 'povolit nastavení "email in"' suppress_from_homepage: "Potlač tuto kategorii na domovské stránce." - sort_order: "Výchozít řazení:" allow_badges_label: "Povolit používání odznaků v této kategorii" edit_permissions: "Upravit oprávnění" add_permission: "Přidat oprávnění" @@ -1926,7 +1922,6 @@ cs: history: "Historie" changed_by: "od uživatele {{author}}" raw_email: - title: "Neupravený email" not_available: "Není k dispozici!" categories_list: "Seznam kategorií" filters: @@ -2423,7 +2418,6 @@ cs: without_uploads: "Ano (nepřikládej soubory)" download: label: "Stáhnout" - title: "Stáhnout zálohu" destroy: title: "Odstranit zálohu" confirm: "Are you sure you want to destroy this backup?" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 0ce1caef54..86ee10c234 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -136,7 +136,6 @@ da: enabled: 'listet %{when}' disabled: 'aflistet %{when}' topic_admin_menu: "administrationshandlinger på emne" - wizard_required: "Det er tid til at konfigurere dig forum! Start Konfigurations Guiden!" emails_are_disabled: "Alle udgående emails er blevet deaktiveret globalt af en administrator. Ingen emailnotifikationer af nogen slags vil blive sendt." bootstrap_mode_enabled: "For at gøre det nemmere at lancere dit nye website, er du i bootstrap tilstand. Alle nye brugere vil blive tildelt niveau 1 og daglige email updateringer vil være slået til. Dette vil blive automatisk slået fra når total antal brugere overskrider %{min_users} brugere." bootstrap_mode_disabled: "Bootstrap tilstand vil blive deaktiveret indenfor de næste 24 timer." @@ -347,7 +346,19 @@ da: title: "Medlemskabsanmodning" body: "Jeg vil gerne ansøge om medlemskab i @%{groupName}." name_placeholder: "Gruppe navn, ingen mellemrum, samme som reglen for brugernavn" + empty: + members: "Der er ingen medlemmer i denne gruppe." + mentions: "Denne gruppe bliver ikke nævnt nogen steder." + messages: "Der er ingen beskeder til denne gruppe." + topics: "Der er ingen emner skrevet af medlemmer i denne gruppe." + logs: "Der er ingen logning for denne gruppe." add: "Tilføj" + join: "Bliv medlem af gruppen" + leave: "Forlad gruppen" + request: "Anmod om indmeldelse i gruppen" + automatic_group: Automatisk gruppe + closed_group: Lukket gruppe + is_group_user: "Du er medlem af denne gruppe" selector_placeholder: "Tilføj medlemmer" owner: "ejer" visible: "Gruppen er synlige for alle brugere" @@ -866,7 +877,6 @@ da: logging_in: "Logger ind..." or: "Eller" authenticating: "Logger ind…" - awaiting_confirmation: "Din konto mangler at blive aktiveret. Brug “Jeg har glemt min adgangskode”-linket for at få en ny aktiverings-mail." awaiting_approval: "Din konto er ikke blevet godkendt af en moderator endnu. Du får en e-mail når den bliver godkendt." requires_invite: "Beklager, det kræve en invitation at blive medlem af dette forum." not_activated: "Du kan ikke logge ind endnu. Vi har tidligere sendt en aktiverings-e-mail til dig på {{sentTo}}. Følg venligst instruktionerne i den e-mail for at aktivere din konto." @@ -1108,7 +1118,6 @@ da: selected: one: "Du har valgt 1 indlæg." other: "Du har valgt {{count}} indlæg." - change_tags: "Skift Tags" choose_new_tags: "Vælg nye tags for dette emne" changed_tags: "Tags for dette emne blev ændret" none: @@ -1740,7 +1749,6 @@ da: history: "Historik" changed_by: "af {{author}}" raw_email: - title: "Email kildekode" not_available: "Ikke tilgængelig!" categories_list: "Kategorioversigt" filters: @@ -2155,7 +2163,6 @@ da: without_uploads: "Ja (inkluder ikke filer)" download: label: "Download" - title: "Download backuppen" destroy: title: "Sletter backuppen" confirm: "Er du sikker på du vil fjerne denne backup?" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 8dc7f4753d..769e93c5f8 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -135,6 +135,9 @@ de: visible: enabled: 'sichtbar gemacht, %{when}' disabled: 'unsichtbar gemacht, %{when}' + banner: + enabled: 'hat dieses Banner erstellt %{when}. Es wird oberhalb jeder Seite angezeigt, bis es vom Benutzer weggeklickt wird.' + disabled: 'hat dieses Banner entfernt %{when}. Es wird nicht mehr oberhalb jeder Seite angezeigt.' topic_admin_menu: "Thema administrieren" wizard_required: "Willkommen bei deinem neuen Discourse! Lass uns mit dem Setup-Assistenten ✨ starten" emails_are_disabled: "Die ausgehende E-Mail-Kommunikation wurde von einem Administrator global deaktiviert. Es werden keinerlei Benachrichtigungen per E-Mail verschickt." @@ -654,7 +657,7 @@ de: title: "Oberflächensprache" instructions: "Die Sprache der Forumsoberfläche. Diese Änderung tritt nach dem Neuladen der Seite in Kraft." default: "(Standard)" - any: "jegliche" + any: "(keine Einschränkung)" password_confirmation: title: "Wiederholung des Passworts" last_posted: "Letzter Beitrag" @@ -1172,7 +1175,7 @@ de: advanced: title: Erweiterte Suche posted_by: - label: Verfasst von + label: Beiträge von in_category: label: In der Kategorie in_group: @@ -1182,33 +1185,33 @@ de: with_tags: label: Mit den Schlagwörtern filters: - label: Zeige nur Beiträge an, die... - likes: Mir gefallen - posted: Ich schrieb einen Beitrag in - watching: Ich beobachte - tracking: Ich verfolge - private: sind in meinen Nachrichten - bookmarks: Ich habe ein Lesezeichen gesetzt - first: sind die allerersten Beiträge - pinned: sind angeheftet - unpinned: sind nicht angeheftet - seen: Habe ich gelesen - unseen: Habe ich nicht gelesen - wiki: sind Wiki + label: 'Themen/Beiträge einschränken:' + likes: Themen/Beiträge, die mir gefallen + posted: Themen mit Beiträgen von mir + watching: Themen, die ich beobachte + tracking: Themen, denen ich folge + private: Beiträge in meinen Unterhaltungen + bookmarks: Gemerkte Themen/Beiträge + first: Erste Beiträge in Themen + pinned: Angeheftete Themen + unpinned: Nicht angeheftete Themen + seen: Gelesene Themen/Beiträge + unseen: Ungelesene Themen/Beiträge + wiki: Wikis statuses: - label: Wo Themen - open: sind offen - closed: sind geschlossen - archived: sind archiviert - noreplies: haben keine Antworten - single_user: enthalten nur einen Nutzer + label: 'Themen einschränken:' + open: Offene Themen + closed: Geschlossene Themen + archived: Archivierte Themen + noreplies: Themen ohne Antwort + single_user: Themen mit nur einem Benutzer post: count: - label: Minimale anzahl an Beiträgen + label: Themen mit … oder mehr Beiträgen time: - label: Beigetragen - before: vorher - after: nachher + label: 'Zeitraum einschränken:' + before: Beiträge vor dem + after: Beiträge nach dem hamburger_menu: "zu einer anderen Themenliste oder Kategorie wechseln" new_item: "neu" go_back: 'zurückgehen' @@ -1800,8 +1803,10 @@ de: num_featured_topics: "Anzahl der Themen, die auf der Kategorien-Seite angezeigt werden" subcategory_num_featured_topics: "Anzahl beworbener Themen, die auf der Seite der übergeordneten Kategorie angezeigt werden:" all_topics_wiki: "Mache neue Themen standardmäßig zu Wikis." - sort_order: "Standardsortierung:" - default_view: "Standardansicht:" + subcategory_list_style: "Listenstil für Unterkategorien" + sort_order: "Themenliste sortieren nach:" + default_view: "Standard-Themenliste" + default_top_period: "Standard-Zeitraum für Top-Beiträge:" allow_badges_label: "Erlaube das Verleihen von Abzeichen in dieser Kategorie." edit_permissions: "Berechtigungen bearbeiten" add_permission: "Berechtigung hinzufügen" @@ -1839,6 +1844,11 @@ de: created: "Erstellt" sort_ascending: 'Aufsteigend' sort_descending: 'Absteigend' + subcategory_list_styles: + rows: "Zeilen" + rows_with_featured_topics: "Zeilen mit hervorgehobenen Themen" + boxes: "Spalten" + boxes_with_featured_topics: "Spalten mit hervorgehobenen Themen" flagging: title: 'Danke für deine Mithilfe!' action: 'Beitrag melden' diff --git a/config/locales/client.et.yml b/config/locales/client.et.yml index d34bb44eef..06ec14de1f 100644 --- a/config/locales/client.et.yml +++ b/config/locales/client.et.yml @@ -136,7 +136,6 @@ et: enabled: 'lisatud %{when}' disabled: 'eemaldatud %{when}' topic_admin_menu: "teema admintegevused" - wizard_required: "On aeg oma foorum seadistada! Käivita algseadistamise viisard!" emails_are_disabled: "Kõik väljuvad meilid on administraatori poolt blokeeritud. Ühtegi teavitust meili teel ei saadeta." bootstrap_mode_enabled: "Oma uue saidi lansseerimise hõlbustamiseks oled käivitusrežiimil. Kõik uued kasutajad saavad usaldustaseme 1 ja nende igapäevased kokkuvõtvad teavitused meili teel on aktiveeritud. See lülitub automaatselt välja kui kasutajate koguarv ületab %{min_users} piiri." bootstrap_mode_disabled: "Käivitusrežiim lülitub välja järgmise 24 tunni jooksul." @@ -928,7 +927,6 @@ et: logging_in: "Login sisse..." or: "Või" authenticating: "Autendin..." - awaiting_confirmation: "Sinu konto ootab aktiveerimist. Kasuta unustasin parooli - viidet, et aktiveerimise meil uuesti saata." awaiting_approval: "Sinu konto on alles meeskonna poolt kinnitamata. Saadame sulle kohe meili, kui see on heaks kiidetud." requires_invite: "Vabandame, sellesse foorumisse pääseb ainult kutsega." not_activated: "Sa ei saa veel sisse logida. Saatsime sulle aktiveerimise meili aadressile {{sentTo}}. Järgi palun selles meilis olevaid juhiseid oma konto aktiveerimiseks." @@ -1785,7 +1783,6 @@ et: suppress_from_homepage: "Eemalda see foorum avalehelt." show_subcategory_list: "Näita selles foorumis alamfoorumite nimekirja teemadest üleval pool." all_topics_wiki: "Tee uued teemad vaikimisi wikideks." - sort_order: "Vaikejärjestus" allow_badges_label: "Luba selles foorumis autasustamist märgistega" edit_permissions: "Muuda kasutusõigusi" add_permission: "Lisa kasutusõigus" @@ -1924,7 +1921,6 @@ et: history: "Ajalugu" changed_by: "autor {{author}}" raw_email: - title: "Täätlemata meil" not_available: "Pole saadaval!" categories_list: "Foorumite loend" filters: @@ -2464,7 +2460,6 @@ et: without_uploads: "Jah (ära kaasa faile)" download: label: "Lae alla" - title: "Lae varukoopia alla" destroy: title: "Eemalda varukoopia" confirm: "Oled kindel, et soovid selle varukoopia hävitada?" diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index a1a732edcc..3c70c5e816 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -676,7 +676,6 @@ fa_IR: logging_in: "درون آمدن..." or: "یا" authenticating: "اعتبارسنجی..." - awaiting_confirmation: "شناسهٔ‌کاربری‌تان چشم به راه فعال‌سازی است، پیوند فراموشی گذرواژه را برای دریافت یک رایانامهٔ‌فعال‌سازی دیگر باز کنید." awaiting_approval: "هنوز کارمندی شناسهٔ‌شما را تأیید نکرده است. پس از تأیید، یک رایانامه دریافت خواهید کرد." requires_invite: "متأسفیم، دسترسی به این انجمن تنها با فراخوانه امکان دارد." not_activated: "هنوز نمی‌توانید به درون بیایید. پیش‌تر یک رایانامهٔ فعال‌سازی برایتان به نشانی {{sentTo}} فرستادیم. لطفاً دستور کار آن رایانامه را برای فعال‌سازی شناسه‌تان دنبال کنید." @@ -1409,7 +1408,6 @@ fa_IR: history: "تاریخچه" changed_by: "توسط {{author}}" raw_email: - title: "ایمیل خام" not_available: "در دسترس نیست!" categories_list: "فهرست دسته‌ بندی ها" filters: @@ -1702,7 +1700,6 @@ fa_IR: without_uploads: "بله (فایل ها را شامل نمی شود)" download: label: "دانلود" - title: "دانلود پشتیبان" destroy: title: "پاک کردن پشتیبان" confirm: "آیا مطمئنید که می‌خواهید پشتیبان را از بین ببرید؟" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 7121b3c72d..ff2b61ad74 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -1807,6 +1807,7 @@ fi: subcategory_list_style: "Tytäraluelistan tyyli:" sort_order: "Ketjulistaus järjestetään:" default_view: "Oletuslistaus:" + default_top_period: "Huiput-listauksen oletusajanjakso:" allow_badges_label: "Salli ansiomerkkien myöntäminen tältä alueelta" edit_permissions: "Muokkaa oikeuksia" add_permission: "Lisää oikeus" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index ae74ec3255..44830f0ab4 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -136,7 +136,6 @@ fr: enabled: 'a rendu ce sujet visible %{when}' disabled: 'a rendu ce sujet invisible %{when}' topic_admin_menu: "actions d'administration sur le sujet" - wizard_required: "C'est le moment de configurer votre forum ! Démarrer l'assistant de configuration." emails_are_disabled: "Le courriel sortant a été désactivé par un administrateur. Aucune notification courriel ne sera envoyée." bootstrap_mode_enabled: "Pour rendre le lancement de votre site plus facile, vous êtes en mode 'bootstrap'. Tout nouveau utilisateur sera accordé le niveau de confirance 1 et aura les résumés par courriel hebdomadaires activés. Ceci cessera d'être le cas lorsque le nombre d'utilisateurs dépassera %{min_users}." bootstrap_mode_disabled: "Le mode Bootstrap sera désactivé dans les prochaines 24 heures." @@ -928,7 +927,6 @@ fr: logging_in: "Connexion en cours…" or: "ou" authenticating: "Authentification…" - awaiting_confirmation: "Votre compte est en attente d'activation, utilisez le lien mot de passe oublié pour demander un nouveau courriel d'activation." awaiting_approval: "Votre compte n'a pas encore été approuvé par un modérateur. Vous recevrez une confirmation par courriel lors de l'activation." requires_invite: "Désolé, l'accès à ce forum est sur invitation seulement." not_activated: "Vous ne pouvez pas vous encore vous connecter. Nous avons envoyé un courriel d'activation à {{sentTo}}. Merci de suivre les instructions afin d'activer votre compte." @@ -1785,7 +1783,6 @@ fr: suppress_from_homepage: "Retirer cette catégorie de la page d'accueil" show_subcategory_list: "Afficher la liste des sous-catégories au dessus des sujets dans cette catégorie." all_topics_wiki: "Faire des nouveaux sujets des Wikis par défaut" - sort_order: "Tri par défaut :" allow_badges_label: "Autoriser les badges à être accordé dans cette catégorie" edit_permissions: "Modifier les permissions" add_permission: "Ajouter la permission" @@ -1924,7 +1921,6 @@ fr: history: "Historique" changed_by: "par {{author}}" raw_email: - title: "Couriel au format brut" not_available: "Indisponible !" categories_list: "Liste des catégories" filters: @@ -2462,7 +2458,6 @@ fr: without_uploads: "Oui (ne pas inclure les fichiers)" download: label: "Télécharger" - title: "Télécharger la sauvegarde" destroy: title: "Supprimer la sauvegarde" confirm: "Êtes-vous sûr de vouloir détruire cette sauvegarde?" diff --git a/config/locales/client.gl.yml b/config/locales/client.gl.yml index fbae93e99c..ec9f0a72b4 100644 --- a/config/locales/client.gl.yml +++ b/config/locales/client.gl.yml @@ -136,7 +136,6 @@ gl: enabled: 'listado o %{when}' disabled: 'retirado da lista o %{when}' topic_admin_menu: "accións do administrador de temas" - wizard_required: "É hora de configura-lo teu foro! Inicie o Asistente de Configuración!" emails_are_disabled: "Todos os correos electrónicos saíntes foron desactivados globalmente por un administrador. Non se enviará ningún tipo de notificación por correo electrónico." s3: regions: @@ -758,7 +757,6 @@ gl: logging_in: "Iniciando sesión..." or: "ou" authenticating: "Autenticando..." - awaiting_confirmation: "A túa conta está pendente de se activar, emprega a ligazón de contrasinal esquecido para emitir outro correo de activación." awaiting_approval: "A túa conta non foi aínda aprobada polos membros do equipo. Enviaráseche unha mensaxe cando así for." requires_invite: "Sentímolo pero o acceso a este foro é unicamente por convite." not_activated: "Non podes acceder aínda. Antes debemos enviarche unha mensaxe a {{sentTo}}. Por favor, sigue as instrucións desta mensaxe para activar a túa conta." @@ -1566,7 +1564,6 @@ gl: history: "Historial" changed_by: "por {{author}}" raw_email: - title: "Fonte do correo" not_available: "Non dispoñíbel." categories_list: "Lista de categorías" filters: @@ -1850,7 +1847,6 @@ gl: without_uploads: "Si (non incluír ficheiros)" download: label: "Descargar" - title: "Descargar a copia de seguranza" destroy: title: "Eliminar a copia de seguranza" confirm: "Confirmas a destrución desta copia de seguranza?" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 4b43b96f1a..0695394f8f 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -1808,6 +1808,7 @@ he: subcategory_list_style: "סגנון רשימות קטגוריות משנה:" sort_order: "סידור ברירת מחדל לנושאים:" default_view: "תצוגת ברירת מחדל לנושאים:" + default_top_period: "פרק זמן דיפולטיבי להובלה" allow_badges_label: "הרשו לעיטורים להיות מוענקים בקטגוריה זו" edit_permissions: "ערוך הרשאות" add_permission: "הוסף הרשאה" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 40fad5e2ec..3b265df219 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -926,7 +926,6 @@ it: logging_in: "Connessione in corso..." or: "Oppure" authenticating: "Autenticazione..." - awaiting_confirmation: "Il tuo account è in attesa di attivazione, usa il collegamento \"password dimenticata\" per ricevere una nuova email di attivazione." awaiting_approval: "Il tuo account non è stato ancora approvato da un membro dello staff. Ti invieremo un'email non appena verrà approvato." requires_invite: "Spiacenti, l'accesso a questo forum e solo ad invito." not_activated: "Non puoi ancora connetterti. Abbiamo inviato un'email di attivazione a {{sentTo}}. Per favore segui le istruzioni contenute nell'email per attivare l'account." @@ -1224,7 +1223,6 @@ it: selected: one: "Hai selezionato 1 argomento." other: "Hai selezionato {{count}} argomenti." - change_tags: "Cambia Etichette" choose_new_tags: "Scegli nuove etichette per i seguenti argomenti:" changed_tags: "Le etichette per quegli argomenti sono state cambiate." none: @@ -1767,7 +1765,6 @@ it: email_in_disabled: "Le Impostazioni Sito non permettono di creare nuovi argomenti via email. Per abilitare la creazione di argomenti via email," email_in_disabled_click: 'abilita l''impostazione "email entrante".' suppress_from_homepage: "Elimina questa categoria dalla homepage." - sort_order: "Ordinamento Predefinito:" allow_badges_label: "Permetti l'assegnazione di distintivi in questa categoria" edit_permissions: "Modifica Permessi" add_permission: "Aggiungi Permesso" @@ -1900,7 +1897,6 @@ it: history: "Storia" changed_by: "da {{author}}" raw_email: - title: "Email Greggia" not_available: "Non disponibile!" categories_list: "Lista Categorie" filters: @@ -2433,7 +2429,6 @@ it: without_uploads: "Sì (non includere i file)" download: label: "Scarica" - title: "Scarica il backup" destroy: title: "Rimuovi il backup" confirm: "Sicuro di voler distruggere questo backup?" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 486c8e07e6..c6d2623cdf 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -738,7 +738,6 @@ ja: logging_in: "ログイン中..." or: "または" authenticating: "認証中..." - awaiting_confirmation: "アカウントはアクティベーション待ち状態です。もう一度アクティベーションメールを送信するには「パスワードを忘れました」リンクをクリックしてください。" awaiting_approval: "アカウントはまだスタッフに承認されていません。承認され次第メールにてお知らせいたします。" requires_invite: "申し訳ありませんが、このフォーラムは招待制です。" not_activated: "まだログインできません。{{sentTo}} にアクティベーションメールを送信しております。メールの指示に従ってアカウントのアクティベーションを行ってください。" @@ -949,7 +948,6 @@ ja: choose_new_category: "このトピックの新しいカテゴリを選択してください" selected: other: "あなたは {{count}} トピックを選択しました。" - change_tags: "タグを変更" none: unread: "未読のトピックはありません。" new: "新しいトピックはありません。" @@ -1472,7 +1470,6 @@ ja: history: "History" changed_by: "by {{author}}" raw_email: - title: "メール" not_available: "利用不可" categories_list: "カテゴリ一覧" filters: @@ -1816,7 +1813,6 @@ ja: without_uploads: "はい(ファイルは含まない)" download: label: "ダウンロード" - title: "バックアップをダウンロード" destroy: title: "バックアップを削除" confirm: "このバックアップを削除しますか？" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 039792f9fc..f6a4fe6c4c 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -118,7 +118,6 @@ ko: enabled: '%{when} 목록에 게시' disabled: '%{when} 목록에서 감춤' topic_admin_menu: "주제 관리자 기능" - wizard_required: "포럼을 설정하세요! 설치 마법사를 시작하세요!" emails_are_disabled: "관리자가 이메일 송신을 전체 비활성화 했습니다. 어떤 종류의 이메일 알림도 보내지지 않습니다." bootstrap_mode_enabled: "쉬운 시작을 위해 부트스트랩 모드로 구동 되었습니다. 모든 새로운 사용자에게 신뢰 수준 1이 부여되고 매일 이메일 다이제스트가 보내집니다. 이 기능은 총 사용자 수가 %{min_users}를 초과 할 때 자동으로 꺼집니다." bootstrap_mode_disabled: "부트스트랩 모드는 24시간 뒤 비활성화 될 것입니다." @@ -810,7 +809,6 @@ ko: logging_in: "로그인 중.." or: "또는" authenticating: "인증 중..." - awaiting_confirmation: "계정 활성화를 기다리고 있습니다. 다른 인증 이메일을 받고 싶으면 비밀번호 찾기를 누르세요." awaiting_approval: "스태프가 아직 내 계정을 승인하지 않았습니다. 승인되면 이메일을 받게됩니다." requires_invite: "죄송합니다. 초대를 받은 사람만 이용하실 수 있습니다." not_activated: "아직 로그인 할 수 없습니다. 계정을 만들었을때 {{sentTo}} 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오." @@ -1556,7 +1554,6 @@ ko: history: "기록" changed_by: "{{author}}에 의해" raw_email: - title: "Raw 이메일" not_available: "Raw 이메일이 가능하지 않습니다." categories_list: "카테고리 목록" filters: @@ -1835,7 +1832,6 @@ ko: without_uploads: "예 (파일을 포함하지 않음)" download: label: "다운로드" - title: "백업 다운로드" destroy: title: "백업 삭제" confirm: "정말 이 백업을 삭제할까요?" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 114308721c..4b546bfeca 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -1806,6 +1806,7 @@ nl: subcategory_list_style: "Stijl van subcategorielijst:" sort_order: "Topiclijst sorteren op:" default_view: "Standaard topiclijst:" + default_top_period: "Standaard topperiode:" allow_badges_label: "Badges laten toekennen in deze categorie" edit_permissions: "Toestemmingen wijzigen" add_permission: "Toestemming toevoegen" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index cbaa5c2d1a..f2382f279e 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -1965,8 +1965,6 @@ pl_PL: show_subcategory_list: "Pokaż listę subkategorii powyżej tematów w tej kategorii." num_featured_topics: "Liczba wątków do wyświetlenia na stronie kategorii:" all_topics_wiki: "Stwórz nowe tematy domyślnie jako wiki" - sort_order: "Domyślnie sortuj:" - default_view: "Domyślny Widok:" allow_badges_label: "Włącz przyznawanie odznak na podstawie aktywności w tej kategorii" edit_permissions: "Edytuj uprawnienia" add_permission: "Dodaj uprawnienie" diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index cb0411b209..14557e1d99 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -136,7 +136,6 @@ pt: enabled: 'listado %{when}' disabled: 'removido da lista %{when}' topic_admin_menu: "Ações administrativas dos Tópicos" - wizard_required: "É altura de configurar o seu fórum! Iniciar o ajudante de configuração!" emails_are_disabled: "Todos os envios de e-mail foram globalmente desativados por um administrador. Nenhum e-mail de notificação será enviado." bootstrap_mode_enabled: "Para facilitar o lançamento do seu novo sítio mais fácil, encontra-se agora em modo de inicialização. Qualquer utilizador novo terá nível de confiança 1 e resumos de email diários ligados. Este modo será automaticamente desligado quando o número total de utilizadores ultrapassar %{min_users}." bootstrap_mode_disabled: "Modo de inicialização será desligado dentro das próximas 24 horas." @@ -911,7 +910,6 @@ pt: logging_in: "A iniciar sessão..." or: "Ou" authenticating: "A autenticar..." - awaiting_confirmation: "A sua conta está a aguardar ativação. Utilize a ligação \"Esqueci a Palavra-passe\" para pedir um novo email de ativação." awaiting_approval: "A sua conta ainda não foi aprovada por um membro do pessoal. Receberá um email quando a sua conta for aprovada." requires_invite: "Pedimos desculpa, o acesso a este fórum é permitido somente por convite de outro membro." not_activated: "Ainda não pode iniciar sessão. Enviámos anteriormente um email de ativação para o endereço {{sentTo}}. Por favor siga as instruções contidas nesse email para ativar a sua conta." @@ -1206,7 +1204,6 @@ pt: selected: one: "Selecionou 1 tópico." other: "Selecionou {{count}} tópicos." - change_tags: "Mudar Etiquetas" choose_new_tags: "Escolha novas etiquetas para estes tópicos:" changed_tags: "As etiquetas para esses tópicos foram mudadas." none: @@ -1744,7 +1741,6 @@ pt: email_in_disabled: "Publicar novos tópicos através do email está desactivado nas Configurações do Sítio. Para permitir a publicação de novos tópicos através do email," email_in_disabled_click: 'ative a definição "email em".' suppress_from_homepage: "Suprimir esta categoria da página principal." - sort_order: "Ordenação Predefinida:" allow_badges_label: "Permitir a atribuição de distintivos nesta categoria" edit_permissions: "Editar Permissões" add_permission: "Adicionar Permissões" @@ -1880,7 +1876,6 @@ pt: history: "Histórico" changed_by: "por {{author}}" raw_email: - title: "Email em bruto" not_available: "Indisponível!" categories_list: "Lista de Categorias" filters: @@ -2414,7 +2409,6 @@ pt: without_uploads: "Sim (não incluir ficheiros)" download: label: "Descarregar" - title: "Descarregar a cópia de segurança" destroy: title: "Remover a cópia de segurança" confirm: "Tem a certeza que deseja destruir esta cópia de segurança?" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 76e922e5e3..cf333ec741 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -137,6 +137,7 @@ pt_BR: disabled: 'desalistou %{when}' banner: enabled: 'tornou isso um banner %{when}. Isso será mostrado no todo de todas as páginas até que seja descartado pelo usuário.' + disabled: 'removeu esse banner %{when}. Ele não vai mais aparecer no topo de todas as páginas.' topic_admin_menu: "ações administrativas do tópico" wizard_required: "Bem vindo ao seu novo Discourse! Vamos começar com o assistente de configuração ✨" emails_are_disabled: "Todo o envio de email foi globalmente desabilitado por algum administrador. Nenhum email de notificações de qualquer tipo será enviado." @@ -877,7 +878,7 @@ pt_BR: hide_session: "Lembre-me amanhã" hide_forever: "não obrigado" hidden_for_session: "OK, Eu vou perguntar amanhã. Você pode também sempre usar o 'Registre-se' para criar uma conta." - intro: "Ei você! :heart_eyes: Para que você está gostando da discussão, mas ainda não criou uma conta." + intro: "Ei você! :heart_eyes: Parece que você está gostando da discussão, mas ainda não criou uma conta." value_prop: "Quando você cria uma conta, nós lembramos exatamente o que você leu, assim você sempre volta exatamente aonde estava. Você também recebe notificações, aqui e por e-mail, quando novas mensagens são feitas. E você pode curtir tópicos para compartilhar o amor. :heartbeat:" summary: enabled_description: "Você está vendo um sumário deste tópico: os posts mais interessantes conforme determinados pela comunidade." @@ -1241,7 +1242,9 @@ pt_BR: one: "Você selecionou 1 tópico." other: "Você selecionou {{count}} tópicos." change_tags: "Substituir marcadores" + append_tags: "Adicionar Etiquetas" choose_new_tags: "Escolha novas tags para esses tópicos:" + choose_append_tags: "Escolha novos marcadores para anexar a esses tópicos:" changed_tags: "As tags para esses tópicos foram alteradas." none: unread: "Não há nenhum tópico não lido." @@ -1798,6 +1801,7 @@ pt_BR: suppress_from_homepage: "Suprimir esta categoria da página inicial." show_subcategory_list: "Exibir lista de subcategorias acima dos tópicos nesta categoria." num_featured_topics: "Número de tópicos exibidos na página de Categorias:" + subcategory_num_featured_topics: "Número de tópicos em destaque na página da categoria pai:" all_topics_wiki: "Tornar novos tópicos wikis por padrão." subcategory_list_style: "Estilo da lista de subcategorias" sort_order: "Classificar lista de tópicos:" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index 8eae67c914..c08e2c6221 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -154,7 +154,6 @@ ro: enabled: 'afișat %{when}' disabled: 'ascuns %{when}' topic_admin_menu: "Opțiuni administrare subiect" - wizard_required: "Acum a sosit momentul să configurați forumul! Porniți Setup Wizard!" emails_are_disabled: "Trimiterea de emailuri a fost dezactivată global de către un administrator. Nu vor fi trimise notificări email de nici un fel." bootstrap_mode_enabled: "Pentru a ușura lansarea site-ului tău ești în modul bootstrap. Toți noii utilizatori vor primi nivelul de încredere 1 și vor avea activată primirea zilnică a unui email-rezumat. Această setare va fi dezactivată automat de îndată ce numărul total de utilizatori depășește %{min_users}." bootstrap_mode_disabled: "Modul bootstrap va fi dezactivat în următoarele 24 de ore." @@ -957,7 +956,6 @@ ro: logging_in: "În curs de autentificare..." or: "sau" authenticating: "Se autentifică..." - awaiting_confirmation: "Contul tău așteaptă să fie activat. Folosește linkul de reamintire a parolei, pentru a cere un alt email de activare." awaiting_approval: "Contul tău nu a fost aprobat încă de un admin . Vei primi un email când se aprobă." requires_invite: "Ne pare rău, accesul la forum se face pe bază de invitație." not_activated: "Nu te poți loga încă. Am trimis anterior un email de activare pentru {{sentTo}}. Urmează instrucțiunile din email pentru a-ți activa contul." @@ -1258,7 +1256,6 @@ ro: one: "Ai selectat un subiect." few: "Ai selectat {{count}} subiecte." other: "Ai selectat {{count}} de subiecte." - change_tags: "Schimbă etichete" choose_new_tags: "Alege etichete noi pentru aceste subiecte:" changed_tags: "Etichetele pentru aceste subiecte au fost schimbate." none: @@ -1830,7 +1827,6 @@ ro: email_in_disabled_click: 'activează opțiunea "primire email ".' suppress_from_homepage: "Elimină această categorie de pe pagina principală." all_topics_wiki: "Transformă subiectele noi în wiki-uri, implicit." - sort_order: "Sortare implicită:" allow_badges_label: "Permite acordarea de ecusoane în această categorie" edit_permissions: "Editează permisiuni" add_permission: "Adaugă permisiune" @@ -1974,7 +1970,6 @@ ro: history: "Istoric" changed_by: "de {{author}}" raw_email: - title: "Email" not_available: "Indisponibil!" categories_list: "Listă categorii" filters: @@ -2526,7 +2521,6 @@ ro: without_uploads: "Da (nu include fişierele)" download: label: "Descărcare" - title: "Descarcă backup-ul" destroy: title: "Șterge backup-ul" confirm: "Ești sigur că vrei să ștergi acest backup?" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 67c7f60ebd..ba7ad54674 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -1005,7 +1005,6 @@ ru: logging_in: "Проверка..." or: "или" authenticating: "Проверка..." - awaiting_confirmation: "Ваша учетная запись требует активации. Для того, чтобы получить активационное письмо повторно, нажмите на Сброс пароля." awaiting_approval: "Ваша учетная запись еще не одобрена. Вы получите письмо, как только это случится." requires_invite: "К сожалению, доступ к этому форуму только по приглашениям." not_activated: "Прежде, чем вы сможете войти на форум, вам необходимо активировать свою учетную запись. Мы отправили на почту {{sentTo}} подробные инструкции, как это cделать." @@ -1964,8 +1963,6 @@ ru: suppress_from_homepage: "Не отображать этот раздел на главной странице." num_featured_topics: "Количество тем на странице разделов" all_topics_wiki: "Создавать новые темы в вики-формате по умолчанию." - sort_order: "Порядок сортировки:" - default_view: "Вид по умолчанию:" allow_badges_label: "Разрешить вручение наград в этом разделе" edit_permissions: "Изменить права доступа" add_permission: "Добавить права" diff --git a/config/locales/client.sk.yml b/config/locales/client.sk.yml index e6eecb2ef7..8f0134243f 100644 --- a/config/locales/client.sk.yml +++ b/config/locales/client.sk.yml @@ -192,7 +192,7 @@ sk: privacy: "Súkromie" terms_of_service: "Podmienky používania" mobile_view: "Mobilná verzia" - desktop_view: "Desktop verzia" + desktop_view: "Zobrazenie pre počítač" you: "Vy" or: "alebo" now: "práve teraz" @@ -399,16 +399,16 @@ sk: none: "Žiadny" notifications: watching: - title: "Pozorovať" + title: "Sledovať" description: "Budete upozornený na každý nový príspevok vo všetkých správach a zobrazí sa počet nových odpovedí." watching_first_post: - title: "Pozorovať prvý príspevok" + title: "Sledovať prvý príspevok" description: "Budete upozornený iba na prvý príspevok v každej téme v tejto skupine." tracking: - title: "Sledovať" + title: "Pozorovať" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie a zobrazí sa počet nových odpovedí." regular: - title: "Bežný" + title: "Bežné" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." muted: title: "Ignorované" @@ -530,18 +530,18 @@ sk: few_per_day: "Pošli mi email pri každom novom príspevku (cca 2 denne)" tag_settings: "Štítky" watched_tags: "Sledované" - watched_tags_instructions: "Budete automaticky pozerať všetky témy s týmito štítkami. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený počet nových príspevkov." - tracked_tags: "Sledované" - tracked_tags_instructions: "Budete automaticky sledovať všetky témy s týmito štítkami. Počet nových príspevkov sa bude zobrazovať vedľa témy." + watched_tags_instructions: "Budete automaticky sledovať všetky témy s týmito štítkami. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený počet nových príspevkov." + tracked_tags: "Pozorované" + tracked_tags_instructions: "Budete automaticky pozorovať všetky témy s týmito štítkami. Počet nových príspevkov sa bude zobrazovať vedľa témy." muted_tags: "Stíšené" muted_tags_instructions: "Nebudete informovaný o nových témach s týmito štítkami a nezobrazia sa ani medzi najnovšími." - watched_categories: "Pozorované" - watched_categories_instructions: "Budete automaticky pozerať všetky témy v týchto kategóriách. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený počet nových príspevkov." - tracked_categories: "Sledované" - tracked_categories_instructions: "Budete automaticky sledovať všetky témy v tejto kategórii. Počet nových príspevkov sa bude zobrazovať vedľa témy." - watched_first_post_categories: "Pozorovať prvý príspevok" + watched_categories: "Sledované" + watched_categories_instructions: "Budete automaticky sledovať všetky témy v týchto kategóriách. Budete upozornený na všetky nové príspevky a témy, a zároveň bude vedľa témy zobrazený počet nových príspevkov." + tracked_categories: "Pozorované" + tracked_categories_instructions: "Budete automaticky pozorovať všetky témy v tejto kategórii. Počet nových príspevkov sa bude zobrazovať vedľa témy." + watched_first_post_categories: "Sledovaný prvý príspevok" watched_first_post_categories_instructions: "Budete upozornený na prvý príspevok v každej novej téme v týchto kategóriách." - watched_first_post_tags: "Pozorovať prvý príspevok" + watched_first_post_tags: "Sledovaný prvý príspevok" watched_first_post_tags_instructions: "Budete upozornený na prvý príspevok v každej novej téme s týmito štítkami." muted_categories: "Ignorované" muted_categories_instructions: "Nebudete informovaný o udalostiach v nových témach týchto kategórií. Tieto témy sa zároveň nebudú zobrazovať v zozname posledných udalostí." @@ -555,7 +555,7 @@ sk: muted_users: "Ignorovaní" muted_users_instructions: "Pozastaviť všetky notifikácie od týchto používateľov." muted_topics_link: "Zobraziť stíšené témy" - watched_topics_link: "Zobraziť pozorované témy" + watched_topics_link: "Zobraziť sledované témy" apps: "Appky" revoke_access: "Odvolať prístup" undo_revoke_access: "Zrušiť odvolanie prístupu" @@ -565,7 +565,7 @@ sk: flagged_posts: "označkované príspevky" deleted_posts: "vymazané príspevky" suspensions: "pozastavenia" - warnings_received: "upozornenia" + warnings_received: "varovania" messages: all: "Všetky" inbox: "Prijatá pošta" @@ -689,7 +689,7 @@ sk: after_2_days: "vytvorené posledné 2 dni" after_1_week: "vytvorené za posledný týždeň" after_2_weeks: "vytvorené za posledné 2 týždne" - auto_track_topics: "Automaticky sleduj témy, do ktorých vstúpim" + auto_track_topics: "Automaticky pozoruj témy, do ktorých vstúpim" auto_track_options: never: "nikdy" immediately: "ihneď" @@ -912,7 +912,6 @@ sk: logging_in: "Prebieha prihlásenie..." or: "Alebo" authenticating: "Prebieha overovanie..." - awaiting_confirmation: "Váš účet čaká na aktiváciu. Ak chcete zaslať aktivačný e-mail znova, použite odkaz pre zabudnuté heslo." awaiting_approval: "Váš účet zatiaľ nebol schválený členom tímu. Keď bude schválený, dostanete e-mail." requires_invite: "Ľutujeme, ale prístup k tomuto fóru majú iba pozvaní používatelia." not_activated: "Systém vás nemôže prihlásiť. Na emailovú adresu {{sentTo}} sme vám poslali aktivačný email. Prosím, postupujte podľa inštrukcií na aktiváciu účtu, ktoré sú uvedené v tomto emaile." @@ -1072,7 +1071,7 @@ sk: other: "

{{count}} správ vo vašej {{group_name}} schránke

" alt: mentioned: "Zmienený od" - quoted: "Citovaný od" + quoted: "Citovaný používateľom" replied: "Odpovedané" posted: "Príspevok od" edited: "Upravte Váš príspevok do" @@ -1142,6 +1141,8 @@ sk: label: Hľadaj iba v témach/prispevkoch, ktoré... likes: sa mi páčia posted: obsahujú môj príspevok + watching: Sledujem + tracking: Pozorujem private: sú v mojich správach seen: som čítal unseen: som nečítal @@ -1167,8 +1168,8 @@ sk: dismiss: "Zahodiť" dismiss_read: "Zahodiť všetký neprečítané" dismiss_button: "Zahadzujem....." - dismiss_tooltip: "Zahoď nové príspevky, alebo prestaň sledovať témy" - also_dismiss_topics: "Prestať sledovať tieto témy. Už sa nikdy nebudu ukazovať medzi neprečítanými" + dismiss_tooltip: "Zahoď iba nové príspevky, alebo prestaň pozorovať témy" + also_dismiss_topics: "Prestať pozorovať tieto témy. Už sa nikdy nebudú ukazovať medzi neprečítanými" dismiss_new: "Zahodiť. Nová" toggle: "prepnuť hromadne vybrané témy" actions: "Hromadné akcie" @@ -1181,7 +1182,6 @@ sk: one: "Označíli ste 1 tému." few: "Označíli ste {{count}} tém.y" other: "Označíli ste {{count}} tém." - change_tags: "Zmeniť štítky" choose_new_tags: "Vyberte pre tému nové štítky:" changed_tags: "Štítky tém boli zmenené." none: @@ -1197,7 +1197,7 @@ sk: search: "Nenašli sa žiadne výsledky" educate: new: '

Tu sa zobrazia Vaše nové témy.

V predvolenom nastavení sú témy považované za nové a zobrazí indikátor nové ak boli vytvorené za posledné 2 dni.

Môžete to zmeniť vo Vašich nastaveniach.

' - unread: '

Tu sa zobrazia Vaše neprečítané témy.

V predvolenom nastavení sú témy považované za neprečítané a zobrazí sa počet neprečítaných 1 ak ste:

  • Vytvorili tému
  • Odpovedali na tému
  • Čítali tému viac ako 4 minúty

Alebo ste explicitne nastavili sledovanie alebo pozeranie témy prostredníctvom ovládania upozornení na konci každej témy.

Môžte to zmeniť vo Vašich nastaveniach.

' + unread: '

Tu sa zobrazia Vaše neprečítané témy.

V predvolenom nastavení sú témy považované za neprečítané a zobrazí sa počet neprečítaných 1 ak ste:

  • Vytvorili tému
  • Odpovedali na tému
  • Čítali tému viac ako 4 minúty

Alebo ste explicitne nastavili pozorovanie alebo sledovanie témy prostredníctvom ovládania upozornení na konci každej témy.

Môžte to zmeniť vo Vašich nastaveniach.

' bottom: latest: "Nie je už viac najnovšich tém." hot: "Nie je už viac horúcich tém" @@ -1300,15 +1300,15 @@ sk: notifications: title: zmeň ako často dostávaš upozornenia o tejto téme reasons: - '3_10': 'Budete dostávať upozornenia, pretože pozeráte štítok na tejto téme.' - '3_6': 'Budete dostávať upozornenia, pretože pozeráte túto kategóriu.' - '3_5': 'Budete automaticky dostávať upozornenie pretože ste začali pozerať túto tému.' - '3_2': 'Budete dostávať upozornenia, pretože pozeráte túto tému.' + '3_10': 'Budete dostávať upozornenia, pretože sledujete štítok na tejto téme.' + '3_6': 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.' + '3_5': 'Budete automaticky dostávať upozornenie pretože ste začali sledovať túto tému.' + '3_2': 'Budete dostávať upozornenia, pretože sledujete túto tému.' '3_1': 'Budete dostávať upozornenia, pretože ste vytvorili túto tému.' - '3': 'Budete dostávať upozornenia, pretože pozeráte túto tému.' - '2_8': 'Budete dostávať upozornenia, pretože sledujete túto kategóriu.' + '3': 'Budete dostávať upozornenia, pretože sledujete túto tému.' + '2_8': 'Budete dostávať upozornenia, pretože pozorujete túto kategóriu.' '2_4': 'Budete dostávať upozornenia, pretože ste zaslali odpoveď na túto tému.' - '2_2': 'Budete dostávať upozornenia, pretože sledujete túto tému.' + '2_2': 'Budete dostávať upozornenia, pretože pozorujete túto tému.' '2': 'Budete dostávať upozornenia, pretože ste čítali túto tému.' '1_2': 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.' '1': 'Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie.' @@ -1316,22 +1316,22 @@ sk: '0_2': 'Ignorujete všetky upozornenia k tejto téme.' '0': 'Ignorujete všetky upozornenia k tejto téme.' watching_pm: - title: "Pozorovať" + title: "Sledovať" description: "Budete upozornený na každú novú odpoveď na túto správu a zobrazí sa počet nových odpovedí." watching: - title: "Pozorovať" + title: "Sledovať" description: "Budete upozornený na každú novu odpoveď na túto tému a zobrazí sa počet nových odpovedí." tracking_pm: - title: "Sledovať" + title: "Pozorovať" description: "Zobrazí počet nových odpovedí na túto správu. Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." tracking: - title: "Sledovať" + title: "Pozorovať" description: "Zobrazí počet nových odpovedí na túto tému. Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." regular: - title: "Bežný" + title: "Bežné" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." regular_pm: - title: "Bežný" + title: "Bežné" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." muted_pm: title: "Stíšené" @@ -1487,6 +1487,7 @@ sk: post: reply: " {{replyAvatar}} {{usernameLink}}" reply_topic: " {{link}}" + quote_reply: "Citácia" edit: "Upravujete {{link}} {{replyAvatar}} {{username}}" edit_reason: "Dôvod:" post_number: "príspevok {{number}}" @@ -1740,15 +1741,15 @@ sk: parent: "Nadradená kategória" notifications: watching: - title: "Pozorovať" - description: "Budete automaticky pozerať všetky témy v týchto kategóriách. Budete upozornený na každý nový príspevok v každej téme. Zároveň bude zobrazený počet nových odpovedí." - watching_first_post: - title: "Pozerať prvý príspevok" - tracking: title: "Sledovať" - description: "Budete automaticky sledovať všetky témy v týchto kategóriách. Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie. Zároveň bude zobrazený počet nových odpovedí." + description: "Budete automaticky sledovať všetky témy v týchto kategóriách. Budete upozornený na každý nový príspevok v každej téme. Zároveň bude zobrazený počet nových odpovedí." + watching_first_post: + title: "Sledovať prvý príspevok" + tracking: + title: "Pozorovať" + description: "Budete automaticky pozorovať všetky témy v týchto kategóriách. Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie. Zároveň bude zobrazený počet nových odpovedí." regular: - title: "Bežný" + title: "Bežné" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo Vám odpovie." muted: title: "Stíšené" @@ -1853,7 +1854,6 @@ sk: history: "História" changed_by: "od {{author}}" raw_email: - title: "Neupravený email" not_available: "Nedostupné!" categories_list: "Zoznam kategórií" filters: @@ -1885,7 +1885,7 @@ sk: one: "Neprečítaná (1)" few: "Neprečítané ({{count}})" other: "Neprečítaných ({{count}})" - help: "témy ktorých neprečítané príspevky v súčastnosti pozeráte alebo sledujete " + help: "témy ktorých neprečítané príspevky v súčastnosti sledujete alebo pozorujete " lower_title_with_count: one: "1 neprečítaná" few: "{{count}} neprečítané" @@ -1993,8 +1993,8 @@ sk: delete: 'd Zmazať príspevok' mark_muted: 'm, m Umlčať tému' mark_regular: 'm, r Obyčajná (preddefinovaná) téma' - mark_tracking: 'm, t Sledovať tému' - mark_watching: 'm, w Pozerať tému' + mark_tracking: 'm, t Pozorovať tému' + mark_watching: 'm, w Pozorovať tému' badges: earned_n_times: one: "Získal tento odkaz 1-krát" @@ -2038,14 +2038,14 @@ sk: manage_groups_description: "Zadefinujte skupiny pre usporiadanie štítkov" notifications: watching: - title: "Pozorovať" - description: "Budete automaticky pozerať všetky témy s týmto štítkom. Budete upozornený na všetky nové príspevky a témy, navyše počet neprečítaných a nových príspevok bude zobrazený pri téme." + title: "Sledovať" + description: "Budete automaticky sledovať všetky témy s týmto štítkom. Budete upozornený na všetky nové príspevky a témy, navyše počet neprečítaných a nových príspevok bude zobrazený pri téme." watching_first_post: - title: "Pozorovať prvý príspevok" + title: "Sledovať prvý príspevok" description: "Budete upozornený iba na prvý príspevok v každej téme s týmto štítkom." tracking: - title: "Sledovať" - description: "Budete automaticky sledovať všetky témy s týmto štítkom. Počet neprečítaných a nových príspevkov sa bude zobrazovať vedľa témy." + title: "Pozorovať" + description: "Budete automaticky pozorovať všetky témy s týmto štítkom. Počet neprečítaných a nových príspevkov sa bude zobrazovať vedľa témy." regular: title: "Bežné" description: "Budete upozornený ak niekto zmieni Vaše @meno alebo odpovie na Váš príspevok." @@ -2304,7 +2304,6 @@ sk: without_uploads: "Áno (nezahŕňať súbory)" download: label: "Stiahnuť" - title: "Stiahnuť zálohu" destroy: title: "Odstrániť zálohu" confirm: "Ste si istý, že chcete odstrániť túto zálohu?" @@ -2877,7 +2876,7 @@ sk: sql_error_header: "Nastala chyba s požiadavkou." error_help: "Pozrite si nasledujäce odkazy pre pomoc s dopytovacími odznakmi." bad_count_warning: - header: "UPOZORNENIE!" + header: "VAROVANIE!" text: "Chýbajú ukážky práv. Toto sa stane, ak dotaz na odznak vráti ID používateľa alebo príspevku, ktorý neexistuje. Toto môže zapríčiniť neskoršie neočakávané výsledky - prosíme znovu overte Váš dotaz." no_grant_count: "Žiadne odznaky na pridelenie." grant_count: diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 04af490fe7..93334e85a9 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -865,7 +865,6 @@ sq: logging_in: "Duke u identifikuar..." or: "Ose" authenticating: "Duke u autorizuar..." - awaiting_confirmation: "Llogaria juaj është në pritje të aktivizimit, përdorni butonin e fjalëkalimit të humbur që të merrni një email të ri me kodin e aktivizimit." awaiting_approval: "Llogaria juaj nuk është aprovuar ende nga një admin. Do t'ju dërgojmë një email kur të aprovohet. " requires_invite: "Na vjen keq, ky forum është vetëm për anëtarë të ftuar. " not_activated: "Nuk mund të identifikoheni akoma. Ju kemi dërguar një email aktivizimi tek {{sentTo}}. Ndiqni udhëzimet në atë email për të aktivizuar llogarinë tuaj. " @@ -1116,7 +1115,6 @@ sq: selected: one: "Keni zgjedhur 1 temë." other: "Keni zgjedhur {{count}} tema." - change_tags: "Ndrysho etiketat" choose_new_tags: "Zgjidh etiketa të reja për këto tema:" changed_tags: "Etiketat e temave u ndryshuan. " none: @@ -1731,8 +1729,6 @@ sq: category_title: "Kategoria" history: "Historia" changed_by: "nga {{author}}" - raw_email: - title: "Raw Email" categories_list: "Lista Kategorive" filters: with_topics: "Temat nga %{filter}" @@ -2165,7 +2161,6 @@ sq: confirm: "Do you want to start a new backup?" download: label: "Shkarko" - title: "Shkarko kopjen" restore: label: "Rikthe" rollback: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index b4e93048cc..940f2496f8 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -136,7 +136,6 @@ sv: enabled: 'listades %{when}' disabled: 'avlistades %{when}' topic_admin_menu: "administratörsåtgärder för ämne" - wizard_required: "Det är dags att konfigurera ditt forum! Starta installationsguiden!" emails_are_disabled: "All utgående e-post har blivit globalt inaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut." bootstrap_mode_enabled: "Du är i bootstrap-läge för att göra lanseringen av din nya webbplats enklare. Alla nya användare kommer att beviljas förtroendenivå 1 och få dagliga sammanfattningar skickade via e-post. Det här stängs automatiskt av när det totala antalet användare överstiger %{min_users}." bootstrap_mode_disabled: "Bootstrap-läge otillgängliggörs i 24 timmar." @@ -639,6 +638,7 @@ sv: short_instructions: "Folk kan nämna dig som @{{username}}" available: "Ditt användarnamn är tillgängligt" not_available: "Inte tillgängligt. Prova {{suggestion}}?" + not_available_no_suggestion: "Inte tillgänglig" too_short: "Ditt användarnamn är för kort" too_long: "Ditt användarnamn är för långt" checking: "Kollar användarnamnets tillgänglighet..." @@ -918,7 +918,6 @@ sv: logging_in: "Loggar in..." or: "Eller" authenticating: "Autentiserar..." - awaiting_confirmation: "Ditt konto väntar på aktivering, använd glömt lösenordslänken för att skicka ett nytt aktiveringsbrev." awaiting_approval: "Ditt konto har inte godkänts av en moderator än. Du kommer att få ett e-postmeddelande när det är godkänt." requires_invite: "Tyvärr, inbjudan krävs för tillgång till detta forum." not_activated: "Du kan inte logga in än. Vi har tidigare skickat ett aktiveringsbrev till dig via {{sentTo}}. Var god följ instruktionerna i det e-postmeddelandet för att aktivera ditt konto." @@ -951,6 +950,9 @@ sv: github: title: "med GitHub" message: "Autentiserar med GitHub (kolla så att pop up-blockare inte är aktiverade)" + invites: + accept_title: "Inbjudan" + welcome_to: "Välkommen till %{site_name}!" emoji_set: apple_international: "Apple/International" google: "Google" @@ -1214,7 +1216,6 @@ sv: selected: one: "Du har markerat 1 ämne." other: "Du har markerat {{count}} ämnen." - change_tags: "Ändra taggar" choose_new_tags: "Välj nya taggar för de här ämnena:" changed_tags: "Taggarna för de här ämnena ändrades." none: @@ -1706,6 +1707,12 @@ sv: side_by_side_markdown: title: "Visa skillnader i rådatan sida vid sida" button: 'Rå' + raw_email: + displays: + text_part: + button: 'Text' + html_part: + button: 'HTML' category: can: 'can… ' none: '(ingen kategori)' @@ -1758,7 +1765,6 @@ sv: email_in_disabled_click: 'aktivera "inkommande e-post" inställningen.' suppress_from_homepage: "Undanta den här kategorin från hemsidan." all_topics_wiki: "Gör nya inlägg till wikis som standard" - sort_order: "Standard slag:" allow_badges_label: "Tillåt utmärkelser i den här kategorin" edit_permissions: "Redigera behörigheter" add_permission: "Lägg till behörighet" @@ -1894,7 +1900,6 @@ sv: history: "Historik" changed_by: "av {{author}}" raw_email: - title: "Rå e-post" not_available: "Ej tillgänglig!" categories_list: "Kategorilista" filters: @@ -2426,7 +2431,6 @@ sv: without_uploads: "Ja (inkludera inte filer)" download: label: "Ladda ner" - title: "Ladda ned säkerhetskopian" destroy: title: "Ta bort säkerhetskopian" confirm: "Är du säker på att du vill förstöra denna säkerhetskopia?" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index aaa765e9a8..cdf8337f99 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -505,7 +505,6 @@ te: logging_in: "ప్రవేశపెడ్తోన్నాం" or: "లేదా" authenticating: "ద్రువీకరిస్తున్నాము..." - awaiting_confirmation: "మీ ఖాతా చేతనం కోసం ఎదురుచూస్తుంది. సంకేతపదం మర్చిపోయా లంకెను వాడు మరో చేతన ఈమెయిల్ పొందండి." awaiting_approval: "మీ ఖాతా ఇంకా సిబ్బంది ఒప్పుకొనలేదు. సిబ్బంది ఒప్పుకోగానే మీకు ఒక ఈమెయిల్ వస్తుంది." requires_invite: "క్షమించాలి. ఈ పోరమ్ ప్రవేశం కేవలం ఆహ్వానితులకు మాత్రమే." not_activated: "మీరప్పుడే లాగిన్ అవ్వలేరు. గతంలో మేము మీకు చేతన ఈమెయల్ {{sentTo}} కు పంపాము. దయచేసి ఆ వేగులోని సూచనలు పాటించి మీ ఖాతాను చేతనం చేసుకోండి." @@ -1072,7 +1071,6 @@ te: history: "చరిత్ర" changed_by: " {{author}} రాసిన" raw_email: - title: "ముడి ఈమెయిల్" not_available: "అందుబాటులో లేదు!" categories_list: "వర్గాల జాబితా" filters: @@ -1285,8 +1283,6 @@ te: title: "బ్యాకప్ సృష్టించు" confirm: "మీరు కొత్త బ్యాకప్ మొదలుపెట్టాలనుకుంటున్నారా?" without_uploads: "అవులు (దస్త్రాలు కాకుండా)" - download: - title: "బ్యాకప్ దిగుమతించు" destroy: title: "బ్యాకప్ తొలగించు" confirm: "మీరు నిజంగానే బ్యాకప్ ను నాశనం చేయాలనుకుంటున్నారా?" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 3a3f4347b7..839adf7032 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -118,7 +118,6 @@ tr_TR: enabled: '%{when} listelendi' disabled: '%{when} listelenmedi' topic_admin_menu: "konuyla alakalı yönetici eylemleri" - wizard_required: "Forumunuzu yapılandırma zamanı geldi! Kur Sihirbazını çalıştırın!" emails_are_disabled: "Tüm giden e-postalar yönetici tarafından genel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek." bootstrap_mode_enabled: "Yeni sitenizi kolayca çalıştırmak için bootstrap modundasınız. Tüm yeni kullanıcılar güven seviyesi 1den başlar ve e-posta uyarıcıları açıksa günlük mail alırlar. Bu özellik kullanıcı sayısı %{min_users} rakamına ulaştığında otomatik kapatılacaktır." bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır." @@ -888,7 +887,6 @@ tr_TR: logging_in: "Oturum açılıyor..." or: "ya da" authenticating: "Kimliğiniz doğrulanıyor..." - awaiting_confirmation: "Hesabınız etkinleştirilmemiş. Yeni bir etkinleştirme e-postası almak için parolamı unuttum bağlantısını kullanabilirsiniz. " awaiting_approval: "Hesabınız henüz bir görevli tarafından onaylanmadı. Onaylandığında e-posta ile haberdar edileceksiniz." requires_invite: "Üzgünüz, bu foruma sadece davetliler erişebilir." not_activated: "Henüz oturum açamazsınız. Hesabınızı etkinleştirmek için lütfen daha önceden {{sentTo}} adresine yollanan etkinleştirme e-postasındaki açıklamaları okuyun." @@ -1186,7 +1184,6 @@ tr_TR: choose_new_category: "Konular için yeni bir kategori seçin:" selected: other: "{{count}} konu seçtiniz." - change_tags: "Etiketleri Değiştir" choose_new_tags: "Konular için yeni etiketler seçin:" changed_tags: "Bu konuların etiketleri değiştirildi." none: @@ -1690,7 +1687,6 @@ tr_TR: email_in_disabled_click: '"e-postala" ayarını etkinleştir' suppress_from_homepage: "Bu kategoriyi ana sayfadan gizle" all_topics_wiki: "Yeni konuyu varsayılan olarak wiki yap" - sort_order: "Öntanımlı Sıralama:" allow_badges_label: "Bu kategoride rozet verilmesine izin ver" edit_permissions: "İzinleri Düzenle" add_permission: "İzin Ekle" @@ -1820,7 +1816,6 @@ tr_TR: history: "Geçmiş" changed_by: "Yazan {{author}}" raw_email: - title: "Ham e-posta" not_available: "Müsait değil!" categories_list: "Kategori Listesi" filters: @@ -2341,7 +2336,6 @@ tr_TR: without_uploads: "Evet (dosya eklemeyin)" download: label: "İndir" - title: "Yedeği indir" destroy: title: "Yedeği kaldır" confirm: "Bu yedeği yok etmek istediğinize emin misiniz?" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 2f4ba0ff21..309747afcf 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -594,7 +594,6 @@ uk: logging_in: "Вхід..." or: "Або" authenticating: "Автентифікуємося..." - awaiting_confirmation: "Ваш обліковий запис очікує на активацію. Для отримання ще одного активаційного листа використайте посилання Забув пароль." awaiting_approval: "Ваш обліковий запис ще не затверджено членом команди. Коли його буде активовано, Ви отримаєте електронного листа." requires_invite: "Даруйте, доступ до цього форуму - лише за запрошеннями." not_activated: "Ви ще не можете увійти. Ми вже надіслали Вам листа для активації на скриньку {{sentTo}}. Будь ласка, виконайте інструкції в цьому листі, щоб активувати обліковий запис." @@ -1001,7 +1000,6 @@ uk: auto_close_label: "Автоматично закривати теми після:" auto_close_units: "годин" email_in: "Custom incoming email address:" - sort_order: "Типове сортування:" allow_badges_label: "Дозволити нагороджувати значками у цій категорії" edit_permissions: "Редагувати дозволи" add_permission: "Додати дозвіл" @@ -1310,7 +1308,6 @@ uk: without_uploads: "Так (не включати файли)" download: label: "Завантажити" - title: "Download the backup" destroy: title: "Remove the backup" confirm: "Are you sure you want to destroy this backup?" diff --git a/config/locales/client.ur.yml b/config/locales/client.ur.yml index 5c40a1f990..732859f96e 100644 --- a/config/locales/client.ur.yml +++ b/config/locales/client.ur.yml @@ -24,6 +24,12 @@ ur: tb: ٹی بی dates: time: "h:mm a" + timeline_date: "MMM YYYY" + long_no_year: "MMM D h:mm a" + long_no_year_no_time: "MMM D" + full_no_year_no_time: "MMMM Do" + long_with_year: "MMM D, YYYY h:mm a" + long_with_year_no_time: "MMM D, YYYY" wrap_ago: "٪{تاریخ} پہلے" tiny: less_than_x_seconds: @@ -116,10 +122,13 @@ ur: visible: enabled: 'مندرج ٪{کب}' disabled: 'غیر مندرج ٪{کب}' + banner: + enabled: 'اِس کو بینر بنا لیا ٪{when}۔ یہ ہر صفحے کے سب سے اوپر دکھایا جائے گا جب تک صارف اِسے برخاست نہیں کر دیتا۔' + disabled: 'اِس بینر کو ہٹا دیا ٪{when}۔ یہ اب ہر صفحے کے سب سے اوپر دکھایا نہیں جائے گا۔' topic_admin_menu: "ٹاپک کے ایڈمن کی کارروائیاں" wizard_required: "اپنے نئے ڈِسکورس پر خوش آمدید! سیٹ اَپ وزرڈ سے آغاز کرتے ہیں۔✨" emails_are_disabled: "تمام سبکدوش ہونے والے ای میل کو عالمی سطح پر ایک منتظم کی طرف سے غیر فعال کر دیا گیا ہے. کسی بھی قسم کی ای میل اطلاعات نہیں بھیجی جائیں گی۔" - bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بوٹسٹریپ کے موڈ میں ہیں۔ تمام نئے صارفین کے اعتماد کی سطح 1 دی گئی ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب کل صارف شمار %{min_users} سے تجاوز کر جائے گا۔" + bootstrap_mode_enabled: "آپ کی نئی ویب سائٹ شروع کرنے کو آسان بنانے کے لئے، آپ بوٹسٹریپ کے موڈ میں ہیں۔ تمام نئے صارفین کے ٹرسٹ لَیول 1 دیا گیا ہے اور روزانہ کی ای میل اپ ڈیٹس فعال کیے جا چکے ہیں۔ یہ خود کار طریقے سے غیر فعال کر دیا جائے گا جب کل صارف شمار %{min_users} سے تجاوز کر جائے گا۔" bootstrap_mode_disabled: "بوٹسٹریپ کا موڈ اگلے 24 گھنٹوں میں غیر فعال کر دیا جائے گا۔" s3: regions: @@ -233,6 +242,8 @@ ur: uploaded: "اَپ لوڈ کیا جا چکا ہے!" enable: "فعال کریں" disable: "غیر فعال کریں" + undo: "کالعدم کریں" + revert: "رِیوَرٹ" failed: "عمل ناکام رہا" switch_to_anon: "گمنام موڈ میں داخل ہوں" switch_from_anon: "گمنام موڈ سے باہر نکلیں" @@ -253,7 +264,7 @@ ur: none: "جائزہ لینے کے لئے کوئی پوسٹس نہیں ہیں۔" edit: "ترمیم کریں" cancel: "منسوخ" - view_pending: "زیر التوا پوسٹس دیکھیں" + view_pending: "زیرِاِلتوَاء پوسٹس دیکھیں" has_pending_posts: one: "اِس ٹاپک کی 1 پوسٹس منظوری کا انتظار کر رہی ہیں" other: "اِس ٹاپک کی {{count}} پوسٹس منظوری کا انتظار کر رہی ہیں" @@ -264,8 +275,22 @@ ur: description: "ہمیں آپ کی نئی پوسٹ موصول ہو چکی ہے لیکن یہ ظاہر ہونے سے پہلے ایک منتظم سے منظور ہونا ضروری ہے۔ براہ مہربانی صبر کریں۔" pending_posts: one: "آپ کی 1 پوسٹ زیر التوا ہیں۔" - other: "آپ کی {{شمار}} پوسٹس زیر التوا ہیں۔" + other: "آپ کی {{شمار}} پوسٹس زیرِاِلتوَاء ہیں۔" ok: "ٹھیک" + user_action: + user_posted_topic: "{{صارف}} نے ٹاپک پوسٹ کیا" + you_posted_topic: "آپ نے ٹاپک پوسٹ کیا" + user_replied_to_post: "{{صارف}} نے {{post_number}} کا جواب دیا" + you_replied_to_post: "آپ نے {{post_number}} کا جواب دیا" + user_replied_to_topic: "{{صارف}} نے ٹاپک کا جواب دیا" + you_replied_to_topic: "آپ نے ٹاپک کا جواب دیا" + user_mentioned_user: "{{صارف}} نے {{another_user}} کا ذکر کیا" + user_mentioned_you: "{{صارف}} نے آپ کا ذکر کیا" + you_mentioned_user: "آپ نے {{another_user}} کا ذکر کیا" + posted_by_user: "{{صارف}} نے پوسٹ کیا" + posted_by_you: "آپ نے پوسٹ کیا" + sent_by_user: "{{صارف}} نے بھیجا" + sent_by_you: "آپ نے بھیجا" directory: filter_name: "صارفین کے ناموں کے حساب سے فلٹر کریں" title: "صارفین" @@ -282,20 +307,20 @@ ur: days_visited: "زائرین کی تعداد" days_visited_long: "زیارت کے دن" posts_read: "پڑھ لیا گیا" - posts_read_long: "پوسٹ جو پڑھ لی گئیں" + posts_read_long: "پڑھی گئیں پوسٹس" total_rows: one: "1 صارف" other: "%{شمار} صارفین" group_histories: actions: - change_group_setting: "گروپ کی سیٹنگ تبدیل کریں" + change_group_setting: "گروپ کی سیٹِنگ تبدیل کریں" add_user_to_group: "صارف شامل کریں" remove_user_from_group: "صارف خارج کریں" make_user_group_owner: "مالک بنائیں" remove_user_as_group_owner: "مالک منسوخ کریں" groups: logs: - title: "نوشتہ جات" + title: "لاگز" when: "کب" action: "عمل" acting_user: "عمل کرنے والا صارف" @@ -320,7 +345,7 @@ ur: mentions: "اس گروپ کے کوئی تذکرے موجود نہیں ہیں۔" messages: "اس گروپ کے لئے فی الحال کوئی پیغامات نہیں ہیں۔" topics: "اِس گروپ کے ارکان کی طرف سے کوئی ٹاپک نہیں ہیں۔" - logs: "اس گروپ کے لئے کوئی نوشتہ جات موجود نہیں ہیں۔" + logs: "اس گروپ کے لئے کوئی لاگز موجود نہیں ہیں۔" add: "شامل کریں" join: "گروپ میں شامل ہوں" leave: "گروپ چھوڑ دیں" @@ -356,7 +381,7 @@ ur: members_mods_and_admins: "صرف گروپ کے اراکین، ثالث اور منتظمین" everyone: "ہر کوئی" trust_levels: - title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لیول:" + title: "ممبران کو شامل کرتے وقت خود کار طریقے سے دیا جانے والا ٹرسٹ لَیول:" none: "کوئی نہیں" notifications: watching: @@ -366,6 +391,7 @@ ur: title: "پہلی پوسٹ پر نظر رکھی ہوئی ہے" description: "آپ کو اِس گروپ کے ہر نئے ٹاپک میں صرف پہلی پوسٹ کے بارے میں مطلع کیا جائے گا۔" tracking: + title: "ٹریک کیا جا رہا" description: "اگر کوئی آپ کا @نام زکر کرتا ہے یا کوئی جواب دیتا ہے تو آپ کو مطلع کر دیا جائے گا، اور نئے جوابات کی گنتی دیکھائی جائے گی۔" regular: title: "عمومی" @@ -394,7 +420,7 @@ ur: '11': "ترامیم" '12': "بھیجی گئی اشیاء" '13': "اِن باکس" - '14': "زیرِاِلتوَا" + '14': "زیرِاِلتوَاء" categories: all: "تمام زُمرَہ جات" all_subcategories: "تمام" @@ -412,6 +438,7 @@ ur: posts: "پوسٹ" topics: "ٹاپک" latest: "تازہ ترین" + latest_by: "تک تازہ ترین" toggle_ordering: "ترتیب کاری کا کنٹرول ٹاگل کریں" subcategories: "ذیلی زمرے" topic_sentence: @@ -430,7 +457,8 @@ ur: other_accounts: "اسی IP ایڈریس والے دوسرے اکاؤنٹس:" delete_other_accounts: "%{شمار} حذف کریں" username: "صارف کا نام" - read_time: " پڑھنے کیلیئے درکار وقت" + trust_level: "TL" + read_time: "پڑھنے کیلئے اِستعمال ہونے والا وقت" topics_entered: " داخل ہوئے ٹاپک" post_count: "# پوسٹ" confirm_delete_other_accounts: "کیا آپ واقعی یہ اکاؤنٹس حذف کرنا چاہتے ہیں؟" @@ -455,7 +483,7 @@ ur: bookmarks: "بُکمارکس" bio: "سائٹ کے بارے میں" invited_by: "کی طرف سے مدعو کیا گیا:" - trust_level: "ٹرسٹ کا درجہ" + trust_level: "ٹرسٹ لَیول" notifications: "اطلاعات" statistics: "اعدادوشمار" desktop_notifications: @@ -463,7 +491,7 @@ ur: not_supported: "نوٹیفیکیشن اس براؤزر کے لیئے غیر معاون ہیں۔ معذرت۔" perm_default: "اطلاعات چالو کریں" perm_denied_btn: "اِجازت نہیں دی گئی" - perm_denied_expl: "آپ نے اطلاعات کے لئے اجازت دینے سے انکار کر دیا۔ اپنے براؤزر کی ترتیبات سے اطلاعات کی اجازت دیں۔" + perm_denied_expl: "آپ نے اطلاعات کے لئے اجازت دینے سے انکار کر دیا۔ اپنے براؤزر کی سیٹِنگ سے اطلاعات کی اجازت دیں۔" disable: "اطلاعات غیر فعال کریں" enable: "اطلاعات فعال کریں" each_browser_note: "نوٹ: آپ کو ہر براؤزر پر اس سیٹنگ کو تبدیل کرنا ہوگا." @@ -473,7 +501,7 @@ ur: disable_jump_reply: "میرے جواب دینے کے بعد میری پوسٹ پر نہ جائیں" dynamic_favicon: "براؤزر آئکن پر نئے / اَپ ڈیٹ ہوئے ٹاپکس کی گنتی دکھائیں" external_links_in_new_tab: "تمام بیرونی ویب سائٹ کے لنکس ایک نئے ٹیب میں کھولیں" - enable_quoting: "روشنی ڈالے گئے متن کے لئے اقتباسی جواب فعال کریں" + enable_quoting: "روشنی ڈالے گئے ٹَیکسٹ کے لئے اقتباسی جواب فعال کریں" change: "بدلیں" moderator: "{{صارف}} ایک ماڈریٹر ہے" admin: "{{صارف}} ایک ایڈمِن ہے" @@ -487,6 +515,9 @@ ur: mailing_list_mode: label: "میلنگ لسٹ کے موڈ" enabled: "میلنگ لسٹ کے موڈ فعال کریں" + instructions: | + یہ سیٹِنگ سرگرمی کے خلاصے کی جگہ لے لیتی ہے۔
+ خاموش کردہ ٹاپک اور زمرہ جات اِن اِیمیلز میں شامل نہیں ہیں۔ daily: "روزانہ اپ ڈیٹس بھیجیں" individual: "ہر نئی پوسٹ پر ایک ای میل بھیجیں" individual_no_echo: "میری اپنی کے سوا، ہر نئی پوسٹ پر ایک ای میل بھیجیں" @@ -677,7 +708,7 @@ ur: title: "دعوتیں" user: "مدعو کیا گیا صارف" sent: "بھیج دیا گیا" - none: "ظاہر کرنے کے لئے کوئی زیر التواء دعوتیں نہیں ہیں۔" + none: "ظاہر کرنے کے لئے کوئی زیرِاِلتوَاء دعوتیں نہیں ہیں۔" truncated: one: "پہلی دعوت دکھائی جا رہی ہیں۔" other: "پہلی {{شمار}} دعوتیں دکھائی جا رہی ہیں۔" @@ -685,11 +716,11 @@ ur: redeemed_tab: "فائدہ اٹھا لیا گیا" redeemed_tab_with_count: "فائدہ اٹھا لیا گیا ({{شمار}})" redeemed_at: "فائدہ اٹھا لیا گیا" - pending: "زیرِالتواء دعوتیں" - pending_tab: "زیرِالتواء" - pending_tab_with_count: "زیرِالتواء ({{شمار}})" + pending: "زیرِاِلتوَاء دعوتیں" + pending_tab: "زیرِاِلتوَاء" + pending_tab_with_count: "زیرِاِلتوَاء ({{شمار}})" topics_entered: " دیکھ لیے گئے ٹاپک" - posts_read_count: " پڑھ لی گئیں پوسٹ" + posts_read_count: "پڑھی گئیں پوسٹس" expired: "اِس دعوت کی میعاد ختم ہو چکی ہے۔" rescind: "خارج کریں" rescinded: "دعوت خارج کر دی گئی" @@ -697,7 +728,7 @@ ur: reinvite_all: "تمام دعوتیں دوبارہ بھیجیں" reinvited: "دعوت دوبارہ بھیج دی گئی" reinvited_all: "تمام دعوتیں دوبارہ بھیج دی گئیں!" - time_read: "وقت جو پڑھنے کیلیئے صرف ہوا" + time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت" days_visited: "دورہ کیے گئے دن" account_age_days: "دنوں میں اکاؤنٹ کی عمر" create: "ایک دعوت بھیجیں" @@ -720,7 +751,7 @@ ur: summary: title: "خلاصہ" stats: "اعدادوشمار" - time_read: "وقت جو پڑھنے کیلیئے صرف ہوا" + time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت" topic_count: one: "بنایا گیا ٹاپک" other: "بنائے گئے ٹاپک" @@ -737,8 +768,8 @@ ur: one: "دن جس میں دورہ کیا گیا" other: "دن جن میں دورہ کیا گیا" posts_read: - one: "پوسٹ جو پڑھی گئی" - other: "پوسٹ جو پڑھی گئیں" + one: "پڑھی گئی پوسٹ" + other: "پڑھی گئیں پوسٹس" bookmark_count: one: "بُک مارک" other: "بُکمارکس" @@ -806,6 +837,8 @@ ur: too_few_topics_notice: "چلیں اِس بحث کو شروع کریں! اِس وقت اَبھی ٪{موجودہ ٹاپک}/٪{درکار ٹاپک} ٹاپک ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔" too_few_posts_notice: "چلیں اِس بحث کو شروع کریں! اِس وقت اَبھی ٪{موجودہ پوسٹ}/٪{درکار پوسٹ} پوسٹ ہیں۔ نئے زائرین کو پڑھنے اور اُن کا جواب دینے کیلئے کچھ مکالمات کی ضرورت ہے۔" logs_error_rate_notice: + reached: "٪{relativeAge} – ٪{rate} ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ تک پہنچ گئی۔" + exceeded: "٪{relativeAge} – ٪{rate} ٪{siteSettingRate} کی سائٹ سیٹِنگ لِمٹ سے تجاوز کر گئی۔" rate: one: "1 خرابی/٪{مدت}" other: "٪{شمار} خرابیاں/٪{مدت}" @@ -855,7 +888,7 @@ ur: last_seen: 'دیکھا گیا' created: 'بنایا گیا' created_lowercase: 'بنایا گیا' - trust_level: 'ٹرسٹ لیول' + trust_level: 'ٹرسٹ لَیول' search_hint: 'صارف نام، ای میل یا IP ایڈریس' create_account: disclaimer: "رجسٹر کرنے پر آپ <{{a href='{{privacy link>زاتی معلومات کی حفاظتی پالیسی اور سروس کی شرائط۔" @@ -864,12 +897,12 @@ ur: forgot_password: title: "پاسورڈ رِی سَیٹ" action: "میں اپنا پاسورڈ بھول گیا" - invite: "اپنا صارف نام یا اِی میل ایڈریس درج کریں، اور ہم آپ کو ایک پاسورڈ رِی سیٹ ای میل بھیج دیں گے۔" + invite: "اپنا صارف نام یا اِی میل ایڈریس درج کریں، اور ہم آپ کو ایک پاسورڈ رِی سَیٹ ایمیل بھیج دیں گے۔" reset: "پاسورڈ رِی سَیٹ کریں" - complete_username: "اگر کوئی اکاؤنٹ صارف نام ٪{صارف نام} سے ملتا ہو گا، تو آپ کو پاسورڈ ری سیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" - complete_email: "اگر کوئی اکاؤنٹ ٪{اِیمیل} سے ملتا ہو گا، تو آپ کو پاسورڈ ری سیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" - complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو صارف نام ٪{صارف نام} سے میچ کرتا ہے، آپ کو پاسورڈ ری سیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" - complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو ٪{اِیمیل} سے میچ کرتا ہے، آپ کو پاسورڈ ری سیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" + complete_username: "اگر کوئی اکاؤنٹ صارف نام ٪{صارف نام} سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" + complete_email: "اگر کوئی اکاؤنٹ ٪{اِیمیل} سے ملتا ہو گا، تو آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" + complete_username_found: "ہمیں ایک اکاؤنٹ ملا ہے جو صارف نام ٪{صارف نام} سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" + complete_email_found: "ہمیں ایک اکاؤنٹ ملا ہے جو ٪{اِیمیل} سے میچ کرتا ہے، آپ کو پاسورڈ رِی سَیٹ کرنے کے لئے ہدایات کی ایک اِی میل جلد ہی موصول ہو جائے گی۔" complete_username_not_found: "کوئی اکاؤنٹ صارف نام ٪{صارف نام} سے میچ نہیں کرتا" complete_email_not_found: "کوئی اکاؤنٹ ٪{اِیمیل} سے میچ نہیں کرتا" login: @@ -880,6 +913,7 @@ ur: caps_lock_warning: "کیپس لاک آن ہے" error: "نامعلوم خرابی" rate_limit: "دوبارہ لاگ اِن کرنے کی کوشش کرنے سے پہلے براہ کرم تھوڑا انتظار کریں۔" + blank_username_or_password: "براہ مہربانی اپنا اِیمیل یا صارف نام، اور پاسورڈ درج کریں۔" reset_password: 'پاسورڈ رِی سَیٹ کریں' logging_in: "لاگ اِن ہو رہا ہے..." or: "یا" @@ -921,6 +955,7 @@ ur: accept_title: "دعوت نامہ" welcome_to: "{SITE_NAME}٪ پر خوش آمدید!" invited_by: "آپ کو جن کی طرف سے مدعو کیا گیا تھا:" + social_login_available: "آپ اِس اِیمیل کا استعمال کرتے ہوئے کسی بھی سوشل لاگ اِن کے ساتھ سائن اِن بھی کرسکیں گے۔" your_email: "آپ کے اکاؤنٹ کا اِیمیل ایڈریس ٪{اِیمیل} ہے۔" accept_invite: "دعوت قبول کریں" success: "آپ کا اکاؤنٹ بنا دیا گیا ہے اور اب آپ لاگ اِن کر سکتے ہیں۔" @@ -939,7 +974,10 @@ ur: categories_and_latest_topics: "تازہ ترین ٹاپکس کے ساتھ زمرہ جات" shortcut_modifier_key: shift: 'شفٹ' + ctrl: 'Ctrl' + alt: 'Alt' composer: + emoji: "اِیمَوجی :)" more_emoji: "مزید..." options: "اختیارات" whisper: "سرگوشی" @@ -992,9 +1030,9 @@ ur: hide_preview: '« پیش نظارہ چھپائیں' quote_post_title: "پوری پوسٹ کا اقتباس کریں" bold_label: "B" - bold_text: "گہرا متن" + bold_text: "گہرا ٹَیکسٹ" italic_label: "I" - italic_text: "زور دیا گیا متن" + italic_text: "زور دیا گیا ٹَیکسٹ" link_title: "ہائپرلِنک" link_description: "یہاں لِنک کی تفصیل درج کریں" link_dialog_title: "ہائپرلِنک ڈالیں" @@ -1002,8 +1040,8 @@ ur: link_url_placeholder: "http://example.com" quote_title: "بلاک کوٹ" quote_text: "بلاک کوٹ" - code_title: "پہلے سے فارمیٹ کیا گیا متن" - code_text: "حاشیہ نے متن کو پہلے سے 4 خالی جگہوں سے فارمیٹ کر دیا" + code_title: "پہلے سے فارمیٹ کیا گیا ٹَیکسٹ" + code_text: "حاشیہ نے ٹَیکسٹ کو پہلے سے 4 خالی جگہوں سے فارمیٹ کر دیا" paste_code_text: "کوڈ یہاں ٹائپ یا پیسٹ کریں" upload_title: "اَپ لوڈ" upload_description: "یہاں اَپ لوڈ کی تفصیل درج کریں" @@ -1022,7 +1060,7 @@ ur: yourself_confirm: title: "کیا آپ وصول کنندگان کو شامل کرنا بھول گئے؟" body: "اِس وقت یہ پیغام صرف اپنے آپ کو بھیجا جا رہا ہے!" - admin_options_title: "اس ٹاپک کیلئے عملے کی اختیاری ترتیبات" + admin_options_title: "اس ٹاپک کیلئے عملے کی اختیاری سیٹِنگ" auto_close: label: "خود کار طریقے سے ٹاپک بند کرنے کا وقت:" error: "براہ کرم، ایک قابلِ قبول قدر درج کریں" @@ -1170,7 +1208,7 @@ ur: select_all: "تمام منتخب کریں" clear_all: "تمام کو صاف کریں" unlist_topics: "ٹاپکس کو فہرست سے ہٹائیں" - reset_read: "\"پڑھ لیا گیا\" کو رِیسیٹ کریں" + reset_read: "\"پڑھ لیا گیا\" کو رِی سَیٹ کریں" delete: "ٹاپکس حذف کریں" dismiss: "بر خاست کریں" dismiss_read: "تمام نہ پڑھے گئے کو بر خاست کریں" @@ -1280,7 +1318,7 @@ ur: deleted: "ٹاپک حذف کردیا گیا ہے" auto_close_notice: "یہ ٹاپک خود کار طریقے سے بند کر دیا جائے گا ٪{timeLeft}۔" auto_close_notice_based_on_last_post: "یہ ٹاپک آخری جواب کے ٪{مدت} بعد بند ہو جائے گا۔" - auto_close_title: 'خود کار طریقے سے بند کر نے کی ترتیبات' + auto_close_title: 'خود کار طریقے سے بند کر نے کی سیٹِنگ' auto_close_save: "محفوظ کریں" auto_close_remove: "اِس ٹاپک کو خود کار طریقے سے بند نہ کریں" auto_close_immediate: @@ -1357,7 +1395,7 @@ ur: archive: "ٹاپک آرکائیو کریں" invisible: "غیر مندرج بنائیں" visible: "مندرج بنائیں" - reset_read: "\"پڑھ لیا گیا\" کا ڈیٹا رِیسیٹ کریں" + reset_read: "\"پڑھ لیا گیا\" کا ڈیٹا رِی سَیٹ کریں" make_public: "ٹاپک پبلک بنائیں" make_private: "ذاتی پیغام بنائیں" feature: @@ -1701,7 +1739,7 @@ ur: edit_long: "ترمیم کریں" view: 'زمرہ میں ٹاپکس دیکھیے' general: 'عام' - settings: 'ترتیبات' + settings: 'سیٹِنگ' topic_template: "ٹاپک ٹَیمپلیٹ" tags: "ٹیگز" tags_allowed_tags: "ٹیگز جو صرف اِس زمرہ میں استعمال کیے جا سکتے ہیں:" @@ -1713,6 +1751,7 @@ ur: create: 'نیا زمرہ' create_long: 'نیا زمرہ بنائیں' save: 'زمرہ محفوظ کریں' + slug: 'زمرہ سلَگ' slug_placeholder: '(اختیاری) URL کے لئے ڈیش دار الفاظ' creation_error: زمرہ بنانے کے دوران ایک خرابی کا سامنا کرنا پڑا۔ save_error: زمرہ محفوظ کرنے میں ایک خرابی کا سامنا کرنا پڑا۔ @@ -1733,14 +1772,14 @@ ur: change_in_category_topic: "تفصیل ترمیم کریں" already_used: 'یہ رنگ دوسرے زمرہ کیلیے استعمال ہو چکا ہے۔' security: "سیکورٹی" - special_warning: "انتباہ: یہ زمرہ ایک پہلے سے بنایا ہوا زمرہ ہے اور اِس کی سیکورٹی ترتیبات میں ترمیم نہیں کی جا سکتی۔ اگر آپ اِس زمرہ کو استعمال کرنے کی خواہش نہیں رکھتے، تو اِسے کسی اور حوالے سے استعمال کرنے کی بجائے، حذف کردیں۔" + special_warning: "انتباہ: یہ زمرہ ایک پہلے سے بنایا ہوا زمرہ ہے اور اِس کی سیکورٹی سیٹِنگ میں ترمیم نہیں کی جا سکتی۔ اگر آپ اِس زمرہ کو استعمال کرنے کی خواہش نہیں رکھتے، تو اِسے کسی اور حوالے سے استعمال کرنے کی بجائے، حذف کردیں۔" images: "تصاویر" auto_close_label: "خود کار طریقے سے ٹاپک بند کردیں بعد ازاں:" auto_close_units: "گھنٹے" email_in: "اپنی مرضی کا اِنکَمِنگ اِیمیل ایڈریس:" email_in_allow_strangers: "اکاؤنٹس نہ رکھنے والے گمنام صارفین کی طرف سے اِیمیلز کو قبول کریں" - email_in_disabled: "ویب سائٹ کی ترتیبات میں اِیمیل کے ذریعے نئے ٹاپک پوسٹ کرنا غیر فعال کیا ہوا ہے۔ اِیمیل کے ذریعے نئے ٹاپک شائع کرنے کو چالو کرنے کے لئے،" - email_in_disabled_click: 'ترتیب میں "اِیمیل اِن" فعال کریں۔' + email_in_disabled: "ویب سائٹ کی سیٹِنگ میں اِیمیل کے ذریعے نئے ٹاپک پوسٹ کرنا غیر فعال کیا ہوا ہے۔ اِیمیل کے ذریعے نئے ٹاپک شائع کرنے کو چالو کرنے کے لئے،" + email_in_disabled_click: 'سیٹِنگ میں "اِیمیل اِن" فعال کریں۔' suppress_from_homepage: "ہَوم پیج سے اِس زمرہ کو دبائیں۔" show_subcategory_list: "اس زمرہ میں ذیلی زمرہ جات کی فہرست ٹاپکس سے مندرجہ بالا دکھائیں۔" num_featured_topics: "زمرہ کے صفحے پر دکھائے گئے ٹاپکس کی تعداد:" @@ -1749,6 +1788,7 @@ ur: subcategory_list_style: "ذیلی زمرہ جات فہرست کا سٹائل:" sort_order: "پہلے سے طے شدہ ترتیب:" default_view: "پہلے سے طے شدہ ویو:" + default_top_period: "پہلے سے طے شدہ ٹاپ کی مدت:" allow_badges_label: "اس زُمرہ میں بیجز دینے کی اجازت دیں" edit_permissions: "ترمیم کرنے کی اجازتیں" add_permission: "اجازت شامل کریں" @@ -1756,7 +1796,7 @@ ur: position: "پوزیشن" default_position: "پہلے سے طے شدہ پوزیشن" position_disabled: "ایکٹیوٹی کے ہساب سے زُمرہ جات کی ترتیب دکھائی جائے گی۔ فہرستوں میں زُمرہ جات کی ترتیب کو کنٹرول کرنے کے لئے،" - position_disabled_click: '"مقررہ زمرہ جات پوزیشنوں" کی ترتیب فعال کریں۔' + position_disabled_click: '"مقررہ زمرہ جات پوزیشنوں" کی سیٹِنگ فعال کریں۔' parent: "بالائی زمرہ" notifications: watching: @@ -1863,6 +1903,12 @@ ur: help: "یہ ٹاپک غیر کسی فہرست میں نہیں ہے؛ یہ ٹاپکس کی فہرست میں ظاہر نہیں ہو گا، اور صرف ایک براہ راست لنک کے ذریعے اِس تک رسائی ہو سکے گی" posts: "پوسٹس" posts_long: "اِس ٹاپک میں {{نمبر}} پوسٹس ہیں" + posts_likes_MF: | + یہاِس ٹاپک کی کیا ہے {شمار، جمع، ایک {1 جواب} دیگر {# جوابات}} {تناسب، منتخب، + کم {لائیک پر پوسٹ کے اونچے تناسب کے ساتھ} + درمیانہ {لائیک پر پوسٹ کے بہت اونچے تناسب کے ساتھ} + اعلی {لائیک پر پوسٹ کے انتہائی اونچے تناسب کے ساتھ} + دیگر {}} original_post: "اصل پوسٹ" views: "وِیوز" views_lowercase: @@ -1975,6 +2021,15 @@ ur: title: 'کی بورڈ شارٹ کٹس' jump_to: title: 'پر جائیں' + home: 'h، g ہَوم' + latest: 'l، g تازہ ترین' + new: 'n، g نیا' + unread: 'u، g بغیر پڑھے ہوئے' + categories: 'c، g زمرہ جات' + top: 't، g ٹاپ' + bookmarks: 'b، g بک مارکس' + profile: 'p، g پروفائل' + messages: 'm، g پیغامات' navigation: title: 'نیویگیشن' jump: '# پوسٹ # پر جائیں' @@ -2040,7 +2095,7 @@ ur: community: name: کمیونٹی trust_level: - name: ٹرسٹ لیول + name: ٹرسٹ لَیول other: name: دیگر posting: @@ -2299,8 +2354,8 @@ ur: web_hooks: title: "وَیب ھُوک٘س٘" none: "اِس وقت کوئی وَیب ھُوک٘س٘ نہیں ہیں۔" - instruction: "جب آپ کی ویب سائٹ میں مخصوص واقعات پیش آتے ہیں تو وَیب ھُوک٘س٘ ڈِسکورس کو بیرونی سروسوں کو مطلع کرنے کے قابل بناتے ہیں۔ جب وَیب ھُوک٘ کو متحرک کیا جائے گا، فراہم کیے گئے یو.آر.ایلز. کو ایک POST درخواست بھیج دی جائے گی۔" - detailed_instruction: "جب منتخب کیا گیا واقعہ پیش آئے گا تو فراہم کیے گئے یو.آر.ایل. کو ایک POST درخواست بھیج دی جائے گی۔" + instruction: "جب آپ کی ویب سائٹ میں مخصوص واقعات پیش آتے ہیں تو وَیب ھُوک٘س٘ ڈِسکورس کو بیرونی سروسوں کو مطلع کرنے کے قابل بناتے ہیں۔ جب وَیب ھُوک٘ کو متحرک کیا جائے گا، فراہم کیے گئے یو.آر.ایلز. کو ایک POST ریکویسٹ بھیج دی جائے گی۔" + detailed_instruction: "جب منتخب کیا گیا واقعہ پیش آئے گا تو فراہم کیے گئے یو.آر.ایل. کو ایک POST ریکویسٹ بھیج دی جائے گی۔" new: "نیا وَیب ھُوک٘" create: "بنائیں" save: "محفوظ کریں" @@ -2334,10 +2389,540 @@ ur: post_event: name: "پوسٹ واقعہ" details: "جب ایک نیا جواب، ترمیم، حذف یا رِِیکور کیا جائے۔" + user_event: + name: "صارف واقعہ" + details: "جب ایک صارف بنایا، منظور یا اَپ ڈیٹ کیا جاتا ہے۔" + delivery_status: + title: "موصول ہونے کی آگاہی" + inactive: "غیر فعال" + failed: "ناکامی" + successful: "کامیابی" + events: + none: "کوئی متعلقہ واقعات موجود نہیں۔" + redeliver: "دوبارہ ڈیلیور کریں" + incoming: + one: "ایک نیا واقعہ موجود ہے۔" + other: "{{شمار}} نئے واقعات موجود ہیں۔" + completed_in: + one: "1 سیکنڈ میں مکمل ہوا۔" + other: "{{شمار}} سیکنڈ میں مکمل ہوا۔" + request: "ریکویسٹ" + response: "جواب" + redeliver_confirm: "کیا آپ واقعی وہی پَیلوڈ دوبارہ ڈیلیور کرنا چاہتے ہیں؟" + headers: "ہیڈرز" + payload: "پَیلوڈ" + body: "متن" + go_list: "فہرست پر جائیں" + go_details: "وَیب ھُوک٘ میں ترمیم کریں" + go_events: "واقعات پر جائیں" + ping: "پِنگ" + status: "سٹیٹس کوڈ" + event_id: "ID" + timestamp: "بنایا گیا" + completion: "مدتِ تکمیل" + actions: "عوامل" + plugins: + title: "پلَگ اِنز" + installed: "انسٹال کیے ہوے پلَگ اِنز" + name: "نام" + none_installed: "آپ کے پاس کوئی پلَگ اِنز اِنسٹال نہیں ہوئے ہیں۔" + version: "ورژن" + enabled: "فعال؟" + is_enabled: "Y" + not_enabled: "N" + change_settings: "سیٹنگ تبدیل کریں" + change_settings_short: "سیٹِنگ" + howto: "میں پلَگ اِنز کیسے انسٹال کروں؟" + backups: + title: "بیک اَپس" + menu: + backups: "بیک اَپس" + logs: "لاگز" + none: "کوئی بیک اَپ دستیاب نہیں۔" + read_only: + enable: + title: "صرف پڑھنے کا مَوڈ فعال کریں" + label: "\"صرف پڑھنا\" فعال کریں" + confirm: "کیا آپ واقعی صرف پڑھنے کا مَوڈ فعال کرنا چاہتے ہیں؟" + disable: + title: "صرف پڑھنے کا مَوڈ غیر فعال کریں" + label: "\"صرف پڑھنا\" غیر فعال کریں" + logs: + none: "ابھی تک کوئی لاگز نہیں..." + columns: + filename: "فائل کا نام" + size: "سائز" + upload: + label: "اَپ لوڈ" + title: "اِس صورتحال کیلئے ایک بیک اَپ اَپ لوڈ کریں" + uploading: "اَپ لوڈ کیا جا رہا ہے..." + success: "'{{filename}}' کو کامیابی سے اَپ لوڈ کر دیا گیا ہے۔" + error: "اَپ لوڈ کرتے وقت ایک خرابی کا سامنا کرنا پڑا '{{filename}}': {{message}}" + operations: + is_running: "ایک کارروائی اِس وقت چل رہی ہے..." + failed: "{{operation}} ناکام رہا۔ براہ مہربانی لاگز چیک کریں۔" + cancel: + label: "منسوخ" + title: "موجودہ کارروائی منسوخ کریں" + confirm: "کیا آپ واقعی موجودہ کارروائی منسوخ کرنا چاہتے ہیں؟" + backup: + label: "بیک اَپ" + title: "بیک اَپ بنائیں" + confirm: "کیا آپ نیا بیک اَپ شروع کرنا چاہتے ہیں؟" + without_uploads: "جی ہاں (فائلوں کو شامل نہ کیا جائے)" + download: + label: "ڈاؤن لوڈ" + title: "ڈاؤن لوڈ لنک کے ساتھ اِیمیل بھیجیں" + alert: "اِس بیک اَپ کو ڈاؤن لوڈ کرنے کا لِنک آپ کو اِیمیل کر دیا گیا ہے۔" + destroy: + title: "بیک اَپ کو ہٹائیں" + confirm: "کیا آپ واقعی اِس بیک اَپ کو ختم کرنا چاہتے ہیں؟" + restore: + is_disabled: "رِیسٹور سائٹ سیٹِنگ میں غیر فعال ہے۔" + label: "رِیسٹور" + title: "بیک اَپ بحال کریں" + confirm: "کیا آپ واقعی اِس بیک اَپ کو بحال کرنا چاہتے ہیں؟" + rollback: + label: "رول بیک کریں" + title: "ڈیٹا بیس کو پِچھلی چالو حالت تک رول بیک کریں" + confirm: "کیا آپ واقعی پِچھلی چالو حالت تک ڈیٹا بیس کو رول بیک کرنا چاہتے ہیں؟" + export_csv: + success: "ایکسپورٹ شروع کر دیا گیا، عمل مکمل ہونے پر آپ کو پیغام کے ذریعے مطلع کر دیا جائے گا۔" + failed: "ایکسپورٹ ناکام رہا۔ براہ مہربانی لاگز چیک کریں۔" + button_text: "ایکسپورٹ" + button_title: + user: "مکمل صارف فہرست CSV فارمیٹ میں ایکسپورٹ کریں۔" + staff_action: "مکمل سٹاف کی کارروایوں کا لاگ CSV فارمیٹ میں ایکسپورٹ کریں۔" + screened_email: "مکمل اسکریننگ کیے گئے اِیمیلز کی فہرست CSV فارمیٹ میں ایکسپورٹ کریں۔" + screened_ip: "مکمل اسکریننگ کیے گئے IP ایڈریسوں کی فہرست CSV فارمیٹ میں ایکسپورٹ کریں۔" + screened_url: "مکمل اسکریننگ کیے گئے URL کی فہرست CSV فارمیٹ میں ایکسپورٹ کریں۔" export_json: - button_text: "برآمد" + button_text: "ایکسپورٹ" + invite: + button_text: "دعوت بھیجیں" + button_title: "دعوت بھیجیں" + customize: + title: "مرضی کے مطابق بنائیں" + long_title: "ویب سائٹ کو اپنی مرضی کے حساب سے بنانے کیلئے اختیارات" + css: "CSS" + header: "ہیڈر" + top: "ٹاپ" + footer: "فُوٹَر" + embedded_css: "اَیمبَیڈ کی ہوئی CSS" + head_tag: + text: "" + title: "HTML جو ٹیگ سے پہلے داخل کی جائے گی" + body_tag: + text: "" + title: "HTML جو ٹیگ سے پہلے داخل کی جائے گی" + override_default: "سٹینڈرڈ سٹائل شیٹ شامل نہ کریں" + enabled: "فعال؟" + preview: "پیشگی دیکھیں" + undo_preview: "پیشگی وِیو ہٹائیں" + rescue_preview: "پہلے سے طے شدہ سٹائل" + explain_preview: "اپنی مرضی کی سٹائل شیٹ کے ساتھ سائٹ ملاحظہ کریں" + explain_undo_preview: "فی الحال فعال اپنی مرضی کی سٹائل شیٹ پر واپس جائیں" + explain_rescue_preview: "پہلے سے طے شدہ سٹائل شیٹ کے ساتھ سائٹ ملاحظہ کریں" + save: "محفوظ کریں" + new: "نیا" + new_style: "نیا سٹائل" + import: "اِمپورٹ" + import_title: "ایک فائل منتخب کریں یا ٹَیکسٹ پَیسٹ کریں" + delete: "حذف کریں" + delete_confirm: "اس اِصلاح کو حذف کریں؟" + about: "سائٹ پر CSS سٹائل شیٹس اور HTML ہیڈرز میں ترمیم کریں۔ شروع کرنے کیلئے ایک اِصلاح شامل کریں۔" + color: "رنگ" + opacity: "دھندلاپن" + copy: "کاپی" + email_templates: + title: "اِیمیل ٹَیمپلیٹ" + subject: "موضوع" + multiple_subjects: "اِس اِیمیل ٹَیمپلیٹ کے ایک سے زیادہ مضامین ہیں۔" + body: "متن" + none_selected: "ترمیم شروع کرنے کیلئے ایک اِیمیل ٹَیمپلیٹ منتخب کریں۔" + revert: "تبدیلیاں لوٹائیں" + revert_confirm: "کیا آپ واقعی تبدیلیاں لوٹانا چاہتے ہیں؟" + css_html: + title: "CSS/HTML" + long_title: "CSS اور HTML اصلاحات" + colors: + title: "رنگ" + long_title: "رنگ سکیمیں" + about: "CSS لکھے بغیر ویب سائٹ پر استعمال رنگوں میں ترمیم کریں۔ شروع کرنے کے لئے ایک نئی سکیم بنائیں۔" + new_name: "نئی رنگ سکیم" + copy_name_prefix: "نقل از" + delete_confirm: "اِس رنگ سکیم کو حذف کریں؟" + undo: "کالعدم کریں" + undo_title: "اِس رنگ کو آخری دفعہ محفوظ کیے جانے کے وقت سے لے کر اَب تک کی اپنی تمام تبدیلیوں کو کالعدم کریں۔" + revert: "رِیوَرٹ" + revert_title: "اِس رنگ کو ڈِسکَورس کی پہلے سے طے شدہ رنگ سکیم کے مطابق رِی سَیٹ کریں۔" + primary: + name: 'بنیادی' + description: 'زیادہ تر ٹَیکسٹ، آئیکنز اور بارڈرز' + secondary: + name: 'ثانوی' + description: 'مَین پسِ منظر کا رنگ، اور کچھ بٹنوں کے ٹَیکسٹ کا رنگ۔' + tertiary: + name: 'ترتییک' + description: 'لنکس، چند بٹن، اطلاعات، اور اَیکسنٹ رنگ۔' + quaternary: + name: "چوتھے درجہ کے" + description: "نیویگیشن لنکس۔" + header_background: + name: "ہیڈر کا پسِ منظر" + description: "سائٹ کے ہیڈر کے پسِ منظر کا رنگ۔" + header_primary: + name: "ہیڈر بنیادی" + description: "سائٹ کے ہیڈر میں ٹَیکسٹ اور آئیکنز۔" + highlight: + name: 'اجاگر کریں' + description: 'اُجاگر کیے گئے عناصر، جیسے کہ پوسٹس اور ٹاپک، کے پسِ منظر کا رنگ.' + danger: + name: 'خطرہ' + description: 'اِعمال، جیسے کہ پوسٹس اور ٹاپکس کو حذف کرنا، کو نمایاں کرنے کا رنگ۔' + success: + name: 'کامیابی' + description: 'ایک کارروائی کے کامیاب ہونے کی نشاندہی کیلئے استعمال کیا جاتا ہے۔' + love: + name: 'محبت' + description: "لائیک بٹن کا رنگ۔" + email: + title: "اِیمیل" + settings: "سیٹِنگ" + templates: "ٹَیمپلیٹ" + preview_digest: "ڈائجسٹ کا مشاہدہ کریں" + sending_test: "ٹیسٹ اِیمیل بھیجی جا رہی ہے..." + error: "تکنیکی خرابی - ٪{server_error}" + test_error: "ٹیسٹ اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ اپنی میل سیٹِنگ دوبارہ چیک کریں، تصدیق کر لیں کہ آپ کا ہَوسٹ میل کنکشنوں کو بلاک تو نہیں کر رہا، اور دوبارہ کوشش کریں۔" + sent: "بھیج دی گئی" + skipped: "چھوڑا گیا" + bounced: "لوٹا دی گئی" + received: "موصول ہو گئی" + rejected: "مسترد کر دی گئی" + sent_at: "بھیجی گئی" + time: "وقت" + user: "صارف" + email_type: "اِیمیل کی قسم" + to_address: "ایڈریس پر" + test_email_address: "ٹیسٹ کرنے کے لیے اِیمیل ایڈریس" + send_test: "ٹیسٹ اِیمیل بھیجییں" + sent_test: "بھیج دی گئی!" + delivery_method: "ترسیل کا طریقہ" + preview_digest_desc: "غیر فعال صارفین کو بھیجے گئے ڈائجسٹ اِیمیلز کے متن کا مشاہدہ کریں۔" + refresh: "رِیفریش" + send_digest_label: "اس رِزَلٹ کو بھیجیں:" + send_digest: "بھیجیں" + sending_email: "اِیمیل بھیجی جا رہی ہے..." + format: "فارمیٹ" + html: "html" + text: "ٹَیکسٹ" + last_seen_user: "صارف کو آخری دفعہ دیکھا:" + no_result: "ڈائجسٹ کیلئے کوئی نتائج نہیں پائے گئے۔" + reply_key: "جواب کِی" + skipped_reason: "وجہ چھوڑیں" + incoming_emails: + from_address: "سے" + to_addresses: "کے لئے" + cc_addresses: "Cc" + subject: "موضوع" + error: "خرابی" + none: "کوئی آنے والی اِیمیلز نہیں ملیں۔" + modal: + title: "آنے والی اِیمیلز کی تفصیلات" + error: "خرابی" + headers: "ہیڈرز" + subject: "موضوع" + body: "متن" + rejection_message: "نامنظوری کی میل" + filters: + from_placeholder: "from@example.com" + to_placeholder: "to@example.com" + cc_placeholder: "cc@example.com" + subject_placeholder: "موضوع..." + error_placeholder: "خرابی" + logs: + none: "کوئی لاگز نہیں ملے۔" + filters: + title: "فِلٹر" + user_placeholder: "صارف نام" + address_placeholder: "name@example.com" + type_placeholder: "ڈائجسٹ، سائن اَپ..." + reply_key_placeholder: "جواب کِی" + skipped_reason_placeholder: "وجہ" + logs: + title: "لاگز" + action: "عمل" + created_at: "بنائے گئی" + last_match_at: "آخری دَفعہ میچ کیا گیا" + match_count: "میچ کیے گئے" + ip_address: "IP" + topic_id: "ٹاپک ID" + post_id: "پوسٹ ID" + category_id: "زمرہ ID" + delete: 'حذف کریں' + edit: 'ترمیم کریں' + save: 'محفوظ کریں' + screened_actions: + block: "بلاک کریں" + do_nothing: "کچھ نہ کریں" + staff_actions: + title: "سٹاف عوامل" + instructions: "فہرست فِلٹر کرنے کیلئے صارف نام اور عوامل پر کلِک کریں۔ صارفیں کے پیج پر جانے کیلئے پروفائل تصاویر کو کلِک کریں۔" + clear_filters: "سب کچھ دکھائیں" + staff_user: "سٹاف یوزر" + target_user: "ہدف صارف" + subject: "موضوع" + when: "کب" + context: "سیاق و سباق" + details: "تفصیلات" + previous_value: "پچھلی" + new_value: "نئی" + diff: "فرق" + show: "دکھائیں" + modal_title: "تفصیلات" + no_previous: "کوئی پچھلی وَیلیو نہیں ہے۔" + deleted: "کوئی نئی وَیلیو نہیں۔ ریکارڈ حذف کر دیا گیا تھا۔" + actions: + delete_user: "صارف کو حذف کریں" + change_trust_level: "ٹرسٹ لَیول تبدیل کریں" + change_username: "صارف نام تبدیل کریں" + change_site_setting: "ویب سائٹ کی سیٹِنگ تبدیل کریں" + change_site_customization: "سائٹ اصلاحات تبدیل کریں" + delete_site_customization: "سائٹ اصلاحات حذف کریں" + change_site_text: "سائٹ ٹَیکسٹ تبدیل کریں" + suspend_user: "صارف معطل کریں" + unsuspend_user: "صارف کی معطلی ختم کریں" + grant_badge: "بَیج دیں" + revoke_badge: "بَیج منسوخ کریں" + check_email: "اِیمیل چیک کریں" + delete_topic: "ٹاپک حذف کریں" + delete_post: "پوسٹ حذف کریں" + impersonate: "نقالی" + anonymize_user: "صارف گمنام بنائیں" + roll_up: "IP بلاکس رول اَپ کریں" + change_category_settings: "زمرہ جات کی سیٹِنگ تبدیل کریں" + delete_category: "زمرہ حذف کریں" + create_category: "زمرہ بنائیں" + block_user: "صارف بلاک کریں" + unblock_user: "صارف پر بلاک ختم کریں" + grant_admin: "اَیڈمِن عطا کریں" + revoke_admin: "اَیڈمِن منسوخ کریں" + grant_moderation: "ماڈرَیشَن عطا کریں" + revoke_moderation: "ماڈرَیشَن منسوخ کریں" + backup_create: "بیک اَپ بنائیں" + deleted_tag: "حذف کیا گیا ٹیگ" + renamed_tag: "نام تبدیل کیا گیا ٹیگ" + revoke_email: "اِیمیل منسوخ کریں" + lock_trust_level: "ٹرسٹ لَیول کو لاک کریں" + unlock_trust_level: "ٹرسٹ لَیول کا لاک ختم کریں" + activate_user: "صارف فعال کریں" + deactivate_user: "صارف غیر فعال کریں" + change_readonly_mode: "صرف پڑھنے کا مَوڈ تبدیل کریں" + backup_download: "بیک اَپ ڈاؤن لوڈ کریں" + backup_destroy: "بیک اَپ تباہ کریں" + screened_emails: + title: "سکرین کی گئی اِیمیلز" + description: "جب کوئی نیا اکاؤنٹ بنانے کی کوشش کرے گا، تو مندرجہ ذیل اِیمیل ایڈریسوں کو چیک کیا جائے گا اور رجسٹریشن بلاک، یا کوئی اور کارروائی کی جائے گی۔" + email: "اِیمیل ایڈریس" + actions: + allow: "اجازت دیں" + screened_urls: + title: "سکرین کیے گئے یو.آر.ایل." + description: "یہاں درج کردہ URLs، صارفین جو سپیمرز کے طور پر شناخت کیے گئے ہیں کی طرف سے، پوسٹس میں استعمال کیے گئے تھے." + url: "URL" + domain: "ڈومین" + screened_ips: + title: "سکرین کیے گئے IP" + description: 'IP ایڈریس جن پر نظر رکھی ہوئی ہے۔ IP ایڈریسوں کو وائٹ لِسٹ کرنے کیلئے "اجازت دیں" کو استعمال کریں۔' + delete_confirm: "کیا آپ واقعی ٪{IP_ADDRESS} کیلئے اصول کو ہٹانا چاہتے ہیں؟" + roll_up_confirm: "کیا آپ واقعی عام سکرین کیے گئے IP ایڈریسوں کو subnets میں رول اَپ کرنا چاہتے ہیں؟" + rolled_up_some_subnets: "کامیابی کے ساتھ IP بین اندراجات کو اِن subnets میں رول اَپ کر دیا گیا: ٪{subnets}۔" + rolled_up_no_subnet: "رول اَپ کرنے کیلئے کچھ بھی نہیں تھا۔" + actions: + block: "بلاک کریں" + do_nothing: "اجازت دیں" + allow_admin: "اجازت دینے والا ایڈمِن" + form: + label: "نیا:" + ip_address: "IP ایڈریس" + add: "اضافہ کریں" + filter: "تلاش کریں" + roll_up: + text: "رول اَپ" + title: "نئے subnet بین اندراجات بناتا ہے اگر کم از کم 'min_ban_entries_for_roll_up' اندراجات موجود ہوں۔" + logster: + title: "خرابیوں کے لاگز" + impersonate: + title: "نقالی" + help: "ڈِیبَگ مقاصد کیلئے اِس آلے کو استعمال کر کہ ایک صارف کے اکاؤنٹ کی نقالی کریں۔ کام ختم ہونے کے بعد آپ کے ایک دفعہ لاگ آؤٹ کرنا ہو گا۔" + not_found: "یہ صارف نہیں تلاش کیا جا سکا۔" + invalid: "معذرت، آپ اِس صارف کی نقالی نہیں کرسکتے۔" + users: + title: 'صارفین' + create: 'ایڈمِن صارف شامل کریں' + last_emailed: "جِسے آخری دفع اِی میل کی گئی" + not_found: "معذرت، وہ صارف نام ہمارے سِسٹم میں موجود نہیں ہے۔" + id_not_found: "معذرت، وہ صارف ID ہمارے سِسٹم میں موجود نہیں ہے۔" + active: "فعال" + show_emails: "اِیمیل دکھائیں" + nav: + new: "نیا" + active: "فعال" + pending: "زیرِاِلتوَاء" + staff: 'سٹاف' + suspended: 'معطل کردہ' + blocked: 'بلاک کردہ' + suspect: 'مشتبہ' + approved: "منظورشدہ؟" + approved_selected: + one: "صارف منظور کریں" + other: "صارفین منظور کریں ({{شمار}})" + reject_selected: + one: "صارف مسترد کریں" + other: "صارفین مسترد کریں ({{شمار}})" + titles: + active: 'متحرک صارفین' + new: 'نئے صارفین' + pending: 'صارفین زیرِ ریویو' + newuser: 'ٹرسٹ لَیول 0 پہ صارفین (نیو یوزر)' + basic: 'ٹرسٹ لَیول 1 پہ صارفین (بَیسِک یوزر)' + member: 'ٹرسٹ لَیول 2 پہ صارفین (ممبر)' + regular: 'ٹرسٹ لَیول 3 پہ صارفین (رَیگولَر)' + leader: 'ٹرسٹ لَیول 4 پہ صارفین (لیڈر)' + staff: "سٹاف" + admins: 'ایڈمِن صارفین' + moderators: 'ماڈریٹرز' + blocked: 'بلاک کردہ صارفین' + suspended: 'معطل کردہ صارفین' + suspect: 'مشتبہ صارفین' + reject_successful: + one: "کامیابی کے ساتھ 1 صارف کو مسترد کیا۔" + other: "کامیابی کے ساتھ ٪{شمار} صارفین کو مسترد کیا۔" + reject_failures: + one: "1 صارف کو مسترد کرنے میں ناکامی۔" + other: "٪{شمار} صارفین کو مسترد کرنے میں ناکامی۔" + not_verified: "غیر تصدیق شدہ" + check_email: + title: "اِس صارف کا اِیمیل ایڈریس ظاہر کریں" + text: "دکھائیں" user: + suspend_failed: "اِس صارف کو معطل کرتے ہوے کچھ غلط ہو گیا {{error}}" + unsuspend_failed: "اِس صارف کی معطلی ختم کرتے ہوے کچھ غلط ہو گیا {{error}}" + suspend_duration: "صارف کب تک معطل رہے گا؟" + suspend_duration_units: "(دن)" + suspend_reason_label: "آپ معطل کیوں کر رہے ہیں؟ یہ ٹَیکسٹ اِس صارف کے پروفائل پیج پر ہر کسی کے لیے ظاہر ہو گا، اور جب صارف لاگ اِن کرنے کی کوشش کریں گے تو اُنہیں دکھایا جائے گا۔ اِسے مختصر رکھیں۔" + suspend_reason: "وجہ" + suspended_by: "کی طرف سے معطل کیا گیا" + delete_all_posts: "تمام پوسٹس حذف کریں" + delete_all_posts_confirm_MF: "آپ {POSTS، جمع، ایک {1 پوسٹ} دیگر {# posts}} اور {TOPICS، جمع، ایک {1 ٹاپک} دیگر {# topics}} حذف کرنے والے ہیں۔ کیا آپ کو یقین ہے؟" + suspend: "معطل کریں" + unsuspend: "معطلی ختم کریں" + suspended: "معطل کردہ؟" + moderator: "ماڈریٹر؟" + admin: "ایڈمن؟" + blocked: "بلاک کردہ؟" + staged: "سٹَیجڈ؟" + show_admin_profile: "ایڈمن" + edit_title: "عنوان میں ترمیم کریں" + save_title: "عنوان محفوظ کریں" + refresh_browsers: "براؤزر رِیفریش فورس کریں" + refresh_browsers_message: "تمام کلائینٹس کو پیغام بھیجا!" + show_public_profile: "پبلک پروفائل دکھائیں" + impersonate: 'نقالی' + action_logs: "عوامل کے لاگز" + ip_lookup: "IP کا سراغ" + log_out: "لاگ آُوٹ" + logged_out: "صارف کو تمام ڈِیوائیسِز سے لاگ آؤٹ کر دیا گیا" + revoke_admin: 'اَیڈمِن منسوخ کریں' + grant_admin: 'اَیڈمِن عطا کریں' + revoke_moderation: 'ماڈرَیشَن منسوخ کریں' + grant_moderation: 'ماڈرَیشَن عطا کریں' + unblock: 'بلاک ختم کریں' + block: 'بلاک کریں' + reputation: ساکھ + permissions: اجازتیں + activity: سرگرمی + like_count: لائیکس دیے / ملے + last_100_days: 'پچھلے 100 دنوں میں' + private_topics_count: نِجی ٹاپک + posts_read_count: پڑھی گئیں پوسٹس + post_count: بنائی گئیں پوسٹس + topics_entered: دیکھ لیے گئے ٹاپک + flags_given_count: فلَیگز دیے گئے + flags_received_count: فلَیگز ملے + warnings_received_count: انتباہات ملیں + flags_given_received_count: 'فلَیگز دیے / ملے' + approve: 'منظور' + approved_by: "کی طرف سے منظور کیا گیا" + approve_success: "صارف منظور کر لیا گیا اور ایکٹیویشن ہدایات کے ساتھ اِیمیل بھیج دی گئی۔" + approve_bulk_success: "کامیابی! تمام منتخب صارفین کو منظوری دے دی اور مطلع کر دیا گیا ہے۔" + time_read: "پڑھنے کیلئے اِستعمال ہونے والا وقت" + anonymize: "صارف گمنام بنائیں" + anonymize_confirm: "کیا آپ واقعی اِس اکاؤنٹ کو گمنام بنانا چاہتے ہیں؟ یہ صارف نام اور اِیمیل تبدیل، اور تمام پروفائل معلومات رِی سَیٹ کر دے گا۔" + anonymize_yes: "جی ہاں، اِس اکاؤنٹ کو گمنام بنائیں" + anonymize_failed: "اِس اکاؤنٹ کو گمنام بنانے میں ایک مسئلہ پیش آیا۔" + delete: "صارف حذف کریں" + delete_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز حذف نہیں کیے جا سکتے۔" + delete_posts_forbidden_because_staff: "اَیڈمن اور ماڈریٹرز کی تمام پوسٹس حذف نہیں کی جا سکتیں۔" + delete_forbidden: + one: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{شمار} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)" + other: "اگر صارفین کی پوسٹس موجود ہوں تو اُنہیں حذف نہیں کیا جا سکتا۔ ایک صارف کو حذف کرنے کی کوشش سے پہلے تمام پوسٹس کو حذف کریں۔ (٪{شمار} دن سے زیادہ پرانی پوسٹس کوحذف نہیں کیا جا سکتا۔)" + cant_delete_all_posts: + one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{شمار} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)" + other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا۔ کچھ پوسٹس ٪{شمار} دن پرانی سے زیادہ پرانی ہیں۔(delete_user_max_post_age سیٹِنگ۔)" + cant_delete_all_too_many_posts: + one: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی 1 سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)" + other: "تمام پوسٹس کو حذف نہیں کیا جاسکتا کیونکہ صارف کی ٪{شمار} سے زیادہ پوسٹس ہیں۔ (delete_all_posts_max)" + delete_confirm: "کیا آپ واقعی اِس صارف کو حذف کرنا چاہتے ہیں؟ یہ مُستقِل عمل ہے!" + delete_and_block: "اِس اِیمیل اور IP ایڈریس کو حذف اور بلاک کریں" + delete_dont_block: "صرف حذف کریں" + deleted: "صارف حذف کر دیا گیا تھا۔" + delete_failed: "اُس صارف کو حذف کرنے میں ایک مسئلہ پیش آیا۔ صارف کو حذف کرنے سے پہلے اس بات کا یقین کرلیں کہ تمام پوسٹس حذف کر دی گئی ہیں۔" + send_activation_email: "ایکٹیویشن اِیمیل بھیجییں" + activation_email_sent: "ایک ایکٹیویشن اِیمیل بھیج دی گئی ہے۔" + send_activation_email_failed: "ایک اور ایکٹیویشن اِیمیل بھیجنے میں ایک مسئلہ پیش آیا۔ ٪{error}" + activate: "اکاؤنٹ فعال کریں" + activate_failed: "صارف فعال کرنے میں ایک مسئلہ پیش آیا۔" + deactivate_account: "اکاؤنٹ غیر فعال کریں" + deactivate_failed: "صارف کو غیر فعال کرنے میں ایک مسئلہ پیش آیا۔" + unblock_failed: 'صارف کو بلاک سے ہٹانے میں ایک مسئلہ پیش آیا۔' + block_failed: 'صارف کو بلاک کرنے میں ایک مسئلہ پیش آیا۔' + block_confirm: 'کیا آپ واقعی اِس صارف کو بلاک کرنا چاہتے ہیں؟ وہ کوئی بھی نئے ٹاپک یا پوسٹ نہیں بنا سکیں گے۔' + block_accept: 'جی ہاں، اِس صارف کو بلاک کریں' + bounce_score: "بائونس سکور" + reset_bounce_score: + label: "رِی سَیٹ" + title: "بائونس سکور واپس 0 پر رِی سَیٹ کریں" + deactivate_explanation: "ایک غیر فعال صارف کو اپنا اِیمیل دوبارہ تصدیق کرنا ضروری ہے۔" + suspended_explanation: "کوئی معطل صارف لاگ اِن نہیں کر سکتا۔" + block_explanation: "ایک بلاک ہوا صارف پوسٹ شائع یا ٹاپک شروع نہیں کر سکتا۔" + staged_explanation: "ایک سٹَیجڈ صارف صرف مخصوص ٹاپکس پر اِیمیل کے ذریعے پوسٹ کر سکتا ہے۔" + bounce_score_explanation: + none: "اس اِیمیل سے حال میں کوئی باؤنسِز موصول نہیں ہوئے۔" + some: "اس اِیمیل سے حال میں چند باؤنسِز موصول ہوئے تھے۔" + threshold_reached: "اس اِیمیل سے بہت زیادہ باؤنسِز موصول ہوئے۔" + trust_level_change_failed: "صارف کا ٹرسٹ لَیول تبدیل کرنے میں ایک مسئلہ پیش آیا۔" + suspend_modal_title: "صارف معطل کریں" + trust_level_2_users: "ٹرسٹ لَیول 2 کے صارفین" + trust_level_3_requirements: "ٹرسٹ لَیول 3 کے تقاضے" + trust_level_locked_tip: "ٹرسٹ لَیول لاک ہے، سِسٹم صارف کا لَیول زیادہ یا کم نہیں کرے گا" + trust_level_unlocked_tip: "ٹرسٹ لَیول لاک نہیں ہے، سِسٹم صارف کا لَیول زیادہ یا کم کرسکتا ہے" + lock_trust_level: "ٹرسٹ لَیول لاک کریں" + unlock_trust_level: "ٹرسٹ لَیول کا لاک ختم کریں" tl3_requirements: + title: "ٹرسٹ لَیول 3 کے تقاضے" + table_title: + one: "پچھلے دن میں" + other: "پچھلے ٪{شمار} دنوں میں" + value_heading: "وَیلِیو" + requirement_heading: "ضروریات" + visits: "زائرین کی تعداد" + days: "دن" + topics_replied_to: "جن ٹاپکس کا جواب دیا گیا" + topics_viewed: " دیکھ لیے گئے ٹاپک" + topics_viewed_all_time: "دیکھ لیے گئے ٹاپک (تمام وقت)" + posts_read: "پڑھی گئیں پوسٹس" + posts_read_all_time: "پڑھی گئیں پوسٹس (تمام وقت)" flagged_posts: "نشان زدہ پوسٹ" flagged_by_users: "نشان زدہ کرنے والے صارفین" likes_given: "لائیکس دیے گئے" @@ -2388,5 +2973,186 @@ ur: title: "صارف کارڈ پر دکھائیں؟" enabled: "صارف کارڈ پر دکھایا گیا" disabled: "صارف کارڈ پر نہیں دکھایا گیا" + field_types: + text: 'ٹَیکسٹ کی جگہ' + confirm: 'تصدیق' + dropdown: "ڈراپ ڈاؤن" + site_text: + description: "آپ اپنے فورم پر کسی بھی ٹَیکسٹ کو اپنی مرضی کے مطابق بدل سکتے ہیں۔ براہ مہربانی شروع کرنے کیلئے ذیل میں سرچ کریں:" + search: "آپ جس ٹَیکسٹ میں ترمیم کرنا چاہتے اُسے سرچ کریں" + title: ' ٹَیکسٹ کا متن' + edit: 'ترمیم' + revert: "تبدیلیاں لوٹائیں" + revert_confirm: "کیا آپ واقعی تبدیلیاں لوٹانا چاہتے ہیں؟" + go_back: "واپس سَرچ پر" + recommended: "اَپنی ضروریات کے مطابق کرنے کے لئے ہم مندرجہ ذیل ٹَیکسٹ کو اپنی مرضی کے حساب سے تبدیل کرنے کی تجویز دیں گے:" + show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں' + site_settings: + show_overriden: 'صرف اووَر رائیڈ ہوئے دکھائیں' + title: 'سیٹِنگ' + reset: 'رِی سَیٹ' + none: 'کوئی نہیں' + no_results: "کوئی نتائج نہیں پائے گئے۔" + clear_filter: "صاف کریں" + add_url: "URL شامل کریں" + add_host: "ہَوسٹ شامل کریں" + categories: + all_results: 'تمام' + required: 'درکار' + basic: 'بنیادی سَیٹ اَپ' + users: 'صارفین' + posting: 'پوسٹ کرنا' + email: 'اِیمیل' + files: 'فائلیں' + trust: 'ٹرسٹ لَیول' + security: 'سیکورٹی' + onebox: "وَن باکس" + seo: 'SEO' + spam: 'سپَیم' + rate_limits: 'رَیٹ لِمِٹس' + developer: 'ڈیولپر' + embedding: "اَیمبَیڈ کرنا" + legal: "قانونی" + user_api: 'یُوزَر API' + uncategorized: 'دیگر' + backups: "بیک اَپس" + login: "لاگ ان" + plugins: "پلَگ اِنز" + user_preferences: "صارف ترجیحات" + tags: "ٹیگز" + search: "سرچ" + groups: "گروپس" badges: + title: بَیج + new_badge: نیا بَیج + new: نیا name: نام + badge: بَیج + display_name: ڈِسپلے نام + description: تفصیل + long_description: طویل تفصیل + badge_type: بیج قِسم + badge_grouping: گروپ + badge_groupings: + modal_title: بَیجوں کے گروپ + granted_by: کی طرف سے عطا کیا گیا + granted_at: جس وقت پر عطا کیا گیا + reason_help: (کسی پوسٹ یا ٹاپک کا ایک لنک) + save: محفوظ کریں + delete: حذف کریں + delete_confirm: کیا آپ واقعی اِس بَیج کو حذف کرنا چاہتے ہیں؟ + revoke: منسوخ کریں + reason: وجہ + expand: کھولیں … + revoke_confirm: کیا آپ واقعی اُس بَیج کو منسوخ کرنا چاہتے ہیں؟ + edit_badges: بَیجوں میں ترمیم کریں + grant_badge: بَیج دیں + granted_badges: دیے گئے بَیجز + grant: عطا کریں + no_user_badges: "٪{نام} کو کوئی بَیج عطا نہیں کیا گیا ہے۔" + no_badges: عطا کیے جانے کیلئے کوئی بَیج موجود نہیں ہیں۔ + none_selected: "شروع کرنے کے لئے ایک بَیج منتخب کریں" + allow_title: عنوان کے طور پر بَیج وں کے استعمال کی اجازت دیں + multiple_grant: ایک سے زیادہ مرتبہ عطا کیا جا سکتا ہے + listable: پبلک بَیجز کے صفحے پر بَیج دکھائیں + enabled: بَیج فعال کریں + icon: آئیکن + image: تصویر + icon_help: "تصویر کا URL یا فونٹ اَوسم کلاس استعمال کریں" + query: بَیج قُوَیری (SQL) + target_posts: ھدف پوسٹس کو قُوَیری کریں + auto_revoke: روزانہ رَیوَوکَیشَن قُوَیری چلائیں + trigger: محرکات + trigger_type: + none: "روزانہ اَپ ڈَیٹ کریں" + post_action: "جب صارف پوسٹ پر کوئی کاروائی کرے" + post_revision: "جب صارف پوسٹ میں ترمیم یا اُسے تخلیق کرے" + trust_level_change: "جب صارف ٹرسٹ لَیول تبدیل کرے" + user_change: "جب ایک صارف ترمیم یا تخلیق کیا جاتا ہے۔" + post_processed: "پوسٹ کے پراسس ہونے کے بعد" + preview: + link_text: "دیے گئے بَیجز کا مشاہدہ کریں" + plan_text: "قُوَیری پلان کا ساتھ مشاہدہ کریں" + modal_title: "بَیج قُوَیری کا مشاہدہ کریں" + sql_error_header: "قُوَیری کے ساتھ ایک خرابی کا سامنا کرنا پڑا۔" + error_help: "بَیج قُوَیریوں کے ساتھ مدد کیلئے مندرجہ ذیل لنکس ملاحظہ کریں۔" + bad_count_warning: + header: "انتباہ!" + text: "کچھ گرانٹ سامپل لاپتہ ہیں۔ یہ اُس وقت ہوتا ہے جب بَیج قُوَیری وہ صارف IDs یا پوسٹ IDs واپس بھیجتا ہے جو موجود نہیں ہوتیں۔ یہ بعد میں غیر متوقع نتائج کا سبب بن سکتا ہے - آپ اپنی قُوَیری کو دوبارہ چیک کرلیں۔" + no_grant_count: "کوئی بَیج تفویض کرنے کیلئے موجود نہیں۔" + grant_count: + one: "تفویض کرنے کیلئے 1 بَیج موجود ہے۔" + other: "تفویض کرنے کیلئے ٪{شمار} بَیج موجود ہیں۔" + sample: "نمونہ:" + grant: + with: ٪{صارف نام} + with_post: ٪{صارف نام} اِس ٪{لنک} میں پوسٹ کیلئے + with_post_time: ٪{صارف نام} ٪{time} پر اِس ٪{لنک} میں پوسٹ کیلئے + with_time: ٪{صارف نام} ٪{time} پر + emoji: + title: "اِیمَوجی" + help: "نئی اِیمَوجی شامل کریں جو سب کے لئے دستیاب ہوگی۔ (پیشہ وَرَانہ ٹِپ: ایک بار میں ایک سے زیادہ فائلوں کو ڈرَیگ & ڈراپ کریں)" + add: "نئی اِیمَوجی شامل کریں" + name: "نام" + image: "تصویر" + delete_confirm: "کیا آپ واقعی :٪{نام}: اِیمَوجی کو حذف کرنا چاہتے ہیں؟" + embedding: + get_started: "اگر آپ ڈِسکورس کو ایک اور ویب سائٹ پر اَیمبَیڈ کرنا چاہتے ہیں، تو ہوسٹ شامل کر کے شروع کریں۔" + confirm_delete: "کیا آپ واقعی اس ہَوسٹ کو حذف کرنا چاہتے ہیں؟" + sample: "ڈِسکورس ٹاپک بنانے اور اَیمبَیڈ کرنے کیلئے اپنی ویب سائٹ میں درج ذیل HTML کوڈ استعمال کریں۔ جس پیج پر آپ اسے اَیمبَیڈ کر رہے ہیں اُس کا canonical URL REPLACE_ME کی جگہ اِستعمال کریں۔" + title: "اَیمبَیڈ کرنا" + host: "اجازت یافتہ ہَوسٹ" + path_whitelist: "پاتھ وائِٹ لِسٹ" + edit: "ترمیم" + category: "زمرہ میں پوسٹ کریں" + add_host: "ہَوسٹ شامل کریں" + settings: "اَیمبَیڈ کرنے کی سیٹِنگ" + feed_settings: "فیڈ کی سیٹِنگ" + feed_description: "اپنی وَیب سائٹ کیلئے ایک RSS/ATOM فِیڈ فراہم کرنے سے ڈِسکورس کی آپ کے مواد کو درآمد کرنے کی صلاحیت بہترہو سکتی ہے۔" + crawling_settings: "کرالر کی سیٹِنگ" + crawling_description: "جب ڈِسکورس آپ کی پوسٹس کیلئے ٹاپک بناتا ہے، اگر کوئی RSS/ATOM فِیڈ موجود نہ ہو تو وہ آپ کا مواد آپ کے HTML سے پارس کرنے کی کوشش کرے گا۔ کبھی کبھار آپ کا مواد نکالنا دشوار ہو سکتا ہے، اِس لیے ہم اِس نکالنے کو آسان بنانے کیلئے CSS اصولوں کی وضاحت کرنے کی صلاحیت فراہم کرتے ہیں۔" + embed_by_username: "ٹاپک کی تخلیق کیلئے صارف نام" + embed_post_limit: "پعسٹس اَیمبَیڈ کرنے کی زیادہ سے زیادہ تعداد۔" + embed_username_key_from_feed: "فیڈ سے ڈِسکورس صارف نام کھیںچنے کی کِی" + embed_title_scrubber: "پوسٹس کے عنوان صاف کرنے کیلئے استعمال ہونے والا رَیگولَر اَیکسپرَیشن" + embed_truncate: "اَیمبَیڈ کی گئی پوسٹس کو تراشیں" + embed_whitelist_selector: "عناصر کیلئے CSS سلیکٹر جن کی اَیمبَیڈ میں اجازت ہے" + embed_blacklist_selector: "عناصر کیلئے CSS سلیکٹر جن کو اَیمبَیڈ سے ہٹایا گیا ہے" + embed_classname_whitelist: "اجازت یافتہ CSS کلاسوں کے نام" + feed_polling_enabled: "RSS / ATOM کے ذریعے پوسٹس درآمد کریں" + feed_polling_url: "کرال کرنے کیلئے RSS / ATOM کا URL" + save: "اَیمبَیڈ کرنے کی سیٹِنگ محفوظ کریں" + permalink: + title: "دائمی لِنکس" + url: "URL" + topic_id: "ٹاپک ID" + topic_title: "ٹاپک" + post_id: "پوسٹ ID" + post_title: "پوسٹ" + category_id: "زمرہ ID" + category_title: "زمرہ" + external_url: "بیرونی URL" + delete_confirm: کیا آپ واقعی اِس دائمی لِنک کو حذف کرنا چاہتے ہیں؟ + form: + label: "نیا:" + add: "شامل کریں" + filter: "سَرچ (URL یا بیرونی URL)" + wizard_js: + wizard: + done: "مکمل" + back: "واپس" + next: "اگلا" + step: "٪{total} میں سے ٪{current}" + upload: "اَپ لوڈ" + uploading: "اَپ لوڈ کیا جا رہا ہے..." + quit: "شاید بعد میں" + staff_count: + one: "آپ کی کمیونٹی میں 1 سٹاف کا رکن ہے۔" + other: "آپ کی کمیونٹی میں ٪{شمار} سٹاف کے ارکان ہیں۔" + invites: + add_user: "شامل کریں" + none_added: "آپ نے کسی بھی سٹاف کو مدعو نہیں کیا۔ کیا آپ واقعی آگے جانا چاہتے ہیں؟" + roles: + admin: "ایڈمن" + moderator: "ماڈریٹر" + regular: "رَیگولر صارف" diff --git a/config/locales/client.vi.yml b/config/locales/client.vi.yml index cb6eea0961..de0028d8ac 100644 --- a/config/locales/client.vi.yml +++ b/config/locales/client.vi.yml @@ -118,7 +118,6 @@ vi: enabled: 'được hiển thị lúc %{when}' disabled: 'bỏ hiển thị lúc %{when}' topic_admin_menu: "Lựa chọn quản lí chủ đề." - wizard_required: "Đến lúc tuỳ biến diễn đàn của bạn! Bắt đầu!" emails_are_disabled: "Ban quản trị đã tắt mọi email gửi đi. Sẽ không có bất kỳ thông báo nào qua email được gửi đi." bootstrap_mode_enabled: "Để đơn giản hoá quá trình triển khai, bạn đang ở trong chế độ bootstrap. Mọi người dùng mới đều có trust level 1 và sẽ nhận được email cập nhật thông tin mỗi ngày. Chế độ này sẽ tự động tắt khi số người dùng vượt qua %{min_users}." bootstrap_mode_disabled: "Chế độ bootstrap sẽ bị tắt trong 24 giờ tới." @@ -860,7 +859,6 @@ vi: logging_in: "Đăng nhập..." or: "Hoặc" authenticating: "Đang xác thực..." - awaiting_confirmation: "Tài khoản của bạn đang đợi kích hoạt, sử dụng liên kết quên mật khẩu trong trường hợp kích hoạt ở 1 email khác." awaiting_approval: "Tài khoản của bạn chưa được chấp nhận bới thành viên. Bạn sẽ được gửi một email khi được chấp thuận " requires_invite: "Xin lỗi, bạn phải được mời để tham gia diễn đàn" not_activated: "Bạn không thể đăng nhập. Chúng tôi đã gửi trước email kích hoạt cho bạn tại {{sentTo}}. Vui lòng làm theo hướng dẫn trong email để kích hoạt tài khoản của bạn." @@ -1127,7 +1125,6 @@ vi: choose_new_category: "Chọn chuyên mục mới cho chủ đề này:" selected: other: "Bạn đã chọn {{count}} chủ đề" - change_tags: "Đổi thẻ" none: unread: "Bạn không có chủ đề nào chưa đọc." new: "Bạn không có chủ đề mới nào." @@ -1594,7 +1591,6 @@ vi: email_in_disabled: "Tạo chủ đề mới thông qua email đã được tắt trong thiết lập. Để bật tính năng này, " email_in_disabled_click: 'kích hoạt thiết lập thư điện tử' suppress_from_homepage: "Ngăn chặn chuyên mục này hiển thị trên trang chủ." - sort_order: "Sắp xếp mặc định:" allow_badges_label: "Cho phép thưởng huy hiệu trong chuyên mục này" edit_permissions: "Sửa quyền" add_permission: "Thêm quyền" @@ -1714,7 +1710,6 @@ vi: history: "Lịch sử" changed_by: "bởi {{author}}" raw_email: - title: "Email gốc" not_available: "Không sẵn sàng!" categories_list: "Danh sách Danh mục" filters: @@ -2060,7 +2055,6 @@ vi: without_uploads: "Đúng (không bao gồm những tập tin)" download: label: "Tải xuống" - title: "Tải xuống bản sao lưu này" destroy: title: "Xóa bản sao lưu này" confirm: "Bạn muốn hủy bản sao lưu này?" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 690c71db24..75c3b76941 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -118,7 +118,6 @@ zh_CN: enabled: '%{when}列出' disabled: '于%{when}隐藏' topic_admin_menu: "管理主题" - wizard_required: "是时候配置你的论坛啦！点击开始设置向导！" emails_are_disabled: "出站邮件已经被管理员全局禁用。将不发送任何邮件提醒。" bootstrap_mode_enabled: "为方便站点准备发布，其正处于初始化模式中。所有新用户将被授予信任等级1，并为他们设置接受每日邮件摘要。初始化模式会在用户数超过 %{min_users} 个时关闭。" bootstrap_mode_disabled: "初始化模式将会在24小时后关闭。" @@ -888,7 +887,6 @@ zh_CN: logging_in: "登录中..." or: "或" authenticating: "验证中..." - awaiting_confirmation: "你的帐号尚未激活，点击忘记密码链接以重新发送激活邮件。" awaiting_approval: "你的帐号尚未被论坛版主审核。请等待一段时间，当你的帐号被审核时会收到一封电子邮件。" requires_invite: "抱歉，本论坛仅接受邀请注册。" not_activated: "你还不能登录。我们已经发送了一封邮件至 {{sentTo}}，请打开它并完成账号激活。" @@ -1208,7 +1206,7 @@ zh_CN: top: "没有最佳主题。" search: "没有搜索结果。" educate: - new: '

这里显示了近期主题列表。

默认情况下，以下主题将显示在近期列表。如果是最近 2 天内创建的，还会显示一个近期标志。

你可以在用户设置中更改要显示哪些内容。

' + new: '

这里显示了近期主题列表。

默认情况下，最近 2 天内创建的主题将显示在近期列表，还会显示一个近期标志。

你可以在用户设置中更改要显示哪些内容。

' unread: '

这里显示你的未读主题。

默认情况下，下述主题会被放在未读中。并且会在旁边显示未读的数量1。如果你：

  • 创建了该主题
  • 回复了该主题
  • 阅读该主题超过 4 分钟

或者你在主题底部的通知控制中选择了跟随或关注。

你可以在用户设置中修改未读设置。

' bottom: latest: "没有更多主题可看了。" @@ -1698,7 +1696,6 @@ zh_CN: suppress_from_homepage: "不在主页中显示这个分类。" show_subcategory_list: "在这个分类中把子分类列表显示在主题的上面" all_topics_wiki: "默认将新主题设为维基主题" - sort_order: "默认排序：" allow_badges_label: "允许在这个分类中授予徽章" edit_permissions: "编辑权限" add_permission: "添加权限" @@ -2348,7 +2345,6 @@ zh_CN: without_uploads: "是（不包括文件）" download: label: "下载" - title: "下载该备份" destroy: title: "删除备份" confirm: "你确定要删除该备份吗？" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 5af19db1da..51638d5626 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -118,7 +118,6 @@ zh_TW: enabled: '於 %{when} 列出' disabled: '於 %{when} 除名' topic_admin_menu: "版區管理員操作" - wizard_required: "是時候配置你的論壇啦！點擊開始設置嚮導！" emails_are_disabled: "管理員已經停用了所有外寄郵件功能。通知信件都不會寄出。" bootstrap_mode_enabled: "為方便站點準備發佈，現正處於初始化模式中。所有新用戶將被授予信任等級1，並為他們設置接受每日郵件摘要。初始化模式會在用戶數超過 %{min_users} 個時關閉。" bootstrap_mode_disabled: "初始化模式將會在24小時後關閉。" @@ -888,7 +887,6 @@ zh_TW: logging_in: "登入中..." or: "或" authenticating: "正在認證..." - awaiting_confirmation: "你的帳號尚未啟用，請使用忘記密碼連結重新發出啟用帳號的電子郵件。" awaiting_approval: "你的帳號尚未通過工作人員的審核，當審核通過時你會收到電子郵件通知。" requires_invite: "抱歉，只有受邀請者才能進入此論壇。" not_activated: "你還無法登入，我們之前曾將啟用帳號的電子郵件寄至 {{sentTo}}，請從該電子郵件啟用你的帳號。" @@ -1699,7 +1697,6 @@ zh_TW: suppress_from_homepage: "不在首頁上顯示此分類。" show_subcategory_list: "在此分類中，將子分類顯示在主題上方。" all_topics_wiki: "新的主題預設為共筆。" - sort_order: "預設排序：" allow_badges_label: "允許授予本分類的徽章" edit_permissions: "編輯權限" add_permission: "新增權限" @@ -1829,7 +1826,6 @@ zh_TW: history: "歷史" changed_by: "作者 {{author}}" raw_email: - title: "原始 Email" not_available: "不可使用" categories_list: "分類清單" filters: @@ -2350,7 +2346,6 @@ zh_TW: without_uploads: "是 ( 不包含檔案 )" download: label: "下載" - title: "下載備份" destroy: title: "刪除備份" confirm: "你確定要刪除備份嗎?" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 8a7fd69563..34a913e53a 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -907,7 +907,6 @@ ar: delete_removed_posts_after: "المشاركات التي تم إزالتها عن طريق الكتاب سيتم مسحها اوتوماتيكياً بعد(n) ساعات ة. اذا تم ضبطها علي 0، سيتم مسح المشاركه فوراً" max_image_width: "أقصى عرض للصور المصغرة في مشاركة" max_image_height: "أقصى ارتفاع للصور المصغرة في مشاركة" - category_featured_topics: "عدد المواضيع المعروضة لكل فئة من صفحة الفئات /categories .بعد تغير هذه القيمة, قد تستغرق صفحة الفئات 15 دقيقة لتُحَدّث." fixed_category_positions: "إذا تم التحقق, ستتمكن من ترتيب الفئات على شكل المطلوب. وإذا لم يتم التحقق, ستسرد الفئات على حسب الفعالية." fixed_category_positions_on_create: "إذا تحققت، سيحفظ ترتيب الفئة في موضوع الحوار المنشأ (يتطلب fixed_category_positions)." add_rel_nofollow_to_user_content: "أضف rel nofollow لجميع محتوى المستخدم المتقدم، باستثناء الروابط الداخلية (بما في ذلك المجالات الأصل). إذا غيرت هذا، يجب عليك عمل rebake لكل المشاركات بـ: \"rake posts:rebake\"" @@ -960,7 +959,6 @@ ar: ga_universal_domain_name: "تحليلات Google العالمية (analytics.js) تتعقب اسم المجال، مثال: mysite.com; انظر http://google.com/analytics" gtm_container_id: "هاوية حاوية ادارة العلامات الخاصة بجوجل. على سبيل المثال: GTM-ABCDEF" enable_escaped_fragments: "اللجوء الى استخدام Ajax-Crawling API حالة اكتشاف تواجد زاحف الشبكة. للمزيد: https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "فعل دعم محرك بحث webcrawler عبر علامة غير نصية." allow_moderators_to_create_categories: "السماح للمشرفين إنشاء قسم جديد" cors_origins: "اسمح بالأصول للطلبات عبر المنشأ (CORS). كل أصل يجب أن يتضمن http:// أو https://. متغير env لـ DISCOURSE_ENABLE_CORS يجب أن يعين إلى true ليعمل CORS." use_admin_ip_whitelist: "المدير فقط يمكنه تسجيل الدخول إذا كانت عناوين IP لهم معرفة في قائمة IP المحجوبة. (المدير > السجلات > IP المحجوبة)" @@ -1048,7 +1046,7 @@ ar: max_likes_per_day: "أقصى عدد من الإعجابات لكلّ مستخدم يوميًّا." max_flags_per_day: "أقصى عدد للإعلامات لكل عضو باليوم." max_bookmarks_per_day: "أقصى عدد من العلامات لكلّ مستخدم يوميًّا." - max_edits_per_day: "أقصى عدد للتعديلات لكل عضو باليوم." + max_edits_per_day: "أقصى عدد من عمليّات التّحرير لكلّ مستخدم يوميًّا." max_topics_per_day: "أقصى عدد للمواضيع التي يمكن للعضو إنشائها باليوم." max_private_messages_per_day: "أقصى عدد لرسائل الأعضاء التي يمكن إنشائها باليوم." max_invites_per_day: "أقصى عدد للدعوات التي يمكن للعضو إرسالها باليوم." @@ -1072,19 +1070,18 @@ ar: external_system_avatars_enabled: "استخدم خدمات الهه النظام الخارجي " default_opengraph_image_url: "عنوان رابط صورة ال اوبن جراف الثابتة" allow_all_attachments_for_group_messages: "اسمح بجميع ملحقات البريد للرسائل الجماعيه " - enable_flash_video_onebox: "تمكين التضمين من swf و FLV (أدوبي فلاش) وصلات في مربع واحد. تحذير: قد يعرض المخاطر الأمنية." + enable_flash_video_onebox: "فعّل تضمين روابط swf وflv (أدوبي فلاش) في الصّناديق. تحذير: قد يتسبّب بمخاطر أمنيّة." default_invitee_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين." default_trust_level: "مستوى الثقة الإفتراضي (0-4) للأعضاء المدعوين.تحذير! التغيرات ستضعك تحت خطر البريد الغير هام." - tl1_requires_topics_entered: "كمية المواضيع التي يجب على العضو الجديد دخولها قبل ترقيته لمستوى الثقة 1." - tl1_requires_read_posts: "كمية المشاركات التي يجب على العضو الجديد قرائتها قبل ترقيته لمستوى الثقة 1." - tl1_requires_time_spent_mins: "كمية الدقائق التي يجب على العضو الجديد قراءة المشاركات فيها قبل ترقيته لمستوى الثقة 1." - tl2_requires_topics_entered: "كمية المواضيع التي يجب على العضو دخولها قبل ترقيته لمستوى الثقة 2." - tl2_requires_read_posts: "كمية المشاركات التي يجب على العضو قرائتها قبل ترقيته لمستوى الثقة 2." - tl2_requires_time_spent_mins: "كمية الدقائق التي يجب على العضو قراءة المشاركات فيها قبل ترقيته لمستوى الثقة 2." - tl2_requires_days_visited: "كمية الأيام التي يجب على العضو زيارة الموقع فيها قبل ترقيته لمستوى الثقة 2." - tl2_requires_likes_received: "كمية الإعجابات التي يجب على العضو إرسالها قبل ترقيته لمستوى الثقة 2." - tl2_requires_likes_given: "كمية الإعجابات التي يجب على العضو جمعها قبل ترقيته لمستوى الثقة 2." - tl2_requires_topic_reply_count: "كمية مواضيع العضو التي يجب الرد عليها قبل الترقية لمستوى الثقة 2." + tl1_requires_topics_entered: "عدد المواضيع التي على المستخدم الجديد دخولها قبل ترقيته إلى مستوى الثّقة الأوّل." + tl1_requires_read_posts: "عدد المشاركات التي على المستخدم الجديد قراءتها قبل ترقيته إلى مستوى الثّقة الأوّل." + tl1_requires_time_spent_mins: "عدد الدّقائق التي على المستخدم الجديد إمضائها في قراءة المشاركات قبل ترقيته إلى مستوى الثّقة الأوّل." + tl2_requires_topics_entered: "عدد المواضيع التي على المستخدم دخولها قبل ترقيته إلى مستوى الثّقة الثّاني." + tl2_requires_read_posts: "عدد المشاركات التي على المستخدم قراءتها قبل ترقيته إلى مستوى الثّقة الثّاني." + tl2_requires_time_spent_mins: "عدد الدّقائق التي على المستخدم إمضائها في قراءة المشاركات قبل ترقيته إلى مستوى الثّقة الثّاني." + tl2_requires_likes_received: "عدد الإعجابات التي على المستخدم استقبالها قبل ترقيته إلى مستوى الثّقة الثّاني." + tl2_requires_likes_given: "عدد الإعجابات التي على المستخدم إعطائها قبل ترقيته إلى مستوى الثّقة الثّاني." + tl2_requires_topic_reply_count: "عدد المواضيع التي على المستخدم الرّد فيها قبل ترقيته إلى مستوى الثّقة الثّاني." tl3_requires_topics_viewed_all_time: "أقل عدد من المواضيع التي يجب على المستخدم مشاهدتها للتأهل لمستوى الثقة 3." tl3_requires_posts_read_all_time: "أقل عدد من المشاركات يجب على المستحدم قرائتها للتأهل لمستوى الثقة 3 ." tl3_promotion_min_duration: "أقل عدد من الأيام التي تكون الترقية إلى مستوى الثقة 3 قد أنتهت قبل عودة المستخدم لمستوى الثقة 2." @@ -1116,7 +1113,7 @@ ar: max_image_size_kb: "الحجم الاقص لتحميل صوره بالكيلو بايت.هذا يجب ضبطه في nginx (client_max_body_size) /اباتشي او البروكسي" max_attachment_size_kb: "أقصى حجم لتحميل المرفقات الملفات بالكيلوبايت. وهذا يجب أن يتم تكوينه في nginx (client_max_body_size) / أباتشي أو الوكيل. " authorized_extensions: "قائمة بالملفات المسموح رفعها (أستخدم '*' للسماح لجميع الأنواع)" - max_similar_results: "كم عدد المواضيع المتشابهه لتظهر للمحرر اثناء انشاء موضوع جديد.المقارنه تعتمد علي العنوان و المحتوي " + max_similar_results: "عدد المواضيع المشابهة لتُعرض فوق المحرّر عند إنشاء موضوع جديد. المقارنة تعتمد عنوان الموضوع ومتنه." title_prettify: "امنع العنوين المشتركه الاخطاء المطبعيه و الاخطاء, و يتضمن كل الحروف الكبيره, الحروف الصغيره الفراغ الاول , اكثر من ! و ؟ , زئده . في النهايه الخ" topic_views_heat_low: "بعد هذه المشاهدات العديدة، مجال هذه المشاهدات بارزة قليلا." topic_views_heat_medium: "بعد هذه المشاهدات العديدة، مجال هذه المشاهدات بارزة باعتدال." @@ -1151,7 +1148,7 @@ ar: auto_block_first_post_regex: "التعابير القياسية ستتحسس عند مرور أول منشور، سيتم حظره وارساله لقائمة الانتظار للموافقة، مثال raging|a[bc]a ستؤدي جميع المشاركات التي تحتوي على عنصرية أو جمعية المحامين الأمريكي أو هيئة مكافحة الفساد للحظر أول مرة. تنطبق فقط على أول منشور." reply_by_email_enabled: "تفعيل الرد على الموضوع بواسطة البريد الالكتروني" reply_by_email_address: "قالب للرد على عنوان البريد الإلكتروني الوارد بواسطة البريد الإلكتروني، مثال: %{reply_key}@reply.example.com أو الردود+%{reply_key}@example.com" - disable_emails: "منع Discourse من إرسال أي نوع من رسائل البريد الإلكتروني" + disable_emails: "امنع دسكورس من إرسال أيّ نوع من البريد" strip_images_from_short_emails: "شريط الصور من البريد الإلكتروني لها حجم أقل من 2800 بايت" short_email_length: "طول أقصر بريد الكتروني بـ Bytes." display_name_on_email_from: "أعرض الاسماء كاملة في البريد الالكتروني من المجال." @@ -1229,7 +1226,7 @@ ar: slug_generation_method: "اختر طريقه توليد سبيكه . 'مشفره' سوف تقوم بتوليد سلسله مئويه مشفره.'لاشي' سوف يعطل السبيكه" enable_emoji: "فعّل الإيموجي" emoji_set: "كيف تريد أن تبدو الإيموجي؟" - enforce_square_emoji: "أجبر نسبة جانب المربع لكل الرموز التعبيرية." + enforce_square_emoji: "أجبِر النّسبة الباعيّة لكلّ الإيموجي لتكون مربّعة." approve_post_count: "عدد المنشورات للمستخدم الجديد او الاساسي يجب ان تتم الموافقه عليه " approve_unless_trust_level: "مشاركات للأعضاء أدنى من مستوى الثقة هذا يجب أن تتم الموافقة عليها." default_email_private_messages: "أرسل بريد إلكتروني عندما يراسل شخص ما العضو إفتراضيا." @@ -1241,7 +1238,7 @@ ar: default_email_in_reply_to: "ارفق مقتبسات الرد على المنشور في رسائل البريد افتراضياً" default_other_new_topic_duration_minutes: "الشروط العالمية الافتراضية لموضوع يعتبر جديد." default_other_auto_track_topics_after_msecs: "الوقت العالمي الافتراضي قبل الموضوع متعقب آليا." - default_other_external_links_in_new_tab: "أفتح الروابط الخارجية في تبويب جديد إفتراضيا." + default_other_external_links_in_new_tab: "افتح الرّوابط الخارجيّة في ألسنة جديدة افتراضيًّا." default_other_enable_quoting: "فعل إقتباس الردود لتحديد النص إفتراضيا." default_other_dynamic_favicon: "إعرض عدد المواضيع الجديدة/الحديثة في أيقونة المتصفح إفتراضيا." default_other_disable_jump_reply: "لاتتجاوز الردود الى رد العضو مباشرة بعد اضافته رد جديد. " @@ -1250,14 +1247,17 @@ ar: default_categories_watching: "قائمة الفئات التي تشاهد إفتراضيا." default_categories_tracking: "قائمة الفئات التي تتابع إفتراضيا." default_categories_muted: "قائمة الفئات التي توضع صامتة إفتراضيا." + company_short_name: "اسم الشّركة (قصير)" + company_full_name: "اسم الشّركة (الكامل)" + company_domain: "نطاق الشّركة" errors: - invalid_email: "بريد الكتروني غير صالح " - invalid_username: "لا يوجد مستخدم بهذا الاسم " - invalid_integer_min_max: "القيمة يجب أن تكون بين %{min} و %{max}." - invalid_integer_min: "القيمة يجب أن تكون %{min} أو أكثر." - invalid_integer_max: "القيمة لا يمكن أن تكون أكثر من %{max}." - invalid_integer: "القيمة يجب أن تكون عدد صحيح" - regex_mismatch: "القيمة لا تتناسب مع الشكل المطلوب" + invalid_email: "عنوان البريد غير صالح." + invalid_username: "لا مستخدم بهذا الاسم." + invalid_integer_min_max: "يجب أن تكون القيمة بين %{min} و%{max}." + invalid_integer_min: "يجب أن تكون القيمة %{min} فأعلى." + invalid_integer_max: "لا يمكن أن تكون القيمة أعلى من %{max}." + invalid_integer: "يجب أن تكون القيمة عددًا صحيحًا." + regex_mismatch: "لا تطابق القيمة التّنسيق المطلوب." must_include_latest: "ويجب أن تتضمن القائمة العلوية علامة التبويب 'أحدث'." invalid_string: "قيمة غير صحيحة" invalid_string_min_max: "يجب أن تكون الأحرف بين %{min} و %{max}." @@ -1270,6 +1270,10 @@ ar: category: 'الأقسام' topic: 'نتائج ' user: 'مستخدمين ' + sso: + not_found: "تعذّر العثور على الحساب. رجاء تواصل مع مدير الموقع." + unknown_error: "ثمّة مشكلة بالحساب. رجاء تواصل مع مدير الموقع." + timeout_expired: "انتهت مهلة جلسة الولوج، رجاء جرّب الولوج ثانيةً." original_poster: "المشاركات الأصلية " most_posts: "معظم المشاركات" most_recent_poster: "معظم المشاركات الاخيرة " @@ -1299,10 +1303,6 @@ ar: change_owner: post_revision_text: "نقل الملكية من %{old_user} إلى %{new_user}" deleted_user: "عضو محذوف" - emoji: - errors: - name_already_exists: "للأسف، الاسم '{name}%' مستخدم بواسطة رموز تعبيرية أخرى." - error_while_storing_emoji: "للأسف ، حدث خطأ عند تخزين الرموز التعبيرية." topic_statuses: archived_enabled: "هذا الموضوع مؤرشف الأن. لن تستطيع أن تعدل عليه بأي طريقة." archived_disabled: "هذا الموضوع غير مؤرشف الأن.لم يجمد، و تستطيع أن تعدل عليه." @@ -1367,7 +1367,7 @@ ar: not_activated: "لا يمكنك تسجيل الدخول حتى الان. أرسلنا رسالة تنشيط لك. يرجى اتباع التعليمات الواردة في البريد الإلكتروني لتفعيل حسابك" not_allowed_from_ip_address: "ﻻ يمكنك تسجيل الدخول كـ %{username} من هذا الـIP" admin_not_allowed_from_ip_address: "لا يمكنك تسجيل الدخول كمدير من خلال هذا العنوان الرقمي - IP." - suspended: "ﻻ يمكنك تسجيل الدخول حتى %{date}." + suspended: "لا يمكنك الولوج حتّى %{date}." suspended_with_reason: "الحساب موقوف حتى %{date}: %{reason}" errors: "%{errors}" not_available: "غير متاح. جرّب %{suggestion} ؟" @@ -1375,8 +1375,8 @@ ar: omniauth_error: "نأسف, هناك خطأ في تصريح حسابك. ربما لم تعطي تصريح؟" omniauth_error_unknown: "حدث خطأ ما في معالجة دخولك، الرجاء إعادة المحاولة." new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت " - password_too_long: "الحد الاقصى لكلمة المرور 200 حرف" - email_too_long: "عنوان البريد الذي ادخلته طويل جدًا. يجب ان لا يزيد عدد الأحرف عن 254 حرفًا, ويجب أن تكون أسماء النطاقات أكثر من 253 حرفًا." + password_too_long: "كلمة السّرّ مقصورة على 200 محرف." + email_too_long: "عنوان البريد الإلكترونيّ الذي قدّمته طويل جدًّا. لا يجب أن يزيد طول أسماء صناديق البريد على 254 محرفًا، ولا يجب أن يزيد طول أسماء النّطاقات على 253 محرفًا." reserved_username: "اسم المستخدم ذلك غير مسموح." missing_user_field: "لم تُكمل كافة الحقول المطلوبة " close_window: "تم التحقق . اغلق هذه النافذة للإستمرار" @@ -1425,6 +1425,7 @@ ar: (إذا انتهت مدة صلاحية الرابط أعلاه، اختر "نسيت كلمة المرور" عند تسجيل الدخول مع عنوان البريد الإلكتروني الخاص بك.) new_version_mailer: + subject_template: "[%{email_prefix}] إصدارة دسكورس جديدة، ثمّة تحديث متوفّر" text_body_template: | مرحى! هناك إصدارة جديدة متوفّرة من [دسكورس](http://www.discourse.org)! @@ -1492,10 +1493,7 @@ ar: csv_export_failed: subject_template: "فشل تصدير البيانات" text_body_template: "نأسف، فشل تصدير البيانات. رجاء افحص السّجلّات أو راسل أحد أعضاء الطّاقم." - email_reject_no_account: - subject_template: "[%{site_name}] بريد الكتروني -- حساب غير معروف" email_reject_empty: - subject_template: "[%{site_name}] بريد الكتروني -- بدون محتوى" text_body_template: | آسفون، لكن رسالة البريد الالكتروني إلى %{destination} (titled %{former_title}) لم تنجح . @@ -1507,24 +1505,6 @@ ar: نحن آسفون ، ولكن رسالة البريد الإلكتروني إلى %{destination} (titled %{former_title}) لا تعمل. لم نتمكن من العثور على أي محتوى في البريد الإلكتروني الخاص بك. **تأكد من الرد الخاص بك هو في الجزء العلوي من البريد الإلكتروني -- نحن لا يمكننا معالجة الردود في سطر . - email_reject_invalid_access: - subject_template: "[%{site_name}] بريد الكتروني -- غير صالح" - email_reject_strangers_not_allowed: - subject_template: "مشاكل البريد ألالكتروني [%{site_name}] -- دخول غير صالح" - email_reject_invalid_post: - subject_template: "مشاكل البريد ألالكتروني [%{site_name}] -- مشكله في النشر " - email_reject_invalid_post_specified: - subject_template: "مشاكل البريد ألالكتروني [%{site_name}] -- مشكله في النشر " - email_reject_reply_key: - subject_template: "[%{site_name}] بريد الكتروني -- مفتاح رد غير معروف" - email_reject_topic_not_found: - subject_template: "[%{site_name}] بريد الكتروني -- موضوع غير موجود" - email_reject_topic_closed: - subject_template: "[%{site_name}] بريد الكتروني -- موضوع مغلق" - email_reject_auto_generated: - subject_template: "[%{site_name}] بريد الكتروني -- توليد رد آلي" - email_error_notification: - subject_template: "[%{site_name}] بريد الكتروني -- خطأ مصادقة POP" spam_post_blocked: subject_template: "العضو الجديد %{username} تم حجب مشاركاته بسبب تكرار الروابط " pending_users_reminder: @@ -1572,7 +1552,6 @@ ar: أنقر على الرابط التالي لإختيار كلمة المرور : %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] تسجيل الدخول" text_body_template: | شخص طلب تسجيل الدخول إلى الحساب الخاص بك في [%{site_name}](%{base_url}). @@ -1581,18 +1560,11 @@ ar: اضغط على الرابط التالي للدخول: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] حسابك الجديد" text_body_template: | تم إنشاء حساب جديد بالنسبة لك في %{site_name} انقر على الرابط التالي لاختيار كلمة مرور لحسابك الجديد: %{base_url}/users/password-reset/%{email_token} - confirm_new_email: - subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الجديد" - confirm_old_email: - subject_template: "[%{site_name}] تأكيد عنوان بريدك الإلكتروني الحالي" - notify_old_email: - subject_template: "[%{site_name}] عنوان بريدك الإلكتروني تم تغييره" signup_after_approval: subject_template: "قد وافقت على %{site_name}!" text_body_template: | @@ -1610,7 +1582,6 @@ ar: (اذا احتجت للاتصال مع [افراد الطاقم]({base_url}/about}%)كمستخدم جديد , فقط قم بالرد علي هذه الرساله). signup: - subject_template: "[%{site_name}] تأكيد حسابك الجديد " text_body_template: | أهلا وسهلا بك في %{site_name}! @@ -1674,37 +1645,8 @@ ar: تعديل محتويات المنشور الاول في هذا الموضوع %{page_name} page. guidelines_topic: title: "الأسئلة الشائعة/توجيهات" - body: | - اهلاً بك معنا، - - إن هذا الموقع يتيح لجميع مستخدمية حرية التعبير ومشاركة المعلومة مع الآخرين بدون أي قيود إلا اننا نتوقع منك الإلتزام بالأداب العامة، وعكس صورة جميلة عن شخصيتك. - - نحن هنا نبحث عن الفائدة اولاً ونحث على مشاركتها مع الآخرين فأجعل مشاركاتك مفيدة قدر المستطاع، وتذكر ان شخص ما قد يستفيد منها ويدعو لك دعوة في ظهر الغيب. - - - تقبل اراء الآخرين حتى لو كانت مختلفة عن ارائك الشخصية. - - الأختلاف يكون بالفكرة نفسها وليس ضد صاحب الفكرة. - - النقاش المثري والصحي يعود بالفائدة للجميع. - - - شكراً لوقتك .. tos_topic: title: "شروط الخدمة" - body: | - رسالتنا : - - نحن في الموقع كإدارة نحاول النهوض بالمستوى المهني على الصعيد االمحلي بشكل كامل وإثراء الموقع وتسهيل التواصل بين ذوي الخبرة وحديثين التخرج بمواضيع تخدم المهتمين وذوي الإحتياج وتثري النقاشات المهنية المتعددة الهادفة إلى الرقي بالفكر المهني ونساعد إلى تكوين فكر واعي ومطلع على الجديد وبما يتعلق بإهتماماتنا. - - المشاركة في جميع اقسام الموقع مجانية ومتاحة للجميع لكن عليك الإلتزام بالشروط التالية: - - 1- عدم استخدام الألفاظ البذيئة أو السوقية او الخارجة عن اطار النقد البناء والنقاش الهادف. - - 2- عدم التعرض لأمور الدين نهائيا. - - 3- عدم التعرض بالسب أو الشتم أو التشهير من غير أدلة قطعية أو استخدام ألفاظ غير مقبولة في إطار النقد لأي جهة او شخص ما. - - 4- كتابة الموضوع في المكان المخصص له. - - نشكرك لتعاونك معنا. privacy_topic: title: "سياسة الخصوصية" body: | diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index 344c2570e6..b7aff2a3f4 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -274,6 +274,8 @@ bs_BA: title: "Users" xaxis: "Day" yaxis: "Number of new users" + profile_views: + xaxis: "Dan" topics: title: "Topics" xaxis: "Day" @@ -341,6 +343,8 @@ bs_BA: title: "Top Referred Topics" xaxis: "Topic" num_clicks: "Clicks" + page_view_anon_reqs: + xaxis: "Dan" time_to_first_response: yaxis: "Prosječno vrijeme (hours)" dashboard: @@ -382,7 +386,6 @@ bs_BA: delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." max_image_width: "Maximum thumbnail width of images in a post" max_image_height: "Maximum thumbnail height of images in a post" - category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity." add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\"" post_excerpt_maxlength: "Maximum length of a post excerpt / summary." @@ -407,7 +410,6 @@ bs_BA: must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site." ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" - enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag" allow_moderators_to_create_categories: "Allow moderators to create new categories" cors_origins: "Allowed origins for cross-origin requests (CORS). Each origin must include http:// or https://. The DISCOURSE_ENABLE_CORS env variable must be set to true to enable CORS." top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|starred|categories|top|read|posted" @@ -588,6 +590,7 @@ bs_BA: notify_about_flags_after: "If there are flags that haven't been handled after this many hours, send an email to the contact_email. Set to 0 to disable." show_create_topics_notice: "If the site has fewer than 5 public topics, show a notice asking admins to create some topics." prevent_anons_from_downloading_files: "Prevent anonymous users from downloading files. WARNING: this will prevent any site assets posted as attachments from working." + enable_emoji: "Omogući smajlije" errors: invalid_email: "Invalid email address." invalid_username: "There's no user with that username." @@ -662,12 +665,6 @@ bs_BA: subject_template: "%{invitee_name} vas poziva da se pridružite %{site_domain_name}" invite_password_instructions: subject_template: "Set password for your %{site_name} account" - test_mailer: - subject_template: "[%{site_name}] Email Deliverability Test" - new_version_mailer: - subject_template: "[%{site_name}] New Discourse version, update available" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] update available" flag_reasons: off_topic: "Your post was flagged as **off-topic**: the community thinks it does not fit into the topic, as currently defined by the title and the first post." inappropriate: "Your post was flagged as **inappropriate**: the community thinks it is offensive, abusive, or a violation of [the community guidelines](/guidelines)." @@ -720,14 +717,6 @@ bs_BA: csv_export_failed: subject_template: "Export failed" text_body_template: "The export has failed. Please check the logs." - email_reject_no_account: - subject_template: "Email issue -- No Account" - email_reject_empty: - subject_template: "Email issue -- No Content" - email_reject_reply_key: - subject_template: "Email issue -- Bad Reply Key" - email_error_notification: - subject_template: "Email issue -- POP authentication error" spam_post_blocked: subject_template: "New user %{username} posts blocked due to repeated links" pending_users_reminder: @@ -746,23 +735,10 @@ bs_BA: title: "Odjavi se" description: "Niste zainteresovani za ove email-e? Nema problema! Kliknite ovdje da se odjavite:" posted_by: "Odgovoreno %{username} dana %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} invited you to a private message '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: why: "Ukratko šta se dešavalo na %{site_link} od vaše zadnje posjete %{last_seen_at}." click_here: "klikni ovdje" forgot_password: - subject_template: "[%{site_name}] Obnova Šifre" text_body_template: | Potražena je obnova šifre na [%{site_name}](%{base_url}). @@ -771,7 +747,6 @@ bs_BA: Kliknite ovdje da resetujete vašu šifru: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Odredi Šifru" text_body_template: | Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address. @@ -780,7 +755,6 @@ bs_BA: Click the following link to choose a password: %{base_url}/users/password-reset/%{email_token} account_created: - subject_template: "[%{site_name}] Vaš Novi Nalog" text_body_template: | Novi nalog je kreiran za vas na %{site_name} diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 74796b9a1e..863fcb5242 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -575,7 +575,6 @@ cs: min_search_term_length: "Minimální délka hledaného výrazu ve znacích" unique_posts_mins: "Kolik minut musí uplynout, než může uživatel zaslat příspěvek se stejným obsahem" queue_jobs: "Zařazovat úlohy do fronty v sidekiq, není-li nastaveno, jsou úlohy vyřizovány okamžitě" - category_featured_topics: "Počet témat zobrazených v seznamu kategorií" apple_touch_icon_url: "Ikona používaná pro doteková zařízení od firmy Apple. Doporučené rozměry jsou 144px krát 144px." email_custom_headers: "Seznam vlastních hlaviček emailů, oddělený svislítkem" enable_long_polling: "'Message bus' smí používat dlouhé výzvy" @@ -583,7 +582,6 @@ cs: notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." ga_universal_tracking_code: "Kód Google Universal Analytics (analytics.js); například UA–12345678-9; více na http://google.com/analytics" ga_universal_domain_name: "Doménové jméno Google Universal Analytics (analytics.js); například mojeforum.cz; více na http://google.com/analytics" - enable_noscript_support: "Povolit podporu <noscript> tagu" allow_moderators_to_create_categories: "Povolit moderátorům vytváření nových kategorií." post_menu: "Určuje, které položky se zobrazí v menu u příspěvku a v jakém pořadí. Příklad: like|edit|flag|delete|share|bookmark|reply" track_external_right_clicks: "Počítat kliknutí na externí odkazy pravým tlačítkem (např. otevření do nové záložky); defaultně zakázáno kvůli přepisu URL" @@ -670,12 +668,6 @@ cs: email: not_allowed: "není povolen od tohoto emailového poskytovatele. Prosím použijte jinou emailovou adresu." blocked: "není povolen." - test_mailer: - subject_template: "[%{site_name}] Zkušební email" - new_version_mailer: - subject_template: "[%{site_name}] Je k dispozici nová verze Discourse." - new_version_mailer_with_notes: - subject_template: "[%{site_name}] Updates Are Available" system_messages: welcome_user: subject_template: "Vítejte na %{site_name}!" @@ -707,22 +699,9 @@ cs: title: "Odhlásit z odběru emailů" description: "Nechcete již od nás dostávat emaily? Žádný problém! Klikněte na odkaz níže pro okamžité odhlášení z odběru emailů:" posted_by: "Zaslal uživatel %{username} dne %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} Vás pozval do konverzace '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{username} vás citoval v '%{topic_title}'" - user_quoted: - subject_template: "[%{site_name}] %{username} vás citoval v '%{topic_title}'" - user_mentioned: - subject_template: "[%{site_name}] %{username} vás citoval v '%{topic_title}'" - user_posted: - subject_template: "[%{site_name}] %{username} vás citoval v '%{topic_title}'" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: click_here: "klikněte zde" forgot_password: - subject_template: "[%{site_name}] Obnovení hesla" text_body_template: | Někdo zažádal o obnovení vašeho hesla na [%{site_name}](%{base_url}). @@ -731,7 +710,6 @@ cs: Klikněte na následující odkaz pro vytvoření nového hesla: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Set Password" text_body_template: | Somebody asked to add a password to your account on [%{site_name}](%{base_url}). Alternatively, you can log in using any supported online service (Google, Facebook, etc) that is associated with this validated email address. @@ -739,8 +717,6 @@ cs: Click the following link to choose a password: %{base_url}/users/password-reset/%{email_token} - admin_login: - subject_template: "[%{site_name}] Přihlášení" signup_after_approval: subject_template: "Byli jste schváleni na %{site_name}!" signup: diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index 3aca7e3339..8cc67ab96b 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -336,7 +336,6 @@ da: pms_per_day: "Du har nu nået det maksimalt antal tilladte beskeder. Vent venligst %{time_left} før du prøver igen." create_like: "Du har nået grænsen for antal tilladte 'likes' for i dag. Vent venligst %{time_left} før du prøver igen." create_bookmark: "Du har nået det maksimalt antal tilladte bogmærker i dag. Vent venligst %{time_left} før du prøver igen. " - edit_post: "Du har nået det maksimalt antal tilladte redigeringer i dag. Vent venligst %{time_left} før du prøver igen." live_post_counts: "Du efterspørger udgivede emner for hurtigt. Vent venligst %{time_left} før du prøver igen." unsubscribe_via_email: "Du har nået det maksimalt antal tilladte afmeldinger via email i dag. Vent venligst%{time_left} før du prøver igen." topic_invitations_per_day: "Du har nået det maksimalt antal tilladte emne invitationer i dag. Vent venligst %{time_left} før du prøver igen." @@ -729,7 +728,6 @@ da: delete_removed_posts_after: "Indlæg, fjernet af forfatteren, vil blive automatisk slettet efter (n) hours. Såfremt værdien sat til 0 vil indlæg blive fjernet straks." max_image_width: "Maximum thumbnail width of images in a post" max_image_height: "Maksimum miniaturebillede højde for billeder i et indlæg" - category_featured_topics: "Antallet af emner der vises pr. kategori på /categories-siden. Efter ændring af denne værdi kan det tage op til 15 minutter før kategorisiden opdateres." fixed_category_positions: "Hvis krydset af, vil du være i stand til at arrangere ordnet visning af kategorier. Hvis ikke afkrydset vil de være listet i en rækkefølge baseret på aktivitet." fixed_category_positions_on_create: "Hvis afkrydset vil kategori visning blive vedligeholdt baseret på emne (kræver manuelt valgt visning af kategorier)." exclude_rel_nofollow_domains: "En liste af domæner hvor 'nofollow' skal tilføjes til links. tid.com vil desuden automatisk tillade sub.tid Som minimum bør du tilføje top level domænet til sitet, for at hjælpe webcrawlere finde alt indhold. Såfremt andre dele af jeres site er på andre domæner, så tilføj også disse." @@ -782,7 +780,6 @@ da: ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF" - enable_noscript_support: "Aktivér standard webcrawler søgemaskineunderstøttelse vha. noscript-tagget" allow_moderators_to_create_categories: "Tillad moderatorer at skabe nye kategorier" use_admin_ip_whitelist: "Admins kan kun logge ind hvis de logger på fra en prædefineret IP liste: (Admin > Logs > Screened Ips)." top_menu: "Afklar hvilke ting fremgår af sidens navigations bar, og i hvilken rækkefølge. Eksempel: latest|new|unread|categories|top|read|posted|bookmarks" @@ -804,7 +801,6 @@ da: invite_passthrough_hours: "Hvor længe kan en bruger benytte en tidligere benyttet invitation til at logge ind, i timer." invite_only: "Offentlig registrering er deaktiveret, alle nye brugere skal inviteres af andre medlemmer eller Staff." login_required: "Kræv godkendelse til at læse indhold på dette site, og tillad ikke anonym adgang." - reserved_usernames: "Brugernavne for hvem oprettelse ikke er mulig." min_password_length: "Mindste adgangskodelængde." min_admin_password_length: "Minimumslængde for Admin adgangskoder." block_common_passwords: "Tillad ikke adgangskoder som findes i de 10.000 mest benyttede adgangskoder." @@ -947,17 +943,11 @@ da: other: "%{count} flag venter på at blive håndteret" unsubscribe_mailer: subject_template: "Bekræft at du ikke længere ønsker at modtage email opdateringer fra %{site_title}" - test_mailer: - subject_template: "[%{site_name}] test af e-mail-udsendelse" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] Opdateringer er tilgængelige" system_messages: welcome_user: subject_template: "Velkommen til %{site_name}!" welcome_invite: subject_template: "Velkommen til %{site_name}!" - email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Email problem -- ugyldig adgang" pending_users_reminder: subject_template: one: "1 bruger afventer godkendelse" @@ -983,16 +973,6 @@ da: reply_by_email: "[Besøg emnet](%{base_url}%{url}) eller svar på denne email for at svare." reply_by_email_pm: "[Gå til besked](%{base_url}%{url}) eller svar på denne email for at svare." posted_by: "Oprettet af %{username} den %{post_date}" - user_replied: - subject_template: "[%{site_name}] %{username} svarede på dit indlæg i emnet '%{topic_title}'" - user_quoted: - subject_template: "[%{site_name}] %{username} citerede dig i emnet '%{topic_title}'" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{subject_prefix}%{username} skrev et indlæg i emnet '%{topic_title}'" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: why: "Et kort resumé af %{site_link} siden dit sidste besøg %{last_seen_at}" since_last_visit: "Siden dit sidste besøg" @@ -1000,15 +980,11 @@ da: new_posts: "Nye indlæg" popular_topics: "Populære emner" join_the_discussion: "Læs mere" - subject_template: "[%{site_name}] Resumé" unsubscribe: "Dette resumé sendes fra %{site_link} når vi ikke har set dig i et stykke tid. For at afmelde %{unsubscribe_link}." click_here: "klik her" from: "%{site_name} resumé" preheader: "Et kort resume siden de sidste besøg %{last_seen_at}" - mailing_list: - subject_template: "[%{site_name}] Resumé for %{date}" forgot_password: - subject_template: "[%{site_name}] Nulstil kodeord" text_body_template: | Nogen har bedt om at få nulstillet dit kodeord på [%{site_name}](%{base_url}). @@ -1017,7 +993,6 @@ da: Klik her for at vælge et nyt kodeord: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Sæt kodeord" text_body_template: | Nogen har bedt om at tilføje et kodeord til din konto på [%{site_name}](%{base_url}). Du kan også loge ind med en af de undestøttede online services (Google, Facebook o.s.v. ) som associeret med denne bekræftede emailadresse. @@ -1026,18 +1001,9 @@ da: Klik på følgende for at vælge et kodeord.: %{base_url}/users/password-reset/%{email_token} - account_created: - subject_template: "[%{site_name}] Din nye konto" - confirm_new_email: - subject_template: "[%{site_name}] Bekræft din nye email adresse" - confirm_old_email: - subject_template: "[%{site_name}] Bekræft din nuværende email adresse" - notify_old_email: - subject_template: "[%{site_name}] Din email adresse er blevet ændret" signup_after_approval: subject_template: "Du er blevet godkendt på %{site_name}!" signup: - subject_template: "[%{site_name}] Bekræft din nye konto" text_body_template: | Velkommen til %{site_name}! diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index c54a655e56..605b977443 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -110,6 +110,7 @@ de: s3_upload_bucket_is_required: "Uploads auf Amazon S3 können nicht aktiviert werden, bevor der 's3_upload_bucket' eingetragen wurde." invite: not_found: "Dein Einladungsschlüssel ist ungültig. Bitte kontaktiere den Administrator der Seite." + user_exists: "Es ist nicht nötig %{email} einzuladen, weil es dieses Konto bereits gibt!" bulk_invite: file_should_be_csv: "Die hochzuladende Datei sollte im CSV-Format vorliegen." error: "Es gab einen Fehler beim Hochladen dieser Datei. Bitte versuche es später noch einmal." @@ -336,6 +337,10 @@ de: attributes: payload_url: invalid: "URL ist ungültig. URL sollte http:// oder https:// enthalten, Leerzeichen sind nicht erlaubt." + custom_emoji: + attributes: + name: + taken: wird schon von einem anderen Emoji verwendet <<: *errors user_profile: no_info_me: "
Das 'Über mich'-Feld deines Profils ist aktuell leer, möchtest du es ausfüllen?
" @@ -848,7 +853,6 @@ de: delete_removed_posts_after: "Beiträge, die deren Verfasser selbst entfernt hat, werden nach (n) Stunden automatisch gelöscht. Die Beiträge werden sofort gelöscht, wenn dieser Wert auf 0 gesetzt wird." max_image_width: "Maximale Breite von Thumbnails von Bildern in einem Beitrag." max_image_height: "Maximale Höhe von Vorschaubildern in einer Nachricht" - category_featured_topics: "Anzahl der angezeigten Themen je Kategorie auf der /categories Seite. Nachdem dieser Wert geändert wurde, dauert es bis zu 15 Minuten bis die Kategorieseite aktualisiert ist." fixed_category_positions: "Falls aktiviert können Kategorien in einer fest vorgegebenen Reihenfolge angeordnet werden. Andernfalls werden Kategorien nach Aktivität sortiert aufgelistet." fixed_category_positions_on_create: "Wenn aktiviert wird die Kategoriezuordnung beim Erstellen eines Themas erhalten (benötigt fixed_category_positions)." add_rel_nofollow_to_user_content: "Füge mit Ausnahme interner Links (schließt übergeordnete Domains ein) allen benutzergenerierten Inhalten 'rel nofollow' hinzu. Die Änderung dieser Einstellung erfordert, dass du sämtliche Markdown-Beiträge aktualisierst: \"rake posts:rebake\"" @@ -907,7 +911,6 @@ de: ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; Siehe http://google.com/analytics" gtm_container_id: "Google Tag Manager Container-ID, z.B.: GTM-ABCDEF" enable_escaped_fragments: "Als Fallback die Ajax-Crawling-API von Google verwenden, wenn keine Suchmaschine deaktiviert wurde. Siehe https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Aktiviere Standard-Suchmaschinen-Webcrawler-Unterstützung durch den noscript-Tag" allow_moderators_to_create_categories: "Erlaube Moderatoren neue Kategorien zu erstellen" cors_origins: "Erlaubte Adressen für Cross-Origin-Requests (CORS). Jede Adresse muss http:// oder https:// enthalten. Die Umgebungsvariable DISCOURSE_ENABLE_CORS muss gesetzt sein, um CORS zu aktivieren." use_admin_ip_whitelist: "Administratoren können sich nur anmelden, wenn sie von einer IP-Adresse aus zugreifen, welcher unter den vertrauenswürden IP-Adressen gelistet ist (Admin > Logs > Screened Ips)." @@ -1335,10 +1338,13 @@ de: topic: 'Ergebnisse' user: 'Benutzer' sso: + login_error: "Fehler bei der Anmeldung" not_found: "Dein Konto wurde nicht erkannt. Bitte kontaktiere den Administrator dieser Site." account_not_approved: "Dein Konto wurde noch nicht genehmigt. Du bekommst eine E-Mail, sobald das geschehen ist." unknown_error: "Es besteht ein Problem mit deinem Konto. Bitte kontaktiere den Administrator dieser Site." timeout_expired: "Die Anmeldung ist abgelaufen, bitte versuch dich erneut anzumelden." + no_email: "Es wurde keine E-Mail-Adresse angegeben. Bitte kontaktiere den Administrator dieser Seite." + email_error: "Ein Konto konnte nicht registriert werden mit der E-Mail-Adresse %{email}. Bitte kontaktiere den Administrator dieser Seite." original_poster: "Autor des ersten Beitrags" most_posts: "Autor der meisten Beiträge" most_recent_poster: "Autor des jüngsten Beitrags" @@ -1363,10 +1369,6 @@ de: change_owner: post_revision_text: "Eigentümer geändert von %{old_user} zu %{new_user}" deleted_user: "ein gelöschter Benutzer" - emoji: - errors: - name_already_exists: "Es tut uns leid, der Name '%{name}' wird schon von einem anderen emoji verwendet." - error_while_storing_emoji: "Es tut uns leid, es gab einen Fehler beim Speichern des emoji." topic_statuses: archived_enabled: "Dieses Thema ist nun archiviert. Es ist eingefroren und kann in keiner Weise mehr verändert werden." archived_disabled: "Dieses Thema wurde aus dem Archiv geholt. Es ist nicht länger eingefroren und kann verändert werden." @@ -1552,6 +1554,7 @@ de: (Wenn der Link abgelaufen ist, wähle "Passwort vergessen" aus, wenn du dich mit deiner E-Mail-Adresse einloggen möchtest.) download_backup_mailer: title: "Backup-Download Mailer" + subject_template: "[%{email_prefix}] Backup der Seite herunterladen" text_body_template: | Here ist der [Seiten-Backup-Download](%{backup_file_path}), den du angefordert hast. @@ -1562,6 +1565,7 @@ de: Entschuldige, der Backup-Download-Link wurde schon verwendet oder ist abgelaufen. test_mailer: title: "Test-E-Mail" + subject_template: "[%{email_prefix}] Test der E-Mail-Zustellbarkeit" text_body_template: | Dies ist eine Test-E-Mail von @@ -1605,7 +1609,7 @@ de: [mt]: http://www.mail-tester.com/ new_version_mailer: title: "Neue Version" - subject_template: "[%{site_name}] Neue Discourse Version, Update verfügbar" + subject_template: "[%{email_prefix}] Neue Discourse-Version, Update verfügbar" text_body_template: | Hurra, eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar! @@ -1619,7 +1623,7 @@ de: - Besuche [meta.discourse.org](https://meta.discourse.org) für Neuigkeiten, Diskussionen und Support für Discourse new_version_mailer_with_notes: title: "Neue Version mit Versionshinweisen" - subject_template: "[%{site_name}] Update verfügbar" + subject_template: "[%{email_prefix}] Update verfügbar" text_body_template: | Hurra, eine neue Version von [Discourse](http://www.discourse.org) ist verfügbar! @@ -1638,8 +1642,8 @@ de: queued_posts_reminder: title: "Erinnerung an Freischaltung wartender Beiträge" subject_template: - one: "[%{site_name}] %{count} auf Freischaltung wartender Beitrag." - other: "[%{site_name}] %{count} auf Freischaltung wartende Beiträge." + one: "[%{email_prefix}] 1 Beitrag wartet auf Überprüfung" + other: "[%{email_prefix}] %{count} Beiträge warten auf Überprüfung" text_body_template: | Hallo, @@ -1789,56 +1793,56 @@ de: text_body_template: "Entschuldigung, beim Exportieren deiner Daten trat ein Fehler auf. Bitte kontaktiere ein Team-Mitglied oder überprüfe die Logdateien." email_reject_insufficient_trust_level: title: "E-Mail abgelehnt weil Vertrauensstufe unzureichend" - subject_template: "[%{site_name}] E-Mail-Problem -- Unzureichende Vertrauensstufe" + subject_template: "[%{email_prefix}] E-Mail-Probme -- Vertrauensstufe nicht ausreichend" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (Titel: %{former_title}) konnte nicht zugestellt werden. Du hast nicht die notwendige Vertrauensstufe, um neue Themen über diese E-Mail-Adresse zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied. email_reject_user_not_found: title: "E-Mail abgelehnt weil Benutzer nicht gefunden" - subject_template: "[%{site_name}] E-Mail-Problem -- Benutzer nicht gefunden" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer nicht gefunden" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Deine Antwort wurde von einer unbekannten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied. email_reject_screened_email: title: "E-Mail abgelehnt weil E-Mail-Adresse gesperrt" - subject_template: "[%{site_name}] E-Mail-Problem -- Blockiertee E-Mail-Adresse" + subject_template: "[%{email_prefix}] E-Mail-Problem -- E-Mail-Adresse blockiert" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Deine Antwort wurde von einer blockierten E-Mail-Adresse gesendet. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied. email_reject_inactive_user: title: "E-Mail abgelehnt weil Benutzer inaktiv" - subject_template: "[%{site_name}] E-Mail-Problem -- Inaktiver Benutzer" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer inaktiv" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. Dein mit dieser E-Mail-Adresse verbundenes Benutzerkonto ist nicht aktiviert. Bitte aktiviere dein Konto bevor du E-Mails sendest. email_reject_blocked_user: title: "E-Mail abgelehnt weil Benutzer gesperrt" - subject_template: "[%{site_name}] E-Mail-Problem -- Blockierter Benutzer" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Benutzer blockiert" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. Dein mit dieser E-Mail-Adresse verbundenes Konto wurde blockiert. email_reject_reply_user_not_matching: title: "E-Mail abgelehnt weil E-Mail-Adresse abweichend" - subject_template: "[%{site_name}] E-Mail-Problem -- Unerwartete Antwort-Adresse" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortadresse unerwartet" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Deine Antwort wurde von einer anderen E-Mail-Adresse versandt als wir erwartet haben, weshalb wir nicht sicher wissen ob das die gleiche Person ist. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied. email_reject_no_account: title: "E-Mail abgelehnt weil unbekanntes Konto" - subject_template: "[%{site_name}] E-Mail-Problem -- Unbekanntes Konto" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Konto unbekannt" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Wir konnten kein Konto finden, das zu deiner E-Mail-Adresse passt. Probiere eine andere Absende-Adresse oder wende dich an ein Team-Mitglied. email_reject_empty: title: "E-Mail abgelehnt weil kein Inhalt" - subject_template: "[%{site_name}] E-Mail-Problem -- Kein Inhalt" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Kein Inhalt" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. @@ -1847,35 +1851,35 @@ de: Wenn du diese E-Mail bekommst, obwohl deine E-Mail Inhalt enthalten hat, versuche es erneut mit weniger Formatierung. email_reject_parsing: title: "E-Mail abgelehnt weil Inhalt nicht erkannt" - subject_template: "[%{site_name}] E-Mail-Problem -- Inhalt nicht erkannt" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Inhalt nicht erkannt" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. Wir konnten keinen Inhalt in deiner E-Mail feststellen. **Versichere dich, dass du den Inhalt oberhalb der erhaltenen E-Mail eingegeben hast** -- Eingebettete Antworten können wir nicht verarbeiten. email_reject_invalid_access: title: "E-Mail abgelehnt weil nicht erlaubt" - subject_template: "[%{site_name}] E-Mail-Problem -- Nicht erlaubt" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Du hast nicht die notwendigen Zugriffsrechte, um neue Themen in dieser Kategorie zu erstellen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied. email_reject_strangers_not_allowed: title: "E-Mail abgelehnt weil Zugriff nicht erlaubt" - subject_template: "[%{site_name}] E-Mail-Problem -- Zugriff nicht erlaubt" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Zugriff ungültig" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Die Kategorie, an die du die E-Mail geschickt hast, erlaubt nur Antworten von Benutzern mit gültigem Konto und von bekannten E-Mail-Adressen. Wenn du glaubst, dass das ein Irrtum ist, dann kontaktiere ein Team-Mitglied. email_reject_invalid_post: title: "E-Mail abgelehnt weil ungültiger Beitrag" - subject_template: "[%{site_name}] E-Mail-Problem -- Ungültiger Beitrag" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitrag fehlerhaft" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. Mögliche Gründe sind komplizierte Formatierung und zu lange oder kurze Nachrichten. Bitte versuche es erneut oder schreibe deinen Beitrag über die Website. email_reject_invalid_post_specified: title: "E-Mail abgelehnt weil ungültiger Beitrag" - subject_template: "[%{site_name}] E-Mail-Problem -- Ungültiger Beitrag" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitrag fehlerhaft" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. @@ -1886,49 +1890,49 @@ de: Bitte versuch es erneut, wenn du das Problem beheben kannst. email_reject_invalid_post_action: title: "E-Mail abgelehnt weil fehlerhafte Beitragsaktion" - subject_template: "[%{site_name}] E-Mail-Problem -- Fehlerhafte Beitragsaktion" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Beitragsaktion ungültig" text_body_template: | Es tut uns leid, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) hat nicht funktioniert. Die Beitragsaktion wurde nicht erkannt. Bitte versuche es erneut oder erstelle deinen Beitrag auf der Website, wenn der Fehler weiterhin auftritt. email_reject_reply_key: title: "E-Mail abgelehnt weil unbekannter Antwort-Schlüssel" - subject_template: "[%{site_name}] E-Mail-Problem -- Unbekannter Antwort-Schlüssel" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwortschlüssel unbekannt" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Der angegebene Antwort-Schlüssel ist ungültig oder unbekannt. Wir wissen daher nicht auf welchen Beitrag diese E-Mail antwortet. Bitte kontaktiere ein Team-Mitglied. email_reject_bad_destination_address: title: "E-Mail abgelehnt weil unbekannte Empfänger-Adresse" - subject_template: "[%{site_name}] E-Mail Problem -- Unbekannte An:-Adresse" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Empfängeradresse unbekannt" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Keine der Ziel-E-Mail-Adressen wurde erkannt. Bitte stelle sicher, dass du die E-Mail an die richtige Adresse schickst, die dir von unserem Team genannt wurde. email_reject_topic_not_found: title: "E-Mail abgelehnt weil Thema nicht gefunden" - subject_template: "[%{site_name}] E-Mail-Problem -- Thema nicht gefunden" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema nicht gefunden" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Das Thema, auf das du geantwortet hast, existiert nicht mehr -- vielleicht wurde es gelöscht? Wenn du glaubst, dass dies ein Irrtum ist, nimm Bitte Kontakt mit einem Team-Mitglied auf. email_reject_topic_closed: title: "E-Mail abgelehnt weil Thema geschlossen" - subject_template: "[%{site_name}] E-Mail-Problem -- Thema geschlossen" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Thema geschlossen" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Das Thema, auf das du geantwortet hast, ist derzeit geschlossen und akzeptiert keine Antworten mehr. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf. email_reject_auto_generated: title: "E-Mail abgelehnt weil automatisch generierte Antwort" - subject_template: "[%{site_name}] E-Mail-Problem -- Automatisch erzeugte Antwort" + subject_template: "[%{email_prefix}] E-Mail-Problem -- Antwort automatisch generiert" text_body_template: | Entschuldige, aber deine E-Mail-Nachricht an %{destination} (betitelt mit %{former_title}) konnte nicht zugestellt werden. Deine E-Mail wurde als „automatisch generiert“ markiert, was bedeutet, dass sie automatisch von einem Computer erstellt wurde statt von einem Menschen getippt; wir können diese Arten von E-Mails nicht akzeptieren. Wenn du glaubst, dass dies ein Irrtum ist, nimm bitte Kontakt mit einem Team-Mitglied auf. email_error_notification: title: "Benachrichtigung zu E-Mail-POP-Authentifizierungsfehler" - subject_template: "[%{site_name}] E-Mail-Problem -- POP-Authentifizierungsfehler" + subject_template: "[%{email_prefix}] E-Mail-Problem -- POP-Authentifizierungsfehler" text_body_template: | Leider gab es einen Authentifizierungsfehler beim Abrufen von E-Mails vom POP-Server. @@ -2066,7 +2070,7 @@ de: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Benutzer zu Nachricht eingeladen" - subject_template: "[%{site_name}] %{username} hat dich zur Unterhaltung '%{topic_title}' eingeladen" + subject_template: "[%{email_prefix}] %{username} hat dich zu einer Unterhaltung '%{topic_title}' eingeladen" text_body_template: | %{header_instructions} @@ -2075,7 +2079,7 @@ de: %{respond_instructions} user_invited_to_private_message_pm_staged: title: "Benutzer zu Nachricht eingeladen (automatisch)" - subject_template: "[%{site_name}] %{username} hat dich zur Unterhaltung '%{topic_title}' eingeladen" + subject_template: "[%{email_prefix}] %{username} hat dich zu einer Unterhaltung '%{topic_title}' eingeladen" text_body_template: | %{header_instructions} @@ -2084,7 +2088,7 @@ de: %{respond_instructions} user_invited_to_topic: title: "Benutzer zu Thema eingeladen" - subject_template: "[%{site_name}] %{username} hat dich zum Thema '%{topic_title}' eingeladen" + subject_template: "[%{email_prefix}] %{username} hat dich eingeladen zu '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2093,7 +2097,7 @@ de: %{respond_instructions} user_replied: title: "Benutzer hat auf Beitrag geantwortet" - subject_template: "[%{site_name}] %{username} hat auf deinen Beitrag '%{topic_title}' geantwortet" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2104,7 +2108,7 @@ de: %{respond_instructions} user_replied_pm: title: "Benutzer hat auf Nachricht geantwortet" - subject_template: "[%{site_name}] [PN] %{topic_title}" + subject_template: "[%{email_prefix}] [PN] %{topic_title}" text_body_template: | %{header_instructions} @@ -2115,7 +2119,7 @@ de: %{respond_instructions} user_quoted: title: "Benutzer wurde zitiert" - subject_template: "[%{site_name}] %{username} hat Dich in '%{topic_title}' zitiert" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2126,7 +2130,7 @@ de: %{respond_instructions} user_linked: title: "Benutzer wurde verlinkt" - subject_template: "[%{site_name}] %{topic_title}" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2137,7 +2141,7 @@ de: %{respond_instructions} user_mentioned: title: "Benutzer wurde erwähnt" - subject_template: "[%{site_name}] %{username} hat Dich in '%{topic_title}' erwähnt" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2148,7 +2152,7 @@ de: %{respond_instructions} user_group_mentioned: title: "Gruppe wurde erwähnt" - subject_template: "[%{site_name}] %{topic_title}" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2159,7 +2163,7 @@ de: %{respond_instructions} user_posted: title: "Benutzer hat in Thema geantwortet" - subject_template: "[%{site_name}] %{subject_prefix}%{username} hat auf '%{topic_title}' geantwortet" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2170,7 +2174,7 @@ de: %{respond_instructions} user_watching_first_post: title: "Benutzer folgt erstem Beitrag" - subject_template: "[%{site_name}] %{topic_title}" + subject_template: "[%{email_prefix}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2181,7 +2185,7 @@ de: %{respond_instructions} user_posted_pm: title: "Benutzer hat Nachricht geschrieben" - subject_template: "[%{site_name}] [PN] %{topic_title}" + subject_template: "[%{email_prefix}] [PN] %{topic_title}" text_body_template: | %{header_instructions} @@ -2210,14 +2214,14 @@ de: join_the_discussion: "Mehr lesen" popular_posts: "Beliebte Beiträge" more_new: "Neu für dich" - subject_template: "Zusammenfassung für [%{site_name}]" + subject_template: "[%{email_prefix}] Zusammenfassung" unsubscribe: "Diese Zusammenfassung wird von %{site_link} gesendet, wenn wir dich einige Zeit lang nicht gesehen haben. Abbestellen unter %{unsubscribe_link}." click_here: "klicke hier" from: "Zusammenfassung für %{site_name}" preheader: "Eine kurze Zusammenfassung seit deinem letzten Besuch am %{last_seen_at}" mailing_list: why: "Alle Aktivitäten auf %{site_link} am %{date}" - subject_template: "[%{site_name}] Zusammenfassung für den %{date}" + subject_template: "[%{email_prefix}] Zusammenfassung für den %{date}" unsubscribe: "Diese Zusammenfassung wird täglich gesendet, weil der Mailinglisten-Modus aktiviret ist. Zum Abmelden %{unsubscribe_link}." from: "%{site_name} Zusammenfassung" new_topics: "Neue Themen" @@ -2226,7 +2230,7 @@ de: back_to_top: "Zurück nach oben" forgot_password: title: "Passwort vergessen" - subject_template: "[%{site_name}] Passwort zurückgesetzt" + subject_template: "[%{email_prefix}] Passwort zurücksetzen" text_body_template: | Jemand hat darum gebeten, dein Passwort auf [%{site_name}](%{base_url}) zurückzusetzen. @@ -2236,7 +2240,7 @@ de: %{base_url}/users/password-reset/%{email_token} set_password: title: "Passwort setzen" - subject_template: "[%{site_name}] Setze Passwort" + subject_template: "[%{email_prefix}] Passwort wählen" text_body_template: | Jemand hat ein Passwort für dein Konto auf [%{site_name}](%{base_url}) beantragt. Alternativ kannst du dich mit einem unterstützen Online-Service (Google, Facebook, etc), der mit dieser validierten E-Mail-Adresse verknüpft ist, anmelden. @@ -2246,7 +2250,7 @@ de: %{base_url}/users/password-reset/%{email_token} admin_login: title: "Administrator-Anmeldung" - subject_template: "[%{site_name}] Anmeldung" + subject_template: "[%{email_prefix}] Anmeldung" text_body_template: | Jemand hat versucht sich in dein Konto auf [%{site_name}](%{base_url}) anzumelden. @@ -2256,7 +2260,7 @@ de: %{base_url}/users/admin-login/%{email_token} account_created: title: "Konto erstellt" - subject_template: "[%{site_name}] Dein neues Konto" + subject_template: "[%{email_prefix}] Dein neues Konto" text_body_template: | Ein neues Konto wurde für dich auf %{site_name} erstellt. @@ -2264,14 +2268,14 @@ de: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "E-Mail-Adresse bestätigen (an neue)" - subject_template: "[%{site_name}] Bestätige deine neue E-Mail-Adresse" + subject_template: "[%{email_prefix}] Bestätige deine neue E-Mail-Adresse" text_body_template: | Um deine E-Mail-Adresse für %{site_name} zu bestätigen, klicke auf den folgenden Link: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "E-Mail-Adresse bestätigen (an alte)" - subject_template: "[%{site_name}] Bestätige deine aktuelle E-Mail-Adresse" + subject_template: "[%{email_prefix}] Bestätige deine aktuelle E-Mail-Adresse" text_body_template: | Bevor wir deine E-Mail-Adresse ändern können, müssen wir dich bitten zu bestätigen, dass du das E-Mail-Konto kontrollierst. Nach diesem Schritt, werden wir dich bitten die neue E-Mail-Adresse zu bestätigen. @@ -2280,7 +2284,7 @@ de: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "Benachrichtigung an alte E-Mail-Adresse" - subject_template: "[%{site_name}] Deine E-Mail-Adresse wurde geändert" + subject_template: "[%{email_prefix}] Deine E-Mail-Adresse wurde geändert" text_body_template: | Dies ist eine automatisierte Nachricht, um eine Änderung deiner E-Mail-Adresse für %{site_name} mitzuteilen. Bitte kontaktiere ein Team-Mitglied, wenn du von einem Fehler ausgehst. @@ -2309,7 +2313,7 @@ de: (Wenn du als neuer Benutzer unter vier Augen mit einem unserer [Team-Mitglieder](%{base_url}/about) reden möchtest, antworte einfach auf diese Nachricht.) signup: title: "Konto bestätigen nach Anmeldung" - subject_template: "[%{site_name}] Bestätige deinen neuen Account" + subject_template: "[%{email_prefix}] Bestätige dein neues Konto" text_body_template: | Willkommen bei %{site_name}! @@ -2384,101 +2388,101 @@ de: body: | - ## [Dies ist ein zivilisierter Platz für öffentliche Diskussionen](#civilized) + ## [This is a Civilized Place for Public Discussion](#civilized) - Bitte behandle dieses Diskussionsforum mit dem gleichen Respekt wie einen öffentlichen Park. Auch wir sind eine gemeinsame Community-Ressource — ein Platz, um Fähigkeiten, Wissen und Interessen durch einen fortlaufenden Dialog zu teilen. + Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - Dies sind keine harten oder schnelle Regeln, sondern vielmehr Hilfen für die menschliche Einschätzung unserer Community. Folge diesen Richtlinien, damit dies ein sauberer, gut beleuchteter Platz für zivilisierten, öffentlichen Diskurs bleibt. + These are not hard and fast rules, merely guidelines to aid the human judgment of our community and keep this a clean and well-lighted place for civilized public discourse. - ## [Verbessere die Diskussion](#improve) + ## [Improve the Discussion](#improve) - Hilf uns, dies zu einem großartigen Platz für Diskussionen zu machen, indem du stets daran arbeitest, die Diskussion in irgendeiner Art zu verbessern, egal wie geringfügig. Wenn du dir nicht sicher bist, ob dein Beitrag zum Dialog beiträgt, denke darüber nach, was du sagen möchtest und probiere es später noch einmal. + Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - Die hier diskutierten Themen sind uns wichtig und wir möchten, dass du dich so verhältst, als wären sie auch genauso wichtig für dich. Respektiere die Themen und die Personen, die diese diskutieren, auch wenn du mit dem was gesagt wird, nicht einverstanden bist. + The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - Ein Weg, die Diskussion zu verbessern, besteht darin zu entdecken, was schon passiert ist. Bitte verbringe etwas Zeit damit, die Themen hier zu durchsuchen, bevor du antwortest oder deine eigenen startest, und du wirst eine bessere Chance haben andere zu treffen, die deine Interessen teilen. + One way to improve the discussion is by discovering ones that are already happening. Spend time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - ## [Sei nett, auch wenn du anderer Meinung bist](#agreeable) + ## [Be Agreeable, Even When You Disagree](#agreeable) - Du magst auf etwas antworten möchten, indem du widersprichst. Das ist in Ordnung. Aber denke daran, _Ideen zu kritisieren, nicht Personen_. Bitte vermeide: + You may wish to respond to something by disagreeing with it. That’s fine. But remember to _criticize ideas, not people_. Please avoid: - * Beschimpfungen - * Persönliche Angriffe - * Antworten auf den Tonfall eines Beitrags statt auf dessen Inhalt - * Reflexartiges Widersprechen + * Name-calling + * Ad hominem attacks + * Responding to a post’s tone instead of its actual content + * Knee-jerk contradiction - Biete stattdessen vernünftige Gegenargumente, die den Dialog verbessern. + Instead, provide reasoned counter-arguments that improve the conversation. - ## [Deine Beteiligung zählt](#participate) + ## [Your Participation Counts](#participate) - Die hier geführten Dialoge geben den Ton für alle an. Hilf uns dabei, die Zukunft dieser Community zu beeinflussen, indem wir uns bewusst für Dialoge entscheiden, die dieses Forum zu einem interessanten Aufenthaltsraum machen — und jene vermeiden, die das nicht tun. + The conversations we have here set the tone for every new arrival. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - Discourse bietet Werkzeuge, die der Community ermöglichen, gemeinsam die besten (und schlechtesten) Beiträge zu identifizieren: Favoriten, Lesezeichen, „Gefällt mir“-Angaben, Meldungen, Antworten, Bearbeitungen, und so weiter. Benutze diese Werkzeuge, um deine eigene Erfahrung zu verbessern, und die von allen anderen ebenso. + Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - Lass uns versuchen, den Park besser zu verlassen als wir ihn vorgefunden haben. + Let’s leave our community better than we found it. - ## [Wenn du ein Problem siehst, melde es](#flag-problems) + ## [If You See a Problem, Flag It](#flag-problems) - Moderatoren haben besondere Befugnisse; sie sind verantwortlich für dieses Forum. Aber das gilt auch für dich. Mit deiner Hilfe können Moderatoren die Vermittler der Community sein, nicht nur die Hausmeister oder die Polizei. + Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - Wenn du schlechtes Verhalten siehst, antworte nicht. Schlechtes Verhalten wird gefördert, indem es anerkannt wird, es verbraucht deine Energie und verbraucht die Zeit von allen. _Melde es einfach_. Wenn genügend Meldungen zusammenkommen, werden Maßnahmen eingeleitet, entweder automatisch oder durch das Eingreifen eines Moderators. + When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - Um unsere Community aufrechtzuerhalten, behalten sich Moderatoren das Recht vor, jeden Inhalten und jedes Benutzerkonto jederzeit aus irgendeinem Grund zu entfernen. Moderatoren sehen neue Beiträge in keiner Weise früher; die Moderatoren und die Sitebetreiber übernehmen keine Verantwortung für jeglichen Inhalt, der in der Community geschrieben wird. + In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts; the moderators and site operators take no responsibility for any content posted by the community. - ## [Immer höflich bleiben](#be-civil) + ## [Always Be Civil](#be-civil) - Nichts sabotiert einen gesunden Dialog so sehr wie Unhöflichkeit. + Nothing sabotages a healthy conversation like rudeness: - * Sei höflich. Schreibe nichts, was eine vernünftige Person als anstößig, beleidigend oder als Hasstirade auffassen würde. - * Halte den Platz sauber. Schreibe nichts, was obszön oder sexuell explizit ist. - * Lasst uns gegenseitig respektieren. Belästige niemanden, füge niemandem Kummer zu, gib dich nicht als jemand anderes aus und veröffentliche niemandes persönliche Informationen. - * Respektiere unser Forum. Schreibe keinen Spam und beschädige das Forum auch sonst in keiner Weise. + * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. + * Keep it clean. Don’t post anything obscene or sexually explicit. + * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. + * Respect our forum. Don’t post spam or otherwise vandalize the forum. - Dies sind keine konkreten Bedingungen mit präzisen Definitionen — vermeide sogar den _Anschein_ von jedem dieser Dinge. Wenn du dir nicht sicher bist, frage dich selbst, wie du dich fühlen würdest, wenn dein Beitrag auf der Titelseite der Frankfurter Allgemeinen Zeitung erscheinen würde. + These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - Dies ist ein öffentliches Forum und Suchmaschinen indizieren diese Diskussionen. Halte die Sprache, Links und Bilder sicher für Familie und Freunde. + This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - ## [Halte den Platz sauber](#keep-tidy) + ## [Keep It Tidy](#keep-tidy) - Betreibe die nötigen Anstrengungen, um Dinge an der richtigen Stelle zu platzieren, damit wir mehr Zeit mit Diskussionen und weniger mit Aufräumen verbringen können. Daher: + Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - * Erstelle keine Themen in der falschen Kategorie - * Schreibe Beiträge nicht gleichzeitig in mehreren Themen - * Schreibe keine leeren Antworten - * Lenke nicht vom Thema ab, indem du es mitten drin änderst - * Signiere deine Beiträge nicht — jedem Beitrag sind deine Profilinformationen beigefügt + * Don’t start a topic in the wrong category. + * Don’t cross-post the same thing in multiple topics. + * Don’t post no-content replies. + * Don’t divert a topic by changing it midstream. + * Don’t sign your posts — every post has your profile information attached to it. - Verwende die „Gefällt mir“-Schaltfläche statt „+1“ oder „Einverstanden“ zu schreiben. Statt ein bestehendes Thema in eine völlig andere Richtung zu lenken, verwende die Funktion „Mit verknüpftem Thema antworten“. + Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - ## [Poste nur deine eigenen Sachen](#stealing) + ## [Post Only Your Own Stuff](#stealing) - Du darfst ohne Erlaubnis nichts schreiben, was jemand anderem gehört. Du darfst keine Beschreibungen von, Links zu oder Methoden beschreiben, die geistiges Eigentum verletzen (Software, Video, Audio, Bilder) oder gegen geltendes Gesetz verstoßen. + You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - ## [Betrieben von Euch](#power) + ## [Powered by You](#power) - Diese Site wird von eurem [freundlichen Team](/about) und *euch* betrieben, der Community. Wenn du irgendwelche weiteren Fragen dazu hast, wie Dinge hier funktionieren sollten, öffne ein neues Thema in der Kategorie [Feedback zur Site](/c/site-feedback) und lass es uns diskutieren! Wenn es ein kritisches oder dringendes Problem gibt, dass nicht mit einem Meta-Thema oder einer Meldung behandelt werden kann, kontaktiere uns über die [Team-Seite](/about). + This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - ## [Nutzungsbedingungen](#tos) + ## [Terms of Service](#tos) - Ja, die rechtliche Seite ist langweilig, aber wir müssen uns selbst schützen – und im erweiterten Sinne auch dich und deine Daten – vor unfreundlichen Leuten. Wir haben [Nutzungsbedingungen](/tos), die deines (und unser) Verhalten und unsere Rechte bezüglich des Inhalts, der Privatsphäre und den Gesetzen beschreiben. Um diesen Dienst zu nutzen, musst du dich mit unseren [Nutzungsbedingungen](/tos) einverstanden erklären. + Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "Nutzungsbedingungen" body: | diff --git a/config/locales/server.el.yml b/config/locales/server.el.yml index e4380a69bb..528616307a 100644 --- a/config/locales/server.el.yml +++ b/config/locales/server.el.yml @@ -863,7 +863,6 @@ el: delete_removed_posts_after: "Δημοσιεύσεις που διαγράφονται από τον συγγραφέα θα διαγράφονται αυτόματα μετά από (n) ώρες. Εάν το ορίσεις στο 0, τότε θα διαγράφονται αμέσως." max_image_width: "Μέγιστο πλάτος μικρογραφίας εικόνων σε μια ανάρτηση" max_image_height: "Μέγιστο ύψος μικρογραφίας εικόνων σε μία ανάρτηση" - category_featured_topics: "Πλήθος νημάτων παρουσιάζονται ανά κατηγορία στη σελίδα των /κατηγοριών. Αφού αλλάξεις αυτή την αξία, θα χρειαστεί μέχρι 15 λεπτά για να αναβαθμιστεί η σελίδα των κατηγοριών." fixed_category_positions: "Εάν ελεγχθεί, θα μπορείς να διευθετήσεις τις κατηγορίες σε μια καθορισμένη σειρά. Εάν δεν ελεγχθεί, οι κατηγορίες είναι διευθετημένες κατά σειρά δραστηριότητας." fixed_category_positions_on_create: "Αν επιλεγεί, η σειρά των κατηγοριών θα διατηρηθεί στον διάλογο δημιουργίας νήματος (χρειάζεται fixed_category_positions). " add_rel_nofollow_to_user_content: "Πρόσθεσε rel nofollow σε ολόκληρο το περιεχόμενο που έχει υποβληθεί από τους χρήστες, εκτός από εσωτερικούς συνδέσμους (συμπεριλαμβανομένων των γονικών τομέων). Αν το αλλάξεις αυτήν την ρύθμιση, θα πρέπει να κάνεις rebake όλα τα νήματα χρησιμοποιώντας το: \"rake posts:rebake\"" @@ -922,7 +921,6 @@ el: ga_universal_domain_name: "Google Universal Analytics (analytics.js) όνομα τομέα, eg: mysite.com; βλέπε http://google.com/analytics" gtm_container_id: "Google Tag Manager container id. eg: GTM-ABCDEF" enable_escaped_fragments: "Υποχώρηση στο Ajax-Crawling API της Google, αν δεν βρεθεί κάποιο πρόγραμμα ανίχνευσης του Ιστού. Βλέπε https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Ενεργοποίηση πρότυπου μηχανής αναζήτησης web crawler που υποστηρίζεται μέσο του noscript tag" allow_moderators_to_create_categories: "Να επιτρέπεται στους συντονιστές να δημιουργούν νέες κατηγορίες" cors_origins: "Επιτρεπόμενες πηγές για αιτήσεις πολλαπλής προέλευσης (cross-origin requests, CORS). Η κάθε προέλευση πρέπει να περιέχει http:// or https://. Η env μεταβλητή DISCOURSE_ENABLE_CORS πρέπει να οριστεί σε αληθινή για να ενεργοποιηθεί το CORS." use_admin_ip_whitelist: "Οι διαχειριστές μπορούν να συνδέονται μόνο αν βρίσκονται σε μια διευθυνση IP καθορισμένη στη λίστα Screened IPs (Admin > Logs > Screened Ips)." @@ -961,7 +959,6 @@ el: login_required: "Απαιτήστε την επικύρωση για να διαβάσετε το περιεχόμενο σε αυτήν την ιστοσελίδα, απαγορεύσετε την ανώνυμη πρόσβαση." min_username_length: "Ελάχιστο μέγεθος όνομα χρήστη σε χαρακτήρες. ΠΡΟΣΟΧΗ: εάν ο όποιος δήποτε από τους χρήστες που είδη υπάρχουν ή από της ομάδες έχουν ονόματα πιο μικρά από αυτό, η ιστοσελίδα σου θα διακοπεί!" max_username_length: "Μέγιστο μέγεθος όνομα χρήστη με χαρακτήρες. ΠΡΟΣΟΧΗ:\nαν υπάρχοντες χρήστες ή ομάδες έχουν ονόματα περισσότερο από αυτό, η ιστοσελίδα σας θα παραβιαστεί!" - reserved_usernames: "Το όνομα χρήστη δεν δικαιούτε για τη δημιουργία λογαριασμού. " min_password_length: "Ελάχιστο μήκος κωδικού πρόσβασης." min_admin_password_length: "Ελάχιστο μήκος κωδικού πρόσβασης για το διαχειριστή" password_unique_characters: "Ελάχιστος αριθμός μοναδικών χαρακτήρων που πρέπει να έχει ένας κωδικός." @@ -1377,10 +1374,6 @@ el: change_owner: post_revision_text: "Η κυριότητα μεταφέρεται από %{old_user} σε %{new_user}." deleted_user: "ένας χρήστης που έχει διαγραφεί " - emoji: - errors: - name_already_exists: "Συγγνώμη, η ονομασία '%{name}', χρησιμοποιείται ήδη από ένα άλλο emoji." - error_while_storing_emoji: "Συγγνώμη, παρουστιάστηκε σφάλμα κατα την διαδικασία αποθήκευσης του emoji." topic_statuses: archived_enabled: "Αυτό το νήμα είναι τώρα αρχειοθετημένο. Έχει παγώσει και δεν μπορεί να τροποποιηθεί με κανένα τρόπο." archived_disabled: "Αυτό το νήμα δεν είναι τώρα αρχειοθετημένο. Δεν είναι πια παγωμένο και μπορεί να τροποποιηθεί." @@ -1570,7 +1563,6 @@ el: test_mailer: title: "Δοκιμάστε τον αποστολέα" - subject_template: "[%{site_name}] Στείλτε μέσω ηλεκτρονικού ταχυδρομίου την δοκιμασία Deliverability" text_body_template: | Αυτό είναι το πρώτο δοκιμαστικό μήνυμα ηλεκτρονικού ταχυδρομείου από @@ -1614,7 +1606,6 @@ el: [mt]: http://www.mail-tester.com/ new_version_mailer: title: "Καινούργια έκδοση Αποστολέα" - subject_template: "[%{site_name}] Νέα έκδοση του Discourse, διαθέσιμη αναβάθμιση" text_body_template: | Ζήτω, μια νέα έκδοση του [Discourse](http://www.discourse.org) είναι διαθέσιμη! @@ -1628,7 +1619,6 @@ el: - Επισκέψου [meta.discourse.org](https://meta.discourse.org) για νέα, συζήτηση, και υποστήριξη για το Discourse new_version_mailer_with_notes: title: "Καινούργια έκδοση Αποστολέα με Σημειώσεις" - subject_template: "[%{site_name}] διαθέσιμη αναβάθμιση" text_body_template: | Γιούπιιι, μια νέα έκδοση του [Discourse](http://www.discourse.org) είανι διαθέσιμη! @@ -1646,9 +1636,6 @@ el: %{notes} queued_posts_reminder: title: "Υπενθύμιση μηνυμάτων σε αναμονή." - subject_template: - one: "[%{site_name}] 1 δημοσίευση αναμένει αναθεώρηση" - other: "[%{site_name}] %{count} δημοσιεύσεις αναμένουν αναθεώρηση" text_body_template: | Γεια σου, @@ -1798,35 +1785,30 @@ el: text_body_template: "Λυπούμαστε αλλά η εξαγωγή δεδομένων απέτυχε. Παρακαλούμε έλεγξε τις καταγραφές ή επικοινώνησε με ένα συνεργάτη. " email_reject_insufficient_trust_level: title: "Απόρριψη ηλεκτρονικού μηνύματος Ανεπαρκές επίπεδο εμπιστοσύνης" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού μηνύματος -- Ανεπαρκές επίπεδο εμπιστοσύνης" text_body_template: | Λυπούμαστε, αλλά το μήνυμα του ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) απέτυχε. Ο λογαριασμός σου δεν έχει το απαιτούμενο επίπεδο εμπιστοσύνης ώστε να δημοσιεύσεις καινούρια νήματα σε αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα μέλος του προσωπικού. email_reject_user_not_found: title: "Απόρριψη ηλεκτρονικού μηνύματος Δε βρέθηκε ο χρήστης" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Ο χρήστης δε βρέθηκε" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Η απάντησή σου στάλθηκε από άγνωστη διεύθυνση ηλεκτρονικού ταχυδρομείου. Προσπάθησε να στείλεις από άλλη διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού. email_reject_screened_email: title: "Απόρριψη ηλεκτρονικού μηνύματος σε ελεγμένες διευθύνσεις ηλεκτρονικού ταχυδρομίου" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού μηνύματος -- Μπλοκαρισμένο ηλεκτρονικό μήνυμα" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Η απάντησή σου στάλθηκε από διεύθυνση ηλεκτρονικού ταχυδρομείου που έχει μπλοκαριστεί. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού. email_reject_inactive_user: title: "Απόρριψη ηλεκτρονικού μηνύματος Μη ενεργός χρήστης" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Μη ενεργός χρήστης" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Ο λογαριασμός σου που σχετίζεται με αυτή τη διεύθυνση ηλεκτρονικού ταχυδρομείου δεν είναι ενεργοποιημένος. Παρακαλώ ενεργοποίησε τον λογαριασμό σου προτού στείλεις ηλεκτρονικά μηνύματα. email_reject_blocked_user: title: "Απόρριψη ηλεκτρονικού μηνύματος Ο χρήστης μπλοκαρίστηκε" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- O χρήστης μπλοκαρίστηκε" text_body_template: |+ Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. @@ -1834,21 +1816,18 @@ el: email_reject_reply_user_not_matching: title: "Απόρριψη ηλεκτρονικού μηνύματος Ο χρήστης δεν ταιριάζει" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού μηνύματος -- Απάντηση από μη αναμενόμενη διεύθυνση ηλεκτρονικού ταχυδρομείου" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό σου μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Η απάντησή σου στάλθηκε από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου από αυτή που περιμέναμε, κι έτσι δεν είμαστε βέβαιοι εάν πρόκειται για το ίδιο άτομο. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού. email_reject_no_account: title: "Απόρριψη ηλεκτρονικού μηνύματος Κανένας λογαριασμός" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Άγνωστος λογαριασμος" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό σας μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Δεν μπορούμε να βρούμε κανένα λογαριασμό που να ταιριάζει με την διεύθυνση του ηλεκτρονικού σου ταχυδρομείου. Προσπάθησε να στείλεις από διαφορετική διεύθυνση ηλεκτρονικού ταχυδρομείου, ή επικοινώνησε με ένα μέλος του προσωπικού. email_reject_empty: title: "Απόρριψη ηλεκτρονικού μηνύματος άδεια" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Δεν υπάρχει περιεχόμενο" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. @@ -1857,35 +1836,30 @@ el: Αν λαμβάνεις αυτό και αν _όντως_ συμπεριέλαβες απάντηση, προσπάθησε ξανά με απλούστερη μορφοποίηση. email_reject_parsing: title: "Τεχνολογία απορριψης ηλεκτρονικού μηνύματος" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Μη αναγνωρίσιμο περιεχόμενο" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Δε μπορέσαμε να βρούμε την απάντησή σου στο μήνυμα ηλεκτρονικού ταχυδρομείου. **Σιγουρέψου ότι η απάντησή σου είναι στην κορυφή του μηνύματος ηλεκτρονικού ταχυδρομείου** - δε μπορούμε να επεξεργαστούμε απαντήσες μέσα στις γραμμές. email_reject_invalid_access: title: "Απόρριψη ηλεκτρονικού μηνύματος μη έγκυρη πρόσβαση" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Μη έγκυρη πρόσβαση" text_body_template: | Λυπούμαστε, αλλά το ηλεκτρονικό μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Ο λογαριασμός σου δεν έχει το προνόμιο να δημοσιεύει καινούρια νήματα σε αυτή την κατηγορία. Εάν πιστεύεις ότι πρόκειται για σφάλμα, επικοινώνησε με ένα μέλος του προσωπικού. email_reject_strangers_not_allowed: title: "Άγνωστοι απόρριψης ηλεκτρονικού μηνύματος δεν επιτρέπονται" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Μη έγκυρη πρόσβαση" text_body_template: | Λυπούμαστε, αλλά αυτό το ηλεκτρονικό μήνυμα προς %{destination} (με τίτλο %{former_title}) απέτυχε. Η κατηγορία που έστειλες το ηλεκτρονικό μήνυμα επιτρέπει απαντήσεις μόνο από χρήστες με έγκυρους λογαριασμούς και γνωστές διευθύνσεις ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για σφάλμα, επικοινώνησε με ένα μέλος του προσωπικού. email_reject_invalid_post: title: "Απόρριψη ηλεκτρονικού μηνύματος μη έγκυρη ανάρτηση" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Σφάλμα δημοσίευσης" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Μερικές πιθανές αιτίες είναι: περίπλοκη μορφοποίηση, πολύ μεγάλο μέγεθος μηνύματος, πολύ μικρό μέγεθος μηνύματος. Παραλούμε προσπαθήστε ξανά, ή αναρτήστε μέσω του ιστοτόπου αν το πρόβλημα συνεχίζεται. email_reject_invalid_post_specified: title: "Προσδιορισμός μη έγκυρης ανάρτησης για απόρριψη ηλεκτρονικού μηνύματος" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Σφάλμα ειδοποίησης" text_body_template: | υπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. @@ -1896,49 +1870,42 @@ el: Αν μπορείς να διορθώσεις το πρόβλημα, παρακαλούμε προσπάθησε ξανά. email_reject_invalid_post_action: title: "Πράξη μη έγκυρης ανάρτησης για απόρριψη ηλεκτρονικού μηνύματος" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Μη έγκυρη δράση δημοσίευσης" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Η ενέργεια ανάρτησης δεν αναγνωρίστηκε. Παρακαλούμε προσπαθήστε ξανά, ή αναρτήστε μέσω του ιστοτόπου αν το πρόβλημα συνεχιζεται. email_reject_reply_key: title: "Κλειδί απάντησης για απόρριψη ηλεκτρονικού μηνύματος" - subject_template: "[%{site_name}] πρόβλημα ηλεκτρονικού μηνύματος -- Άγνωστο κλειδί απάντησης" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Το κλειδί απάντησης στο μήνυμα ηλεκτρονικού ταχυδρομείου δεν είναι έγκυρο ή είναι άγνωστο, οπότε δεν μπορούμε να καταλάβουμε σε τι αναφέρεται ως απάντηση αυτό το μήνυμα ηλεκτρονικού ταχυδρομείου. Επικοινώνησε με κάποιο συνεργάτη. email_reject_bad_destination_address: title: "Απόρριψη ηλεκτρονικού μηνύματος άκυρη διεύθυνση προορισμού" - subject_template: "[%{site_name}] πρόβλημα ηλεκτρονικού μηνύματος -- Αγνωστο σε: Διεύθυνση" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Καμία από τις διευθύνσεις ηλεκτρονικού ταχυδρομείου των παραληπτών δεν αναγνωρίστηκε. Παρακαλούμε σιγουρέψου ότι στέλνεις στην σωστή διεύθυνση ηλεκτρονικού ταχυδρομείου, η οποία παρέχεται από κάποιο συνεργάτη. email_reject_topic_not_found: title: "Απόρριψη ηλεκτρονικού μηνύματος Δε βρέθηκε το νήμα" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού ταχυδρομείου -- Το νήμα δε βρέθηκε" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Το νήμα στο οποίο απαντάς είναι δεν υπάρχει πλέον, ίσως να έχει διαγραφεί. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη. email_reject_topic_closed: title: "Απόρριψη ηλεκτρονικού μηνύματος θέμα τελειωμένο" - subject_template: "[%{site_name}] Ζήτημα με την ηλεκτρονική διεύθυνση -- Το θέμα έκλεισε" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Το νήμα στο οποίο απαντάς είναι προσωρινά κλειστό και δε μπορεί πλέον δεχτεί απαντήσεις. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη. email_reject_auto_generated: title: "Απόρριψη ηλεκτρονικού μηνύματος δημιουργήθηκε αυτόματα" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού μηνύματος -- Δημιουργία αυτόματης απάντησης" text_body_template: | Λυπούμαστε, αλλά το μήνυμα ηλεκτρονικού ταχυδρομείου σου προς %{destination} (titled %{former_title}) δεν εστάλη. Το μήνυμα ηλεκτρονικού ταχυδρομείου σου σημάνθηκε ως "αυτοδημιούργητο", το οποίο σημαίνει ότι δημιουργήθηκε αυτόματα από έναν υπολογιστή αντί να πληκτρολογηθεί από άνθρωπο. Δε μπορούμε να δεχτούμε τέτοιου είδους μηνύματα ηλεκτρονικού ταχυδρομείου. Εάν πιστεύεις ότι πρόκειται για λάθος, επικοινώνησε με ένα συνεργάτη. email_error_notification: title: "Ειδοποίηση σφάλματος ηλεκτρονικού ταχυδρομείου" - subject_template: "[%{site_name}] Θέμα ηλεκτρονικού μηνύματος -- POP λάθος πιστοποίησης" text_body_template: | Δυστυχώς υπήρξε ένα πρόβλημα πιστοποίησης κατά τη διάρκεια συγκέντρωσης μηνυμάτων από τον διακομιστή POP. @@ -2079,7 +2046,6 @@ el: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Ο χρήστης προσκλήθηκε σε προσωπικό μήνυμα" - subject_template: "[%{site_name}] %{username} σε προσκάλεσε σε ένα μήνυμα '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2088,7 +2054,6 @@ el: %{respond_instructions} user_invited_to_private_message_pm_staged: title: "Ο χρήστης προσκλήθηκε στο στάδιο προσωπικού μηνύματος" - subject_template: "[%{site_name}] %{username} σε προσκάλεσε σε ένα μήνυμα '%{topic_title}'" text_body_template: |+ %{header_instructions} @@ -2098,7 +2063,6 @@ el: user_invited_to_topic: title: "Ο χρήστης προσκλήθηκε στο νήμα" - subject_template: "[%{site_name}] &{username} σε προσκάλεσε στο '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2107,7 +2071,6 @@ el: %{respond_instructions} user_replied: title: "Ο χρήστης απάντησε" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2118,7 +2081,6 @@ el: %{respond_instructions} user_replied_pm: title: "Ο χρήστης απάντησε σε προσωπικό μηνύμα" - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -2129,7 +2091,6 @@ el: %{respond_instructions} user_quoted: title: "Φράση χρήστη" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2140,7 +2101,6 @@ el: %{respond_instructions} user_linked: title: "Ο χρήστης συνδέθηκε" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2151,7 +2111,6 @@ el: %{respond_instructions} user_mentioned: title: "Ο χρήστης αναφέρθηκε" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2162,7 +2121,6 @@ el: %{respond_instructions} user_group_mentioned: title: "Αναφέρθηκε χρήστης ομάδας" - subject_template: "[%{site_name}] &{topic_title}" text_body_template: | &{header_instructions} @@ -2173,7 +2131,6 @@ el: %{respond_instructions} user_posted: title: "Ο χρήστης δημοσίευσε" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2184,7 +2141,6 @@ el: %{respond_instructions} user_watching_first_post: title: "Ο χρήστης παρακολουθεί την πρώτη δημοσίευση" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: |+ %{header_instructions} @@ -2196,7 +2152,6 @@ el: user_posted_pm: title: "Ο χρήστης δημοσίευσε προσωπικό μήνυμα" - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: |+ %{header_instructions} @@ -2226,14 +2181,12 @@ el: join_the_discussion: "Διάβασε περισσότερα" popular_posts: "Δημοφιλείς Δημοσιεύσεις" more_new: "Νέο για εσένα" - subject_template: "[%{site_name}] Περίληψη" unsubscribe: "Αυτή η περίληψη αποστέλλεται από %{site_link} όταν δεν σε έχουμε δεί για ένα χρονικό διάστημα. Για να σταματήσεις την εγγραφή %{unsubscribe_link}." click_here: "κάνε κλικ εδώ" from: "%{site_name} περίληψη" preheader: "Μία σύντομη περίληψη από την τελευταία σου επίσκεψη στο %{last_seen_at}" mailing_list: why: "Όλες οι δραστηριότητες στο %{site_link} για %{date}" - subject_template: "[%{site_name}] Περίληψη για %{date}" unsubscribe: "Αυτή η περίληψη στέλνεται καθημερινά εξαιτίας της ενεργοποίησης τηε λειτουργίας συμπερίληψης στη λίστα μηνυμάτων. Για να διαγραφείς %{unsubscribe_link}." from: "%{site_name} περίληψη" new_topics: "Καινούρια νήματα" @@ -2242,7 +2195,6 @@ el: back_to_top: "Πίσω στην κορυφή" forgot_password: title: "Ξέχασα τον κωδικό πρόσβασης" - subject_template: "[%{site_name}] Επαναφορά κωδικού πρόσβασης" text_body_template: |+ Κάποιος ζήτησε να επαναφέρει τον κωδικό πρόσβασης σου στο [%{site_name}](%{base_url}). @@ -2255,7 +2207,6 @@ el: set_password: title: "Όρισε κωδικό πρόσβασης" - subject_template: "[%{site_name}] Όρισε κωδικό πρόσβασης" text_body_template: |+ Κάποιος ζήτησε να προσθέσει έναν κωδικό στον λογαριασμό σου στο [%{site_name}](%{base_url}). Εναλλακτικά, μπορείς να συνδεθείς χρησιμοποιώντας μια υποστηρίσημη υπηρεσία απευθείας σύνδεσης. (Google, Facebook, etc) που να σχετίζεται με αυτήν την επικυρωμένη ηλεκτρονιή διεύθυνση. @@ -2267,7 +2218,6 @@ el: admin_login: title: "Σύνδεση Διαχειριστή" - subject_template: "[%{site_name}] Σύνδεση" text_body_template: | Κάποιος ζήτησε να συνδεθεί στο λογαριασμό σου στο [%{site_name}](%{base_url}). @@ -2277,7 +2227,6 @@ el: %{base_url}/users/admin-login/%{email_token} account_created: title: "Ο λογαριασμός δημιουργήθηκε" - subject_template: "[%{site_name}] Ο καινούριος σας λογαριασμός" text_body_template: | Ένας καινούριος λογαριασμός δημιουργήθηκε για εσένα στο %{site_name} @@ -2285,14 +2234,12 @@ el: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Επιβεβαίωση Νέας Ηλεκτρονικής Διεύθυνσης" - subject_template: "[%{site_name}] Επιβεβαίωση της καινούριας διεύθυνσης ηλεκτρονικού ταχυδρομείου" text_body_template: | Επιβεβαίωσε την καινούρια διεύθυνση ηλεκτρονικού ταχυδρομείου για %{site_name} κάνοντας κλικ στον ακόλουθο σύνδεσμο: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "Επιβεβαίωση Παλιάς Ηλεκτρονικής Διεύθυνσης" - subject_template: "[%{site_name}] Επιβεβαίωσε την τωρινή ηλεκτρονική σου διεύθυνση." text_body_template: | Πριν μπορέσομε να αλλάξουμε την διεύθυνση ηλεκτρονικού ταχυδρομείου σου, χρειαζόμαστε επιβεβαίωση ότι ελέγχεις την τωρινή διεύθυνση ηλεκτρονικού ταχυδρομείου. Μόλις ολοκληρώσεις αυτό το βήμα, θα σου επιτρέψουμε να επιβεβαιώσεις @@ -2303,7 +2250,6 @@ el: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "Ειδοποίηση παλιάς ηλεκτρονικής διεύθυνσης" - subject_template: "[%{site_name}] Η διεύθυνση ηλεκτρονικού ταχυδρομείου έχει αλλάξει" text_body_template: | Αυτό είναι αυτοματοποιημένο μήνυμα για να σε ενημερώσει ότι η διεύθυνση ηλεκτρονικού ταχυδρομείου σου για το %{site_name} έχει αλλάξει. Εάν αυτό έγινε καταλάθος, παρακαλούμε επικοινώνησε @@ -2335,7 +2281,6 @@ el: (Αν χρειαστεί να επικοινωνήσεις με [staff members](%{base_url}/about) ως νέος χρήστης, απλώς απάντησε σε αυτό το μήνυμα.) signup: title: "Εγγραφή" - subject_template: "[%{site_name}] Επιβεβαιώστε το νέο σας λογαριασμό" text_body_template: | Καλώς ήρθες στο %{site_name}! @@ -2409,104 +2354,6 @@ el: guidelines_topic: title: "Συχνές Ερωτήσεις/Οδηγίες" - body: | - - - ## [Αυτό είναι ένα πολιτισμένο μέρος για συζήτηση](#civilized) - - Παρακαλούμε σεβαστείτε αυτό το φόρουμ συζήτησης με τον ίδιο τρόπο όπως σέβεστε ένα δημόσιο πάρκο. Όπως και αυτό, έτσι κι εμείς είμαστε κοινός πόρος της κοινότητας &mdash, ένα μέρος για να μοιραστείς δεξιότητες, γνώσεις και ενδιαφέροντα μέσω εξωστρεφών συζητήσεων. - - Αυτοί δεν είναι σκληροί και γρήγοροι κανόνες, κυρίως βοηθήματα για την ανθρώπινη κρίση της κοινότητάς μας. Χρησιμοποίησε αυτές τις οδηγίες για να κρατήσεις καθαρό και φωτεινό αυτό το μέρος για πολιτισμένη δημόσια ομιλία. - - - - ## [Βελτίωσε τη συζήτηση](#improve) - - Βοήθησέ μας να κάνουμε αυτό το μέρος θαυμάσιο για συζήτηση με τη διαρκή προσπάθεια να βελτιώσεις τη συζήτηση με κάποιο τρόπο, όσο μικρός κι αν είναι. Αν δεν είσαι σίγουρος ότι η ανάρτησή σου προσθέτει κάτι στη συζήτηση, σκέψου ξανά τι θέλεις να πεις και προσπάθησε ξανά αργότερα. - - Τα νήματα που συζητούνται εδώ έχουν σημασία για εμάς και θέλουμε να πράττεις σαν να έχουν και για σένα σημασία. Να σέβεσαι τα νήματα και τους ανθρώπους που τα συζητούν, ακόμη κι αν διαφωνείς με μερικά από αυτά που λέγονται. - - Ένας τρόπος να βελτιώσεις τη συζήτηση είναι με το να ανακαλύπτεις αυτές που ήδη υπάρχουν Παρακαλούμε αφιέρωσε λίγο χρόνο να περιηγηθείς στα νήματα εδώ πριν απαντήσεις ή ξεκινήσεις το δικό σου νήμα και θα έχεις καλύτερη πιθανότητα να συναντήσεις άλλους που μοιράζονται τα ενδιαφέροντα σου. - - - - ## [Να είσαι ευχάριστος, ακόμη κι όταν διαφωνείς](#agreeable) - - Ίσως θέλεις να απαντήσεις σε κάτι διαφωνώντας με αυτό. Πολύ καλά. Αλλά να θυμάσαι _ να κρίνεις ιδέες, όχι ανθρώπους_. Παρακαλούμε απόφυγε: - - * Κλήση με όνομα. - * Επιθέσεις ενάντια στο άτομο. - * Να απαντάς στον τόνο της ανάρτησης αντί για το πραγματικό περιεχόμενό του. - * Σπασμωδική αντίφαση. - - Αντί για αυτά, πρόσφερε αιτιολογημένα αντι-επιχειρήματα που βελτιώνουν τη συζήτηση. - - - - ## [Η συμμετοχή σου μετράει](#participate) - - Οι συζητήσεις που έχουμε εδώ θέτουν τον τόνο για όλους. Βοήθησέ μας να επηρεάσουμε το μέλλον αυτής της κοινότητας επιλέγοντας να συμμετέχεις σε συζητήσεις που κάνουν αυτό το φόρουμ ένα ενδιαφέρον μέρος να είναι κανείς — και αποφεύγοντας αυτές που δεν το κάνουν. - - Το Discourse παρέχει εργαλεία που δίνουν τη δυνατότητα στην κοινότητα να εντοπίζει συλλογικά τις καλύτερες (και τις χειρότερες) συνεισφορές: αγαπημένα, σελιδοδείκτες, μου αρέσει, επισημάνσεις, απαντήσεις, επεξεργασίες, και ούτω καθ’ εξής. Χρησιμοποίησε αυτά τα εργαλεία για να βελτιώσεις τη δική σου εμπειρία, όπως και όλων των άλλων. - - Ας προσπαθήσουμε να αφήσουμε το πάρκο μας καλύτερο απ’ ότι το βρήκαμε. - - - - ## [Αν βρεις κάποιο πρόβλημα, επισήμανέ το](#flag-problems) - - Οι συντονιστές έχουν ειδική εξουσία. Είναι υπεύθυνοι γι’ αυτό το φόρουμ. Είσαι όμως κι εσύ υπεύθυνος. Με τη βοήθειά σου, οι συντονιστές μπορούν να διευκολύνουν την κοινότητα, όχι απλά να αστυνομεύουν ή να επιστατούν. - - Όταν δεις κακή συμπεριφορά, μην απαντήσεις. Ενθαρρύνεις την κακή συμπεριφορά όταν την αναγνωρίζεις, σπαταλάς την ενέργειά σου και το χρόνο όλων. _Απλά επισήμανέ την_. Αν μαζευτούν πολλές επισημάνσεις, θα παρθούν μέτρα, είτε αυτόματα είτε με παρέμβαση συντονιστή. - - Για να διατηρήσουμε την κοινότητά μας, οι συντονιστές διατηρούν το δικαίωμα να αφαιρέσουν οποιοδήποτε περιεχόμενο και οποιοδήποτε λογαριασμό χρήστη για οποιοδήποτε λόγο, οποιαδήποτε στιγμή. Οι συντονιστές δεν κάνουν προεπισκόπηση νέων αναρτήσεων με κανένα τρόπο, οι συντονιστές και οι λειτουργοί ιστοτόπου δεν φέρουν καμία ευθύνη για οποιοδήποτε περιεχόμενο έχει αναρτηθεί από την κοινότητα. - - - - ## [Πάντα να είσαι ευγενικός](#be-civil) - - Τίποτα δεν σαμποτάρει μια υγιή συζήτηση όπως η αγένεια: - - * Να είσαι ευγενικός. Μην αναρτείς οτιδήποτε ένας λογικός άνθρωπος θα θεωρούσε προσβλητικό, καταχρηστικό ή εχθρικό λόγο. - * Κράτα τη συζήτηση καθαρή. Μην αναρτείς τίποτα άσεμνο ή σαφώς σεξουαλικό. - * Να σέβεστε ο ένας τον άλλο. Μην παρενοχλείτε ή θλίβετε κανέναν, μην πλαστοπροσωπείτε ανθρώπους, ή εκθέτετε ιδιωτικές πληροφορίες τους. - * Να σέβεσαι το φόρουμ μας. Μην αναρτείς ανεπιθύμητη αλληλογραφία και μην βανδαλίζεις με οποιοδήποτε άλλο τρόπο το φόρουμ. - - Αυτοί δεν είναι συγκεκριμένοι όροι με ακριβείς ορισμούς — απόφυγε ακόμη και την _εμφάνιση_ οποιουδήποτε από αυτά τα πράγματα. Αν δεν είσαι σίγουρος, ρώτησε τον εαυτό σου πως θα ένιωθες αν η ανάρτησή σου εμφανιζόταν στο εξώφυλλο των New York Times. - - Αυτό είναι σημόσιο φόρουμ, και οι μηχανές αναζήτησης κατατάσσουν αυτές τις συζητήσεις. Διατήρησε τη γλώσσα, τους συνδέσμους και τις εικόνες ασφαλείς για οικογένεια και φίλους. - - - - ## [Κράτα το τακτοποιημένο](#keep-tidy) - - Προσπάθησε να βάζεις τα πράγματα στο σωστό σημείο, έτσι ώστε να ξοδεύουμε περισσότερο χρόνο συζητώντας και λιγότερο ξεκαθαρίζοντας. Οπότε: - - * Μην ξεκινάς ένα νήμα σε λανθασμένη κατηγορία. - * Μην αναρτείς επαναλαμβανόμενα το ίδιο πράγμα σε πολλαπλά νήματα. - * Μην αναρτείς απαντησεις χωρίς περιεχόμενο. - * Μην εκτρέπεις ένα νήμα αλλάζοντάς το στη μέση της συζήτησης. - * Μην υπογράφεις τις αναρτήσεις σου — κάθε ανάρτηση έχει συνδεδεμένες τις πληροφορίες του προφίλ σου. - - Αντί να αναρτείς “+1” or “Συμφωνώ”, χρησιμοποίησε το κουμπί Μου αρέσει. Αντί να στρέφεις ένα υπάρχον νήμα σε τελείως διαφορετική κατεύθυνση, χρησιμοποίησε την Απάντηση ως συνδεδεμένο νήμα. - - - - ## [Να αναρτείς μόνο δικά σου πράγματα](#stealing) - - Μην αναρτείς τίποτα ψηφιακό που ανήκει σε κάποιον άλλο χωρίς την άδεια του. Μην αναρτείς περιγραφές, συνδέσμους ή μεθόδους κλοπής πνευματικής ιδιοκτησίας κάποιου (λογισμικό, βίντεο, ήχος, εικόνες), ή παραβίασης άλλου νόμου. - - - - ## [Συμβαίνει εξαιτίας σου](#power) - - Αυτός ο ιστότοπος λειτουργεί από τους [φιλικούς τοπικούς συνεργάτες](/about) και *εσένα*, την κοινότητα. Αν έχεις επιπλέον ερωτήσεις για το πώς θα πρέπει να λειτουργούν τα πράγματα εδώ, άνοιξε νέο νήμα [κατηγορία ανατροφοδότησης ιστοτόπου](/c/site-feedback) και ας συζητήσουμε! Αν υπάρχει κρίσιμο ή επείγον ζήτημα το οποίο δεν μπορεί να χειριστεί ένα μετα νήμα ή η επισήμανση, επικοινώνησε μαζί μας μέσω της [σελίδα συνεργατών](/about). - - - - ## [Οροι χρήσης](#tos) - - Ναι, η νομική ορολογία είναι βαρετή, αλλά πρέπει να προστατεύσουμε τους εαυτούς μας – και κατ’ επέκταση εσάς και τα δεδομένα σας – έναντι εχθρικών ανθρώπων. Έχουμε [Όρους Χρήσης](/tos) που περιγράφουν την δική σου (και την δική μας) συμπεριφορά και δικαιώματα σχετικά με το περιεχόμενο, την ιδιωτικότητα και τους νόμους. Για να χρησιμοποιήσεις αυτή την υπηρεσία, πρέπει να συμφωνήσεις να συμμορφώνεσαι με τους [ΟΧ](/tos). tos_topic: title: "Όροι χρήσης της Υπηρεσίας" body: |+ @@ -3073,7 +2920,6 @@ el: description: "Ιστοσελίδα γενικής επικοινωνίας για εσάς και τον οργανισμό σας. Θα εμφανίζεται στο Σχετικά με τη σελίδα." site_contact: label: "Αυτόματα Μηνύματα" - description: "Όλα τα αυτόματα προσωπικά μηνύματα του Discourse θα αποστέλλονται από αυτόν τον χρήστη. Το πιο σημαντικό, αυτός ο χρήστης θα είναι ο καθορισμένος αποστολέας για κάθε μήνυμα καλωσορίσματος που στέλνεται αυτόματα στους χρήστες." corporate: title: "Οργάνωση" description: "Αυτά τα ονόματα θα υπάρχουν στην Πολιτική Προστασίας Πολιτικών Δεδομένων και στους Όρους χρήσης, που είναι νήματα τα οποία μπορείς να επεξεργαστείς στην κατηγορία του Προσωπικού. Εάν δεν έχεις εταιρεία, παράλειψε ελεύθερα αυτό το βήμα για τώρα." diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index e3a7302acb..aff9a4d1eb 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -848,7 +848,6 @@ es: delete_removed_posts_after: "Los posts borrados por su autor serán automáticamente eliminados después de (n) horas. Si se establece este valor a 0, los posts serán eliminados automáticamente." max_image_width: "Ancho máximo de las miniaturas de las imágenes en un post" max_image_height: "Alto máximo de las miniaturas de las imágenes en un post" - category_featured_topics: "Número de temas mostrados por categoría en la página /categories. Este cambio puede tardar hasta 15 minutos en verse reflejado" fixed_category_positions: "Si está marcado, podrás ordenar las categorías en un orden fijado. Si no, las categorías se mostrarán según su actividad reciente." fixed_category_positions_on_create: "Al marcar esta opción, el orden de las categorías se mantendrá en el diálogo de creación de temas (requiere fixed_category_positions)." add_rel_nofollow_to_user_content: "Añadir la etiqueta rel nofollow a todo el contenido introducido por los usuarios, excepto por los enlaces entrantes (incluyendo dominios padre). Si cambias esto, deberás hacer un rebake de todos los posts con: \"rake posts:rebake\"" @@ -907,7 +906,6 @@ es: ga_universal_domain_name: "Nombre del dominio establecido en Google Universal Analytics (analytics.js), ejemplo: misitio.com; visita http://google.com/analytics" gtm_container_id: "Google Tag Manager container id. ejempo: GTM-ABCDEF" 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" - enable_noscript_support: "Habilitar el soporte de motor de búsqueda estándar webcrawler mediante la etiqueta noscript" 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." use_admin_ip_whitelist: "Los admins solo pueden iniciar sesión si están en una dirección IP definida en la lista de Screened IPs (Admin > Logs > Screened Ips)." @@ -1363,10 +1361,6 @@ es: change_owner: post_revision_text: "Se ha transferido la propiedad de %{old_user} a %{new_user}" deleted_user: "un usuario eliminado" - emoji: - errors: - name_already_exists: "Lo sentimos, el nombre '%{name}' ya está en uso por otro emoji." - error_while_storing_emoji: "Lo sentimos, ha habido un error mientras se guardaba el emoji." topic_statuses: archived_enabled: "Este tema está ahora archivado. Se paraliza y no puede ser cambiado en ningún modo." archived_disabled: "Este tema se ha desarchivado. Se desparaliza y ahora puede ser cambiado." @@ -1613,7 +1607,6 @@ es: [mt]: http://www.mail-tester.com/ new_version_mailer: title: "Email de Nueva versión" - subject_template: "[%{site_name}] Nueva versión de Discourse, actualización disponible" text_body_template: | ¡Genial, una nueva versión de [Discourse](http://www.discourse.org) está disponible! @@ -1627,7 +1620,6 @@ es: - 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: "[%{site_name}] actualización disponible" text_body_template: |+ ¡Genial, una nueva versión de [Discourse](http://www.discourse.org) está disponible! @@ -1646,9 +1638,6 @@ es: queued_posts_reminder: title: "Recordatorio de post en revisión" - subject_template: - one: "[%{site_name}] 1 post esperando ser revisado" - other: "[%{site_name}] %{count} posts esperando ser revisados" text_body_template: | Hola, @@ -1803,56 +1792,48 @@ es: text_body_template: "Lo sentimos, pero la exportación de datos falló. Por favor, verifica los registros o contacta a un miembro del staff." email_reject_insufficient_trust_level: title: "Email rechazado, insuficiente nivel de confianza" - subject_template: "[%{site_name}] Problema relacionado con el email -- Insuficiente nivel de confianza" text_body_template: | Lo sentimos, pero tu mensaje de email a %{destination} (con título %{former_title}) no ha funcionado. Tu cuenta no tiene el nivel de confianza necesario para publicar nuevos temas a esta dirección de email. Si crees que se trata de un error, contacta a un miembro del staff. email_reject_user_not_found: title: "Email rechazado, cuenta de usuario no encontrada" - subject_template: "[%{site_name}] Problema de email -- Usuario no encontrado" text_body_template: | Lo sentimos, pero tu mensaje de email para %{destination} (titulado %{former_title}) no se ha enviado. No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_screened_email: title: "Email rechazado, correo bloqueado" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Correo bloqueado" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_inactive_user: title: "Email rechazado, usuario inactivo" - subject_template: "[%{site_name}] Problema relacionado con el email -- Usuario inactivo" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se entregó. La cuenta asociada a esta dirección de email no ha sido activada. Por favor activa tu cuenta antes de enviar emails. email_reject_blocked_user: title: "Email rechazado, usuario bloqueado" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Usuario bloqueado" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se entregó. La cuenta asociada a esta dirección de email ha sido bloqueada. email_reject_reply_user_not_matching: title: "Email rechazado, el usuario no coincide" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Email de respuesta no esperado" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no se ha enviado. No hay una cuenta asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_no_account: title: "Email rechazado, no hay cuenta" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Cuenta Desconocida" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. No hay una cuenta de usuario asociada con esta dirección de email. Intenta enviarlo con otra dirección de email o contacta con algún miembro del Staff. email_reject_empty: title: "Email rechazado, email vacío" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Sin Contenido" text_body_template: | Lo sentimos, pero tu email para %{destination} (titled %{former_title}) no funcionó. @@ -1861,21 +1842,18 @@ es: Si estás teniendo este problema y _sí_ incluiste contenido, inténtalo de nuevo con un formato más simple. email_reject_parsing: title: "Email rechazado, contenido erróneo" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Contenido erróneo" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó. No hemos encontrado tu respuesta en el email. **Asegúrate de escribir tu entera respuesta al principio del email** - no podemos analizar respuestas entre líneas. email_reject_invalid_access: title: "Email rechazado, acceso inválido" - subject_template: "[%{site_name}] Error de email -- Acceso no válido" text_body_template: | Lo sentimos, pero tu mensaje por email a %{destination} (titled %{former_title}) no funcionó. Tu cuenta no tiene los privilegios para publicar nuevos temas en esa categoría. Si crees que esto es un error, contacta a un moderador o administrador. email_reject_strangers_not_allowed: title: "Rechazar emails desconocidos No permitido" - subject_template: "[%{site_name}] Error de email -- Acceso no válido" text_body_template: |+ Lo sentimos, pero tu mensaje de email para %{destination} (titulado %{former_title}) no fue aceptado. @@ -1884,14 +1862,12 @@ es: email_reject_invalid_post: title: "Email rechazado, post inválido" - subject_template: "[%{site_name}] Problemas del Email -- Posting error" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. Posibles causas: formato complejo, mensaje demasiado extenso o demasiado breve. Por favor, inténtalo de nuevo, o bien publícalo en el foro. email_reject_invalid_post_specified: title: "Email Rechazado, Post Especificado Inválido" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Error de publicación" text_body_template: | Lo sentimos, pero tu mensaje de email para %{destination} (titled %{former_title}) no funcionó. @@ -1902,49 +1878,42 @@ es: Si puedes corregir el problema sugerido, por favor inténtalo de nuevo. email_reject_invalid_post_action: title: "Email Rechazado, Acción de Post Inválida" - subject_template: "[%{site_name}] Email Error -- Acción de Post Inválida" text_body_template: | Lo sentimos, pero tu mensaje de email para %{destination} (titled %{former_title}) no funcionó. La "Post Action" no fue reconocida. Por favor prueba luego o envía el mensaje desde el sitio web de forma tradicional si el error continua. email_reject_reply_key: title: "El email rechazó la clave de respuesta" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Clave de Respuesta Desconocida" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) se ha rechazado. La clave de respuesta proporcionada no es válida o es desconocida, por lo que no sabemos a qué responde este email. Contacta con algún miembro del staff. email_reject_bad_destination_address: title: "Email rechazado, mala dirección del destinatario" - subject_template: "[%{site_name}] Problema con el email -- Dirección desconocida" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó. Ninguna de las direcciones de emails ha sido reconocida. Por favor asegúrate de que estás enviando los correos a las direcciones correctas provistas por los administradores. email_reject_topic_not_found: title: "Email rechazado, tema no encontrado" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Tema no encontrado" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó. El tema al que estás respondiendo ya no existe, quizá debe haber sido eliminado? Si crees que esto es un error, contacta a un administrador. email_reject_topic_closed: title: "Email rechazado, tema cerrado" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Tema cerrado" text_body_template: | Lo sentimos, pero tu email para %{destination} (titulado %{former_title}) no funcionó. El tema actualmente está cerrado y no acepta más respuestas. Si crees que esto es un error, contacta a un administrador. email_reject_auto_generated: title: "Email autogenerado rechazado" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Respuesta Auto Generada" text_body_template: | Lo sentimos, pero tu mensaje de correo electrónico para %{destination} (titulado %{former_title}) no funcionó. Tu respuesta de correo fue marcada como "generada automáticamente", lo que significa que fue creado automáticamente por una computadora, en vez de un ser humano; no aceptamos este tipo de emails. Si crees que se trata de un error contacta con un administrador. email_error_notification: title: "Email, error de notificación" - subject_template: "[%{site_name}] Problema con el correo electrónico -- Error de autenticación POP" text_body_template: |+ Hubo un error de autenticación mientras se ejecutaba el polling de los emails desde el servidor POP. @@ -2084,7 +2053,6 @@ es: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Usuario invitado a MP" - subject_template: "[%{site_name}] %{username} te ha invitado a un hilo de mensajes '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2093,7 +2061,6 @@ es: %{respond_instructions} user_invited_to_private_message_pm_staged: title: "Usuario invitado a MP provisional" - subject_template: "[%{site_name}] %{username} te ha invitado a un mensaje '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2102,7 +2069,6 @@ es: %{respond_instructions} user_invited_to_topic: title: "Usuario invitado a tema" - subject_template: "[%{site_name}] %{username} te invitó a '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2111,7 +2077,6 @@ es: %{respond_instructions} user_replied: title: "Usuario respondió" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2122,7 +2087,6 @@ es: %{respond_instructions} user_replied_pm: title: "Usuario respondió por MP" - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -2133,7 +2097,6 @@ es: %{respond_instructions} user_quoted: title: "Usuario citado" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2144,7 +2107,6 @@ es: %{respond_instructions} user_linked: title: "Usuario enlazado" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2155,7 +2117,6 @@ es: %{respond_instructions} user_mentioned: title: "Usuario mencionado" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2166,7 +2127,6 @@ es: %{respond_instructions} user_group_mentioned: title: "Grupo del usuario mencionado" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2177,7 +2137,6 @@ es: %{respond_instructions} user_posted: title: "Usuario publicó" - subject_template: "[%{site_name}] %{subject_prefix}%{username} publicó en '%{topic_title}'" text_body_template: | %{header_instructions} @@ -2188,7 +2147,6 @@ es: %{respond_instructions} user_watching_first_post: title: "Usuarios vigilando el primer Post" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2199,7 +2157,6 @@ es: %{respond_instructions} user_posted_pm: title: "Usuario envió un MP" - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -2228,14 +2185,12 @@ es: join_the_discussion: "Leer más" popular_posts: "Temas populares" more_new: "Nuevo para ti" - subject_template: "Resumen de [%{site_name}]" unsubscribe: "Este resumen se envía desde %{site_link} cuando pasa un tiempo desde tu última visita. Para cancelar tu suscripción %{unsubscribe_link}." click_here: "clic aquí" from: "resumen de %{site_name}" preheader: "Un corto resumen desde tu última visita el %{last_seen_at}" mailing_list: why: "Actividad en %{site_link} a %{date}" - subject_template: "[%{site_name}] Resumen del %{date}" unsubscribe: "Este resumen se envía diariamente dado que el modo lista de correo está activado. Puedes darte de baja %{unsubscribe_link}." from: "%{site_name} resumen" new_topics: "Nuevos temas" @@ -2244,7 +2199,6 @@ es: back_to_top: "Volver al inicio" forgot_password: title: "Olvidé la Contraseña" - subject_template: "[%{site_name}] Restablecer contraseña" text_body_template: | Alguien ha pedido restablecer tu contraseña en [%{site_name}](%{base_url}). @@ -2254,7 +2208,6 @@ es: %{base_url}/users/password-reset/%{email_token} set_password: title: "Pon una contraseña" - subject_template: "[%{site_name}] Establecer contraseña" text_body_template: | Se ha solicitado añadir una contraseña a tu cuenta en [%{site_name}](%{base_url}). Otra opción es iniciar sesión usando cualquier servicio online soportado (Google, Twitter, etc) que esté asociado con esta dirección de email validada. @@ -2264,7 +2217,6 @@ es: %{base_url}/users/password-reset/%{email_token} admin_login: title: "Admin Login" - subject_template: "[%{site_name}] inicio sesión" text_body_template: | Alguien pidió iniciar sesión con tu cuenta en [%{site_name}](%{base_url}). @@ -2274,7 +2226,6 @@ es: %{base_url}/users/admin-login/%{email_token} account_created: title: "Cuenta creada" - subject_template: "[%{site_name}] Tu nueva cuenta" text_body_template: | Una nueva cuenta ha sido creada por ti en %{site_name} @@ -2282,14 +2233,12 @@ es: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Confirmar Nuevo Email" - subject_template: "[%{site_name}] Confirma tu nueva dirección de email" text_body_template: | Confirma tu nueva dirección de email para %{site_name} haciendo clic en el siguiente enlace: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "Confirmar Viejo Email" - subject_template: "[%{site_name}] Confirma tu dirección actual de email" text_body_template: | Antes de cambiar tu dirección de correo electrónico, necesitamos que confirmes que tienes acceso a dicho email. Después de completar este paso, podrás confirmar la nueva dirección de correo electrónico. @@ -2298,7 +2247,6 @@ es: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "Antiguo email de notificaciones" - subject_template: "[%{site_name}] Tu dirección de email ha sido cambiada" text_body_template: | Este es un mensaje automático que se ha generado para comunicarte que tu email para el sitio %{site_name} ha sido modificado. Si ha habido un error, por favor contacta al administrador. @@ -2327,7 +2275,6 @@ es: (Si necesitas comunicarte por privado con [algún miembro del staff](%{base_url}/about) como nuevo usuario, puedes responder a este mensaje.) signup: title: "Registrate" - subject_template: "[%{site_name}] Confirma tu nueva cuenta" text_body_template: | ¡Bienvenido a %{site_name}! @@ -2399,105 +2346,6 @@ es: Edita el primer post de este tema para cambiar el contenido de la página %{page_name}. guidelines_topic: title: "Preguntas Frecuentes / Directrices" - body: | - - - ## [Este es un lugar público para conversaciones civilizadas](#civilized) - - Por favor, trata este foro de debate con el mismo respeto con el que tratarías un parque. Este es un lugar donde compartir habilidades, conocimiento e intereses a través de debates y conversaciones. - - Estas no son unas normas estrictas y cerradas, sino una ayuda para el correcto desarrollo de la comunidad. Usa estas pautas para mantener este sitio como un lugar limpio y adecuado para poder debatir y conversar correctamente. - - - - ## [Aporta](#improve) - - Ayúdanos a mantener este foro como un buen lugar esforzándote para mejorar el debate de alguna manera, aunque sea mínima. Si no estás seguro de lo que tu mensaje aporta a la conversación, piensa sobre lo que quieres decir e intenta contestar después. - - El contenido de este foro nos importa, y queremos que actúes como si te importara a ti también. Sé respetuoso con los temas debatidos y con la gente que los debate, aunque no estés de acuerdo con algo de lo que digan. - - Una buena manera de de mejorar el foro es investigando un poco lo que está pasando o ya ha pasado. Por favor, echa un vistazo a los temas ya existentes antes de responder a uno o crearlo y así podrás ver quién opina lo mismo o tiene intereses parecidos a los tuyos. - - - - ## [Sé aceptable incluso cuando no estés de acuerdo](#agreeable) - - Cuando vayas a responder a algo con lo que no estás de acuerdo acuérdate de __criticar las ideas y no las personas__. Por favor, evita: - - - * Ridiculizar a los demás. - * Faltar al respeto e insultar. - * Responder al tono del mensaje en vez de a su contenido. - * Hacer comparaciones y contradicciones exageradas y/o fuera de lugar. - - En lugar de eso, da argumentos que aporten algo al tema, por favor. - - - - ## [Tu participación cuenta](#participate) - - Eres parte de la comunidad, y queremos que todo el mundo participe en ella. Crea o responde a los temas aportando algo y harás de este foro un lugar más interesante y agradable. - - Este foro ofrece herramientas que permiten a la comunidad identificar entre todas las mejores (y peores) contribuciones: "Me gusta", marcadores, reportes, distintivos, respuestas, ediciones, y demás. Usa todo esto para mejorar tu experiencia y la de los demás. - - Intentemos dejar esto mejor de lo que nos lo encontramos. - - - - ## [Si ves un problema, repórtalo](#flag-problems) - - Los moderadores tienen una autoridad especial: son los responsables de este foro. Pero tú lo eres también. Con tu ayuda, los moderadores pueden ser personas que faciliten el desarrollo de la comunidad en lugar de la policía del foro o el servicio de limpieza. - - Cuando veas un comportamiento inadecuado, no respondas. Eso hace que, al reconocer públicamente el contenido inadecuado, se siga publicando contenido de esa clase. Además, lo único que harás será perder energía y el tiempo de todos. En su lugar, repórtalo. Si un post es reportado lo suficiente, se tomarán medidas automáticamente o mediante la intervención de un moderador. - - Para el correcto funcionamiento de esta comunidad, los moderadores se reservan el derecho de eliminar cualquier contenido y cualquier cuenta, por cualquier razón en cualquier momento. Los moderadores no ven los temas antes de que sean publicados por lo que ellos y los operadores del foro no son responsables del contenido publicado por la comunidad. - - - - ## [Sé educado](#be-civil) - - Nada estropea más una conversación que la mala educación. - - * Sé educado. No publoques nada que una persona razonable consideraría ofensivo o abusivo. - * Mantén limpio el foro. No publiques nada obsceno o sexualmente explícito. - * Respeta. No molestes ni acoses a los demás usuarios, tampoco publiques su información privada y/o personal. - * Respeta el foro. No publiques spam ni nos estropees el foro. - - Como puedes ver, estos no son términos exactos con definiciones exactas. Evita siquiera la aparición de cualquiera de estas cosas en el foro. Si no estás seguro, piensa en cómo te sentirías si tu post apareciera en la portada de algún periódico importante. - - Este es un foro público y por tanto el contenido puede aparecer en los motores de búsqueda. El foro es para todos los públicos, así que debes tener cuidado con el vocabulario y el contenido. - - - - ## [Mantén limpio y organizado el foro](#keep-tidy) - - Esfuérzate para poner las cosas en su lugar correspondiente para que podamos estar más tiempo participando en la comunidad y menos tiempo limpiando y organizando. - - * No empieces un nuevo tema en la categoría equivocada. - * No publiques lo mismo en varios temas diferentes. - * No respondas con un mensaje sin contenido. - * No desvíes un tema en mitad de la discusión. - * No firmes tus mensajes — tu información y perfil están claramente visibles junto al post. - - En vez de responder “+1” or “Estoy de acuerdo”, usa el botón de Me gusta. En lugar de cambiar radicalmente la dirección de un tema, responde como nuevo tema. - - - - ## [Publica sólo lo que es tuyo](#stealing) - - No publiques nada que pertenezca a otra persona sin permiso. No debes facilitar enlaces, descipciones o métodos de robar la propiedad intelectual de los demás. (software, vídeo, audio, imágenes, etc.), o formas de violar las leyes. - - - - ## [Funcionamos gracias a gente como tú](#power) - - Este foro es operado por nuestro [equipo](/about) y *vosotros*, la comunidad. Si tienes alguna pregunta sobre cómo deberían funcionar las cosas aquí, abre un nuevo tema en la [categoría de Sugerencias](/c/site-feedback). Si pasa algo urgente que no puede ser resuelto con un tema o un reporte, contáctanos a través de [esta página](/about). - - - - ## [Términos del Servicio](#tos) - - 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](/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](/tos). tos_topic: title: "Términos de Servicio" body: | diff --git a/config/locales/server.et.yml b/config/locales/server.et.yml index 79cc6f9790..48da7be45f 100644 --- a/config/locales/server.et.yml +++ b/config/locales/server.et.yml @@ -379,7 +379,6 @@ et: pms_per_day: "Oled ületanud tänaseks lubatud sõnumite limiidi. Palun oota %{time_left} enne kui uuesti proovid." create_like: "Oled ületanud tänaseks lubatud meeldimiste lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid." create_bookmark: "Oled ületanud tänaseks lubatud järjehoidjate lisamise limiidi. Palun oota %{time_left} enne kui uuesti proovid." - edit_post: "Oled ületanud tänaseks lubatud postituste muutmise limiidi. Palun oota %{time_left} enne kui uuesti proovid." live_post_counts: "Küsid postituste reaalajas loendit liiga kiiresti. Palun oota %{time_left} enne kui uuesti proovid." unsubscribe_via_email: "Oled ületanud tänaseks lubatud meilitsi tellimuste tühistamise limiidi. Palun oota %{time_left} enne kui uuesti proovid." topic_invitations_per_day: "Oled ületanud tänaseks lubatud teemadesse kutsumise limiidi. Palun oota %{time_left} enne kui uuesti proovid." @@ -753,28 +752,13 @@ et: %{message} mailing_list: why: "Saidi %{site_link} kõik toimingud päeval %{date}" - subject_template: "[%{site_name}] Kokkuvõte päeval %{date}" from: "%{site_name} kokkuvõte" new_topics: "Uued teemad" topic_updates: "eemade uuendused" view_this_topic: "Vaata seda teemat" back_to_top: "Tagasi üles" - forgot_password: - subject_template: "[%{site_name}] Parooli uuendamine" - set_password: - subject_template: "[%{site_name}] Määra parool" - admin_login: - subject_template: "[%{site_name}] Logi sisse" - account_created: - subject_template: "[%{site_name}] Sinu uus konto" - confirm_old_email: - subject_template: "[%{site_name}] Kinnita oma kehtiv meiliaadress" - notify_old_email: - subject_template: "[%{site_name}] Sinu meiliaadress on muudetud" signup_after_approval: subject_template: "Oled saidil %{site_name} heaks kiidetud!" - signup: - subject_template: "[%{site_name}] Kinnita oma uus konto" page_not_found: title: "Oih! Soovitud lehte ei ole või on see privaatne." popular_topics: "Populaarsed" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index ea2f176e2e..6e0b6510ee 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -32,8 +32,10 @@ fa_IR: purge_reason: "حساب کاربری غیرفعال. حذف شده به صورت خودکار به علت عدم استفاده." disable_remote_images_download_reason: "عکس های ریموت دانلود شده غیرفعال شدند زیرا آنجا فضای کافی در دیسک وجود نداشت" anonymous: "ناشناس" + remove_posts_deleted_by_author: "پاک شدن توسط نویسنده" emails: incoming: + default_subject: "این موضوع نیاز به عنوان دارد" show_trimmed_content: "نمایش محتوای پنهان شده." maximum_staged_user_per_email_reached: "تکمیل ظرفیت تعداد حساب های کاربری با هر ایمیل." errors: @@ -300,7 +302,6 @@ fa_IR: pms_per_day: "شما به حداکثر تعداد پیام هایی که امروز میتوانید بفرستید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید." create_like: "شما به حداکثر تعداد پسند هایی که امروز میتوانید بکنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید." create_bookmark: "شما به حداکثر تعداد بوک مارک هایی که امروز میتوانید بکنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید." - edit_post: "شما به حداکثر تعداد ویرایش هایی که امروز میتوانید بکنید رسیده اید. لطفا به مدت %{time_left} صبر کنید قبل از اینکه دوباره امتحان کنید." hours: other: "%{count} ساعت" minutes: @@ -613,7 +614,6 @@ fa_IR: delete_removed_posts_after: "نوشته های حذف شده توسط نویسنده بطور خودکار پاک می شوند بعد از (n) ساعت. اگر به 0 تنظیم شود همان موقع پاک خواهند شد. " max_image_width: "حداکثر عرض تامبنیل عکس ها در نوشته." max_image_height: "حداکثر طول تامبنیل عکس ها در نوشته." - category_featured_topics: "تعداد جستارهای نمایش داداه شده به دسته بندی در صفحه دسته بندی ها. بعد از عوض کردن این مقدار٬ تا 15 دقیقه زمان می برد تا صفحه دسته بندی ها به روز شود. " fixed_category_positions: "اگر چک شده باشد٬ شما این امکان را دارید تا دسته بندی ها را به ترتیب در یک نظم ثابت قرار دهید. اگر چک نشده باشد٬ دسته بندی ها بر اساس فعالیتشان قرار می گیرند. " fixed_category_positions_on_create: "اگر انتخاب شود بدین معنی است که ترتیب دسته‌ها در پنجره ایجاد یک عنوان جدید مدیریت خواهد شد (نیازمند fixed_category_positions است)." add_rel_nofollow_to_user_content: "nofollow REL را اضافه کن به تمام محتویات ارسال شده کاربر٬ بجر برای پیوندهای داخلی (به همراه دامنه های والد). اگر این را عوض کردی٬‌ باید تمام پست ها را rebake کنی با : \"rake posts:rebake\"" @@ -646,7 +646,6 @@ fa_IR: must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) کد پیگری کد٬ UA-12345678-9; این را ببین http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) اسم دامنه٬‌ eg: mysite.com; این را ببین http://google.com/analytics" - enable_noscript_support: "webcrawler موتور جستجوی استاندارد را فعال کناز طریق تگ noscript" allow_moderators_to_create_categories: "اجازه دادن به مدیران برای ساخت دسته‌بندی‌های جدید" cors_origins: "ریشه های مجاز برای cross-origin requests درخواست متقابل منشاء (CORS). هر منشاء باید دارای http:// or https://. The DISCOURSE_ENABLE_CORS env باید متغیر باشد برای تنظیم به کارگیری CORS. " top_menu: "مشخص کن کدام موارد در صفحه اصلی مکان یابی نشان داده شوند٬ و به چه ترتیبی. برای مثال : آخرین ها|جدید|خوانده نشده|دسته بندی|خوانده شده|نوشته شده|نشانک" @@ -679,7 +678,6 @@ fa_IR: invite_passthrough_hours: "برای چه مدت کاربر می تواند از کلید فراخوان بخشوده شده برای ورود به سیستم استفاده کند٬‌ در ساعت" invite_only: "ثبت نام عمومی از کار افتاده است٬ تمام کاربران جدید باید از توسط کاربران عضو دعوت شده شوند." login_required: "نیاز به تصدیق است برای خواندن محتوا در سایت٬ دسترسی ناشناس رد شود." - reserved_usernames: "نام های کاربری غیرمجاز جهت عضویت." min_password_length: "حداقل طول رمز عبور" block_common_passwords: "رمز عبوری که جزو 10,000 رمز عبور رایج است را قبول نکنید. " enable_sso: "اجازه single sign on از طریق سایت‌های دیگر داده شود (هشدار: آدرس ایمیل کاربر *باید* توسط سایت دیگر معتبر تشخیص داده شود!)" @@ -902,10 +900,6 @@ fa_IR: change_owner: post_revision_text: "حق مالکیت از کاربر {old_user}% به کاربر {new_user}% منتقل شد" deleted_user: "یک کاربر حذف شده" - emoji: - errors: - name_already_exists: "متأسفیم، در حال حاضر نام '{name}%' توسط ایموجی دیگری استفاده می‌شود." - error_while_storing_emoji: "متأسفیم، در هنگام ذخیره‌سازی ایموجی خطایی رخ داده است." topic_statuses: archived_enabled: "این جستار بایگانی شده است. غیر قابل دسترسی است و قادر به تغییر آن نیستید." archived_disabled: "این جستار الان از بایگانی خارج شد.این دیگر غیر قابل دسترسی نیست و قادر به عوض شدن است." @@ -975,15 +969,6 @@ fa_IR: subject_template: "%{invitee_name} دعوت شدید به عضویت در %{site_domain_name}" invite_password_instructions: subject_template: "تنظیم رمز عبور برای حساب کاربری {site_name}%" - test_mailer: - subject_template: "[%{site_name}] ایمیل تست دهش" - new_version_mailer: - subject_template: "[%{site_name}] نسخه جدید Discourse برای به روز رسانی موجود است" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] بروزرسانی در دسترس" - queued_posts_reminder: - subject_template: - other: "[%{site_name}] %{count} نوشته منتظر بررسی است" flag_reasons: off_topic: "نوشته شما به عنوان **بی ربط به جستار** پرچم گزاری شده. انجمن احساس خوبی برای جا دادن آن در جستار ندارد٬ آن طور که در عنوان و نوشته اول تعریف شده. " inappropriate: "نوشاه شما به عنوان ** نامناسب** پرچم گزاری شده. انجمن احساس کرده این تهاجمی، توهین آمیز، و یا نقض [دستورالعمل انجمن ما است](دستورعمل انجمن/)" @@ -1042,22 +1027,6 @@ fa_IR: csv_export_failed: subject_template: "خارج کردن فایل ها ناموفق شد" text_body_template: "ما متاسفیم٬ ولی خارج کردن اطلاعات ناموفق شد. لطفا سیستم را چک کنید یا با یکی از مدیران تماس بگیرید. " - email_reject_no_account: - subject_template: "[%{site_name}] مشکل ایمیل -- حساب کاربری ناشناس " - email_reject_empty: - subject_template: "[%{site_name}] مشکل ایمیل -- بدون محتوا" - email_reject_invalid_access: - subject_template: "[%{site_name}] مشکل ایمیل -- دسترسی نامعتبر " - email_reject_reply_key: - subject_template: "[%{site_name}] مشکل ایمیل -- کلید پاسخ ناشناس" - email_reject_topic_not_found: - subject_template: "[%{site_name}] مشکل ایمیل -- جستار یافت نشد" - email_reject_topic_closed: - subject_template: "[%{site_name}] مشکل ایمیل -- جستار بسته است" - email_reject_auto_generated: - subject_template: "[%{site_name}] مشکل ایمیل -- پاسخ خودکار" - email_error_notification: - subject_template: "[%{site_name}] مشکل ایمیل -- ایراد تصدیق POP " spam_post_blocked: subject_template: "کاربر جدید%{username} نوشته مسدود شده است بدلیل پیوند های تکراری" pending_users_reminder: @@ -1078,23 +1047,10 @@ fa_IR: title: "لغو اشتراک" description: "آیا تمایلی به دریافت این ایمیل‌ها ندارید؟ مشکلی نیست! اینجا را کلیک کنید تا اشتراک آن هم‌اکنون حذف شود." posted_by: "نوشته شده توسط {username}% در تاریخ {post_date}%" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} شما را به یک پیام دعوت کرده است: '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: why: "یک گزارش کوتاه از %{site_link} از آخرین باری که بازدید کردید در %{last_seen_at}" click_here: "اینجا کلیک کنید" forgot_password: - subject_template: "[%{site_name}] باز یابی رمز عبور" text_body_template: | شخصی برای ریست رمز عبور سوال کرد[%{site_name}](%{base_url}). @@ -1106,7 +1062,6 @@ fa_IR: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "تنظیم رمز عبور [%{site_name}] " text_body_template: | شخصی برای اضافه کردن رمز عبور به حساب کاربری شما پرسیده در [%{site_name}](%{base_url}). در روش دیگر٬‌ شما می توانید با وارد شوید از طریق سرویس دیگر مثل (گوگل٬‌ فیس بوک٬‌غیره) که ایمیل برابر استفاده می کنند. @@ -1117,7 +1072,6 @@ fa_IR: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] ورود به سیستم" text_body_template: | شخصی برای ورود به سیستم با حساب کاربری شما سوال کرد [%{site_name}](%{base_url}). @@ -1126,7 +1080,6 @@ fa_IR: برای ورود به سیستم لینک پیش رو را کلیک کنید. : %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] حساب کاربری جدید شما" text_body_template: | حساب کاربری جدید برای شما ساخته شد در %{site_name} @@ -1154,7 +1107,6 @@ fa_IR: ( اگر شما نیاز به ارتباط با مدیران را دارید[staff members](%{base_url}/about) به عنوان یک کاربر جدید٬ لطفا به این پیام پاسخ دهید.) signup: - subject_template: "[%{site_name}] حساب کاربری جدید را تایید کنید" text_body_template: | خوش آمدید به %{site_name}! @@ -1218,7 +1170,6 @@ fa_IR: نوشته اول این جستار را ویرایش کن برای عوض کردن محتویا ت%{page_name} صفحه. guidelines_topic: title: "پرسش و پاسخ / دستورالعمل" - body: "اینجا مکانی متمدن برای بحث جمعی است.\nلطفا برای این فروم بحث همان احترامی را قائل باشید که برای یک پارک عمومی هستید. ما، هم، یک منبع جمعی مشترک هستیم – جایی که مهارت ها، دانش و علایق در اثر بحث های در جریان به اشتراک گذاشته می شود.\nاز راهنمای زیر برای تمیز نگه داشتن این مکان به صورت یک مجلس متمدن بحث بهره ببرید. این راهنما قوانین سفت و سختی ندارد، بلکه صرفا به قضاوت افراد از جامعه ی ما کمک میکند.\nبحث را بهبود ببخشید\nبا بهبود بحث ها، حتی اگر بهبود کوچکی باشد، به ما کمک کنید تا اینجا را همیشه یک مکان مناسب برای بحث نگه داریم. اگر مطمئن نیستید که پست های شما به بحث چیزی اضافه میکند، به چیزی که میخواهید فکر کنید و بعدتر دوباره تلاش کنید.\nموضوعات بحث شده در اینجا برای ما مهم است، و میخواهیم شما هم طوری رفتار کنید که گویی آن ها برای شما هم مهم هستند. نسبت به موضوعات مطرح شده و مردمی که راجع به آن بحث میکنند احترام قائل باشید، حتی اگر با بعضی چیزهایی که گفته می شود موافق نیستید.\nیک راه بهبود بحث ها، با کشف بحث هایی است که پیش تر اتفاق افتاده. لطفا پیش از اینکه پاسخ خودتان را بیان کنید، زمانی برای مرور عناوینی که اینجاست سپری کنید؛ در این صورت احتمال اینکه افراد دیگری با علایق مشترک با شما بیابید بیشتر میشود.\nحتی وقتی موافق نیستید، نیز دلپذیر باشید\nممکن است بخواهید با بعضی بحث های مطرح شده مخالفت کنید. این خوب است. فقط حواستان باشد که ایده ها را نقد کنید و نه افراد را. لطفا از موارد زیر دوری کنید:\n-\tنام بردن\n-\tحمله به شخصیت و یا انگیزه ی افراد\n-\tواکنش به نحوه ی بیان پست به جای محتوای آن\n-\tواکنش های سریع و متناقض\nبه جای این ها، استدلال های مخالفی که بحث را بهبود می بخشند فراهم کنید.\nمشارکت شما به حساب می آید\nبحث هایی که ما اینجا داریم برای همه خواهد ماند. با تعامل در بحث هایی که این فروم را به مکان جالب تری برای حضور میکند و دوری از بحث هایی که این چنین نمی کند، به ما کمک کنید در آینده ی این جمع تاثیرگذار باشیم.\nدیسکورس ابزاری در دسترس می گذارد که به جمع این امکان را میدهد که بهترین (و بدترین) مشارکتها را تشخیص دهند: علاقه مندی ها، نشانک ها، لایک ها، پرچم ها، پاسخ ها، ویرایش ها، و ... . از این ابزارها برای بهبود تجربه ی خودتان و همین طور دیگران بهره ببرید.\nبیاید تلاش کنیم پارک را نسبت به آن چه از ابتدا یافته ایم، بهبود ببخشیم.\nاگر مشکلی دیدید، آن را پرچم گذاری کنید.\nتعدیل کننده ها امتیازهای مشخصی دارند؛ آن ها مسئول این فروم هستند. و البته شما هم هستید. با کمک شما، تعدیل کننده ها میتوانند تسهیل گر باشند و نه فقط فراش یا پلیس.\nوقتی رفتار نامناسبی میبینید، پاسخ ندهید. این کار رفتار بد را تشویق میکند، انرژی شما را مصرف میکند، و زمان دیگران را خرج میکند. تنها کافی است آن را پرچم گذاری کنید. با تعلق گرفتن پرچم های کافی، اقدام مناسب انجام می شود، یا خود به خود و یا با دخالت تعدیل کننده ها.\nبرای حفظ جامعه یمان، تعدیل کننده ها این حق را دارند که محتوای هر کاربری و یا هر کاربری را به هر دلیلی در هر زمانی حذف کنند. تعدیل کننده ها، پست های جدید را پیش نمایش نمیکنند؛ و تعدیل کننده ها و مجریان سایت مسئول هیچ کدام از پست های جمع نیستند.\nهمیشه متمدن باشید\nهیچ چیزی یک بحث سالم را مانند بی ادبی خراب نمیکند:\n-\tمتمدن باشید. مطالبی که یک فرد معقول توهین آمیز، سواستفاده، و یا بیان نفرت در نظر میگیرد پست نکنید.\n-\tاینجا را تمیز نگه دارید. مطالب مستهجن و یا مطالب جنسی صریح پست نکنید.\n-\tبه همدیگر احترام بگذارید. باعث آزار یا اندوه دیگران نشوید، خود را به جای دیگران جا نزنید، و یا اطلاعات خصوصی دیگران را در معرض قرار ندهید.\n-\tبه فروم ما احترام بگذارید. اسپم پست نکنید و یا فروم را به تباهی نکشید.\nاین شرایط تعریف دقیق ندارند – از چیزهایی که حتی نمود این موارد هست نیز دوری کنید. اگر مطمئن نیستید، از خودتان بپرسید چه حسی به شما دست میداد اگر پستتان در صفحه ی اول نشریه نیویورک تایمز چاپ شود.\nاینجا یک فروم عمومی است، و موتورهای جستجو بحث های موجود را نشان میدهند. زبان، لینک ها، و تصاویر را برای دوستان و خانواده امن نگه دارید.\nاینجا را تمیز نگه دارید\nتلاش کنید تا چیزها را در جای مناسب خود قرار دهید، تا ما بتوانیم زمان بیشتری را به بحث و زمان کمتری را به تمیزکاری بپردازیم:\n-\tیک موضوع را در دسته بندی نادرست مطرح نکنید.\n-\tیک موضوع را در عناوین مختلف پست نکنید.\n-\tپاسخ های بدون محتوا پست نکنید.\n-\tیک موضوع را با ویرایش آن در حین بحث منحرف نکنید.\n-\tپست های خودتون رو امضا نکنید – هر پستی اطلاعات شما را با خود به همراه دارد.\nبه جای پست کردن «+1» یا «موافقم»، از دکمه ی لایک استفاده کنید. به جای اینکه یک موضوع موجود را به عنوان موضوع جدید مطرح کنید، از گزینه ی «پاسخ به صورت موضوع لینک شده» استفاده کنید.\nتنها مطالب خودتان را پست کنید\nمطالب دیگران را بدون اجازه مطرح نکنید. توصیف، لینک، و یا ابزاری برای دزدی دارایی های معنوی دیگران (نرم افزارها، ویدیوها، فایل صوتی، تصویر) و یا شکستن قوانین دیگر؛ را مطرح نکنید.\nقدرت گرفته از شما\nاین سایت توسط مدیران ما و شما، جمع حرکت میکند. اگر هر سوال دیگری درباره ی نحوه ی عملکرد چیزهای اینجا دارید، یک بحث جدید در دسته بندی فیدبک های سایت شروع کنید و بگذارید تا بحث صورت بگیرد. اگر یک موضوع بحرانی و یا مسئله ی فوری هست که نمیتواند در یک موضوع فیدبک و یا با پرچم مطرح شود، از طریق صفحه ی اعضا با ما تماس بگیرید.\nشرایط سرویس\nبله، قوانین خسته کننده هستند، ولی ما باید از خودمان در برابر گروه های غیردوستانه محافظت کنیم – و همین طور از شما و اطلاعات شما. در شرایط استفاده از سرویسمان که رفتار شما ( و ما) را توصیف میکند و حقوق مربوط به محتوا، حریم خصوصی، و قوانین را توضیح داده ایم. برای استفاده از این سرویس، لازم است شما با رعایت شرایط استفاده از سرویس ما موافقت کرده باشید.\n" tos_topic: title: "شرایط استفاده از خدمات" privacy_topic: diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 6e2fa07cb3..52959c502a 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -854,7 +854,6 @@ fi: delete_removed_posts_after: "Kirjoittajalta poistetut viestit poistetaan automaattisesti (n) tunnin kuluttua. Jos asetetaan 0, viestit poistetaan välittömästi." max_image_width: "Esikatselukuvan suurin sallittu leveys viestissä" max_image_height: "Esikatselukuvan suurin sallittu korkeus viestissä" - category_featured_topics: "Näytettävien ketjujen lukumäärä alueittan Alueet-sivulla. Arvon muuttamisen jälkeen voi kestää jopa 15 minuuttia sivun päivittymiseen." fixed_category_positions: "Jos tämä on valittuna, voit muokata alueiden järjestystä. Jos tätä ei valita, alueet järjetsetään aktiivisuuden mukaan." fixed_category_positions_on_create: "Jos tämä on valittuna, alueiden järjestys pysyy samana uuden ketjun luomisen dialogissa (edellyttää fixed_category_positions)" add_rel_nofollow_to_user_content: "Lisää rel nofollow kaikkeen käyttäjien lähettämään sisältöön, paitsi sivuston sisäisiin linkkeihin (sisältäen ylemmät verkkotunnukset). Jos muutat asetusta, sinun täytyy rakentaa viestit uudelleen komennolla: \"rake posts:rebake\"" @@ -912,7 +911,6 @@ fi: ga_universal_domain_name: "Google Universal analytics (analytics.js) verkkotunnus, esim.: osoite.fi; katso http://google.com/analytics" gtm_container_id: "Google Tag Manager -säiliön ID. Esim: GTM-ABCDEF" enable_escaped_fragments: "Käytä Googlen Ajax-sivustoille tarkoitettua API:a, jos webcrawleria ei tunnisteta. Katso https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Ota käyttöön noscript-tagi hakukoneiden webcrawlereille" allow_moderators_to_create_categories: "Salli valvojien luoda uusia alueita" cors_origins: "Salli lähteet CORS-pyynnöille (cross-origin request). Jokaisen lähteen pitää sisältää http:// tai https://. DISCOURSE_ENABLE_CORS asetus pitää olla valittuna ottaaksesi CORSin käyttöön." use_admin_ip_whitelist: "Ylläpitäjät voivat kirjautua vain IP-osoitteista, jotka on määritetty Seulottavien IP:iden listassa (Ylläpito > Lokit > Seulottavat IP:t)" @@ -1100,7 +1098,7 @@ fi: max_image_size_kb: "Liitetyn kuvan suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista." max_attachment_size_kb: "Liitetyn tiedoston suurin sallittu koko kilotavuissa. Tämä pitää asettaa myös nginxin (client_max_body_size) / apachen tai proxyn asetuksista." authorized_extensions: "Liitetiedostojen sallitut tiedostopäätteet (käytä '*' salliaksesi kaikki tiedostotyypit)" - max_similar_results: "Kuinka monta samankaltaista ketjua näytetään viestikentän yläpuolella uutta ketjua luotaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin." + max_similar_results: "Kuinka monta samankaltaista ketjua näytetään viestikentän päällä uutta ketjua luotaessa. Vertailu perustuu sekä otsikkoon että leipätekstiin." max_image_megapixels: "Kuvan enimmäiskoko megapikseleinä." title_prettify: "Estä yleiset kirjoitusvirheet otsikossa, kuten pelkät isot kirjaimet, pieni ensimmäinen kirjain, useat !- ja ?-merkit ym." topic_views_heat_low: "Näin monen katselun jälkeen katselut-saraketta korostetaan hieman." @@ -1366,10 +1364,6 @@ fi: change_owner: post_revision_text: "Omistus vaihdettu käyttäjältä %{old_user} käyttäjälle %{new_user}" deleted_user: "poistettu käyttäjä" - emoji: - errors: - name_already_exists: "Pahoittelut, nimi '%{name}' on jo käytössä toisella emojilla." - error_while_storing_emoji: "Pahoittelut, tämän emojin tallentamisessa tapahtui virhe." topic_statuses: archived_enabled: "Tämä ketju on arkistoitu. Se on jäädytetty eikä sitä voi muuttaa millään tavalla." archived_disabled: "Ketjun arkistointi on poistettu, se ei ole enää jäädytettynä ja sitä voi taas muuttaa." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 9fce130ea5..5ae81ab628 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -384,7 +384,6 @@ fr: pms_per_day: "Vous avez atteint le nombre maximum de nouveaux messages pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." create_like: "Vous avez atteint le nombre maximum de J'aime pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." create_bookmark: "Vous avez atteint le nombre maximum de favoris pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." - edit_post: "Vous avez atteint le nombre maximum de modifications pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." live_post_counts: "Vous demandez le nombre de posts en activité trop rapidement. Veuillez respecter le temps d'attente %{time_left} avant de réessayer." unsubscribe_via_email: "Vous avez atteint le nombre maximum de désinscriptions par email pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." topic_invitations_per_day: "Vous avez atteint le nombre maximum d'invitations dans un sujet pour aujourd'hui. Patientez s'il vous plaît %{time_left} avant d'essayer à nouveau." @@ -797,7 +796,6 @@ fr: delete_removed_posts_after: "Les messages retirés par leur auteur seront automatiquement supprimés après (n) heures. Pour une valeur renseignée à 0, les messages seront supprimés immédiatement." max_image_width: "Largeur maximale des images dans un message" max_image_height: "Hauteur maximale autorisée des images dans un message" - category_featured_topics: "Nombre de sujets affichés par catégorie sur la page /categories. Après avoir modifié cette valeur, il faut jusqu'à 15 minutes pour que la page des catégories soit mise à jour." fixed_category_positions: "Si coché, vous pourrez modifier l'ordre des catégories. Si décoché, elle seront triées par ordre d'activité." fixed_category_positions_on_create: "Si coché, le classement des catégories sera maintenu dans la fenêtre de création de sujet (nécessite fixed_category_positions)." add_rel_nofollow_to_user_content: "Ajouter rel nofollow à tous les contenus des utilisateurs, sauf les liens internes (incluant les domaines parents). Si vous modifiez ceci, vous devez exécuter la commande \"rake posts:rebake\"" @@ -855,7 +853,6 @@ fr: ga_universal_domain_name: "Nom de domaine Google Universal Analytics (analytics.js), par exemple : monsite.com ; voir http://google.com/analytics" gtm_container_id: "ID du conteneur Google Tag Manager, par exemple : GTM-ABCDEF" enable_escaped_fragments: "Utiliser l'API Ajax-Crawling de Google si aucun robot n'est détecté. Voir https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Activer le support des moteurs de recherches standards via le tag noscript" allow_moderators_to_create_categories: "Autoriser les modérateurs à créer de nouvelles catégories" cors_origins: "Requêtes cross-origin (CORS) autorisées. Chaque origine doit inclure http:// ou https://. la variable d'environnement DISCOURSE_ENABLE_CORS doit être renseignée à true pour activer CORS." use_admin_ip_whitelist: "Les administrateurs ne peuvent se connecter que s'ils sont à une adresse IP définie dans la liste des IP surveillées (Admin > Journaux > IP surveillés)." @@ -892,7 +889,6 @@ fr: invite_passthrough_hours: "Combien de temps un utilisateur peut encore utilisé une clé d'invitation après son expiration, en heure" invite_only: "L'inscription publique est désactivée, tous les nouveaux utilisateurs doivent explicitement être invités par les membres ou l'équipe du forum." login_required: "Authentification requise pour lire le contenu du site, interdit l'accès anonyme." - reserved_usernames: "Pseudos pour lesquels l'inscription n'est pas autorisée." min_password_length: "Longueur minimale du mot de passe." min_admin_password_length: "Longueur minimale du mot de passe pour l'administrateur." block_common_passwords: "Ne pas autoriser les mots de passe qui font partie des 10 000 les plus utilisés." @@ -1304,10 +1300,6 @@ fr: change_owner: post_revision_text: "Auteur du message changé de %{old_user} vers %{new_user}" deleted_user: "un utilisateur supprimé" - emoji: - errors: - name_already_exists: "Désolé, le nom « %{name} » est déjà utilisé par un autre emoji." - error_while_storing_emoji: "Désolé, il y a eu une erreur lors de l'enregistrement de l'emoji." topic_statuses: archived_enabled: "Ce sujet est maintenant archivé. Il est gelé et ne peut plus être modifié d'aucune façon." archived_disabled: "Ce sujet est maintenant désarchivé. Il n'est plus figé et peut être modifié." @@ -1402,14 +1394,6 @@ fr: other: "%{count} signalements en attente de traitement." unsubscribe_mailer: subject_template: "Confirmez que vous ne souhaitez plus recevoir de courriels de mises à jour de %{site_title}" - text_body_template: | - Quelqu’un (est-ce vous ?) a demandé à ne plus envoyer de courriels de mises à jour de %{site_domain_name} à cette adresse. - Pour confirmer, merci de cliquer sur ce lien : - - %{confirm_unsubscribe_link} - - - Si vous souhaitez continuer à recevoir ces courriels, vous pouvez ignorer ce message. invite_mailer: subject_template: "%{invitee_name} vous a invité(e) à participer à « %{topic_title} » sur %{site_domain_name}" custom_invite_mailer: @@ -1428,7 +1412,6 @@ fr: (Si le lien est expiré, choisissez "J'ai oublié mon mot de passe" lorsque vous essayez de vous connecter avec votre adresse mail.) test_mailer: - subject_template: "[%{site_name}] Test de délivrabilité d'un courriel" text_body_template: | Ceci est un courriel de test de @@ -1471,7 +1454,6 @@ fr: [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ new_version_mailer: - subject_template: "[%{site_name}] Nouvelle version de Discourse, mise à jour disponible" text_body_template: |+ Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible ! @@ -1485,7 +1467,6 @@ fr: - Visitez [meta.discourse.org](https://meta.discourse.org) pour des nouvelles, des discussions, et de l'aide concernant Discourse. new_version_mailer_with_notes: - subject_template: "[%{site_name}] mise à jour disponible" text_body_template: | Hourra, une nouvelle version de [Discourse](http://www.discourse.org) est disponible ! @@ -1502,9 +1483,6 @@ fr: %{notes} queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 message en attente de modération" - other: "[%{site_name}] %{count} messages en attente de modération" text_body_template: | Bonjour, @@ -1619,49 +1597,41 @@ fr: subject_template: "Échec de l'exportation des données " text_body_template: "Nous sommes désolés, l'exportation de vos données a échoué. Veuillez consulter les journaux ou contacter un responsable." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problème de courriel -- Niveau de confiance insuffisant " text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet via cette adresse de courriel. Si vous pensez qu'il s'agit d'une erreur, contacter un responsable. email_reject_user_not_found: - subject_template: "[%{site_name}] Problème de courriel -- L'utilisateur est introuvable" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Votre réponse a été envoyée depuis une adresse inconnue. Essayez de l'envoyer depuis une autre adresse, ou contactez un responsable. email_reject_screened_email: - subject_template: "[%{site_name}] Problème de courriel -- Courriel bloqué" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Votre réponse a été envoyée depuis une adresse bloquée. Essayez de l'envoyer depuis une autre adresse ou contactez un responsable. email_reject_inactive_user: - subject_template: "[%{site_name}] Problème de courriel -- Compte inactivé" text_body_template: | Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué. Le compte associé avec cette adresse existe n'est pas activé. Veuillez activer votre compte avant d'envoyer des courriels. email_reject_blocked_user: - subject_template: "[%{site_name}] Problème de courriel -- Utilisateur bloqué" text_body_template: | Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué. Le compte associé avec cette adresse a été bloqué. email_reject_reply_user_not_matching: - subject_template: "[%{site_name}] Problème de courriel -- Adresse de réponse inattendue" text_body_template: | Malheureusement votre courriel à %{destination} (titled %{former_title}) a échoué. Votre réponses nous est parvenue d'une autre adresse courriel que celle attendue, nous ne savons donc pas s'il s'agit de la même personne. Essayez de l'envoyer depuis une autre adresse, ou contactez un responsable. email_reject_no_account: - subject_template: "[%{site_name}] Problème de courriel - Compte utilisateur inconnu" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Aucun compte utilisateur avec cette adresse n'a été trouvé. Essayez de l'envoyer depuis une autre adresse ou contactez un responsable. email_reject_empty: - subject_template: "[%{site_name}] Problème de courriel - sans contenu" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. @@ -1669,31 +1639,26 @@ fr: Si vous obtenez ce message alors que vous _aviez_ inclus une réponse, réessayez avec un formatage plus simple. email_reject_parsing: - subject_template: "[%{site_name}] Problème de courriel -- Contenu non reconnu" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Nous n'avons pas pu trouver votre réponse dans le courriel. **Assurez-vous que votre réponse se trouve au début du courriel** -- nous ne pouvons pas traiter les réponses en ligne. email_reject_invalid_access: - subject_template: "[%{site_name}] Problème de courriel -- Accès invalide" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Votre compte n'a pas le niveau de confiance requis pour créer un nouveau sujet dans cette catégorie. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable. email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Problème de courriel -- Accès invalide" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. La catégorie vers laquelle vous avez envoyé ce courriel autorise uniquement les réponses d'utilisateurs avec un compte valide et une adresse de courriel connue. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable. email_reject_invalid_post: - subject_template: "[%{site_name}] Problème de courriel -- Erreur d'envoi d'un message" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Cela peut-être à cause d'un format trop complexe, d'un message trop long ou trop court. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problème de courriel -- Erreur d'envoi d'un message" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. @@ -1703,43 +1668,36 @@ fr: Si vous pouvez corriger les erreurs, veuillez réessayer. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problème de courriel -- Action Post invalide" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Le Post Action n'était pas reconnu. Veuillez réessayer ou rédigez votre message directement sur le site si le problème persiste. email_reject_reply_key: - subject_template: "[%{site_name}] Problème de courriel -- Mauvaise clé de réponse" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. La clé de réponse est invalide ou inconnue et nous ne pouvons pas savoir à quel message s’adresse cette réponse. Contactez un responsable. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problème de courriel - Adresse de destinataire inconnue" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Aucune des adresses de destination n'est reconnue. Veuillez vérifier que vous envoyez bien à l'adresse de courriel fournie par les responsables. email_reject_topic_not_found: - subject_template: "[%{site_name}] Problème de courriel -- Le sujet est introuvable" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Le sujet à lequel vous répondez n'existe plus. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable. email_reject_topic_closed: - subject_template: "[%{site_name}] Problème de courriel -- Le sujet est fermé" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Le sujet à lequel vous répondez est actuellement fermé et n'accepte plus de réponses. Si vous pensez qu'il s'agit d'une erreur, contactez un responsable. email_reject_auto_generated: - subject_template: "[%{site_name}] Problème de courriel - Réponse automatique" text_body_template: | Nous sommes désolés, mais l'envoi de votre courriel à %{destination} (intitulé %{former_title}) n'a pas fonctionné. Votre courriel a été marqué comme "automatiquement généré", ce qui signifie qu'il a été créé par un ordinateur au lieu d'être rédigé par un humain ; nous ne pouvons pas accepter ces types de courriel. Si vous pensez qu'il s'agit d'une erreur, contacter un responsable. email_error_notification: - subject_template: "[%{site_name}] Problème de courriel -- Erreur d'authentification POP3" text_body_template: | Malheureusement il y a eu un erreur d'authentification lors de la récupération des courriels depuis le serveur POP. @@ -1875,7 +1833,6 @@ fr: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Utilisateur invité au MP" - subject_template: "[%{site_name}] %{username} vous a invité dans la conversation « %{topic_title} »" text_body_template: | %{header_instructions} @@ -1883,7 +1840,6 @@ fr: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} vous a invité dans la conversation « %{topic_title} »" text_body_template: | %{header_instructions} @@ -1892,7 +1848,6 @@ fr: %{respond_instructions} user_invited_to_topic: title: "Utilisateur invité au sujet" - subject_template: "[%{site_name}] %{username} vous a invité dans « %{topic_title} »" text_body_template: | %{header_instructions} @@ -1901,7 +1856,6 @@ fr: %{respond_instructions} user_replied: title: "Utilisateur a répondu" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1912,7 +1866,6 @@ fr: %{respond_instructions} user_replied_pm: title: "Utilisateur a répondu au MP" - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -1923,7 +1876,6 @@ fr: %{respond_instructions} user_quoted: title: "Utilisateur a cité" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1933,7 +1885,6 @@ fr: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1944,7 +1895,6 @@ fr: %{respond_instructions} user_mentioned: title: "Utilisateur a mentionné" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1954,7 +1904,6 @@ fr: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1964,7 +1913,6 @@ fr: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1974,7 +1922,6 @@ fr: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1984,7 +1931,6 @@ fr: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -2012,14 +1958,12 @@ fr: join_the_discussion: "Lire la suite" popular_posts: "Messages populaires" more_new: "Nouveau pour vous" - subject_template: "[%{site_name}] Résumé" unsubscribe: "Ce résumé est envoyé depuis %{site_link} lorsque nous ne vous voyons plus depuis un moment. Pour se désabonner %{unsubscribe_link}." click_here: "cliquez ici" from: "résumé de %{site_name}" preheader: "Un bref résumé depuis votre dernière visite le %{last_seen_at}" mailing_list: why: "Toute l'activité sur %{site_link} le %{date}" - subject_template: "[%{site_name}] Résumé du %{date}" unsubscribe: "Ce résumé est envoyé quotidiennement car la liste de diffusion est activée. Pour se désabonner %{unsubscribe_link}." from: "%{site_name} résumé" new_topics: "Nouveaux sujets" @@ -2028,7 +1972,6 @@ fr: back_to_top: "Aller en haut" forgot_password: title: "Mot de passe oublié" - subject_template: "[%{site_name}] Réinitialisation du mot de passe" text_body_template: | Quelqu'un a demandé la réinitialisation de votre mot de passe sur [%{site_name}](%{base_url}). @@ -2038,7 +1981,6 @@ fr: %{base_url}/users/password-reset/%{email_token} set_password: title: "Définir le mot de passe" - subject_template: "[%{site_name}] Définir le mot de passe" text_body_template: | Quelqu'un a demandé d'ajouter un mot de passe à votre compte sur [%{site_name}](%{base_url}). Alternativement, vous pouvez vous connecter en utilisant un service en ligne pris en charge (Google, Facebook, etc) déjà associé à cette adresse de courriel validée. @@ -2047,7 +1989,6 @@ fr: Cliquez sur le lien suivant pour choisir un mot de passe: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Identification" text_body_template: | On a cherché à se connecter à votre compte sur [%{site_name}](%{base_url}). @@ -2056,20 +1997,17 @@ fr: Sinon, cliquez sur ce lien pour vous connecter : %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Votre nouveau compte" text_body_template: | Un nouveau compte utilisateur a été créé pour vous sur {site_name} Cliquez sur le lien ci-dessous pour choisir un mot de passe pour votre nouveau compte : %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Confirmer votre nouvelle adresse courriel" text_body_template: | Confirmer votre nouvelle adresse courriel pour %{site_name} en cliquant sur le lien suivant : %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Confirmer votre adresse courriel actuelle" text_body_template: | Avant de pouvoir changer votre adresse courriel, nous devons confirmer que vous contrôlez bien l'adresse actuelle. Après avoir effectuée cette étape, vous devrez confirmer @@ -2079,7 +2017,6 @@ fr: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] Votre adresse courriel a bien été modifiée" text_body_template: | Ceci est un message automatique pour vous informer que votre adresse courriel pour %{site_name} a été modifiée. Si c'est une erreur, merci de contacter @@ -2109,7 +2046,6 @@ fr: (Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.) signup: title: "Inscription" - subject_template: "[%{site_name}] Confirmer votre nouveau compte" text_body_template: | Bienvenue sur %{site_name} ! @@ -2181,104 +2117,6 @@ fr: Modifier le premier message de ce sujet pour changer le contenu de la page %{page_name}. guidelines_topic: title: "FAQ/Charte" - body: | - - - ## [Ceci est un endroit civilisé, merci de le respecter](#civilized) - - Merci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté — un endroit pour partager des compétences, savoirs et intérêts au travers de conversations. - - Il ne s'agit pas de règles absolues, uniquement d'aide au bon sens de notre communauté. Suivez ces instructions pour garder cet endroit propre et bien éclairé pour un débat public civilisé. - - - - ## [Améliorez la discussion](#improve) - - Aidez nous à faire de cet endroit un lieu idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard. - - Les sujets abordés ici sont importants pour nous et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit. - - Une façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Essayez de passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts. - - - - ## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable) - - La critique peut être constructive. Vous pouvez répondre à une personne en étant en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. Merci d'éviter : - - * les injures, - * les attaques ad hominem, - * de répondre à la tonalité d'un sujet plutôt qu'à son contenu réel, - * les contradictions primaires. - - Au lieu de cela, fournissez des contre-arguments motivés qui améliorent la conversation. - - - - ## [Votre participation compte](#participate) - - Les conversations que nous avons ici donnent le ton pour tout le monde. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant — et en évitant celles qui n'y participent pas. - - Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions : favoris, signets, des *J'aime*, des signalements, des réponses, des vérifications et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience et celle de tous les autres aussi. - - Essayons de laisser notre parc mieux que nous l'avons trouvé. - - - - ## [Si vous voyez un problème, signaler le](#flag-problems) - - Les modérateurs ont un rôle spécial ; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté et pas seulement des concierges ou des policiers. - - Quand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez-le*. Si suffisamment de signalements s'accumulent, des mesures seront prises, automatiquement ou par l'intervention d'un modérateur. - - Afin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne disposent pas d'un aperçu des nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté. - - - - ## [Soyez toujours civilisé](#be-civil) - - Rien ne sabote une conversation saine mieux que la grossièreté : - - * Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux. - * Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite. - * Se respecter mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant. - * Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme. - - Il ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avez un doute, demandez-vous comment vous vous sentiriez si votre sujet était publié sur la première page du Monde. - - Il s'agit d'un forum public et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis. - - - - ## [Gardez cet endroit propre](#keep-tidy) - - Faites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps à discuter et moins à ranger. Ainsi : - - * Ne commencez pas un sujet dans la mauvaise catégorie. - * Ne postez pas le même contenu dans plusieurs discussions. - * Ne postez pas de message sans contenu. - * Ne pas détourner un sujet en le changeant en cours de route. - * Ne signez pas vos messages — chaque message dispose d'informations sur le profil qui s'y rattache. - - Plutôt que de poster "+1", "lol", "mdr" ou "d'accord", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez "Répondre en créant un sujet lié". - - - - ## [Postez seulement vos propres trucs](#stealing) - - Vous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi. - - - - ## [Powered by You](#power) - - Ce site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en ! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about). - - - - ## [Lisez les conditions générales d'utilisation](#tos) - - Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger – et par extension, vous et vos données – contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos). tos_topic: title: "Conditions générales d'utilisation" privacy_topic: @@ -2661,7 +2499,6 @@ fr: description: "Page web pour vous contacter ou votre organisation. Sera affichée dans la page À propos." site_contact: label: "Messages automatiques" - description: "Tous les messages privés automatiques de Discourse seront envoyés par cet utilisateur. Plus important, cet utilisateur sera l'envoyeur désigné de tous les messages de bienvenue à destination des nouveaux utilisateurs." corporate: title: "Organisation" description: "Ces noms seront renseignés dans les pages Politique de confidentialité et Conditions générales d'utilisation que vous pouvez modifier à tout moment depuis la catégorie Staff. Si vous n'avez pas de société, vous pouvez ignorer cette étape pour le moment." diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 565dc47ee6..4cb5c2f319 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -849,7 +849,6 @@ he: delete_removed_posts_after: "פוסטים שהוסרו על ידי מחבריהם ימחקו באופן אוטומטי לאחר (n) שעות. אם הגדרה זו מכוונת ל-0, פוסטים ימחקו מיידית." max_image_width: "הרוחב המקסימלי של תצוגת תמונה מוקטנת בפוסט" max_image_height: "גובה מקסימלי של תצוגת תמונה מוקטנת בפוסט" - category_featured_topics: "מספר נושאים שמוצגים עבור כל קטגוריה בדף /categories. לאחר שינוי ערך זה, לוקח עד 15 דקות לדף הקטגוריות להתעדכן." fixed_category_positions: "אם אפשרות זו מסומנת, תוכלו לארגן את הקטגוריות כך שיופיעו בסדר קבוע. אם האופציות אינן מסומנות, הקטגוריות יסודרו על פי סדר הפעילות שהתבצעה בהן." fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)." add_rel_nofollow_to_user_content: "הוספת התווית rel nofollow לכל תוכן שפורסם על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל מתחם הורה parent domains). אם תשנו אפשרות זו, עליכם לאפות מחדש את כל הפרסומים עם: \"rake posts:rebake\"" @@ -908,7 +907,6 @@ he: ga_universal_domain_name: "שם המתחם של (Google Universal Analytics analytics.js), למשל: mysite.com; ראו http://google.com/analytics" gtm_container_id: "מזהה קונטיינר של מנהל תגיות גוגל. למשל: GTM-ABCDEF" enable_escaped_fragments: "נסיגה ל Ajax-Crawling API של גוגל אם לא מתגלה זחלן-רשת. ראו https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "אפשרו תמיכה בזחלן רשת סטנדרטי של מנועי חיפוש באמצעות התג noscript" allow_moderators_to_create_categories: "אפשרו למנחים ליצור קטגוריות חדשות" cors_origins: "מקורות שאפשר לבצע להם בקשות קרוס-דומיין (Cross origin requests). כל מקור צריך לכלול את התחילית http:// או https:// . משתנה הסביבה DISCOURCE_ENABLE_CORS חייב להיות true כדי לאפשר CORS." use_admin_ip_whitelist: "מנהלים יכולים להתחבר רק אם הכתובת שלהם מופיע ברשימת ה IPs המסוננים (ניהול > לוגים > כתובות IP מסוננות)." @@ -1367,10 +1365,6 @@ he: change_owner: post_revision_text: "בעלות הועברה מהמשתמש %{old_user} אל %{new_user}" deleted_user: "משתמש שנמחק" - emoji: - errors: - name_already_exists: "מצטערים, השם '%{name}' כבר תפוס על ידי emoji אחר." - error_while_storing_emoji: "מצטערים, היתה שגיאה בזמן שמירת ה-emoji." topic_statuses: archived_enabled: "הנושא הזה נכנס לארכיון. הוא קפוא ולא ניתן לשינוי בכל דרך." archived_disabled: "הנושא הזה הוצא מהארכיון. הוא כבר לא קפוא, וניתן לשינוי." @@ -2386,104 +2380,6 @@ he: ערכו את הפוסט הראשון בנושא זה כדי לשנות את התכנים של העמוד %{page_name}. guidelines_topic: title: "שאלות נפוצות / הנחיות" - body: | - - - ## [זהו מקום מתורבת לדיונים פומביים](#civilized) - - אנא התייחסו לפורום זה באותה הצורה כפי שהייתם מתייחסים לפארק ציבורי. גם אנחנו משאב קהילתי משותף — מקום לחלוק בו יכולות, ידע ותחומי עיניין באמצעות שיחה. - - אלו אינם כללים נוקשים, אלא הנחיות לשיקול דעתה של הקהילה שלנו. השתמשו בהנחיות אלו כדי להשאיר את המקום הזה נקי, מואר, ונוח לדיון ציבורי. - - - - ## [שפרו את הדיון](#improve) - - עזרו לנו להפוך את הפורום הזה למקום נהדר לדיונים על ידי כך שתמיד נפעל לשיפור הדיון בצורה זו או אחרת, קטנה ככל שתהיה. אם אינכם בטוחים שהודעה שלכם מוסיפה לדיון, חישבו מה אתם מנסים לומר ונסו שוב מאוחר יותר. - - הנושאים שנידונים כאן חשובים לנו, ואנחנו רוצים שתנהגו בהתאם. כבדו את הנושאים ואת האנשים שדנים בהם, גם אם אינכם מסכימים עם חלק מהדברים שנאמרים. - - דרך אחת לשיפור הדיון היא על-ידי היכרות עם דיונים שכבר מתרחשים. אנא השקיעו קצת זמן בסיור בין הנושאים שכבר קיימים לפני שאתם מתחילים דיון חדש, וכך יגבר הסיכוי שתפגשו אנשים נוספים שחולקים איתכם תחומי עיניין. - - - - ## [אפשרו לאחרים להסכים איתכם, גם כשאינכם מסכימים](#agreeable) - - ייתכן ותרצו להגיב למשהו שאינכם מסכימים איתו. זה אחלה. אך, זיכרו לבקר רעיונות ולא אנשים. אנא המנעו מ: - - * קריאה בשמות. - * התקפות אד-הומינם (לגופו של אדם, ולא לגופו של עיניין). - * להגיב לנימה של הודעה ולא לתוכן שלה. - * Knee-jerk contradiction. - - במקום זאת, אנא ספקו נימוקים מושכלים שמשפרים את הדיון. - - - - ## [השתתפותכם משפיעה](#participate) - - הדיונים שאנחנו מקיימים כאן קובעים את הטון עבור כולם. עיזרו לנו להשפיע על עתיד הקהילה הזו על ידי בחירה להשתתף בדיונים שגורמים לפורום הזה להיות מקום מעניין - ולהמנע מדיונים שמרחיקים את הפורום משם. - - דיסקורס מספקת כלים שמאפשרים לקהילה לזהות ביחד את התרומות הכי טובות (וגרועות): פייבוריטים, סימניות, לייקים, דגלים, תגובות, עריכות, וכהנה וכהנה. השתמשו בכלים אלו כדי לשפר את החוויה שלכם, ושל כולם. - - בואו ננסה להשאיר את השטח נקי יותר מאיך שמצאנו אותו. - - - - ## [אם יש לכם בעיה, דווחו עליה](#flag-problems) - - לעורכים יש סמכות מיוחדת; הם אחראים על פורום זה. אך גם אתם. בעזרתכם, עורכים יכולים לאפשר לקהילה לפרוח, ולא רק להיות מנקים או שוטרים. - - כאשר אתם נתקלים בהתנהגות רעה, אל תגיבו. תגובות מעודדות התנהגויות רעות על-ידי קבלה שלהן, לוקחות לכם אנרגיה, ומבזבזות את הזמן של כולם. _אך ורק דגלו אותה_. אם מצטברים מספיק דגלים, תינקט פעולה אוטומטית או על ידי התערבות עורך. - - כדי לשמר את הקהילה שלנו, עורכים שומרים לעצמם את הזכות להסיר כל תוכן שהוא וכל חשבון משתמש מסיבה כלשהי ובכל זמן שהוא. עורכים לא קוראים מראש פוסטים חדשים בשום צורה; העורכים ומתפעלי האתר לא לוקחים שום אחריות על שום תוכן שפורסם על-ידי הקהילה. - - - - ## [Always Be Civil](#be-civil) - - אין דבר שפוגע יותר בדיון בריא מאשר גסות-רוח: - - * אזרחות טובה. אל תשאירו הודעות שאדם מהרחוב היה מחשיב כתוקפניות, נצלניות, או מסיתות. - * השאירו סביבה נקייה. אל תפרסמו דברים שעלולים להחשב פוגעניים או מטרידים מינית. - * כבדו את חבריכם. אל תטרידו, תתחזו, או תפרסמו מידע פרטי של אנשים אחרים. - * כבדו את הפורום שלנו. בבקשה לא להספים או לחבל בפורום. - - אלו אינם כללים מדוייקים — המנעו גם מ_מראית עין_ של כל אחד מהדברים האלו. אם אינכם בטוחים, שאלו את עצמכם כיצד תרגישו אם דבריכם היו מפורסמים בעמוד הראשון של Ynet. - - זהו פורום פומבי, ומנועי חיפוש מאנדקסים את הדיונים הללו. אנא שימרו על שפה, קישורים ותמונות כשרים למשפחה וחברים. - - - - ## [סדר וניקיון](#keep-tidy) - - עשו מאמץ לשים דברים במקום הנכון, כך שנוכל להשקיע יותר זמן בדיונים ופחות בניקיונות. כך: - - * אל תתחילו נושא בקטגוריה הלא-נכונה. - * אל תפרסמו את אותו התוכן בכמה נושאים. - * אל תפרסמו תגובות ללא תוכן. - * אל תסיטו את הדיון על ידי שינוי נושא באמצע. - * אל תחתמו — כל הודעה שלכם כבר מקושרת לפרופיל האישי שלכם. - - במקום לכתוב ״+1״ או ״מסכים״, אנא השתמשו בכפתור ה״Like״. במקום להסיט את הדיון לכיוון שונה, אנא השתמשו ב״תגובה בנושא קשור״. - - - - ## [פרסמו רק את החומרים של עצמכם](#stealing) - - אינכם רשאים לפרסם שום תוכן ששייך לאף אחד אחר ללא רשות. אינכם רשאים לפרסם תיאור על, קישורים ל, או שיטות לגניבה של קניין רוחני של מישהו אחר (תוכנה, וידאו, אודיאו, או תמונות), או להפרה של כל חוק שהוא. - - - - ## [מופעל על-ידיכם](#power) - - אתר זה מתופעל על ידי [הצוות](/about) ועל-ידיכם, הקהילה. אם יש לכם שאלות נוספות בנוגע לאיך דברים אמורים לעבוד כאן, פיתחו נושא חדש תחת [קטגוריית משוב לאתר](/c/site-feedback) ובואו נדבר! אם יש עיניינים קריטיים או דחופים שלא ניתן לטפל בהם על ידי מטא-נושא או סימון, פנו אלינו דרך [דף הצוות](/about). - - - - ## [תנאי שירות](#tos) - - כן, משפטנות היא משעממת, אך אנחנו מגינים על עצמנו – וכך גם עליכם, והמידע שלכם – מפני חברים לא נחמדים. יש לנו [תנאי שימוש](/tos) שמתארים את התנהגותכם (והתנהגותנו) וזכויות שנוגעות לתוכן, פרטיות, וחוקים. כדי להשתמש בשירות הזה, עליכם להסכים לציית ל[תנאי השירות](/tos). tos_topic: title: "תנאי השימוש" body: | diff --git a/config/locales/server.id.yml b/config/locales/server.id.yml index 99be53b0b6..fe8f48ab51 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -457,7 +457,6 @@ id: previous_discussion: "Balasan Sebelumnya" posted_by: "Dipost oleh %{username} pada %{post_date}" account_created: - subject_template: "[%{site_name}] Akun Baru Anda" text_body_template: |+ Anda mendapatkan akun baru di %{site_name} @@ -467,14 +466,11 @@ id: %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Konfirmasi email baru Anda" text_body_template: | Silahkan mengkonfirmasi email baru Anda di %{site_name} dengan mengunjungi tautan dibawah: %{base_url}/users/authorize-email/%{email_token} - signup: - subject_template: "[%{site_name}] Konfirmasi akun baru Anda" page_not_found: see_more: "Selengkapnya" terms_of_service: diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 9aed538f2e..40cb2dbb47 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -391,7 +391,6 @@ it: pms_per_day: "Hai raggiunto il massimo numero di messaggi per oggi. Per favore attendi %{time_left} prima di riprovare." create_like: "Hai raggiunto il massimo numero di \"Mi piace\" per oggi. Per favore attendi %{time_left} prima di riprovare." create_bookmark: "Hai raggiunto il massimo numero di segnalibri per oggi. Per favore attendi %{time_left} prima di riprovare." - edit_post: "Hai raggiunto il massimo numero di modifiche per oggi. Per favore attendi %{time_left} prima di riprovare." live_post_counts: "Stai richiedendo troppo velocemente il conteggio dei messaggi attivi. Attendi %{time_left} prima di riprovare." unsubscribe_via_email: "Hai raggiunto il massimo numero di cancellazioni via email per oggi. Per favore aspetta %{time_left} prima di riprovare ancora." topic_invitations_per_day: "Hai raggiunto il numero massimo di inviti ad argomenti per oggi. Per favore aspetta %{time_left} prima di riprovare." @@ -801,7 +800,6 @@ it: delete_removed_posts_after: "I messaggi rimossi dall'autore saranno automaticamente cancellati dopo (n) ore. Se impostato a 0, i messaggi saranno cancellati subito." max_image_width: "Larghezza massima delle miniature delle immagini in un messaggio" max_image_height: "Altezza massima delle miniature delle immagini in un messaggio" - category_featured_topics: "Numero di argomenti mostrati per categoria nella pagina /categories. Dopo il cambiamento di questo valore, la pagina delle categorie impiega fino a 14 minuti per aggiornarsi." fixed_category_positions: "Se attivata, potrai ordinare le categorie. Se non attivata, le categorie vengono elencate in ordine di attività." fixed_category_positions_on_create: "Se attivata, verrà mantenuto l'ordinamento delle categorie nella finestra di creazione argomenti (richiede fixed_category_positions)." add_rel_nofollow_to_user_content: "Aggiungi l'attributo rel nofollow a tutti i contenuti degli utenti, tranne per i link interni (compresi i domini di livello superiore). Se modifichi questa opzione devi aggiornare tutti i messaggi con il comando \"rake posts:rebake\"" @@ -855,7 +853,6 @@ it: ga_universal_domain_name: "Nome di dominio Google Universal Analytics (analytics.js), es: miosito.com; vedi http://google.com/analytics" gtm_container_id: "Container id di Google Tag Manager. Es: GTM-ABCDEF" enable_escaped_fragments: "Usa le Ajax-Crawling API di Google se non viene rilevato un webcrawler. Vedi https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Abilita il supporto standard ai webcrawler dei motori di ricerca attraverso il tag noscript" allow_moderators_to_create_categories: "Permetti ai moderatori di creare nuove categorie" cors_origins: "Origini permesse per richieste cross-origin (CORS). Ogni origine deve includere http:// o https://. La variabile d'ambiente DISCOURSE_ENABLE_CORS deve essere impostata come true per abilitare CORS." use_admin_ip_whitelist: "Gli amministratori possono connettersi soltanto se hanno un indirizzo IP definito nell'elenco degli IP scansionati (Amministrazione > Log > IP scansionati). " @@ -892,7 +889,6 @@ it: invite_passthrough_hours: "Per quanto tempo un utente può usare una chiave d'invito per connettersi, espresso in ore" invite_only: "La registrazione pubblica è disabilitata, tutti i nuovi utenti devono essere invitati esplicitamente da altri membri o dallo staff." login_required: "E' richiesta l'autenticazione per leggere contenuti su questo sito, disabilita l'accesso anonimo." - reserved_usernames: "Nomi utente ai quali non è permessa l'iscrizione.." min_password_length: "Minima lunghezza della password." min_admin_password_length: "Lunghezza minima password Amministratore." block_common_passwords: "Non permettere password che sono nelle 10.000 password più comuni." @@ -1211,16 +1207,6 @@ it: subject_template: "%{invitee_name} ti invita a partecipare su %{site_domain_name}" invite_password_instructions: subject_template: "Imposta la password per il tuo account su %{site_name}" - test_mailer: - subject_template: "[%{site_name}] Test Invio Email" - new_version_mailer: - subject_template: "[%{site_name}] Nuova versione di Discourse, aggiornamento disponibile" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] aggiornamento disponibile" - queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 messaggio in attesa di essere revisionato" - other: "[%{site_name}] %{count} messaggi in attesa di essere revisionati" flag_reasons: off_topic: "Il tuo messaggio è stato segnalato come **fuori tema**: la comunità pensa non riguardi l'argomento, come attualmente definito dal titolo e dal contenuto del primo messaggio." inappropriate: "Il tuo messaggio è stato segnalato come **inappropriato**: la comunità lo ritiene offensivo, ingiurioso o una violazione delle [linee guida della comunità](/guidelines)." @@ -1295,45 +1281,22 @@ it: subject_template: "Esportazione dati completa" csv_export_failed: subject_template: "Esportazione dati fallita" - email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problema email -- Livello Esperienza Insufficiente" email_reject_screened_email: - subject_template: "[%{site_name}] Problema email -- Email Bloccata" text_body_template: | Spiacenti, il tuo messaggio email a %{destination} (intitolato %{former_title}) non ha funzionato. La tua risposta è stata inviata da un indirizzo email bloccato. Prova a spedire da un altro indirizzo email, oppure contatta un membro dello staff. - email_reject_inactive_user: - subject_template: "[%{site_name}] Problema email -- Utente Inattivo" - email_reject_blocked_user: - subject_template: "[%{site_name}] Problema email -- Utente Bloccato" email_reject_no_account: - subject_template: "[%{site_name}] Problema relativo all'email -- Account Sconosciuto" text_body_template: | Ci dispiace, ma il tuo messaggio email per %{destination} (intitolato %{former_title}) non ha funzionato. Non esiste un account con quell'indirizzo email. Prova ad inviarla a un altro indirizzo o contatta un membro dello staff. - email_reject_empty: - subject_template: "[%{site_name}] Problema relativo all'email -- Nessun Contenuto" - email_reject_invalid_access: - subject_template: "[%{site_name}] Problema relativo all'email -- Accesso non valido" - email_reject_reply_key: - subject_template: "[%{site_name}] Problema relativo all'email -- Chiave di risposta sconosciuta" email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problema email -- Destinatario sconosciuto" text_body_template: |+ Spiacenti, ma il tuo messaggio email a %{destination} (intitolato %{former_title}) non è stato inviato. Non è stato riconosciuto alcuno degli indirizzi email di destinazione. Assicurati di inviare a indirizzi email validi. - email_reject_topic_not_found: - subject_template: "[%{site_name}] Problema relativo all'email -- Argomento Non Trovato" - email_reject_topic_closed: - subject_template: "[%{site_name}] Problema relativo all'email -- Argomento Chiuso" - email_reject_auto_generated: - subject_template: "[%{site_name}] Problema relativo all'email -- Risposta Autogenerata" - email_error_notification: - subject_template: "[%{site_name}] Problema relativo all'email -- Errore di autenticazione POP" too_many_spam_flags: subject_template: "Nuovo account sospeso" text_body_template: | @@ -1381,12 +1344,7 @@ it: visit_link_to_respond: "[Visita Argomento](%{base_url}%{url}) per replicare." visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per replicare." posted_by: "Pubblicato da %{username} il %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} ti invita al partecipare al messaggio '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1396,7 +1354,6 @@ it: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1406,7 +1363,6 @@ it: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title} " text_body_template: | %{header_instructions} @@ -1416,7 +1372,6 @@ it: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1426,7 +1381,6 @@ it: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1436,7 +1390,6 @@ it: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1446,7 +1399,6 @@ it: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1456,7 +1408,6 @@ it: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1472,7 +1423,6 @@ it: %{message} digest: why: "Un breve sommario di %{site_link} dalla tua ultima visita il %{last_seen_at}" - subject_template: "[%{site_name}] Riepilogo" unsubscribe: "Questo riepilogo viene inviato da %{site_link} se non ti si vede da un po'. Per annullare l'iscrizione %{unsubscribe_link}." click_here: "clicca qui" from: "%{site_name} riepilogo" @@ -1483,7 +1433,6 @@ it: view_this_topic: "Vedi questo argomento" back_to_top: "Torna in cima" forgot_password: - subject_template: "[%{site_name}] Reimposta password" text_body_template: | Qualcuno ha richiesto l'azzeramento della tua password su [%{site_name}](%{base_url}). @@ -1492,7 +1441,6 @@ it: Clicca il seguente collegamento per scegliere una nuova password: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Imposta Password" text_body_template: | Qualcuno ha richiesto di aggiungere una password al tuo account su [%{site_name}](%{base_url}). In alternativa, puoi collegarti usando uno dei servizi online supportati (Google, Facebook ecc.) associato con questo indirizzo email validato. @@ -1501,7 +1449,6 @@ it: Clicca sul seguente collegamento per scegliere una password: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "Connessione [%{site_name}]" text_body_template: | Qualcuno ha richiesto di connettersi al tuo account su [%{site_name}](%{base_url}). @@ -1510,7 +1457,6 @@ it: Altrimenti, clicca sul seguente collegamento per connetterti: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Il Tuo Nuovo Account " text_body_template: | Ti è stato creato un account su %{site_name} @@ -1536,7 +1482,6 @@ it: ps: se vuoi comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio. signup: - subject_template: "[%{site_name}] Conferma il tuo nuovo account" text_body_template: | Benvenuto su %{site_name}! diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index 97d0b9a99b..7c6cb7cd53 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -567,7 +567,6 @@ ja: delete_removed_posts_after: "投稿者は投稿を削除してから(N)時間後に削除されます。0を設定すると、すぐに削除されます" max_image_width: "投稿内での画像サムネイルの最大の幅" max_image_height: "投稿内での画像サムネイルの最大の高さ" - category_featured_topics: "/categories ページに表示されるカテゴリ毎のトピックの数。変更後、カテゴリページの更新におよそ15分程かかります。" fixed_category_positions: "チェックすると、カテゴリの表示順をコントロールできます。チェックしない場合、アクティビティ順に表示されます" fixed_category_positions_on_create: "チェックすると、トピック作成ダイアログ上でカテゴリの順序が維持されます(fixed category positions が必要)。" add_rel_nofollow_to_user_content: " 内部リンク(親ドメインを含む)を除き、投稿されたすべてのユーザコンテンツに rel nofollow を追加する。この設定を反映するには \"rake posts:rebake\" を実行して baked markdown をすべて更新する必要があります" @@ -603,7 +602,6 @@ ja: must_approve_users: "スタッフはサイトへのアクセスが許可される前のすべての新規ユーザを承認する必要があります。警告：公開中のサイトでこれを有効にすると、既存の非スタッフユーザのアクセスを取り消すことになります！" ga_universal_tracking_code: "Google Universal Analytics(analytics.js) のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) のドメイン名。例: mysite.com; 参考 http://google.com/analytics" - enable_noscript_support: "noscript タグ経由でアクセスしてきた標準サーチエンジンクローラのサポートを有効にする" allow_moderators_to_create_categories: "モデレータのカテゴリ作成を許可" cors_origins: "CORSを許可。オリジンはhttp://かhttps://を含む必要があります。CORSを有効にするには、環境変数　DISCOURSE_ENABLE_CORSにtrueをセットする必要があります" top_menu: "ホームナビゲーションに表示する項目・表示順を指定。例: latest|new|unread|categories|top|read|posted|bookmarks" @@ -635,7 +633,6 @@ ja: invite_passthrough_hours: "ユーザーが、以前の招待キーを使う事ができる時間" invite_only: "パブリックなユーザー登録を無効化し、全てのユーザは他のメンバーかスタッフの招待を必要とする" login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する" - reserved_usernames: "サインアップが許可されていないユーザ名。" min_password_length: "パスワードの最小の長さ" block_common_passwords: "最もよく使われている10,000個のパスワードを許可しない" enable_sso: "外部サイトを経由したシングルサインオンを有効にします(警告：ユーザーのメールアドレスは必ず外部サイトで認証されなければなりません)" @@ -874,10 +871,6 @@ ja: change_owner: post_revision_text: "%{old_user} から %{new_user}にownershipを移動させました" deleted_user: "削除されたユーザ" - emoji: - errors: - name_already_exists: "申し訳ありません。'%{name}'は既に別の絵文字で使われています" - error_while_storing_emoji: "申し訳ありません、絵文字の保存中にエラーが発生しました" topic_statuses: archived_enabled: "このトピックはアーカイブされました。すべての内容は凍結されており、一切の変更ができません。" archived_disabled: "このトピックはアーカイブ解除されました。凍結解除され、変更可能になりました。" @@ -955,15 +948,6 @@ ja: %{base_url}/users/password-reset/%{email_token} (リンクの有効期限が切れていた場合は、"パスワードを忘れたました"を選択しメールアドレスを入力してください) - test_mailer: - subject_template: "[%{site_name}] メール送信テスト" - new_version_mailer: - subject_template: "[%{site_name}] Discourseの新しいバージョンがあります。" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] アップデートがあります" - queued_posts_reminder: - subject_template: - other: "[%{site_name}] %{count} 件の投稿がレビュー待ちです" flag_reasons: off_topic: "あなたの投稿/トピックは「話題に関係ない」として通報されました" inappropriate: "あなたの投稿は「不適切」として通報されました。攻撃的、 [コミュニティガイドライン](/guidelines)に違反している可能性があります。" @@ -1018,30 +1002,10 @@ ja: csv_export_failed: subject_template: "データのエクスポートに失敗しました" text_body_template: "申し訳ありません。データのエクスポートに失敗しました。ログを確認するかスタッフメンバーにお問い合わせください。" - email_reject_no_account: - subject_template: "[%{site_name}] Email issue -- 不明なアカウント" - email_reject_empty: - subject_template: "[%{site_name}] Email issue -- 本文なし" email_reject_parsing: text_body_template: | 申し訳ありません,あなたの %{destination} へのメール(titled %{former_title}) は動きませんでした メールから回答を見つける事ができませんでした。返信はメールのトップにあることを確認してください。インライン回答を見つける事はできません。 - email_reject_invalid_access: - subject_template: "[%{site_name}] Email issue -- 不正なアクセス" - email_reject_invalid_post: - subject_template: "[%{site_name}] Email issue -- 投稿エラー" - email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Email issue -- 投稿エラー" - email_reject_reply_key: - subject_template: "[%{site_name}] Email issue -- 不明なReply Key" - email_reject_topic_not_found: - subject_template: "[%{site_name}] Email issue -- 存在しないトピック" - email_reject_topic_closed: - subject_template: "[%{site_name}] Email issue -- クローズ済みトピック" - email_reject_auto_generated: - subject_template: "[%{site_name}] Email issue -- 自動生成された返信" - email_error_notification: - subject_template: "[%{site_name}] Email issue -- POP認証エラー" spam_post_blocked: subject_template: "同一リンクの連続投稿による新規ユーザ %{username} のブロック" pending_users_reminder: @@ -1062,18 +1026,6 @@ ja: title: "解除" description: "メールに興味がありませんか? 下のリンクをクリックすると、即座にメール解除ができます:" posted_by: "%{post_date} に %{username} が投稿" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} がメッセージにあなたを招待しました '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] '%{topic_title}' 内のあなたのポストに新たな回答が投稿されました" - user_quoted: - subject_template: "[%{site_name}] '%{topic_title}' で %{username} があなたを引用しました" - user_mentioned: - subject_template: "[%{site_name}] '%{topic_title}' で %{username} があなたをタグ付けしました" - user_posted: - subject_template: "[%{site_name}] '%{topic_title}' に %{subject_prefix}個の新しいポストが投稿されました" - user_posted_pm: - subject_template: "[%{site_name}] [プライベートメッセージ] %{topic_title}" digest: why: "あなたが最後にアクセスした %{last_seen_at} 以降の %{site_link} のまとめです" unsubscribe: "このお知らせは%{site_link}から送信されました。購読を解除したい場合は%{unsubscribe_link}してください。" @@ -1081,7 +1033,6 @@ ja: mailing_list: new_topics: "新着トピック" forgot_password: - subject_template: "[%{site_name}] パスワードのリセット" text_body_template: | [%{site_name}](%{base_url}) にて、パスワードのリセットリクエストが行われました。 @@ -1089,7 +1040,6 @@ ja: 新たなパスワードを設定する場合は次のリンクをクリックしてください: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] パスワード設定" text_body_template: | [%{site_name}](%{base_url}) のあなたのアカウントに対してパスワード追加のリクエストがありました。 あるいは、この検証済みメールアドレスに関連付けられている任意のサポートされているオンラインサービス（グーグル、フェイスブックなど）を使用してログインすることができます。 @@ -1098,17 +1048,13 @@ ja: パスワードを選択する場合は次のリンクをクリックしてください: %{base_url}/users/password-reset/%{email_token} - admin_login: - subject_template: "[%{site_name}] ログイン" account_created: - subject_template: "[%{site_name}] あなたの新しいアカウント" text_body_template: | %{site_name}のあなたの新しいアカウントが作成されました。 以下のリンクをクリックしてパスワードを設定してください: %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] 新しいメールアドレスを確認してください" text_body_template: | 以下のリンクをクリックして、%{site_name}で利用するメールアドレスを有効化してください: @@ -1133,7 +1079,6 @@ ja: (もし[スタッフメンバー](%{base_url}/about) に新規ユーザーとして連絡する必要がある場合、このメッセージに返信してください) signup: - subject_template: "[%{site_name}] アカウントの確認" text_body_template: | Welcome to %{site_name}! diff --git a/config/locales/server.ko.yml b/config/locales/server.ko.yml index e8d17f6d90..0b6c769147 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -566,7 +566,6 @@ ko: delete_removed_posts_after: "작성자에 의해 삭제된 글은 (n) 시간 뒤 자동으로 삭제됩니다. 0으로 설정 시, 즉시 삭제됩니다." max_image_width: "글에서 사용할 수 있는 썸네일 이미지의 최대 너비" max_image_height: "글에서 사용할 수 있는 썸네일 이미지의 최대 높이" - category_featured_topics: "카테고리 페이지에서 한 카테고리당 보여질 글타래의 수" fixed_category_positions: "활성화하면 고정된 순서의 카테고리들을 바꿀 수 있다. 활성화 하지 않으면 카테고리는 활동적인 순서에 따라 정렬된다." fixed_category_positions_on_create: "선택 시, 카테고리 정렬이 유지됩니다. (fixed_category_positions가 체크돼 있어야 합니다.)" add_rel_nofollow_to_user_content: "사용자 생성 컨텐츠에 대해서 rel nofollow 를 설정함. parent domain을 포함한 internal link는 예외임. 이 설정을 바꾸려면 모든 baked markdown을 \"rake posts:rebake\" 명령으로 변경해주서야 함" @@ -602,7 +601,6 @@ ko: pending_users_reminder_delay: "새로운 사용자가 승인을 기다리는 시간이 여기에 지정된 시간횟수보다 더 길어길경우 운영자에게 알려줍니다. 알림을 해제하려면 -1로 설정하세요." ga_universal_tracking_code: "Google Universal Analytics (analytics.js)의 트래킹 코드, 예: UA-12345678-9; 참고 http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js)의 도메인 이름, 예: mysite.com; 참고 http://google.com/analytics" - enable_noscript_support: "당신의 사이트를 검색하기 위한 noscript 태그를 이용한 일반적인 웹 크롤러를 활성화" allow_moderators_to_create_categories: "운영자가 새로운 카테고리를 만드는 것을 허용" cors_origins: "Allowed origins cross-origin requests (CORS). 각 origin은 반드시 http:// 나 https:// 를 포함해야합니다. DISCOURSE_ENABLE_CORS 환경 변수를 true로 지정해줘야 CORS를 활성화할 수 있습니다." top_menu: "첫페이지 메뉴에 어떤 아이템이 뜨고 어떤 순서로 뜰지 정합니다 예 최근|새로씀|안읽음|카테고리|위로|읽음|쓴글|북마크" @@ -634,7 +632,6 @@ ko: invite_passthrough_hours: "사용되어진 방문키를 로그인하는데 재사용할 수 있는 기간, 시간" invite_only: "공개 가입은 불가하도록 설정됨. 초대를 받아야만 신규 가입 가능함." login_required: "글을 읽으려면 인증(로그인)이 필요함" - reserved_usernames: "회원가입 금지된 아이디 목록" min_password_length: "비밀번호 최소 글자수." block_common_passwords: "가장 흔히 사용되는 10,000개 비밀번호 목록에 있는 비밀번호를 사용하는 것을 허용하지 않음." enable_sso: "외부사이트 Single Sign On, SSO를 통해 로그인 활성화(경고: 유저의 이메일 주소는 반드시 외부에서 확인해야합니다!)" @@ -854,10 +851,6 @@ ko: not_seen_in_a_month: "잘 돌아오셨습니다. 다음은 당신이 오지 않은 동안 가장 인기있던 글타래들입니다." change_owner: post_revision_text: "소유권이 %{old_user}에서 %{new_user}으로 이전되었습니다." - emoji: - errors: - name_already_exists: "죄송합니다. '%{name}'은/는 이미 다른 이모티콘이 사용하고 있습니다." - error_while_storing_emoji: "죄송합니다, emoji를 저장하는 도중 오류가 발생했습니다." topic_statuses: archived_enabled: "이 글타래는 보관되었고 더이상 변경하실 수 없습니다." archived_disabled: "이 글타래의 보관이 풀렸고 이제 변경하실 수 있습니다." @@ -926,15 +919,6 @@ ko: subject_template: "%{site_domain_name}의 %{invitee_name}님께서 당신을 초대하였습니다." invite_password_instructions: subject_template: "%{site_name} 계정을 위해 비밀번호 설정" - test_mailer: - subject_template: "[%{site_name}] 이메일 발송 테스트" - new_version_mailer: - subject_template: "[%{site_name}] 새 Discourse 버전으로 업데이트 가능." - new_version_mailer_with_notes: - subject_template: "[%{site_name}] 업데이트 가능." - queued_posts_reminder: - subject_template: - other: "[%{site_name}]의 %{count}개의 글이 검토를 기다리고 있습니다." flag_reasons: off_topic: "내가 올린 글타래가 **주제 벗어난 이야기**으로 신고 되었습니다. 사람들이 이 글타래의 제목이랑 글 내용이 안 맞는다고 느끼나 봅니다. " inappropriate: "내가 올린 글타래가 **부적절**로 신고 되었습니다. 사람들이 이 글타래가 [가이드라인](/guidelines)에서 벗어나 공격적, 모욕적, 폭력적이라고 느낍니다." @@ -988,27 +972,11 @@ ko: csv_export_failed: subject_template: "데이터 추출 실패" text_body_template: "죄송합니다. 데이터 추출에 실패하였습니다. 로그를 확인하시거나 관리자에게 문의해주세요." - email_reject_no_account: - subject_template: "[%{site_name}] 이메일 문제 -- 모르는 계정" - email_reject_empty: - subject_template: "[%{site_name}] 이메일 문제 -- 내용 없음" email_reject_parsing: text_body_template: | 죄송합니다, 이메일 메세지 %{destination} (titled %{former_title})가 안 됐습니다. 이메일에 내용이 안 보입니다. 답글이 이메일 상단에 있는지 확인 해주세요 -- 한줄 답변은 처리 못합니다. - email_reject_invalid_access: - subject_template: "[%{site_name}] 이메일 문제 -- 잘못된 접근" - email_reject_reply_key: - subject_template: "[%{site_name}] 이메일 문제 -- 잘못된 답글 Key" - email_reject_topic_not_found: - subject_template: "[%{site_name}] 이메일 문제 -- 글타래 못 찾음" - email_reject_topic_closed: - subject_template: "[%{site_name}] 이메일 문제 -- 글타래 닫힘" - email_reject_auto_generated: - subject_template: "[%{site_name}] 이메일 문제 -- 자동 생성된 답글" - email_error_notification: - subject_template: "[%{site_name}] 이메일 문제 -- POP 인증 오류" spam_post_blocked: subject_template: "%{username} 신규가입자가 연속 링크로 블락됨" pending_users_reminder: @@ -1029,30 +997,16 @@ ko: title: "구독해지" description: "이메일들에 관심이 없나요? 아래 구독해지를 눌러서 바로 구독을 해지할 수 있습니다:" posted_by: "%{username} 사용자가 %{post_date}에 게시하였습니다." - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} 회원님이 '%{topic_title}' 글타래에 초대했습니다" - user_replied: - subject_template: "[%{site_name}] '%{topic_title}'에 답글이 달렸습니다" - user_quoted: - subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}' 글타래에 당신을 인용하였습니다" - user_mentioned: - subject_template: "[%{site_name}] %{username}님께서 '%{topic_title}'에서 당신을 언급하였습니다" - user_posted: - subject_template: "[%{site_name}] %{subject_prefix} '%{topic_title}'에 새로운 글이 등록되었습니다" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: why: "%{last_seen_at}부터 지금까지 %{site_link} 사이트 근황" click_here: "클릭" forgot_password: - subject_template: "[%{site_name}] 패스워드 재설정" text_body_template: | [%{site_name}](%{base_url}) 사이트에서 누군가 당신의 패스워드를 재설정 요청하였습니다. 아래 링크를 클릭하여 패스워드를 재설정하세요: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] 패스워드 재설정" text_body_template: | [%{site_name}](%{base_url})의 회원님 계정에 비밀번호를 추가 요청을 받았습니다. 이 이메일이 사용된 다른 온라인 서비스 (Google, Facebook, etc)를 이용해 로그인할 수 있습니다. @@ -1061,7 +1015,6 @@ ko: 비밀번호 선택 페이지: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] 로그인" text_body_template: | [%{site_name}](%{base_url})의 회원님 계정에 로그인 요청을 받았습니다. @@ -1070,7 +1023,6 @@ ko: 로그인 페이지: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] 당신의 새 계정" text_body_template: | %{site_name}에 새 계정이 만들어 졌습니다. @@ -1096,7 +1048,6 @@ ko: (새 사용자로서 할말이 있으시면 이글에 답변함으로써 [스태프](%{base_url}/about)들에게 이야기해주세요.) signup: - subject_template: "[%{site_name}] 새 계정 확인" text_body_template: | %{site_name}에 오신것을 환영합니다! diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index 6e75a20785..65ab31799a 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -808,8 +808,6 @@ nb_NO: ip_address: blocked: "Nye registreringer er ikke tillatt fra IP-adressen din." max_new_accounts_per_registration_ip: "Nye registreringer er ikke tillatt fra IP-adressen din (maksimalt antall nådd). Ta kontakt med et medlem av staben." - new_version_mailer_with_notes: - subject_template: "[%{site_name}]-oppdatering tilgjengelig" flags_dispositions: agreed: "Takk for at du sier ifra. Vi er enig at det er et problem her og vi ser på saken." disagreed: "Takk for at du sier ifra. Vi skal se på det. " @@ -849,33 +847,23 @@ nb_NO: join_the_discussion: "Les mer" popular_posts: "Populære innlegg" more_new: "Nytt for deg" - subject_template: "[%{site_name}] Oppsummering" unsubscribe: "Denne oppsummeringen blir sendt fra %{site_link} når vi ikke har sett deg på en stund. For å melde deg av %{unsubscribe_link}." click_here: "trykk her" from: "%{site_name} oppsummering" preheader: "En kort oppsummering siden ditt siste besøk på %{last_seen_at}" mailing_list: - subject_template: "[%{site_name}] Oppsummering for %{date}" unsubscribe: "Denne oppsummeringen sendes daglig fordi e-postlistemodus er aktivert. For å melde deg deg av %{unsubscribe_link}." from: "%{site_name}-oppsummering" new_topics: "Nye emner" view_this_topic: "Vis dette emnet" back_to_top: "Tilbake til toppen" account_created: - subject_template: "[%{site_name}] Din Nye Konto" text_body_template: | En ny konto ble registrert for deg på %{site_name} Trykk på følgende link for å velge et passord for kontoen din: %{base_url}/users/password-reset/%{email_token} - confirm_new_email: - subject_template: "[%{site_name}] Bekreft e-postadressen din" - confirm_old_email: - subject_template: "[%{site_name}] Bekreft nåværende e-postadresse" - notify_old_email: - subject_template: "[%{site_name}] Din e-postadresse har blitt endret" signup: - subject_template: "[%{site_name}] Bekreft din nye konto" text_body_template: | Velkommen til %{site_name}! @@ -917,105 +905,6 @@ nb_NO: csv_export: boolean_yes: "Ja" boolean_no: "Nei" - guidelines_topic: - body: | - - - ## [Dette er et sivilisert sted for offentlig diskusjon](#sivilisert) - - Vær så snill og behandle denne diskusjonen med samme respekt du ville behandlet en offentlig park med. Også vi er en ressurs delt med fellesskapet – et sted hvor en kan dele ferdigheter, kunnskap og interesse gjennom en samtale som går sin gang. - - Dette er ikke definitive regler, bare hjelpemidler for fellesskapets menneskelige vurderingsevne. Bruk disse retningslinjene til å holde dette stedet rent og godt belyst for sivilisert offentlig samtale. - - - - ## [Forbedre diskusjonen](#forbedre) - - Hjelp oss å gjøre dette til et godt sted for diskusjon ved å alltid jobbe mot å gjøre diskusjonen bedre på en eller annen måte. Hvis du ikke er sikker på at innlegget ditt tilfører noe til diskusjonen, så tenk over hva det er du vil si og prøv igjen senere. - - Emnene som diskuteres her, betyr noe for oss, og vi vil at du skal oppføre deg som om de betyr noe for deg også. Vis respekt for dem og menneskene som diskuterer dem, selv om du er uenig med noe av det som blir sagt. - - En måte å forbedre diskusjonen på er å utforske dem som allerede foregår. Vær så snill og bruk litt tid til å streife gjennom emnene her før du svarer eller startet ditt eget, og du vil ha større sjanse for å møte noen som deler dine interesser. - - - - ## [Vær grei, også dersom du er uenig](#grei) - - Du ønsker kanskje å svare på noe du er uenig med. Det er greit. Men husk å _krisere idéer, ikke mennesker_. Vær så snill å unngå: - - * Utskjelling. - * Personangrep. - * Å svare på et innleggs tone i stedet for dets faktiske innhold - * Refleksartig motsigelse. - - Kom med begrunnede motargumenter i stedet som forbedrer samtalen. - - - - ## [Din deltakelse teller](#delta) - - Samtalene vi fører her, setter tonen for alle. Hjelp oss å påvirke fremtiden til dette fellesskapet ved å velge å ta del i diskusjoner som gjør dette forumet til et interessant sted å være – og ved å unngå dem som ikke gjør det. - - Discourse kommer med verktøy som gjør fellesskapeti stand til å sammen identifisere de beste (og dårligste) bidragene: favoritter, bokmerker, liker, rapportering, svar, redigering, osv. Bruk disse verktøyene til å forbedre din egen opplevelse, og alle andres. - - La oss prøve å forlate parken i bedre stand enn da vi kom. - - - - ## [Dersom du ser et problem, rapportér det](#rapporter-problemer) - - Moderatorer har en særmakt; de er ansvarlige for dette forumet. Men det er du også. Med din hjelp kan moderatorene være meglere, ikke bare vaktmestre eller politi. - - Når du ser dårlig oppførsel, ikke var. Det oppmuntrer den dårlige oppførselen ved å gi den oppmerksomhet, tærer på kreftene dine og kaster bort alles tid. _Bare rapportér den_. Dersom nok rapporteringer blir registrert, vil det bli handlet, enten automatisk eller ved at en moderator griper inn. - - For å opprettholde fellesskapet forbeholder moderatorene seg retten til å fjerne hvilket som helst innhold fra hvilken som helst bruker av hvilken som helst grunn når som helst. Moderatorer godkjenner ikke nye innlegg på noen som helst måte; moderatorene og sideoperatøren påtar seg intet ansvar for innhold publisert av fellesskapet. - - - - ## [Vær alltid sivilisert](#vaer-sivilisert) - - Ingenting saboterer en sunn samtale som frekkhet: - - * Vær sivilisert. Ikke publiser noe som et fornuftig menneske ville ansett som fornærmende, sårende eller hatefult. - * Hold det rent. Ikke publiser noe usømmelig eller pornografisk. - * Respektér hverandre. Ikke trakassér eller plag noen, utgi deg for å være for å være en annen eller prisgi andres fortrolighet. - * Respekt forumet vårt. Ikke publiser spam eller vandalisér forumet på annet vis. - - Dette er ikke håndfaste begrep med nøyaktige definisjoner – unngå til og med det som _ser ut_ til å være noe av disse tingene. Hvis du er usikker, spør deg selv hvordan det ville føles om innlegget ditt sto på forsiden av New York Times. - - Dette er et offentlig forum, og søkemotorer indekserer disse diskusjonene. Sørg for at språket, lenkene og bildene er trygt for familie og venner. - - - - ## [Hold det ryddig](#hold-det-ryddig) - - Anstreng deg for å sette ting på riktig plass slik at vi bruke mer tid på å diskutere og mindre på å rydde opp. Derfor: - - * Ikke start et emne i gal kategori. - * Ikke publiser samme ting i flere kategorier. - * Ikke publiser svar uten innhold. - * Ikke avled et emne ved å endre det midt i diskusjonen. - * Ikke signér innleggene dine – hvert innlegg har profilinformasjonen din tilknyttet. - - I stedet for å publisere «+1» eller «Enig» bruk liker-knappen. I stedet for å ta et eksisterende emne i en radikalt annerledes retning, bruk Svar med lenket emne. - - - - ## [Publisér dine egne ting](#tyveri) - - Du har ikke lov publisere noe digitalt som tilhører en annen, uten tillatelse. Du har ikke lov til å publisere beskrivelser av, lenker til eller metoder for å stjele andres åndsverk (programvare, film, lyd, bilde), eller for å bryte andre lover. - - - - ## [Drevet av deg](#drevet-av) - - Denne siden drives av ditt [vennlige personell](/about) og *deg*, en del av felleskapet. Dersom du har noen flere spørsmål om hvordan ting skal fungere her, opprett et nytt emne i [kategorien for tilbakemeldinger](/c/site-feedback) og la oss diskutere! Hvis det er et kritisk eller akutt problem som ikke kan bli håndtert med et meta-emne eller en rapportering, ta kontakt med oss via [personell-siden](/about). - - - - ## [Vilkår](#vilkaar) - - Ja, juridisk fagspråk er kjedelig, men vi må beskytte oss selv – og i utvidet betydning deg og dine data – mot uvennlige mennesker. Vi har [Vilkår](/tos) som beskriver din (og vår) oppførsel og rettigheter med tanke på innhold, personvern og lover. For å bruke denne tjenesten må du samtykke å overholde våre [Vilkår](/tos). tos_topic: title: "Bruksvilkår" privacy_topic: diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index 419ce90b13..cca826b804 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -832,7 +832,6 @@ nl: delete_removed_posts_after: "Berichten verwijderd door de auteur zullen automatisch verwijderd worden na (n) uur. Als dit ingesteld is op 0 zullen berichten direct verwijderd worden." max_image_width: "Maximale breedte van een thumbnail van afbeeldingen in een bericht" max_image_height: "Maximale hoogte van een thumbnail van afbeeldingen in een bericht" - category_featured_topics: "Aantal topics dat wordt weergegeven in de categorielijst. An het wijzigen van dit getal kan het tot 15 minuten duren voordat de lijst is bijgewerkt." fixed_category_positions: "Indien aangevinkt kun je categorieën in een vaste volgorde arrangeren. Indien uitgevinkt zullen de categorieeen gesorteerd worden op activiteit." fixed_category_positions_on_create: "Indien aangevinkt wordt de categorie volgorde aangehouden in het menu voor nieuwe topics (vaste-categorie-posities vereist)." add_rel_nofollow_to_user_content: "Voeg 'rel nofollow' toe aan alle ingediende gebruikerscontent, behalve voor interne links (inclusief bovenliggende domeinen). Als je dit verandert, moet je ook alle berichten opnieuw renderen met: \"rake posts:rebake\"" @@ -871,7 +870,6 @@ nl: pending_users_reminder_delay: "Stuur moderators een bericht als nieuwe gebruikers al langer dan dit aantal uren op goedkeuring wacht. Stel in op -1 om notificaties uit te schakelen." ga_universal_tracking_code: "Google Universal Analytics (analytics.js) trackingcode, bijv. UA-12345678-9; zie http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domeinnaam, bijv. mijnsite.nl; zie http://google.com/analytics" - enable_noscript_support: "Ondersteun <noscript> tag" allow_moderators_to_create_categories: "Moderators mogen nieuwe categorieën maken" cors_origins: "Toegestane domeinen voor ´cross-origin requests´ (CORS). Elk domein moet http:// of https:// bevatten. De DISCOURSE_ENABLE_CORS omgevingsvariabele moet staan ingesteld op ´WAAR´ om CORS te kunnen gebruiken." use_admin_ip_whitelist: "Beheerders kunnen zich alleen aanmelden vanaf een IP-adres dat in de lijst Gecontroleerde IP-nummers is gedefinieerd (Beheer > Logboeken > Gecontroleerde IP-adressen)." @@ -905,7 +903,6 @@ nl: invite_passthrough_hours: "Hoe lang een gebruiker een eerder verkregen uitnodigingssleutel kan gebruiken om in te loggen, in uren gespecificeerd" invite_only: "Openbare registratie is uitgeschakeld, alle nieuwe gebruikers moeten expliciet worden uitgenodigd door andere leden of personeel." login_required: "Authenticatie vereist om inhoud te lezen op deze site, verbied anonieme toegang." - reserved_usernames: "Gebruikersnamen waarvoor registratie niet is toegestaan." min_password_length: "Minimum lengte wachtwoord." min_admin_password_length: "Minimale wachtwoordlengte voor de beheerder." block_common_passwords: "Accepteer geen wachtwoorden die voorkomen in de 10.000 meest voorkomende wachtwoorden." @@ -1182,10 +1179,6 @@ nl: change_owner: post_revision_text: "Eigendom overgezet van %{old_user} naar %{new_user}" deleted_user: "een verwijderde gebruiker" - emoji: - errors: - name_already_exists: "Sorry, de naam '%{name}' is al in gebruik voor een andere emoji." - error_while_storing_emoji: "Sorry, fout opgetreden tijdens het opslaan van de emoji." topic_statuses: archived_enabled: "Deze topic is nu gearchiveerd en kan niet meer veranderd worden." archived_disabled: "Deze topic is niet langer gearchiveerd en kan weer veranderd worden." @@ -1274,16 +1267,6 @@ nl: %{base_url}/users/password-reset/%{email_token} (Als bovenstaande link is verlopen, kies dan "Ik ben mijn wachtwoord vergeten" tijdens het inloggen met je e-mail adres.) - test_mailer: - subject_template: "[%{site_name}] E-mail Bezorgtest" - new_version_mailer: - subject_template: "[%{site_name}] Nieuwe Discourse-versie, update beschikbaar" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] Update beschikbaar" - queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 bericht wacht op beoordeling" - other: "[%{site_name}] %{count} berichten wachten op beoordeling" flag_reasons: off_topic: "Je bericht is gemarkeerd als **off-topic**: de gemeenschap meent het niet goed past bij het onderwerp, zoals momenteel bepaald door de titel en de eerste post." inappropriate: "Je bericht is gemarkeerd als **ongepast**: de gemeenschap vindt het bericht beledigend, grof, of een schending van [onze gemeenschapsrichtlijnen](/guidelines)." @@ -1335,16 +1318,12 @@ nl: title: "CSV Export Mislukt" subject_template: "Export mislukt" text_body_template: "Het spijt ons, maar de export is mislukt. Bekijk de logbestanden of neem contact op met de staf." - email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] E-mailprobleem -- Vertrouwensniveau te laag" email_reject_inactive_user: - subject_template: "[%{site_name}] E-mailprobleem -- Gebruiker inactief" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. Het account dat bij dit e-mailadres hoort, is niet geactiveerd. Je moet je account activeren voordat je e-mails instuurt. email_reject_blocked_user: - subject_template: "[%{site_name}] E-mailprobleem -- Geblokkeerde gebruiker" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. @@ -1355,13 +1334,11 @@ nl: Je reactie werd verstuurd van een ander e-mailadres dan we verwacht hadden, dus we weten niet zeker of dit dezelfde persoon is. Probeer de e-mail vanaf een ander adres te sturen, of neem contact op met de staf. email_reject_no_account: - subject_template: "[%{site_name}] E-mailprobleem -- Onbekende account" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. We konden geen accounts vinden die overeenkomen met je e-mailadres. Probeer de e-mail van een ander adres te sturen, of neem contact op met de staf. email_reject_empty: - subject_template: "[%{site_name}] E-mailprobleem -- Geen inhoud" text_body_template: |+ Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. @@ -1375,18 +1352,12 @@ nl: Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. We konden je reactie niet in je e-mail vinden. **Zorg ervoor dat je reactie bovenaan de e-mail staat**, we kunnen ingebedde reacties niet verwerken. - email_reject_invalid_access: - subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige toegang" - email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige toegang" email_reject_invalid_post: - subject_template: "[%{site_name}] E-mailprobleem -- Foutmelding bij het plaatsen" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. Dit kan bijvoorbeeld komen door complexe opmaak of door een te groot of te klein bericht. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] E-mailprobleem -- Foutmelding bij het plaatsen" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. @@ -1396,31 +1367,20 @@ nl: Probeer het opnieuw als je het probleem kan oplossen. email_reject_invalid_post_action: - subject_template: "[%{site_name}] E-mailprobleem -- Ongeldige plaatsingsactie" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. De plaatsingsactie werd niet herkend. Probeer het opnieuw of plaats je bericht via de website als het nog steeds niet lukt. email_reject_reply_key: - subject_template: "[%{site_name}] E-mailprobleem -- Onbekende antwoordsleutel" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. De antwoordsleutel in de e-mail is ongeldig of onbekend, dus we weten niet waar deze e-mail een reactie op is. Neem contact op met de staf. email_reject_bad_destination_address: - subject_template: "[%{site_name}] E-mailprobleem -- Onbekend bestemmingsadres" text_body_template: | Het spijt ons, maar het plaatsen van je e-mail op %{destination} (met onderwerp %{former_title}) is niet gelukt. Geen van de bestemmingsadressen werd herkend. Zorg ervoor dat je je e-mail naar het juiste door de staf verstrekte e-mailadres stuurt. - email_reject_topic_not_found: - subject_template: "[%{site_name}] E-mailprobleem -- Topic niet gevonden" - email_reject_topic_closed: - subject_template: "[%{site_name}] E-mailprobleem -- Topic gesloten" - email_reject_auto_generated: - subject_template: "[%{site_name}] E-mailprobleem -- Automatisch gegenereerde reactie" - email_error_notification: - subject_template: "[%{site_name}] Email probleem -- POP authenticatie fout" blocked_by_staff: subject_template: "Account tijdelijk geblokkeerd" user_automatically_blocked: @@ -1459,18 +1419,6 @@ nl: title: "Uitschrijven" description: "Niet geïnteresseerd in deze e-mails? Geen probleem! Klik hieronder om direct uitgeschreven te worden:" posted_by: "Geplaatst door %{username} op %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} nodigt je uit voor een bericht '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" digest: why: "Een korte samenvatting van %{site_link} sinds we je voor het laatst zagen op %{last_seen_at}." liked_received: "Ontvangen likes" @@ -1481,7 +1429,6 @@ nl: popular_posts: "Populaire berichten" click_here: "klik hier" forgot_password: - subject_template: "[%{site_name}] Wachtwoord herstellen" text_body_template: | Iemand heeft aangegeven je wachtwoord te willen herstellen op [%{site_name}](%{base_url}). @@ -1490,7 +1437,6 @@ nl: Klik op de volgende link om een nieuw wachtwoord te kiezen: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Stel wachtwoord in" text_body_template: | Iemand heeft verzocht een wachtwoord aan je account toe te voegen op [%{site_name}](%{base_url}). Je kan ook nog - indien geactiveerd - inloggen met een online service (Google, Facebook, etc) waar je met hetzelfde mailadres geregistreerd staat. @@ -1499,7 +1445,6 @@ nl: Klik op de volgende link om een wachtwoord in te stellen: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Login" text_body_template: | Iemand heeft geprobeerd om met je account op [%{site_name}](%{base_url}) in te loggen. @@ -1508,7 +1453,6 @@ nl: Klik op de volgende link om in te loggen: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Uw Nieuwe Account" text_body_template: | Er is een nieuw account voor je aangemaakt op %{site_name} @@ -1534,7 +1478,6 @@ nl: (Als je contact wilt opnemen met [staff members](%{base_url}/about) als nieuwe gebruiker, stuur dan een reply op dit bericht.) signup: - subject_template: "[%{site_name}] Bevestig je nieuwe account" text_body_template: | Welkom op %{site_name}! diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index ca1a0125d5..35604e3e82 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -451,7 +451,6 @@ pl_PL: pms_per_day: "Osiągnąłeś maksymalną liczbę wiadomości na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz." create_like: "Osiągnąłeś maksymalną liczbę lajków na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz." create_bookmark: "Wyczerpałeś na dziś możliwość dodawania zakładek. Musisz poczekać %{time_left}, zanim znów spróbujesz." - edit_post: "Wyczerpałeś na dziś możliwość edytowania. Musisz poczekać %{time_left}, zanim znów spróbujesz." live_post_counts: "Zbyt szybko prosisz o bieżące zliczanie postów . Musisz poczekać %{time_left}, zanim znów spróbujesz." unsubscribe_via_email: "Osiągnąłeś maksymalną liczbę wypisań przez maila na dziś. Musisz poczekać %{time_left}, zanim znów spróbujesz." topic_invitations_per_day: "Osiągnąłeś maksymalną liczbę zaproszeń do tematów na dziś. Odczekaj %{time_left} przed kolejną próbą." @@ -916,7 +915,6 @@ pl_PL: delete_removed_posts_after: "Wpisy usunięte przez autora będą automatycznie zlikwidowane po (n) godzinach. Jeżeli liczba godzin będzie wynosić 0, to zostaną usunięte natychmiast. " max_image_width: "Maksymalna szerokość miniaturki grafiki we wpisie. " max_image_height: "Maksymalna wysokość miniaturki grafiki we wpisie. " - category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." fixed_category_positions: "Zaznacz, aby ręcznie ustawiać kolejność kategorii. Odznacz, aby kategorie były sortowane na podstawie aktywności. " fixed_category_positions_on_create: "Jeżeli jest sprawdzone to porządkowanie kategorii będzie zależało od stworzonego tematu (requires fixed_category_positions). " add_rel_nofollow_to_user_content: "Dodaj rel nofollow do wszystkich treści użytkownika, poza wewnętrznymi linkami (wliczając domeny nadrzędne). Jeśli to zmienisz, musisz rebake wszystkie posty poprzez: \"rake post:rebake\"" @@ -974,7 +972,6 @@ pl_PL: ga_universal_domain_name: "Domena dla Google Universal Analytics (analytics.js), np: mysite.com; zobacz http://google.com/analytics" gtm_container_id: "Kontener menadżera tagów Google np: GTM-ABCDEF" enable_escaped_fragments: "Odwołuj się do API Google Ajax-Crawling jeżeli nie wykryto żadnego robota internetowego. Sprawdź https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag" allow_moderators_to_create_categories: "Zezwól moderatorom na tworzenie nowych kategorii" cors_origins: "Dozwolone źródła dla zapytać cross-origin (CORS). Każde źródło musi zawierać http:// lub https://. Zmienna środowiskowa DISCOURSE_ENABLE_CORS musi być ustawiona na true żeby włączyć CORS." use_admin_ip_whitelist: "Administratorzy mogą się logować tylko z adresów IP zdefiniowanych w liście Screened IPs (Admin > Logi > Screened Ips)." @@ -1012,7 +1009,6 @@ pl_PL: login_required: "Wymagaj autoryzacji do wyświetlenia zawartości strony, zablokuj możliwość anonimowego dostępu." min_username_length: "Minimalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy krótsze niż ta, twój serwis się uszkodzi!" max_username_length: "Maksymalna długość nazwy użytkownika w znakach. OSTRZEŻENIE: jeśli jacykolwiek istniejący użytkownicy lub grupy mają nazwy dłuższe niż ta, twój serwis się uszkodzi!" - reserved_usernames: "Niedozwolone nazwy użytkowników." min_password_length: "Minimalna długość hasła." min_admin_password_length: "Minimalna długość hasła dla Admina." password_unique_characters: "Minimalna ilość różnych znaków, które muszą być w haśle." @@ -1253,10 +1249,6 @@ pl_PL: change_owner: post_revision_text: "Zmieniono właściciela z %{old_user} na %{new_user}" deleted_user: "usunięty użytkownik" - emoji: - errors: - name_already_exists: "Nazwa \"%{name}\" wkorzystywana jest już przez inny emotikon." - error_while_storing_emoji: "Wystąpił błąd podczas zapisywania emotikonu." topic_statuses: archived_enabled: "Temat został zarchiwizowany. Został zablokowany i nie może być zmieniany. " archived_disabled: "Temat został przywrócony z archiwum. Został odblokowany i może ponownie być zmieniany." @@ -1363,14 +1355,6 @@ pl_PL: other: "%{count} flagi oczekują na reakcję" unsubscribe_mailer: subject_template: "Potwierdź, że nie chcesz już otrzymywać powiadomień mailowych ze strony %{site_title}" - text_body_template: | - Ktoś (może ty?) zażądał, by strona %{site_domain_name} nie wysyłała już powiadomień mailowych na ten adres. - Jeśli to potwierdzasz, kliknij w ten link: - - %{confirm_unsubscribe_link} - - - Jeśli nadal chcesz otrzymywać powiadomienia mailowe, po prostu zignoruj ten mail. invite_mailer: subject_template: "%{invitee_name} zaprosił cię do '%{topic_title}' na %{site_domain_name}" text_body_template: | @@ -1451,7 +1435,6 @@ pl_PL: (Jeśli powyższy link wygasł, wybierz "Zapomniałem hasła", logując się za pomocą adresu email.) test_mailer: - subject_template: "[%{site_name}] Test dostarczania poczty" text_body_template: | To testowy mail z serwisu: @@ -1494,7 +1477,6 @@ pl_PL: [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ new_version_mailer: - subject_template: "[%{site_name}] Aktualizacja do nowej wersji Discourse jest dostępna." text_body_template: | Pojawiła się nowa wersja [Discourse](http://www.discourse.org)! @@ -1507,7 +1489,6 @@ pl_PL: - Sprawdź najnowsze informacje, weź udział w dyskusji lub skorzystaj z wsparcia technicznego Discourse na stronie [meta.discourse.org](https://meta.discourse.org) new_version_mailer_with_notes: - subject_template: "[%{site_name}] dostępna aktualizacja" text_body_template: | Pojawiła się nowa wersja [Discourse](http://www.discourse.org)! @@ -1524,11 +1505,6 @@ pl_PL: %{notes} queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 post oczekuje na przejrzenie" - few: "[%{site_name}] %{count} posty oczekuje na przejrzenie" - many: "[%{site_name}] %{count} postów oczekuje na przejrzenie" - other: "[%{site_name}] %{count} postów oczekuje na przejrzenie" text_body_template: | Witaj, @@ -1652,25 +1628,8 @@ pl_PL: title: "Email odrzucony Pusty" email_reject_invalid_access: title: "Email odrzucony Nieprawidłowy dostęp" - email_reject_invalid_post: - subject_template: "[%{site_name}] Problem z mailem -- błąd postu" - email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problem z mailem -- błąd postu" - email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problem z mailem -- błędna akcja postu" - email_reject_reply_key: - subject_template: "[%{site_name}] Problem z mailem -- Nieznany Klucz Odpowiedzi" - email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problem z mailem -- Nieznany: Adres" - email_reject_topic_not_found: - subject_template: "[%{site_name}] Problem z mailem -- Temat Nieznaleziony " email_reject_topic_closed: title: "Email odrzucony Temat zamknięty" - subject_template: "[%{site_name}] Problem z mailem -- Temat Zamknięty" - email_reject_auto_generated: - subject_template: "[%{site_name}] Problem z mailem -- Odpowiedź Wygenerowana Automatycznie " - email_error_notification: - subject_template: "[%{site_name}] Problem z mailem -- Błąd uwierzytelnienia POP" too_many_spam_flags: subject_template: "Nowe konto zawieszone" too_many_tl3_flags: @@ -1740,7 +1699,6 @@ pl_PL: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Użytkownik zaprosił do PW" - subject_template: "[%{site_name}] %{username} zaprasza cie do wiadomości '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1748,7 +1706,6 @@ pl_PL: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} zaprasza cie do wiadomości '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1757,7 +1714,6 @@ pl_PL: %{respond_instructions} user_invited_to_topic: title: "Użytkownik zaprosił do Tematu" - subject_template: "[%{site_name}] %{username} zaprasza cie do '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1766,7 +1722,6 @@ pl_PL: %{respond_instructions} user_replied: title: "Użytkownik odpowiedział" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1777,7 +1732,6 @@ pl_PL: %{respond_instructions} user_replied_pm: title: "Użytkownik odpowiedział przez PW" - subject_template: "[%{site_name}] [PW] %{topic_title}" text_body_template: | %{header_instructions} @@ -1788,7 +1742,6 @@ pl_PL: %{respond_instructions} user_quoted: title: "Użytkownik Zacytował" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1799,7 +1752,6 @@ pl_PL: %{respond_instructions} user_linked: title: "Użytkownik podał link" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1810,7 +1762,6 @@ pl_PL: %{respond_instructions} user_mentioned: title: "Użytkownik Wspomniany" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1821,7 +1772,6 @@ pl_PL: %{respond_instructions} user_group_mentioned: title: "Grupa Użytkowników Wspomniana" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1832,7 +1782,6 @@ pl_PL: %{respond_instructions} user_posted: title: "Użytkownik Opublikował" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1843,7 +1792,6 @@ pl_PL: %{respond_instructions} user_watching_first_post: title: "Użytkownik Pregląda pierwszy post" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1854,7 +1802,6 @@ pl_PL: %{respond_instructions} user_posted_pm: title: "Użytkownik Napisał PM" - subject_template: "[%{site_name}] [PW] %{topic_title}" text_body_template: | %{header_instructions} @@ -1881,13 +1828,11 @@ pl_PL: join_the_discussion: "Czytaj więcej" popular_posts: "Popularne wpisy" more_new: "Nowe dla ciebie" - subject_template: "%{site_name} Podsumowanie" click_here: "kliknij tutaj" from: "%{site_name} podsumowanie" preheader: "Podsumowanie aktywności od Twojej ostatniej wizyty w dniu %{last_seen_at}" mailing_list: why: "Cała aktywność w %{site_link} dla %{date}" - subject_template: "[%{site_name}] Podsumowanie dla %{date}" from: "%{site_name} podsumowanie" new_topics: "Nowe tematy" topic_updates: "Aktualizacje tematu" @@ -1895,7 +1840,6 @@ pl_PL: back_to_top: "Powrót do góry" forgot_password: title: "Zapomniane hasło" - subject_template: "[%{site_name}] Reset hasła" text_body_template: | Ktoś poprosił o zresetowanie Twojego hasła na [%{site_name}](%{base_url}). @@ -1905,7 +1849,6 @@ pl_PL: %{base_url}/users/password-reset/%{email_token} set_password: title: "Ustaw hasło" - subject_template: "[%{site_name}] Ustaw hasło" text_body_template: | Ktoś poprosił o dodanie hasła do twojego konta [%{site_name}](%{base_url}). Możesz się zalogować przy pomocy konta w i innym serwisie (Google, Facebook, itd.) które zostało powiązane z twoim potwierdzonym adresem email. @@ -1915,10 +1858,8 @@ pl_PL: %{base_url}/users/password-reset/%{email_token} admin_login: title: "Logowanie administratora. " - subject_template: "[%{site_name}] Login" account_created: title: "Utworzono Konto" - subject_template: "[%{site_name}] Twoje nowe konto" text_body_template: | Utworzyliśmy Twoje konto na %{site_name} @@ -1926,13 +1867,10 @@ pl_PL: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Potwierdź Nowy Email" - subject_template: "[%{site_name}] Potwierdź nowy adres email" confirm_old_email: title: "Potwierdź stary email" - subject_template: "[%{site_name}] Potwierdź aktualny adres email" notify_old_email: title: "Powiadom Stary Email" - subject_template: "[%{site_name}] Twój adres email został zmieniony" signup_after_approval: title: "Zarejestruj się po zatwierdzeniu" subject_template: "Zostałeś zaakceptowany na forum %{site_name}!" @@ -1956,7 +1894,6 @@ pl_PL: signup: title: "Podpis" - subject_template: "[%{site_name}] Potwierdź swoje nowe konto" text_body_template: | Witaj na %{site_name}! diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 02cae7bf26..3bb384932b 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -354,7 +354,6 @@ pt: pms_per_day: "Atingiu o número máximo de mensagens de hoje. Por favor espere %{time_left} antes de tentar novamente." create_like: "Atingiu o número máximo de gostos de hoje. Por favor espere %{time_left} antes de tentar novamente." create_bookmark: "Atingiu o número máximo de marcações de hoje. Por favor espere %{time_left} antes de tentar novamente." - edit_post: "Atingiu o número máximo de edições de hoje. Por favor espere %{time_left} antes de tentar novamente." live_post_counts: "Está a pedir por contagens de publicações em tempo real a um ritmo demasiado rápido. Por favor espere %{time_left} antes de tentar outra vez." unsubscribe_via_email: "Atingiu o número máximo de cancelamentos de subscrições por email de hoje. Por favor espere %{time_left} antes de tentar novamente." topic_invitations_per_day: "Atingiu o número máximo de convites para tópicos de hoje. Por favor espere %{time_left} antes de tentar novamente." @@ -765,7 +764,6 @@ pt: delete_removed_posts_after: "Mensagens removidas pelo autor serão automaticamente eliminadas após um período de (n) horas. Se estiver definido a 0, as mensagens serão eliminadas imediatamente." max_image_width: "Largura máxima de miniaturas de imagens numa mensagem." max_image_height: "Altura máxima de miniaturas de imagens numa mensagem." - category_featured_topics: "Número de tópicos visíveis por categoria na página de /categorias. Após a alteração deste valor, irá demorar até 15 minutos para que a página de categorias fique atualizada." fixed_category_positions: "Se estiver marcado, irá conseguir organizar as categorias por uma ordem fixa. Se não estiver marcado, as categorias são listadas por ordem de actividade." fixed_category_positions_on_create: "Se marcado, a ordenação de categorias irá ser mantida no diálogo de criação do tópico (requer fixed_category_positions)" add_rel_nofollow_to_user_content: "Adicionar a etiqueta rel nofollow em todos os conteúdos submetidos pelo utilizador, excepto para hiperligações internas (incluindo domínios pai). Se mudar isto, terá que atualizar todas as suas mensagens com: \"rake posts:rebake\"" @@ -823,7 +821,6 @@ pt: ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: omeusitio.com; ver http://google.com/analytics" gtm_container_id: "id de contentor do Google Tag Manager. eg: GTM-ABCDEF" enable_escaped_fragments: "Reverter para a Google Ajax-Crawling API se nenhum webcrawler for detectado. Ver https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Ativar o suporte básico para pesquisas em motores de pesquisa através da etiqueta noscript" allow_moderators_to_create_categories: "Permitir que os moderadores criem novas categorias" cors_origins: "Permitidos compartilhamentos de recursos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS tem que estar configurada a verdadeiro para ativar o CORS." use_admin_ip_whitelist: "Os Administradores só podem iniciar sessão se estiverem num endereço IP definido na lista de IPs Rastreados (Admin > Logs > IPs Rastreados)." @@ -860,7 +857,6 @@ pt: invite_passthrough_hours: "Quanto tempo pode um utilizador utilizar uma chave de convite previamente recuperada, em horas" invite_only: "O registo público está desativado, todos os novos utilizadores devem ser explicitamente convidados por outros membros ou pelo pessoal." login_required: "Requerer autenticação para ler conteúdo neste sítio, não permitir acesso anónimo." - reserved_usernames: "Nomes de utilizadores para os quais o registo não é permitido." min_password_length: "Tamanho mínimo da palavra-passe." min_admin_password_length: "Tamanho mínimo da palavra-passe para Administração." block_common_passwords: "Não permitir palavras-passe que estejam nas 10,000 palavras-passe mais comuns." @@ -1263,10 +1259,6 @@ pt: change_owner: post_revision_text: "Direito de posse transferido de %{old_user} para %{new_user}" deleted_user: "um utilizador eliminado" - emoji: - errors: - name_already_exists: "Pedimos desculpa, o nome '%{name}' já está a ser usado por outro emoji." - error_while_storing_emoji: "Pedimos desculpa, ocorreu um erro enquanto o seu emoji estava a ser guardado." topic_statuses: archived_enabled: "Este tópico está agora arquivado. Está congelado e não pode ser alterado de qualquer maneira." archived_disabled: "Este tópico foi agora desarquivado. Já não está congelado, e pode ser alterado." @@ -1357,14 +1349,6 @@ pt: other: "%{count} sinalizações à espera de serem tratadas" unsubscribe_mailer: subject_template: "Confirme que não quer receber emails com actualizações de %{site_title}" - text_body_template: | - Alguém (possivelmente você?) pediu para não receber mais emails com com actualizações de %{site_domain_name} neste endereço. - Se confirma este pedido por favor carregue nesta ligação: - - %{confirm_unsubscribe_link} - - - Se quiser continuar a receber emails com actualizações pode ignorar este email. invite_mailer: subject_template: "%{invitee_name} convidou-o a juntar-se a '%{topic_title}' em %{site_domain_name}" custom_invite_mailer: @@ -1383,7 +1367,6 @@ pt: (Se a hiperligação acima tiver expirado, escolha "Esqueci a minha palavra-passe" ao iniciar sessão com o seu endereço de email.) test_mailer: - subject_template: "[%{site_name}] Teste de entrega de email" text_body_template: | Este é um email de teste de @@ -1426,7 +1409,6 @@ pt: [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ new_version_mailer: - subject_template: "[%{site_name}] Nova versão Discourse, atualização disponível" text_body_template: | Hurrah, uma nova versão do [Discourse](http://www.discourse.org) está disponível! @@ -1439,7 +1421,6 @@ pt: - Visite [meta.discourse.org](https://meta.discourse.org) para notícias, debates, e suporte para o Discourse. new_version_mailer_with_notes: - subject_template: "[%{site_name}] atualização disponível" text_body_template: | Hurrah, uma nova versão do [Discourse](http://www.discourse.org) está disponível! @@ -1456,9 +1437,6 @@ pt: %{notes} queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 mensagem à espera de revisão" - other: "[%{site_name}] %{count} mensagens à espera de revisão" text_body_template: | Olá, @@ -1567,52 +1545,44 @@ pt: subject_template: "A exportação dos dados falhou" text_body_template: "Pedimos desculpa mas a sua exportação de dados falhou. Por favor verifique os registos do log ou contacte um membro do pessoal." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problema com Email -- Nível de Confiança Insuficiente" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) falhou. A sua conta não possui o nível de confiança necessário para criar novos tópicos para este endereço de email. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_reject_user_not_found: - subject_template: "[%{site_name}] Problema de email -- Utilizador Não Encontrado" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua resposta foi enviada de um endereço de email desconhecido. Tente enviá-la de outro endereço de email, ou contacte um membro da equipa de apoio. email_reject_screened_email: - subject_template: "[%{site_name}] Problema de email -- Email Bloqueado" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua resposta foi enviada de um endereço de email bloqueado. Tente enviá-la de outro endereço de email, ou contacte um membro da equipa de apoio. email_reject_inactive_user: - subject_template: "[%{site_name}] Problema de email -- Utilizador inactivo" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua conta associada com este email não está activa. Por favor active a sua conta antes de enviar emails. email_reject_blocked_user: - subject_template: "[%{site_name}] Problema de email -- Utilizador Bloqueado" text_body_template: |+ Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua conta associada com este endereço de email foi bloqueada. email_reject_reply_user_not_matching: - subject_template: "[%{site_name}] Problema de email -- Endereço de Resposta Inesperado" text_body_template: |+ Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua resposta foi enviada de um email diferente daquele que esperávamos, por esta razão não temos a certeza que seja a mesma pessoa. Tente enviar de outro endereço de email ou contacte um membro da equipa de apoio. email_reject_no_account: - subject_template: "[%{site_name}] Problema de email -- Conta Desconhecida" text_body_template: |+ Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Não conseguimos encontrar nenhuma conta com o seu endereço de email. Tente enviar de outro endereço de email, ou contacte um membro da equipa de apoio. email_reject_empty: - subject_template: "[%{site_name}] Problema de email -- Sem Conteúdo" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (com título%{former_title}) não funcionou. @@ -1620,32 +1590,27 @@ pt: Se está a obter isto e _realmente_ incluiu uma resposta, tente novamente com um formato mais simples. email_reject_parsing: - subject_template: "[%{site_name}] Problema de email -- Conteúdo Não Reconhecido" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (título %{former_title}) não funcionou. Não conseguimos encontrar a sua resposta no email. **Certifique-se que a sua resposta se encontra no topo do email** - não conseguimos processar respostas em linha. email_reject_invalid_access: - subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A sua conta não tem privilégios para publicar novos tópicos nessa categoria. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Problema de email -- Acesso Inválido" text_body_template: |+ Pedimos desculpa mas a sua mensagem de email para %{destination} (titled %{former_title}) não funcionou. A categoria que enviou neste email apenas permite respostas de utilizadores com contas validadas e endereços de email conhecidos. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_reject_invalid_post: - subject_template: "[%{site_name}] Problema de email -- Erro de Publicação" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Algumas causas possíveis são: formatação complexa, mensagem demasiado grande, mensagem demasiado pequena. Por favor tente novamente, ou publique através do sítio se isto continuar. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problema de email -- Erro de Publicação" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. @@ -1655,43 +1620,36 @@ pt: Se conseguir corrigir o problema, tente novamente. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problema de email -- Acção de Publicação inválida" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A Acção de Publicação não foi reconhecida. Por favor tente novamente, ou publique através do sítio se isto continuar. email_reject_reply_key: - subject_template: "[%{site_name}] Problema de email -- Chave de Resposta Desconhecida" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. A chave de resposta no email é inválida ou desconhecida e por isso não conseguimos determinar a que é o que email estava a responder. Contacte um membro da equipa de apoio. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problema de Email -- Endereço Para: Desconhecido" text_body_template: | Pedimos desculpa mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Nenhum dos endereços de destino é reconhecido. Por favor, certifique-se que está a enviar o endereço de email correcto fornecido pela equipa de apoio. email_reject_topic_not_found: - subject_template: "[%{site_name}] Problema de email -- Tópico Não Encontrado" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. O tópico ao qual está a responder já não existe -- talvez tenha sido apagado. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_reject_topic_closed: - subject_template: "[%{site_name}] Problema de email -- Tópico Encerrado" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. O tópico ao qual está a responder encontra-se fechado e já não aceita respostas. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_reject_auto_generated: - subject_template: "[%{site_name}] Problema de email -- Resposta Gerada Automaticamente" text_body_template: | Pedimos desculpa, mas a sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. O seu email foi marcado como "gerado automaticamente", o que quer dizer que foi automaticamente criado por um computador em vez de ser escrito por uma pessoa; não podemos aceitar esse tipo de emails. Se acredita que isto é um erro, contacte um membro da equipa de apoio. email_error_notification: - subject_template: "[%{site_name}] Problema de email -- Erro de autenticação POP" text_body_template: | Infelizmente, ocorreu um erro de autenticação ao recuperar emails do servidor POP. @@ -1822,7 +1780,6 @@ pt: user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1830,7 +1787,6 @@ pt: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} convidou-o para uma mensagem '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1838,7 +1794,6 @@ pt: %{respond_instructions} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} convidou-o para '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1846,7 +1801,6 @@ pt: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1856,7 +1810,6 @@ pt: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -1866,7 +1819,6 @@ pt: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1876,7 +1828,6 @@ pt: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1886,7 +1837,6 @@ pt: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1896,7 +1846,6 @@ pt: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1906,7 +1855,6 @@ pt: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1916,7 +1864,6 @@ pt: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1926,7 +1873,6 @@ pt: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -1952,14 +1898,12 @@ pt: follow_topic: "Acompanhar este tópico" join_the_discussion: "Ler Mais" popular_posts: "Publicações Populares" - subject_template: "Sumário de [%{site_name}] " unsubscribe: "Este resumo é enviado de %{site_link} quando não o vemos há algum tempo. Para anular a subscrição %{unsubscribe_link}." click_here: "clique aqui" from: "resumo de %{site_name}" preheader: "Um breve sumário desde a sua última visita em %{last_seen_at}" mailing_list: why: "Toda a atividade em %{site_link} em %{date}" - subject_template: "Resumo de [%{site_name}] para %{date}" unsubscribe: "Este resumo é enviado diariamente devido ao modo de lista de distribuição estar ativado. Para anular a subscrição %{unsubscribe_link}." from: "resumo de %{site_name}" new_topics: "Novos tópicos" @@ -1967,7 +1911,6 @@ pt: view_this_topic: "Ver este tópico" back_to_top: "Voltar ao topo" forgot_password: - subject_template: "[%{site_name}] Repor palavra-passe" text_body_template: | Alguém pediu para redefinir a sua palavra-passe em [%{site_name}](%{base_url}). @@ -1976,7 +1919,6 @@ pt: Para escolher a sua nova palavra-passe clique na seguinte hiperligação: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Configurar Palavra-passe" text_body_template: | Alguém pediu para adicionar uma palavra-passe à sua conta em [%{site_name}](%{base_url}). Como alternativa, pode entrar usando qualquer serviço online suportado (Google, Facebook, etc) que estiver associado a este endereço de email validado. @@ -1985,7 +1927,6 @@ pt: Clique na hiperligação seguinte para escolher uma palavra-passe. %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Iniciar sessão" text_body_template: | Alguém pediu para iniciar sessão na sua conta em [%{site_name}](%{base_url}). @@ -1994,20 +1935,17 @@ pt: Clique na seguinte hiperligação para iniciar sessão: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] A Sua Nova Conta" text_body_template: | Uma nova conta foi criada para si em %{site_name} Clique na hiperligação seguinte para escolher uma palavra-passe para a sua nova conta. %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Confirme o seu novo endereço de email" text_body_template: | Confirme o seu novo endereço de email para %{site_name} ao clicar na seguinte ligação: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Confirme o seu endereço de email atual" text_body_template: | Antes de podermos alterar o seu endereço de email, precisámos que confirme que controla @@ -2018,7 +1956,6 @@ pt: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] O seu endereço de email foi alterado" text_body_template: | Isto é uma mensagem automática para o informar que o seu endereço de email para %{site_name} foi alterado. Se isto foi feito em erro, por favor contacte @@ -2047,7 +1984,6 @@ pt: (Se precisar de comunicar com [membros da equipa de apoio](%{base_url}/about) como um novo utilizador, apenas responda a esta mensagem.) signup: - subject_template: "[%{site_name}] Confirme a sua nova conta" text_body_template: | BeM-vindo ao %{site_name}! @@ -2118,103 +2054,6 @@ pt: Edite a primeira mensagem neste tópico para alterar os conteúdos da página %{page_name}. guidelines_topic: title: "FAQ/Orientações" - body: | - - - ## [Este é um Local Civilizado para Discussão Pública](#civilized) - - Por favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações. - - Estas não são regras rígidas e rápidas, meramente ajudas para o julgamento humano da nossa comunidade. Utilize estas orientações para manter este local limpo e iluminado para discussões públicas civilizadas. - - - - ## [Melhorar a Discussão](#improve) - - Ajude-nos a fazer deste um óptimo local para debates ao trabalhar constantemente para melhorar esses debates de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde. - - Os tópicos discutidos aqui têm importância para nós, e queremos que aja como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde com algo do que está a ser dito. - - Uma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você. - - - - ## [Seja Agradável, Mesmo Que Discorde](#agreeable) - - Pode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite: - - * Insultos. - * Ataques pessoais. - * Responder ao tom de uma mensagem e não ao seu conteúdo. - * Contradições instintivas - - Pelo contrário, forneça contra-argumentos que melhorem a conversação. - - - - ## [A Sua Participação Conta](#participate) - - As conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher investir nos debates que tornam este fórum um local interessante para se estar — e evite os que não o fazem. - - O Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, denúncias, respostas, edições, entre outras. Utilize estas ferramentas para melhorar a sua experiência e de todos os outros também. - - Vamos tentar deixar o nosso parque em melhor condições do que as em que o encontramos. - - - - ## [Se vir um Problema, Denuncie-o](#flag-problems) - - Os moderadores têm uma autoridade especial; são responsáveis por este fórum. Mas você também o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas porteiros ou polícias. - - Quando vir mau comportamento, não responda. O reconhecimento encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas denuncio-o. Se denúncias suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores. - - De maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas publicações de qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade. - - - - ## [Seja sempre civilizado](#be-civil) - - Nada estraga mais uma conversação saudável do que ser rude: - - *Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou discurso de ódio. - *Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito. - *Respeite os outros. Não assedie ou magoe, não personifique pessoas, e não exponha informações pessoais. - *Respeite o nosso fórum. Não publique spam ou vandalize de outra maneira o fórum. - - Estes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem a certeza, pergunte-se a si próprio como se sentiria se a sua publicação fosse capa de notícia. - - Este é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, ligações e imagens seguras para família e amigos. - - - - ## [Mantenha-o Organizado](#keep-tidy) - - Faça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso: - - * Não comece um tópico na categoria errada. - * Não cruze publicações sobre o mesmo tema em múltiplos tópicos. - * Não publique respostas sem conteúdo. - * Não desvie um tópico ao mudar o seu centro de atenção. - * Não assine as suas publicações — qualquer publicação tem a sua informação de perfil anexada à mesma. - - Em vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico. - - - - ## [Publique Apenas As Suas Próprias Coisas](#stealing) - - Não deve publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, ligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei. - - - ## [Patrocinado Por Si](#power) - - Este sítio é operado pelos seus [membros locais amigáveis](/about) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico na [categoria de retorno](/c/site-feedback) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente que não pode ser tratado por um meta-tópico ou por uma denúncia, contacte-nos através da [equipa de apoio](/about). - - - - ## [Termos de Serviço](#tos) - - Sim, texto jurídico é chato, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra pessoal pouco amigável. Temos os [Termos de Serviço](/tos) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço, tem que concordar em cumprir os nossos [TDS](/tos). tos_topic: title: "Termos de Serviço" body: | @@ -2733,7 +2572,6 @@ pt: description: "Página da internet com informação geral sobre si ou a sua organização. Será mostrada na sua página de descrição." site_contact: label: "Mensagens Automatizadas" - description: "Todas as mensagens pessoais automatizadas do Discourse serão enviadas deste utilizador. Acima de tudo, este utilizador será o remetente de todas as mensagens de boas-vindas automaticamente enviadas a novos utilizadores." corporate: title: "Organização" fields: diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 806533e767..85c50f33f4 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -419,7 +419,6 @@ pt_BR: pms_per_day: "Você alcançou o número máximo de mensagens por hoje. Por favor aguarde %{time_left} antes de tentar de novo." create_like: "Você atingiu o número máximo de curtidas hoje. Por favor aguarde% {time_left} antes de tentar novamente." create_bookmark: "Você atingiu o número máximo de marcadores hoje. Por favor aguarde% {time_left} antes de tentar novamente." - edit_post: "Você atingiu o número máximo de edições hoje. Por favor aguarde% {tempo} esquerda antes de tentar novamente." live_post_counts: "Você está pedindo contagens de publicações ao vivo rápido demais. Por favor, espere %{time_left} antes de tentar novamente." unsubscribe_via_email: "Você atingiu o número máximo de cancelamentos de inscrição via email por hoje. Por favor, espere %{time_left} antes de tentar novamente." topic_invitations_per_day: "Você atingiu o número máximo de convites para tópicos hoje. Por favor aguarde %{time_left} antes de tentar novamente." @@ -826,7 +825,6 @@ pt_BR: delete_removed_posts_after: "Postagens removidas pelo autor serão automaticamente deletadas depois de (n) horas. Se o valor definido for 0, as postagens serão deletadas imediatamente." max_image_width: "Largura máxima para imagens em um post" max_image_height: "Altura máxima para imagens em um post" - category_featured_topics: "Número de tópicos exibidos por categoria na página /categories. Depois de alterar este valor, levará até 15 minutos para a página de categorias atualizar-se." fixed_category_positions: "Se selecionado, você será capaz de organizar as categorias em uma ordem fixa. Se nada for feito, as categorias serão listadas em ordem de atividade." fixed_category_positions_on_create: "Se ativado, a ordenação das categorias vai ser mantida no formulário de criação de tópico. (requer fixed_category_positions)" add_rel_nofollow_to_user_content: "Adicionar \"nofollow\" para todo conteúdo incluído por um usuário, exceto links internos (incluindo sub domínios). Para que as mudanças façam efeito é necessário rodar \"rake posts:rebake\"." @@ -881,7 +879,6 @@ pt_BR: ga_universal_domain_name: "Nome de domínio do Google Universal Analytics (analytics.js), ex: meusite.com; veja http://google.com/analytics" gtm_container_id: "ID do container do Gerenciador de Tags do Google. eg: GTM-ABCDEF" enable_escaped_fragments: "Voltar à API de Ajax-Crawling do Google se nenhum webcrawler for detectado. Veja https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Ativar suporte a tag <noscript>" allow_moderators_to_create_categories: "Permitir a criação de categorias por moderadores" cors_origins: "Origens permitidas para pedidos de origem-cruzada (CORS). Cada origem deve incluir http:// ou https://. A variável de ambiente DISCOURSE_ENABLE_CORS deve ser definida como true para habilitar CORS." use_admin_ip_whitelist: "Administradores só podem logar se estiverem na lista de IPs Filtrados (Administração > Logs > IPs Filtrados)." @@ -917,7 +914,6 @@ pt_BR: invite_passthrough_hours: "Quando tempo um usuário pode usar uma chave de convite previamente usada para logar, em horas" invite_only: "Cadastro público está desabilitado, todos os novos usuários devem ser explicitamente convidados por outros membros ou equipe." login_required: "Exigir autenticação para ler conteúdo neste site, desabilitar acesso anônimo." - reserved_usernames: "Nomes de usuário não permitidos para criação de contas." min_password_length: "Comprimento mínimo da senha." min_admin_password_length: "Tamanho de senha mínima para Administradores." block_common_passwords: "Não permitir senhas que estiverem entre as 10,000 senhas mais comuns." @@ -1204,10 +1200,6 @@ pt_BR: change_owner: post_revision_text: "Autoria transferida de %{old_user} para %{new_user}" deleted_user: "um usuário deletado" - emoji: - errors: - name_already_exists: "Desculpe, o nome '%{name}' já está sendo usado por outro emoji." - error_while_storing_emoji: "Desculpe, houve um erro ao armazenar o emoji." topic_statuses: archived_enabled: "Este tópico está agora arquivado. Está congelado e não pode ser alterado de qualquer forma." archived_disabled: "Este tópico foi agora desarquivado. Já não está congelado, e pode ser alterado." @@ -1296,16 +1288,6 @@ pt_BR: %{base_url}/users/password-reset/%{email_token} (Se o link acima expirou, escolha a opção "Esqueci minha senha" quando efetuar o login com o seu endereço de e-mail.) - test_mailer: - subject_template: "[%{site_name}] Teste de entrega de email" - new_version_mailer: - subject_template: "[%{site_name}] Nova versão do Discourse, atualização disponível" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] atualização disponível" - queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 mensagem aguardando revisão" - other: "[%{site_name}] %{count} mensagens aguardando revisão" flag_reasons: off_topic: "Sua postagem foi sinalizada como **off-topic**: a comunidade sente que não é uma boa adequação ao tópico, como atualmante definido de acordo com o título e o primeiro post." inappropriate: "Sua postagem foi sinalizada como **não apropriada**: a comunidade sente que ela é ofensiva, abusiva, ou uma violação das [nossas orientações da comunidade](/guidelines)." @@ -1359,30 +1341,11 @@ pt_BR: csv_export_failed: subject_template: "A exportação de dados falhou" text_body_template: "Nos desculpamos, mas sua exportação de dados falhou. Por favor verifique os logs ou entre em contato com um membro da staff." - email_reject_no_account: - subject_template: "[%{site_name}] Problema com Email -- Conta Desconhecida" - email_reject_empty: - subject_template: "[%{site_name}] Problema com email -- Sem conteúdo" email_reject_parsing: - subject_template: "[%{site_name}] Problema com email -- Conteúdo Não Reconhecido" text_body_template: | Nos desculpamos, mas sua mensagem de email para %{destination} (intitulada %{former_title}) não funcionou. Não pudemos encontrar seu resposta no email. **Certifique-se que sua resposta está no topo do email** -- não conseguimos processar respostas em linha. - email_reject_invalid_access: - subject_template: "[%{site_name}] Email -- Acesso Inválido" - email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Problema com Email -- Acesso Inválido" - email_reject_reply_key: - subject_template: "[%{site_name}] Problema com email -- Chave de Resposta Desconhecida" - email_reject_topic_not_found: - subject_template: "[%{site_name}] Problema com email -- Tópico Não Encontrado" - email_reject_topic_closed: - subject_template: "[%{site_name}] Problema com email -- Tópico Fechado" - email_reject_auto_generated: - subject_template: "[%{site_name}] Problema com email -- Resposta Gerada Automaticamente" - email_error_notification: - subject_template: "[%{site_name}] Problema com email -- Erro de autenticação POP" too_many_spam_flags: subject_template: "Nova conta suspensa" too_many_tl3_flags: @@ -1435,7 +1398,6 @@ pt_BR: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} convidou você para uma mensagem '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1457,7 +1419,6 @@ pt_BR: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1467,7 +1428,6 @@ pt_BR: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1477,7 +1437,6 @@ pt_BR: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1487,7 +1446,6 @@ pt_BR: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1497,7 +1455,6 @@ pt_BR: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1507,7 +1464,6 @@ pt_BR: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1517,7 +1473,6 @@ pt_BR: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1527,7 +1482,6 @@ pt_BR: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1537,7 +1491,6 @@ pt_BR: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1563,13 +1516,11 @@ pt_BR: follow_topic: "Seguir esse tópico" join_the_discussion: "Leia Mais" popular_posts: "Publicações Populares" - subject_template: "[%{site_name}] Resumo das discussões" unsubscribe: "Este resumo é enviado por %{site_link} quando não o vemos há algum tempo. Para cancelar a assinatura %{unsubscribe_link}." click_here: "clique aqui" from: "resumo do site %{site_name} " preheader: "Um breve resumo do que aconteceu no fórum desde a sua última visita no dia %{last_seen_at}" mailing_list: - subject_template: "[%{site_name}] Resumo das discussões do dia %{date}" unsubscribe: "Este resumo está sendo enviado diariamente devido à configuração de \"lista de email\" estar habilitada. Para deixar de receber estas mensagens, clique em %{unsubscribe_link}." from: "Resumo das discussões do site %{site_name}" new_topics: "Novos tópicos" @@ -1577,7 +1528,6 @@ pt_BR: view_this_topic: "Ver esse tópico" back_to_top: "Voltar ao topo" forgot_password: - subject_template: "[%{site_name}] Redefinição de senha" text_body_template: | Alguém pediu para redefinir a sua senha em [%{site_name}](%{base_url}). @@ -1586,7 +1536,6 @@ pt_BR: Para escolher a sua nova senha clique no link a seguir: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Definir Senha" text_body_template: | Alguém solicitou para adicionar uma senha para a sua conta em [%{site_name}] (% {base_url}). Alternativamente, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc) que está associado a este endereço de e-mail validado. @@ -1595,7 +1544,6 @@ pt_BR: Clique no link abaixo para escolher uma senha: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Login" text_body_template: | Alguém pediu para logar na sua conta no [%{site_name}](%{base_url}). @@ -1604,7 +1552,6 @@ pt_BR: Clique no link a seguir para logar: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Sua nova Conta" text_body_template: | Uma nova conta foi criada para você em %{site_name} @@ -1612,13 +1559,11 @@ pt_BR: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Confirmar novo e-mail" - subject_template: "[%{site_name}] Confirme seu novo endereço de email" text_body_template: | Confirme seu novo endereço de email para %{site_name} clicando no link a seguir: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Confirme seu endereço de email atual" text_body_template: | Antes que possamos mudar seu endereço de email, precisamos confirmar que você controla a conta de email atual. Após completar esse passo, pediremos que você confirme @@ -1628,7 +1573,6 @@ pt_BR: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] Seu endereço de email foi alterado." text_body_template: | Esta é uma mensagem automática para lhe avisar que seu endereço de email para %{site_name} foi modificado. Se isso foi um erro, por favor entre em contato @@ -1657,7 +1601,6 @@ pt_BR: (Se precisar se comunicar com um [membro interno](%{base_url}/about) como um novo usuário, só responder a esta mensagem.) signup: - subject_template: "[%{site_name}] Confirme sua nova conta" text_body_template: | Ben-vindo ao %{site_name}! diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index dbad8996c2..817f310743 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -373,7 +373,6 @@ ro: pms_per_day: "Ai atins numărul maxim de mesaje pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." create_like: "Ai atins numărul maxim de aprecieri pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." create_bookmark: "Ai atins numărul maxim de semne de carte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." - edit_post: "Ai atins numărul maxim de editări pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." live_post_counts: "Ceri prea rapid contorizarea live a numărului de postări. Te rugăm să aștepți %{time_left} înainte să încerci din nou." unsubscribe_via_email: "Ai atins numărul maxim de dezabonări prin email pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." topic_invitations_per_day: "Ai atins numărul maxim de invitații la subiecte pe ziua de azi. Te rugăm să aștepți %{time_left} înainte să încerci din nou." @@ -810,7 +809,6 @@ ro: delete_removed_posts_after: "Postările șterse de către autor vor fi automat șterse după (n) de ore. Dacă este setat la 0, postările vor fi șterse imediat." max_image_width: "Maximul lățimii unui thumbnail într-o postare" max_image_height: "Maximul înălțimii unui thumbnail într-o postare" - category_featured_topics: "Numărul subiectelor afișate după categorie pe /pagina de categorii. După schimbarea valorii, e nevoie de până la 15 minute până ce pagina de categorii se va actualiza." fixed_category_positions: "Dacă e bifat, veți putea aranja categoriile într-o ordine fixă. Dacă e nebifat, categoriile sunt listate în ordinea activității." fixed_category_positions_on_create: "Dacă este bifat, ordonarea categoriilor va fi menținută în dialogul de creare a subiectelor (presupune fixed_category_positions)." add_rel_nofollow_to_user_content: "Adaugă atributul rel nofollow la toate conținuturile transmise de către utilizator, cu excepția link-urilor interne (includiv domeniile părinte). Dacă schimbi această setare, postările trebuie refăcute cu: \"rake posts:rebake\"" @@ -868,7 +866,6 @@ ro: ga_universal_domain_name: "Numele de domeniu Google Universal Analytics (analytics.js), ex: mysite.com; vezi http://google.com/analytics" gtm_container_id: "ID-ul containerului Google Tag Manager. De ex: GTM-ABCDEF" enable_escaped_fragments: "Întoarce-te la Google's Ajax-Crawling API dacă nu e detectat webcrawler-ul. Vezi https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Activează suportul pentru roboții de căutare web prin tag-ul noscript" allow_moderators_to_create_categories: "Permite moderatorilor să creeze noi categorii" cors_origins: "Origini permise pentru interogările inter-origini (CORS). Fiecare origine trebuie să includă http:// sau https://. Variabila env DISCOURSE_ENABLE_CORS trebuie setată pe true pentru a activa CORS." use_admin_ip_whitelist: "Adminii se pot autentifica numai dacă au o adresă IP definită în lista de IP-uri verificate (Admin > Rapoarte > IP-uri verificate) " @@ -905,7 +902,6 @@ ro: invite_passthrough_hours: "Cât timp un utilizator poate folosi o cheie de invitație acceptată anterior pentru autentificare, în ore" invite_only: "Înregistrarea publică este dezactivată, toți utilizatorii noi trebuie să fie exclusiv invitați de un alt membru sau de personalul site-ului." login_required: "Cere autentificare pentru a citi conținutul acestui site, blochează accesul anonim." - reserved_usernames: "Nume de utilizator pentru care înregistrarea nu este permisă." min_password_length: "Lungimea minimă a parolei." min_admin_password_length: "Lungimea maximă a parolei pentru Admin." block_common_passwords: "Nu permite parole ce sunt printre cele 10,000 cele mai cunoscute parole." @@ -1315,10 +1311,6 @@ ro: change_owner: post_revision_text: "Autor schimbat din %{old_user} în %{new_user}" deleted_user: "un utilizator șters" - emoji: - errors: - name_already_exists: "Ne pare rău, numele '%{name}' este deja folosit de un alt emoji." - error_while_storing_emoji: "Ne pare rău, a apărut o eroare la stocarea acestui emoji." topic_statuses: archived_enabled: "Acest subiect este acum arhivat. Este înghețat și nu mai poate fi schimbat în nici un fel." archived_disabled: "Acest subiect este acum dezarhivat. Nu mai este înghețat și poate fi modificat." @@ -1419,12 +1411,6 @@ ro: other: "%{count} de marcaje de avertizare așteptând să fie gestionate" unsubscribe_mailer: subject_template: "Confirmă că nu mai vrei să primești actualizări pe email de la %{site_title}" - text_body_template: | - Cineva (posibil tu?) a cerut să nu mai fie trimise actualizări pe email de la %{site_domain_name} către această adresă. - Dacă dorești să confirmi, te rugăm dă click pe acest link: - %{confirm_unsubscribe_link} - - Dacă dorești să primești în continuare actualizări pe email, poți ignora acest mesaj. invite_mailer: subject_template: "%{invitee_name} te-a invitat la subiectul '%{topic_title}' pe %{site_domain_name}" custom_invite_mailer: @@ -1443,7 +1429,6 @@ ro: (Dacă linkul de mai sus a expirat, alege "Mi-am uitat parola" la autentificarea cu adresa ta de email.) test_mailer: - subject_template: "[%{site_name}] Test de capacitate de livrare email" text_body_template: | Acesta este un email de test de la @@ -1486,7 +1471,6 @@ ro: [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ new_version_mailer: - subject_template: "[%{site_name}] O nouă versiune de Discourse, actualizare disponibilă" text_body_template: | Uraaa, o nouă versiune de [Discourse](http://www.discourse.org) este acum disponibilă! @@ -1499,7 +1483,6 @@ ro: - Vizitează [meta.discourse.org](https://meta.discourse.org) pentru știri, discuții și suport pentru Discourse new_version_mailer_with_notes: - subject_template: "[%{site_name}] actualizare disponibilă" text_body_template: | Uraaa, o nouă versiune de [Discourse](http://www.discourse.org) este acum disponibilă! @@ -1516,10 +1499,6 @@ ro: %{notes} queued_posts_reminder: - subject_template: - one: "[%{site_name}] o postare așteptând să fie verificată" - few: "[%{site_name}] %{count} postări așteptând să fie verificate" - other: "[%{site_name}] %{count} de postări așteptând să fie verificate" text_body_template: | Salutare, @@ -1633,49 +1612,41 @@ ro: subject_template: "Exportul datelor a eșuat" text_body_template: "Ne pare rău, dar exportul datelor tale a eșuat. Te rugăm să verifici rapoartele sau să contactezi un membru al echipei." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problemă de email -- Nivelul de încredere este insuficient" text_body_template: | Ne pare rău, dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Contul tău nu are nivelul de încredere necesar pentru a crea noi subiecte, de la această adresă de email. Dacă ți se pare că aste e o eroare, contactează un membru al echipei. email_reject_user_not_found: - subject_template: "[%{site_name}] Problemă de email -- Utilizatorul nu a fost găsit" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Răspunsul tău a fost trimis de pe o adresă de email necunoscută. Încearcă să îl trimiți de pe o altă adresă de email, sau contactează un membru al echipei. email_reject_screened_email: - subject_template: "[%{site_name}] Problemă de email -- Email blocat" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Răspunsul tău a fost trimis de pe o adresă de email blocată. Încearcă să îl trimiți de pe o altă adresă, sau contactează un membru al echipei. email_reject_inactive_user: - subject_template: "[%{site_name}] Problemă de email -- Cont dezactivat" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Contul tău asociat acestei adrese de email nu este activat. Te rugăm să îți activezi contul înainte de a trimite emailuri. email_reject_blocked_user: - subject_template: "[%{site_name}] Problemă de email -- Utilizator blocat" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Contul asociat acestei adrese de email este blocat. email_reject_reply_user_not_matching: - subject_template: "[%{site_name}] Problemă de email -- Adresă de răspuns neasteptată" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Răspunsul tău a fost trimis de pe o adresă de email diferită de cea așteptată, așa că nu suntem siguri că este aceeași persoană. Încearcă să trimiți de pe altă adresă de email, sau contactează un membru al echipei. email_reject_no_account: - subject_template: "[%{site_name}] Problemă de email -- Cont utilizator necunoscut" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Nu putem găsi nici un cont care să corespundă adresei tale de email. Încearcă să trimiți de pe o adresă diferită de email, sau contactează un membru al echipei. email_reject_empty: - subject_template: "[%{site_name}] Problemă de email -- Fără conținut" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. @@ -1683,32 +1654,27 @@ ro: Dacă primești acest mesaj și _ai inclus_ un răspuns, încercă din nou cu o formatare mai simplă. email_reject_parsing: - subject_template: "[%{site_name}] Problemă de email -- Conținut nerecunoscut" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Nu am putu găsi răspunsul tău în email. **Asigură-te că răspunsul tău este în partea de sus a emailului** -- nu putem procesa răspunsuri intercalate. email_reject_invalid_access: - subject_template: "[%{site_name}] Problemă de email -- Acces invalid" text_body_template: |+ Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Contul tău nu are drepturile necesare pentru a posta noi subiecte în acea categorie. Dacă ți se pare că asta e o eroare, contactează un membru al echipei. email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Problemă de email -- Acces invalid" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Categoria căreia i-ai trimis acest email nu permite răspunsuri decât de la utilizatori cu conturi valide și adrese de email cunoscute. Dacă ți se pare că e o eroare, contactează un membru al echipei. email_reject_invalid_post: - subject_template: "[%{site_name}] Problemă de email -- Eroare la trimiterea unui mesaj" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Dintre cauzele posibile: formatare complexă, mesaj prea lung, mesaj prea scurt. Te rugăm să încerci din nou sau să postezi prin intermediul site-ului, dacă eroarea continuă. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problemă de email -- Eroare de postare" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. @@ -1718,43 +1684,36 @@ ro: Dacă poți corecta eroarea, te rugăm să încerci din nou. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problemă de email -- Acțiune de postare invalidă" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Acțiunea de postare nu a fost recunoscută. Te rugăm să încerci din nou, sau să postezi pe website dacă eroarea persistă. email_reject_reply_key: - subject_template: "[%{site_name}] Problemă de email -- Cheie de răspuns necunoscută" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Cheia de răspuns la acest email este invalidă sau necunoscută, așa că nu ne putem da seama la ce email vine acest răspuns. Contactați un membru al echipei. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problemă de email -- Adresă destinatar necunoscută" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Nici una din adresele de email de destinație nu este recunoscută. Te rugăm să verifici că trimiți la adresa corecta de email furnizată de către echipă. email_reject_topic_not_found: - subject_template: "[%{site_name}] Problemă de email -- Subiectul nu a fost găsit" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Subiectul la care vrei să răspunzi nu mai există -- poate că a fost șters? Dacă ți se pare că e o eroare, contactează un membru al echipei. email_reject_topic_closed: - subject_template: "[%{site_name}] Problemă de email -- Subiect închis" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Subiectul la care vrei să răspunzi este în prezent închis și nu mai acceptă răspunsuri. Dacă ți se pare că e o eroare, contactează un membru al echipei. email_reject_auto_generated: - subject_template: "[%{site_name}] Problemă de email - Răspuns autogenerat" text_body_template: | Ne pare rău dar mesajul tău către %{destination} (cu titlul %{former_title}) nu a mers. Emailul tău a fost marcat ca „autogenerat”, ceea ce înseamnă că a fost creat automat de un computer în loc să fie scris de un om; nu putem accepta aceste tipuri de emailuri. Dacă ți se pare că este o eroare, contactează un membru al echipei. email_error_notification: - subject_template: "[%{site_name}] Problemă de email - Eroare de autentificare POP3" text_body_template: | Din păcate,s-a produs o eroare de autentificare la retragerea emailurilor de pe serverul POP @@ -1885,7 +1844,6 @@ ro: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} te-a invitat la un mesaj '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1893,7 +1851,6 @@ ro: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} te-a invitat la un mesaj '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1901,7 +1858,6 @@ ro: %{respond_instructions} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} te-a invitat la subiectul '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1909,7 +1865,6 @@ ro: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1919,7 +1874,6 @@ ro: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1929,7 +1883,6 @@ ro: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1939,7 +1892,6 @@ ro: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1949,7 +1901,6 @@ ro: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1959,7 +1910,6 @@ ro: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1969,7 +1919,6 @@ ro: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1979,7 +1928,6 @@ ro: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1989,7 +1937,6 @@ ro: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -2016,14 +1963,12 @@ ro: follow_topic: "Urmărește acest subiect" join_the_discussion: "Citește mai mult" popular_posts: "Postări notorii" - subject_template: "[%{site_name}] Rezumat" unsubscribe: "Acest rezumat este transmis de pe %{site_link} când a trecut ceva vreme de când nu te-am mai văzut. Pentru a te dezabona, %{unsubscribe_link}." click_here: "click aici" from: "%{site_name} rezumat" preheader: "Un scurt rezumat de la ultima ta vizită din %{last_seen_at}" mailing_list: why: "Toată activitatea de pe %{site_link} pentru data de %{date}" - subject_template: "[%{site_name}] Rezumatul pentru data de %{date}" unsubscribe: "Acest rezumat este trimis zilnic pentru că modul mailing list este activat. Pentru dezabonare dă click pe %{unsubscribe_link}" from: "%{site_name} rezumat" new_topics: "Subiecte noi" @@ -2031,7 +1976,6 @@ ro: view_this_topic: "Vizualizează acest subiect" back_to_top: "Înapoi sus" forgot_password: - subject_template: "[%{site_name}] Resetare parolă" text_body_template: | Cineva a cerut resetarea parolei tale pe site-ul [%{site_name}](%{base_url}). @@ -2040,7 +1984,6 @@ ro: Click pe următoarea adresă pentru a reseta parola: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Setare parola" text_body_template: | Cineva a cerut crearea unei parole pe site-ul [%{site_name}](%{base_url}). Alternativ, te poți autentifica folosind orice serviciu online acceptat (Google, Facebook, etc), serviciu ce este asociat cu acesta adresa de email validată. @@ -2049,7 +1992,6 @@ ro: Click pe adresa următoare pentru a alege o parolă: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Autentificare" text_body_template: | Cineva a încercat să se autentifice pe contul tău de pe [%{site_name}](%{base_url}). @@ -2058,20 +2000,17 @@ ro: Click pe următorul link pentru a te autentifica: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Noul tău cont" text_body_template: | Un cont nou a fost creat pentru tine pe %{site_name} Click pe următorul link pentru a-ți alege o parolă pentru noul tău cont %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Confirmă noua ta adresă de email" text_body_template: | Confirmă-ți noua adresă de email pentru %{site_name} dând click pe următorul link: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Confirmă adresa ta de email curentă" text_body_template: | Înainte de a-ți putea schimba adresa de email, trebuie să ne confirmi că deții controlul asupra adresei de email curente. După ce completezi acest pas, va trebui să ne confirmi noua adresă de email. @@ -2079,7 +2018,6 @@ ro: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] Adresa ta de email a fost schimbată" text_body_template: | Acesta este un mesaj automat pentru a te informa că adresa ta de email pentru %{site_name} a fost schimbată. Dacă acest lucru s-a întâmplat dintr-o eroare, contractează un administrator al site-lui. @@ -2106,7 +2044,6 @@ ro: (Dacă ai nevoie să comunici cu [membrii echipei](%{base_url}/about) din postura de nou utilizator, pur și simplu dă reply la acest mesaj.) signup: - subject_template: "[%{site_name}] Confirmă-ți noul cont" text_body_template: | Bine ai venit pe %{site_name}! @@ -2177,104 +2114,6 @@ ro: Editează prima postare în acest subiect pentru a schimba conținutul paginii %{page_name}. guidelines_topic: title: "FAQ/Ghid" - body: | - - - ## [Acesta este un loc pentru discuții civilizate](#civilized) - - Te rugăm să tratezi acest forum de discuții cu același respect cu care ai trata un parc public. și noi, la rândul nostru, suntem o resursă partajată a comunității — un loc în care ne punem la dispoziție aptitudinile, cunoștințele și priceperea prin intermediul conversației în desfășurare. - - Acestea nu sunt reguli absolute, ci doar îndreptări pentru judecata rațională din spatele comunității.Folosește aceste îndreptări pentru a menține acest loc curat și bine iluminat pentru un discurs public civilizat. - - - - ## [Îmbunătățește calitatea discuției](#improve) - - Ajută-ne să facem din locul astă o zonă propice conversației, contribuind neîncetat la creșterea calității discuțiilor, în orice mod, oricât de mic. Dacă nu ești sigur că o postare adaugă ceva la conversație, gândește-te din nou la ce ai de spus și încearcă din nou mai târziu. - - Subiectele discutate aici contează pentru noi, și vrem să acționăm de așa manieră încât să conteze și pentru tine. Fi respectuos cu oamenii cu care discuți subiectele, chiar dacă nu ești de acord cu anumite lucruri care sunt spuse. - - O metodă de a crește calitatea discuției este să te uiți întâi la discuțiile deja existente. Te rugăm să petreci puțin timp răsfoind subiectele de pe aici, înainte de a te apuca să răspunzi sau să le creezi pe ale tale. Astfel, vei avea mai multe șanse să dai peste alții care au aceleasi interese ca și tine. - - - - ## [Fi agreabil, chiar și atunci când nu ești de acord](#agreeable) - - Poate că dorești să răspunzi la ceva cu care nu ești de acord. Asta-i bine. Dar, amintește-ți _să critici ideile și nu oamenii_. Te rugăm să eviți: - - * Insultele. - * Atacurile la persoană. - * Să răspunzi tonului unei postări în loc să răspunzi conținutului ei. - * Contrazicerea de de dragul contrazicerii. - - În loc de asta, furnizează contra-argumente motivate care să îmbunătățească conversația. - - - - ## [Participarea ta contează](#participate) - - Conversațiile pe care le avem aici dau tonul pentru toată lumea. Ajută-ne să influențăm viitorul acestei comunități alegând să te angajezi în discuții care să facă din acest forum un loc interesant — și evitându-i pe cei care nu o fac. - - Discourse furnizează instrumentele care dau posibilitatea comunității să identifice colectiv cele mai bune (și cele mai proaste) contribuții: favorite, semne de carte, aprecieri, marcaje de avertizare, răspunsuri, editări și așa mai departe. Folosește aceste instrumente ca să îți imbunătățești experiența și, de asemenea, pe cea a tuturor celorlați. - - Să încercăm să lăsăm parcul mai frumos decât l-am găsit. - - - - ## [Dacă vezi o problemă, marcheaz-o](#flag-problems) - - Moderatorii au o autoritate specială; ei sunt responsabili de acest forum. Dar și tu, la rândul tău. Cu ajutorul tău, moderatorii pot fi facilitatori ai comunitătii și nu doar niste gunoieri sau polițiști. - - Atunci când sesizezi un comportament greșit, nu răspunde. Asta ar încuraja acel comportament greșit băgându-l în seamă, ți-ar consuma energia și ar irosi timpul tuturor. _Pur și simplu marchează-l cu marcaj de avertizare. Dacă se adună suficiente marcaje de avertizare, se iau masuri, fie automat fie prin intermediul intrevenției unui moderator. - - Pentru a ne întreține comunitatea, moderatorii își rezervă dreptul să șteargă orice conținut și orice cont utilizator din orice motiv și în orice moment. Moderatorii nu pot previzualiza mesajele înainte de postare; ei și membrii echipei nu își pot asuma răspundera pentru nici un fel de conținut postat de comunitate. - - - - ## [Întodeauna fi civilizat](#be-civil) - - Nimic nu sabotează o conversație sănătoasă mai mult decât bădărănia: - - * Fi civilizat. Nu posta ceva ce o persoană rezonabilă ar putea considera ofensator, abuziv sau incitare la ură. - * Păstrează curățenia. Nu posta nimic obscen sau exlicit din punct de vedere sexual. - * Respectați-vă reciproc. Nu hărțui sau îndurera pe nimeni, nu maimuțări alți oameni și nu le expune informațiile lor private. - * Respectă-ne forumul. Nu posta spam sau orice altă formă de vandalism. - - Aceștia nu sunt termeni concreți cu definiții precise — evită până și _aparența_ oricăror din aceste lucruri. Dacă nu ești sigur, întreabă-te cum te-ai simți dacă postarea ta ar apărea pe prima pagină din Dilema veche. - - Acesta este un forum public și motoarele de căutare indexează aceste discuții. Păstrează limbajul, link-urile și imaginile sigure pentru familie și prieteni. - - - - ## [Păstrează ordinea](#keep-tidy) - - Fă un efort să pui lucurile la locul potrivit, ca să petrecem mai mult timp discutând și mai puțin curâțând. Astfel: - - * Nu începe un subiect într-o categorie nepotrivită. - * Nu posta încrucișat același lucru în subiecte diferite. - * Nu posta răspunsuri fără conținut. - * Nu deturna un subiect schimbându-i cursul în mijlocul conversației. - * Nu îți semna postările — fiecare postare are atașate informațiile tale de profil. - - În loc să postezi “+1” sau “de acord”, folosește butonul Apreciere. În loc să duci un subiect într-o direcție radical diferită, folosește Răspunde ca subiect înrudit. - - - - ## [Postează numai ce-i al tău](#stealing) - - Nu posta nimic digital ce aparține altcuiva fără permisiunea lui prealabilă. Nu ai voie să postezi descrieri, link-uri sau metode de a fura conținutul proprietății intelectuale a altcuiva (software, video, audio, imagini), și nici să încalci orice altă lege. - - - - ## [Propulsat de tine](#power) - - Acest site este operat de [echipa noastră prietenoasă](/about) și de *tine*, membrul comunității. Dacă ai orice altă întrebare despre cum merg lucrurile pe-aici, deschide un nou subiect în [categoria de feedback la site](/c/site-feedback) și hai să discutăm! Dacă e vreo chestiune critică sau urgentă care nu poate fi gestionată printr-un meta-subiect sau marcaj de avertizare, contactează-ne prin [pagina echipei](/about). - - - - ## [Condițiile generale de utilizare a site-ului](#tos) - - Da, legea este plictisitoare, însă trebuie să ne protejăm – și prin extensie, și pe tine și datele tale – împotriva băieților răi. Avem niște [Condiții generale de utilizare a site-ului](/tos) ce descriu comportamentul tău (și al nostru) și drepturile legate de conținut, confidențialitate și legi. Pentru a utiliza acest serviciu trebuie să ne accepți [CGU](/tos). tos_topic: title: "Condiții generale de utilizare" body: | @@ -2792,7 +2631,6 @@ ro: description: "Pagina web generică cu date de contact pentru tine sau organizația ta. Se va afișa pe pagina despre noi. " site_contact: label: "Mesaje automate" - description: "Toate mesajele personale automate din Discourse vor fi trimite de la acest utilizator. Ce-i mai important este că acest utilizator va fi desemnat să trimită fiecare mesaj de bun venit ce se trimite automat noilor utilizatori." corporate: title: "Organizație" fields: diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 2f734e6b6a..5cf1566f2c 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -417,7 +417,6 @@ ru: pms_per_day: "Вы достигли лимита сообщений на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой." create_like: "Вы достигли лимита симпатий на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой." create_bookmark: "Вы достигли лимита закладок на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой." - edit_post: "Вы достигли лимита редактирования сообщений на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой." unsubscribe_via_email: "Вы достигли лимита отказа от подписок через email на сегодня. Пожалуйста, подождите %{time_left} перед следующей попыткой." topic_invitations_per_day: "На сегодня вы достигли лимита приглашений в темы. Пожалуйста, подождите %{time_left} перед следующей попыткой." hours: @@ -856,7 +855,6 @@ ru: delete_removed_posts_after: "Сообщение, которое удалено автором, будет автоматически удалено через (n) часов. Если установлено 0, то сообщение будет удалено немедленно." max_image_width: "Максимальная ширина уменьшенных версий изображений, показываемых в сообщениях" max_image_height: "Максимальная высота уменьшенных версий изображений, показываемых в сообщениях" - category_featured_topics: "Количество тем, отображаемых для одного разделе на странице разделов. После изменения значения потребуется около 15 минут для обновления списков." fixed_category_positions: "Если влючено, разделы можно будет отсортировать в определенном порядке. Иначе разделы будут отображаться в порядке активности в них." add_rel_nofollow_to_user_content: "Добавить \"rel nofollow\" для всех ссылок за исключением внутренних (включая родительский домен). Изменение данной настройки потребует обновления всех сообщений с помощью команды \"rake posts:rebake\"" post_excerpt_maxlength: "Максимальная длина краткого изложения сообщения." @@ -890,7 +888,6 @@ ru: pending_users_reminder_delay: "Уведомлять модераторов, если новые пользователи ждут одобрения больше чем столько часов. Установите в -1 для отключения уведомлений." ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code код, например: UA-12345678-9; больше информации можно узнать на странице http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) доменное имя, например: mysite.com; больше можно найти на странице http://google.com/analytics" - enable_noscript_support: "Включить поддержку тэга noscript для поисковых роботов" allow_moderators_to_create_categories: "Разрешить модераторам создавать новые разделы" cors_origins: "Разрешенные источники для cross-origin запросов (CORS). Каждый запрос должен включать http:// или https://. Чтобы включить CORS, переменная окружения DISCOURSE_ENABLE_CORS должна быть установлена в значение true." top_menu: "Определите, какие элементы должны располагаться в навигации на главной странице и в каком порядке. Пример: latest|new|unread|categories|top|read|posted|bookmarks" @@ -922,7 +919,6 @@ ru: invite_passthrough_hours: "Как долго пользователь может воспользоваться ключем приглашения для входа на сайт, указывается в часах" invite_only: "Публичная регистрация отключена. Регистрация только по приглашениям. Новые пользователи могут получить приглашения для регистрации от существующих пользователей или от редакции сайта." login_required: "Требовать авторизации для доступа к сайту, анонимный доступ запретить." - reserved_usernames: "Псевдонимы, запрещенные для регистрации" min_password_length: "Минимальная длина пароля" min_admin_password_length: "Минимальная длина пароля для Администратора." block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых частоиспользуемых паролей." @@ -1215,10 +1211,6 @@ ru: change_owner: post_revision_text: "Владелец сменен с %{old_user} на %{new_user}" deleted_user: "Удаленный пользователь" - emoji: - errors: - name_already_exists: "Название \"%{name}\" уже используется для другой иконки." - error_while_storing_emoji: "Произошла ошибка во время сохранения иконки." topic_statuses: archived_enabled: "Эта тема отправлена в Архив. Она заморожена и не может быть изменена." archived_disabled: "Эта тема разархивирована. Она более не заморожена, и может быть изменена." @@ -1342,18 +1334,6 @@ ru: %{base_url}/users/password-reset/%{email_token} Если срок действия этой ссылки истек, нажмите на кнопку "Войти", а затем "Я забыл свой пароль" и введите ваш e-mail. - test_mailer: - subject_template: "[%{site_name}] Проверка доставки писем" - new_version_mailer: - subject_template: "[%{site_name}] Ихууу, доступна новая версия Discourse!" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] новые обновления" - queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 сообщение ожидает проверки" - few: "[%{site_name}] %{count} сообщения ожидают проверки" - many: "[%{site_name}] %{count} сообщений ожидают проверки" - other: "[%{site_name}] %{count} сообщений ожидают проверки" flag_reasons: off_topic: "Сообщество считает, что ваше сообщение **не относится к теме**, учитывая ее заголовок и первое сообщение." inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нурашающим [кодекс чести](/guidelines)." @@ -1416,31 +1396,11 @@ ru: title: "Неудачный Экспорт CSV" subject_template: "Экспорт не удался" text_body_template: "Мы сожалеем, но возникли неполадки с экспортом ваших данных. Свяжитесь с администратором сайта." - email_reject_inactive_user: - subject_template: "[%{site_name}] Неполадки с e-mail -- неактивный пользователь" - email_reject_blocked_user: - subject_template: "[%{site_name}] Неполадки с e-mail -- заблокированный пользователь" - email_reject_no_account: - subject_template: "[%{site_name}] Неполадки с письмом - не найдена учетная запись" - email_reject_empty: - subject_template: "[%{site_name}] Неполадки с письмом - отсутствует текст" email_reject_parsing: text_body_template: | К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст **в самом верху письма**. - email_reject_invalid_access: - subject_template: "[%{site_name}] Системное сообщение -- Доступ запрещен" - email_reject_reply_key: - subject_template: "[%{site_name}] Системное сообщение -- Неизвестный ключ для ответа" - email_reject_topic_not_found: - subject_template: "[%{site_name}] Системное сообщение -- Тема не найдена" - email_reject_topic_closed: - subject_template: "[%{site_name}] Неполадки с письмом - Топик закрыт" - email_reject_auto_generated: - subject_template: "[%{site_name}] системное сообщение - Автоматически сгенерирован ответ" - email_error_notification: - subject_template: "[%{site_name}] Системное сообщение -- ошибка POP аутентификации" blocked_by_staff: title: "Заблокировано Персоналом" subject_template: "Учётная запись временно заблокирована" @@ -1482,24 +1442,6 @@ ru: visit_link_to_respond: "[Посетите тему](%{base_url}%{url}) чтобы ответить." visit_link_to_respond_pm: "[Посетите сообщение](%{base_url}%{url}) чтобы ответить." posted_by: "Отправлено %{username} %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} приглашает вас к обсуждению сообщения '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_replied_pm: - subject_template: "[%{site_name}] [ЛС] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_linked: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [Личное сообщение] %{topic_title}" user_posted_pm_staged: subject_template: "%{optional_re}%{topic_title}" digest: @@ -1525,7 +1467,6 @@ ru: back_to_top: "Наверх" forgot_password: title: "Забыл Пароль" - subject_template: "[%{site_name}] Сброс пароля" text_body_template: | Кто-то запросил смену вашего пароля на сайте [%{site_name}](%{base_url}). @@ -1535,7 +1476,6 @@ ru: %{base_url}/users/password-reset/%{email_token} set_password: title: "Установить Пароль" - subject_template: "[%{site_name}] Установить пароль" text_body_template: | Кто-то попросил добавить пароль в вашу учётную запись на сайте [%{site_name}](%{base_url}). Вы так же можете войти на сайт используя любой поддерживаемый онлайн-сервис (такие как Google, Facebook и другие), которые связанны с вашим электронным адресом. @@ -1544,7 +1484,6 @@ ru: Нажмите на следующую ссылку для того, что бы изменить пароль: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Войти" text_body_template: | Кто-то запросил ссылку для входа в ваш аккаунт [%{site_name}](%{base_url}). @@ -1554,7 +1493,6 @@ ru: %{base_url}/users/admin-login/%{email_token} account_created: title: "Учётная Запись Создана" - subject_template: "[%{site_name}] Ваша новая учетная запись" text_body_template: | Для вас была создана новая учетная запись на сайте %{site_name} @@ -1562,15 +1500,10 @@ ru: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Подтвердить Новый E-mail" - subject_template: "[%{site_name}] Подтвердите новый адрес электронной почты" text_body_template: | Подтвердите ваш новый адрес электронной почты для сайта %{site_name}, перейдя по следующей ссылке: %{base_url}/users/authorize-email/%{email_token} - confirm_old_email: - subject_template: "[%{site_name}] Подтвердите текущий адрес электронной почты" - notify_old_email: - subject_template: "[%{site_name}] Ваш адрес электронной почты был подтвержден" signup_after_approval: subject_template: "Ваша учетная запись на сайте %{site_name} одобрена!" text_body_template: | @@ -1592,7 +1525,6 @@ ru: (Если вам требуется помощь [администрации](%{base_url}/about), вы можете задать свой вопрос, просто ответив на данное письмо.) signup: - subject_template: "[%{site_name}] Активируйте свою учетную запись" text_body_template: | Добро пожаловать на сайт %{site_name}! @@ -1866,7 +1798,6 @@ ru: description: "Основная страница для связи с Вами или Вашей организацией. Будет отображаться на вашей информационной странице." site_contact: label: "Автоматизированные Сообщения" - description: "Все автоматизированные личные сообщения Discourse будут отправляться от этого пользователя. Наиболее важно, этот пользователь будет указан отправителем каждого приветственного сообщения, автоматически высылаемого новым пользователям." corporate: title: "Организация" description: "Эти имена будут указаны в Вашей Политике Конфиденциальности и Условиях Предоставления Услуг, которые являются записями, которые Вы можете изменить в разделе \"Персонал\"." diff --git a/config/locales/server.sk.yml b/config/locales/server.sk.yml index 083f6a511b..e63125913c 100644 --- a/config/locales/server.sk.yml +++ b/config/locales/server.sk.yml @@ -349,7 +349,6 @@ sk: pms_per_day: "Dosiahli ste maximálny počet správ na tento deň. Prosím čakajte %{time_left} , než skúsite znova" create_like: "Dosiahli ste maximálny počet \"Páči sa\" na tento deň. Prosím čakajte %{time_left} , než skúsite znova" create_bookmark: "Dosiahli ste maximálny počet záložiek na tento deň. Prosím čakajte %{time_left} , než skúsite znova" - edit_post: "Dosiahli ste maximálny počet úprav na tento deň. Prosím čakajte %{time_left} , než skúsite znova" hours: one: "1 hodina" few: "%{count} hodiny" @@ -737,7 +736,6 @@ sk: delete_removed_posts_after: "Príspevky zmazané autorom budú automaticky zmazané po (n) hodinách. Pokiaľ je nastavená 0, príspevky budú zmazané okamžite." max_image_width: "Maximálna šírka náhľadu obrázkov v príspevku" max_image_height: "Maximálna výška náhľadu obrázkov v príspevku" - category_featured_topics: "Počet zobrazených tém na jednu kategóriu na stránke /katgórie. Zmena hodnoty sa na stránkach prejaví do 15 minút." fixed_category_positions: "Ak je to označené, budete môcť zoraďovať kategórie v pevnom poradí. Ak je neoznačené, kategórie budu zoradené podlľa aktivity." fixed_category_positions_on_create: "Ak je označené, triedenie kategórií bude spravované v dialógu na vytváranie témy (vyžaduje fixed_category_positions)." add_rel_nofollow_to_user_content: "Pridať rel nofollow ku všetkému zaslanému používateľskému kontextu s výnimkou interných odkazov (zahrňuje rodičovskú doménu). Ak to zmeníte, musíte vykonať prípaz rebake na všetky príspevky pomocou: \"rake posts:rebake\"" @@ -777,7 +775,6 @@ sk: ga_tracking_code: "ZASTARALÉ: Google analytics (ga.js) sledovací kód, napr.: UA-12345678-9; pozri http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) sledovací kód, napr: UA-12345678-9; pozri http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) názov domény, napr: mysite.com; pozri http://google.com/analytics" - enable_noscript_support: "Zapnúť štandardnú podporu prehľadávačov pomocou značky noscript" allow_moderators_to_create_categories: "Povoliť moderátorom vytváranie nových kategórií" cors_origins: "Povoľ prameňom/origins použitie cross-origin dotazov (CORS). Každý prameň/origin musí obsahovať http:// alebo https://. Aby ste umožnili CORS, systémové premenná DISCOURSE_ENABLE_CORS musí byť nastavená na true." use_admin_ip_whitelist: "Správcovia sa môťu prihlásiť iba pokiaľ pristupujú z adresy uvedenej v zozname kontrolovaných IP adries (Admin > Logs > Screened Ips)" @@ -811,7 +808,6 @@ sk: invite_passthrough_hours: "Ako dlho môže používateľ používať získaný pozývací kľúč na prihlasovanie, v hodinách" invite_only: "Verejná registrácia je vypnutá, všetci noví používatelia musia byť explicitne pozvaní ostatnými členmi alebo obsluhou." login_required: "Požadovať prihlásenie pre čítanie obshau tejto stránky, zakáž anonymný prístup. " - reserved_usernames: "Používateľské mená, ktorých registrácia nie je povolená." min_password_length: "Minimálna dĺžka hesla." min_admin_password_length: "Minimálna dĺžka hesla pre Administrátora." block_common_passwords: "Nepovoliť heslá, ktoré sú v zozname 10 000 najbežnejších hesiel." @@ -1098,10 +1094,6 @@ sk: change_owner: post_revision_text: "Vlástníctvo bolo prenesené z %{old_user} na %{new_user}" deleted_user: "vymazaný užívateľ" - emoji: - errors: - name_already_exists: "Ľutujeme, meno '%{name}' je už použité iným emoji." - error_while_storing_emoji: "Ľutujeme, pri ukladaní emoji nastala chyba." topic_statuses: archived_enabled: "Táto téma je archivovaná. Je zmrazená a už sa nedá nijako meniť. " archived_disabled: "Táto téma je vyňatá z archivu. Už nie je zmrazená a môže sa opäť meniť. " @@ -1192,14 +1184,6 @@ sk: other: "%{count} značiek čaká na zpracovanie" unsubscribe_mailer: subject_template: "Potvrďte, že už ďalej nechcete dostávať aktualizácie z %{site_title}" - text_body_template: | - Niekto (pravdepodobne vy?) požiadal aby ďalej na túto adresu neboli zasielané emailové aktualizácie z %{site_domain_name}. - Ak si prajete potvrdiť, prosíme kliknite na odkaz: - - %{confirm_unsubscribe_link} - - - Ak chcete pokračovať v prijímaní emailových aktualizácií, môžete tento email ignorovať. invite_mailer: subject_template: "%{invitee_name} Vás pozval '%{topic_title}' na %{site_domain_name}" invite_forum_mailer: @@ -1213,17 +1197,6 @@ sk: %{base_url}/users/password-reset/%{email_token} (Ak vyššie uvedený odkaz vyexpiroval, vyberte "Zabudol som heslo" keď sa prihlasujete pomocou svojej emailovej adresy.) - test_mailer: - subject_template: "[%{site_name}] Overenie doručiteľnosti emailu" - new_version_mailer: - subject_template: "[%{site_name}] Nové verzia Discourse, dostupná aktualizácia" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] aktualizácia dostupná" - queued_posts_reminder: - subject_template: - one: "%{site_name}] 1 príspevok čaká na revíziu" - few: "[%{site_name}] %{count} príspevky čakajú na revíziu" - other: "[%{site_name}] %{count} príspevkov čaká na revíziu" flag_reasons: off_topic: "Váš príspevok bol označený ako \"mimo-témy\": komunita cíti, že nie je vhodný do témy tak, ako je definovaná nadpisom a prvým príspevkom" inappropriate: "Váš príspevok bol označený ako **nevhodný**: komunita cíti, že je úrážlivý, nemiestny alebo porušuje [naše pravidlá komunity](/guidelines)." @@ -1268,7 +1241,6 @@ sk: subject_template: "Export dát zlyhal" text_body_template: "Ľutujeme, ale export Vašich dát zlyhal. Prosím, skontrolujte logy alebo kontaktujte člena obsluhy." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problém s emailom -- Nízka úroveň dôvery" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. @@ -1284,7 +1256,6 @@ sk: Vaša odpoveď bola poslaná z blokovanej emailovej adresy. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu. email_reject_inactive_user: - subject_template: "[%{site_name}] Problém s emailom -- Neaktívny užívateľ" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. @@ -1300,13 +1271,11 @@ sk: Vaša odpoveď bola poslaná z inej emailovej adresy ako sme očakávali, takže si nie sme istí či sa jedná o tú istú osobu. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu. email_reject_no_account: - subject_template: "[%{site_name}] Problém s emailom -- Neznámy účet" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Nemôžeme nájsť žiaden účet zodpovedajúci Vašej emailovej adrese. Skúste ju poslať z inej emailovej adresy alebo kontaktujte obsluhu. email_reject_empty: - subject_template: "[%{site_name}] Problém s emailom -- Žiadny obsah" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. @@ -1319,25 +1288,21 @@ sk: Vo Vašom emaile se nepodarilo nájsť pridávaný obsah. **Uistite sa, že ste odpoveď uviedli na začiatku emailu** -- nedokážeme spracovať vložené odpovede. email_reject_invalid_access: - subject_template: "[%{site_name}] Problém s emailom -- Nesprávny prístup" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Váš účet nemá právo na vytváranie nových tém v danej kategórii. Ak si myslíte, že ide o chybu, kontaktujte obsluhu. email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Problém s emailom -- Nesprávny prístup" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Kategória, do ktorej ste poslali tento email, povoľuje odpovede iba od používateľov s platným účtom a známou emailovou adresou. Ak si mysíte, že ide o chybu, kontaktujte zamestnanca stránok. email_reject_invalid_post: - subject_template: "[%{site_name}] Problém s emailom -- Chyba pri uverejnení" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Medzi možnými príčinami môže byť: komplexné formátovanie, správa je príliš veľká, správa je príliš krátka. Prosíme skúste znovu alebo, ak sa chovanie opakuje, uverejnite pomocou webstránky. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Problém s emailom -- Chyba pri uverejnení" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. @@ -1347,43 +1312,35 @@ sk: Ak tento problém dokážete odstrániť, prosíme pokus opakujte. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Problém s emailom -- Neplatná akcia k príspevku" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Akcia uverejnenia nebola rozpoznaná. Prosíme skúste znovu alebo, ak sa chovanie opakuje, uverejnite pomocou webstránky. email_reject_reply_key: - subject_template: "[%{site_name}] Problém s emailom -- Neznámy kľúč odpovede" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Kľúč odpovede v emaili je neplatný alebo neznámy, takže nedokážeme zistiť na čo tento email odpovedá. Kontaktujte obsluhu. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Problém s emailom -- Neznáma adresa príjemcu - Komu:" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Žiadna z adries príjemcov nebola rozpoznaná. Prosíme, uistite sa, že email posielate na správnu adresu poskytnutú obsluhou. email_reject_topic_not_found: - subject_template: "[%{site_name}] Problém s emailom -- Téma nebola nájdená" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Téma, na ktorú odpovedáte už neexistuje - možno bola zmazaná? Ak si myslíte, že ide o chybu, kontaktujte obsluhu. email_reject_topic_closed: - subject_template: "[%{site_name}] Problém s emailom -- Téma je uzavretá" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Téma, na ktorú odpovedáte je momentálne zavretá a neakceptuje ďalšie odpovede. Ak si myslíte, že ide o chybu, kontaktujte obsluhu. email_reject_auto_generated: - subject_template: "[%{site_name}] Problém s emailom -- Automaticky generovaná odpoveď" text_body_template: | Ľutujeme, ale Vaša emailová správa na %{destination} (titled %{former_title}) nefungovala. Váš email bol označený ako "automaticky vygenerovaný", čo znamená, že bol vytvorený automaticky počítačom namiesto napísaný človekom; tento typ emailov nemôžeme akceptovať. Ak si myslíte, že ide o chybu, kontaktujte obsluhu. - email_error_notification: - subject_template: "[%{site_name}] Problém s emailom -- Chyba pri POP autentifikácií" spam_post_blocked: subject_template: "Nový uživateľ %{username} je zablokovaný kôli opakovaným odkazom" pending_users_reminder: @@ -1401,31 +1358,13 @@ sk: title: "Odhlásiť" description: "Nezaujímajú Vás už tieto emaily? Žiadny problém! Pre okamžité odhlásenie kliknite nižšie: " posted_by: "Príspevok od %{username} dňa %{post_date}" - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'" - user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} Vás pozval k správe '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" user_posted_pm_staged: subject_template: "%{optional_re}%{topic_title}" digest: why: "Krátky súhrn zo stránky %{site_link} od Vašej poslednej návštevy %{last_seen_at}" + since_last_visit: "Od Vašej poslednej návštevy" click_here: "kliknite tu" forgot_password: - subject_template: "[%{site_name}] Obnovenie hesla" text_body_template: | Niekto si vyžiadal reset Vášho hesla na [%{site_name}](%{base_url}). @@ -1433,12 +1372,7 @@ sk: Pre zmenu hesl kliknite na nasledujúci odkaz %{base_url}/users/password-reset/%{email_token} - set_password: - subject_template: "[%{site_name}] Nastaviť heslo" - admin_login: - subject_template: "[%{site_name}] Prihlásenie" account_created: - subject_template: "[%{site_name}] Váš nový účet" text_body_template: | Nový účet bol pre Vás vytvorený na %{site_name} @@ -1446,8 +1380,6 @@ sk: %{base_url}/users/password-reset/%{email_token} signup_after_approval: subject_template: "Váš účet bol schválený na %{site_name}!" - signup: - subject_template: "[%{site_name}] Potvrďte Váš nový účet" page_not_found: title: "Stránka neexistuje alebo je privátna." popular_topics: "Populárne" @@ -1501,104 +1433,6 @@ sk: guidelines_topic: title: "FAQ/Pravidlá" - body: | - - - ## [Toto je miesto pre civilizovanú diskusiu](#civilized) - - Prosíme majte k tejto diskusii rešpekt podobný ako k verejnému parku. My, sme tiež zdieľaný zdroj — miesto na zdieľanie znalostí, vedomostí a záujmov pomocou nepretržitej diskusie. - - Toto nie sú jednoznačné pravidlá, skôr návod ľudskému úsudku naše komunity. Použite tieto pravidlá na udržanie prehľadnú a svetlého miesta pre civilizovanú verejnú diskusiu. - - - - ## [Vylepšujte diskusiu](#improve) - - Pomôžte nám tvoriť toto skvelé miesto akýmkoľvek snahou o zlepšenie diskuzie, stačí drobnosť. Ak nie ste si istý že Váš príspevok posúva diskuziu, premyslite si čo chcete povedať a skúste neskôr. - - Diskutované témy sú nám blízke a chceme, aby ste sa správali tak, akoby Vám boli blízke tiež. Rešpektujte témy a diskutujúcich dokonca i v prípade, ak nesúhlasíte s tým, čo bolo povedané. - - Jedným zo spôsobov ako vylepšiť diskusiu je objavenie tej ktoré už prebieha. Prosíme, venujte trochu času zoznámeniu sa s témami predtým, ako začnete odpovedať alebo začínať svoje vlastné a budete mať vačšiu šancu stretnúť tých, ktorý s Vami zdieľajú záujmy. - - - - ## [Buďte príjemný i keď nesúhlasíte](#agreeable) - - Môžete mať túžbu odpovedať na niečo s čím nesúhlasíte. To je v poriadku. Ale pamätajte _kritizujte myšienky a nie ľudí_. Prosíme, vyvarujte sa: - - * Posmeškom. - * Útokom na konkrétnu osobu. - * Odpovediam na tón príspevku miesto skutočného obsahu. - * Impulzívnym reakciám. - - Namiesto toho poskytnite logické proti argumenty, ktoré zlepšia konverzáciu. - - - - ## [Vaša účasť sa počíta](#participate) - - Konverzácie, ktoré tu máme nastavujú tón pre všetkých. Pomôžte nám ovplyvniť budúcnosť tejto komunity zapojením sa do diskusií ktoré z tohoto fóra robia zaujímavé miesto a vyhýbaním sa tým ktoré to nerobia. - - Discourse poskytuje nástroje, ktoré komunite spoločne umožňujú identifikovať najlepšie (a najhoršie) príspevky, záložky, páči sa mi, značky, odpovede, úpravy a podobne. Použite ich na vylepšenie Vašej skúsenosti i skúsenosti kohokoľvek iného. - - Poďme náš park zanechať v lepšom stave než v akom sme ho našli. - - - - ## [Ak vidíte problém označte ho](#flag-problems) - - Moderátori majú špeciálnu autoritu, sú zodpovedný za fórum. Ale Vy tiež. S Vašou pomocou sa moderátori môžu stať sprostredkovateľmi a nie iba školníkmi alebo políciou. - - Ak vidíte nevhodné chovanie, neodpovedajte. Reakciou naň ho posiľujete, míňate svoju energiu a strácate čas nás všetkých. _Oba ho označte_. Ak sa zíde viačej značiek, budú prijaté opatrenia, či už automatické alebo zásahom moderátora. - - Na správu komunity majú moderátori vyhradené práva na odstránenie akéhokoľvek obsahu a používateľského účtu kedukoľvek z akéhokoľvek dôvodu. Moderátori žiadnym spôsobom nekontrolujú príspevky, moderátori a vlastníci stránky nepreberajú žiadku zodpovednosť za obsah publikovaný komunitou. - - - - ## [Buďte civilizovaný](#be-civil) - - Nič nesabotuje zdravú diskusiu tak ako hrubosť: - - * Buďte zdvorilí, Neuverejňujte nič, čo by múdra osoba považovala za urážlivé, znevažujúce alebo nenávistné. - * Udržujte poriadok. Neuverejnujte nič nemravné alebo explicitne sexuálne. - * Rešpektujte iných. Neprenasledujte alebo nezarmucujte ostatných, nenapodobnujte ľudí, alebo nezverejňujte ich súkromné informácie. - * Rešpektujte naše fórum. Neuverejňujte spam alebo iným spôsobom nevandalizujte fórum. - - Toto nie sú jednoznačné pravidlá s presnými definiciami — vyhnite sa čo i len _náznaku_ akejkoľvek z týchto vecí. Ak nie ste si istý, spýtajte sa, či by Váš príspevok bol zverejnený na hlavnej strane New York Times. - - Toto je verejné fórum a diskusie sú indexované vyhľadávačmi. Udržujte jazyk, odkazy a obrázky bezpečné pre rodinu a priateĺov. - - - - ## [Udržujte poriadok](#keep-tidy) - - Vynaložte snahu dať veci na správne miesto, tak môžeme stráviť viac času diskusiou a menej udržiavaním poriadku. Takže: - - * Nezačínajte tému v nesprávnej kategórií. - * Neuverejňujte rovnaké veci vo viacetých témach. - * Nepublikujte príspevky bez obsahu. - * Nepresmerujte tému zmenou uprostred. - * Nepodpisujte sa — každý príspevok má pripojený odkaz na Váš profil. - - Namiesto poslania “+1” or “Súhlasím”, radšej použite tlačítko Páči sa mi. Namiesto radikálnej zmeny témy v priebehu diskusie radšej odpovedzte spojenou témou. - - - - ## [Uverejňujte iba svoj obsah](#stealing) - - Bez dovolenia nemôžete publikovať nič digitálne, čo patrí niekomu inému. Nemôžete publikovať popis, odkazy alebo metódy na kradnutie niekoho intelektuálneho vlastníctva (softvéru, videa, audia, obrázkov), alebo porušovať akýkoľvek iný zákon. - - - - ## [Založené na Vás](#power) - - Táto stránka je prevádzkovaná [miestnym priateľským personálom](/about) a *Vami*, komunitou. Ak máte akékoľvek ďalšie otázky ako by tu veci mali fungovať, založte novú tému v [kategórií spätná väzba](/c/site-feedback) a poďme diskutovať! Ak ste narazili na kritický alebo urgentný problém ktorý nemôže byť riešený pomocou tém v meta alebo príznakom, kontaktujte nás pomocou [stránky personálu](/about). - - - - ## [Podmienky](#tos) - - Áno, právnický žargón je nudný, ale musíme chrániť seba – tým následne i Vás a vaše dáta – voči nepriateľským ľuďom. Máme [Podmienky](/tos) popisujúce Vaše (a naše ) správanie a práva súvisiace s obsahom, súkromým a legislatívou. K používaniu tejto služby musíte dodžiavať naše [Pravidlá](/tos). tos_topic: title: "Podmienky používania" privacy_topic: diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index a6d562cdf0..39ba3d2af7 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -571,7 +571,6 @@ sq: delete_removed_posts_after: "Posts removed by the author will be automatically deleted after (n) hours. If set to 0, posts will be deleted immediately." max_image_width: "Maximum thumbnail width of images in a post" max_image_height: "Maximum thumbnail height of images in a post" - category_featured_topics: "Number of topics displayed per category on the /categories page. After changing this value, it takes up to 15 minutes for the categories page to update." fixed_category_positions: "If checked, you will be able to arrange categories into a fixed order. If unchecked, categories are listed in order of activity." fixed_category_positions_on_create: "If checked, category ordering will be maintained on topic creation dialog (requires fixed_category_positions)." add_rel_nofollow_to_user_content: "Add rel nofollow to all submitted user content, except for internal links (including parent domains). If you change this, you must rebake all posts with: \"rake posts:rebake\"" @@ -608,7 +607,6 @@ sq: must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domain name, eg: mysite.com; see http://google.com/analytics" - enable_noscript_support: "Enable standard webcrawler search engine support via the noscript tag" allow_moderators_to_create_categories: "Allow moderators to create new categories" cors_origins: "Allowed origins for cross-origin requests (CORS). Each origin must include http:// or https://. The DISCOURSE_ENABLE_CORS env variable must be set to true to enable CORS." top_menu: "Determine which items appear in the homepage navigation, and in what order. Example latest|new|unread|categories|top|read|posted|bookmarks" @@ -640,7 +638,6 @@ sq: invite_passthrough_hours: "How long a user can use a previously redeemed invitation key to log in, in hours" invite_only: "Public registration is disabled, all new users must be explicitly invited by other members or staff." login_required: "Require authentication to read content on this site, disallow anonymous access." - reserved_usernames: "Usernames for which signup is not allowed." min_password_length: "Minimum password length." block_common_passwords: "Mos lejo fjalëkalimet që gjenden në 10,000 fjalëkalimet më të përdorshme." enable_sso: "Enable single sign on via an external site (WARNING: USERS' EMAIL ADDRESSES *MUST* BE VALIDATED BY THE EXTERNAL SITE!)" @@ -880,10 +877,6 @@ sq: change_owner: post_revision_text: "Ownership transferred from %{old_user} to %{new_user}" deleted_user: "a deleted user" - emoji: - errors: - name_already_exists: "Sorry, the name '%{name}' is already used by another emoji." - error_while_storing_emoji: "Sorry, there has been an error while storing the emoji." topic_statuses: archived_enabled: "This topic is now archived. It is frozen and cannot be changed in any way." archived_disabled: "This topic is now unarchived. It is no longer frozen, and can be changed." @@ -968,16 +961,6 @@ sq: (Nëse lidhjes së mësipërme i ka mbaruar afati, zgjidhni "Kam harruar fjalëkalimin" kur të hyni me adresën tuaj email.) - test_mailer: - subject_template: "[%{site_name}] Email Deliverability Test" - new_version_mailer: - subject_template: "[%{site_name}] verion i ri i Discourse, përditësoje!" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] ka perditesime" - queued_posts_reminder: - subject_template: - one: "[%{site_name}] 1 postim pret moderimin" - other: "[%{site_name}] %{count} postime po presin moderimin" flag_reasons: off_topic: "Your post was flagged as **off-topic**: the community feels it is not a good fit for the topic, as currently defined by the title and the first post." inappropriate: "Your post was flagged as **inappropriate**: the community feels it is offensive, abusive, or a violation of [our community guidelines](/guidelines)." @@ -1047,29 +1030,11 @@ sq: csv_export_failed: subject_template: "Data export failed" text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member." - email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Problem emaili -- Niveli i Besimit nuk mjafton" - email_reject_no_account: - subject_template: "[%{site_name}] Email issue -- Unknown Account" - email_reject_empty: - subject_template: "[%{site_name}] Email issue -- No Content" email_reject_parsing: text_body_template: | We're sorry, but your email message to %{destination} (titled %{former_title}) didn't work. We couldn't find your reply in the email. **Make sure your reply is at the top of the email** -- we can't process inline replies. - email_reject_invalid_access: - subject_template: "[%{site_name}] Email issue -- Invalid Access" - email_reject_reply_key: - subject_template: "[%{site_name}] Email issue -- Unknown Reply Key" - email_reject_topic_not_found: - subject_template: "[%{site_name}] Email issue -- Topic Not Found" - email_reject_topic_closed: - subject_template: "[%{site_name}] Email issue -- Topic Closed" - email_reject_auto_generated: - subject_template: "[%{site_name}] Email issue -- Auto Generated Reply" - email_error_notification: - subject_template: "[%{site_name}] Email issue -- POP authentication error" spam_post_blocked: subject_template: "New user %{username} posts blocked due to repeated links" pending_users_reminder: @@ -1131,7 +1096,6 @@ sq: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} të ka ftuar tek mesazhi '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1139,7 +1103,6 @@ sq: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} të ka ftuar tek mesazhi '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1147,7 +1110,6 @@ sq: %{respond_instructions} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} të ka ftuar tek tema '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1155,7 +1117,6 @@ sq: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1165,7 +1126,6 @@ sq: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1175,7 +1135,6 @@ sq: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1185,7 +1144,6 @@ sq: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1195,7 +1153,6 @@ sq: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1205,7 +1162,6 @@ sq: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1215,7 +1171,6 @@ sq: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1225,7 +1180,6 @@ sq: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1235,7 +1189,6 @@ sq: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [MP] %{topic_title}" text_body_template: | %{header_instructions} @@ -1251,12 +1204,10 @@ sq: %{message} digest: why: "Një përmbledhje e shkurtër e temave tek %{site_link} që prej vizitës tuaj të fundit më %{last_seen_at}" - subject_template: "[%{site_name}] - Një përmbledhje e shkurtër" unsubscribe: "Kjo përmbledhje dërgohet nga %{site_link} kur nuk ju kemi parë prej disa kohësh. Për të çaktivizuar njoftimet %{unsubscribe_link}." click_here: "klikoni këtu" from: "%{site_name} - Një përmbledhje e shkurtër" mailing_list: - subject_template: "[%{site_name}] Përmbledhja për %{date}" unsubscribe: "Përmbledhja dërgohet përditë, duke qënë se faqja është në formatin \"mailing list\". %{unsubscribe_link} për t'u çabonuar." from: "%{site_name} përmbledhje" new_topics: "Tema të reja" @@ -1264,7 +1215,6 @@ sq: view_this_topic: "Shiko këtë temë" back_to_top: "Kthehu sipër" forgot_password: - subject_template: "[%{site_name}] Rivendosje fjalëkalimi" text_body_template: | Dikush kërkoi për të rivendosur fjalëkalimin tuaj tek [%{site_name}](%{base_url}). @@ -1273,7 +1223,6 @@ sq: Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim të ri: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Vendos fjalëkalimin" text_body_template: | Dikush kërkoi për të shtuar një fjalëkalim tek [%{site_name}](%{base_url}). Nga ana tjetër, mund të hyni në sistem duke përdorur një nga shërbimet online që mbështeten (Google, Facebook, etj) i cili është i lidhur me këtë adresë email. @@ -1282,7 +1231,6 @@ sq: Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Identifikohu" text_body_template: | Somebody asked to login to your account on [%{site_name}](%{base_url}). @@ -1291,20 +1239,17 @@ sq: Click the following link to login: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Llogaria Juaj e Re" text_body_template: | Një llogari e re u krijua për ju tek %{site_name} Klikoni lidhjen e mëtejshme për të zgjedhur një fjalëkalim për llogarinë tuaj të re: %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Konfirmo adresën e re email" text_body_template: | Konfirmo adresën e re email për faqen %{site_name} duke klikuar në linkun më poshtë: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Konfirmoni adresën e tanishme email" text_body_template: | Përpara se sa ta ndryshoni adresën tuaj email, nevojitet të konfirmoni që jeni i zoti i saj. Pasi ta përmbushni këtë hap, ne @@ -1314,7 +1259,6 @@ sq: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] Adresa juaj email u ndryshua" text_body_template: | Ky është një mesazh automatik që ju njofton se adresa juaj email për %{site_name} u ndryshua. Nëse ky është një gabim, njoftoni një administrator @@ -1342,7 +1286,6 @@ sq: (Nëse ju duhet të komunikoni me [anëtarët e stafit](%{base_url}/about) si një anëtar i ri, thjesht përgjigjuni këtij mesazhi.) signup: - subject_template: "[%{site_name}] Konfirmoni llogarinë tuaj të re" text_body_template: | Mirësevini tek %{site_name}! @@ -1403,104 +1346,6 @@ sq: Modifiko postimin e parë të kësaj teme puer të ndryshuar përmbajtjen e faqes %{page_name}. guidelines_topic: title: "Pyetje dhe Përgjigje/Udhëzime" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Powered by You](#power) - - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "Termat e Shërbimit " body: | diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 7a49900c74..825960a14d 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -368,7 +368,6 @@ sv: pms_per_day: "Du har uppnått maximalt antal inlägg idag. Var god vänta %{time_left} innan du försöker igen." create_like: "Du har uppnått maximalt antal gillningar idag. Var god vänta %{time_left} innan du försöker igen." create_bookmark: "Du har uppnått maximalt antal bokmärken idag. Var god vänta %{time_left} innan du försöker igen." - edit_post: "Du har uppnått maximalt antal redigeringar idag. Var god vänta %{time_left} innan du försöker igen. " live_post_counts: "Du ber om uppdateringar för ofta. Var god vänta %{time_left} innan du försöker igen." unsubscribe_via_email: "Du har uppnått maximalt antal avregistreringar via e-post idag. Var god vänta %{time_left} innan du försöker igen." topic_invitations_per_day: "Du har uppnått maximalt antal inbjudningar till ämnen idag. Var god vänta %{time_left} innan du försöker igen." @@ -779,7 +778,6 @@ sv: delete_removed_posts_after: "Inlägg som tagits bort av författaren kommer automatiskt att raderas efter (n) timmar. Ange 0 för att omedelbart ta bort inlägg." max_image_width: "Maxbredd för bildikoner i ett inlägg" max_image_height: "Maxhöjd för bildikoner i ett inlägg" - category_featured_topics: "Antal ämnen som visas per kategori på /kategorier-sidan. Efter att ha ändrat det här värdet så tar det upp till 15 minuter för kategori-sidan att uppdateras." fixed_category_positions: "Om aktiverad, kommer du kunna ordna kategorier i en bestämd ordning. Om inaktiverad, sorteras kategorierna baserat på aktivitet." fixed_category_positions_on_create: "Kategoriordningen kommer att upprätthållas vid dialogen för skapandet av ämnen om den här bockas i (kräver fixed_category_positions)." add_rel_nofollow_to_user_content: "Lägg till rel nofollow på allt användargenererat innehåll, förutom interna länkar (inklusive förälderdomän). Om du ändrar det här så måste du uppdatera alla inlägg med \"rake posts:rebake\"" @@ -833,7 +831,6 @@ sv: ga_universal_tracking_code: "Google Universal Analytics (analytics.js) spårningskod, exempelvis UA-12345678-9; se http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) domännamn, exemplevis: minhemsida.se; se http://google.com/analytics" enable_escaped_fragments: "Återvänd till Googles Ajax-Crawling API om ingen sökrobot upptäcks. Se https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Tillåt standard-sökrobotar sökmotorstöd via noscript-taggen" allow_moderators_to_create_categories: "Tillåt moderatorer att skapa nya kategorier" cors_origins: "Tillåtna ursprung för cross-ursprungsbegäran (CORS). Varje ursprung måste inkludera http:// eller https://. DISCOURSE_ENABLE_CORS env variabeln måste sättas till true för att aktivera CORS." use_admin_ip_whitelist: "Administratörer kan bara logga in om de är på en IP-adress definierad i listan över granskade IP-adresser (Admin > Loggar > Granskade IP-adresser)." @@ -872,7 +869,6 @@ sv: login_required: "Kräv autentisering för att läsa innehåll på den här webbplatsen, avvisa anonym tillgång." min_username_length: "Minsta längd på användarnamnet. Varning: om någon existerande användare eller grupp har namn kortare än detta, er sida kommer att gå sönder!" max_username_length: "Längsta användarnamn. Varning: om någon existerande användare eller grupp har ett namn längre än detta, er sida kommer att gå sönder." - reserved_usernames: "Användarnamn som inte tillåter registrering." min_password_length: "Minsta lösenordslängd." min_admin_password_length: "Högsta lösenordslängd för administratör." password_unique_characters: "Minsta antalet unika tecken som ett lösenord måste ha." @@ -1264,10 +1260,6 @@ sv: change_owner: post_revision_text: "Ägarbyte från %{old_user} till %{new_user}" deleted_user: "en raderad användare" - emoji: - errors: - name_already_exists: "Tyvärr används redan namnet '%{name}' av en annan emoji." - error_while_storing_emoji: "Tyvärr uppstod ett fel vid lagring av emojin." topic_statuses: archived_enabled: "Detta ämne är nu arkiverat. Det är fryst och kan inte förändras på något sätt." archived_disabled: "Detta ämne är nu oarkiverat. Det är inte längre fruset, och kan ändras." @@ -1358,14 +1350,6 @@ sv: unsubscribe_mailer: title: "stäng av mail skrivaren" subject_template: "Bekräfta att du inte längre vill motta e-postuppdateringar från %{site_title}" - text_body_template: | - Någon (kanske du?) begärde att inte längre motta e-postuppdateringar från %{site_domain_name} till den här adressen. - Om du önskar bekräfta det, klicka på länken nedanför: - - %{confirm_unsubscribe_link} - - - Om du vill fortsätta att motta e-postuppdateringar så kan du bortse från det här meddelandet. invite_mailer: title: "Invitera mail skrivaren" subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}" @@ -1390,18 +1374,12 @@ sv: (Om länken ovanför har löpt ut, klicka på "jag har glömt mitt lösenord" när du loggar in med din e-postadress). test_mailer: title: "test mail skrivare" - subject_template: "[%{site_name}] E-postlevereringstest" new_version_mailer: title: "Ny version mail skrivare" - subject_template: "[%{site_name}] Ny version av Discourse, uppdatering tillgänglig" new_version_mailer_with_notes: title: "Ny version mail skrivare med anteckningar" - subject_template: "[%{site_name}] uppdatering tillgänglig" queued_posts_reminder: title: "Påminnelse om köande inlägg" - subject_template: - one: "[%{site_name}] 1 användare väntar på att granskas" - other: "[%{site_name}] %{count} användare väntar på att granskas" text_body_template: | Hej! @@ -1488,35 +1466,30 @@ sv: text_body_template: "Tyvärr har din dataexport misslyckats. Var god kontrollera loggarna eller kontakta personal." email_reject_insufficient_trust_level: title: "email avslår otillräcklig förtroendenivå" - subject_template: " [%{site_name}] E-postfel -- Otillräcklig förtroendenivå" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ditt konto har inte tillräckligt hög förtroendenivå för att skriva nya inlägg från den e-postadressen. Kontakta personal om du tror att det här är ett misstag. email_reject_user_not_found: title: "Emailet avslås användare kunde inte finnas" - subject_template: "[%{site_name}] E-postfel -- Okänd användare" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ditt svarsmeddelande skickades från en okänd e-postadress. Försök skicka meddelandet från en annan e-postadress, eller kontakta personal. email_reject_screened_email: title: "Email avslås screenade email" - subject_template: "[%{site_name}] E-postfel -- Blockerad e-postadress" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ditt svarsmeddelande skickades från en blockerad e-postadress. Försök skicka svaret från en annan e-postadress eller kontakta personal. email_reject_inactive_user: title: "Emailet avslås Inaktiverad användare" - subject_template: "[%{site_name}] E-postfel -- Inaktiv användare" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Kontot associerat till den här e-postadressen är inte aktiverat. Var god se till att ditt konto är aktiverat innan du skickar e-post. email_reject_blocked_user: title: "Email avslås blockerad användare" - subject_template: "[%{site_name}] E-postfel -- Användare blockerad" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. @@ -1529,14 +1502,12 @@ sv: Ditt svarsmeddelande skickades från en annan e-postadress än den vi väntat oss, så vi är inte säkra på att det är från samma person. Försök skicka svaret från en annan e-postadress eller kontakta personal. email_reject_no_account: title: "Emailet avslås det finns inget konto" - subject_template: "[%{site_name}] E-postfel -- Okänt konto" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Vi kan inte hitta något konto som matchar din e-postadress. Försök skicka meddelandet från en annan e-postadress eller kontakta personal. email_reject_empty: title: "Emailet avslås - tomt" - subject_template: "[%{site_name}] E-postfel -- Innehåll saknas" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. @@ -1550,28 +1521,24 @@ sv: Vi kunde inte hitta något svar i ditt e-postmeddelande. **Se till att ditt svar är högst upp i e-postmeddelandet** -- vi kan inte hantera inbäddad text. email_reject_invalid_access: title: "Emailet avslås ogiltig åtkomst" - subject_template: "[%{site_name}] E-postfel -- Ogiltig åtkomst" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ditt konto har inte rättighet att skriva nya inlägg i den kategorin. Kontakta personal om du tror att det här är ett misstag. email_reject_strangers_not_allowed: title: "Emailet avslås okända är ej tillåtna" - subject_template: "[%{site_name}] E-postfel -- Ogiltig åtkomst" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Kategorin som du skickat e-postmeddelandet till godkänner endast inlägg från användare med giltiga konton och kända e-postadresser. Kontakta personal om du tror att det här är ett misstag. email_reject_invalid_post: title: "Emailet avslås ogiltigt inlägg" - subject_template: "[%{site_name}] E-postfel -- Inläggsfel" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Några möjliga anledningar är: för komplex formattering, meddelandet är för stort, meddelandet är för litet. Var vänlig försök igen, eller gör ett inlägg via hemsidan om problemet fortsätter. email_reject_invalid_post_specified: title: "Emailet avslås ogiltigt inlägg specificerat" - subject_template: "[%{site_name}] E-postfel -- Inläggsfel" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. @@ -1582,49 +1549,42 @@ sv: Om du kan åtgärda problemet, var vänlig försök igen. email_reject_invalid_post_action: title: "Emailet avslås ogiltigt inlägg" - subject_template: "[%{site_name}] E-postfel -- Ogiltig poståtgärd" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Poståtgärden kändes inte igen. Var vänlig försök igen, eller gör ett inlägg via hemsidan om problemet fortsätter. email_reject_reply_key: title: "Emailet avvisar svars nyckeln" - subject_template: "[%{site_name}] E-postfel -- Okänd svarsnyckel" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Svarsnyckeln i e-postmeddelandet är ogiltigt eller okänt, så vi vet inte vad det är e-postmeddelandet är ett svar till. Kontakta personal. email_reject_bad_destination_address: title: "Emailet avslås dålig mottagaradress" - subject_template: "[%{site_name}] E-postfel -- Okänd mottagaradress" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Inga av mottagaradresserna kunde identifieras. Var god se till att du skickar till en korrekt e-postadress tillhandahållen av personalen. email_reject_topic_not_found: title: "Emailet avslås ämnet fanns ej" - subject_template: "[%{site_name}] E-postfel -- Okänt ämne" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ämnet du försöker svara i finns inte längre, kanske har den raderats? Kontakta personal om du tror att det här är ett misstag. email_reject_topic_closed: title: "Emailet avslås ämnet är stängt" - subject_template: "[%{site_name}] E-postfel -- Ämne avstängt" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ämnet som du svarar i är för närvarande avstängt och tar inte emot svarsmeddelanden. Kontakta personal om du tror att det här är ett misstag. email_reject_auto_generated: title: "Emailet avslås detta är autogenererat" - subject_template: "[%{site_name}] E-postfel -- Autogenererat svar" text_body_template: | Tyvärr har ditt e-postmeddelande till %{destination} (med ämnet %{former_title}) inte kunnat skickas. Ditt e-postmeddelande har flaggats som "autogenererat", vilket betyder att e-postmeddelandet är skapat av en dator och inte skrivet av en människa. Vi kan tyvärr inte acceptera den typen av e-post. Kontakta personal om du tror att det här är ett misstag. email_error_notification: title: "Email felmeddelanden" - subject_template: "[%{site_name}] E-postfel -- POP autentisieringsfel" text_body_template: | Tyvärr uppstod ett autentiseringsproblem vid sökningen efter e-post från POP-servern. @@ -1757,7 +1717,6 @@ sv: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "Användare invitera personligt" - subject_template: "[%{site_name}] %{username} har bjudit in dig till en privat konversation '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1765,7 +1724,6 @@ sv: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} bjöd in dig till ett meddelande '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1774,7 +1732,6 @@ sv: %{respond_instructions} user_invited_to_topic: title: "Användare inviterad till ämnet" - subject_template: "[%{site_name}] %{username} bjöd in dig till '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1783,7 +1740,6 @@ sv: %{respond_instructions} user_replied: title: "Användare svarade" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1794,7 +1750,6 @@ sv: %{respond_instructions} user_replied_pm: title: "Användare svarade personligen" - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1805,7 +1760,6 @@ sv: %{respond_instructions} user_quoted: title: "Användare citerade" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1816,7 +1770,6 @@ sv: %{respond_instructions} user_linked: title: "Användares länk" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1827,7 +1780,6 @@ sv: %{respond_instructions} user_mentioned: title: "Användare som nämns" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1838,7 +1790,6 @@ sv: %{respond_instructions} user_group_mentioned: title: "Användargrupp som nämns" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1849,7 +1800,6 @@ sv: %{respond_instructions} user_posted: title: "Användare publicerade" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1860,7 +1810,6 @@ sv: %{respond_instructions} user_watching_first_post: title: "Användare bevakar första inlägget" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1870,7 +1819,6 @@ sv: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1898,13 +1846,11 @@ sv: join_the_discussion: "Läs mer" popular_posts: "Populära meddelanden" more_new: "Nytt för er" - subject_template: "[%{site_name}] Sammanfattning" unsubscribe: "Den här sammanfattningen har skickats från %{site_link} där vi inte har sett dig på ett tag. För att säga upp dig %{unsubscribe_link}." click_here: "klicka här" from: "%{site_name} sammanfattning" mailing_list: why: "All aktivitet på %{site_link} den %{date}" - subject_template: "[%{site_name}] Sammanfattning för %{date}" unsubscribe: "Den här sammanfattningen skickas dagligen eftersom att utskicksläge är aktiverat. För att säga upp dig {unsubscribe_link}." from: "%{site_name} sammanfattning" new_topics: "Nya ämnen" @@ -1913,7 +1859,6 @@ sv: back_to_top: "Tillbaka till början" forgot_password: title: "Glömt lösenord" - subject_template: "[%{site_name}] Återställning av lösenord" text_body_template: | Någon bad om att få återställa ditt lösenord på [%{site_name}](%{base_url}). @@ -1923,7 +1868,6 @@ sv: %{base_url}/users/password-reset/%{email_token} set_password: title: "Välj lösenord" - subject_template: "[%{site_name}] Ange lösenord" text_body_template: | Någon har begärt att lägga till ett lösenord till ditt konto på [%{site_name}](%{base_url}). Du kan också logga in genom att använda någon av våra alternativa onlinetjänster (Google eller Facebook) som är kopplat till din validerade e-postadress. @@ -1933,7 +1877,6 @@ sv: %{base_url}/users/password-reset/%{email_token} admin_login: title: "Administratörs login" - subject_template: "[%{site_name}] Logga in" text_body_template: | Någon bad om att få återställa ditt lösenord på [%{site_name}](%{base_url}). @@ -1943,7 +1886,6 @@ sv: %{base_url}/users/password-reset/%{email_token} account_created: title: "Konto skapat" - subject_template: "[%{site_name}] Ditt nya konto" text_body_template: | Ett nytt konto har skapats för dig på %{site_name} @@ -1951,14 +1893,12 @@ sv: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "Bekräfta den nya emailadressen" - subject_template: "[%{site_name}] Bekräfta din nya e-postadress" text_body_template: | Bekräfta din nya e-postadress för %{site_name} genom att klicka på länken nedanför: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "Bekräfta den gamla email adressen" - subject_template: "[%{site_name}] Bekräfta din nuvarande e-postadress" text_body_template: | Vänligen bekräfta att du kontrollerar den här e-postadressen innan vi ändrar din e-postadress. @@ -1967,7 +1907,6 @@ sv: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "Meddela gamla epostmeddelanden" - subject_template: "[%{site_name}] Din e-postadress har ändrats " text_body_template: | Det här är ett automatiserat meddelande för att informera dig om att din e-postadress för %{site_name} har ändrats. Var vänlig kontakta en administratör om det inte var din avsikt. @@ -1996,7 +1935,6 @@ sv: (Om du som ny användare behöver komma i kontakt med vår [personal](%{base_url}/about), svara bara på detta meddelande.) signup: title: "Bli medlem" - subject_template: "[%{site_name}] Verifiera ditt nya konto" text_body_template: | Välkommen till %{site_name}! @@ -2067,106 +2005,6 @@ sv: Redigera det första inlägget i det här ämnet för att ändra innehållet i %{page_name} sidan. guidelines_topic: title: "FAQ/Riktlinjer" - body: |+ - - - ## [Det här är ett civiliserat forum för allmän diskussion](#civilized) - - Var snäll och behandla det här diskussionsforumet med samma respekt som du skulle en allmän park. Vi är också ett samhälle och en plats för att dela kompetens, kunskap och intresse genom fortgående konversationer. - - Det som följer är inte fasta regler utan snarare hjälpmedel till det mänskliga bedömandet av forumet. Använd de här riktlinjerna för att hålla forumet städat, välupplyst och en plats för civiliserad diskussion. - - - - ## [Förbättra diskussionen](#improve) - - Hjälp oss göra det här till en fantastisk plats för diskussion genom att alltid medverka till att förbättra diskussionen på något sätt, oavsett hur litet. Om du inte är säker på hur ditt inlägg bidrar till diskussionen, fundera över vad du vill ha sagt och försök igen senare. - - Ämnena som diskuteras här är av betydelse för oss, och vi vill att du beter dig som att de har betydelse också för dig. Var respektful mot ämnena och personerna som diskuterar dem, även om du inte håller med en del av det som har sagts. - - Ett sätt att främja diskussionen är genom att upptäcka de som redan äger rum. Var snäll och ta litet tid till att bläddra igenom ämnen här innan du svarar eller startar egna så kommer du ha en bättre chans att träffa andra som delar dina intressen. - - - - ## [Var angenäm, även när du inte håller med](#agreeable) - - Du kanske vill svara på något genom att visa att du inte håller med det som står. Det är okej, men kom ihåg att _kritisera idéer, inte människor_. Försök undvika: - - * Smutskastande. - * Ad hominem attacker. - * Att svara på ett inläggs ton istället för det faktiska innehållet. - * Ogenomtänkta motsägelser. - - Försök istället komma med förnuftiga motargument som förbättrar diskussionen. - - - - ## [Din medverkan spelar roll](#participate) - - Konversationerna vi har här sätter tonen för alla. Hjälp oss influera framtiden för det här forumet genom att välja hur vi engagerar oss i diskussioner som gör det här forumet till ett intressant ställe att vara på — och undviker dem som inte gör det. - - Discourse tillhandahåller verktyg som möjliggör att forumet kollektivt kan identifiera de bästa (och sämsta) insatserna: favoriter, bokmärken, gillningar, flaggningar, inlägg, redigeringar och så vidare. Använd de här verktygen för att förbättra din egen upplevelse, och alla andras också. - - Försök att lämna den här parken lite bättre än när vi hittade den. - - - - ## [Om du ser ett problem, flagga det](#flag-problems) - - Moderatorer har speciell auktoritet, de är ansvariga för det här forumet. Det är dock också du. Med din hjälp kan moderatörerna vara samhällshjälpredor, inte bara vaktmästare eller polis. - - När du ser dåligt beteende, svara inte. Det uppmuntrar det dåliga beteendet genom att uppmärksamma det. Det konsumerar också din energi och slösar allas tid. _Flagga det bara_. Om tillräckligt många flaggningar tillkommer så kommer det leda till handling, antingen automatiskt eller en moderators ingripande. - - För att upprätthålla forumet så reserverar moderatorerna rätten att ta bort allt material och alla användarkonton för alla skäl vid alla tillfällen. Moderatorer kontrollerar inte nya inlägg på något sätt, moderatorer och sidansvariga hålls inte ansvariga för något innehåll upplagt av användarna. - - - - ## [Var alltid hövlig](#be-civil) - - Ingenting saboterar hälsosamma konversationer som oförskämdhet: - - * Var hövlig. Skriv ingenting här som en förnuftig människa skulle tycka var stötande, kränkande eller hotfullt. - * Håll det rent. Lägg inte upp något här som är obscent eller sexuellt anstötande. - * Respektera varandra. Ofreda ingen, ge dig inte ut för att vara någon annan och röj inte känslig information om någon. - * Respektera forumet. Spamma inte, eller på något annat sätt vandalisera forumet. - - Dessa är inte konkreta termer med precisa definitioner — undvik ens _framställningen_ av någon av de här sakerna. Om du är osäker, fråga dig själv hur du skulle känna om ditt inlägg var presenterat på framsidan av New York Times eller liknande. - - Det här är ett publikt forum och söktjänster indexerar de här diskussionerna. Håll språket, länkarna och bilderna säkra för familj och vänner. - - - - ## [Håll det rent](#keep-tidy) - - Försök att lägga saker på rätt plats, så att vi kan lägga mer tid på att diskutera och mindre på att städa upp. - - * Starta inte ämnen i fel kategori. - * Skriv inte identiska inlägg i flera ämnen. - * Skriv inte inlägg utan substans. - * Omdirigera inte ett ämne genom att ändra det mitt i. - * Signera inte dina inlägg — varje inlägg har din profilinformation anslutit till sig. - - Istället för att skriva ett inlägg med “+1” eller “Håller med”, använd gilla-knappen. Istället för att driva ett ämne åt ett helt annat håll, använd Svara som ett länkat ämne. - - - - ## [Skriv bara dina egna tankar](#stealing) - - Det är inte accepterat att lägga upp något digitalt som tillhör någon annan utan tillåtelse. Du får inte lägga upp beskrivningar av, länkar till eller metoder för att stjäla någons immateriella egendom (mjukvara, video, audio, bilder), eller för att bryta mot någon annan lag. - - - - ## [Driven av användarna](#power) - - Den här hemsidan är driven av er [vänliga personal](/about) och *er*, användarna. Om du har några ytterligare frågor om hur saker borde fungera här, starta ett nytt ämne i [site feedback-kategorin](/c/site-feedback) så kan vi diskutera saken! Om det finns något kritiskt eller brådskande ärende som inte kan hanteras av en metadiskussion eller en flaggning så kan du kontakta oss via [om oss-sidan](/about). - - - - ## [Användarvillkor](#tos) - - Ja, vi vet att juristspråk är tråkigt men vi måste skydda oss själva – och i förlängningen du och din data – mot otrevliga människor. Vi har [användarvillkor](/tos) som beskriver din (och våra) uppföranden och rättigheter relaterat till innehåll, integritet och lagar. För att använda den här tjänsten måste du samtycka till våra [användarvillkor](/tos). - - tos_topic: title: "Villkor" privacy_topic: diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml index 30ff3e5557..995795f619 100644 --- a/config/locales/server.te.yml +++ b/config/locales/server.te.yml @@ -471,7 +471,6 @@ te: post_edit_time_limit: "రచయిత వారు చేసిన టపా (n) నిమిషాల తర్వాత సవరించవచ్చు లేదా తొలగించవచ్చు. ఎప్పటికీ 0 అమర్చుము." max_image_width: "ఒక టపాలో థంబ్నైల్ గరిష్ట వెడల్పు" max_image_height: "ఒక టపాలో థంబ్నైల్ గరిష్ట ఎత్తు" - show_subcategory_list: "ఒక అంశం జాబితా వర్గంలో నమోదు చేసేటప్పుడు బదులుగా ఉపవర్గం జాబితా చూపించు." post_excerpt_maxlength: "ఒక టపా సంగ్రహం/సారాంశం గరిష్ట పొడవు." allow_moderators_to_create_categories: "మధ్యవర్తులు కొత్త వర్గాలు సృష్టించడానికి అనుమతించు" topics_per_period_in_top_summary: "అప్రమేయ అగ్ర విషయాల సారాంశంలో చూపే అగ్ర విషయాల సంఖ్య." @@ -542,12 +541,8 @@ te: subject_template: "%{site_name} కు సుస్వాగతం!" user_notifications: previous_discussion: "గత జవాబులు" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" digest: click_here: "ఇక్కడ క్లిక్ చేయండి" - account_created: - subject_template: "[%{site_name}] మీ కొత్త ఖాతా" page_not_found: popular_topics: "ప్రముఖ" recent_topics: "తాజా" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 6f2827dafc..5f02044348 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -317,7 +317,6 @@ tr_TR: pms_per_day: "Bugün oluşturabileceğiniz en fazla ileti sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin." create_like: "Bugün yapabileceğiniz en fazla beğeni sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin." create_bookmark: "Bugün yapabileceğiniz en fazla imleme sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin." - edit_post: "Bugün yapabileceğiniz en fazla düzenleme sayısına ulaştınız. Lütfen tekrar denemek için %{time_left} bekleyin." live_post_counts: "Canlı gönderi sayımları için çok hızlı istek yapıyorsunuz. Lütfen tekrar denemeden önce %{time_left} bekleyin." unsubscribe_via_email: "Günlük e-posta ile abonelikten çıkma limitinizi aştınız. Lütfen tekrar denemeden önce %{time_left} bekleyin." hours: @@ -673,7 +672,6 @@ tr_TR: delete_removed_posts_after: "Yazar tarafından kaldırılan gönderiler (n) saat sonra otomatik olarak silinecektir. 0 olarak ayarlanırsa, gönderiler beklemeden hemen silinir." max_image_width: "Bir gönderideki küçük resimlerin en fazla genişliği" max_image_height: "Bir gönderideki küçük resimlerin en fazla yüksekliği" - category_featured_topics: "/categories sayfasında yer alan kategori başına düşen konu sayısı. Bu değeri değiştirirseniz, değişikliğin kategoriler sayfasına yansıması 15 dakika kadar sürebilir." fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler etkinlik sırasına göre listelenir. " fixed_category_positions_on_create: "Seçerseniz, konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)." add_rel_nofollow_to_user_content: "İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri \"rake post:rebake\" ile yeniden işlemeniz gerekir." @@ -724,7 +722,6 @@ tr_TR: ga_universal_tracking_code: "Google Universal Analytics (analytics.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics" ga_universal_domain_name: "Google Universal Analytics (analytics.js) alan adı, ör: mysite.com; bakınız http://google.com/analytics" enable_escaped_fragments: "Eğer bir ağ gezgini tespit edilmezse Google'ın Ajax-Crawling API'sine dönün. Dahası için şuraya bakın : https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "Noscript etiketi üzerinden standart webcrawler arama motoru desteğini etkinleştir" allow_moderators_to_create_categories: "Moderatörlerin yeni kategoriler oluşturmasına izin ver" cors_origins: "Cross-origin isteklerin (CORS) izin verilen originler. Her origin http:// veya https:// içermeli. CORS'u etkinleştirebilmek için DISCOURSE_ENABLE_CORS env değişkeni doğru olarak ayarlanmalı." use_admin_ip_whitelist: "Yöneticiler, sadece Taranmış IP listesinde tanımlanmış bir IP adresinden erişim sağlıyorlarsa giriş yapabilirler. (Yönetici > Kayıtlar > Taranmış IP'ler)" @@ -760,7 +757,6 @@ tr_TR: invite_passthrough_hours: "Daha önce kabul edilmiş davetiye anahtarının kullanım süresi, saat olarak" invite_only: "Herkese açık kayıt sistemi devre dışı bırakıldı, tüm yeni kullanıcıların bir üye ya da görevli tarafından davet edilmesi gerekir. " login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme." - reserved_usernames: "Kayıt için izin verilmeyen kullanıcı adları." min_password_length: "Parolanın en az uzunluğu." min_admin_password_length: "Yönetici için parolanın en az uzunluğu." block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme." @@ -1087,10 +1083,6 @@ tr_TR: change_owner: post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı" deleted_user: "silinmiş kullanıcı" - emoji: - errors: - name_already_exists: "Üzgünüz, '%{name}' ismi zaten bir başka emoji tarafından kullanılıyor." - error_while_storing_emoji: "Üzgünüz, emoji kaydedilirken bir hata oluştu." topic_statuses: archived_enabled: "Konu şimdi arşivlendi. Donduruldu ve herhangi bir şekilde değişiklik yapılamaz." archived_disabled: "Konu şimdi arşivden çıkarıldı. Artık donmuş değil, değiştirilebilir." @@ -1167,13 +1159,6 @@ tr_TR: other: "İlgilenilmesi gereken %{count} bildirim var" unsubscribe_mailer: subject_template: "%{site_title} üzerinden daha fazla e-posta güncellemesi almak istemediğinizi onaylayın" - text_body_template: | - Birisi (galiba siz?) bundan sonra %{site_domain_name} adresinden daha fazla e-posta bildirimi almamak için istekte bulundu. - Eğer bunu onaylıyorsanız, lütfen bağlantıya tıklayın: - - %{confirm_unsubscribe_link} - - Eğer e-posta bildirimlerini almaya devam etmek istiyorsanız, bu e-postayı görmezden gelin. invite_mailer: subject_template: "%{invitee_name} sizi %{site_domain_name} sitesindeki '%{topic_title}' adlı konuya davet etti. " custom_invite_mailer: @@ -1191,10 +1176,7 @@ tr_TR: %{base_url}/users/password-reset/%{email_token} (Eğer yukarıdaki bağlantının süresi dolmuşsa e-posta adresinizle giriş yaparken "Parolamı unuttum" bağlantısına tıklayınız.) - test_mailer: - subject_template: "[%{site_name}] E-posta Ulaştırma Testi" new_version_mailer: - subject_template: "[%{site_name}] Yeni Discourse sürümü, güncelleme var" text_body_template: | Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır! @@ -1207,7 +1189,6 @@ tr_TR: - Yeniliklerden haberdar olmak, tartışmak ve destek almak için [meta.discourse.org](https://meta.discourse.org) adresini ziyaret edin new_version_mailer_with_notes: - subject_template: "[%{site_name}] güncellemesi var" text_body_template: | Yuhaaa, [Discourse](http://www.discourse.org) için yeni bir sürüm hazır! @@ -1223,9 +1204,6 @@ tr_TR: ### Sürüm notları %{notes} - queued_posts_reminder: - subject_template: - other: "[%{site_name}] %{count} konu incelenmeyi bekliyor." flag_reasons: off_topic: "Gönderiniz **konu-dışı** olarak bildirildi: topluluk, gönderinizin konu başlığı ve ilk gönderi ile tanımlanan konu içeriğine uygun olmadığını düşünüyor. " inappropriate: "Gönderiniz **uygunsuz** olarak bildirildi: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](/guidelines) aykırı olduğunu düşünüyor." @@ -1319,22 +1297,7 @@ tr_TR: csv_export_failed: subject_template: "Dışarı veri aktarımı başarısız oldu" text_body_template: "Üzgünüz, dışarı veri aktarımı başarısız oldu. Lütfen kayıtları inceleyin veya bir görevli ile iletişime geçin." - email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] E-posta sorunu -- Yetersiz Güven Seviyesi" - email_reject_user_not_found: - subject_template: "[%{site_name}] E-posta sorunu -- Kullanıcı Bulunamadı" - email_reject_screened_email: - subject_template: "[%{site_name}] E-posta sorunu -- Engellenen E-posta" - email_reject_inactive_user: - subject_template: "[%{site_name}] E-posta sorunu -- Edilgen Kullanıcı" - email_reject_blocked_user: - subject_template: "[%{site_name}] E-posta sorunu -- Engellenen Kullanıcı" - email_reject_reply_user_not_matching: - subject_template: "[%{site_name}] E-posta sorunu -- Beklenmeyen Cevap Adresi" - email_reject_no_account: - subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Hesap" email_reject_empty: - subject_template: "[%{site_name}] E-posta sorunu -- İçerik Yok" text_body_template: | Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başarısız oldu. @@ -1342,31 +1305,8 @@ tr_TR: Eğer bu iletiyi alıyorsanız ve cevap eklediyseniz, daha basit bir biçimleme ile yeniden deneyin. email_reject_parsing: - subject_template: "[%{site_name}] E-posta sorunu -- İçerik Tanınamadı" text_body_template: | Üzgünüz, ama %{destination} (titled %{former_title}) adresine göndermeye çalıştığınız e-posta başırısız oldu. E-postada herhangi bir cevap bulamadık. **Cevabınızın e-posta'nın en üstünde yer aldığından emin olun** -- aralardaki cevapları işleyemiyoruz. - email_reject_invalid_access: - subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz giriş" - email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz İzin" - email_reject_invalid_post: - subject_template: "[%{site_name}] E-posta sorunu -- Gönderme hatası" - email_reject_invalid_post_specified: - subject_template: "[%{site_name}] E-posta sorunu -- Gönderim hatası" - email_reject_invalid_post_action: - subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz Gönderi Eylemi" - email_reject_reply_key: - subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Cevap Anahtarı" - email_reject_bad_destination_address: - subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen: Adres" - email_reject_topic_not_found: - subject_template: "[%{site_name}] E-posta sorunu -- Konu Bulunamadı" - email_reject_topic_closed: - subject_template: "[%{site_name}] E-posta sorunu -- Konu Kapatıldı" - email_reject_auto_generated: - subject_template: "[%{site_name}] E-posta sorunu -- Otomatik Üretilmiş Cevap" - email_error_notification: - subject_template: "[%{site_name}] E-posta sorunu -- POP doğrulama hatası" too_many_spam_flags: subject_template: "Yeni hesap askıda" text_body_template: | @@ -1452,7 +1392,6 @@ tr_TR: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} sizi bir iletiye davet etti '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1460,7 +1399,6 @@ tr_TR: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} sizi bir iletiye davet etti '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1468,7 +1406,6 @@ tr_TR: %{respond_instructions} user_invited_to_topic: - subject_template: "[%{site_name}] %{username} sizi konuya davet etti '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1476,7 +1413,6 @@ tr_TR: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1486,7 +1422,6 @@ tr_TR: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [ÖM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1496,7 +1431,6 @@ tr_TR: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1506,7 +1440,6 @@ tr_TR: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1516,7 +1449,6 @@ tr_TR: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1526,7 +1458,6 @@ tr_TR: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1536,7 +1467,6 @@ tr_TR: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1546,7 +1476,6 @@ tr_TR: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1556,7 +1485,6 @@ tr_TR: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [ÖM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1580,13 +1508,11 @@ tr_TR: follow_topic: "Bu konuyu takip et" join_the_discussion: "Devamını Oku" popular_posts: "Gözde Gönderiler" - subject_template: "[%{site_name}] Özeti" unsubscribe: "Bir süredir görünmediğiniz için bu e-posta size %{site_link} topluluğundan gönderildi. Bu e-postaları almak istemiyorsanız %{unsubscribe_link}." click_here: "buraya tıklayın" from: "%{site_name} özeti" preheader: "%{last_seen_at} tarihindeki ziyaretinizden bu yana olanların kısa bir özeti" mailing_list: - subject_template: "[%{site_name}] %{date} Özeti " unsubscribe: "Bu günlük e-posta size %{site_link} topluluğundan duyuru listesi modunu etkin yaptığınız için gönderildi. Bu e-postaları almak istemiyorsanız %{unsubscribe_link}." from: "%{site_name} özeti" new_topics: "Yeni konular" @@ -1594,7 +1520,6 @@ tr_TR: view_this_topic: "Bu konuyu görüntüle" back_to_top: "Başa dön" forgot_password: - subject_template: "[%{site_name}] Parola sıfırlama" text_body_template: | [%{site_name}](%{base_url}) sitesinde, biri parolanızın sıfırlanması için talepte bulundu. @@ -1603,7 +1528,6 @@ tr_TR: Yeni parola oluşturmak için aşağıdaki bağlantıya tıklayın: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Parola Oluşturun" text_body_template: | Biri, [%{site_name}](%{base_url}) sitesindeki hesabınıza parola ekleme talebinde bulundu. Dilerseniz, bu doğrulanmış e-posta hesabınızla eşleşen, desteklediğiniz herhangi bir çevrimiçi servisi (Google, Facebook, vs.) kullanarak da giriş yapabilirsiniz. @@ -1612,7 +1536,6 @@ tr_TR: Parola oluşturmak için aşağıdaki bağlantıya tıklayın: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Giriş" text_body_template: | [%{site_name}](%{base_url}) sitesinde, biri hesabınıza giriş yapmaya talebinde bulundu. @@ -1621,19 +1544,16 @@ tr_TR: Giriş yapmak için aşağıdaki bağlantıya tıklayın: %{base_url}/users/password-reset/%{email_token} account_created: - subject_template: "[%{site_name}] Yeni Hesabınız" text_body_template: | %{site_name} sitesinde sizin için yeni bir hesap oluşturuldu. Yeni hesabınıza ait bir parola oluşturmak için aşağıdaki bağlantıya tıklayın: %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Yeni mail adresinizi onaylayın" text_body_template: | %{site_name} adresindeki yeni e-posta adresinizi aşağıdaki bağlantıya tıklayarak doğrulayın %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Şimdiki e-posta adresinizi doğrulayın" text_body_template: | E-posta adresinizi değiştirmeden önce, şu anki e-posta adresinizin kontrolünün sizde olduğunu doğrulamamız gerekiyor. Bu adımı tamamlandıktan sonra, yeni e-posta adresinizi doğrulayacaksınız. @@ -1641,7 +1561,6 @@ tr_TR: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] E-posta adresiniz değiştirildi" text_body_template: | Bu %{site_name} forumunda kullandığınız e-posta adresinizin değiştiğini bildiren otomatik bir iletidir. Bir hata olduğunu düşünüyorsanız lütfen @@ -1669,7 +1588,6 @@ tr_TR: (Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu iletiyi cevaplamanız yeterli.) signup: - subject_template: "[%{site_name}] Yeni hesabınızı onaylayın" text_body_template: | %{site_name} topluluğuna hoş geldiniz! @@ -2027,7 +1945,6 @@ tr_TR: placeholder: "http://www.ornek.com/iletisim" site_contact: label: "Otomatik İletiler" - description: "Discourse tarafından gönderilen tüm otomatik kişisel iletiler bu kullanıcı tarafından gönderilecek. Daha da önemlisi, kullanıcılara gidecek olan hoş geldiniz mesajları da bu kullanıcı tarafından gönderilecek." corporate: fields: company_short_name: diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml index ebdab566a6..20c0e16d37 100644 --- a/config/locales/server.uk.yml +++ b/config/locales/server.uk.yml @@ -310,7 +310,6 @@ uk: unique_posts_mins: "How many minutes before a user can make a post with the same content again" queue_jobs: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! За замовчуванням, додавати завдання до черги в sidekiq. Якщо вимкнути, Ваш сайт зламається." crawl_images: "Отримувати зображення з віддалених адрес, щоб встановити правильні розміри ширини і висоти." - category_featured_topics: "Кількість тем на одну категорію, що показуються на сторінці /categories. Після зміни цього значення, оновлення категорій займе до 15 хвилин." apple_touch_icon_url: "Піктограма, що використовується для сенсорних пристроїв Apple. Рекмоендований розмір 144px на 144px." email_custom_headers: "Список заголовків електронної пошти, розділених вертикальною рискою" enable_long_polling: "Message bus used for notification can use long polling" @@ -318,7 +317,6 @@ uk: notify_mods_when_user_blocked: "Якщо користувача автоматично заблоковано, надіслати повідомлення всім модераторам." ga_universal_tracking_code: "Код відстеження Google Universal Analytics (analytics.js), напр.: UA-12345678-9; див. http://google.com/analytics" ga_universal_domain_name: "Доменне ім'я Google Universal Analytics (analytics.js), напр.: mysite.com; див. http://google.com/analytics" - enable_noscript_support: "Увімкнути стандартну підтримку пошукових роботів через теґ noscript" post_menu: "Визначає, які елементи з'являються в меню допису, та в якому порядку. Наприклад, like|edit|flag|delete|share|bookmark|reply" track_external_right_clicks: "Track external links that are right clicked (eg: open in new tab) disabled by default because it rewrites URLs" port: "ТІЛЬКИ ДЛЯ РОЗРОБНИКІВ! УВАГА! Використовувати цей HTTP-порт замість звичайного порту 80. Лишіть порожнім, щоб використовувати значення за замовчуванням 80." @@ -405,10 +403,6 @@ uk: email: not_allowed: "is not allowed from that email provider. Please use another email address." blocked: "не допускається." - test_mailer: - subject_template: "[%{site_name}] Тест доставки електронної пошти" - new_version_mailer_with_notes: - subject_template: "оновлення [%{site_name}] доступно" system_messages: welcome_user: subject_template: "Ласкаво просимо до сайта %{site_name}!" @@ -431,20 +425,9 @@ uk: title: "Відпісатися" description: "Не зацікавлені в отриманні цих листів? Немає проблем! Натисніть нижче, щоб відписатися назавжди:" posted_by: "Опубліковано %{username} %{post_date}" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [ПП] %{topic_title}" digest: click_here: "натисніть тут" forgot_password: - subject_template: "[%{site_name}] Скидання пароля" text_body_template: | Хтось попросив скинути Ваш пароль на сайті [%{site_name}](%{base_url}). @@ -453,7 +436,6 @@ uk: Перейдіть за посиланням, щоб обрати новий пароль: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Встановлення пароля" text_body_template: | Хтось попросив додати пароль до Вашого облікового запису на сайті [%{site_name}](%{base_url}). Замість цього, Ви можете входити в систему, використовуючи будь-який із підтримуваних онлайн-сервісів (Google, Facebook, і т. ін.), який поєднаний із цією перевіреною електронною скринькою. diff --git a/config/locales/server.vi.yml b/config/locales/server.vi.yml index 429fda5a49..5789578a5c 100644 --- a/config/locales/server.vi.yml +++ b/config/locales/server.vi.yml @@ -315,7 +315,6 @@ vi: pms_per_day: "Bạn vừa đạt tới số lần gửi tin nhắn tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại." create_like: "Bạn vừa đạt tới số lần tối đa được Like trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại." create_bookmark: "Bạn vừa đạt tới số lần đánh dấu tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại." - edit_post: "Bạn vừa đạt tới số lần chỉnh sửa tối đa trong ngày. Xin vui lòng chờ %{time_left} trước khi thử lại." live_post_counts: "Bạn đang yêu cầu bộ đếm bài viết quá nhanh, hãy đợi %{time_left} trước khi thử lại." unsubscribe_via_email: "Bạn đã vượt quá số lần hủy nhận tin qua email của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại." topic_invitations_per_day: "Bạn đã vượt quá số lần mời chủ đề của ngày hôm nay, hãy đợi %{time_left} trước khi thử lại." @@ -653,7 +652,6 @@ vi: delete_removed_posts_after: "Bài viết đã được xóa bởi tác giả sẽ được tự động xóa sau (n) giờ. Nếu cài là 0, bài viết sẽ được xóa ngay lập tức." max_image_width: "Chiều rộng tối đa của ảnh thu nhỏ trong bài viết." max_image_height: "Chiều cao tối đa của ảnh thu nhỏ trong bài viết." - category_featured_topics: "Số chủ đề hiện thị mỗi danh mục trong trang /categories. Sau khi thay đổi giá trị này, nó sẽ mất khoảng 15 phút để trang danh mục cập nhật." fixed_category_positions: "Nếu được bật, bạn sẽ có thể sắp xếp chuyên mục theo một thứ tự cố định. Nếu không bật, chuyên mục sẽ được sắp xếp theo thứ tử hoạt động." fixed_category_positions_on_create: "Nếu chọn, sắp xếp danh mục sẽ được thực hiện trong cửa sổ tạo chủ đề (yêu cầu fixed_category_positions)." add_rel_nofollow_to_user_content: "Thêm rel='nofollow' cho tất cả các nội dung mà người dùng gửi, ngoại trừ các liên kết nội bộ (của tên miền chính). Nếu thay đổi, bạn phải thực hiện lại cho tất cả các bài viết với: \"rake posts:rebake\"" @@ -693,7 +691,6 @@ vi: pending_users_reminder_delay: "Thông báo cho quản trị viên nếu thành viên mới đã chờ duyệt lâu hơn số giờ được thiết lập ở đây, đặt là -1 để tắt thông báo." ga_universal_tracking_code: "Mã theo dõi Google Universal Analytics (analytics.js) , Ví dụ: UA-12345678-9; chi tiết http://google.com/analytics" ga_universal_domain_name: "Tên miền Google Universal Analytics (analytics.js), ví dụ: mysite.com; chi tiết http://google.com/analytics" - enable_noscript_support: "Cho phép webcrawler search engine chuẩn hỗ trợ bằng thẻ noscript" allow_moderators_to_create_categories: "Cho phép điều hành viên tạo danh mục mới" cors_origins: "Cho phép CORS (Cross-Origin Requests). Mỗi nguyên gốc phải kèm theo http:// hoặc https://. Biến env DISCOURSE_ENABLE_CORS phải được đặt là 'true' để bật CORS." use_admin_ip_whitelist: "Admin chỉ có thể đăng nhập nếu có địa chỉ IP được định nghĩa trước trong danh sách Screened IPs (Admin > Logs > Screened Ips)." @@ -727,7 +724,6 @@ vi: invite_passthrough_hours: "Bao lâu người dùng có thể sử dụng mã lời mời trước đó để đăng nhập, theo giờ" invite_only: "Đăng ký tự do đã khóa, tất cả người dùng phải được mời bởi những thành viên khác hoặc nhân viên." login_required: "Yêu cầu chứng thực để đọc nội dung trên trang web, không cho phép người dùng nặc danh truy cập." - reserved_usernames: "Những username không được phép đăng ký." min_password_length: "Chiều dài mật khẩu tối thiểu." min_admin_password_length: "Chiều dài mật khẩu tối thiểu đối với Admin." block_common_passwords: "Không cho phép mật khẩu trong danh sách 10.000 mật khẩu phổ biến." @@ -1039,10 +1035,6 @@ vi: change_owner: post_revision_text: "Chuyển quyền sở hữu từ %{old_user} sang %{new_user}" deleted_user: "xóa người dùng" - emoji: - errors: - name_already_exists: "Xin lỗi, tên '%{name}' đã được sử dụng bởi một emoji khác." - error_while_storing_emoji: "Xin lỗi, đã có lỗi xảy ra trong khi lưu emoji." topic_statuses: archived_enabled: "Chủ đề này được đưa vào lưu trữ. Nó sẽ không được sửa đổi nữa. " archived_disabled: "Chủ đề này được đưa khỏi lưu trữ. Nó có thể được sửa đổi." @@ -1116,14 +1108,6 @@ vi: other: "%{count} đánh dấu đang đợi xử lý" unsubscribe_mailer: subject_template: "Xác nhận bạn không còn muốn nhận email cập nhật từ %{site_title}" - text_body_template: | - Ai đó (có thể là bạn?) đã yêu cầu không muốn nhận email cập nhật từ %{site_domain_name} tới địa chỉ này. - Nếu bạn muốn xác nhận điều này, xin hãy click liên kết: - - %{confirm_unsubscribe_link} - - - Nếu bạn vẫn muốn tiếp tục nhận email cập nhật, xin hãy bỏ qua email này. invite_mailer: subject_template: "%{invitee_name} mời bạn tham gia chủ đề '%{topic_title}' trên %{site_domain_name}" invite_forum_mailer: @@ -1137,15 +1121,6 @@ vi: %{base_url}/users/password-reset/%{email_token} (Nếu liên kết trên hết hạn, bạn hãy chọn "Quên mật khẩu" khi đăng nhập với email của bạn). - test_mailer: - subject_template: "[%{site_name}] Email Thử Nghiệm" - new_version_mailer: - subject_template: "[%{site_name}] Phiên bản Discourse mới, cập nhật đã sẵn sàng" - new_version_mailer_with_notes: - subject_template: "[%{site_name}] cập nhật đã sẵn sàng" - queued_posts_reminder: - subject_template: - other: "[%{site_name}] %{count} bài viết đang chờ duyệt" flag_reasons: off_topic: "Bài viết của bạn được đánh dấu là **off-topic**: cộng đồng cảm thấy nó không phù hợp cho chủ đề này, được xác định bởi tiêu đề và bài viết đầu tiên." inappropriate: "Bài viết của bạn được đánh dấu là **inappropriate**: cộng đồng cảm thấy đó là sự xúc phạm, lăng mạ, hoặc vi phạm [nội quy diễn đàn](/guidelines)." @@ -1200,25 +1175,21 @@ vi: subject_template: "Xuất dữ liệu thất bại" text_body_template: "Chúng tôi xin lỗi, những dữ liệu bạn xuất bị lỗi. Vui lòng xem log hoặc liên hệ nhân viên." email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] Sự cố email -- Cấp độ tin cậy thiếu tin tưởng" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Tài khoản của bạn không đủ cấp độ tin cậy bắt buộc để gửi chủ đề mới tới địa chỉ email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_reject_user_not_found: - subject_template: "[%{site_name}] Sự cố email -- Không tìm thấy tài khoản" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Trả lời của bạn đã được gửi từ một địa chỉ email chưa rõ. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT. email_reject_inactive_user: - subject_template: "[%{site_name}] Sự cố email -- Thành viên không hoạt động" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Tài khoản của bạn liên kết với địa chỉ email này chưa được kích hoạt. Xin hãy kích hoạt tài khoản của bạn trước khi gửi email. email_reject_blocked_user: - subject_template: "[%{site_name}] Sự cố -- Thành viên bị chặn" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. @@ -1229,13 +1200,11 @@ vi: Trả lời của bạn đã được gửi từ một địa chỉ email khác với những gì chúng tôi mong đợi, chúng tôi nghĩ đây có thể là cùng một người. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT. email_reject_no_account: - subject_template: "[%{site_name}] Vấn đề Email -- Không xác định tài khoản" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Chúng tôi không tìm thấy tài khoản nào khớp với địa chỉ email của bạn. Xin hãy thử gửi với địa chỉ email khác, hoặc liên hệ với BQT. email_reject_empty: - subject_template: "[%{site_name}] Vấn đề Email -- Không có nội dung" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. @@ -1248,25 +1217,21 @@ vi: Chúng tôi không tìm thấy nội dung trả lời trong email của bạn. **Hãy đảm bảo rằng trả lời của bạn ở phía trên cùng của email** -- chúng tôi không thể xử lý các trả lời nội tuyến. email_reject_invalid_access: - subject_template: "[%{site_name}] Vấn đề Email -- truy cập không phù hợp" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Tài khoản của bạn không có quyền tạo chủ đề mới trong chuyên mục đó. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_reject_strangers_not_allowed: - subject_template: "[%{site_name}] Sự cố email -- Truy cập không phù hợp" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Chuyên mục bạn gửi email này tới chỉ chấp nhận trả lời từ các thành viên có tài khoản hợp lệ với các địa chỉ email rõ ràng. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_reject_invalid_post: - subject_template: "[%{site_name}] Sự cố email -- Lỗi gửi bài" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Một số nguyên nhân có thể là: định dạng phức tạp, nội dung quá nhiều, hoặc nội dung quá ít... xin hãy thử lại, hoặc gửi thông qua website. email_reject_invalid_post_specified: - subject_template: "[%{site_name}] Sự cố email -- Lỗi gửi bài" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. @@ -1276,43 +1241,36 @@ vi: Nếu bạn có thể khắc phục sự cố, xin hãy thử lại. email_reject_invalid_post_action: - subject_template: "[%{site_name}] Sự cố email -- Hành động gửi bài không hợp lệ" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Hành động gửi bài không được công nhận, bạn hãy thử lại hoặc gửi thông qua website. email_reject_reply_key: - subject_template: "[%{site_name}] Vấn đề Email -- Không xác định được key trả lời" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Khóa trả lời trong email là không hợp lệ hoặc không rõ, vì thế chúng tôi không thể hình dung ra email này gửi trả lời tới đâu. Xin hãy liên hệ với BQT. email_reject_bad_destination_address: - subject_template: "[%{site_name}] Sự cố email -- Không rõ địa chỉ Tới:" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Không có địa chỉ email người nhận được xác định, hãy chắc chắn rằng địa chỉ email bạn gửi tới là chính xác. email_reject_topic_not_found: - subject_template: "[%{site_name}] Vấn đề Email -- Không tìm thấy chủ đề" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Chủ đề bạn gửi trả lời không còn tồn tại -- có thể do đã được xóa? Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_reject_topic_closed: - subject_template: "[%{site_name}] Vấn đề Email -- Chủ đề đóng" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Chủ đề bạn gửi trả lời hiện đang đóng và không nhận gửi trả lời. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_reject_auto_generated: - subject_template: "[%{site_name}] Vấn đề Email -- Tự động tạo trả lời" text_body_template: | Xin lỗi, tin nhắn email bạn gửi tới %{destination} (tiêu đề %{former_title}) không được thực hiện. Email của bạn được đánh dấu là "tạo tự động", chúng tôi không chấp nhận các kiểu email này. Nếu bạn tin đây là lỗi, xin hãy liên hệ với BQT. email_error_notification: - subject_template: "[%{site_name}] Vấn đề Email -- chứng thực POP lỗi" text_body_template: | Thật không may, có một lỗi xác thực trong khi polling mail từ POP server. @@ -1386,28 +1344,6 @@ vi: tại > %{site_title} -- %{site_description} - user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} mời bạn trả lời thông điệp '%{topic_title}'" - user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} mời bạn xem '%{topic_title}'" - user_invited_to_topic: - subject_template: "[%{site_name}] %{username} mời bạn xem '%{topic_title}'" - user_replied: - subject_template: "[%{site_name}] %{topic_title}" - user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" - user_quoted: - subject_template: "[%{site_name}] %{topic_title}" - user_linked: - subject_template: "[%{site_name}] %{topic_title}" - user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" - user_posted: - subject_template: "[%{site_name}] %{topic_title}" - user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" user_posted_pm_staged: subject_template: "%{optional_re}%{topic_title}" digest: @@ -1418,7 +1354,6 @@ vi: view_this_topic: "Xem chủ đề này" back_to_top: "Trở lên trên" forgot_password: - subject_template: "[%{site_name}] Đặt lại mật khẩu" text_body_template: | Có người đã yêu cầu được đặt lại mật khẩu của bạn trên [%{site_name}](%{base_url}). @@ -1427,7 +1362,6 @@ vi: Click vào liên kết sau để chọn mật khẩu mới: %{base_url}/users/password-reset/%{email_token} set_password: - subject_template: "[%{site_name}] Đặt Mật khẩu" text_body_template: | Có người đã yêu cầu thêm mật khẩu vào tài khoản của bạn trên [%{site_name}](%{base_url}). Ngoài ra, bạn có thể đăng nhập sử dụng bất kỳ dịch vụ trực tuyến nào hỗ trợ (Google, Facebook,...) được liên kết với địa chỉ email này. @@ -1436,7 +1370,6 @@ vi: Click vào liên kết sau để chọn mật khẩu mới: %{base_url}/users/password-reset/%{email_token} admin_login: - subject_template: "[%{site_name}] Đăng nhập" text_body_template: | Có người đã yêu cầu đăng nhập vào tài khoản của bạn trên [%{site_name}](%{base_url}). @@ -1445,20 +1378,17 @@ vi: Click liên kết sau để đăng nhập: %{base_url}/users/admin-login/%{email_token} account_created: - subject_template: "[%{site_name}] Tài khoản mới" text_body_template: | Tài khoản mới cho bạn trên %{site_name} đã được tạo Click liên kết sau để chọn mật khẩu cho tài khoản của bạn: %{base_url}/users/password-reset/%{email_token} confirm_new_email: - subject_template: "[%{site_name}] Xác nhận địa chỉ email mới của bạn" text_body_template: | Xác nhận địa chỉ email mới của bạn trên %{site_name} bằng cách click liên kết sau: %{base_url}/users/authorize-email/%{email_token} confirm_old_email: - subject_template: "[%{site_name}] Xác nhận địa chỉ email hiện tại của bạn" text_body_template: | Trước khi thay đổi địa chỉ email của bạn, chúng tôi cần xác nhận rằng bạn kiểm soát địa chỉ email của tài khoản hiện tại. Sau khi hoàn thành bước này, bạn có thể xác nhận địa chỉ email mới. @@ -1466,7 +1396,6 @@ vi: %{base_url}/users/authorize-email/%{email_token} notify_old_email: - subject_template: "[%{site_name}] Địa chỉ email của bạn đã được thay đổi" text_body_template: | Đây là tin nhắn tự động để thông báo rằng địa chỉ email của bạn trên %{site_name} đã được thay đổi. Nếu điều này là không đúng, xin hãy liên hệ với BQT. @@ -1493,7 +1422,6 @@ vi: (Nếu bạn cần liên hệ với BQT [nhân viên quản trị](%{base_url}/about), bạn có thể gửi trả lời tin nhắn này). signup: - subject_template: "[%{site_name}] Xác nhận tài khoản mới của bạn" text_body_template: | Chào mừng bạn tham gia %{site_name}! @@ -1557,94 +1485,6 @@ vi: Sửa bài viết đầu tiên trong chủ đề này để thay đổi nội dung của trang %{page_name}. guidelines_topic: title: "FAQ/Hướng dẫn" - body: | - - - ## [Đây Là Một Cộng Đồng Thảo Luận Văn Minh](#civilized) - - Hãy thể hiện nếp sống văn minh ở cộng đồng này. Đây là một cộng đồng chia sẻ — kỹ năng, sự hiểu biết và sở thích thông qua đối thoại. - - Đây không phải là những quy tắc cứng nhắc, mà chỉ là những quy tắc được dùng để đánh giá. Bạn hãy sử dụng các hướng dẫn này để giúp giữ vững một cộng đồng lành mạnh, văn minh. - - - - ## [Nâng Cao Thảo Luận](#improve) - - Các chủ đề thảo luận ở đây là quan trọng với chúng tôi, và chúng tôi cũng muốn bạn coi đó là quan trọng. Hãy tôn trọng nội dung chủ đề và những người cùng tham gia thảo luận, ngay cả khi bạn không đồng ý với những gì đang thảo luận. - - Một cách để thảo luận là khám phá những gì đã xảy ra, hãy dành một chút thời gian duyệt xem các bài viết trước khi bạn gửi bài viết của mình. - - - - ## [Hãy Thoải Mái, Ngay Cả Khi Bạn Không Đồng Ý](#agreeable) - - Bạn có thể muốn trả lời một cái gì đó bởi không đồng ý, đó là điều tốt. Nhưng hãy nhớ không được chỉ trích quan điểm của người khác. Hãy tránh: - - * Chửi rủa. - * Chống đối nhau. - * Đối phó với giọng điệu của bài viết thay vì nội dung thực của bài viết. - * Sự mâu thuẫn. - - Thay vào đó, bạn hãy cung cấp lập luận để cải thiện cuộc trò chuyện. - - - - ## [Đếm Sự Tham Gia Của Bạn](#participate) - - Discourse cung cấp các công cụ để giúp cộng đồng xác định đóng góp tốt nhất (cũng như tồi nhất): yêu thích, đánh dấu, gắn cờ, trả lời, sửa,... Các công cụ này được sử dụng để cải thiện kinh nghiệm của riêng bạn, và của mọi người khác. - - - - ## [Nếu Bạn Thấy Có Vấn Đề, Hãy Đánh Dấu](#flag-problems) - - Khi bạn nhìn thấy một hành vi xấu, đừng trả lời, hãy gắn cờ nó. Nếu đủ cờ tích luỹ, hành động sẽ được thực hiện, hoặc là tự động hoặc bằng cách can thiệp điều tiết. - - Để duy trì cộng đồng, BQT có quyền loại bỏ bất cứ nội dung nào cũng như bất kỳ tài khoản người dùng nào vì bất cứ lý do và bất cứ lúc nào. BQT không chịu trách nhiệm cho bất kỳ nội dung nào được đăng bởi cộng đồng. - - - - ## [Tuân Thủ Pháp Luật](#be-civil) - - Không có gì phá hoại một cuộc trò chuyện mạnh bằng sự thô lỗ: - - * Hãy lịch sự: không đăng bất cứ điều gì mà người khác coi là sự xúc phạm, lăng mạ, hay thù hận. - * Giữ sạch sẽ: không đăng bất cứ điều gì khiêu dâm hay đồi trụy. - * Tôn trọng lẫn nhau: không quấy rối hoặc làm người khác bực, mạo danh, hoặc lộ thông tin cá nhân của họ. - * Tôn trọng diễn đàn: không spam hoặc phá hoại diễn đàn. - - Đây là một diễn đàn công khai, các nội dung ở đây có thể được các công cụ tìm kiếm tìm thấy. Bạn hãy tự bảo vệ ngôn từ, liên kết, và hình ảnh an toàn cho gia đình và bạn bè của mình. - - - - ## [Sạch Sẽ, Gọn Gàng](#keep-tidy) - - Hãy nỗ lực để đưa mọi thứ vào đúng chỗ để chúng ta có thể có nhiều thời gian thảo luận hơn, vì thế: - - * Không tạo chủ đề sai chuyên mục. - * Không gửi cùng một bài trong nhiều chuyên mục khác nhau. - * Không gửi bài viết chưa có nội dung. - * Không chuyển hướng một chủ đề bằng cách thay đổi nó giữa dòng. - * Không ký vào bài viết của bạn — và tất cả các bài viết khác có chứa thông tin hồ sơ của bạn trong đó. - - Thay vì gửi bài viết có nội dung là “+1” hoặc “Đồng ý!”, hãy sử dụng nút Like. - - - - ## [Chỉ Gửi Những Gì Bạn Có](#stealing) - - Bạn không được gửi bất cứ nội dung nào thuộc về người khác mà không được phép. Bạn không được gửi thông tin mô tả, đường dẫn, hoặc các phương pháp để ăn cắp tài sản trí tuệ của một ai đó (phần mềm, video, âm thanh, hình ảnh...), hoặc vi phạm pháp luật khác. - - - - ## [Powered by You](#power) - - Website này được điều hành bởi [nhóm điều hành](/about) và *bạn*, trong một cộng đồng. Nếu bạn có bất kỳ thắc mắc nào, hãy tạo chủ đề mới trong [chuyên mục phản hồi](/c/site-feedback) và thảo luận với chúng tôi! Nếu có một vấn đề quan trọng, cấp bách cần xử lý ngay, hãy liên hệ với chúng tôi qua [trang nhân viên](/about). - - - - ## [Quy Định Sử Dụng](#tos) - - Chúng tôi có mục [Quy Định Sử Dụng](/tos) mô tả hành vi bạn (và chúng tôi) phải thực hiện liên quan đến nội dung, bảo mật, quyền riêng tư, và pháp luật. Để sử dụng dịch vụ này, bạn phải đồng ý với các quy định của chúng tôi [TOS](/tos). tos_topic: title: "Điều khoản Dịch vụ" privacy_topic: diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 3d8a352a8b..0b3a09841d 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -404,7 +404,6 @@ zh_CN: pms_per_day: "你今天的消息数量已经到达上限，请等待%{time_left}之后再试。" create_like: "你今天的“赞”数量已经到达上限，请等待%{time_left}之后再试。" create_bookmark: "你今天的收藏已经到达上限，请等待%{time_left}之后再试。" - edit_post: "你今天编辑帖子的数量已经到达上限，请等待%{time_left}之后再试。" live_post_counts: "你请求帖子数量的速度太快了，请等待%{time_left}之后再试。" unsubscribe_via_email: "你已经达到了今日用邮件解除订阅的最大数量限制。请等待%{time_left}之后再试。" topic_invitations_per_day: "你已经达到了今日主题邀请的最大数量限制。请等待%{time_left}之后再试。" @@ -791,7 +790,6 @@ zh_CN: delete_removed_posts_after: "帖子被作者删除，将在(n)小时后被自动删除。" max_image_width: "帖子中图片允许的最大缩略图宽度" max_image_height: "帖子中图片允许的最大缩略图宽度" - category_featured_topics: "在分类 /categories 页面中每个分类显示的主题数目。在修改这个值之后，分类页面需要 15 分钟后完成更新。" fixed_category_positions: "如果选择，你将可以设置一个固定的分类顺序。如果不选择，分类将按照活动的顺序显示。" fixed_category_positions_on_create: "如果选择了，目录排序将会在话题创建对话框中被包含(要求固定目录位置选项)" add_rel_nofollow_to_user_content: "添加 rel nofollow 属性到所有的用户内容，除了内部链接（包括父域名）。如果你更改了这个，你必须重新调制所有帖子，以该命令：“rake posts:rebake”" @@ -849,7 +847,6 @@ zh_CN: ga_universal_domain_name: "Google 通用分析域名（analytics.js）追踪代码，例如：mysite.com；参考 http://google.com/analytics" gtm_container_id: "Google Tag Manager 容器 id。例如：GTM-ABCDEF" enable_escaped_fragments: "如未侦测到爬虫回退到使用 Google Ajax-Crawling API。参见 https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "通过 no script 标签启用对标准爬虫的支持。" allow_moderators_to_create_categories: "允许版主创建新的分类" cors_origins: "允许跨源请求（CORS）。每个源必须包括 http:// 或 https://。DISCOURSE_ENABLE_CORS 环境变量必须设置为 true 才能启用 CORS 政策。" use_admin_ip_whitelist: "当目前的IP刚好处于IP段禁止名单(Admin > Logs > Screened Ips)中的时候，只有管理员才可登入。" @@ -886,7 +883,6 @@ zh_CN: invite_passthrough_hours: "用户多久才能使用一个已经使用过的邀请代码，以小时计" invite_only: "公开注册已禁用，新用户必须被其他成员或管理人员邀请。" login_required: "需要验证才能继续在该站阅读，不允许匿名访问。" - reserved_usernames: "注册时不可使用的用户名。" min_password_length: "最小密码长度。" min_admin_password_length: "管理员最短密码长度" password_unique_characters: "密码中必须包含几个不同的字符。" @@ -1298,10 +1294,6 @@ zh_CN: change_owner: post_revision_text: "所有权从 %{old_user} 转移至 %{new_user}" deleted_user: "已经删除的用户" - emoji: - errors: - name_already_exists: "抱歉，名字 '%{name}' 已经被另一个 emoji 使用。" - error_while_storing_emoji: "抱歉，存储 emoji 时发生错误。" topic_statuses: archived_enabled: "本主题已归档，即已经冻结，无法修改。" archived_disabled: "本主题已被解除归档，即不再冻结，可以修改。" @@ -1386,14 +1378,6 @@ zh_CN: other: "%{count} 个标记需要被处理" unsubscribe_mailer: subject_template: "确认你不想要收到%{site_title}的电子邮件更新" - text_body_template: | - 有人（可能是你？）请求不再接受来自%{site_domain_name}的邮件更新。 - 点击链接以确认退订： - - %{confirm_unsubscribe_link} - - - 如果你想要继续接受邮件更新，你可以忽略这封邮件。 invite_mailer: subject_template: "%{invitee_name} 邀请你参与 %{site_domain_name} 主题 '%{topic_title}' " custom_invite_mailer: @@ -1412,7 +1396,6 @@ zh_CN: （如果链接已经过期，在登录时用，选择“我忘记了密码”，再次输入你的邮箱即可。） test_mailer: - subject_template: "[%{site_name}] 电子邮件发送测试" text_body_template: | 这是一封测试电子邮件，发自： @@ -1455,7 +1438,6 @@ zh_CN: [mj]: https://www.mailjet.com/pricing [mt]: http://www.mail-tester.com/ new_version_mailer: - subject_template: "[%{site_name}] 有新的 Discourse 版本，可供升级" text_body_template: | 哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升级！ @@ -1468,7 +1450,6 @@ zh_CN: - 访问 [meta.discourse.org（英文）](https://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。也可访问 [meta.discoursecn.org 非官方的中文支持论坛](https://meta.discoursecn.org) 获得支持。 new_version_mailer_with_notes: - subject_template: "[%{site_name}] 可以升级" text_body_template: | 哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升级！ @@ -1485,8 +1466,6 @@ zh_CN: %{notes} queued_posts_reminder: - subject_template: - other: "[%{site_name}] %{count} 个帖子等待审核" text_body_template: | 你好， @@ -1607,56 +1586,48 @@ zh_CN: subject_template: "数据导出失败" text_body_template: "我们很抱歉，但是你的数据导出请求失败了。请检查日志或联系一位管理人员。" email_reject_insufficient_trust_level: - subject_template: "[%{site_name}] 电子邮件错误 -- 信任等级不足" text_body_template: | 我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。 你的账户没有足够的信任等级以该邮件地址发布新主题。如果你有异议，联系管理人员。 email_reject_user_not_found: title: "Email被拒绝：用户未找到" - subject_template: "[%{site_name}] 邮件问题 -- 用户未找到" text_body_template: | 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 你发送回复的邮件地址是未知的邮件地址。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_screened_email: title: "Email被拒绝：被屏蔽的Email地址" - subject_template: "[%{site_name}] 电子邮件错误 -- 被封禁的邮件地址" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 你发送回复的邮件地址是已被封禁的邮件地址。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_inactive_user: title: "Email被拒绝：未激活的用户" - subject_template: "[%{site_name}] 电子邮件错误 -- 未激活用户" text_body_template: | 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 与你账户关联的邮件地址没有激活，请先激活你的账号再发送邮件。 email_reject_blocked_user: title: "Email被拒绝：被禁用的用户" - subject_template: "[%{site_name}] 电子邮件错误 -- 被封禁的用户" text_body_template: | 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 与你账户关联的邮件地址已经被封禁。 email_reject_reply_user_not_matching: title: "Email被拒绝：用户未找到" - subject_template: "[%{site_name}] 电子邮件错误 -- 未预期的回复地址" text_body_template: | 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 你发送回复的邮件地址与我们等待的地址不同，所以我们不确定你是不是同一个人。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_no_account: title: "Email被拒绝：帐户不存在" - subject_template: "[%{site_name}] 电子邮件错误 -- 未知账户" text_body_template: | 我们非常抱歉，但是你发送至 %{destination}（名为%{former_title}） 的邮件出问题了。 我们找不到匹配你邮件地址的账号。试试从另外一个邮件地址发送，或者联系管理人员。 email_reject_empty: title: "Email被拒绝：空" - subject_template: "[%{site_name}] 电子邮件错误 -- 无内容" text_body_template: | 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件没有成功。 @@ -1664,34 +1635,29 @@ zh_CN: 如果你**确定**你的邮件中有回复内容，试试用更简单的格式。 email_reject_parsing: - subject_template: "[%{site_name}] 电子邮件错误 -- 内容无法识别" text_body_template: | 我们很抱歉，但是你发送至 %{destination}（名为 %{former_title}）的邮件无法发送。 我们不能找到你邮件中的回复。**请确认将你的回复置于邮件顶端**——我们不能处理行内回复。 email_reject_invalid_access: title: "Email被拒绝：无效访问" - subject_template: "[%{site_name}] 电子邮件错误 -- 无权限" text_body_template: | 我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。 你的账户没有达到足够的信任等级在该分类发布新主题。如果你有异议，联系管理人员。 email_reject_strangers_not_allowed: title: "Email被拒绝：不允许陌生人" - subject_template: "[%{site_name}] 电子邮件错误 -- 无权限" text_body_template: |+ 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 邮件发至的分类只接受来自合法帐户且邮件地址已确认的用户的有邮件。如果你有异议，联系管理人员。 email_reject_invalid_post: - subject_template: "[%{site_name}] 邮件问题 -- 发布时错误" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 可能的原因是：复杂的格式、消息超长、消息太短。请再试一次，如果还不行，使用网站发表。 email_reject_invalid_post_specified: - subject_template: "[%{site_name}] 邮件问题 -- 发布时错误" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 @@ -1701,46 +1667,39 @@ zh_CN: 如果你能解决错误，请再试一次。 email_reject_invalid_post_action: - subject_template: "[%{site_name}] 电子邮件错误 -- 无发表权限" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 发送的命令无法被识别。请再试一次，如果还有问题，使用网站发表。 email_reject_reply_key: - subject_template: "[%{site_name}] 电子邮件错误 -- 未知回复指纹" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}）的邮件出问题了。 邮件中的回复信令是无效或者未知的，所以我们不知道这封邮件回复给谁了。请联系管理人员。 email_reject_bad_destination_address: title: "Email被拒绝：收件人地址不正确" - subject_template: "[%{site_name}] 电子邮件错误 -- 未知的回复至地址" text_body_template: | 我们非常抱歉，但是你发送至%{destination}（名为%{former_title}） 邮件出问题了。 目标邮件地址无法识别。请确保你在向管理人员提供的邮件地址发信。 email_reject_topic_not_found: title: "Email被拒绝：主题不存" - subject_template: "[%{site_name}] 邮件问题 -- 主题未找到" text_body_template: | 我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。 你回复的主题不存在——可能已经被删除了？如果你有异议，联系管理人员。 email_reject_topic_closed: title: "Email被拒绝：主题已关闭" - subject_template: "[%{site_name}] 邮件问题 -- 主题已关闭" text_body_template: | 我们很抱歉，但是你发送至 %{destination} ( 名为 %{former_title} )的邮件出问题了。 你回复的主题已经被关闭，不允许回复。如果你有异议，联系管理人员。 email_reject_auto_generated: - subject_template: "[%{site_name}] 邮件问题 -- 自动生成的回复" text_body_template: | 我们很抱歉，但是你发送至%{destination}（名为 %{former_title}）的邮件出问题了。 系统觉得你的邮件是“自动生成”的，即电脑生成了该邮件而不是由你输入的；我们不能接受这样的邮件。如果你有异议，联系管理人员。 email_error_notification: - subject_template: "[%{site_name}] 电子邮件错误 -- POP 验证错误" text_body_template: | 不幸的是，从 POP 服务器查询邮件时遇到了验证错误。 @@ -1869,7 +1828,6 @@ zh_CN: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: - subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'" text_body_template: | %{header_instructions} @@ -1877,7 +1835,6 @@ zh_CN: %{respond_instructions} user_invited_to_private_message_pm_staged: - subject_template: "[%{site_name}] %{username} 邀请你加入消息交流：'%{topic_title}'" text_body_template: | %{header_instructions} @@ -1885,7 +1842,6 @@ zh_CN: %{respond_instructions} user_invited_to_topic: - subject_template: "[%{site_name}] %{username}邀请你参与“%{topic_title}”" text_body_template: | %{header_instructions} @@ -1893,7 +1849,6 @@ zh_CN: %{respond_instructions} user_replied: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1903,7 +1858,6 @@ zh_CN: %{respond_instructions} user_replied_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -1913,7 +1867,6 @@ zh_CN: %{respond_instructions} user_quoted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1923,7 +1876,6 @@ zh_CN: %{respond_instructions} user_linked: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1933,7 +1885,6 @@ zh_CN: %{respond_instructions} user_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1943,7 +1894,6 @@ zh_CN: %{respond_instructions} user_group_mentioned: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1953,7 +1903,6 @@ zh_CN: %{respond_instructions} user_posted: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1963,7 +1912,6 @@ zh_CN: %{respond_instructions} user_watching_first_post: - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -1973,7 +1921,6 @@ zh_CN: %{respond_instructions} user_posted_pm: - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -2017,7 +1964,6 @@ zh_CN: back_to_top: "回到顶部" forgot_password: title: "忘记密码" - subject_template: "[%{site_name}] 密码重置" text_body_template: | 有人请求重置你在 [%{site_name}](%{base_url}) 上的密码。 @@ -2027,7 +1973,6 @@ zh_CN: %{base_url}/users/password-reset/%{email_token} set_password: title: "设置密码" - subject_template: "[%{site_name}] 设置密码" text_body_template: | 有人请求添加你在 [%{site_name}](%{base_url}) 的密码。除此之外，你可以通过已验证过你邮件地址的在线服务商登录。 @@ -2037,7 +1982,6 @@ zh_CN: %{base_url}/users/password-reset/%{email_token} admin_login: title: "管理员登陆" - subject_template: "[%{site_name}]登录" text_body_template: | 有人尝试登录你在[%{site_name}](%{base_url})的账户。 @@ -2047,7 +1991,6 @@ zh_CN: %{base_url}/users/admin-login/%{email_token} account_created: title: "帐号已创建" - subject_template: "[%{site_name}] 你的新帐号" text_body_template: | 你在 %{site_name} 上建立了一个新账号 @@ -2055,14 +1998,12 @@ zh_CN: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "确认新邮箱" - subject_template: "[%{site_name}] 确认你的新电子邮箱地址" text_body_template: | 点击下面的链接来确认你在%{site_name}上的新电子邮箱地址： %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "确认旧邮箱" - subject_template: "[%{site_name}] 确认你的新电子邮箱地址" text_body_template: | 在我们修改你的邮箱地址前，我们需要你确认你拥有当前的邮件账号。在你完成这步之后，我们将确认你的新邮件地址。 @@ -2071,7 +2012,6 @@ zh_CN: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "通知旧邮箱" - subject_template: "[%{site_name}] 你的邮箱地址已经修改成功" text_body_template: | 这是%{site_name}自动发出的邮件，以告知你的邮箱地址已经被修改了。如果这是一个错误，请联系站点管理人员。 @@ -2100,7 +2040,6 @@ zh_CN: （如果你在新用户级别需要和[管理人员](%{base_url/about)沟通的话，直接回复这个消息。） signup: title: "注册" - subject_template: "[%{site_name}] 确认你的新账户" text_body_template: | 欢迎来到 %{site_name}！ @@ -2172,103 +2111,6 @@ zh_CN: 编辑本主题的第一帖以改变 %{page_name} 页面的内容。 guidelines_topic: title: "FAQ/指引" - body: | - - - ## [这是一个文明讨论的地方](#civilized) - - 在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。 - - 这些都不是死规矩或者是草率决定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的文明的公开论坛。 - - - - ## [改善讨论](#improve) - - 帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。 - - 这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。 - - 改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。 - - - - ## [即使你不同意他人时，尊重他人](#agreeable) - - 你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免： - - * 指名道姓。 - * 人生攻击。 - * 回复帖子无关于帖子的内容。 - * 下意识的反驳。 - - 相反，提供合理的观点改善讨论。 - - - - ## [你的参与有意义](#participate) - - 我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 — 并且避免那些没有帮助的行为。 - - Discourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。 - - 让我们创造一个更美好的社群。 - - - - ## [如果你发现问题了，标记它](#flag-problems) - 版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社群监察者，而不仅是守卫或者警察。 - - 当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。 - - 为了维护我们的社群，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。 - - - - ## [永远保持文明](#be-civil) - - 粗鲁这样的行为会破坏健康的讨论： - - * 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。 - * 拒绝色情。不要发表任何淫秽或性暗示的东西。 - * 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。 - * 尊重我们的论坛。不要发表广告或者其他垃圾信息。 - - 这些条款不是法律条文，并且没有准确的定义 — 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。 - - 这是一个公共论坛，并且搜索引擎会索引这些讨论。注意发表的语言、链接和图片，不要在其中包含你的家庭和朋友。 - - - - ## [保持整洁](#keep-tidy) - - 花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以： - - * 不要在错误的分类发表新主题。 - * 不要在多个主题中回复同样的内容。 - * 不要发布没有内容的回复。 - * 不要在中途改变主题。 - * 不要在你的帖子中签名 — 每一贴都附有你的个人信息。 - - 比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。 - - - - ## [只发表你自己的东西](#stealing) - - 你不能在没有他人授权的情况下发表任何属于他人的数字资产。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何违反法律的内容。 - - - - ## [有你参与](#power) - - 这个站点由[一群友善的管理人员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站点反馈](/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[管理人员页面](/about)联系我们。 - - - - ## [使用条款](#tos) - - 是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。 tos_topic: title: "服务条款" body: | @@ -2791,7 +2633,6 @@ zh_CN: description: "你或者你的组织平时用于联络的网页。将被显示在关于页面中。" site_contact: label: "自动消息" - description: "所有自动发送自 Discourse 的私人消息将以该用户的名义发送。最重要的是，这个用户将被指定为发送给每个新用户的欢迎消息的发送人。" corporate: title: "组织" fields: diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index 6b6ce242c0..5bbc42b189 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -413,7 +413,6 @@ zh_TW: pms_per_day: "您今天發表的訊息數已經達到上限。請等待 %{time_left} 後再行嘗試。" create_like: "您今天給予讚的次數已經達到上限。請等待 %{time_left} 再行嘗試。" create_bookmark: "您今天加入書籤的數目已經達到上限。請等待 %{time_left} 再行嘗試。" - edit_post: "您今天編輯的次數已達到上限。請等待 %{time_left} 再行嘗試。" live_post_counts: "您要求的即時文章計數過於快速。請等待 %{time_left} 再行嘗試。" unsubscribe_via_email: "你已經達到了今日用郵件解除訂閲的最大數量限制。請等待%{time_left}之後再試。" topic_invitations_per_day: "你已經達到了今日主題邀請的最大數量限制。請等待%{time_left}之後再試。" @@ -802,7 +801,6 @@ zh_TW: delete_removed_posts_after: "帖子被作者刪除，將在 (n) 小時後被自動刪除。如果設置為 0，帖子將被立即刪除。" max_image_width: "文章中最大的縮圖寬度" max_image_height: "文章中的允許圖片最大的縮圖高度" - category_featured_topics: "在分類 /categories 頁面每個分類顯示的討論話題數目。此數值的改變最多需要 15 分鐘才會反應在分類頁面上。" fixed_category_positions: "若勾選，你將能調整並固定分類的順序。若不勾選，分類將會依照活躍程度來排序。" fixed_category_positions_on_create: "如果選擇了，目錄排序將會在話題創建對話框中被包含(要求固定目錄位置選項)" add_rel_nofollow_to_user_content: "添加 rel nofollow 屬性到所有的用戶內容，除了內部鏈接（包括父域名）。如果你更改了這個，你必須重新調制所有帖子，而該命令為：“rake posts:rebake”" @@ -860,7 +858,6 @@ zh_TW: ga_universal_domain_name: "Google 通用 Analytics (分析) 域名（analytics.js）追踪代码，例如：mysite.com；参考 http://google.com/analytics" gtm_container_id: "Google Tag Manager 容器 id。例如：GTM-ABCDEF" enable_escaped_fragments: "如未偵測到爬蟲回退到使用 Google Ajax-Crawling API。參見 https://developers.google.com/webmasters/ajax-crawling/docs/learn-more" - enable_noscript_support: "開啟noscript來對網路爬蟲來做標準的支援" allow_moderators_to_create_categories: "允許板主建立新分類" cors_origins: "允許跨來源資源共享（CORS）。每個來源必須包括 http:// 或 https://。DISCOURSE_ENABLE_CORS 環境選項必須設置為 true 才能啟用 CORS 。" use_admin_ip_whitelist: "當目前的IP剛好處于IP段禁止名單(Admin > Logs > Screened Ips)中的時候，只有管理員才可登入。" @@ -1307,10 +1304,6 @@ zh_TW: change_owner: post_revision_text: "所有權從 %{old_user} 轉移至 %{new_user}" deleted_user: "已經刪除的用戶" - emoji: - errors: - name_already_exists: "抱歉，名字 '%{name}' 已經被另一個 emoji 使用。" - error_while_storing_emoji: "抱歉，存儲 emoji 時發生錯誤。" topic_statuses: archived_enabled: "此討論話題已封存，即已經凍結，無法修改。" archived_disabled: "此討論話題已被解除封存，即不再凍結，可以修改。" @@ -1483,7 +1476,6 @@ zh_TW: (如果連結已經過期，在登入頁面選擇「我忘了我的密碼」，再次輸入你的 email 即可) test_mailer: title: "測試 Mailer" - subject_template: "[%{site_name}] 電子郵件發送測試" text_body_template: | 這是一封測試電子郵件，發自： @@ -1527,7 +1519,6 @@ zh_TW: [mt]: http://www.mail-tester.com/ new_version_mailer: title: "新版本 Mailer" - subject_template: "[%{site_name}] 有可用的新版 Discourse 更新" text_body_template: | 哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升級！ @@ -1541,7 +1532,6 @@ zh_TW: - 訪問 [meta.discourse.org（英文）](https://meta.discourse.org) 獲取 Discourse 的最新資訊、討論和支持。也可訪問 [meta.discoursecn.org 非官方的中文支持論壇](https://meta.discoursecn.org) 獲得支持。 new_version_mailer_with_notes: title: "包含提醒的新版本 Mailer" - subject_template: "[%{site_name}] 可以升級" text_body_template: | 哇哦，有新版本的 [Discourse](http://www.discourse.org) 可以升級！ @@ -1559,8 +1549,6 @@ zh_TW: %{notes} queued_posts_reminder: title: "排定中的文章提醒" - subject_template: - other: "[%{site_name}] %{count} 個帖子等待審核" text_body_template: | 你好， @@ -1704,56 +1692,48 @@ zh_TW: text_body_template: "很抱歉，你的資料匯出失敗了。請檢查日誌，或聯繫管理人員。" email_reject_insufficient_trust_level: title: "電子郵件拒絕 信任等級不足" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 信任等級不足" text_body_template: | 我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。 你的賬戶沒有足夠的信任等級以該郵件地址發佈新主題。如果你有異議，聯繫管理人員。 email_reject_user_not_found: title: "電子郵件拒絕 找不到用戶" - subject_template: "[%{site_name}] 郵件問題 -- 用戶未找到" text_body_template: | 我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。 你發送回覆的郵件地址是未知的郵件地址。試試從另外一個郵件地址發送，或者聯繫管理人員。 email_reject_screened_email: title: "電子郵件拒絕 屏蔽的電子郵件地址" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 被封禁的郵件地址" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 你發送回覆的郵件地址是已被封禁的郵件地址。試試從另外一個郵件地址發送，或者聯繫管理人員。 email_reject_inactive_user: title: "電子郵件拒絕 用戶尚未啟動" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 未激活用戶" text_body_template: | 我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。 與你賬戶關聯的郵件地址沒有激活，請先激活你的賬號再發送郵件。 email_reject_blocked_user: title: "電子郵件拒絕 已封鎖的用戶" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 被封禁的用戶" text_body_template: | 我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。 與你賬戶關聯的郵件地址已經被封禁。 email_reject_reply_user_not_matching: title: "點子郵件拒絕 未找到符合的用戶" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 未預期的回覆地址" text_body_template: | 我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。 你發送回覆的郵件地址與我們等待的地址不同，所以我們不確定你是不是同一個人。試試從另外一個郵件地址發送，或者聯繫管理人員。 email_reject_no_account: title: "電子郵件拒絕 沒有帳號" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 未知賬戶" text_body_template: | 我們非常抱歉，但是你發送至 %{destination}（名為%{former_title}） 的郵件出問題了。 我們找不到匹配你郵件地址的賬號。試試從另外一個郵件地址發送，或者聯繫管理人員。 email_reject_empty: title: "電子郵件拒絕 空白" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 無內容" text_body_template: | 我們很抱歉，但是你發送至 %{destination}（名為 %{former_title}）的郵件沒有成功。 @@ -1762,21 +1742,18 @@ zh_TW: 如果你**確定**你的郵件中有回覆內容，試試用更簡單的格式。 email_reject_parsing: title: "電子郵件拒絕 分析" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 內容無法識別" text_body_template: | 我們很抱歉，但是你發送至 %{destination}（名為 %{former_title}）的郵件無法發送。 我們不能找到你郵件中的回覆。**請確認將你的回覆置於郵件頂端**——我們不能處理行內回覆。 email_reject_invalid_access: title: "電子郵件拒絕 無效存取" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 無權限" text_body_template: | 我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。 你的賬戶沒有達到足夠的信任等級在該分類發佈新主題。如果你有異議，聯繫管理人員。 email_reject_strangers_not_allowed: title: "電子郵件拒絕 陌生人禁止" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 無權限" text_body_template: |+ 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 @@ -1784,14 +1761,12 @@ zh_TW: email_reject_invalid_post: title: "電子郵件拒絕 無效貼文" - subject_template: "[%{site_name}] 郵件問題 -- 發佈時錯誤" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 可能的原因是：複雜的格式、消息超長、消息太短。請再試一次，如果還不行，使用網站發表。 email_reject_invalid_post_specified: title: "電子郵件拒絕 無效貼文認定" - subject_template: "[%{site_name}] 郵件問題 -- 發佈時錯誤" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 @@ -1802,49 +1777,42 @@ zh_TW: 如果你能解決錯誤，請再試一次。 email_reject_invalid_post_action: title: "電子郵件拒絕 無效貼文動作" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 無發表權限" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 發送的命令無法被識別。請再試一次，如果還有問題，使用網站發表。 email_reject_reply_key: title: "電子郵件拒絕 復原金鑰" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 未知回覆指紋" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}）的郵件出問題了。 郵件中的回覆信令是無效或者未知的，所以我們不知道這封郵件回覆給誰了。請聯繫管理人員。 email_reject_bad_destination_address: title: "電子郵件拒絕 不良目的地位址" - subject_template: "[%{site_name}] 電子郵件錯誤 -- 未知的回覆至地址" text_body_template: | 我們非常抱歉，但是你發送至%{destination}（名為%{former_title}） 郵件出問題了。 目標郵件地址無法識別。請確保你在向管理人員提供的郵件地址發信。 email_reject_topic_not_found: title: "電子郵件拒絕 未找到討論話題" - subject_template: "[%{site_name}] 郵件問題 -- 主題未找到" text_body_template: | 我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。 你回覆的主題不存在——可能已經被刪除了？如果你有異議，聯繫管理人員。 email_reject_topic_closed: title: "電子郵件拒絕 討論話題已關閉" - subject_template: "[%{site_name}] 郵件問題 -- 主題已關閉" text_body_template: | 我們很抱歉，但是你發送至 %{destination} ( 名為 %{former_title} )的郵件出問題了。 你回覆的主題已經被關閉，不允許回覆。如果你有異議，聯繫管理人員。 email_reject_auto_generated: title: "電子郵件拒絕 自動生成" - subject_template: "[%{site_name}] 郵件問題 -- 自動生成的回覆" text_body_template: | 我們很抱歉，但是你發送至%{destination}（名為 %{former_title}）的郵件出問題了。 系統覺得你的郵件是“自動生成”的，即電腦生成了該郵件而不是由你輸入的；我們不能接受這樣的郵件。如果你有異議，聯繫管理人員。 email_error_notification: title: "電子郵件錯誤通知" - subject_template: "[%{site_name}] 電子郵件錯誤 -- POP 驗證錯誤" text_body_template: | 不幸的是，從 POP 伺服器查詢郵件時遇到了驗證錯誤。 @@ -1980,7 +1948,6 @@ zh_TW: > %{site_title} -- %{site_description} user_invited_to_private_message_pm: title: "用戶被邀請至私人訊息" - subject_template: "[%{site_name}] %{username} 邀請你參與討論 '%{topic_title}'" text_body_template: | %{header_instructions} @@ -1989,7 +1956,6 @@ zh_TW: %{respond_instructions} user_invited_to_private_message_pm_staged: title: "用戶被邀請至私人訊息狀態" - subject_template: "[%{site_name}] %{username} 邀請你加入消息交流：'%{topic_title}'" text_body_template: | %{header_instructions} @@ -1998,7 +1964,6 @@ zh_TW: %{respond_instructions} user_invited_to_topic: title: "用戶被邀請至討論話題" - subject_template: "[%{site_name}] %{username}邀請你參與“%{topic_title}”" text_body_template: | %{header_instructions} @@ -2007,7 +1972,6 @@ zh_TW: %{respond_instructions} user_replied: title: "用戶回覆" - subject_template: "[%{site_name}] %{username} 在 '%{topic_title}' 討論話題回覆了你的文章" text_body_template: | %{header_instructions} @@ -2018,7 +1982,6 @@ zh_TW: %{respond_instructions} user_replied_pm: title: "用戶回復私人訊息" - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -2029,7 +1992,6 @@ zh_TW: %{respond_instructions} user_quoted: title: "用戶引述" - subject_template: "[%{site_name}] %{username} 在 '%{topic_title}' 討論話題引用了你的內容" text_body_template: | %{header_instructions} @@ -2040,7 +2002,6 @@ zh_TW: %{respond_instructions} user_linked: title: "用戶連結" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2051,7 +2012,6 @@ zh_TW: %{respond_instructions} user_mentioned: title: "用戶提及" - subject_template: "[%{site_name}] %{username} 在 '%{topic_title}' 討論話題提及了你" text_body_template: | %{header_instructions} @@ -2062,7 +2022,6 @@ zh_TW: %{respond_instructions} user_group_mentioned: title: "用戶群組提及" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2073,7 +2032,6 @@ zh_TW: %{respond_instructions} user_posted: title: "用戶貼文" - subject_template: "[%{site_name}] %{subject_prefix}%{username} 在 '%{topic_title}' 討論話題發表了文章" text_body_template: | %{header_instructions} @@ -2084,7 +2042,6 @@ zh_TW: %{respond_instructions} user_watching_first_post: title: "用戶觀看第一個主題" - subject_template: "[%{site_name}] %{topic_title}" text_body_template: | %{header_instructions} @@ -2095,7 +2052,6 @@ zh_TW: %{respond_instructions} user_posted_pm: title: "用戶發表私人訊息" - subject_template: "[%{site_name}] [PM] %{topic_title}" text_body_template: | %{header_instructions} @@ -2124,14 +2080,12 @@ zh_TW: join_the_discussion: "閲讀更多" popular_posts: "熱門貼文" more_new: "新內容與你分享" - subject_template: "[%{site_name}] 摘要" unsubscribe: "這是封來自%{site_link}的摘要郵件，因為你長時間沒有訪問而發送。%{unsubscribe_link}取消訂閲。" click_here: "點擊此處" from: "%{site_name}的摘要" preheader: "在你上次於%{last_seen_at}訪問後的新內容摘要" mailing_list: why: "%{date}%{site_link}上的所有情況" - subject_template: "[%{site_name}] %{date}摘要" unsubscribe: "這是每日摘要郵件。站點啟用了郵件列表模式，點擊連結 %{unsubscribe_link} 退訂。" from: "%{site_name}的摘要" new_topics: "近期主題" @@ -2140,7 +2094,6 @@ zh_TW: back_to_top: "回到頂部" forgot_password: title: "忘記密碼" - subject_template: "[%{site_name}] 密碼重設" text_body_template: | 有人請求重設你在 [%{site_name}](%{base_url}) 上的密碼。 @@ -2150,7 +2103,6 @@ zh_TW: %{base_url}/users/password-reset/%{email_token} set_password: title: "設定密碼" - subject_template: "[%{site_name}] 設定密碼" text_body_template: | 有人請求添加你在 [%{site_name}](%{base_url}) 的密碼。除此之外，你可以通過已驗證過你郵件地址的在綫服務商登錄。 @@ -2160,7 +2112,6 @@ zh_TW: %{base_url}/users/password-reset/%{email_token} admin_login: title: "管理員登入" - subject_template: "[%{site_name}]登錄" text_body_template: | 有人嘗試登錄你在[%{site_name}](%{base_url})的賬戶。 @@ -2170,7 +2121,6 @@ zh_TW: %{base_url}/users/admin-login/%{email_token} account_created: title: "建立用戶" - subject_template: "[%{site_name}] 你的新帳號" text_body_template: | 你在 %{site_name} 上建立了一個新賬號 @@ -2178,14 +2128,12 @@ zh_TW: %{base_url}/users/password-reset/%{email_token} confirm_new_email: title: "確認新郵件" - subject_template: "[%{site_name}] 確認你的電子郵件位址" text_body_template: | 點擊以下連結確認你在[%{site_name}]上的新電子郵件： %{base_url}/users/authorize-email/%{email_token} confirm_old_email: title: "確認舊郵件" - subject_template: "[%{site_name}] 確認你的新電子郵箱地址" text_body_template: | 在我們修改你的郵箱地址前，我們需要你確認你擁有當前的郵件賬號。在你完成這步之後，我們將確認你的新郵件地址。 @@ -2194,7 +2142,6 @@ zh_TW: %{base_url}/users/authorize-email/%{email_token} notify_old_email: title: "通知舊的郵件" - subject_template: "[%{site_name}] 你的郵箱地址已經修改成功" text_body_template: | 這是%{site_name}自動發出的郵件，以告知你的郵箱地址已經被修改了。如果這是一個錯誤，請聯繫站點管理人員。 @@ -2223,7 +2170,6 @@ zh_TW: (如果你需要和[管理人員](%{base_url}/about)聯繫的話，請直接回覆這則訊息。) signup: title: "註冊" - subject_template: "[%{site_name}] 確認你的新賬戶" text_body_template: | 歡迎來到 %{site_name}！ @@ -2295,103 +2241,6 @@ zh_TW: 編輯本主題的第一帖以改變 %{page_name} 頁面的內容。 guidelines_topic: title: "FAQ / 使用守則" - body: | - - - ## [這是一個文明討論的地方](#civilized) - - 在論壇上請表現得像在公共公園一樣得體。我們一群人共享着一個公共社群資源 — 一個通過不斷進行討論以分享我們技能、知識和興趣的地方。 - - 這些都不是死規矩或者是草率決定，只是一些幫助社群的人們來判斷的規定。試用這些指引來保持乾淨和充滿靈感的文明的公開論壇。 - - - - ## [改善討論](#improve) - - 幫助我們讓這個地方變成一個討論的好地方。你可以總是一致的做一些幫助改善討論的事，即使是小事也行。如果你不確定你的帖子有益於討論，認真想一想你要說什麼再發佈。 - - 這裡討論的主題對我們很重要，並且我們希望你也覺得這些內容對你很重要。尊重這些討論的主題，以及討論他們的人們，特別是當你不同意他們所說的時候。 - - 改善討論的一種方法是找一找已經發生過的事。請在發帖或創建你自己的主題前，花一些時間瀏覽這些主題，這樣你更有機會遇見和你有共同愛好的人。 - - - - ## [即使你不同意他人時，尊重他人](#agreeable) - - 你可能想表達你的不同意。這沒問題。但是，記住_批評觀點，而不是人_。請避免： - - * 指名道姓。 - * 人生攻擊。 - * 回覆帖子無關於帖子的內容。 - * 下意識的反駁。 - - 相反，提供合理的觀點改善討論。 - - - - ## [你的參與有意義](#participate) - - 我們在這兒的討論為大家樹立了榜樣。通過選擇參與有意義的討論，幫助我們將論壇變成一個有意思的地方 — 並且避免那些沒有幫助的行為。 - - Discourse 提供了讓社群共同鑒別最棒（或最差）的貢獻的工具：收藏、書籤、贊、標記、回覆和編輯等等。使用這些工具不僅能改善你自己的體驗，也能改善其他人的體驗。 - - 讓我們創造一個更美好的社群。 - - - - ## [如果你發現問題了，標記它](#flag-problems) - 版主有特別的權力；他們對論壇負責。但是你也是。有了你的幫助，版主能成為社群監察者，而不僅是守衛或者警察。 - - 當你見到不合適的行為，不要回覆。這種承認變相鼓勵了這種不合適的行為，浪費了你的精力，並且浪費了每一個人的時間。_只要標記它。_如果收到了足夠的標記，將會有相應的處理，這個處理可能是自動地，也可能由版主介入。 - - 為了維護我們的社群，版主保留了任何情況下刪除任何內容和任何用戶的權力。版主沒有預先審核任何新帖子；版主和站點維護人員對社群裡發表的任何言論均不負責任。 - - - - ## [永遠保持文明](#be-civil) - - 粗魯這樣的行為會破壞健康的討論： - - * 文明。不要發表任何理智的人會認為冒犯的、過分的或招致怨恨的言論。 - * 拒絶色情。不要發表任何淫穢或性暗示的東西。 - * 尊重每一個人。不要騷擾或者讓別人難過，檢視別人，或暴露他們的個人信息。 - * 尊重我們的論壇。不要發表廣告或者其他垃圾信息。 - - 這些條款不是法律條文，並且沒有準確的定義 — 避免任何做關於他們的_可能擦邊_的事。如果你不確定，問問自己的帖子是否能出現在紐約時報的頭版頭條上。 - - 這是一個公共論壇，並且搜索引擎會索引這些討論。注意發表的語言、連結和圖片，不要在其中包含你的家庭和朋友。 - - - - ## [保持整潔](#keep-tidy) - - 花一點時間讓東西出現在正確的位置，這樣我們能花更多的時間在討論上而非清理格式。所以： - - * 不要在錯誤的分類發表新主題。 - * 不要在多個主題中回覆同樣的內容。 - * 不要發佈沒有內容的回覆。 - * 不要在中途改變主題。 - * 不要在你的帖子中簽名 — 每一貼都附有你的個人信息。 - - 比起發表“+1”或者“同意”，使用贊按鈕。比起將帖子帶向一個決然不同的方向，使用“回覆為關聯主題”。 - - - - ## [只發表你自己的東西](#stealing) - - 你不能在沒有他人授權的情況下發表任何屬於他人的數字資產。你可能不能發表關於竊據他人知識產權（軟件、視頻、音頻和圖像）的任何簡介、連結或方法，或其他任何違反法律的內容。 - - - - ## [有你參與](#power) - - 這個站點由[一群友善的管理人員](/about)、你和社群一起運營。如果你對這裡的事情仍有疑問，在[站點反饋](/c/site-feedback)分類新建一個主題並且開始討論！如果遇到了重要或緊急的事情，並且不能用站務分類的主題或標記解決，通過[管理人員頁面](/about)聯繫我們。 - - - - ## [使用條款](#tos) - - 是的，法律很無聊，但是我們必須保護我們自己 – 引申開來，你和你的數據 – 用於針對不友好的傢伙們。我們有一個[使用條款](/tos)描述你的（以及我們）關於內容、隱私和法律的行為和權力。要使用我們的服務，你必須同意遵守[使用條款](/tos)。 tos_topic: title: "服務條款" body: | @@ -2914,7 +2763,6 @@ zh_TW: description: "你或者你的組織平時用於聯絡的網頁。將被顯示在關於頁面中。" site_contact: label: "自動消息" - description: "所有自動發送自 Discourse 的私人消息將以該用戶的名義發送。最重要的是，這個用戶將被指定為發送給每個新用戶的歡迎消息的發送人。" corporate: title: "組織" description: "這些名字將顯示於隱私策略和服務條款中，你可以在工作人員分類中編輯這些主題。如果你沒有公司，你可以跳過這個步驟。" diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml index 48183b6883..8cfdeaaf03 100644 --- a/plugins/poll/config/locales/client.da.yml +++ b/plugins/poll/config/locales/client.da.yml @@ -54,6 +54,7 @@ da: insert: Indsæt afstemning help: options_count: Vælg mindst 2 muligheder + invalid_values: Minimumsværdien skal være mindre end maksimumværdien. poll_type: label: Type regular: Enkelt valg diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml index 00a1d5ce62..1658d071ce 100644 --- a/plugins/poll/config/locales/client.de.yml +++ b/plugins/poll/config/locales/client.de.yml @@ -54,6 +54,7 @@ de: insert: Umfrage einfügen help: options_count: Gib mindestens 2 Optionen ein + invalid_values: Der minimale Wert muss kleiner sein als der maximale Wert. poll_type: label: Art regular: Einfachauswahl diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml index fddd4b41a3..8bc698e026 100644 --- a/plugins/poll/config/locales/client.pl_PL.yml +++ b/plugins/poll/config/locales/client.pl_PL.yml @@ -64,6 +64,7 @@ pl_PL: insert: Wstaw ankietę help: options_count: Wprowadź przynajmniej 2 opcje + invalid_values: Wartość minimalna musi być mniejsza niż maksymalna. poll_type: label: Typ regular: Pojedynczy wybór diff --git a/plugins/poll/config/locales/client.sk.yml b/plugins/poll/config/locales/client.sk.yml index eec84edce3..5424aff098 100644 --- a/plugins/poll/config/locales/client.sk.yml +++ b/plugins/poll/config/locales/client.sk.yml @@ -11,7 +11,7 @@ sk: voters: one: "volič" few: "voliči" - other: "voliči" + other: "účastníci" total_votes: one: "hlas celkom" few: "hlasy celkom" @@ -38,11 +38,11 @@ sk: title: "Hlasovať" label: "Hlasuj teraz!" show-results: - title: "Zobraiť výsledky hlasovania" + title: "Zobraziť výsledky hlasovania" label: "Zobraz výsledky" hide-results: title: "Návrat na odovzdané hlasy" - label: "Skyť výsledky" + label: "Skryť výsledky" open: title: "Zahájiť hlasovanie" label: "Zahájiť" @@ -53,12 +53,13 @@ sk: confirm: "Ste si istý, že chcete uzavrieť toto hlasovanie?" error_while_toggling_status: "Ľutujeme, nastala chyba pri prepínaní stavu tohto hlasovania." error_while_casting_votes: "Ľutujeme, nastala chyba pri prideľovaní Vašich hlasov." - error_while_fetching_voters: "Ľutujeme, nastala chyba pri zobrazovaní voličov." + error_while_fetching_voters: "Ľutujeme, nastala chyba pri zobrazení účastníkov." ui_builder: title: Vytvoriť hlasovanie insert: Vložiť hlasovanie help: options_count: Zadajte aspoň 2 možnosti + invalid_values: Minimálna hodnota musí byť menšia ako maximálna hodnota. poll_type: label: Typ regular: Jedna možnosť @@ -71,4 +72,4 @@ sk: poll_public: label: Ukázať kto hlasoval poll_options: - label: Zadajte jednu možnosť voľby na riadok + label: Zadajte každú možnosť voľby do nového riadka diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml index 49e9f0e49e..f620cfdde7 100644 --- a/plugins/poll/config/locales/client.sv.yml +++ b/plugins/poll/config/locales/client.sv.yml @@ -54,6 +54,7 @@ sv: insert: Lägg till omröstning help: options_count: Ange minst 2 alternativ + invalid_values: Minimivärde måste vara mindre än det maximala värdet. poll_type: label: Typ regular: Ett val From 616e1dcd16f669b2319a1b180688187ebe17c220 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 7 Apr 2017 14:37:05 -0400 Subject: [PATCH 113/124] FIX: Topic Timeline was impossible to close if you used the back button --- .../components/topic-navigation.js.es6 | 7 +++++- .../discourse/widgets/topic-timeline.js.es6 | 25 +++++++------------ 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 b/app/assets/javascripts/discourse/components/topic-navigation.js.es6 index ecae615fc5..1f06f87162 100644 --- a/app/assets/javascripts/discourse/components/topic-navigation.js.es6 +++ b/app/assets/javascripts/discourse/components/topic-navigation.js.es6 @@ -3,7 +3,12 @@ import showModal from 'discourse/lib/show-modal'; export default Ember.Component.extend({ composerOpen: null, - info: Em.Object.create(), + info: null, + + init() { + this._super(); + this.set('info', Ember.Object.create()); + }, _performCheckSize() { if (!this.element || this.isDestroying || this.isDestroyed) { return; } diff --git a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 index 6b927c05fc..a77012282b 100644 --- a/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 +++ b/app/assets/javascripts/discourse/widgets/topic-timeline.js.es6 @@ -154,8 +154,7 @@ createWidget('timeline-scrollarea', { if (this.state.position !== result.current) { this.state.position = result.current; - const timeline = this._findAncestorWithProperty('updatePosition'); - timeline.updatePosition.call(timeline, result.current); + this.sendWidgetAction('updatePosition', result.current); } return result; @@ -287,8 +286,6 @@ export default createWidget('topic-timeline', { this.state.position = pos; this.state.excerpt = ""; - this.scheduleRerender(); - const stream = this.attrs.topic.get('postStream'); // a little debounce to avoid flashing @@ -300,7 +297,6 @@ export default createWidget('topic-timeline', { // we have an off by one, stream is zero based, // pos is 1 based stream.excerpt(pos-1).then(info => { - if (info && this.state.position === pos) { let excerpt = ""; @@ -308,9 +304,7 @@ export default createWidget('topic-timeline', { excerpt = "" + info.username + ": "; } - excerpt += info.excerpt; - - this.state.excerpt = excerpt; + this.state.excerpt = excerpt + info.excerpt; this.scheduleRerender(); } }); @@ -332,16 +326,15 @@ export default createWidget('topic-timeline', { } let elems = [h('h2', this.attach('link', { - contents: ()=>titleHTML, - className: 'fancy-title', - action: 'jumpTop'}))]; - + contents: () => titleHTML, + className: 'fancy-title', + action: 'jumpTop' + }))]; if (this.state.excerpt) { - elems.push( - new RawHtml({ - html: "
" + this.state.excerpt + "
" - })); + elems.push(new RawHtml({ + html: "
" + this.state.excerpt + "
" + })); } result.push(h('div.title', elems)); From 28c59d754b00efa2b26521faac6af38989d7eb77 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 7 Apr 2017 15:18:23 -0400 Subject: [PATCH 114/124] FIX: Don't update `cooked` when a like is received. --- .../javascripts/discourse/controllers/topic.js.es6 | 6 +++++- .../javascripts/discourse/models/post-stream.js.es6 | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index d5b6852685..6fe51c4936 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -891,7 +891,11 @@ export default Ember.Controller.extend(SelectedPostsCount, BufferedContent, { switch (data.type) { case "acted": - postStream.triggerChangedPost(data.id, data.updated_at).then(() => refresh({ id: data.id, refreshLikes: true })); + postStream.triggerChangedPost( + data.id, + data.updated_at, + { preserveCooked: true } + ).then(() => refresh({ id: data.id, refreshLikes: true })); break; case "revised": case "rebaked": { diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 0e9a586303..419baf7ccb 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -544,7 +544,9 @@ export default RestModel.extend({ return Ember.RSVP.Promise.resolve(); }, - triggerChangedPost(postId, updatedAt) { + triggerChangedPost(postId, updatedAt, opts) { + opts = opts || {}; + const resolved = Ember.RSVP.Promise.resolve(); if (!postId) { return resolved; } @@ -552,7 +554,13 @@ export default RestModel.extend({ if (existing && existing.updated_at !== updatedAt) { const url = "/posts/" + postId; const store = this.store; - return ajax(url).then(p => this.storePost(store.createRecord('post', p))); + return ajax(url).then(p => { + if (opts.preserveCooked) { + p.cooked = existing.get('cooked'); + } + + this.storePost(store.createRecord('post', p)); + }); } return resolved; }, From 231fea1bdb0b88ad08535cda5aef5352b83bc7bb Mon Sep 17 00:00:00 2001 From: Risto Date: Fri, 7 Apr 2017 23:29:08 +0300 Subject: [PATCH 115/124] Typo fix A weird period/full stop in the middle of a word. --- config/locales/server.en.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 6e8ec39fac..2fe259ab23 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -387,7 +387,7 @@ en: invalid: "is not a valid color" post_reply: base: - different_topic: "Post and reply must be.long to the same topic." + different_topic: "Post and reply must belong to the same topic." web_hook: attributes: payload_url: From 40cee37bcc694cf6c3905ac2918b4bbcd45c6af3 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 7 Apr 2017 17:10:01 -0400 Subject: [PATCH 116/124] FIX: Don't insert topic status messages unless the status changes --- app/services/topic_status_updater.rb | 27 ++++++++--- spec/models/topic_spec.rb | 24 ++++++---- spec/services/topic_status_updater_spec.rb | 56 ++++++++++++++++++++++ 3 files changed, 91 insertions(+), 16 deletions(-) diff --git a/app/services/topic_status_updater.rb b/app/services/topic_status_updater.rb index 5bd72a7b4b..795751a0d7 100644 --- a/app/services/topic_status_updater.rb +++ b/app/services/topic_status_updater.rb @@ -4,23 +4,36 @@ TopicStatusUpdater = Struct.new(:topic, :user) do @topic_status_update = topic.topic_status_update + updated = nil Topic.transaction do - change(status, opts) - highest_post_number = topic.highest_post_number - create_moderator_post_for(status, opts[:message]) - update_read_state_for(status, highest_post_number) + updated = change(status, opts) + if updated + highest_post_number = topic.highest_post_number + create_moderator_post_for(status, opts[:message]) + update_read_state_for(status, highest_post_number) + end end + + updated end private def change(status, opts={}) + result = true + if status.pinned? || status.pinned_globally? topic.update_pinned(status.enabled?, status.pinned_globally?, opts[:until]) elsif status.autoclosed? - topic.update_column('closed', status.enabled?) + rc = Topic.where(id: topic.id, closed: !status.enabled?).update_all(closed: status.enabled?) + topic.closed = status.enabled? + result = false if rc == 0 else - topic.update_column(status.name, status.enabled?) + rc = Topic.where(:id => topic.id, status.name => !status.enabled) + .update_all(status.name => status.enabled?) + + topic.send("#{status.name}=", status.enabled?) + result = false if rc == 0 end if @topic_status_update @@ -38,6 +51,8 @@ TopicStatusUpdater = Struct.new(:topic, :user) do (status.disabled? && status.visible?)) CategoryFeaturedTopic.where(topic_id: topic.id).delete_all end + + result end def create_moderator_post_for(status, message=nil) diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index a25f4db326..5feef5180d 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -689,14 +689,16 @@ describe Topic do context 'archived' do context 'disable' do before do - @topic.update_status('archived', false, @user) - @topic.reload + @archived_topic = Fabricate(:topic, archived: true, bumped_at: 1.hour.ago) + @original_bumped_at = @archived_topic.bumped_at.to_f + @archived_topic.update_status('archived', false, @user) + @archived_topic.reload end it 'should archive correctly' do - expect(@topic).not_to be_archived - expect(@topic.bumped_at.to_f).to eq(@original_bumped_at) - expect(@topic.moderator_posts_count).to eq(1) + expect(@archived_topic).not_to be_archived + expect(@archived_topic.bumped_at.to_f).to eq(@original_bumped_at) + expect(@archived_topic.moderator_posts_count).to eq(1) end end @@ -719,14 +721,16 @@ describe Topic do shared_examples_for 'a status that closes a topic' do context 'disable' do before do - @topic.update_status(status, false, @user) - @topic.reload + @closed_topic = Fabricate(:topic, closed: true, bumped_at: 1.hour.ago) + @original_bumped_at = @closed_topic.bumped_at.to_f + @closed_topic.update_status(status, false, @user) + @closed_topic.reload end it 'should not be pinned' do - expect(@topic).not_to be_closed - expect(@topic.moderator_posts_count).to eq(1) - expect(@topic.bumped_at.to_f).not_to eq(@original_bumped_at) + expect(@closed_topic).not_to be_closed + expect(@closed_topic.moderator_posts_count).to eq(1) + expect(@closed_topic.bumped_at.to_f).not_to eq(@original_bumped_at) end end diff --git a/spec/services/topic_status_updater_spec.rb b/spec/services/topic_status_updater_spec.rb index 3609082ec6..17f3be231d 100644 --- a/spec/services/topic_status_updater_spec.rb +++ b/spec/services/topic_status_updater_spec.rb @@ -56,4 +56,60 @@ describe TopicStatusUpdater do expect(last_post.raw).to eq(I18n.t("topic_statuses.autoclosed_enabled_lastpost_hours", count: 10)) end + describe "repeat actions" do + + shared_examples "an action that doesn't repeat" do + it "does not perform the update twice" do + topic = Fabricate(:topic, status_name => false) + updated = TopicStatusUpdater.new(topic, admin).update!(status_name, true) + expect(updated).to eq(true) + expect(topic.send("#{status_name}?")).to eq(true) + + updated = TopicStatusUpdater.new(topic, admin).update!(status_name, true) + expect(updated).to eq(false) + expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(1) + + updated = TopicStatusUpdater.new(topic, admin).update!(status_name, false) + expect(updated).to eq(true) + expect(topic.send("#{status_name}?")).to eq(false) + + updated = TopicStatusUpdater.new(topic, admin).update!(status_name, false) + expect(updated).to eq(false) + expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(2) + end + + end + + it_behaves_like "an action that doesn't repeat" do + let(:status_name) { "closed" } + end + + it_behaves_like "an action that doesn't repeat" do + let(:status_name) { "visible" } + end + + it_behaves_like "an action that doesn't repeat" do + let(:status_name) { "archived" } + end + + it "updates autoclosed" do + topic = Fabricate(:topic) + updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', true) + expect(updated).to eq(true) + expect(topic.closed?).to eq(true) + + updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', true) + expect(updated).to eq(false) + expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(1) + + updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', false) + expect(updated).to eq(true) + expect(topic.closed?).to eq(false) + + updated = TopicStatusUpdater.new(topic, admin).update!('autoclosed', false) + expect(updated).to eq(false) + expect(topic.posts.where(post_type: Post.types[:small_action]).count).to eq(2) + end + + end end From e2ff06ce0257bc3cb843fd8d0dd8f0cea30886b8 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Fri, 7 Apr 2017 17:44:02 -0400 Subject: [PATCH 117/124] FIX: rounding error in spec --- spec/models/topic_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/topic_spec.rb b/spec/models/topic_spec.rb index 5feef5180d..8fe1d46d0b 100644 --- a/spec/models/topic_spec.rb +++ b/spec/models/topic_spec.rb @@ -697,7 +697,7 @@ describe Topic do it 'should archive correctly' do expect(@archived_topic).not_to be_archived - expect(@archived_topic.bumped_at.to_f).to eq(@original_bumped_at) + expect(@archived_topic.bumped_at.to_f).to be_within(0.1).of(@original_bumped_at) expect(@archived_topic.moderator_posts_count).to eq(1) end end From e7c2f5fd96768e52782da434f9a6c47fe7072ba0 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Sat, 8 Apr 2017 10:12:36 +0530 Subject: [PATCH 118/124] UX: show check mark glyph on 'Dismiss New' button on mobile --- .../javascripts/discourse/templates/mobile/discovery/topics.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs index 0fb3cb216d..c17937e618 100644 --- a/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/mobile/discovery/topics.hbs @@ -35,7 +35,7 @@ {{/if}} {{#if showResetNew}} - + {{/if}} {{#if latest}} From e49f3a408e87d60ddbd1e400f31231bcd147728f Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Mon, 10 Apr 2017 16:11:58 +0800 Subject: [PATCH 119/124] FEATURE: Add option for `ExcerptParser` to keep onebox source. --- lib/excerpt_parser.rb | 9 +++++++-- spec/components/pretty_text_spec.rb | 13 ++++++++++++- 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/excerpt_parser.rb b/lib/excerpt_parser.rb index 2c62b93719..c162bd89be 100644 --- a/lib/excerpt_parser.rb +++ b/lib/excerpt_parser.rb @@ -14,6 +14,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document @markdown_images = options[:markdown_images] == true @keep_newlines = options[:keep_newlines] == true @keep_emoji_images = options[:keep_emoji_images] == true + @keep_onebox_source = options[:keep_onebox_source] == true @remap_emoji = options[:remap_emoji] == true @start_excerpt = false end @@ -27,6 +28,7 @@ class ExcerptParser < Nokogiri::XML::SAX::Document parser.parse(html) end excerpt = me.excerpt.strip + excerpt = excerpt.gsub(/\s*\n+\s*/, "\n\n") if options[:keep_onebox_source] excerpt = CGI.unescapeHTML(excerpt) if options[:text_entities] == true excerpt end @@ -83,8 +85,11 @@ class ExcerptParser < Nokogiri::XML::SAX::Document end when "aside" - @in_quote = true - + @in_quote = true unless @keep_onebox_source + when 'article' + if @keep_onebox_source && attributes.include?(['class', 'onebox-body']) + @in_quote = true + end when "div", "span" if attributes.include?(["class", "excerpt"]) @excerpt = "" diff --git a/spec/components/pretty_text_spec.rb b/spec/components/pretty_text_spec.rb index 45655f92fe..8554b82c33 100644 --- a/spec/components/pretty_text_spec.rb +++ b/spec/components/pretty_text_spec.rb @@ -273,6 +273,17 @@ HTML expect(PrettyText.excerpt(emoji_code, 100)).to eq(":heart:") end + it "should have an option to preserver onebox source" do + onebox = "\n\n\n" + expected = "meta.discourse.org" + + expect(PrettyText.excerpt(onebox, 100, keep_onebox_source: true)) + .to eq(expected) + + expect(PrettyText.excerpt("#{onebox}\n \n \n \n\n\n #{onebox}", 100, keep_onebox_source: true)) + .to eq("#{expected}\n\n#{expected}") + end + end describe "strip links" do @@ -433,7 +444,7 @@ HTML it "replaces the custom emoji" do CustomEmoji.create!(name: 'trout', upload: Fabricate(:upload)) Emoji.clear_cache - + expect(PrettyText.cook("hello :trout:")).to match(/]+trout[^>]+>/) end end From 0013a23dc1a4a8e79687ac41129313f098c92150 Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Mon, 10 Apr 2017 08:01:25 -0400 Subject: [PATCH 120/124] SECURITY: prefer render plain/html to render text where possible --- app/controllers/admin/diagnostics_controller.rb | 8 ++++---- app/controllers/admin/email_controller.rb | 2 +- app/controllers/application_controller.rb | 4 ++-- app/controllers/exceptions_controller.rb | 2 +- app/controllers/forums_controller.rb | 4 ++-- app/controllers/onebox_controller.rb | 4 ++-- app/controllers/posts_controller.rb | 4 ++-- app/controllers/session_controller.rb | 2 +- app/controllers/static_controller.rb | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/admin/diagnostics_controller.rb b/app/controllers/admin/diagnostics_controller.rb index 161963519e..ba889837a3 100644 --- a/app/controllers/admin/diagnostics_controller.rb +++ b/app/controllers/admin/diagnostics_controller.rb @@ -14,7 +14,7 @@ class Admin::DiagnosticsController < Admin::AdminController text << "\n\nCOUNT #{statements.count}" - render text: text, content_type: Mime::TEXT + render plain: text end def memory_stats @@ -33,7 +33,7 @@ class Admin::DiagnosticsController < Admin::AdminController text = MemoryDiagnostics.memory_report(class_report: params.key?(:full)) end - render text: text, content_type: Mime::TEXT + render plain: text end def dump_heap @@ -46,9 +46,9 @@ class Admin::DiagnosticsController < Admin::AdminController ObjectSpace.dump_all(:output => io) io.close - render text: "HEAP DUMP:\n#{io.path}", content_type: Mime::TEXT + render plain: "HEAP DUMP:\n#{io.path}" rescue - render text: "HEAP DUMP:\nnot supported", content_type: Mime::TEXT + render plain: "HEAP DUMP:\nnot supported" end end diff --git a/app/controllers/admin/email_controller.rb b/app/controllers/admin/email_controller.rb index 416e0c1b94..74ce0901ec 100644 --- a/app/controllers/admin/email_controller.rb +++ b/app/controllers/admin/email_controller.rb @@ -85,7 +85,7 @@ class Admin::EmailController < Admin::AdminController def handle_mail params.require(:email) Email::Processor.process!(params[:email]) - render text: "email was processed" + render plain: "email was processed" end def raw_email diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 2c39073208..d7a37a3a45 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -29,7 +29,7 @@ class ApplicationController < ActionController::Base unless is_api? || is_user_api? super clear_current_user - render text: "[\"BAD CSRF\"]", status: 403 + render plain: "[\"BAD CSRF\"]", status: 403 end end @@ -159,7 +159,7 @@ class ApplicationController < ActionController::Base render_json_error I18n.t(type), type: type, status: status_code else - render text: build_not_found_page(status_code, include_ember ? 'application' : 'no_ember') + render html: build_not_found_page(status_code, include_ember ? 'application' : 'no_ember') end end diff --git a/app/controllers/exceptions_controller.rb b/app/controllers/exceptions_controller.rb index d04c4214d2..d5f21f8cb6 100644 --- a/app/controllers/exceptions_controller.rb +++ b/app/controllers/exceptions_controller.rb @@ -14,7 +14,7 @@ class ExceptionsController < ApplicationController # Don't show google search if it's embedded in the Ember app @hide_google = true - render text: build_not_found_page(200, false) + render html: build_not_found_page(200, false) end end diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index d0c6969e28..879fb27da7 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -6,9 +6,9 @@ class ForumsController < ApplicationController def status if $shutdown - render text: 'shutting down', status: 500, content_type: 'text/plain' + render plain: 'shutting down', status: 500 else - render text: 'ok', content_type: 'text/plain' + render plain: 'ok' end end diff --git a/app/controllers/onebox_controller.rb b/app/controllers/onebox_controller.rb index 9b09a0f3b8..c4e4fa47f4 100644 --- a/app/controllers/onebox_controller.rb +++ b/app/controllers/onebox_controller.rb @@ -9,7 +9,7 @@ class OneboxController < ApplicationController preview = Oneboxer.cached_preview(params[:url]) preview.strip! if preview.present? - return render(text: preview) if preview.present? + return render(plain: preview) if preview.present? # only 1 outgoing preview per user return render(nothing: true, status: 429) if Oneboxer.is_previewing?(params[:user_id]) @@ -26,7 +26,7 @@ class OneboxController < ApplicationController if preview.blank? render nothing: true, status: 404 else - render text: preview + render plain: preview end end diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index 8531c42e92..9feab0fe82 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -19,7 +19,7 @@ class PostsController < ApplicationController def markdown_num if params[:revision].present? post_revision = find_post_revision_from_topic_id - render text: post_revision.modifications[:raw].last, content_type: 'text/plain' + render plain: post_revision.modifications[:raw].last else markdown Post.find_by(topic_id: params[:topic_id].to_i, post_number: (params[:post_number] || 1).to_i) end @@ -27,7 +27,7 @@ class PostsController < ApplicationController def markdown(post) if post && guardian.can_see?(post) - render text: post.raw, content_type: 'text/plain' + render plain: post.raw else raise Discourse::NotFound end diff --git a/app/controllers/session_controller.rb b/app/controllers/session_controller.rb index b915c1401a..49e7639974 100644 --- a/app/controllers/session_controller.rb +++ b/app/controllers/session_controller.rb @@ -48,7 +48,7 @@ class SessionController < ApplicationController sso.moderator = current_user.moderator? if sso.return_sso_url.blank? - render text: "return_sso_url is blank, it must be provided", status: 400 + render plain: "return_sso_url is blank, it must be provided", status: 400 return end diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb index 2f12fe6d36..de2988d8a3 100644 --- a/app/controllers/static_controller.rb +++ b/app/controllers/static_controller.rb @@ -43,7 +43,7 @@ class StaticController < ApplicationController end if I18n.exists?("static.#{@page}") - render text: I18n.t("static.#{@page}"), layout: !request.xhr?, formats: [:html] + render html: I18n.t("static.#{@page}"), layout: !request.xhr?, formats: [:html] return end @@ -163,7 +163,7 @@ class StaticController < ApplicationController rescue Errno::ENOENT expires_in 1.second, public: true, must_revalidate: false - render text: "can not find #{params[:path]}", status: 404 + render plain: "can not find #{params[:path]}", status: 404 return end end From 3957540dd12eab8716c90b3a84c44fddc45496d1 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 10 Apr 2017 13:15:25 -0400 Subject: [PATCH 121/124] FIX: convert emoji to unicode in topic titles in emails --- app/mailers/user_notifications.rb | 7 ++++--- app/views/user_notifications/digest.html.erb | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb index 56593fe8aa..acf82ae2dc 100644 --- a/app/mailers/user_notifications.rb +++ b/app/mailers/user_notifications.rb @@ -4,6 +4,7 @@ require_dependency 'age_words' class UserNotifications < ActionMailer::Base include UserNotificationsHelper + include ApplicationHelper helper :application default charset: 'UTF-8' @@ -117,7 +118,7 @@ class UserNotifications < ActionMailer::Base .for_mailing_list(user, min_date) .where('posts.post_type = ?', Post.types[:regular]) .where('posts.deleted_at IS NULL AND posts.hidden = false AND posts.user_deleted = false') - .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 5.0) + .where("posts.post_number > ? AND posts.score > ?", 1, ScoreCalculator.default_score_weights[:like_score] * 1.0) .limit(SiteSetting.digest_posts) else [] @@ -399,7 +400,7 @@ class UserNotifications < ActionMailer::Base invite_template = "user_notifications.invited_to_topic_body" end topic_excerpt = post.excerpt.tr("\n", " ") if post.is_first_post? && post.excerpt - message = I18n.t(invite_template, username: username, topic_title: title, topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description) + message = I18n.t(invite_template, username: username, topic_title: gsub_emoji_to_unicode(title), topic_excerpt: topic_excerpt, site_title: SiteSetting.title, site_description: SiteSetting.site_description) unless translation_override_exists html = UserNotificationRenderer.new(Rails.configuration.paths["app/views"]).render( @@ -434,7 +435,7 @@ class UserNotifications < ActionMailer::Base end email_opts = { - topic_title: title, + topic_title: gsub_emoji_to_unicode(title), topic_title_url_encoded: title ? URI.encode(title) : title, message: message, url: post.url, diff --git a/app/views/user_notifications/digest.html.erb b/app/views/user_notifications/digest.html.erb index 6cee3a4e7e..44c83df06c 100644 --- a/app/views/user_notifications/digest.html.erb +++ b/app/views/user_notifications/digest.html.erb @@ -124,7 +124,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo

- <%= t.title.truncate(60, separator: /\s/) -%> + <%= gsub_emoji_to_unicode(t.title.truncate(60, separator: /\s/)) -%>

<%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> @@ -279,7 +279,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo

- <%= post.topic.title.truncate(60, separator: /\s/) -%> + <%= gsub_emoji_to_unicode(post.topic.title.truncate(60, separator: /\s/)) -%>

<%=t 'user_notifications.digest.join_the_discussion' %> @@ -325,7 +325,7 @@ body, table, td, th, h1, h2, h3 {font-family: Helvetica, Arial, sans-serif !impo - <%= t.title.truncate(60, separator: /\s/) -%> + <%= gsub_emoji_to_unicode(t.title.truncate(60, separator: /\s/)) -%> <%- if SiteSetting.show_topic_featured_link_in_digest && t.featured_link %> <%= raw topic_featured_link_domain(t.featured_link) %> From 6af864b969372fb045312f65e3910e323e05661f Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 10 Apr 2017 13:43:35 -0400 Subject: [PATCH 122/124] Update translations --- config/locales/client.ar.yml | 61 ++++---- config/locales/client.cs.yml | 15 +- config/locales/client.fi.yml | 49 +++++- config/locales/client.fr.yml | 2 + config/locales/client.he.yml | 32 +++- config/locales/client.nb_NO.yml | 270 ++++++++++++++++++-------------- config/locales/client.pl_PL.yml | 2 + config/locales/server.ar.yml | 4 +- config/locales/server.cs.yml | 9 ++ config/locales/server.de.yml | 88 +++++------ config/locales/server.fi.yml | 121 ++++++++++---- config/locales/server.he.yml | 39 ++++- config/locales/server.nb_NO.yml | 59 +++++-- config/locales/server.pl_PL.yml | 38 ++--- config/locales/server.ru.yml | 26 +-- public/422.cs.html | 2 +- 16 files changed, 513 insertions(+), 304 deletions(-) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index c4f9767899..043c4619a8 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -687,9 +687,9 @@ ar: warnings_received: "تحذيرات" messages: all: "الكل" - inbox: "البريد الوارد" - sent: "مرسلة" - archive: "الارشيف" + inbox: "الوارد" + sent: "الصّادر" + archive: "الأرشيف" groups: "مجموعاتي" bulk_select: "إختيار رسائل" move_to_inbox: "الذهاب إلى الرسائل الواردة" @@ -777,13 +777,13 @@ ar: last_posted: "آخر مشاركة" last_emailed: "أخر مراسلة" last_seen: "آخر تواجد مُنذ " - created: "إنضم" + created: "انضم" log_out: "اخرج" location: "الموقع" card_badge: - title: "وسام بطاقة المستخدم" + title: "شارة بطاقة المستخدم" website: "موقع الكتروني" - email_settings: "بريد الكتروني" + email_settings: "البريد الإلكترونيّ" like_notification_frequency: title: "أرسل إشعارا عند الإعجاب" always: "دوما" @@ -832,7 +832,7 @@ ar: notification_level_when_replying: "إن شاركت في موضوع ما، اجعله" invited: search: "نوع البحث عن الدعوات" - title: "دعوة" + title: "الدّعوات" user: "المستخدمين المدعويين" sent: "تم الإرسال" none: "لا توجد دعوات معلقة لعرضها." @@ -891,12 +891,12 @@ ar: many: "عدد المواضيع المنشأة" other: "عدد المواضيع المنشأة" post_count: - zero: "عدد المواضيع" - one: "عدد المواضيع" - two: "عدد المواضيع" - few: "عدد المواضيع" - many: "عدد المواضيع" - other: "عدد المواضيع" + zero: "عدد المشاركات" + one: "عدد المشاركات" + two: "عدد المشاركات" + few: "عدد المشاركات" + many: "عدد المشاركات" + other: "عدد المشاركات" likes_given: zero: "ما أعطى من " one: "ما أعطى من " @@ -912,19 +912,19 @@ ar: many: "ما استقبل من " other: "ما استقبل من " days_visited: - zero: "اجمالي الأيام التي زار فيها الموقع" - one: "اجمالي الأيام التي زار فيها الموقع" - two: "اجمالي الأيام التي زار فيها الموقع" - few: "اجمالي الأيام التي زار فيها الموقع" - many: "اجمالي الأيام التي زار فيها الموقع" - other: "اجمالي الأيام التي زار فيها الموقع" + zero: "أيّام الزّيارة" + one: "أيّام الزّيارة" + two: "أيّام الزّيارة" + few: "أيّام الزّيارة" + many: "أيّام الزّيارة" + other: "أيّام الزّيارة" posts_read: - zero: "لم يشاهد اي مشاركة بعد. " - one: "مشاركة مقروءة" - two: "مشاركة مقروءة" - few: "مشاركات مقروءة" - many: "مشاركة مقروءة" - other: "مشاركة مقروءة" + zero: "المشاركات المقروءة" + one: "المشاركات المقروءة" + two: "المشاركات المقروءة" + few: "المشاركات المقروءة" + many: "المشاركات المقروءة" + other: "المشاركات المقروءة" bookmark_count: zero: "عدد العلامات" one: "عدد العلامات" @@ -1047,7 +1047,7 @@ ar: username: 'إسم المستخدم' last_seen: 'شوهدت' created: 'مكتوبة' - created_lowercase: 'أُنشئ' + created_lowercase: 'الإنشاء' trust_level: 'مستوى التقة' search_hint: 'اسم المستخدم، أو بريد إلكترونيّ أو عنوان IP' create_account: @@ -1497,11 +1497,12 @@ ar: jump_reply_up: انتقل إلى أول رد jump_reply_down: انتقل إلى آخر رد deleted: "الموضوع محذوف" - auto_close_notice: "سيُغلق الموضوع آليًّا %{timeLeft}." - auto_close_notice_based_on_last_post: "سيُغلق الموضوع بعد %{duration} من آخر رد." + status_update_notice: + auto_open: "سيُفتح هذا الموضوع آليًّا %{timeLeft}." + auto_close: "سيُغلق هذا الموضوع آليًّا %{timeLeft}." + auto_publish_to_category: "سيُنشر هذا الموضوع في#%{categoryName} %{timeLeft}." + auto_close_based_on_last_post: "سيُغلق هذا الموضوع %{duration} بعد آخر ردّ فيه." auto_close_title: 'إعدادات الإغلاق الآلي' - auto_close_save: "احفظ" - auto_close_remove: "لا تغلق هذا الموضوع آليا" timeline: back: "الرجوع" back_description: "عُد إلى آخر مشاركة غير مقروءة" diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 011bf2519b..79f8643c90 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -365,6 +365,9 @@ cs: title: 'Editovat skupinu' full_name: 'Celé jméno' add: "Přidat" + automatic_group: Automatická skupina + membership: "Členství" + user_count: "Počet členů" bio: "O skupině" selector_placeholder: "Přidat členy" owner: "Vlastník" @@ -864,7 +867,7 @@ cs: hide_forever: "děkuji, ne" hidden_for_session: "Dobrá, zeptám se tě zítra. Pro založení účtu můžeš také vždy použít 'Přihlásit se'." intro: "Nazdar! :heart_eyes: Vypadá to, že si užíváš diskuzi, ale zatím jsi si nezaložil účet." - value_prop: "Pokud si založíš účet, budeme si přesně pomatovat, co jsi četly, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění, zde a přes e-mail, kdykoli přibydou nově příspěvky. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartbeat:" + value_prop: "Pokud si založíš účet, budeme si přesně pamatovat, co jsi četl, takže se vždycky vrátíš do bodu, odkud jsi odešel. Také budeš dostávat upozornění zde a přes e-mail, kdykoli přibudou nově příspěvky. A můžeš přidávat 'to se mi líbí' a šířit tak lásku. :heartbeat:" summary: enabled_description: "Čtete shrnutí tohoto tématu: nejzajímavější příspěvky podle komunity." description: "Je tu {{replyCount}} odpovědí." @@ -949,6 +952,7 @@ cs: invites: accept_title: "Pozvání" invited_by: "Pozvání od:" + success: "Váš účet byl vytvořen a nyní jste přihlášeni." emoji_set: apple_international: "Apple/Mezinárodní" google: "Google" @@ -1169,6 +1173,8 @@ cs: first: jsou první příspěvek v tématu pinned: jsou připnuty unpinned: nejsou připnuty + seen: jsem četl + unseen: jsem nečetl wiki: jsou wiki statuses: label: Kde příspěvky @@ -1192,6 +1198,8 @@ cs: topics: new_messages_marker: "poslední navštívení" bulk: + select_all: "Vybrat vše" + clear_all: "Zrušit vše" unlist_topics: "Odebrat témata ze seznamu" reset_read: "reset přečteného" delete: "Smazat témata" @@ -1326,6 +1334,7 @@ cs: go_bottom: "dolů" go: "go" jump_bottom: "na poslední příspěvek" + jump_prompt: "přejít na..." jump_prompt_long: "Na který příspěvek chcete přejít?" jump_bottom_with_number: "Skočit na příspěvěk %{post_number}" total: celkem příspěvků @@ -2015,7 +2024,7 @@ cs: keyboard_shortcuts_help: title: 'Klávesové zkratky' jump_to: - title: 'Jump To' + title: 'Přejít na' home: 'g, h Domů' latest: 'g, l Poslední' new: 'g, n Nový' @@ -2200,7 +2209,7 @@ cs: admins: 'Administrátoři:' blocked: 'Blokováno:' suspended: 'Zakázáno:' - private_messages_short: "Msgs" + private_messages_short: "Zpráv" private_messages_title: "Zprávy" mobile_title: "Mobilní verze" space_free: "{{size}} prázdné" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index ff2b61ad74..0518f2ac4c 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -366,7 +366,7 @@ fi: automatic_group: Automaattinen ryhmä closed_group: Suljettu ryhmä is_group_user: "Olet tämän ryhmän jäsen" - allow_membership_requests: "Salli käyttäjien lähettää jäsenhakemuksia ryhmien isännille (vaatii että kaikki voivat mainita ryhmän)" + allow_membership_requests: "Salli käyttäjän lähettää jäsenhakemuksia ryhmien isännille" membership: "Jäsenyys" name: "Nimi" user_count: "Jäsenmäärä" @@ -564,7 +564,8 @@ fi: muted_users: "Vaimennetut" muted_users_instructions: "Älä näytä ilmoituksia näiltä käyttäjiltä" muted_topics_link: "Näytä vaimennetut ketjut" - watched_topics_link: "Näytä tarkkaillut ketjut" + watched_topics_link: "Näytä tarkkailtavat ketjut" + tracked_topics_link: "Näytä seurattavat ketjut" automatically_unpin_topics: "Poista kiinnitetyn ketjun kiinnitys automaattisesti, kun olen selannut sen loppuun." apps: "Sovellukset" revoke_access: "Peru käyttöoikeus" @@ -939,6 +940,10 @@ fi: not_allowed_from_ip_address: "Kirjautuminen estetty tästä IP-osoitteesta." admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta." resend_activation_email: "Klikkaa tästä lähettääksesi vahvistusviestin uudelleen." + resend_title: "Lähetä aktivointisähköposti uudelleen" + change_email: "Vaihda sähköpostiosoitetta" + provide_new_email: "Anna uusi osoite niin lähetämme sinulle vahvistamissähköpostin." + submit_new_email: "Päivitä sähköpostiosoite" sent_activation_email_again: "Lähetimme uuden vahvistusviestin sinulle osoitteeseen {{currentEmail}}. Viestin saapumisessa voi kestää muutama minuutti; muista tarkastaa myös roskapostikansio." to_continue: "Ole hyvä ja kirjaudu sisään" preferences: "Sinun täytyy olla kirjautuneena sisään muokataksesi tilisi asetuksia" @@ -1155,6 +1160,7 @@ fi: sort_by: "Järjestä" relevance: "Osuvuus" latest_post: "Uusin viesti" + latest_topic: "Uusin ketju" most_viewed: "Katselluin" most_liked: "Tykätyin" select_all: "Valitse kaikki" @@ -1333,11 +1339,37 @@ fi: jump_reply_up: hyppää aiempaan vastaukseen jump_reply_down: hyppää myöhempään vastaukseen deleted: "Tämä ketju on poistettu" - auto_close_notice: "Tämä ketju sulkeutuu automaattisesti %{timeLeft}." - auto_close_notice_based_on_last_post: "Tämä ketju suljetaan %{duration} kuluttua viimeisimmästä viestistä." + topic_status_update: + title: "Aseta ajastin ketjulle" + save: "Aseta ajastin" + time: "Aika:" + remove: "Poista ajastin" + publish_to: "Mihin julkaistaan:" + auto_update_input: + limited: + units: "(# tuntia)" + examples: 'Syötä aika tunteina (24).' + all: + examples: 'Syötä aika tunteina (24), kellonaikana (17:30) tai aikaleimana (2013-11-22 14:00).' + publish_to_category: + title: "Julkaise määrättynä ajankohtana" + temp_open: + title: "Avaa väliaikaisesti" + auto_reopen: + title: "Avaa ketju automaattisesti" + temp_close: + title: "Sulje väliaikaisesti" + auto_close: + title: "Sulje ketju automaattisesti" + label: "Aika, jolloin suljetaan automaattisesti:" + error: "Arvo ei kelpaa." + based_on_last_post: "Älä sulje ennen kuin viimeisin viesti ketjussa on ainakin näin vanha." + status_update_notice: + auto_open: "Ketju avautuu automaattisesti %{timeLeft}." + auto_close: "Ketju suljetaan ajastetusti %{timeLeft}." + auto_publish_to_category: "Ketju julkaistaan alueella #%{categoryName} %{timeLeft}." + auto_close_based_on_last_post: "Ketju sulkeutuu %{duration} viimeisimmästä viestistä." auto_close_title: 'Automaattisen sulkemisen asetukset' - auto_close_save: "Tallenna" - auto_close_remove: "Älä sulje tätä ketjua automaattisesti" auto_close_immediate: one: "Ketjun viimeisin viesti on jo tunnin vanha, joten ketju suljetaan heti." other: "Ketjun viimeisin viesti on jo %{hours} tuntia vanha, joten ketju suljetaan heti." @@ -1370,7 +1402,7 @@ fi: '2_8': 'Saat ilmoituksia, koska olet asettanut tämän alueen seurantaan.' '2_4': 'Saat ilmoituksia, koska olet kirjoittanut ketjuun.' '2_2': 'Saat ilmoituksia, koska olet asettanut ketjun seurantaan.' - '2': 'Saat ilmoituksia, koska luit ketjua aiemmin.' + '2': 'Saat ilmoituksia, koska luit ketjua aiemmin.' '1_2': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.' '1': 'Saat ilmoituksen jos joku mainitsee @nimesi tai vastaa sinulle.' '0_7': 'Et saa mitään ilmoituksia tältä alueelta.' @@ -1406,7 +1438,7 @@ fi: open: "Avaa ketju" close: "Sulje ketju" multi_select: "Valitse viestejä..." - auto_close: "Sulje automaattisesti..." + timed_update: "Aseta ajastin ketjulle..." pin: "Kiinnitä ketju..." unpin: "Poista ketjun kiinnitys..." unarchive: "Poista ketjun arkistointi" @@ -2854,6 +2886,7 @@ fi: logged_out: "Käyttäjä on kirjautunut ulos kaikilla laitteilla" revoke_admin: 'Peru ylläpitäjän oikeudet' grant_admin: 'Myönnä ylläpitäjän oikeudet' + grant_admin_confirm: "Vahvistaaksemme uuden ylläpitäjän lähetimme sinulle sähköpostin. Avaa se ja noudata ohjeita." revoke_moderation: 'Peru valvojan oikeudet' grant_moderation: 'Myönnä valvojan oikeudet' unblock: 'Poista esto' diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 44830f0ab4..f0507ce6dd 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -933,6 +933,8 @@ fr: not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter depuis cette adresse IP." admin_not_allowed_from_ip_address: "Vous ne pouvez pas vous connecter comme administrateur depuis cette adresse IP." resend_activation_email: "Cliquez ici pour envoyer à nouveau le courriel d'activation." + resend_title: "Renvoyer le courriel d'activation" + change_email: "Changer l'adresse de courriel" sent_activation_email_again: "Nous venons d'envoyer un nouveau courriel d'activation à {{currentEmail}}. Il peut prendre quelques minutes à arriver; n'oubliez pas de vérifier votre répertoire spam." to_continue: "Veuillez vous connecter" preferences: "Vous devez être connecté pour modifier vos préférences utilisateur." diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 0695394f8f..77720ccfa8 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -366,7 +366,7 @@ he: automatic_group: קבוצה אוטומטית closed_group: קבוצה סגורה is_group_user: "אתם חברים בקבוצה זו." - allow_membership_requests: "אפשרו למשתמשים לשלוח בקשות חברות לבעלי הקבוצה (מצריך שכולם יוכלו לאזכר את הקבוצה)" + allow_membership_requests: "אפשרו למשתמשים לשלוח בקשות חברות לבעלי קבוצה" membership: "חברות" name: "שם" user_count: "מספר חברים" @@ -564,6 +564,7 @@ he: muted_users_instructions: "להשבית כל התראה ממשתמשים אלו" muted_topics_link: "הצג נושאים שהושתקו" watched_topics_link: "הצגת נושאים נצפים" + tracked_topics_link: "הצגת נושאים במעקב" automatically_unpin_topics: "בטל נעיצת נושאים באופן אוטומטי כאשר אני מגיע/ה לתחתית." apps: "אפליקציות" revoke_access: "שלילת גישה" @@ -938,6 +939,10 @@ he: not_allowed_from_ip_address: "אינכם יכולים להתחבר מכתובת IP זו." admin_not_allowed_from_ip_address: "אינכם יכולים להתחבר כמנהל מערכת מכתובת IP זו." resend_activation_email: "יש ללחוץ כאן לשליחת דואר אלקטרוני חוזר להפעלת החשבון." + resend_title: "שליחה מחדש של מייל הפעלה" + change_email: "שינוי כתובת מייל" + provide_new_email: "הזינו כתובת חדשה ונשלח מחדש את מייל האישור שלכם." + submit_new_email: "עדכון כתובת מייל" sent_activation_email_again: "שלחנו לך הודעת דואר אלקטרוני נוספת להפעלת החשבון לכתובת {{currentEmail}}. זה יכול לקחת כמה דקות עד שיגיע, לא לשכוח לבדוק את תיבת דואר הזבל." to_continue: "התחברו בבקשה" preferences: "אתם צריכים להיות מחוברים כדי לשנות את העדפות המשתמש שלכם." @@ -1154,6 +1159,7 @@ he: sort_by: "מיון על פי" relevance: "רלוונטיות" latest_post: "הפוסטים האחרונים" + latest_topic: "נושא אחרון" most_viewed: "הנצפה ביותר" most_liked: "האהובים ביותר" select_all: "בחירה של הכל" @@ -1334,11 +1340,27 @@ he: jump_reply_up: קפיצה לתגובה קודמת jump_reply_down: קפיצה לתגובה מאוחרת deleted: "הנושא הזה נמחק" - auto_close_notice: "הנושא הזה יסגר אוטומטית %{timeLeft}." - auto_close_notice_based_on_last_post: "נושא זה ייסגר %{duration} אחר התגובה האחרונה." + topic_status_update: + title: "קביעת שעון עצר לנושא" + save: "קביעת שעון עצר" + time: "זמן:" + publish_to: "פרסום ל:" + auto_update_input: + limited: + units: "(# שעות)" + examples: 'הכניסו מספר שעות (24).' + publish_to_category: + title: "תזמון פרסום" + temp_open: + title: "פתיחה זמנית" + auto_reopen: + title: "פתיחה אוטומטית של נושא" + temp_close: + title: "סגירה זמנית" + auto_close: + title: "סגירה אוטומטית של נושא" + error: "אנא הכניסו ערך תקין." auto_close_title: 'הגדרות סגירה אוטומטית' - auto_close_save: "שמור" - auto_close_remove: "אל תנעל נושא זה אוטומטית" auto_close_immediate: one: "הפוסט האחרון בנושא הוא כבר בן שעה, אז הנושא ייסגר מיידית." other: "הפוסט האחרון בנושא הוא כבר בן %{count} שעות, אז הנושא ייסגר אוטומטית." diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index cb59c5ac9b..0ad682aeeb 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -176,7 +176,7 @@ nb_NO: links_lowercase: one: "link" other: "lenker" - faq: "FAQ" + faq: "O-S-S" guidelines: "Retningslinjer" privacy_policy: "Personvernerklæring" privacy: "Personvern" @@ -214,7 +214,7 @@ nb_NO: all_time: "Gjennom tidene" last_7_days: "Siste 7 dager" last_30_days: "Siste 30 dager" - like_count: "Likes" + like_count: "Kjærtegn" topic_count: "Emner" post_count: "Innlegg" user_count: "Brukere" @@ -266,13 +266,13 @@ nb_NO: choose_topic: none_found: "Ingen emner funnet." title: - search: "Søk etter et emne ved navn, url eller id:" + search: "Søk etter et emne ved navn, URL eller ID:" placeholder: "skriv emnetittelen her" queue: topic: "Emne:" approve: 'Godkjenn' reject: 'Avvis' - delete_user: 'Slett Bruker' + delete_user: 'Slett bruker' title: "Trenger godkjenning" none: "Det er ingen innlegg som må evalueres." edit: "Rediger" @@ -366,7 +366,7 @@ nb_NO: automatic_group: Automatisk gruppe closed_group: Lukket gruppe is_group_user: "Du er medlem av denne gruppen" - allow_membership_requests: "Tillat brukere å sende forespørsler om medlemskap av gruppen til eiere (Krever at alle kan nevne gruppen)" + allow_membership_requests: "Tillat brukere å sende forespørsler om medlemskap av gruppen til eiere" membership: "Medlemskap" name: "Navn" user_count: "Antall medlemmer" @@ -422,8 +422,8 @@ nb_NO: flair_preview_image: "Forhåndsvis bilde" flair_note: "Merk: Bilde for gruppetilhørighet på avatar vil bare vises for brukerens primære gruppe." user_action_groups: - '1': "Liker tildelt" - '2': "Liker mottatt" + '1': "Kjærtegn tildelt" + '2': "Kjærtegn mottatt" '3': "Bokmerker" '4': "Emner" '5': "Svar" @@ -563,7 +563,8 @@ nb_NO: muted_users: "Ignorert" muted_users_instructions: "Skjul alle varsler fra denne brukeren" muted_topics_link: "Vis ignorerte emner" - watched_topics_link: "Se emner som følges" + watched_topics_link: "Vis fulgte emner" + tracked_topics_link: "Vis fulgte emner" automatically_unpin_topics: "Automatisk fjern feste for emner når jeg når bunnen." apps: "Apper" revoke_access: "Trekk tilbake tilgang" @@ -607,7 +608,7 @@ nb_NO: title: "Endre e-postadresse" taken: "Beklager, den e-postadressen er ikke tilgjengelig." error: "Det oppsto en feil ved endring av din e-postadresse. Kanskje den adressen allerede er i bruk?" - success: "Vi har sendt en e-post til den adressen. Følg meldingens instruksjoner for bekreftelse." + success: "Vi har sendt en e-post til den adressen. Følg instruksjonene i meldingen." change_avatar: title: "Bytt profilbilde" gravatar: "Gravatar, basert på" @@ -677,7 +678,7 @@ nb_NO: first_time: "Første gang et innlegg blir likt" never: "Aldri" email_previous_replies: - title: "Inkludér tidligere svar nederst i e-poster" + title: "Inkluder tidligere svar nederst i e-poster" unless_emailed: "med mindre sendt tidligere" always: "alltid" never: "aldri" @@ -689,7 +690,7 @@ nb_NO: every_three_days: "hver tredje dag" weekly: "ukentlig" every_two_weeks: "annenhver uke" - include_tl0_in_digests: "Inkludér innhold fra nye brukere i oppsummerings-eposter" + include_tl0_in_digests: "Inkluder innhold fra nye brukere i oppsummerings-eposter" email_in_reply_to: "Inkluder et utdrag i e-poster av innlegget man svarer på" email_direct: "Motta en e-post når noen siterer meg, svarer på innlegget mitt, nevner @brukernavnet mitt eller inviterer meg til et emne" email_private_messages: "Motta en e-post når noen sender meg en melding" @@ -793,14 +794,14 @@ nb_NO: no_topics: "Ingen emner enda." more_topics: "Flere Emner" top_badges: "Toppmerker" - no_badges: "Ennå ingen merker." + no_badges: "Ingen merker enda." more_badges: "Flere merker" top_links: "Topplenker" no_links: "Ingen lenker enda" most_liked_by: "Mest likt av" most_liked_users: "Mest likt" most_replied_to_users: "Mest besvart" - no_likes: "Ingen liker dette enda." + no_likes: "Ingen kjærtegner dette enda." associated_accounts: "Innloggingsforsøk" ip_address: title: "Siste IP-adresse" @@ -832,18 +833,18 @@ nb_NO: network_fixed: "Ser ut som om den er tilbake." server: "Feilkode: {{status}}" forbidden: "Du har ikke tilgang til dette." - not_found: "Oisann, applikasjonen forsøkte å laste en URL som ikke eksisterer." + not_found: "Oisann, programmet forsøkte å laste inn en URL som ikke eksisterer." unknown: "Noe gikk galt." buttons: back: "Gå tilbake" again: "Prøv igjen" fixed: "Last side" close: "Lukk" - assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Oppdater nå for siste versjon?" + assets_changed_confirm: "Dette nettstedet ble nettopp oppdatert. Gjenoppfrisk nå for siste versjon?" logout: "Du ble logget ut" refresh: "Refresh" read_only_mode: - enabled: "Dette nettstedet er i lese-modus. Fortsett gjerne, men du kan ikke svare, trykke liker eller utføre andre handlinger som er slått av." + enabled: "Dette nettstedet er i lesemodus. Fortsett gjerne, men du kan ikke svare, gi kjærtegn eller utføre andre handlinger som er slått av." login_disabled: "Innlogging er deaktivert mens nettsiden er i skrivebeskyttet modus." logout_disabled: "Du kan ikke logge ut når nettstedet er i lese-modus." too_few_topics_and_posts_notice: "La oss få i gang diskusjonen. Det finnes for øyeblikket %{currentTopics} / %{requiredTopics} emner og %{currentPosts} / %{requiredPosts} innlegg. Nye brukere trenger noen samtaler å lese og svare på." @@ -881,7 +882,7 @@ nb_NO: intro: "Hei du! :heart_eyes: Det ser ut som du følger diskusjonen, men ikke har registrert deg enda." value_prop: "Når du registrerer deg husker vi hvor langt du har lest, så du starter på riktig sted neste gang du åpner en tråd. Du får også varsler, her og på e-post når det skjer ting i diskusjonene du vil følge. I tillegg kan du like innlegg :heartbeat:" summary: - enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: de mest interessante innleggene ifølge fellesskapet." + enabled_description: "Du ser for øyeblikket en oppsummering av dette emnet: De mest interessante innleggene ifølge fellesskapet." description: "Det er {{replyCount}} svar." description_time: "Det er {{replyCount}} svar med en forventet lesetid på {{readingTime}} minutter." enable: 'Oppsummer dette emnet' @@ -904,7 +905,7 @@ nb_NO: trust_level: 'Tillitsnivå' search_hint: 'brukernavn, e-post eller IP-adresse' create_account: - disclaimer: "Ved å registrere deg samtykker du til Personvernerklæringen og Bruksvilkårene." + disclaimer: "Ved å registrere deg samtykker du til personvernserklæringen og bruksvilkårene." title: "Opprett ny konto" failed: "Noe gikk galt, kanskje denne e-postadressen allerede er registrert. Prøv lenke for glemt passord" forgot_password: @@ -938,6 +939,10 @@ nb_NO: not_allowed_from_ip_address: "Du kan ikke logge inn fra den IP-adressen." admin_not_allowed_from_ip_address: "Du kan ikke logge inn som administrator fra den IP-adressen." resend_activation_email: "Klikk her for å sende e-posten for aktivering igjen." + resend_title: "Send aktivterings-e-post på nytt" + change_email: "Endre e-postadresse" + provide_new_email: "Oppgi en ny adresse og vi vil sende din aktiverings-e-post på nytt." + submit_new_email: "Oppdater e-postadresse" sent_activation_email_again: "Vi sendte deg en ny e-post for aktivering på {{currentEmail}}. Det kan ta noen minutter før den kommer fram; sørg for at du sjekker nettsøppel om du ikke finner den." to_continue: "Logg inn" preferences: "Du må være innlogget for å endre brukerinnstillinger." @@ -945,25 +950,25 @@ nb_NO: not_approved: "Kontoen din har ikke blitt godkjent enda. Du vil få beskjed via e-post når du er klar til å logge inn." google: title: "med Google" - message: "Autentiserer med Google (sørg for at du tillater pop-up vindu)" + message: "Autentiserer med Google (sørg for at du tillater oppsprettsvindu)" google_oauth2: title: "med Google" message: "Autentiserer med Google (sørg for at du tillater pop-up vindu)" twitter: title: "med Twitter" - message: "Autentiserer med Twitter (sørg for at du tillater pop-up vindu)" + message: "Autentiserer med Twitter (sørg for at du tillater oppsprettsvindu)" instagram: title: "med Instagram" message: "Logger på med Instagram. Sørg for at du ikke har programvare som blokkerer forgrunnsvinduer." facebook: title: "med Facebook" - message: "Autentiserer med Facebook (sørg for at du tillater pop-up vindu)" + message: "Autentiserer med Facebook (sørg for at du tillater oppsprettsvindu)" yahoo: title: "med Yahoo" - message: "Autentiserer med Yahoo (sørg for at du tillater pop-up vindu)" + message: "Autentiserer med Yahoo (sørg for at du tillater oppsprettsvindu)" github: title: "med GitHub" - message: "Autentiserer med GitHub (sørg for at du tillater pop-up vindu)" + message: "Autentiserer med GitHub (sørg for at du tillater oppsprettsvindu)" invites: accept_title: "Invitasjon" welcome_to: "Velkommen til %{site_name}!" @@ -1039,7 +1044,7 @@ nb_NO: saved: "Lagret!" saved_draft: "Innleggsutkast. Velg for å fortsette." uploading: "Laster opp…" - show_preview: 'se forhånsvisning »' + show_preview: 'forhånsvis »' hide_preview: '« skjul forhåndsvisning' quote_post_title: "Siter hele innlegget" bold_label: "F" @@ -1055,18 +1060,18 @@ nb_NO: link_url_placeholder: "http://example.com" quote_title: "Sitatramme" quote_text: "Sitatramme" - code_title: "Kode Utsnitt" + code_title: "Kodeutsnitt" code_text: "Skriv inn preformattert tekst med 4 mellomroms innrykk." paste_code_text: "skriv inn eller kopier kode her" upload_title: "Bilde" upload_description: "beskriv bildet her" - olist_title: "Nummerert Liste" - ulist_title: "Kulepunkt Liste" + olist_title: "Nummerert liste" + ulist_title: "Kulepunktliste" list_item: "Listeelement" heading_label: "O" heading_title: "Overskrift" heading_text: "Overskrift" - hr_title: "Horisontalt Skille" + hr_title: "Horisontalt skille" help: "Hjelp for redigering i Markdown" toggler: "gjem eller vis redigeringspanelet" modal_ok: "OK" @@ -1137,11 +1142,11 @@ nb_NO: private_message: '{{username}} sendte deg en privat melding: "{{topic}}" - {{site_title}}' linked: '{{username}} lenket til ditt innlegg i "{{topic}}" - {{site_title}}' upload_selector: - title: "Legg til Bilde" + title: "Legg til bilde" title_with_attachments: "Legg til et bilde eller en fil" - from_my_computer: "Fra Min Enhet" + from_my_computer: "Fra min enhet" from_the_web: "Fra nettet" - remote_tip: "link til bilde" + remote_tip: "lenke til bilde" remote_tip_with_attachments: "lenke til bilde eller fil {{authorized_extensions}}" local_tip: "velg bilder fra din enhet" local_tip_with_attachments: "velg bilde eller fil fra din enhet {{authorized_extensions}}" @@ -1154,6 +1159,7 @@ nb_NO: sort_by: "Sorter etter" relevance: "Relevanse" latest_post: "Siste innlegg" + latest_topic: "Siste emne" most_viewed: "Mest Lest" most_liked: "Mest Likt" select_all: "Velg alle" @@ -1216,7 +1222,7 @@ nb_NO: new_item: "ny" go_back: 'gå tilbake' not_logged_in_user: 'brukerside med oppsummering av nåværende aktivtet og preferanser.' - current_user: 'go til din brukerside' + current_user: 'gå til din brukerside' topics: new_messages_marker: "siste besøk" bulk: @@ -1254,7 +1260,7 @@ nb_NO: latest: "Det finnes ingen siste emner. Det var synd." hot: "Det er ingen populære emner." bookmarks: "Du har ingen bokmerkede emner." - category: "Det er ingen {{category}} emner." + category: "Det er ingen {{category}}-emner." top: "Det er ingen populære emner." search: "Det er ingen søkeresultater" educate: @@ -1267,7 +1273,7 @@ nb_NO: read: "Det er ingen leste emner igjen å lese." new: "Det er ingen nye emner igjen å lese." unread: "Det er ingen uleste emner igjen å lese." - category: "Det er ingen {{category}} emner igjen." + category: "Det er ingen {{category}}-emner igjen." top: "Det er ingen flere populære emner." bookmarks: "Det er ingen bokmerkede emner." search: "Det er ingen flere søkeresultater" @@ -1317,10 +1323,10 @@ nb_NO: one: "Det er 1 nytt innlegg i dette emnet siden sist du leste det" other: "Det er {{count}} nye innlegg i dette emnet siden sist du leste det" likes: - one: "det er 1 liker i dette emnet" - other: "det er {{count}} liker i dette emnet" - back_to_list: "Tilbake til Emnelisten" - options: "Valg for Emner" + one: "det er ett kjærtegn i dette emnet" + other: "det er {{count}} kjærtegn i dette emnet" + back_to_list: "Tilbake til emnelisten" + options: "Valg for emner" show_links: "vis lenker i dette emnet" toggle_information: "vis/skjul emnedetaljer" read_more_in_category: "Vil du lese mer? Bla gjennom andre emner i {{catLink}} eller {{latestLink}}." @@ -1332,11 +1338,37 @@ nb_NO: jump_reply_up: hopp til tidligere svar jump_reply_down: hopp til senere svar deleted: "Emnet har blitt slettet" - auto_close_notice: "Dette emnet vil automatisk lukkes %{timeLeft}." - auto_close_notice_based_on_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget." + topic_status_update: + title: "Sett emneutløp" + save: "Sett utløp" + time: "Tid:" + remove: "Fjern utløp" + publish_to: "Publiser til:" + auto_update_input: + limited: + units: "(# timer)" + examples: 'Før inn antall timer (24).' + all: + examples: 'Før inn antall timer (24), absolutt tid (17:30) eller tidsstempel (2013-11-22 14:00).' + publish_to_category: + title: "Planlegg publisering" + temp_open: + title: "Åpne midlertidig" + auto_reopen: + title: "Auto-åpning av emne" + temp_close: + title: "Lukk midlertidig" + auto_close: + title: "Auto-lukk emne" + label: "Tid for auto-lukking av emne:" + error: "Skriv inn en gyldig verdi." + based_on_last_post: "Ikke lukk før det siste innlegget i emnet er minst så gammelt." + status_update_notice: + auto_open: "Dette emnet vil automatisk åpnes %{timeLeft}." + auto_close: "Dette emnet vil automatisk lukkes %{timeLeft}." + auto_publish_to_category: "Dette emnet vil bli publisert til #%{categoryName} %{timeLeft}." + auto_close_based_on_last_post: "Dette emnet vil bli lukket %{duration} etter det siste innlegget." auto_close_title: 'Auto-lukk innstillinger' - auto_close_save: "Lagre" - auto_close_remove: "Ikke lukk dette emnet automatisk" auto_close_immediate: one: "Det siste innlegget i emnet er allerede en time gammelt, så emnet vil stenges umiddelbart." other: "Det siste innlegget i emnet er allerede %{count} timer gammelt, så emnet vil stenges umiddelbart." @@ -1369,7 +1401,7 @@ nb_NO: '2_8': 'Du vil motta varsler fordi du overvåker denne kategorien.' '2_4': 'Du vil motta varsler fordi du svarte på dette emnet.' '2_2': 'Du vil motta varsler fordi du overvåker dette emnet.' - '2': 'Du vil motta varsler fordi du read this topic.' + '2': 'Du vil motta varsler fordi du leste dette emnet.' '1_2': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.' '1': 'Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg.' '0_7': 'Du ignorerer alle varsler i denne kategorien.' @@ -1405,7 +1437,7 @@ nb_NO: open: "Åpne emne" close: "Lukk emne" multi_select: "Velg innlegg…" - auto_close: "Lukk automatisk" + timed_update: "Sett emneutløp…" pin: "Fest emnet…" unpin: "Løsne emne…" unarchive: "Opphev arkivering av emne" @@ -1466,17 +1498,17 @@ nb_NO: inviting: "Inviterer…" automatically_add_to_groups: "Denne invitasjonen inkluderer også tilgang til disse gruppene:" invite_private: - title: 'Invitér til samtale' + title: 'Inviter til samtale' email_or_username: "Invitertes e-post eller brukernavn." email_or_username_placeholder: "e-postadresse eller brukernavn" - action: "Invitér" + action: "Inviter" success: "Vi har invitert denne brukeren til å delta i denne meldingen." success_group: "Vi har invitert denne gruppen til å delta i denne meldingen." error: "Beklager, det oppstod en feil ved å invitere den brukeren." group_name: "gruppenavn" controls: "Emnefunksjoner" invite_reply: - title: 'Invitér' + title: 'Inviter' username_placeholder: "brukernavn" action: 'Send Invitasjon' help: 'Inviter andre til dette emnet via e-post eller varsler' @@ -1505,7 +1537,7 @@ nb_NO: one: "Du er i ferd med å lage et nytt emne basert på innlegget du har valgt.." other: "Du er i ferd med å lage et nytt emne basert på {{count}} innlegg du har valgt." merge_topic: - title: "Slå sammen Emne" + title: "Slå sammen emne" action: "slå sammen emne" error: "Det oppsto en feil ved sammenslåing av dette emnet." instructions: @@ -1569,8 +1601,8 @@ nb_NO: one: "{{count}} svar" other: "{{count}} svar" has_likes: - one: "{{count}} Like" - other: "{{count}} liker" + one: "{{count}} kjærtegn" + other: "{{count}} kjærtegn" has_likes_title: one: "{{count}} bruker likte dette innlegget" other: "{{count}} brukere likte dette innlegget" @@ -1580,10 +1612,10 @@ nb_NO: other: "du og {{count}} andre likte dette innlegget" errors: create: "Beklager, det oppstod en feil ved å publisere ditt innlegg. Prøv igjen." - edit: "Beklager, det oppstod en feil ved redigeringen av ditt innlegg. Vennligst prøv igjen." - upload: "Sorry, there was an error uploading that file. Please try again." + edit: "Det oppstod en feil ved redigeringen av ditt innlegg. Prøv igjen." + upload: "Det skjedde en feil når filen ble lastet opp. Prøv igjen senere. " file_too_large: "Beklager, den filen er for stor. Største tillatte størrelse er {{max_size_kb}} kb. Hvorfor ikke heller laste opp filen til en fildelingstjeneste og dele lenken?" - too_many_uploads: "Beklager, du kan bare laste opp ett bilde om gangen." + too_many_uploads: "Du kan bare laste opp ett bilde av gangen." too_many_dragged_and_dropped_files: "Beklager, du kan bare laste opp 10 filer om gangen." upload_not_authorized: "Beklager, filen du forsøket å laste opp er ikke tillatt. Tillatte filendelser er {{authorized_extensions}}." image_upload_not_allowed_for_new_user: "Beklager, nye brukere kan ikke laste opp bilder" @@ -1599,8 +1631,8 @@ nb_NO: wiki: about: "dette innlegget er en wiki" archetypes: - save: 'Lagre Alternativene' - few_likes_left: "Takk for at du sprer kjærlighet! Du vil nå grensen for antall ting du kan like i dag ganske snart." + save: 'Lagre alternativene' + few_likes_left: "Takk for at du sprer kjærlighet! Du vil nå grensen for antall ting du kan kjærtegne i dag ganske snart." controls: reply: "begynn å skrive et svar til dette innlegget" like: "lik dette innlegget" @@ -1641,7 +1673,7 @@ nb_NO: vote: "Angre stemme" people: off_topic: "markerte dette som urelatert" - spam: "flagget dette som spam" + spam: "flagget dette som søppelpost" inappropriate: "flagget dette som upassende" notify_moderators: "varslet moderatorer" notify_user: "sendte en melding" @@ -1755,7 +1787,7 @@ nb_NO: choose: 'Velg en katekori…' edit: 'rediger' edit_long: "Rediger" - view: 'Se Emner i Kategori' + view: 'Se emner i kategori' general: 'Generellt' settings: 'Innstillinger' topic_template: "Emnemal" @@ -1768,10 +1800,10 @@ nb_NO: delete: 'Slett kategori' create: 'Ny Kategori' create_long: 'Opprett en ny kategori' - save: 'Lagre Kategori' + save: 'Lagre kategori' slug: 'Kategorinavn i URL' slug_placeholder: '(valgfritt) Sammensatte ord for bruk i URL' - creation_error: Det oppstod en feil ved å lage denne kategorien. + creation_error: Det oppstod en feil ved lagring av denne kategorien. save_error: Det oppstod en feil ved lagrinen av denne kategorien. name: "Kategorinavn" description: "Beskrivelse" @@ -1782,19 +1814,19 @@ nb_NO: background_color: "Bakgrunnsfarge" foreground_color: "Forgrunnsfarge" name_placeholder: "Bør være kortfattet." - color_placeholder: "Enhver webfarge" + color_placeholder: "Vilkårlig vevfarge" delete_confirm: "Er du sikker på at du vil slette denne kategorien?" delete_error: "Det oppstod en feil ved å slette denne kategorien." - list: "List Kategorier" + list: "List opp kategorier" no_description: "Legg til en beskrivelse for denne kategorien." - change_in_category_topic: "Rediger Beskrivelse" + change_in_category_topic: "Rediger beskrivelse" already_used: 'Denne fargen er i bruk av en annen kategori' security: "Sikkerhet" special_warning: "Advarsel: Denne kategorien er en forhåndsbestemt kategori og dens sikkerhetsinnstillinger kan ikke endres. Hvis du ikke vil bruke denne kategorien, slett den i stedet for å bruke den til noe annet." images: "Bilder" auto_close_label: "Lukk emner automatisk etter:" auto_close_units: "timer" - email_in: "Egendefinert inkommende e-postadresse:" + email_in: "Egendefinert innkommende e-postadresse:" email_in_allow_strangers: "Godta e-post fra anonyme brukere uten brukerkonto" email_in_disabled: "Posting av nye emner via e-post er deaktivert i nettstedsinstillingene. For å aktivere posting av nye emner via e-post," email_in_disabled_click: 'aktiver innstillingen "e-post inn".' @@ -1806,6 +1838,7 @@ nb_NO: subcategory_list_style: "Listestil for underkategorier:" sort_order: "Sorter emneliste etter:" default_view: "Forvalgt emneliste:" + default_top_period: "Forvalgt topp-periode:" allow_badges_label: "Tillat merker å bli tildelt i denne kategorien" edit_permissions: "Rediger tillatelser" add_permission: "Legg til tillatelser" @@ -1813,7 +1846,7 @@ nb_NO: position: "posisjon" default_position: "Forvalgt posisjon" position_disabled: "Kategorier vil bli vist i henhold til aktivitet. For å styre rekkefølgen av kategorier i listen" - position_disabled_click: 'aktivere "faste kategoriposisjoner"-innstillingen.' + position_disabled_click: 'aktiver innstillingen "faste kategoriposisjoner".' parent: "Foreldrekategori" notifications: watching: @@ -1833,8 +1866,8 @@ nb_NO: description: "Du vil aldri bli varslet om noe med tanke på nye emner i disse kategoriene, og de vil ikke vises i siste." sort_options: default: "forvalg" - likes: "Gunst" - op_likes: "Gunst gitt orginalinnlegget" + likes: "Kjærtegn" + op_likes: "Kjærtegn gitt orginalinnlegget" views: "Visninger" posts: "Innlegg" activity: "Aktivitet" @@ -1851,9 +1884,9 @@ nb_NO: flagging: title: 'Takk for at du hjelper å holde forumet ryddig!' action: 'Rapporter innlegg' - take_action: "Ta Handling" + take_action: "Ta handling" notify_action: 'Melding' - official_warning: 'Offisiell Advarsel' + official_warning: 'Offisiell advarsel' delete_spammer: "Slett spammer" delete_confirm_MF: "Du er i ferd med å slette {POSTS, flere, ett {1 innlegg} andre {# innlegg}} og {EMNER, flere, ett {1 emne} andre {# emner}} av denne brukeren, fjern kontoen deres, blokker påmeldinger fra deres IP-adresse {ip_address}, og legg til deres e-postadresse {email} til en permanent blokkeringsliste. Er du sikker på at denne brukeren virkelig sender søppelpost?" yes_delete_spammer: "Ja, slett spammer" @@ -1885,7 +1918,7 @@ nb_NO: notify_action: "Melding" topic_map: title: "Emneoppsummering" - participants_title: "Hyppige Bidragsytere" + participants_title: "Hyppige bidragsytere" links_title: "Populære Lenker" links_shown: "vis flere lenker…" clicks: @@ -1926,7 +1959,7 @@ nb_NO: med {with a very high like to post ratio} high {with an extremely high like to post ratio} other {}} - original_post: "Originalt Innlegg" + original_post: "Originalt innlegg" views: "Visninger" views_lowercase: one: "visninger" @@ -1936,11 +1969,11 @@ nb_NO: one: "dette emnet er vist 1 gang" other: "dette emnet er vist {{number}} ganger" activity: "Aktivitet" - likes: "Liker" + likes: "Kjærtegn" likes_lowercase: - one: "like" - other: "likes" - likes_long: "det er {{number}} liker i dette emnet" + one: "kjærtegn" + other: "kjærtegn" + likes_long: "det er {{number}} kjærtegn i dette emnet" users: "Deltakere" users_lowercase: one: "bruker" @@ -1994,7 +2027,7 @@ nb_NO: other: "Nye ({{count}})" help: "emner opprettet de siste dagene" posted: - title: "Mine Innlegg" + title: "Mine innlegg" help: "emner du har bidratt med innlegg i" bookmarks: title: "Bokmerker" @@ -2208,7 +2241,7 @@ nb_NO: admin_js: type_to_filter: "skriv for å filtrere…" admin: - title: 'Discourse Admin' + title: 'Discourse-admin' moderator: 'Moderator' dashboard: title: "Dashbord" @@ -2216,7 +2249,7 @@ nb_NO: version: "Versjon" up_to_date: "Du har den seneste versjonen!" critical_available: "En kritisk oppdatering er tilgjengelig." - updates_available: "Oppdateringer er tilgjengelig." + updates_available: "Oppdateringer er tilgjengelige." please_upgrade: "Oppgrader!" no_check_performed: "En sjekk for oppdateringer har ikke blitt utført. Verifiser at sidekiq kjører." stale_data: "Det har ikke vært sjekket for oppdateringer på en stund. Sjekk at sidekiq kjører." @@ -2247,9 +2280,9 @@ nb_NO: yesterday: "I går" last_7_days: "Siste 7 Dager" last_30_days: "Siste 30 Dager" - all_time: "Gjennom Tidene" - 7_days_ago: "7 Dager Siden" - 30_days_ago: "30 Dager Siden" + all_time: "Gjennom tidene" + 7_days_ago: "7 dager siden" + 30_days_ago: "30 dager siden" all: "Alle" view_table: "tabell" view_graph: "graf" @@ -2326,7 +2359,7 @@ nb_NO: primary: "Primærgruppe" no_primary: "(ingen primærgruppe)" title: "Grupper" - edit: "Rediger Grupper" + edit: "Rediger grupper" refresh: "Last inn på nytt" new: "Ny" selector_placeholder: "oppgi brukernavn" @@ -2360,12 +2393,12 @@ nb_NO: user: "Bruker" title: "API" key: "Nøkkel" - generate: "Generer API Nøkkel" - regenerate: "Regenerer API Nøkkel" + generate: "Generer API-nøkkel" + regenerate: "Regenerer API-nøkkel" revoke: "Tilbakedra" confirm_regen: "Er du sikker på at du vil erstatte denne API-nøkkelen med en ny?" confirm_revoke: "Er du sikker på at du vil tilbakedra denne nøkkelen?" - info_html: "Din API nøkkel vil tillate deg å lage og oppdatere emner ved å bruke JSON samteler." + info_html: "Din API-nøkkel vil tillate deg å lage og oppdatere emner ved å bruke JSON-samteler." all_users: "Alle brukere" note_html: "Hold denne nøkkelen hemmelig. Alle brukere som har den vil kunne opprette vilkårlige innlegg som en hvilken som helst bruker. " web_hooks: @@ -2440,7 +2473,7 @@ nb_NO: actions: "Handlinger" plugins: title: "Utvidelser" - installed: "Installerte Utvidelser" + installed: "Installerte utvidelser" name: "Navn" none_installed: "Du har ikke installert noen utvidelser." version: "Versjon" @@ -2465,7 +2498,7 @@ nb_NO: title: "Skru av skrivebeskyttet modus" label: "Skru av skrivebeskytting" logs: - none: "Ingen logger enda..." + none: "Ingen logger enda…" columns: filename: "Filnavn" size: "Størrelse" @@ -2510,7 +2543,7 @@ nb_NO: button_title: user: "Eksporter full medlemsliste i CSV format." staff_action: "Eksporter full handligslogg i CSV format." - screened_email: "Eksporter komplett liste over filtrerte e-postadresser i CSV format." + screened_email: "Eksporter komplett liste over filtrerte e-postadresser i CSV-format." screened_ip: "Eksporter komplett liste over filtrerte IP-addresser i CSV format." screened_url: "Eksporter komplett liste over filtrerte URL'er i CSV format." export_json: @@ -2542,7 +2575,7 @@ nb_NO: explain_rescue_preview: "Se nettstedet med forvalgt stilark" save: "Lagre" new: "Ny" - new_style: "Ny Stil" + new_style: "Ny stil" import: "Importer" import_title: "Velg en fil eller lim inn tekst" delete: "Slett" @@ -2566,9 +2599,9 @@ nb_NO: title: "Farger" long_title: "Fargepanel" about: "Endre farger som brukes på nettstedet uten å skrive CSS. Legg til et skjema for å starte." - new_name: "Nytt fargetema" + new_name: "Ny fargepalett" copy_name_prefix: "Kopi av" - delete_confirm: "Slett dette fargetemaet?" + delete_confirm: "Slett denne fargepaletten?" undo: "angre" undo_title: "Fjern endringer av denne fargen siden sist den ble lagret." revert: "gå tilbake" @@ -2673,9 +2706,9 @@ nb_NO: last_match_at: "Siste treff" match_count: "Treff" ip_address: "IP" - topic_id: "Emne ID" - post_id: "Innlegg ID" - category_id: "Kategori ID" + topic_id: "Emne-ID" + post_id: "Innleggs-ID" + category_id: "Kategori-ID" delete: 'Slett' edit: 'Endre' save: 'Lagre' @@ -2776,7 +2809,7 @@ nb_NO: invalid: "Beklager, du kan ikke gi deg ut for å være den brukeren." users: title: 'Brukere' - create: 'Legg til Admin Bruker' + create: 'Legg til admin-bruker' last_emailed: "Sist kontaktet" not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt." id_not_found: "Denne brukerID-en eksisterer ikke i vårt system." @@ -2798,8 +2831,8 @@ nb_NO: one: "avvis bruker" other: "avvis brukere ({{count}})" titles: - active: 'Aktive Brukere' - new: 'Nye Brukere' + active: 'Aktive brukere' + new: 'Nye brukere' pending: 'Brukere som venter på evaluering' newuser: 'Brukere på tillitsnivå 0 (Ny Bruker)' basic: 'Brukere på tillitsnivå 1 (Juniormedlem)' @@ -2807,7 +2840,7 @@ nb_NO: regular: 'Brukere på tillitsnivå 3 (Aktivt medlem)' leader: 'Brukere på tillitsnivå 4 (Leder)' staff: "Stab" - admins: 'Admins' + admins: 'Admin-brukere' moderators: 'Moderatorer' blocked: 'Blokkerte brukere' suspended: 'Bannlyste brukere' @@ -2823,8 +2856,8 @@ nb_NO: title: "Vis denne brukerens e-postadresse" text: "Vis" user: - suspend_failed: "Noe gikk galt ved å bannlyse denne brukeren {{error}}" - unsuspend_failed: "Noe gikk galt ved å gjeninsette denne brukeren {{error}}" + suspend_failed: "Noe gikk galt ved bannlysing av denne brukeren {{error}}" + unsuspend_failed: "Noe gikk galt ved gjeninnsetting av denne brukeren {{error}}" suspend_duration: "Hvor lenge vil du bannlyse denne brukeren? (dager)" suspend_duration_units: "(dager)" suspend_reason_label: "Hvorfor vil du bannlyse? Denne teksten vil være synlig for alle på denne brukerens profilside, og blir vist til brukeren om de skulle forsøke å logge inn. Fatt deg i korthet." @@ -2833,16 +2866,14 @@ nb_NO: delete_all_posts: "Slett alle innlegg" delete_all_posts_confirm_MF: "Du er i ferd med å slette {INNLEGG, flertall, ett {ett innlegg} andre {# innlegg}} og {INNLEGG, flertall, ett {ett emne} andre {# emner}}. Er du sikker?" suspend: "Bannlyst" - unsuspend: "Gjeninnsett\"" + unsuspend: "Gjeninnsett" suspended: "Bannlyst?" moderator: "Moderator?" admin: "Admin?" blocked: "Blokkert?" staged: "Arrangert?" show_admin_profile: "Admin" - edit_title: "Rediger tittel" - save_title: "Lagre tittel" - refresh_browsers: "Tving nettleser refresh" + refresh_browsers: "Tving gjenoffrisking av nettleser" refresh_browsers_message: "Melding sendt til alle klienter!" show_public_profile: "Vis offentlig profil" impersonate: 'Gi deg ut for å være en annen' @@ -2850,16 +2881,17 @@ nb_NO: ip_lookup: "IP Lookup" log_out: "Logg ut" logged_out: "Brukeren ble logget ut på alle enheter" - revoke_admin: 'Tilbakedra Admin' + revoke_admin: 'Tilbakedra admin' grant_admin: 'Innvilg admin' - revoke_moderation: 'Tilbakedra Moderering' + grant_admin_confirm: "Vi har sendt deg en e-post for å bekrefte den nye administratoren. Følg instruksjonene i meldingen." + revoke_moderation: 'Tilbakedra moderering' grant_moderation: 'Innvilg moderering' unblock: 'Opphev blokkering' block: 'Blokker' reputation: Rykte permissions: Tillatelser activity: Aktivitet - like_count: Liker tildelt / mottatt + like_count: Kjærtegn tildelt / mottatt last_100_days: 'de siste 100 dagene' private_topics_count: Private emner posts_read_count: Innlegg lest @@ -2870,7 +2902,7 @@ nb_NO: warnings_received_count: Advarsler mottatt flags_given_received_count: 'Rapporteringer tildelt / mottatt' approve: 'Godta' - approved_by: "Godtatt Av" + approved_by: "Godtatt av" approve_success: "Brukeren er godkjent og e-post med aktiveringsinstruksjoner er sendt." approve_bulk_success: "Suksess! Alle valgte brukere har blitt godkjent og varslet." time_read: "Lesetid" @@ -2878,7 +2910,7 @@ nb_NO: anonymize_confirm: "Ønsker du virkelig å anonymisere denne kontoen? Dette vil endre brukernavn og e-post samt tilbakestille kontoinnstillinger." anonymize_yes: "Ja, anonymiser denne kontoen" anonymize_failed: "Det oppstod en feil ved anonymisering av denne kontoen." - delete: "Slett Bruker" + delete: "Slett bruker" delete_forbidden_because_staff: "Administratorer og moderatorer kan ikke slettes." delete_posts_forbidden_because_staff: "Kan ikke slette alle innlegg av administratorer og moderatorer." delete_forbidden: @@ -2898,9 +2930,9 @@ nb_NO: send_activation_email: "Send e-post for aktivering" activation_email_sent: "En e-post for aktivering har blitt sendt." send_activation_email_failed: "Det oppstod et problem ved sending av ny e-post for aktivering. %{error}" - activate: "Aktiver Konto" + activate: "Aktiver konto" activate_failed: "Det oppstod et problem ved aktiveringen av den brukeren." - deactivate_account: "Deaktiver Konto" + deactivate_account: "Skru av konto" deactivate_failed: "Det oppstod et problem ved deaktiveringen av den brukeren." unblock_failed: 'Det oppstod et problem med å oppheve blokkeringen av brukeren.' block_failed: 'Det oppstod et problem med blokkeringen av brukeren.' @@ -2942,10 +2974,10 @@ nb_NO: posts_read_all_time: "Innlegg lest (totalt)" flagged_posts: "Rapporterte innlegg" flagged_by_users: "Brukere som rapporterte" - likes_given: "Likes tildelt" - likes_received: "Likes mottatt" - likes_received_days: "Likes mottatt: Unike dager" - likes_received_users: "Likes mottatt: Unike brukere" + likes_given: "Kjærtegn tildelt" + likes_received: "Kjærtegn mottatt" + likes_received_days: "Kjærtegn mottatt: Unike dager" + likes_received_users: "Kjærtegn mottatt: Unike brukere" qualifies: "Kvalifiserer til tillitsnivå 3." does_not_qualify: "Kvalifiserer ikke til tillitsnivå 3." will_be_promoted: "Vil snart forfremmes." @@ -2955,7 +2987,7 @@ nb_NO: locked_will_not_be_demoted: "Tillitsnivå låst. Vil aldri bli degradert." sso: title: "Single Sign On" - external_id: "Ekstern ID" + external_id: "Ekstern-ID" external_username: "Brukernavn" external_name: "Navn" external_email: "E-post" @@ -3109,7 +3141,7 @@ nb_NO: with_time: %{username} - %{time} emoji: title: "Emoji" - help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROTIP: Dra og slipp flere filer samtidig)" + help: "Legg til en ny emoji som vil være tilgjengelig for alle. (PROFFTIPS: Dra og slipp flere filer samtidig)" add: "Legg til ny Emoji" name: "Navn" image: "Bilde" @@ -3143,11 +3175,11 @@ nb_NO: permalink: title: "Permalenker" url: "URL" - topic_id: "Emne ID" + topic_id: "Emne-ID" topic_title: "Emne" - post_id: "Innlegg ID" + post_id: "Innleggs-ID" post_title: "Innlegg" - category_id: "Kategori ID" + category_id: "Kategori-ID" category_title: "Kategori" external_url: "Ekstern URL" delete_confirm: Er du sikker du vil slette denne permalenken? diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index f2382f279e..833ef495bf 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -618,6 +618,7 @@ pl_PL: muted_users_instructions: "Wstrzymaj powiadomienia od tych użytkowników." muted_topics_link: "Pokaż wyciszone tematy" watched_topics_link: "Pokaż obserwowane tematy" + tracked_topics_link: "Pokaż śledzone tematy" automatically_unpin_topics: "Automatycznie odpinaj tematy kiedy dotrę do końca strony." apps: "Aplikacje" revoke_access: "Zablokuj dostęp" @@ -1013,6 +1014,7 @@ pl_PL: not_allowed_from_ip_address: "Nie możesz się zalogować z tego adresu IP." admin_not_allowed_from_ip_address: "Nie możesz się zalogować jako admin z tego adresu IP." resend_activation_email: "Kliknij tutaj, aby ponownie wysłać email z aktywacją konta." + change_email: "Zmień Adres Email" sent_activation_email_again: "Wysłaliśmy do ciebie kolejny email z aktywacją konta na {{currentEmail}}. Zanim dotrze, może minąć kilka minut; pamiętaj, żeby sprawdzić folder ze spamem." to_continue: "Zaloguj się" preferences: "Musisz się zalogować, aby zmieniać swoje ustawienia." diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 34a913e53a..5511422199 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -1644,11 +1644,11 @@ ar: static_topic_first_reply: | تعديل محتويات المنشور الاول في هذا الموضوع %{page_name} page. guidelines_topic: - title: "الأسئلة الشائعة/توجيهات" + title: "الأسئلة الشّائعة/توجيهات" tos_topic: title: "شروط الخدمة" privacy_topic: - title: "سياسة الخصوصية" + title: "سياسة الخصوصيّة" body: | diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 863fcb5242..a0c0edda79 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -149,6 +149,7 @@ cs: excerpt_image: "obrázek" groups: errors: + can_not_modify_automatic: "Nelze měnit automatické skupiny" member_already_exist: "'%{username}' je už členem této skupiny." default_names: everyone: "kdokoliv" @@ -444,7 +445,9 @@ cs: xaxis: "Den" yaxis: "Počet nových uživatelů" profile_views: + title: "Zobrazení uživatelských profilů" xaxis: "Den" + yaxis: "Počet zobrazení uživatelských profilů" topics: title: "Témata" xaxis: "Den" @@ -552,8 +555,11 @@ cs: xaxis: "Den" yaxis: "Celkem požadavků" time_to_first_response: + title: "Čas první odpovědi" xaxis: "Den" + yaxis: "Průměrný čas (hodiny)" topics_with_no_response: + title: "Témat bez odpovědi" xaxis: "Den" yaxis: "Celkem" mobile_visits: @@ -573,6 +579,7 @@ cs: default_locale: "Výchozí jazyk této Discourse instance (kód ve formátu ISO 639-1)" allow_user_locale: "Povolit uživatelům nastavit si jazyk fóra" min_search_term_length: "Minimální délka hledaného výrazu ve znacích" + allow_duplicate_topic_titles: "Povolit témata se stejným, duplicitním názvem" unique_posts_mins: "Kolik minut musí uplynout, než může uživatel zaslat příspěvek se stejným obsahem" queue_jobs: "Zařazovat úlohy do fronty v sidekiq, není-li nastaveno, jsou úlohy vyřizovány okamžitě" apple_touch_icon_url: "Ikona používaná pro doteková zařízení od firmy Apple. Doporučené rozměry jsou 144px krát 144px." @@ -773,6 +780,8 @@ cs: badges: welcome: name: Vítejte + autobiographer: + description: Vyplněné informace v profilu first_like: name: První "to se mi líbí" first_share: diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 605b977443..1df24e53f9 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -2388,101 +2388,101 @@ de: body: | - ## [This is a Civilized Place for Public Discussion](#civilized) + ## [Dies ist ein zivilisierter Platz für öffentliche Diskussionen](#civilized) - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. + Bitte behandle dieses Diskussionsforum mit dem gleichen Respekt wie einen öffentlichen Park. Auch wir sind eine gemeinsame Community-Ressource — ein Platz, um Fähigkeiten, Wissen und Interessen durch einen fortlaufenden Dialog zu teilen. - These are not hard and fast rules, merely guidelines to aid the human judgment of our community and keep this a clean and well-lighted place for civilized public discourse. + Dies sind keine harten oder schnelle Regeln, sondern vielmehr Hilfen für die menschliche Einschätzung unserer Community. Folge diesen Richtlinien, damit dies ein sauberer, gut beleuchteter Platz für zivilisierten, öffentlichen Diskurs bleibt. - ## [Improve the Discussion](#improve) + ## [Verbessere die Diskussion](#improve) - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. + Hilf uns, dies zu einem großartigen Platz für Diskussionen zu machen, indem du stets daran arbeitest, die Diskussion in irgendeiner Art zu verbessern, egal wie geringfügig. Wenn du dir nicht sicher bist, ob dein Beitrag zum Dialog beiträgt, denke darüber nach, was du sagen möchtest und probiere es später noch einmal. - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. + Die hier diskutierten Themen sind uns wichtig und wir möchten, dass du dich so verhältst, als wären sie auch genauso wichtig für dich. Respektiere die Themen und die Personen, die diese diskutieren, auch wenn du mit dem was gesagt wird, nicht einverstanden bist. - One way to improve the discussion is by discovering ones that are already happening. Spend time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. + Ein Weg, die Diskussion zu verbessern, besteht darin zu entdecken, was schon passiert ist. Bitte verbringe etwas Zeit damit, die Themen hier zu durchsuchen, bevor du antwortest oder deine eigenen startest, und du wirst eine bessere Chance haben andere zu treffen, die deine Interessen teilen. - ## [Be Agreeable, Even When You Disagree](#agreeable) + ## [Sei nett, auch wenn du anderer Meinung bist](#agreeable) - You may wish to respond to something by disagreeing with it. That’s fine. But remember to _criticize ideas, not people_. Please avoid: + Du magst auf etwas antworten möchten, indem du widersprichst. Das ist in Ordnung. Aber denke daran, _Ideen zu kritisieren, nicht Personen_. Bitte vermeide: - * Name-calling - * Ad hominem attacks - * Responding to a post’s tone instead of its actual content - * Knee-jerk contradiction + * Beschimpfungen + * Persönliche Angriffe + * Antworten auf den Tonfall eines Beitrags statt auf dessen Inhalt + * Reflexartiges Widersprechen - Instead, provide reasoned counter-arguments that improve the conversation. + Biete stattdessen vernünftige Gegenargumente, die den Dialog verbessern. - ## [Your Participation Counts](#participate) + ## [Deine Beteiligung zählt](#participate) - The conversations we have here set the tone for every new arrival. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. + Die hier geführten Dialoge geben den Ton für alle an. Hilf uns dabei, die Zukunft dieser Community zu beeinflussen, indem wir uns bewusst für Dialoge entscheiden, die dieses Forum zu einem interessanten Aufenthaltsraum machen — und jene vermeiden, die das nicht tun. - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. + Discourse bietet Werkzeuge, die der Community ermöglichen, gemeinsam die besten (und schlechtesten) Beiträge zu identifizieren: Favoriten, Lesezeichen, „Gefällt mir“-Angaben, Meldungen, Antworten, Bearbeitungen, und so weiter. Benutze diese Werkzeuge, um deine eigene Erfahrung zu verbessern, und die von allen anderen ebenso. - Let’s leave our community better than we found it. + Lass uns versuchen, den Park besser zu verlassen als wir ihn vorgefunden haben. - ## [If You See a Problem, Flag It](#flag-problems) + ## [Wenn du ein Problem siehst, melde es](#flag-problems) - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. + Moderatoren haben besondere Befugnisse; sie sind verantwortlich für dieses Forum. Aber das gilt auch für dich. Mit deiner Hilfe können Moderatoren die Vermittler der Community sein, nicht nur die Hausmeister oder die Polizei. - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. + Wenn du schlechtes Verhalten siehst, antworte nicht. Schlechtes Verhalten wird gefördert, indem es anerkannt wird, es verbraucht deine Energie und verbraucht die Zeit von allen. _Melde es einfach_. Wenn genügend Meldungen zusammenkommen, werden Maßnahmen eingeleitet, entweder automatisch oder durch das Eingreifen eines Moderators. - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts; the moderators and site operators take no responsibility for any content posted by the community. + Um unsere Community aufrechtzuerhalten, behalten sich Moderatoren das Recht vor, jeden Inhalten und jedes Benutzerkonto jederzeit aus irgendeinem Grund zu entfernen. Moderatoren sehen neue Beiträge in keiner Weise früher; die Moderatoren und die Sitebetreiber übernehmen keine Verantwortung für jeglichen Inhalt, der in der Community geschrieben wird. - ## [Always Be Civil](#be-civil) + ## [Immer höflich bleiben](#be-civil) - Nothing sabotages a healthy conversation like rudeness: + Nichts sabotiert einen gesunden Dialog so sehr wie Unhöflichkeit. - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. + * Sei höflich. Schreibe nichts, was eine vernünftige Person als anstößig, beleidigend oder als Hasstirade auffassen würde. + * Halte den Platz sauber. Schreibe nichts, was obszön oder sexuell explizit ist. + * Lasst uns gegenseitig respektieren. Belästige niemanden, füge niemandem Kummer zu, gib dich nicht als jemand anderes aus und veröffentliche niemandes persönliche Informationen. + * Respektiere unser Forum. Schreibe keinen Spam und beschädige das Forum auch sonst in keiner Weise. - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. + Dies sind keine konkreten Bedingungen mit präzisen Definitionen — vermeide sogar den _Anschein_ von jedem dieser Dinge. Wenn du dir nicht sicher bist, frage dich selbst, wie du dich fühlen würdest, wenn dein Beitrag auf der Titelseite der Frankfurter Allgemeinen Zeitung erscheinen würde. - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. + Dies ist ein öffentliches Forum und Suchmaschinen indizieren diese Diskussionen. Halte die Sprache, Links und Bilder sicher für Familie und Freunde. - ## [Keep It Tidy](#keep-tidy) + ## [Halte den Platz sauber](#keep-tidy) - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: + Betreibe die nötigen Anstrengungen, um Dinge an der richtigen Stelle zu platzieren, damit wir mehr Zeit mit Diskussionen und weniger mit Aufräumen verbringen können. Daher: - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. + * Erstelle keine Themen in der falschen Kategorie + * Schreibe Beiträge nicht gleichzeitig in mehreren Themen + * Schreibe keine leeren Antworten + * Lenke nicht vom Thema ab, indem du es mitten drin änderst + * Signiere deine Beiträge nicht — jedem Beitrag sind deine Profilinformationen beigefügt - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. + Verwende die „Gefällt mir“-Schaltfläche statt „+1“ oder „Einverstanden“ zu schreiben. Statt ein bestehendes Thema in eine völlig andere Richtung zu lenken, verwende die Funktion „Mit verknüpftem Thema antworten“. - ## [Post Only Your Own Stuff](#stealing) + ## [Poste nur deine eigenen Sachen](#stealing) - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. + Du darfst ohne Erlaubnis nichts schreiben, was jemand anderem gehört. Du darfst keine Beschreibungen von, Links zu oder Methoden beschreiben, die geistiges Eigentum verletzen (Software, Video, Audio, Bilder) oder gegen geltendes Gesetz verstoßen. - ## [Powered by You](#power) + ## [Betrieben von Euch](#power) - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). + Diese Site wird von eurem [freundlichen Team](/about) und *euch* betrieben, der Community. Wenn du irgendwelche weiteren Fragen dazu hast, wie Dinge hier funktionieren sollten, öffne ein neues Thema in der Kategorie [Feedback zur Site](/c/site-feedback) und lass es uns diskutieren! Wenn es ein kritisches oder dringendes Problem gibt, dass nicht mit einem Meta-Thema oder einer Meldung behandelt werden kann, kontaktiere uns über die [Team-Seite](/about). - ## [Terms of Service](#tos) + ## [Nutzungsbedingungen](#tos) - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). + Ja, die rechtliche Seite ist langweilig, aber wir müssen uns selbst schützen – und im erweiterten Sinne auch dich und deine Daten – vor unfreundlichen Leuten. Wir haben [Nutzungsbedingungen](/tos), die deines (und unser) Verhalten und unsere Rechte bezüglich des Inhalts, der Privatsphäre und den Gesetzen beschreiben. Um diesen Dienst zu nutzen, musst du dich mit unseren [Nutzungsbedingungen](/tos) einverstanden erklären. tos_topic: title: "Nutzungsbedingungen" body: | diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 52959c502a..efb214f84a 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -110,7 +110,7 @@ fi: s3_upload_bucket_is_required: "Et voi ottaa s3 latausta käyttöön, jos et ole määrittänyt 's3_upload_bucket'." invite: not_found: "Kutsusi tunnistusväline ei kelpaa. Ota yhteyttä sivuston ylläpitäjään." - user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen %{email}, sillä kutsuttavalla on jo tunnus!" + user_exists: "Ei ole tarpeen lähettää kutsua osoitteeseen %{email}, sillä kutsuttavalla on jo tunnus!" bulk_invite: file_should_be_csv: "Ladattavan tiedoston tulee olla CSV-muodossa." error: "Tiedoston lataus epäonnistui. Yritä myöhemmin uudelleen." @@ -281,7 +281,7 @@ fi: Oletko harkinnut vastaavasi myös *muille* keskusteluun osallistuville? Parhaissa keskusteluissa on useita ääniä ja näkökantoja. - Jos haluat jatkaa keskustelua tämän käyttäjän kanssa edelleen, [lähetä hänelle yksityisviesti](/users/%{reply_username}). + Jos haluat jatkaa keskustelua tämän käyttäjän kanssa edelleen, [lähetä hänelle yksityisviesti](/u/%{reply_username}). too_many_replies: | ### Olet kirjoittanut enimmäismäärän vastauksia tähän ketjuun @@ -342,9 +342,13 @@ fi: attributes: name: taken: on jo varattu toiselle emojille + topic_status_update: + attributes: + execute_at: + in_the_past: "täytyy olla tulevaisuudessa." <<: *errors user_profile: - no_info_me: "
Minusta -kohta käyttäjäprofiilissasi on vielä täyttämättä,haluaisitko täyttää sen nyt?
" + no_info_me: "
Tietoa minusta -kenttä käyttäjätiedoissasi on täyttämättä. Haluaisitko täyttää sen nyt?
" no_info_other: "
%{name} ei ole täyttänyt vielä mitään Minusta -kohtaan profiilissaan
" vip_category_name: "Lounge" vip_category_description: "Alue luottamustason 3 ja ylemmille käyttäjille." @@ -549,6 +553,12 @@ fi: approval_required: "Valvojan täytyy hyväksyä uusi tilisi, jotta pääset palstalle. Saat sähköpostin, kun tilisi on hyväksytty." missing_session: "Emme voineet havaita, onnistuiko tilisi luonti. Varmista, että selaimesi sallii evästeiden käytön." activated: "Pahoittelut, tämä tili on jo aktivoitu." + admin_confirm: + title: "Vahvista ylläpitäjätili" + description: "Oletko varma, että haluat käyttäjästä %{target_username} ylläpitäjän?" + grant: "Myönnä ylläpitäjäoikeudet" + complete: "%{target_username} on nyt ylläpitäjä." + back_to: "Palaa %{title}" post_action_types: off_topic: title: 'Se eksyy aiheesta' @@ -1126,8 +1136,9 @@ fi: min_ban_entries_for_roll_up: "Kun Kääri-painiketta painetaan, luodaan IP-porttikielloista aliverkon kattavia kieltoja jos kieltoja on asettu vähintään (N) määrä." max_age_unmatched_emails: "Poista osumattomat seulotut sähköpostiosoitteet (N) päivän jälkeen." max_age_unmatched_ips: "Poista osumattomat seulotut IP-osoitteet (N) päivän jälkeen." - num_flaggers_to_close_topic: "Minimimäärä uniikkeja liputtajia, joka vaaditaan ketjun automaattiseksi keskeyttämiseksi." - num_flags_to_close_topic: "Minimimäärä aktiivisia lippuja, joka vaaditaan ketjun automaattiseksi keskeyttämiseksi." + num_flaggers_to_close_topic: "Kuinka monta eri liputtajaa tarvitaan, jotta ketju voi mennä tauolle puuttumistoimia odottamaan" + num_flags_to_close_topic: "Kuinka monta aktiivista lippua tarvitaan, jotta ketju voi mennä tauolle puuttumistoimia odottamaan" + num_hours_to_close_topic: "Kuinka moneksi tunniksi ketju menee tauolle puuttumistoimia odottamaan." auto_respond_to_flag_actions: "Ota käyttöön automaattinen vastaus lippua poistettaessa." min_first_post_typing_time: "Minimimäärä aikaa millisekunneissa, joka käyttäjän täytyy kirjoittaa ensimmäistä viestiään. Jos rajaa ei saavuteta, viesti lisätään automaattisesti hyväksyttävien jonoon. Aseta 0 ottaaksesi pois käytöstä (ei suositella)." auto_block_fast_typers_on_first_post: "Estä automaattisesti käyttäjät, jotka eivät saavuta min_first_post_typing_time" @@ -1393,6 +1404,24 @@ fi: autoclosed_enabled_lastpost_minutes: one: "Tämä ketju suljettiin automaattisesti 1 minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa." other: "Ketju suljettiin automaattisesti %{count} minuutin kuluttua viimeisestä viestistä. Uusia vastauksia ei voi enää kirjoittaa." + autoclosed_disabled_days: + one: "Ketju avattiin ajastetusti 1 päivän kuluttua." + other: "Ketju avattiin ajastetusti %{count} päivän kuluttua." + autoclosed_disabled_hours: + one: "Ketju avattiin ajastetusti 1 tunnin kuluttua." + other: "Ketju avattiin ajastetusti %{count} tunnin kuluttua." + autoclosed_disabled_minutes: + one: "Ketju avattiin ajastetusti 1 minuutin kuluttua." + other: "Ketju avattiin ajastetusti %{count} minuutin kuluttua." + autoclosed_disabled_lastpost_days: + one: "Ketju avattiin automaattisesti 1 päivän kuluttua viimeisimmästä viestistä." + other: "Ketju avattiin automaattisesti %{count} päivän kuluttua viimeisimmästä viestistä." + autoclosed_disabled_lastpost_hours: + one: "Ketju avattiin automaattisesti 1 tunnin kuluttua viimeisimmästä viestistä." + other: "Ketju avattiin automaattisesti %{count} tunnin kuluttua viimeisimmästä viestistä." + autoclosed_disabled_lastpost_minutes: + one: "Ketju avattiin automaattisesti 1 minuutin kuluttua viimeisimmästä viestistä." + other: "Ketju avattiin automaattisesti %{count} minuutin kuluttua viimeisimmästä viestistä." autoclosed_disabled: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa." autoclosed_disabled_lastpost: "Tämä ketju on nyt avattu. Uusia vastauksia voi taas kirjoittaa." pinned_enabled: "Tämä ketju on nyt kiinnitetty. Se näytetään alueensa ylimmäisenä. Kiinnityksen voi poistaa joko henkilökunnan jäsen kaikilta yhteisesti tai yksittäiset käyttäjät itseltään." @@ -1406,7 +1435,7 @@ fi: incorrect_username_email_or_password: "Väärä käyttäjänimi, sähköposti tai salasana" wait_approval: "Kiitos kirjautumisesta. Ilmoitamme, kun tilisi on hyväksytty." active: "Tilisi on aktivoitu ja valmiina käyttöön." - activate_email: "

Olet melkein valmis! Lähetimme sähköpostin osoitteeseen %{email}. Seuraa viestin ohjeita aktivoidaksesi käyttäjätilisi.

Jos viesti ei tullut perille, tarkista roskapostikansiosta tai yritä kirjautua sisään, jolloin aktivointiviestin voi lähettää uudestaan.

" + activate_email: "

Melkein valmista! Lähetimme sähköpostin osoitteeseen %{email}. Aktivoi käyttäjätilisi seuraamalla viestin ohjeita.

Jos viesti ei tullut perille, tarkista roskapostikansiosi - tai yritä kirjautua sisään, jolloin voit lähettää aktivointiviestin uudelleen tai muuttaa sähköpostiosoitetta.

" not_activated: "Et voi vielä kirjautua sisään. Lähetimme sinulle vahvistusviestin. Seuraa sähköpostiviestin ohjeita ottaaksesi tunnuksen käyttöön." not_allowed_from_ip_address: "Et voi kirjautua käyttäjätunnuksella %{username} tästä IP-osoitteesta." admin_not_allowed_from_ip_address: "Et voi kirjautua ylläpitäjänä tästä IP-osoitteesta." @@ -1543,10 +1572,10 @@ fi: text_body_template: | Kiitos, kun hyväksyit kutsun sivustolle %{site_name} -- tervetuloa! - Avaa tämä linkki valitaksesi salasanan nyt: - %{base_url}/users/password-reset/%{email_token} + Valitse salasana tämän linkin kautta: + %{base_url}/u/password-reset/%{email_token} - (jos yllä oleva linkki on vanhentunut, valitse "unohdin salasanani" kirjautuessasi sisään sähköpostiosoitteellasi) + (Jos yllä oleva linkki on vanhentunut, valitse "Unohdin salasanani", kun kirjaudut sisään sähköpostiosoitteellasi.) download_backup_mailer: title: "Lataa varmuuskopio" subject_template: "[%{email_prefix}] Varmuuskopion lataus sivustosta" @@ -1558,6 +1587,13 @@ fi: (Jos *et* pyytänyt varmuuskopiota, on asia otettava vakavissaan -- jollakulla on ylläpitäjän oikeudet sivustoosi.) no_token: | Pahoittelut, tämä varmuuskopion latauslinkki on jo käytetty tai on vanhentunut. + admin_confirmation_mailer: + title: "Ylläpitäjän vahvistaminen" + subject_template: "[%{email_prefix}] Vahvista uusi ylläpitäjätili" + text_body_template: | + Vahvista, että haluat käyttäjästä **%{target_username}** ylläpitäjän palstallesi. + + [Vahvista ylläpitäjäoikeudet](%{admin_confirm_url}) test_mailer: title: "Sähköpostipalvelun testaus" subject_template: "[%{email_prefix}] Sähköpostin toimitettavuustesti" @@ -1654,7 +1690,9 @@ fi: disagreed: "Kiitos kun toit asian tietoomme. Selvitämme asiaa." deferred: "Kiitos kun toit asian tietoomme. Selvitämme asiaa." deferred_and_deleted: "Kiitos kun toit asian tietoomme. Poistimme kyseisen viestin." - temporarily_closed_due_to_flags: "Tämä ketju on väliaikaisesti suljettu, johtuen suuresta määrästä liputuksia." + temporarily_closed_due_to_flags: + one: "Ketju on suljettu väliaikaisesti 1 tunnin ajan suuren lippumäärän vuoksi." + other: "Ketju on suljettu väliaikaisesti %{count} tunnin ajan suuren lippumäärän vuoksi." system_messages: post_hidden: title: "Viesti piilotettu" @@ -2020,6 +2058,17 @@ fi: Ylläpitäjän hallintapaneelissa on raportoitu virheistä. [Tarkastele ja korjaa ne](%{base_url}/admin). + new_user_of_the_month: + title: "Olet kuukauden tulokas!" + subject_template: "Olet kuukauden tulokas!" + text_body_template: | + Onneksi olkoon, sinulle myönnettiin Kuukauden tulokas -palkinto %{month_year}** :trophy: + + Sinusta on äkkiä tullut tärkeä osa yhteisöä, ja kaikki todella pitävät viesteistäsi. + + Palkinto näkyy pysyvästi ansiomerkkinä [käyttäjäsivullasi](/my/badges). + + Kiitos - jatka samaa rataa! unsubscribe_link: | Jos et enää halua näitä viestejä, [klikkaa tästä](%{unsubscribe_url}). unsubscribe_link_and_mail: | @@ -2231,54 +2280,54 @@ fi: text_body_template: | Salasanasi uusimista pyydettiin sivustolla [%{site_name}](%{base_url}). - Jos et halua muuttaa salasanaasi, voit jättää tämän viestin huomiotta. + Jos pyytäjä et ollut sinä, voit huoletta jättää tämän viestin huomiotta. - Klikkaa alla olevaa linkkiä vaihtaaksesi salasanasi: - %{base_url}/users/password-reset/%{email_token} + Valitse uusi salasana klikkaamalla linkkiä: + %{base_url}/u/password-reset/%{email_token} set_password: title: "Syötä salasana" subject_template: "[%{email_prefix}] Aseta salasana" text_body_template: | - Joku on pyytänyt lisäämään salasanan tilillesi sivustolla [%{site_name}](%{base_url}). Vaihtoehtoisesti, voit kirjautua sisään muiden tuettujen palveluiden avulla (Google, Facebook, etc) joissa on käytössä tämä sama sähköpostiosoite. + Joku haluaa lisätä salasanan tilillesi sivustolla [%{site_name}](%{base_url}). Vaihtoehtoisesti, voit kirjautua sisään muiden tuettujen palveluiden (Google, Facebook, etc) tileillä, jotka ovat tämän saman sähköpostiosoitteen alaisia. - Jos et ole pyytänyt salasanan lisäämistä, voit jättää viestin huomiotta. + Jos et ole pyynnön taustalla, voit huoletta jättää tämän viestin huomiotta. - Klikkaa tätä linkkiä valitaksesi salasanan: - %{base_url}/users/password-reset/%{email_token} + Valitse uusi salasana klikkaamalla linkkiä: + %{base_url}/u/password-reset/%{email_token} admin_login: title: "Ylläpitäjäkirjautuminen" subject_template: "[%{email_prefix}] Kirjautuminen" text_body_template: | - Joku pyysi sinua kirjautumaan tilillesi sivustolla [%{site_name}](%{base_url}). + Joku haluaa kirjautua tilillesi sivustolla [%{site_name}](%{base_url}). - Jos et ole pyynnön takana, voit huoletta jättää tämän viestin huomiotta. + Jos et ole pyynnön taustalla, voit huoletta jättää tämän viestin huomiotta. - Klikkaa tätä linkkiä kirjautuaksesi: - %{base_url}/users/admin-login/%{email_token} + Kirjaudu sisään klikkaamalla linkkiä: + %{base_url}/u/admin-login/%{email_token} account_created: title: "Tili luotu" subject_template: "[%{email_prefix}] Uusi käyttäjätilisi" text_body_template: | - Sinulle luotiin uusi käyttäjätunnus sivustolla %{site_name} + Sinulle luotiin käyttäjätili sivustolle %{site_name} - Klikkaa seuraavaa linkkiä asettaaksesi salasanan uudelle tunnuksellesi: - %{base_url}/users/password-reset/%{email_token} + Valitse salasana uudelle tilillesi klikkaamalla linkkiä: + %{base_url}/u/password-reset/%{email_token} confirm_new_email: title: "Vahvista uusi sähköpostiosoite" subject_template: "[%{email_prefix}] Vahvista uusi sähköpostiosoite" text_body_template: | - Vahvista uusi sähköpostiosoite sivustolle %{site_name} klikkaamalla alla olevaa linkkiä: + Vahvista uusi sähköpostiosoitteesi sivustolla %{site_name} klikkaamalla linkkiä: - %{base_url}/users/authorize-email/%{email_token} + %{base_url}/u/authorize-email/%{email_token} confirm_old_email: title: "Vahvista vanha sähköpostiosoite" subject_template: "[%{email_prefix}] Vahvista nykyinen sähköpostiosoitteesi" text_body_template: |+ - Ennen kuin voit vaihtaa sähköpostiosoitteesti, meidän täytyy varmistaa, että hallinnoit nykyistä sähköpostiosoitetta. Kun olet suorittanut tämän, varmistamme vielä uuden sähköpostiosoitteenkin. + Ennen kuin vaihdamme sähköpostiosoitteesi täytyy varmistaa, että hallinnoit nykyistä sähköpostiosoitetta. Tämän jälkeen varmistamme vielä uudenkin sähköpostiosoitteen. - Vahvista sähköpostiosoitteesti sivustolle %{site_name} klikkaamalla linkkiä: + Vahvista nykyinen sähköpostiosoitteesi sivustolla %{site_name} klikkaamalla linkkiä: - %{base_url}/users/authorize-email/%{email_token} + %{base_url}/u/authorize-email/%{email_token} notify_old_email: title: "Ilmoita vanhaan sähköpostiosoitteeseen" @@ -2297,8 +2346,8 @@ fi: Henkilökunnan edustaja on hyväksynyt tilisi sivustolla %{site_name}. - Klikkaa alla olevaa linkkiä vahvistaaksesi ja aktivoidaksesi uuden tilisi: - %{base_url}/users/activate-account/%{email_token} + Vahvista ja aktivoi uusi tilisi klikkaamalla linkkiä: + %{base_url}/u/activate-account/%{email_token} Jos linkkiä ei voi klikata, yritä kopioida ja liittää se selaimen osoiteriville. @@ -2315,8 +2364,8 @@ fi: text_body_template: | Tervetuloa sivustolle %{site_name}! - Klikkaa alla olevaa linkkiä vahvistaaksesi ja aktivoidaksesi uuden tilisi: - %{base_url}/users/activate-account/%{email_token} + Vahvista ja aktivoi uusi tilisi klikkaamalla linkkiä: + %{base_url}/u/activate-account/%{email_token} Jos linkkiä ei voi klikata, yritä kopioida ja liittää se selaimen osoiteriville. page_not_found: @@ -2783,6 +2832,12 @@ fi: description: Vastasi sähköpostilla long_description: | Tämä ansiomerkki myönnetään, kun vastaat ensimmäistä kertaa sähköpostilla :e-mail:. + new_user_of_the_month: + name: "Kuukauden tulokas" + description: Erinomaista osallistumista ensimmäisen kuukauden aikana + long_description: | + Tämä ansiomerkki myönnetään kahdelle uudelle käyttäjälle joka kuukausi kiitoksena erinomaisesta osallistumisestaan. Mittari on tykkäykset: kuinka usein viesteistä tykätään ja kuka tykkää. + badge_title_metadata: "%{display_name} -ansiomerkki sivustolla %{site_title}" admin_login: success: "Sähköposti lähetetty" error: "Virhe!" diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 4cb5c2f319..b43cfd7fb5 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -110,7 +110,7 @@ he: s3_upload_bucket_is_required: "אינכם יכולים להעלות ל-S3 ללא 's3_upload_bucket'." invite: not_found: "אסימון ההזמנה שלכם אינו תקין. אנא צרו קשר עם האדמיניסטרטור של האתר." - user_exists: "אין צורך להזמין את %{email}, כבר יש לו/ה חשבון!" + user_exists: "אין צורך להזמין את %{email}, הוא/היא כבר בעלים של חשבון!" bulk_invite: file_should_be_csv: "הקובץ שמועלה אמור להיות בפורמט csv." error: "ארעה שגיאה בהעלת הקובץ. אנא נסו שוב מאוחר יותר." @@ -273,11 +273,11 @@ he: get_a_room: | ### שיקלו לענות ליותר אנשים - כבר עניתם %{count} פעמים ל-@%{reply_username} בנושא ספציפי זה. + כבר הגבתם %{count} פעמים ל-@%{reply_username} בנושא ספציפי זה. - האם שקלתם לענות לאנשים *אחרים* בדיון גם כן? דיון מעולה מערב הרבה קולות ופקספקטיבות. + האם שקלתם לענות לאנשים *אחרים* בדיון גם כן? דיון מעולה מערב פרספקטיבות וקולות רבים. - אם תרצו להמשיך את הדיון באריכות עם משתמש ספציפי זה, [שילחו אליו/ה הודעה אישית](/users/%{reply_username}). + אם הייתם רוצים להמשיך את הדיון באריכות עם משתמש/ת ספציפי/ת זה/זו, [שילחו אליהם הודעה אישית](/u/%{reply_username}). too_many_replies: | ### הגעתם למספר המקסימלי של תגובות לנושא זה @@ -329,7 +329,7 @@ he: invalid: "זהו אינו צבע תקני" post_reply: base: - different_topic: "פוסט ותגובה חייבים להיות באותו הנושא." + different_topic: "פוסט ותגובה חייבים להיות שייכים לאותו הנושא." web_hook: attributes: payload_url: @@ -338,9 +338,12 @@ he: attributes: name: taken: כבר בשימוש על ידי אמוג'י אחר + topic_status_update: + attributes: + execute_at: + in_the_past: "חייב להיות בעתיד." <<: *errors user_profile: - no_info_me: "
שדה האודות של הפרופיל שלכם ריק כרגע, תרצו למלא אותו?
" no_info_other: "
%{name} עדיין לא הזין/ה דבר בשדה אודות של הפרופיל שלו/ה
" vip_category_name: "לאונג'" vip_category_description: "קטגוריה אקסקלוסיבית למשתמשים עם רמת אמון 3 או יותר." @@ -544,6 +547,12 @@ he: approval_required: "מנהל צריך לאשר את החשבון שלכם ידנית לפני שתוכלו להיכנס לפורום הזה. יישלח אליכם דואר אלקטרוני כשהחשבון שלכם יאושר!" missing_session: "אנחנו לא יכולים לזהות אם חשבונכם נוצר, אנא וודאו שיש לכם עוגיות (cookies) מאופשרות." activated: "מצטערים, חשבון זה כבר הופעל." + admin_confirm: + title: "אישור חשבון ניהול" + description: "האם אתם בטוחים שאתם מעוניינים ש-%{target_username} יהיה/תהיה מנהל/ת?" + grant: "הענקת גישת ניהול" + complete: "%{target_username} הוא/היא עכשיו מנהלים." + back_to: "חזרה ל-%{title}" post_action_types: off_topic: title: 'אוף-טופיק' @@ -1125,6 +1134,7 @@ he: max_age_unmatched_ips: "מחק ערכי IP לא תואמים שמוצגים לאחר (N) ימים." num_flaggers_to_close_topic: "מספר מינימלי של דגלים שונים שנדרש כדי להשהות באופן אוטומטי אפשות להתערב בנושא" num_flags_to_close_topic: "מספר מינימלי של דגלים פעילים שנדרש כדי להשהות באופן אוטומטי את היכולת להתערב בנושא" + num_hours_to_close_topic: "מספר שעות לעצירת נושא לצורך התערבות." auto_respond_to_flag_actions: "אפשרו תגובה אוטמטית עם הסרת דגל." min_first_post_typing_time: "זמן מינימלי במילי-שניות שמשתמש חייב להקיש בזמן הפוסט הראשון, אם הסף לא נעבר הפוסט אוטומטית יכנס לתור של אלו שצריכים אישור. קיבעו 0 כדי לנטרל (לא מומלץ)" auto_block_fast_typers_on_first_post: "חסימה אוטומטית של משתמשים שלא עונים על min_first_post_typing_time" @@ -1394,6 +1404,15 @@ he: autoclosed_enabled_lastpost_minutes: one: "נושא זה ננעל אוטומטית לאחר דקה מהתגובה האחרונה. תגובות חדשות לא מתקבלות." other: "נושא זה נסגר אוטומטית לאחר %{count} דקות מהתגובה האחרונה. תגובות חדשות לא מתקבלות." + autoclosed_disabled_days: + one: "נושא זה נפתח אוטומטית לאחר יום 1." + other: "נושא זה נפתח אוטומטית לאחר %{count} ימים." + autoclosed_disabled_hours: + one: "נושא זה נפתח אוטומטית לאחר שעה 1." + other: "נושא זה נפתח אוטומטית לאחר %{count} שעות." + autoclosed_disabled_minutes: + one: "נושא זה נפתח אוטומטית לאחר דקה 1." + other: "נושא זה נפתוח אוטומטית לאחר %{count} דקות." autoclosed_disabled: "הנושא הזה נפתח. ניתן להגיב תגובות חדשות." autoclosed_disabled_lastpost: "הנושא הזה נפתח. ניתן להגיב תגובות חדשות." pinned_enabled: "הנושא הזה ננעץ. הוא יופיע בראש הקטגוריה שלו עד שיוסר מנעיצה על ידי מנהל או שכפתור נקה נעיצות נלחץ." @@ -2018,6 +2037,9 @@ he: כמה בעיות מדווחות ללוח המכוונים של האדמיניסטרטור. [אנא סיקרו וטפלו בהן](%{base_url}/admin). + new_user_of_the_month: + title: "אתם המשתמשים החדשים של החודש!" + subject_template: "אתם המשתמשים החדשים של החודש!" unsubscribe_link: | כדי להפסיק את המיילים האלו, [לחצו כאן](%{unsubscribe_url}). unsubscribe_link_and_mail: | @@ -2819,9 +2841,12 @@ he: long_description: עיטור זה מוענק בפעם הראשונה שמפרסמים קישור בשורה נפרדת, מה שיגרום לו להתרחב לתיבת onebox עם תקציר של העמוד המקושר, כותרת ותמונה (כאשר ישנה תמונה בעמוד המקושר). first_reply_by_email: name: תגובה ראשונה במייל - description: השיבו לפוסט באמצעות מייל + description: הגיבו לפוסט באמצעות מייל long_description: | עיטור זה מוענק בפעם הראשונה שאתם עונים לפוסט באמצעות מייל :e-mail:. + new_user_of_the_month: + name: "המשתמש/ת החדש/ה של החודש" + description: תרומות יוצאות מהכלל בחודש הראשון שלהם admin_login: success: "דוא\"ל נשלח" error: "שגיאה!" diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index 65ab31799a..0c69f108a9 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -96,7 +96,9 @@ nb_NO: embed: load_from_remote: "Det oppstod et problem med innlastingen av innlegget." site_settings: + min_username_length_exists: "Du kan ikke sette minimumslengden på brukernavn over det korteste brukernavnet." min_username_length_range: "Du kan ikke sette minimum høyere enn maksimum." + max_username_length_exists: "Du kan ikke sette maksimallengden for brukernavn under det lengste brukernavnet." max_username_length_range: "Du kan ikke sette maksimum under minimum." default_categories_already_selected: "Du kan ikke velge en annen kategori brukt i en annen liste." invite: @@ -113,8 +115,8 @@ nb_NO: not_found: "Den etterspurte URL eller ressurs ble ikke funnet" invalid_access: "Du har ingen tilgang til denne resurssen." read_only_mode_enabled: "Siden er i skrivebeskyttet modus. Alle interaksjoner er utilgjengelige." - reading_time: "Lese tid" - likes: "Likes" + reading_time: "Lesetid" + likes: "Kjærtegn" too_many_replies: one: "Vi beklager, men nye brukere er midlertidig begrenset til 1 svar i det samme emnet." other: "Vi beklager, men nye brukere er midlertidig begrenset til %{count} svar i det samme emnet." @@ -171,6 +173,12 @@ nb_NO: latest: "Siste emner" hot: "Populære emner" top: "Mest Populære Emner" + top_all: "Tidenes mest populære emner" + top_yearly: "Årets mest populære emner" + top_quarterly: "Kvartalets mest populære emner" + top_monthly: "Månedens mest populære emner" + top_weekly: "Ukas mest populære emner" + top_daily: "Dagens mest populære emner" posts: "Siste innlegg" private_posts: "Siste private meldinger" group_posts: "Siste innlegg fra %{group_name}" @@ -184,6 +192,10 @@ nb_NO: groups: errors: member_already_exist: "'%{username}' er allerede medlem av denne gruppen." + invalid_domain: "'%{domain}' er ikke et gyldig domene." + invalid_incoming_email: "'%{email}' er ikke en gyldig e-postadresse." + email_already_used_in_group: "'%{email}' er allerede i bruk av gruppa '%{group_name}'." + email_already_used_in_category: "'%{email}' er allerede i bruk av kategorien '%{category_name}'." default_names: everyone: "alle" admins: "administratorer" @@ -270,7 +282,7 @@ nb_NO: meta_category_description: "Diskusjon om dette nettstedet, hvordan det er organisert, hvordan det fungerer og hvordan vi kan forbedre det." staff_category_name: "Stab" staff_category_description: "Privat kategori for diskusjoner blant staben. Emner er kun synlige for administratorer og moderatorer." - assets_topic_body: "Dette er et permanent emne, synlig bare for staben, for å lagre bilder of filer brukt i designet på siden. Ikke slett det!\n\n\nHvordan legge til nye filer:\n\n\n1. Svar på dette emnet.\n2. Last opp alle bilder du vil bruke, som logoer, favicons osv. (Bare dra bildene inn i skrivefeltet, eller bruk knappen for opplasting.)\n3. Send ditt svar.\n4. Høyrklikk bildene i din nye post for å få lenken til de opplastede bildene, eller klikk på redigeringsikonet for å kopiere lenkene fra skrivefeltet.\n5. Lim disse lenkene inn i [basic settings](/admin/site_settings/category/required).\n\n\nHvis du trenger å tillate andre filtyper, rediger `authorized_extensions` i [file settings](/admin/site_settings/category/files)." + assets_topic_body: "Dette er et permanent emne, synlig bare for staben, for å lagre bilder og filer brukt i sidens design. Ikke slett det!\n\n\nHvordan legge til nye filer:\n\n\n1. Svar på dette emnet.\n2. Last opp alle bilder du vil bruke, som logoer, favicons osv. (Bare dra bildene inn i skrivefeltet, eller bruk knappen for opplasting.)\n3. Send inn svaret ditt for å poste det.\n4. Høyreklikk på bildene i din nye post for å få lenken til de opplastede bildene, eller klikk på redigeringsikonet for å kopiere lenkene fra skrivefeltet.\n5. Lim disse lenkene inn i [basic settings](/admin/site_settings/category/required).\n\n\nHvis du trenger å tillate andre filtyper, rediger `authorized_extensions` i [file settings](/admin/site_settings/category/files)." discourse_welcome_topic: title: "Velkommen til Discourse" lounge_welcome: @@ -328,6 +340,8 @@ nb_NO: by_type: first_day_replies_per_day: "Du har nådd det maksimale antall svar en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen." first_day_topics_per_day: "Du har nådd det maksimale antall emner en ny bruker kan publisere på sin første dag. Vær så snill og vent %{time_left} før du prøver igjen." + create_post: "Du svarer for raskt. Vent %{time_left} før du prøver igjen." + delete_post: "Du sletter innlegg for raskt. Vent %{time_left} før du prøver igjen." topics_per_day: "Du har oppnådd høyest antall innlegg for i dag. Vær så snill og vent %{time_left} før du prøver igjen." hours: one: "1 time" @@ -412,6 +426,7 @@ nb_NO: password_reset: no_token: "Beklager, den lenken for å endre passord er for gammel. Velg logg inn-knappen bruk 'Jeg glemte passordet mitt' for å motta en ny lenke." choose_new: "Velg et nytt passord" + choose: "Velg et passord" update: 'Oppdater passord' save: 'Sett passord' title: 'Tilbakestill passord' @@ -425,11 +440,16 @@ nb_NO: title: "Takk for at du bekreftet din nåværende e-postadresse" description: "Vi sender deg en e-post til din nye adresse for bekreftelse." activation: + action: "Klikk her for å aktivere din konto" already_done: "Beklager, denne bekreftelseslenken er ikke lenger gyldig. Kanskje er kontoen din allerede aktivert?" please_continue: "Din nye konto er registrert; du vil bli videresendt til hjemmesiden. " continue_button: "Fortsett til %{site_name}" welcome_to: "Velkommen til %{site_name}!" approval_required: "En moderator må manuelt godkjenne kontoen din før du får tilgang til forumet. Du vil motta en e-post når kontoen din er godkjent!" + admin_confirm: + title: "Bekreft admin-konto" + grant: "Tildel admin-tilgang" + back_to: "Gå tilbake til %{title}" post_action_types: off_topic: title: 'Urelatert' @@ -497,11 +517,13 @@ nb_NO: make: "Dette emnet er nå en banner. Det vil vises på toppen av hver side til brukeren lukker det." remove: "Dette emnet er ikke lenger en banner. Det vil ikke lenger vises på toppen av hver side." unsubscribe: + title: "Avmeld" stop_watching_topic: "Slutt å følge dette emnet, %{link}" mute_topic: "Demp alle varslene for dette emnet, %{link}" unwatch_category: "Slutt å følge alle emner i %{category}" mailing_list_mode: "Slå av e-postlistemodus" disable_digest_emails: "Slutt å sende meg oppsummerings-eposter" + all: "Ikke send meg noen e-poster fra %{sitename}" log_out: "Logg ut" user_api_key: read: "les" @@ -532,9 +554,9 @@ nb_NO: xaxis: "Dag" yaxis: "Antall nye innlegg" likes: - title: "Likes" + title: "Kjærtegn" xaxis: "Dag" - yaxis: "Antall nye likes" + yaxis: "Antall nye kjærtegn" flags: title: "Flagg" xaxis: "Dag" @@ -654,7 +676,7 @@ nb_NO: site_settings: censored_words: "Ord som automatisk vil bli erstattet med ■■■■" delete_old_hidden_posts: "Slett automatisk skjulte innlegg som har vært skjult i mer enn 30 dager." - default_locale: "Standard språk for denne instansen av Discourse (ISO 639-1 Kode)" + default_locale: "Forvalgt språk for denne instansen av Discourse (ISO 639-1 Kode)" allow_user_locale: "Tillat brukere å velge eget språk" min_post_length: "Minimum tillatt lengde for innlegg i tegn" min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg" @@ -668,9 +690,9 @@ nb_NO: unique_posts_mins: "Hvor mange minutter før en bruker kan lage et innlegg med det samme innholdet igjen" educate_until_posts: "Når bruker begynner å skrive på de første (n) innleggene, vis pop-up med opplæringspanelet for nye brukere i editoren." title: "Navnet på denne siden, slik du vil ha det i title-taggen." - site_description: "Beskriv siden med en setning, vil brukes i description-taggen." - contact_email: "Epost til ansvarlig kontakt for denne siden. Brukes til kritiske påminninger som uhåndterte flagg og som kontakt-adresse på /about-siden." - contact_url: "Kontakt URL for siden. Brukes på /about siden." + site_description: "Beskriv siden med en setning, vil brukes i beskrivelses-merkelappen." + contact_email: "E-post til ansvarlig kontakt for denne siden. Brukes til kritiske påminninger som uhåndterte flagg og som kontakt-adresse på /om-siden." + contact_url: "Kontakt-URL for siden. Brukes på /om siden." queue_jobs: "KUN FOR UTVIKLERE! ADVARSEL! Jobber køes som forvalg i Sidekiq. Hvis det slås av vil siden ikke fungere. " crawl_images: "Hent bilder fra ekstern URL for å sette inn korrekt høyde og bredde." download_remote_images_to_local: "Konverter eksterne bilder ved å laste de ned lokalt, dette forhindrer ødelagte bilder." @@ -686,6 +708,7 @@ nb_NO: apple_touch_icon_url: "Ikon brukt på Apple touch enheter. Anbefalt størrelse er 144px x 144px." summary_max_results: "Maksimalt antall innlegg som returneres av 'Oppsummer dette emnet'" allow_moderators_to_create_categories: "Tillat moderatorer å opprette nye kategorier" + send_welcome_message: "Send alle nye brukere en velkomstmelding med en rask startveileder." topics_per_period_in_top_summary: "Antall topp-emner vises som forvalg i oppsummeringen av topp-emner." show_email_on_profile: "Vis brukerens e-postadresse i profilen (kun synlig for brukeren selv og forumstaben)" email_token_valid_hours: "Glemt passord / aktiver konto tokens er gyldig for (n) timer." @@ -694,9 +717,12 @@ nb_NO: invite_expiry_days: "Hvor lenge en bruker invitasjons nøkkel er gyldig i dager" min_password_length: "Minimums passordslengde." min_admin_password_length: "Minimums passordslengde for administrator." + google_oauth2_client_id: "Klient-ID tilhørende din Google-søknad." rate_limit_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt" rate_limit_new_user_create_post: "Etter et innlegg må ny brukere vente (n) sekunder før de kan skrive et nytt" - max_likes_per_day: "Maximum antall liker per bruker per dag" + max_likes_per_day: "Maximum antall kjærtegn per bruker per dag" + max_invites_per_day: "Maksimalt antall invitasjoner en bruker kan sende hver dag." + max_logins_per_ip_per_hour: "Maksimalt antall innlogginger som tillates for hver IP-adresse per time." newuser_max_links: "Hvor mange linker en ny bruker kan legge til i et innlegg." newuser_max_images: "Hvor mange bilder en ny bruker kan legge til i et innlegg." title_prettify: "Unngå vanlige skrivefeil i titler, sånn som store bokstaver, liten bokstav først, mange !, ? og punktum på slutten, osv." @@ -710,7 +736,7 @@ nb_NO: digest_other_topics: "Maksimalt antall emner å vise i delen 'Nytt i emner og kategorier du følger' i oppsummerings-e-posten." digest_min_excerpt_length: "Minimal lengde på utdrag av innlegg i e-post-oppsummeringen, i antall tegn." digest_suppress_categories: "Utelat disse kategoriene i oppsummerings-eposter" - disable_digest_emails: "Deaktivér oppsummerings-eposter for alle brukere." + disable_digest_emails: "Deaktiver oppsummerings-eposter for alle brukere." allow_profile_backgrounds: "Gi brukere mulighet til å laste opp profilbakgrunner." enable_mobile_theme: "Mobilenheter bruker et mobilvennlig drakt, med muligheten til å gå til den fulle siden. Deaktiver dette hvis du ønsker å bruke et tilpasset stilark." dominating_topic_minimum_percent: "Hvor mange innlegg en bruker kan lage innenfor en topic før de blir påminnet om dominering av en topic." @@ -723,7 +749,7 @@ nb_NO: default_include_tl0_in_digests: "La det være forvalgt innstilling å inkludere innlegg fra nye brukere i oppsummerings-e-poster. Brukere kan endre dette i innstillingene sine." default_email_mailing_list_mode_frequency: "Brukere som slår på e-postlistemodus, vil motta e-poster så ofte som forvalg" disable_mailing_list_mode: "Forby brukere å slå på e-postlistemodus" - default_email_previous_replies: "Inkludér tidligere svar i e-poster som forvalg." + default_email_previous_replies: "Inkluder tidligere svar i e-poster som forvalg." default_topics_automatic_unpin: "Automatisk fjern feste for emner når brukeren når bunnen som forvalg." default_categories_watching: "Liste med kategorier som følges som forvalg" default_categories_tracking: "Liste med kategorier som overvåkes som forvalg" @@ -748,7 +774,7 @@ nb_NO: most_posts: "Flest innlegg" most_recent_poster: "Ferskeste innlegg av" redirected_to_top_reasons: - new_user: "Velkommen til vårt forum! Dette er de mest populære emnene for tiden. " + new_user: "Velkommen til forumet vårt! Dette er de mest populære emnene for tiden. " not_seen_in_a_month: "Velkommen tilbake! Nå har ikke vi sett deg på en stund. Dette er de mest populære emnene for tiden." change_owner: deleted_user: "en slettet bruker" @@ -840,6 +866,7 @@ nb_NO: new_topics: "Nye emner" unread_messages: "Uleste meldinger" unread_notifications: "Uleste varslinger." + liked_received: "Kjærtegn mottatt" new_posts: "Nye innlegg" new_users: "Nye brukere" popular_topics: "Populære emner" @@ -908,7 +935,7 @@ nb_NO: tos_topic: title: "Bruksvilkår" privacy_topic: - title: "Personvernerklæring" + title: "Personvernserklæring" body: | @@ -943,7 +970,7 @@ nb_NO: Vi vil forsøke i god tro å: - * Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forspørslene til denne tjeneren ikke lenger enn i 90 dager. + * Ikke oppbevare tjener-logger som inneholder IP-adressen til alle forespørslene til denne tjeneren i lenger enn i 90 dager. * Ikke oppbevare IP-adressene forbundet med registrerte brukere og deres innlegg lenger enn i 5 år. @@ -958,7 +985,7 @@ nb_NO: ## [Gir vi noen opplysninger videre til andre parter?](#gi-videre) - Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for marketsføring, reklame eller annet bruk. + Vi verken selger, handler med eller overfører på noen annen måte til andre parter dine identifiserbare personopplysninger. Dette inkluderer ikke tredjeparter som har vår tillit og bistår oss i å drive nettstedet, utføre våre anliggender eller yter tjenester til deg, så lenge disse partene samtykker til å behandle disse opplysningene fortrolig. Vi kan også frigi opplysningene dine dersom vi tror at å frigi dem er hensiktsmessig for å overholde loven, håndheve nettstedet retningslinjer eller beskytte våre og andres rettigheter. Imidlertid kan opplysninger som ikke er personlig identifiserbare, bli delt med andre parter for markedsføring, reklame eller annet bruk. diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 35604e3e82..24bc5fd490 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -347,16 +347,16 @@ pl_PL: attributes: hex: invalid: "nie jest poprawnym kolorem" - post_reply: - base: - different_topic: "Wpis i odpowiedź muszą należeć do tego samego tematu." web_hook: attributes: payload_url: invalid: "Link jest nieprawidłowy, powinien zawierać http:// lub https://. Puste pole jest niedozwolone." + topic_status_update: + attributes: + execute_at: + in_the_past: "musi wskazywać na przyszłość." <<: *errors user_profile: - no_info_me: "
Pole O mnie w Twoim profilu jest obecnie puste, czy chcesz je wypełnić?
" no_info_other: "
%{name} jeszcze nie podał swojego opisu w profilu
" vip_category_name: "Salon" vip_category_description: "Kategoria wyłącznie dla członków o poziomie zaufania 3 lub wyższym." @@ -610,6 +610,9 @@ pl_PL: welcome_to: "Witamy na forum %{site_name}!" approval_required: "Moderator musi zaakceptować Twoje nowe konto zanim uzyskasz dostęp do forum. O aktywacji zostaniesz poinformowanym mailem." missing_session: "Nie wiemy, czy twoje konto zostało utworzone, upewnij się, że masz włączone pliki cookies." + activated: "Przepraszamy, to konto zostało już aktywowane." + admin_confirm: + back_to: "Wróć do %{title}" post_action_types: off_topic: title: 'Nie na temat' @@ -1840,33 +1843,16 @@ pl_PL: back_to_top: "Powrót do góry" forgot_password: title: "Zapomniane hasło" - text_body_template: | - Ktoś poprosił o zresetowanie Twojego hasła na [%{site_name}](%{base_url}). - - Jeśli to nie Ty, możesz bezpiecznie zignorować tę wiadomość. - - Kliknij na poniższy link by wybrać nowe hasło: - %{base_url}/users/password-reset/%{email_token} set_password: title: "Ustaw hasło" - text_body_template: | - Ktoś poprosił o dodanie hasła do twojego konta [%{site_name}](%{base_url}). Możesz się zalogować przy pomocy konta w i innym serwisie (Google, Facebook, itd.) które zostało powiązane z twoim potwierdzonym adresem email. - - Jeśli to nie była twoja prośba, możesz zignorować tą wiadomość. - - Kliknij odnośnik poniżej by ustawić hasło: - %{base_url}/users/password-reset/%{email_token} admin_login: title: "Logowanie administratora. " account_created: title: "Utworzono Konto" - text_body_template: | - Utworzyliśmy Twoje konto na %{site_name} - - Kliknij na linku poniżej, aby ustawić swoje hasło: - %{base_url}/users/password-reset/%{email_token} + subject_template: "[%{site_name}] Twoje Nowe Konto" confirm_new_email: title: "Potwierdź Nowy Email" + subject_template: "[%{email_prefix}] Potwierdź swój nowy adres email" confirm_old_email: title: "Potwierdź stary email" notify_old_email: @@ -2102,14 +2088,15 @@ pl_PL: description: Użyto Emoji w Poście first_mention: name: Pierwsze Wspomnienie - description: Wspomniano o użytkowniku w Poście first_onebox: name: Pierwszy Onebox first_reply_by_email: name: Pierwsza Odpowiedz przez Email - description: Odpowiedź na post przez maila + description: Odpowiedział na post poprzez email long_description: | Ta odznaka jest przyznawana za kiedy pierwszy raz odpowiesz na post poprzez maila:. + new_user_of_the_month: + name: "Nowy Użytkownik Miesiąca" admin_login: success: "Email wysłany" error: "Błąd!" @@ -2163,6 +2150,7 @@ pl_PL: fields: welcome: label: "Temat powitalny" + one_paragraph: "Ogranicz wiadomość powitalną do jednego akapitu." privacy: title: "Dostęp" fields: diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 5cf1566f2c..8ae079b2c3 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -1446,19 +1446,23 @@ ru: subject_template: "%{optional_re}%{topic_title}" digest: why: "Сводка обсуждений на сайте %{site_link} с момента вашего последнего визита %{last_seen_at}" - since_last_visit: "С Вашего последнего посещения" - new_topics: "Новые Темы" - unread_messages: "Непрочитанные Сообщения" - unread_notifications: "Непрочитанные Уведомления" - liked_received: "Получено Симпатий" - new_posts: "Новые Сообщения" - new_users: "Новые Пользователи" - popular_topics: "Популярные Темы" + since_last_visit: "За время вашего отсутствия" + new_topics: "Новые темы" + unread_messages: "Непрочитанные сообщения" + unread_notifications: "Непрочитанные уведомления" + liked_received: "Симпатии" + new_posts: "Новые сообщения" + new_users: "Новые пользователи" + popular_topics: "Популярные темы" follow_topic: "Следить за этой темой" - join_the_discussion: "Читать Далее" - popular_posts: "Популярные Сообщения" - more_new: "Новое для Вас" + join_the_discussion: "Читать далее" + popular_posts: "Популярные сообщения" + more_new: "Новинки для вас" + subject_template: "[%{email_prefix}] — сводка" + unsubscribe: "Сводка новостей отправляется, если вы давно не заходили на сайт %{site_link}. Чтобы отписаться от этой рассылки, %{unsubscribe_link}." click_here: "нажмите здесь" + from: "Сводка — %{site_name}" + preheader: "Сводка новостей с вашего последнего визита %{last_seen_at}" mailing_list: why: "Вся активность на сайте %{site_link} за %{date}" new_topics: "Новые темы" diff --git a/public/422.cs.html b/public/422.cs.html index f140e86582..ae0439e5a1 100644 --- a/public/422.cs.html +++ b/public/422.cs.html @@ -18,7 +18,7 @@
-

Změna, kterou jste chtěl(a), byl(a) odmítnuta.

+

Požadovaná změna byla odmítnuta.

Možná jste se pokusil(a) změnit něco, k čemu jste neměl(a) přístup.

From 028eb8c05a6fb26e742d7d2120e21fd0e6e8da46 Mon Sep 17 00:00:00 2001 From: Arpit Jalan Date: Mon, 10 Apr 2017 23:29:03 +0530 Subject: [PATCH 123/124] FIX: render emoji in topic title --- app/helpers/topics_helper.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/topics_helper.rb b/app/helpers/topics_helper.rb index 677e72ae2b..ad96e94177 100644 --- a/app/helpers/topics_helper.rb +++ b/app/helpers/topics_helper.rb @@ -1,7 +1,8 @@ module TopicsHelper + include ApplicationHelper def render_topic_title(topic) - link_to(topic.title,topic.relative_url) + link_to(gsub_emoji_to_unicode(topic.title),topic.relative_url) end def categories_breadcrumb(topic) From 8ce14479b6f4bda2071bcc557f0a964d51b26223 Mon Sep 17 00:00:00 2001 From: Neil Lalonde Date: Mon, 10 Apr 2017 14:31:27 -0400 Subject: [PATCH 124/124] Version bump to v1.8.0.beta10 --- lib/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/version.rb b/lib/version.rb index 704b8bb045..ab63b0e6f5 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 8 TINY = 0 - PRE = 'beta9' + PRE = 'beta10' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end