diff --git a/Gemfile b/Gemfile index 03750100f4..539bc0d34c 100644 --- a/Gemfile +++ b/Gemfile @@ -25,8 +25,6 @@ else gem 'seed-fu', '~> 2.3.3' end -gem 'actionpack-action_caching' - # Rails 4.1.6+ will relax the mail gem version requirement to `~> 2.5, >= 2.5.4`. # However, mail gem 2.6.x currently does not work with discourse because of the # reference to `Mail::RFC2822Parser` in `lib/email.rb`. This ensure discourse diff --git a/Gemfile.lock b/Gemfile.lock index 154d660bc2..abbaf8458c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -15,8 +15,6 @@ GEM activesupport (= 4.1.10) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionpack-action_caching (1.1.1) - actionpack (>= 4.0.0, < 5.0) actionview (4.1.10) activesupport (= 4.1.10) builder (~> 3.1) @@ -208,7 +206,7 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - onebox (1.5.20) + onebox (1.5.21) moneta (~> 0.7) multi_json (~> 1.7) mustache (~> 0.99) @@ -392,7 +390,6 @@ PLATFORMS ruby DEPENDENCIES - actionpack-action_caching active_model_serializers (~> 0.8.3) annotate aws-sdk diff --git a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 b/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 index 266f06c3e8..be6834333d 100644 --- a/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-customize-css-html.js.es6 @@ -1,3 +1,5 @@ +import showModal from 'discourse/lib/show-modal'; + /** This controller supports interface for creating custom CSS skins in Discourse. @@ -21,6 +23,10 @@ export default Ember.ArrayController.extend({ this.set('selectedItem', item); }, + importModal: function() { + showModal('upload-customization'); + }, + /** Select a given style diff --git a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 index 6bb36989b7..0430e8a180 100644 --- a/app/assets/javascripts/admin/controllers/admin-reports.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-reports.js.es6 @@ -4,24 +4,26 @@ export default Ember.ObjectController.extend({ viewingBarChart: Em.computed.equal('viewMode', 'barChart'), startDate: null, endDate: null, + categoryId: null, refreshing: false, actions: { - refreshReport: function() { - var self = this; - this.set('refreshing', true); - Discourse.Report.find(this.get('type'), this.get('startDate'), this.get('endDate')).then(function(r) { - self.set('model', r); - }).finally(function() { - self.set('refreshing', false); - }); + refreshReport() { + this.set("refreshing", true); + Discourse.Report.find( + this.get("type"), + this.get("startDate"), + this.get("endDate"), + this.get("categoryId") + ).then(m => this.set("model", m) + ).finally(() => this.set("refreshing", false)); }, - viewAsTable: function() { + viewAsTable() { this.set('viewMode', 'table'); }, - viewAsBarChart: function() { + viewAsBarChart() { this.set('viewMode', 'barChart'); } } diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js.es6 similarity index 83% rename from app/assets/javascripts/admin/models/report.js rename to app/assets/javascripts/admin/models/report.js.es6 index 6f8bfdfff3..ebb63486d2 100644 --- a/app/assets/javascripts/admin/models/report.js +++ b/app/assets/javascripts/admin/models/report.js.es6 @@ -1,9 +1,11 @@ -Discourse.Report = Discourse.Model.extend({ +import round from "discourse/lib/round"; + +const Report = Discourse.Model.extend({ reportUrl: function() { return("/admin/reports/" + this.get('type')); }.property('type'), - valueAt: function(numDaysAgo) { + valueAt(numDaysAgo) { if (this.data) { var wantedDate = moment().subtract(numDaysAgo, 'days').format('YYYY-MM-DD'); var item = this.data.find( function(d) { return d.x === wantedDate; } ); @@ -14,7 +16,7 @@ Discourse.Report = Discourse.Model.extend({ return 0; }, - sumDays: function(startDaysAgo, endDaysAgo) { + sumDays(startDaysAgo, endDaysAgo) { if (this.data) { var earliestDate = moment().subtract(endDaysAgo, 'days').startOf('day'); var latestDate = moment().subtract(startDaysAgo, 'days').startOf('day'); @@ -25,7 +27,7 @@ Discourse.Report = Discourse.Model.extend({ sum += datum.y; } }); - return sum; + return round(sum, -2); } }, @@ -100,7 +102,7 @@ Discourse.Report = Discourse.Model.extend({ } }.property('type'), - percentChangeString: function(val1, val2) { + percentChangeString(val1, val2) { var val = ((val1 - val2) / val2) * 100; if( isNaN(val) || !isFinite(val) ) { return null; @@ -111,7 +113,7 @@ Discourse.Report = Discourse.Model.extend({ } }, - changeTitle: function(val1, val2, prevPeriodString) { + changeTitle(val1, val2, prevPeriodString) { var title = ''; var percentChange = this.percentChangeString(val1, val2); if( percentChange ) { @@ -139,26 +141,29 @@ Discourse.Report = Discourse.Model.extend({ }); -Discourse.Report.reopenClass({ - find: function(type, startDate, endDate) { +Report.reopenClass({ - return Discourse.ajax("/admin/reports/" + type, {data: { - start_date: startDate, - end_date: endDate - }}).then(function (json) { + find(type, startDate, endDate, categoryId) { + return Discourse.ajax("/admin/reports/" + type, { + data: { + start_date: startDate, + end_date: endDate, + category_id: categoryId + } + }).then(json => { // Add a percent field to each tuple - var maxY = 0; - json.report.data.forEach(function (row) { + let maxY = 0; + json.report.data.forEach(row => { if (row.y > maxY) maxY = row.y; }); if (maxY > 0) { - json.report.data.forEach(function (row) { - row.percentage = Math.round((row.y / maxY) * 100); - }); + json.report.data.forEach(row => row.percentage = Math.round((row.y / maxY) * 100)); } - var model = Discourse.Report.create({type: type}); + const model = Discourse.Report.create({ type: type }); model.setProperties(json.report); return model; }); } }); + +export default Report; diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js index 27b6ddbdd9..f7b6346a95 100644 --- a/app/assets/javascripts/admin/models/site_customization.js +++ b/app/assets/javascripts/admin/models/site_customization.js @@ -78,13 +78,18 @@ Discourse.SiteCustomization = Discourse.Model.extend({ siteCustomization.set('savingStatus', I18n.t('saved')); siteCustomization.set('saving',false); siteCustomization.startTrackingChanges(); + return siteCustomization; }); }, destroy: function() { if (!this.id) return; return Discourse.ajax("/admin/site_customizations/" + this.id, { type: 'DELETE' }); - } + }, + + download_url: function() { + return Discourse.getURL('/admin/site_customizations/' + this.id); + }.property('id') }); var SiteCustomizations = Ember.ArrayProxy.extend({ diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 index bbe4c79845..5f2c6abd8e 100644 --- a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 @@ -12,8 +12,9 @@ export default Discourse.Route.extend({ if (versionChecks) { c.set('versionCheck', Discourse.VersionCheck.create(d.version_check)); } - _.each(d.reports,function(report){ - c.set(report.type, Discourse.Report.create(report)); + + ['global_reports', 'page_view_reports', 'private_message_reports', 'http_reports', 'user_reports'].forEach(name => { + c.set(name, d[name].map(r => Discourse.Report.create(r))); }); var topReferrers = d.top_referrers; diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs index 004318e1eb..e2cc7951a0 100644 --- a/app/assets/javascripts/admin/templates/customize_css_html.hbs +++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs @@ -8,12 +8,14 @@ + {{d-button action="importModal" icon="upload" label="admin.customize.import"}} {{#if selectedItem}}
{{text-field class="style-name" value=selectedItem.name}} + {{fa-icon "download"}} {{i18n 'admin.export_json.button_text'}}
    diff --git a/app/assets/javascripts/admin/templates/dashboard.hbs b/app/assets/javascripts/admin/templates/dashboard.hbs index 1d4dcf6740..d448553301 100644 --- a/app/assets/javascripts/admin/templates/dashboard.hbs +++ b/app/assets/javascripts/admin/templates/dashboard.hbs @@ -17,7 +17,9 @@ {{#unless loading}} - {{admin-report-trust-level-counts report=users_by_trust_level}} + {{#each r in user_reports}} + {{admin-report-trust-level-counts report=r}} + {{/each}} {{/unless}} @@ -26,15 +28,15 @@
    - + - + - + - +
    {{i18n 'admin.dashboard.admins'}}{{fa-icon "shield"}} {{i18n 'admin.dashboard.admins'}} {{#link-to 'adminUsersList.show' 'admins'}}{{admins}}{{/link-to}} {{i18n 'admin.dashboard.suspended'}}{{fa-icon "ban"}} {{i18n 'admin.dashboard.suspended'}} {{#link-to 'adminUsersList.show' 'suspended'}}{{suspended}}{{/link-to}}
    {{i18n 'admin.dashboard.moderators'}}{{fa-icon "shield"}} {{i18n 'admin.dashboard.moderators'}} {{#link-to 'adminUsersList.show' 'moderators'}}{{moderators}}{{/link-to}} {{i18n 'admin.dashboard.blocked'}}{{fa-icon "ban"}} {{i18n 'admin.dashboard.blocked'}} {{#link-to 'adminUsersList.show' 'blocked'}}{{blocked}}{{/link-to}}
    @@ -54,14 +56,9 @@ {{#unless loading}} - {{admin-report-counts report=visits}} - {{admin-report-counts report=signups}} - {{admin-report-counts report=topics}} - {{admin-report-counts report=posts}} - {{admin-report-counts report=likes}} - {{admin-report-counts report=flags}} - {{admin-report-counts report=bookmarks}} - {{admin-report-counts report=emails}} + {{#each r in global_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}} @@ -81,21 +78,19 @@ {{#unless loading}} - {{admin-report-counts report=page_view_anon_reqs}} - {{admin-report-counts report=page_view_logged_in_reqs}} - {{admin-report-counts report=page_view_crawler_reqs}} - {{admin-report-counts report=page_view_total_reqs}} + {{#each r in page_view_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}}
    -
    - + @@ -105,11 +100,9 @@ {{#unless loading}} - {{admin-report-counts report=user_to_user_private_messages}} - {{admin-report-counts report=system_private_messages}} - {{admin-report-counts report=notify_moderators_private_messages}} - {{admin-report-counts report=notify_user_private_messages}} - {{admin-report-counts report=moderator_warning_private_messages}} + {{#each r in private_message_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}}
    {{i18n 'admin.dashboard.private_messages_short'}}{{fa-icon "enveloppe"}} {{i18n 'admin.dashboard.private_messages_short'}} {{i18n 'admin.dashboard.reports.today'}} {{i18n 'admin.dashboard.reports.yesterday'}} {{i18n 'admin.dashboard.reports.last_7_days'}}
    @@ -154,12 +147,9 @@ {{#unless loading}} - {{admin-report-counts report=http_2xx_reqs}} - {{admin-report-counts report=http_3xx_reqs}} - {{admin-report-counts report=http_4xx_reqs}} - {{admin-report-counts report=http_5xx_reqs}} - {{admin-report-counts report=http_background_reqs}} - {{admin-report-counts report=http_total_reqs}} + {{#each r in http_reports}} + {{admin-report-counts report=r}} + {{/each}} {{/unless}} @@ -176,7 +166,7 @@ {{#if foundProblems}}
    -
    +
    {{fa-icon "exclamation-triangle"}}

    {{i18n 'admin.dashboard.problems_found'}} diff --git a/app/assets/javascripts/admin/templates/reports.hbs b/app/assets/javascripts/admin/templates/reports.hbs index 0bc26a8739..2bbc04b187 100644 --- a/app/assets/javascripts/admin/templates/reports.hbs +++ b/app/assets/javascripts/admin/templates/reports.hbs @@ -3,6 +3,7 @@

    {{i18n 'admin.dashboard.reports.start_date'}} {{input type="date" value=startDate}} {{i18n 'admin.dashboard.reports.end_date'}} {{input type="date" value=endDate}} + {{category-chooser valueAttribute="id" value=categoryId source=categoryId}} {{d-button action="refreshReport" class="btn-primary" label="admin.dashboard.reports.refresh_report" icon="refresh"}}
    diff --git a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs index 12e640c2c3..ec8ecaf395 100644 --- a/app/assets/javascripts/admin/templates/site-settings/url_list.hbs +++ b/app/assets/javascripts/admin/templates/site-settings/url_list.hbs @@ -1,3 +1,3 @@ -{{value-list value=buffered.value addKey="admin.site_settings.add_url"}} +{{value-list values=buffered.value addKey="admin.site_settings.add_url"}} {{setting-validation-message message=validationMessage}}
    {{{unbound setting.description}}}
    diff --git a/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 b/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 index 218a8d8d8c..b73bf7ecb1 100644 --- a/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 +++ b/app/assets/javascripts/discourse/adapters/build-plugin.js.es6 @@ -2,8 +2,8 @@ import RestAdapter from 'discourse/adapters/rest'; export default function buildPluginAdapter(pluginName) { return RestAdapter.extend({ - pathFor(store, type) { - return "/admin/plugins/" + pluginName + this._super(store, type); + pathFor(store, type, findArgs) { + return "/admin/plugins/" + pluginName + this._super(store, type, findArgs); } }); } diff --git a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 index 236091072b..66fcd65a37 100644 --- a/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 +++ b/app/assets/javascripts/discourse/components/bread-crumbs.js.es6 @@ -1,6 +1,6 @@ // A breadcrumb including category drop downs export default Ember.Component.extend({ - classNames: ['category-breadcrumb'], + classNameBindings: ['hidden:hidden',':category-breadcrumb'], tagName: 'ol', parentCategory: Em.computed.alias('category.parentCategory'), @@ -12,6 +12,10 @@ export default Ember.Component.extend({ return !c.get('parentCategory'); }), + hidden: function(){ + return Discourse.Mobile.mobileView && !this.get('category'); + }.property('category'), + firstCategory: function() { return this.get('parentCategory') || this.get('category'); }.property('parentCategory', 'category'), @@ -29,6 +33,11 @@ export default Ember.Component.extend({ return this.get('categories').filter(function (c) { return c.get('parentCategory') === firstCategory; }); - }.property('firstCategory', 'hideSubcategories') + }.property('firstCategory', 'hideSubcategories'), + + render: function(buffer) { + if (this.get('hidden')) { return; } + this._super(buffer); + } }); diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6 index e440f839ac..5fdd914e82 100644 --- a/app/assets/javascripts/discourse/components/combo-box.js.es6 +++ b/app/assets/javascripts/discourse/components/combo-box.js.es6 @@ -14,8 +14,12 @@ export default Ember.Component.extend({ return result; }, + realNameProperty: function() { + return this.get('nameProperty') || 'name'; + }.property('nameProperty'), + render(buffer) { - const nameProperty = this.get('nameProperty') || 'name', + const nameProperty = this.get('realNameProperty'), none = this.get('none'); // Add none option if required @@ -64,16 +68,22 @@ export default Ember.Component.extend({ o.selected = !!$(o).attr('selected'); }); + // observer for item names changing (optional) + if (this.get('nameChanges')) { + this.addObserver('content.@each.' + this.get('realNameProperty'), this.rerender); + } + $elem.select2({formatResult: this.comboTemplate, minimumResultsForSearch: 5, width: 'resolve'}); const castInteger = this.get('castInteger'); $elem.on("change", function (e) { let val = $(e.target).val(); - if (val.length && castInteger) { + if (val && val.length && castInteger) { val = parseInt(val, 10); } self.set('value', val); }); + $elem.trigger('change'); }.on('didInsertElement'), _destroyDropdown: function() { diff --git a/app/assets/javascripts/discourse/components/json-file-uploader.js.es6 b/app/assets/javascripts/discourse/components/json-file-uploader.js.es6 new file mode 100644 index 0000000000..e29491d48a --- /dev/null +++ b/app/assets/javascripts/discourse/components/json-file-uploader.js.es6 @@ -0,0 +1,103 @@ + +export default Em.Component.extend({ + fileInput: null, + loading: false, + expectedRootObjectName: null, + hover: 0, + + classNames: ['json-uploader'], + + _initialize: function() { + const $this = this.$(); + const self = this; + + const $fileInput = $this.find('#js-file-input'); + this.set('fileInput', $fileInput[0]); + + $fileInput.on('change', function() { + self.fileSelected(this.files); + }); + + $this.on('dragover', function(e) { + if (e.preventDefault) e.preventDefault(); + return false; + }); + $this.on('dragenter', function(e) { + if (e.preventDefault) e.preventDefault(); + self.set('hover', self.get('hover') + 1); + return false; + }); + $this.on('dragleave', function(e) { + if (e.preventDefault) e.preventDefault(); + self.set('hover', self.get('hover') - 1); + return false; + }); + $this.on('drop', function(e) { + if (e.preventDefault) e.preventDefault(); + + self.set('hover', 0); + self.fileSelected(e.dataTransfer.files); + return false; + }); + + }.on('didInsertElement'), + + accept: function() { + return ".json,application/json,application/x-javascript,text/json" + (this.get('extension') ? "," + this.get('extension') : ""); + }.property('extension'), + + setReady: function() { + let parsed; + try { + parsed = JSON.parse(this.get('value')); + } catch (e) { + this.set('ready', false); + return; + } + + const rootObject = parsed[this.get('expectedRootObjectName')]; + + if (rootObject !== null && rootObject !== undefined) { + this.set('ready', true); + } else { + this.set('ready', false); + } + }.observes('destination', 'expectedRootObjectName'), + + actions: { + selectFile: function() { + const $fileInput = $(this.get('fileInput')); + $fileInput.click(); + } + }, + + fileSelected(fileList) { + const self = this; + let files = []; + for (let i = 0; i < fileList.length; i++) { + files[i] = fileList[i]; + } + const fileNameRegex = /\.(json|txt)$/; + files = files.filter(function(file) { + if (fileNameRegex.test(file.name)) { + return true; + } + if (file.type === "text/plain") { + return true; + } + return false; + }); + const firstFile = fileList[0]; + + this.set('loading', true); + + let reader = new FileReader(); + reader.onload = function(evt) { + self.set('value', evt.target.result); + self.set('loading', false); + }; + + reader.readAsText(firstFile); + } + +}); diff --git a/app/assets/javascripts/discourse/components/navigation-bar.js.es6 b/app/assets/javascripts/discourse/components/navigation-bar.js.es6 new file mode 100644 index 0000000000..3cf9a741f1 --- /dev/null +++ b/app/assets/javascripts/discourse/components/navigation-bar.js.es6 @@ -0,0 +1,56 @@ +export default Ember.Component.extend({ + tagName: 'ul', + classNameBindings: [':nav', ':nav-pills'], + id: 'navigation-bar', + selectedNavItem: function(){ + const filterMode = this.get('filterMode'), + navItems = this.get('navItems'); + + var item = navItems.find(function(item){ + return item.get('filterMode').indexOf(filterMode) === 0; + }); + + return item || navItems[0]; + }.property('filterMode'), + + closedNav: function(){ + if (!this.get('expanded')) { + this.ensureDropClosed(); + } + }.observes('expanded'), + + ensureDropClosed: function(){ + if (!this.get('expanded')) { + this.set('expanded',false); + } + $(window).off('click.navigation-bar'); + Discourse.URL.appEvents.off('dom:clean', this, this.ensureDropClosed); + }, + + actions: { + toggleDrop: function(){ + this.set('expanded', !this.get('expanded')); + var self = this; + if (this.get('expanded')) { + + Discourse.URL.appEvents.on('dom:clean', this, this.ensureDropClosed); + + Em.run.next(function() { + + if (!self.get('expanded')) { return; } + + self.$('.drop a').on('click', function(){ + self.$('.drop').hide(); + self.set('expanded', false); + return true; + }); + + $(window).on('click.navigation-bar', function() { + self.set('expanded', false); + return true; + }); + }); + } + } + } +}); diff --git a/app/assets/javascripts/discourse/components/navigation-item.js.es6 b/app/assets/javascripts/discourse/components/navigation-item.js.es6 index 56927d55bb..075919ca74 100644 --- a/app/assets/javascripts/discourse/components/navigation-item.js.es6 +++ b/app/assets/javascripts/discourse/components/navigation-item.js.es6 @@ -24,25 +24,13 @@ export default Ember.Component.extend(StringBuffer, { this.get('filterMode').indexOf(this.get('content.filterMode')) === 0; }.property('content.filterMode', 'filterMode'), - name: function() { - var categoryName = this.get('content.categoryName'), - name = this.get('content.name'), - extra = { count: this.get('content.count') || 0 }; - - if (categoryName) { - name = 'category'; - extra.categoryName = Discourse.Formatter.toTitleCase(categoryName); - } - return I18n.t("filters." + name.replace("/", ".") + ".title", extra); - }.property('content.{categoryName,name,count}'), - renderString(buffer) { const content = this.get('content'); buffer.push(""); if (content.get('hasIcon')) { buffer.push(""); } - buffer.push(this.get('name')); + buffer.push(this.get('content.displayName')); buffer.push(""); } }); diff --git a/app/assets/javascripts/discourse/components/post-gap.js.es6 b/app/assets/javascripts/discourse/components/post-gap.js.es6 index 38e40fa446..3c3209a89e 100644 --- a/app/assets/javascripts/discourse/components/post-gap.js.es6 +++ b/app/assets/javascripts/discourse/components/post-gap.js.es6 @@ -1,5 +1,5 @@ export default Ember.Component.extend({ - classNameBindings: [':gap', 'gap::hidden'], + classNameBindings: [':gap', ':jagged-border', 'gap::hidden'], initGaps: function(){ this.set('loading', false); diff --git a/app/assets/javascripts/discourse/components/search-result-category.js.es6 b/app/assets/javascripts/discourse/components/search-result-category.js.es6 new file mode 100644 index 0000000000..e23284ed16 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-result-category.js.es6 @@ -0,0 +1,2 @@ +import SearchResult from 'discourse/components/search-result'; +export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-post.js.es6 b/app/assets/javascripts/discourse/components/search-result-post.js.es6 new file mode 100644 index 0000000000..e23284ed16 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-result-post.js.es6 @@ -0,0 +1,2 @@ +import SearchResult from 'discourse/components/search-result'; +export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-topic.js.es6 b/app/assets/javascripts/discourse/components/search-result-topic.js.es6 new file mode 100644 index 0000000000..e23284ed16 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-result-topic.js.es6 @@ -0,0 +1,2 @@ +import SearchResult from 'discourse/components/search-result'; +export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result-user.js.es6 b/app/assets/javascripts/discourse/components/search-result-user.js.es6 new file mode 100644 index 0000000000..e23284ed16 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-result-user.js.es6 @@ -0,0 +1,2 @@ +import SearchResult from 'discourse/components/search-result'; +export default SearchResult.extend(); diff --git a/app/assets/javascripts/discourse/components/search-result.js.es6 b/app/assets/javascripts/discourse/components/search-result.js.es6 new file mode 100644 index 0000000000..dacf1f2696 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-result.js.es6 @@ -0,0 +1,11 @@ +export default Ember.Component.extend({ + tagName: 'ul', + + _highlightOnInsert: function() { + const term = this.get('controller.term'); + if(!_.isEmpty(term)) { + this.$('.blurb').highlight(term.split(/\s+/), {className: 'search-highlight'}); + this.$('.topic-title').highlight(term.split(/\s+/), {className: 'search-highlight'} ); + } + }.on('didInsertElement') +}); diff --git a/app/assets/javascripts/discourse/components/search-text-field.js.es6 b/app/assets/javascripts/discourse/components/search-text-field.js.es6 new file mode 100644 index 0000000000..e833f66110 --- /dev/null +++ b/app/assets/javascripts/discourse/components/search-text-field.js.es6 @@ -0,0 +1,7 @@ +import TextField from 'discourse/components/text-field'; + +export default TextField.extend({ + placeholder: function() { + return this.get('searchContextEnabled') ? "" : I18n.t('search.title'); + }.property('searchContextEnabled') +}); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 1cc221a9ad..0571ddb9c3 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -332,7 +332,7 @@ export default Ember.ObjectController.extend(Presence, { this.set('similarTopicsMessage', message); } - this.store.find('topic', {similar: {title, raw: body}}).then(function(newTopics) { + this.store.find('similar-topic', {title, raw: body}).then(function(newTopics) { similarTopics.clear(); similarTopics.pushObjects(newTopics.get('content')); diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index 4f55d15d41..b5812eb6a9 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -21,8 +21,7 @@ export default DiscourseController.extend(ModalFunctionality, { maxUsernameLength: Discourse.computed.setting('max_username_length'), minUsernameLength: Discourse.computed.setting('min_username_length'), - resetForm: function() { - + resetForm() { // We wrap the fields in a structure so we can assign a value this.setProperties({ accountName: '', @@ -49,11 +48,11 @@ export default DiscourseController.extend(ModalFunctionality, { if (this.get('passwordValidation.failed')) return true; // Validate required fields - var userFields = this.get('userFields'); + let userFields = this.get('userFields'); if (userFields) { userFields = userFields.filterProperty('field.required'); } if (!Ember.isEmpty(userFields)) { - var anyEmpty = userFields.any(function(uf) { - var val = uf.get('value'); + const anyEmpty = userFields.any(function(uf) { + const val = uf.get('value'); return !val || Ember.isEmpty(val); }); if (anyEmpty) { return true; } @@ -61,6 +60,9 @@ export default DiscourseController.extend(ModalFunctionality, { return false; }.property('passwordRequired', 'nameValidation.failed', 'emailValidation.failed', 'usernameValidation.failed', 'passwordValidation.failed', 'formSubmitted', 'userFields.@each.value'), + + usernameRequired: Ember.computed.not('authOptions.omit_username'), + passwordRequired: function() { return this.blank('authOptions.auth_provider'); }.property('authOptions.auth_provider'), @@ -89,7 +91,7 @@ export default DiscourseController.extend(ModalFunctionality, { // Check the email address emailValidation: function() { // If blank, fail without a reason - var email; + let email; if (this.blank('accountEmail')) { return Discourse.InputValidation.create({ failed: true @@ -149,7 +151,7 @@ export default DiscourseController.extend(ModalFunctionality, { }.observes('emailValidation', 'accountEmail'), fetchExistingUsername: Discourse.debounce(function() { - var self = this; + const self = this; Discourse.User.checkUsername(null, this.get('accountEmail')).then(function(result) { if (result.suggestion && (self.blank('accountUsername') || self.get('accountUsername') === self.get('authOptions.username'))) { self.set('accountUsername', result.suggestion); @@ -225,7 +227,7 @@ export default DiscourseController.extend(ModalFunctionality, { }, checkUsernameAvailability: Discourse.debounce(function() { - var _this = this; + const _this = this; if (this.shouldCheckUsernameMatch()) { return Discourse.User.checkUsername(this.get('accountUsername'), this.get('accountEmail')).then(function(result) { _this.set('globalNicknameExists', false); @@ -275,30 +277,23 @@ export default DiscourseController.extend(ModalFunctionality, { // Actually wait for the async name check before we're 100% sure we're good to go usernameValidation: function() { - var basicValidation, uniqueUsername; - basicValidation = this.get('basicUsernameValidation'); - uniqueUsername = this.get('uniqueUsernameValidation'); - if (uniqueUsername) { - return uniqueUsername; - } - return basicValidation; + const basicValidation = this.get('basicUsernameValidation'); + const uniqueUsername = this.get('uniqueUsernameValidation'); + return uniqueUsername ? uniqueUsername : basicValidation; }.property('uniqueUsernameValidation', 'basicUsernameValidation'), - usernameNeedsToBeValidatedWithEmail: function() { + usernameNeedsToBeValidatedWithEmail() { return( this.get('globalNicknameExists') || false ); }, // Validate the password passwordValidation: function() { - var password; if (!this.get('passwordRequired')) { - return Discourse.InputValidation.create({ - ok: true - }); + return Discourse.InputValidation.create({ ok: true }); } // If blank, fail without a reason - password = this.get("accountPassword"); + const password = this.get("accountPassword"); if (this.blank('accountPassword')) { return Discourse.InputValidation.create({ failed: true }); } @@ -339,8 +334,8 @@ export default DiscourseController.extend(ModalFunctionality, { }); }.property('accountPassword', 'rejectedPasswords.@each', 'accountUsername', 'accountEmail'), - fetchConfirmationValue: function() { - var createAccountController = this; + fetchConfirmationValue() { + const createAccountController = this; return Discourse.ajax('/users/hp.json').then(function (json) { createAccountController.set('accountPasswordConfirm', json.value); createAccountController.set('accountChallenge', json.challenge.split("").reverse().join("")); @@ -348,12 +343,12 @@ export default DiscourseController.extend(ModalFunctionality, { }, actions: { - externalLogin: function(provider) { + externalLogin(provider) { this.get('controllers.login').send('externalLogin', provider); }, - createAccount: function() { - var self = this, + createAccount() { + const self = this, attrs = this.getProperties('accountName', 'accountEmail', 'accountPassword', 'accountUsername', 'accountPasswordConfirm', 'accountChallenge'), userFields = this.get('userFields'); @@ -369,7 +364,7 @@ export default DiscourseController.extend(ModalFunctionality, { return Discourse.User.createAccount(attrs).then(function(result) { if (result.success) { // Trigger the browser's password manager using the hidden static login form: - var $hidden_login_form = $('#hidden-login-form'); + 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')); @@ -397,7 +392,7 @@ export default DiscourseController.extend(ModalFunctionality, { _createUserFields: function() { if (!this.site) { return; } - var userFields = this.site.get('user_fields'); + let userFields = this.site.get('user_fields'); if (userFields) { userFields = userFields.map(function(f) { return Ember.Object.create({ diff --git a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 index c48aa54ffa..d6077dd099 100644 --- a/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery-sortable.js.es6 @@ -7,7 +7,8 @@ export var queryParams = { status: { replace: true }, state: { replace: true }, search: { replace: true }, - max_posts: { replace: true } + max_posts: { replace: true }, + q: { replace: true } }; // Basic controller options diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index 15c8d66c2e..a69daece73 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -2,7 +2,7 @@ import DiscoveryController from 'discourse/controllers/discovery'; import { queryParams } from 'discourse/controllers/discovery-sortable'; import BulkTopicSelection from 'discourse/mixins/bulk-topic-selection'; -var controllerOpts = { +const controllerOpts = { needs: ['discovery'], period: null, @@ -16,20 +16,42 @@ var controllerOpts = { expandGloballyPinned: false, expandAllPinned: false, + isSearch: Em.computed.equal('model.filter', 'search'), + + searchTerm: function(){ + return this.get('model.params.q'); + }.property('isSearch,model.params,model'), + actions: { - changeSort: function(sortBy) { - if (sortBy === this.get('order')) { - this.toggleProperty('ascending'); + changeSort(sortBy) { + if (this.get('isSearch')) { + let term = this.get('searchTerm'); + let order; + + if (sortBy === 'activity') { order = 'latest'; } + if (sortBy === 'views') { order = 'views'; } + + if (order && term.indexOf("order:" + order) === -1) { + term = term.replace(/order:[a-z]+/, ''); + term = term.trim() + " order:" + order; + this.set('model.params.q', term); + this.get('model').refreshSort(); + } + } else { - this.setProperties({ order: sortBy, ascending: false }); + if (sortBy === this.get('order')) { + this.toggleProperty('ascending'); + } else { + this.setProperties({ order: sortBy, ascending: false }); + } + this.get('model').refreshSort(sortBy, this.get('ascending')); } - this.get('model').refreshSort(sortBy, this.get('ascending')); }, // Show newly inserted topics showInserted: function() { - var tracker = Discourse.TopicTrackingState.current(); + const tracker = Discourse.TopicTrackingState.current(); // Move inserted into topics this.get('content').loadBefore(tracker.get('newIncoming')); @@ -38,7 +60,7 @@ var controllerOpts = { }, refresh: function() { - var filter = this.get('model.filter'), + const filter = this.get('model.filter'), self = this; this.setProperties({ order: 'default', ascending: false }); @@ -57,7 +79,7 @@ var controllerOpts = { self.setProperties({ model: list }); self.resetSelected(); - var tracking = Discourse.TopicTrackingState.current(); + const tracking = Discourse.TopicTrackingState.current(); if (tracking) { tracking.sync(list, filter); } @@ -68,7 +90,7 @@ var controllerOpts = { resetNew: function() { - var self = this; + const self = this; Discourse.TopicTrackingState.current().resetNew(); Discourse.Topic.resetNew().then(function() { @@ -113,11 +135,11 @@ var controllerOpts = { footerMessage: function() { if (!this.get('allLoaded')) { return; } - var category = this.get('category'); + const category = this.get('category'); if( category ) { return I18n.t('topics.bottom.category', {category: category.get('name')}); } else { - var split = (this.get('model.filter') || '').split('/'); + const split = (this.get('model.filter') || '').split('/'); if (this.get('model.topics.length') === 0) { return I18n.t("topics.none." + split[0], { category: split[1] @@ -133,7 +155,7 @@ var controllerOpts = { footerEducation: function() { if (!this.get('allLoaded') || this.get('model.topics.length') > 0 || !Discourse.User.current()) { return; } - var split = (this.get('model.filter') || '').split('/'); + const split = (this.get('model.filter') || '').split('/'); if (split[0] !== 'new' && split[0] !== 'unread') { return; } diff --git a/app/assets/javascripts/discourse/controllers/login.js.es6 b/app/assets/javascripts/discourse/controllers/login.js.es6 index 7db0f9b3aa..7e7aad6fb6 100644 --- a/app/assets/javascripts/discourse/controllers/login.js.es6 +++ b/app/assets/javascripts/discourse/controllers/login.js.es6 @@ -47,7 +47,7 @@ export default DiscourseController.extend(ModalFunctionality, { actions: { login: function() { - var self = this; + const self = this; if(this.blank('loginName') || this.blank('loginPassword')){ self.flash(I18n.t('login.blank_username_or_password'), 'error'); @@ -69,14 +69,15 @@ export default DiscourseController.extend(ModalFunctionality, { sentTo: result.sent_to_email, currentEmail: result.current_email }); + } else { + self.flash(result.error, 'error'); } - self.flash(result.error, 'error'); } else { self.set('loggedIn', true); // Trigger the browser's password manager using the hidden static login form: - var $hidden_login_form = $('#hidden-login-form'); - var destinationUrl = $.cookie('destination_url'); - var shouldRedirectToUrl = self.session.get("shouldRedirectToUrl"); + const $hidden_login_form = $('#hidden-login-form'); + const destinationUrl = $.cookie('destination_url'); + const shouldRedirectToUrl = self.session.get("shouldRedirectToUrl"); $hidden_login_form.find('input[name=username]').val(self.get('loginName')); $hidden_login_form.find('input[name=password]').val(self.get('loginPassword')); if (self.get('loginRequired') && destinationUrl) { @@ -102,22 +103,22 @@ export default DiscourseController.extend(ModalFunctionality, { }, externalLogin: function(loginMethod){ - var name = loginMethod.get("name"); - var customLogin = loginMethod.get("customLogin"); + const name = loginMethod.get("name"); + const customLogin = loginMethod.get("customLogin"); if(customLogin){ customLogin(); } else { this.set('authenticate', name); - var left = this.get('lastX') - 400; - var top = this.get('lastY') - 200; + const left = this.get('lastX') - 400; + const top = this.get('lastY') - 200; - var height = loginMethod.get("frameHeight") || 400; - var width = loginMethod.get("frameWidth") || 800; - var w = window.open(Discourse.getURL("/auth/" + name), "_blank", + const height = loginMethod.get("frameHeight") || 400; + const width = loginMethod.get("frameWidth") || 800; + const w = window.open(Discourse.getURL("/auth/" + name), "_blank", "menubar=no,status=no,height=" + height + ",width=" + width + ",left=" + left + ",top=" + top); - var self = this; - var timer = setInterval(function() { + const self = this; + const timer = setInterval(function() { if(!w || w.closed) { clearInterval(timer); self.set('authenticate', null); @@ -127,10 +128,10 @@ export default DiscourseController.extend(ModalFunctionality, { }, createAccount: function() { - var createAccountController = this.get('controllers.createAccount'); + const createAccountController = this.get('controllers.createAccount'); if (createAccountController) { createAccountController.resetForm(); - var loginName = this.get('loginName'); + const loginName = this.get('loginName'); if (loginName && loginName.indexOf('@') > 0) { createAccountController.set("accountEmail", loginName); } else { @@ -141,7 +142,7 @@ export default DiscourseController.extend(ModalFunctionality, { }, forgotPassword: function() { - var forgotPasswordController = this.get('controllers.forgotPassword'); + const forgotPasswordController = this.get('controllers.forgotPassword'); if (forgotPasswordController) { forgotPasswordController.set("accountEmailOrUsername", this.get("loginName")); } this.send("showForgotPassword"); } @@ -149,13 +150,13 @@ export default DiscourseController.extend(ModalFunctionality, { authMessage: (function() { if (this.blank('authenticate')) return ""; - var method = Discourse.get('LoginMethod.all').findProperty("name", this.get("authenticate")); + const method = Discourse.get('LoginMethod.all').findProperty("name", this.get("authenticate")); if(method){ return method.get('message'); } }).property('authenticate'), - authenticationComplete: function(options) { + authenticationComplete(options) { const self = this; function loginError(errorMsg, className) { @@ -187,12 +188,12 @@ export default DiscourseController.extend(ModalFunctionality, { return; } - var createAccountController = this.get('controllers.createAccount'); + const createAccountController = this.get('controllers.createAccount'); createAccountController.setProperties({ accountEmail: options.email, accountUsername: options.username, accountName: options.name, - authOptions: Em.Object.create(options) + authOptions: Ember.Object.create(options) }); showModal('createAccount'); } diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 index 65bf573193..79fb9561bf 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 @@ -13,13 +13,13 @@ export default DiscourseController.extend({ isSearch: Em.computed.equal('filterMode', 'search'), - searchTerm: Em.computed.alias('controllers.discovery/topics.model.params.search'), + searchTerm: Em.computed.alias('controllers.discovery/topics.model.params.q'), actions: { search: function(){ var discovery = this.get('controllers.discovery/topics'); var model = discovery.get('model'); - discovery.set('search', this.get("searchTerm")); + discovery.set('q', this.get('searchTerm')); model.refreshSort(); } } diff --git a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 index 3ce160c880..dd53320766 100644 --- a/app/assets/javascripts/discourse/controllers/not-activated.js.es6 +++ b/app/assets/javascripts/discourse/controllers/not-activated.js.es6 @@ -4,6 +4,10 @@ import DiscourseController from 'discourse/controllers/controller'; export default DiscourseController.extend(ModalFunctionality, { emailSent: false, + onShow() { + this.set("emailSent", false); + }, + actions: { sendActivationEmail: function() { Discourse.ajax('/users/action/send_activation_email', {data: {username: this.get('username')}, type: 'POST'}); diff --git a/app/assets/javascripts/discourse/controllers/search.js.es6 b/app/assets/javascripts/discourse/controllers/search.js.es6 index bc812e3efe..2bf8183041 100644 --- a/app/assets/javascripts/discourse/controllers/search.js.es6 +++ b/app/assets/javascripts/discourse/controllers/search.js.es6 @@ -88,7 +88,13 @@ export default Em.Controller.extend(Presence, { actions: { moreOfType: function(type) { - this.set('typeFilter', type); + if (type === 'topic' && (!this.get('searchContextEnabled') || this.get('searchContext.type') !== 'topic')) { + var term = this.get('term'); + // TODO in topic and in category special handling + Discourse.URL.routeTo("/search?q=" + encodeURIComponent(term)); + } else { + this.set('typeFilter', type); + } }, cancelType: function() { diff --git a/app/assets/javascripts/discourse/controllers/upload-customization.js.es6 b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6 new file mode 100644 index 0000000000..09158f5375 --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/upload-customization.js.es6 @@ -0,0 +1,52 @@ +import ModalFunctionality from 'discourse/mixins/modal-functionality'; + +export default Ember.Controller.extend(ModalFunctionality, { + notReady: Em.computed.not('ready'), + + needs: ['admin-customize-css-html'], + + title: "hi", + + ready: function() { + let parsed; + try { + parsed = JSON.parse(this.get('customizationFile')); + } catch (e) { + return false; + } + + return !!parsed["site_customization"]; + }.property('customizationFile'), + + actions: { + createCustomization: function() { + const self = this; + const object = JSON.parse(this.get('customizationFile')).site_customization; + + // Slight fixup before creating object + object.enabled = false; + delete object.id; + delete object.key; + + const customization = Discourse.SiteCustomization.create(object); + + this.set('loading', true); + customization.save().then(function(customization) { + self.send('closeModal'); + self.set('loading', false); + + const parentController = self.get('controllers.admin-customize-css-html'); + parentController.pushObject(customization); + parentController.set('selectedItem', customization); + }).catch(function(xhr) { + self.set('loading', false); + if (xhr.responseJSON) { + bootbox.alert(xhr.responseJSON.errors.join("
    ")); + } else { + bootbox.alert(I18n.t('generic_error')); + } + }); + } + } + +}); diff --git a/app/assets/javascripts/discourse/ember/resolver.js.es6 b/app/assets/javascripts/discourse/ember/resolver.js.es6 index f0e091589c..c8c2a3eeea 100644 --- a/app/assets/javascripts/discourse/ember/resolver.js.es6 +++ b/app/assets/javascripts/discourse/ember/resolver.js.es6 @@ -89,6 +89,10 @@ export default Ember.DefaultResolver.extend({ return this.customResolve(parsedName) || this._super(parsedName); }, + resolveModel(parsedName) { + return this.customResolve(parsedName) || this._super(parsedName); + }, + resolveView(parsedName) { return this.findLoadingView(parsedName) || this.customResolve(parsedName) || this._super(parsedName); }, diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js index 708c8d08b5..3eff90d74b 100644 --- a/app/assets/javascripts/discourse/helpers/application_helpers.js +++ b/app/assets/javascripts/discourse/helpers/application_helpers.js @@ -4,21 +4,13 @@ var safe = Handlebars.SafeString; var registerUnbound = require('discourse/helpers/register-unbound', null, null, true).default; var avatarTemplate = require('discourse/lib/avatar-template', null, null, true).default; -/** - Bound avatar helper. - - @method bound-avatar - @for Handlebars -**/ Em.Handlebars.helper('bound-avatar', function(user, size, uploadId) { if (Em.isEmpty(user)) { return new safe("
    "); } var username = Em.get(user, 'username'); - if (arguments.length < 4) { uploadId = Em.get(user, 'uploaded_avatar_id'); } - var avatar = Em.get(user, 'avatar_template') || avatarTemplate(username, uploadId); return new safe(Discourse.Utilities.avatarImg({ size: size, avatarTemplate: avatar })); diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6 index 36ca2a6920..3753f0c167 100644 --- a/app/assets/javascripts/discourse/helpers/period-title.js.es6 +++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6 @@ -1,5 +1,3 @@ -import { iconHTML } from 'discourse/helpers/fa-icon'; - const TITLE_SUBS = { all: 'all_time', yearly: 'this_year', @@ -7,7 +5,26 @@ const TITLE_SUBS = { daily: 'today', }; -export default Ember.Handlebars.makeBoundHelper(function (period) { +export default Ember.Handlebars.makeBoundHelper(function (period, options) { const title = I18n.t('filters.top.' + (TITLE_SUBS[period] || 'this_week')); - return new Handlebars.SafeString(iconHTML('calendar-o') + " " + title); + if (options.hash.showDateRange) { + var dateString = ""; + switch(period) { + case 'yearly': + dateString = moment().subtract(1, 'year').format(I18n.t('dates.full_with_year_no_time')); + break; + case 'weekly': + dateString = moment().subtract(1, 'week').format(I18n.t('dates.full_no_year_no_time')) + " - " + moment().format(I18n.t('dates.full_no_year_no_time')); + break; + case 'monthly': + dateString = moment().subtract(1, 'month').format(I18n.t('dates.full_no_year_no_time')) + " - " + moment().format(I18n.t('dates.full_no_year_no_time')); + break; + case 'daily': + dateString = moment().format(I18n.t('dates.full_no_year_no_time')); + break; + } + return new Handlebars.SafeString(title + " " + dateString + ""); + } else { + return new Handlebars.SafeString(title); + } }); diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6 index f0703c6d9e..105ec123a9 100644 --- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 +++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6 @@ -2,5 +2,6 @@ import registerUnbound from 'discourse/helpers/register-unbound'; registerUnbound('topic-link', function(topic) { var title = topic.get('fancyTitle'); - return new Handlebars.SafeString("" + title + ""); + var url = topic.linked_post_number ? topic.urlForPostNumber(topic.linked_post_number) : topic.get('lastUnreadUrl'); + return new Handlebars.SafeString("" + title + ""); }); diff --git a/app/assets/javascripts/discourse/initializers/live-development.js.es6 b/app/assets/javascripts/discourse/initializers/live-development.js.es6 index 817b9e058d..701789cf7f 100644 --- a/app/assets/javascripts/discourse/initializers/live-development.js.es6 +++ b/app/assets/javascripts/discourse/initializers/live-development.js.es6 @@ -64,6 +64,10 @@ export default { $(this).data('orig', this.href); } const orig = $(this).data('orig'); + if (!me.hash) { + window.__uniq = window.__uniq || 1; + me.hash = window.__uniq++; + } this.href = orig + (orig.indexOf('?') >= 0 ? "&hash=" : "?hash=") + me.hash; } }); diff --git a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 index b7a8f24c6f..04d6d0dbc7 100644 --- a/app/assets/javascripts/discourse/lib/ajax-error.js.es6 +++ b/app/assets/javascripts/discourse/lib/ajax-error.js.es6 @@ -28,7 +28,7 @@ function extractError(error) { if (parsedJSON) { if (parsedJSON.errors && parsedJSON.errors.length > 0) { - parsedError = parsedJSON.errors[0]; + parsedError = parsedJSON.errors.join("
    "); } else if (parsedJSON.error) { parsedError = parsedJSON.error; } else if (parsedJSON.failed) { @@ -36,6 +36,12 @@ function extractError(error) { } } + if (!parsedError) { + if (error.status && error.status >= 400) { + parsedError = error.status + " " + error.statusText; + } + } + return parsedError || I18n.t('generic_error'); } diff --git a/plugins/poll/assets/javascripts/lib/decimal-adjust.js.es6 b/app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 similarity index 100% rename from plugins/poll/assets/javascripts/lib/decimal-adjust.js.es6 rename to app/assets/javascripts/discourse/lib/decimal-adjust.js.es6 diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb index 1441f0cdce..67e1a4048b 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb +++ b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb @@ -86,6 +86,7 @@ var translations = { ':-D' : 'smiley', ':|' : 'expressionless', ':-|' : 'expressionless', + ':/' : 'confused', ";P" : 'stuck_out_tongue_winking_eye', ";-P" : 'stuck_out_tongue_winking_eye', ":$" : 'blush', diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/lib/formatter.js index f2063e3786..1b3db5baad 100644 --- a/app/assets/javascripts/discourse/lib/formatter.js +++ b/app/assets/javascripts/discourse/lib/formatter.js @@ -188,7 +188,7 @@ relativeAgeMediumSpan = function(distance, leaveAgo) { }; switch(true){ - case(distanceInMinutes >= 1 && distanceInMinutes <= 56): + case(distanceInMinutes >= 1 && distanceInMinutes <= 55): formatted = t("x_minutes", {count: distanceInMinutes}); break; case(distanceInMinutes >= 56 && distanceInMinutes <= 89): @@ -258,14 +258,18 @@ relativeAge = function(date, options) { }; var number = function(val) { + var formattedNumber; + val = parseInt(val, 10); if (isNaN(val)) val = 0; if (val > 999999) { - return (val / 1000000).toFixed(1) + "M"; + formattedNumber = I18n.toNumber(val / 1000000, {precision: 1}); + return I18n.t("number.short.millions", {number: formattedNumber}); } if (val > 999) { - return (val / 1000).toFixed(1) + "K"; + formattedNumber = I18n.toNumber(val / 1000, {precision: 1}); + return I18n.t("number.short.thousands", {number: formattedNumber}); } return val.toString(); }; diff --git a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js index ae9fca7e21..1164e44968 100644 --- a/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js +++ b/app/assets/javascripts/discourse/lib/keyboard_shortcuts.js @@ -59,6 +59,7 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ bindEvents: function(keyTrapper, container) { this.keyTrapper = keyTrapper; this.container = container; + this._stopCallback(); _.each(PATH_BINDINGS, this._bindToPath, this); _.each(CLICK_BINDINGS, this._bindToClick, this); @@ -128,6 +129,11 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ }, showBuiltinSearch: function() { + if ($('#search-dropdown').is(':visible')) { + this._toggleSearch(false); + return true; + } + var currentPath = this.container.lookup('controller:application').get('currentPath'), blacklist = [ /^discovery\.categories/ ], whitelist = [ /^topic\./ ], @@ -137,10 +143,14 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ // If we're viewing a topic, only intercept search if there are cloaked posts if (showSearch && currentPath.match(/^topic\./)) { showSearch = $('.cooked').length < this.container.lookup('controller:topic').get('postStream.stream.length'); - } - return showSearch ? this.showSearch(true) : true; + if (showSearch) { + this._toggleSearch(true); + return false; + } + + return true; }, createTopic: function() { @@ -155,11 +165,8 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ Discourse.__container__.lookup('controller:topic-progress').send('toggleExpansion', {highlight: true}); }, - showSearch: function(selectContext) { - $('#search-button').click(); - if(selectContext) { - Discourse.__container__.lookup('controller:search').set('searchContextEnabled', true); - } + showSearch: function() { + this._toggleSearch(false); return false; }, @@ -304,22 +311,32 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ tabLoc.focus(); } - var rgx = new RegExp("post-cloak-(\\d+)").exec($article.parent()[0].id); - if (rgx === null || typeof rgx[1] === 'undefined') { - this._scrollList($article, direction); - } else { - Discourse.URL.jumpToPost(rgx[1]); - } + this._scrollList($article, direction); } }, _scrollList: function($article) { // Try to keep the article on screen - var scrollPos = $article.position().top - ($(window).height() * 0.5); + var pos = $article.offset(); + var height = $article.height(); + var scrollTop = $(window).scrollTop(); + var windowHeight = $(window).height(); + + // skip if completely on screen + if (pos.top > scrollTop && (pos.top + height) < (scrollTop + windowHeight)) { + return; + } + + var scrollPos = (pos.top + (height/2)) - (windowHeight * 0.5); if (scrollPos < 0) { scrollPos = 0; } - $('html, body').scrollTop(scrollPos); + + if (this._scrollAnimation) { + this._scrollAnimation.stop(); + } + this._scrollAnimation = $("html, body").animate({ scrollTop: scrollPos + "px"}, 100); }, + _findArticles: function() { var $topicList = $('.topic-list'), $topicArea = $('.posts-wrapper'); @@ -340,5 +357,24 @@ Discourse.KeyboardShortcuts = Ember.Object.createWithMixins({ if(index >= 0 && index < $sections.length){ $sections.eq(index).find('a').click(); } - } + }, + + _stopCallback: function() { + var oldStopCallback = this.keyTrapper.stopCallback; + + this.keyTrapper.stopCallback = function(e, element, combo) { + if ((combo === 'ctrl+f' || combo === 'command+f') && element.id === 'search-term') { + return false; + } + + return oldStopCallback(e, element, combo); + }; + }, + + _toggleSearch: function(selectContext) { + $('#search-button').click(); + if (selectContext) { + Discourse.__container__.lookup('controller:search').set('searchContextEnabled', true); + } + }, }); diff --git a/plugins/poll/assets/javascripts/lib/round.js.es6 b/app/assets/javascripts/discourse/lib/round.js.es6 similarity index 54% rename from plugins/poll/assets/javascripts/lib/round.js.es6 rename to app/assets/javascripts/discourse/lib/round.js.es6 index b26eed0736..45d4f0eec7 100644 --- a/plugins/poll/assets/javascripts/lib/round.js.es6 +++ b/app/assets/javascripts/discourse/lib/round.js.es6 @@ -1,4 +1,4 @@ -import decimalAdjust from "discourse/plugins/poll/lib/decimal-adjust"; +import decimalAdjust from "discourse/lib/decimal-adjust"; export default function(value, exp) { return decimalAdjust("round", value, exp); diff --git a/app/assets/javascripts/discourse/lib/search-for-term.js.es6 b/app/assets/javascripts/discourse/lib/search-for-term.js.es6 index 12e05eb739..478b1bc6e9 100644 --- a/app/assets/javascripts/discourse/lib/search-for-term.js.es6 +++ b/app/assets/javascripts/discourse/lib/search-for-term.js.es6 @@ -4,7 +4,7 @@ function searchForTerm(term, opts) { if (!opts) opts = {}; // Only include the data we have - var data = { term: term, include_blurbs: 'true' }; + const data = { term: term, include_blurbs: 'true' }; if (opts.typeFilter) data.type_filter = opts.typeFilter; if (opts.searchForId) data.search_for_id = true; @@ -22,7 +22,7 @@ function searchForTerm(term, opts) { if (!results.posts) { results.posts = []; } if (!results.categories) { results.categories = []; } - var topicMap = {}; + const topicMap = {}; results.topics = results.topics.map(function(topic){ topic = Topic.create(topic); topicMap[topic.id] = topic; @@ -44,23 +44,23 @@ function searchForTerm(term, opts) { return Discourse.Category.list().findProperty('id', category.id); }).compact(); - var r = results.grouped_search_result; + const r = results.grouped_search_result; results.resultTypes = []; // TODO: consider refactoring front end to take a better structure [['topic','posts'],['user','users'],['category','categories']].forEach(function(pair){ - var type = pair[0], name = pair[1]; - if(results[name].length > 0) { + const type = pair[0], name = pair[1]; + if (results[name].length > 0) { results.resultTypes.push({ results: results[name], - displayType: (opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type, - type: type, + componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type), + type, more: r['more_' + name] }); } }); - var noResults = !!(results.topics.length === 0 && + const noResults = !!(results.topics.length === 0 && results.posts.length === 0 && results.users.length === 0 && results.categories.length === 0); diff --git a/app/assets/javascripts/discourse/lib/url.js b/app/assets/javascripts/discourse/lib/url.js index ca15970399..3742887ab3 100644 --- a/app/assets/javascripts/discourse/lib/url.js +++ b/app/assets/javascripts/discourse/lib/url.js @@ -109,7 +109,6 @@ Discourse.URL = Ember.Object.createWithMixins({ @param {String} path The path we are routing to. **/ routeTo: function(path) { - if (Em.isEmpty(path)) { return; } if (Discourse.get('requiresRefresh')) { diff --git a/app/assets/javascripts/discourse/models/nav_item.js b/app/assets/javascripts/discourse/models/nav_item.js index 41280548f7..0ea27df11e 100644 --- a/app/assets/javascripts/discourse/models/nav_item.js +++ b/app/assets/javascripts/discourse/models/nav_item.js @@ -9,6 +9,24 @@ Discourse.NavItem = Discourse.Model.extend({ + displayName: function() { + var categoryName = this.get('categoryName'), + name = this.get('name'), + count = this.get('count') || 0; + + if (name === 'latest' && !Discourse.Mobile.mobileView) { + count = 0; + } + + var extra = { count: count }; + + if (categoryName) { + name = 'category'; + extra.categoryName = Discourse.Formatter.toTitleCase(categoryName); + } + return I18n.t("filters." + name.replace("/", ".") + ".title", extra); + }.property('categoryName,name,count'), + topicTrackingState: function() { return Discourse.TopicTrackingState.current(); }.property(), diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index f882b258d1..8052ee4048 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -6,16 +6,20 @@ function calcDayDiff(p1, p2) { const date = p1.get('created_at'); if (date) { if (p2) { - const lastDate = p2.get('created_at'); - if (lastDate) { - const delta = new Date(date).getTime() - new Date(lastDate).getTime(); - const days = Math.round(delta / (1000 * 60 * 60 * 24)); + const numDiff = p1.get('post_number') - p2.get('post_number'); + if (numDiff === 1) { + const lastDate = p2.get('created_at'); + if (lastDate) { + const delta = new Date(date).getTime() - new Date(lastDate).getTime(); + const days = Math.round(delta / (1000 * 60 * 60 * 24)); - p1.set('daysSincePrevious', days); + p1.set('daysSincePrevious', days); + } } } } } + const PostStream = RestModel.extend({ loading: Em.computed.or('loadingAbove', 'loadingBelow', 'loadingFilter', 'stagingPost'), notLoading: Em.computed.not('loading'), @@ -137,7 +141,13 @@ const PostStream = RestModel.extend({ toggleSummary() { this.get('userFilters').clear(); this.toggleProperty('summary'); - return this.refresh(); + + const self = this; + return this.refresh().then(function() { + if (self.get('summary')) { + self.jumpToSecondVisible(); + } + }); }, toggleDeleted() { @@ -145,17 +155,33 @@ const PostStream = RestModel.extend({ return this.refresh(); }, + jumpToSecondVisible() { + const posts = this.get('posts'); + if (posts.length > 1) { + const secondPostNum = posts[1].get('post_number'); + Discourse.URL.jumpToPost(secondPostNum); + } + }, + // Filter the stream to a particular user. toggleParticipant(username) { const userFilters = this.get('userFilters'); this.set('summary', false); this.set('show_deleted', true); + + let jump = false; if (userFilters.contains(username)) { userFilters.removeObject(username); } else { userFilters.addObject(username); + jump = true; } - return this.refresh(); + const self = this; + return this.refresh().then(function() { + if (jump) { + self.jumpToSecondVisible(); + } + }); }, /** diff --git a/app/assets/javascripts/discourse/models/post.js.es6 b/app/assets/javascripts/discourse/models/post.js.es6 index 9e720b36d1..d7ee374c86 100644 --- a/app/assets/javascripts/discourse/models/post.js.es6 +++ b/app/assets/javascripts/discourse/models/post.js.es6 @@ -50,6 +50,12 @@ const Post = RestModel.extend({ return Discourse.Utilities.postUrl(this.get('topic.slug') || this.get('topic_slug'), this.get('topic_id'), this.get('post_number')); }.property('post_number', 'topic_id', 'topic.slug'), + // Don't drop the /1 + urlWithNumber: function() { + const url = this.get('url'); + return (this.get('post_number') === 1) ? url + "/1" : url; + }.property('post_number', 'url'), + usernameUrl: Discourse.computed.url('username', '/users/%@'), showUserReplyTab: function() { diff --git a/app/assets/javascripts/discourse/models/store.js.es6 b/app/assets/javascripts/discourse/models/store.js.es6 index 9ded087abc..cda112cefb 100644 --- a/app/assets/javascripts/discourse/models/store.js.es6 +++ b/app/assets/javascripts/discourse/models/store.js.es6 @@ -37,8 +37,13 @@ function findAndRemoveMap(type, id) { flushMap(); export default Ember.Object.extend({ + _plurals: {}, pluralize(thing) { - return thing + "s"; + return this._plurals[thing] || thing + "s"; + }, + + addPluralization(thing, plural) { + this._plurals[thing] = plural; }, findAll(type) { @@ -143,10 +148,13 @@ export default Ember.Object.extend({ return this.container.lookup('adapter:' + type) || this.container.lookup('adapter:rest'); }, - _lookupSubType(subType, id, root) { + _lookupSubType(subType, type, id, root) { // cheat: we know we already have categories in memory - if (subType === 'category') { + // TODO: topics do their own resolving of `category_id` + // to category. That should either respect this or be + // removed. + if (subType === 'category' && type !== 'topic') { return Discourse.Category.findById(id); } @@ -172,13 +180,13 @@ export default Ember.Object.extend({ } }, - _hydrateEmbedded(obj, root) { + _hydrateEmbedded(type, obj, root) { const self = this; Object.keys(obj).forEach(function(k) { const m = /(.+)\_id$/.exec(k); if (m) { const subType = m[1]; - const hydrated = self._lookupSubType(subType, obj[k], root); + const hydrated = self._lookupSubType(subType, type, obj[k], root); if (hydrated) { obj[subType] = hydrated; delete obj[k]; @@ -196,7 +204,7 @@ export default Ember.Object.extend({ // Experimental: If serialized with a certain option we'll wire up embedded objects // automatically. if (root.__rest_serializer === "1") { - this._hydrateEmbedded(obj, root); + this._hydrateEmbedded(type, obj, root); } const existing = fromMap(type, obj.id); diff --git a/app/assets/javascripts/discourse/models/topic-list.js.es6 b/app/assets/javascripts/discourse/models/topic-list.js.es6 index 7f158b924a..d685b2f60c 100644 --- a/app/assets/javascripts/discourse/models/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-list.js.es6 @@ -40,8 +40,8 @@ const TopicList = RestModel.extend({ }, refreshSort: function(order, ascending) { - const self = this, - params = this.get('params') || {}; + const self = this; + var params = this.get('params') || {}; params.order = order || params.order; @@ -51,7 +51,14 @@ const TopicList = RestModel.extend({ params.ascending = ascending; } + if (params.q) { + // search is unique, nothing else allowed with it + params = {q: params.q}; + } + this.set('loaded', false); + this.set('params', params); + const store = this.store; store.findFiltered('topicList', {filter: this.get('filter'), params}).then(function(tl) { const newTopics = tl.get('topics'), diff --git a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 index 036fac5a64..051a7b0328 100644 --- a/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 +++ b/app/assets/javascripts/discourse/models/topic-tracking-state.js.es6 @@ -266,6 +266,12 @@ const TopicTrackingState = Discourse.Model.extend({ }, lookupCount(name, category){ + + if (name === "latest") { + return this.lookupCount("new", category) + + this.lookupCount("unread", category); + } + let categoryName = category ? Em.get(category, "name") : null; if(name === "new") { return this.countNew(categoryName); @@ -278,6 +284,7 @@ const TopicTrackingState = Discourse.Model.extend({ } } }, + loadStates(data) { // not exposed const states = this.states; diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index bba5b4c2ec..798053e3c2 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -363,8 +363,7 @@ const Topic = RestModel.extend({ ); }, - excerptNotEmpty: Em.computed.notEmpty('excerpt'), - hasExcerpt: Em.computed.and('pinned', 'excerptNotEmpty'), + hasExcerpt: Em.computed.notEmpty('excerpt'), excerptTruncated: function() { const e = this.get('excerpt'); diff --git a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 index 81b94b5a2d..ac1f8a8bbb 100644 --- a/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 +++ b/app/assets/javascripts/discourse/routes/build-topic-route.js.es6 @@ -16,6 +16,7 @@ function findTopicList(store, filter, filterParams, extras) { extras = extras || {}; return new Ember.RSVP.Promise(function(resolve) { + const session = Discourse.Session.current(); if (extras.cached) { @@ -80,7 +81,6 @@ export default function(filter, extras) { }, model(data, transition) { - // attempt to stop early cause we need this to be called before .sync Discourse.ScreenTrack.current().stop(); @@ -115,8 +115,12 @@ export default function(filter, extras) { const params = model.get('params'); if (params && Object.keys(params).length) { - topicOpts.order = params.order; - topicOpts.ascending = params.ascending; + if (params.order !== undefined) { + topicOpts.order = params.order; + } + if (params.ascending !== undefined) { + topicOpts.ascending = params.ascending; + } } this.controllerFor('discovery/topics').setProperties(topicOpts); diff --git a/app/assets/javascripts/discourse/routes/user.js.es6 b/app/assets/javascripts/discourse/routes/user.js.es6 index 6e206c82e0..832e1cb0eb 100644 --- a/app/assets/javascripts/discourse/routes/user.js.es6 +++ b/app/assets/javascripts/discourse/routes/user.js.es6 @@ -1,22 +1,22 @@ -var INDEX_STREAM_ROUTES = ["user.deletedPosts", "user.flaggedPosts", "userActivity.index"]; +const INDEX_STREAM_ROUTES = ["user.deletedPosts", "user.flaggedPosts", "userActivity.index"]; export default Discourse.Route.extend({ - titleToken: function() { - var model = this.modelFor('user'); - var username = model.get('username'); + titleToken() { + const model = this.modelFor('user'); + const username = model.get('username'); if (username) { return [I18n.t("user.profile"), username]; } }, actions: { - logout: function() { + logout() { Discourse.logout(); }, - composePrivateMessage: function(user, post) { - var recipient = user ? user.get('username') : '', + composePrivateMessage(user, post) { + const recipient = user ? user.get('username') : '', reply = post ? window.location.protocol + "//" + window.location.host + post.get("url") : null; return this.controllerFor('composer').open({ @@ -28,18 +28,18 @@ export default Discourse.Route.extend({ }); }, - willTransition: function(transition) { + willTransition(transition) { // will reset the indexStream when transitioning to routes that aren't "indexStream" // otherwise the "header" will jump - var isIndexStream = ~INDEX_STREAM_ROUTES.indexOf(transition.targetName); + const isIndexStream = ~INDEX_STREAM_ROUTES.indexOf(transition.targetName); this.controllerFor('user').set('indexStream', isIndexStream); return true; } }, - model: function(params) { + model(params) { // If we're viewing the currently logged in user, return that object instead - var currentUser = Discourse.User.current(); + const currentUser = this.currentUser; if (currentUser && (params.username.toLowerCase() === currentUser.get('username_lower'))) { return currentUser; } @@ -47,34 +47,38 @@ export default Discourse.Route.extend({ return Discourse.User.create({username: params.username}); }, - afterModel: function() { - var user = this.modelFor('user'); + afterModel() { + const user = this.modelFor('user'); + const self = this; + return user.findDetails().then(function() { return user.findStaffInfo(); + }).catch(function() { + return self.replaceWith('/404'); }); }, - serialize: function(model) { + serialize(model) { if (!model) return {}; return { username: (Em.get(model, 'username') || '').toLowerCase() }; }, - setupController: function(controller, user) { + setupController(controller, user) { controller.set('model', user); // Add a search context this.controllerFor('search').set('searchContext', user.get('searchContext')); }, - activate: function() { + activate() { this._super(); - var user = this.modelFor('user'); + const user = this.modelFor('user'); this.messageBus.subscribe("/users/" + user.get('username_lower'), function(data) { user.loadUserAction(data); }); }, - deactivate: function() { + deactivate() { this._super(); this.messageBus.unsubscribe("/users/" + this.modelFor('user').get('username_lower')); diff --git a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs index f8afeb5755..341d355d47 100644 --- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs @@ -3,7 +3,10 @@ {{topic-list showParticipants=showParticipants hideCategory=hideCategory - topics=topics}} + topics=topics + expandExcerpts=expandExcerpts + searchTerm=searchTerm + }} {{else}}
    {{i18n 'choose_topic.none_found'}} diff --git a/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs new file mode 100644 index 0000000000..b34f6c4b9f --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/json-file-uploader.hbs @@ -0,0 +1,12 @@ +
    +
    + + {{d-button class="fileSelect" action="selectFile" class="" icon="upload" label="upload_selector.select_file"}} + {{conditional-loading-spinner condition=loading size="small"}} +
    +
    {{i18n "alternation"}}
    +
    + {{textarea value=value}} +
    +
    {{fa-icon "upload"}}
    +
    diff --git a/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs new file mode 100644 index 0000000000..078b8b9315 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/navigation-bar.hbs @@ -0,0 +1,4 @@ +{{#each navItem in navItems}} + {{navigation-item content=navItem filterMode=filterMode}} +{{/each}} +{{custom-html "extraNavItem"}} diff --git a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs index 8f7fddc94f..570d7034e7 100644 --- a/app/assets/javascripts/discourse/templates/components/period-chooser.hbs +++ b/app/assets/javascripts/discourse/templates/components/period-chooser.hbs @@ -1,4 +1,4 @@ -

    {{period-title period}}

    +

    {{period-title period showDateRange=true}}

    diff --git a/app/assets/javascripts/discourse/templates/components/search-result-category.hbs b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs new file mode 100644 index 0000000000..071eba1841 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-category.hbs @@ -0,0 +1,7 @@ +{{#each results as |result|}} +
  • + + {{category-badge result}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-post.hbs b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs new file mode 100644 index 0000000000..71b188ddf1 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-post.hbs @@ -0,0 +1,12 @@ +{{#each results as |result|}} + + + {{i18n 'search.post_format' post_number=result.post_number username=result.username}} + + {{#unless site.mobileView}} + + {{{unbound result.blurb}}} + + {{/unless}} + +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs new file mode 100644 index 0000000000..c092bcaa6e --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-topic.hbs @@ -0,0 +1,14 @@ +{{#each results as |result|}} +
  • + + + {{topic-status topic=result.topic disableActions=true}}{{unbound result.topic.title}}{{category-badge result.topic.category}} + + {{#unless site.mobileView}} + + {{format-age result.created_at}} - {{{unbound result.blurb}}} + + {{/unless}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/components/search-result-user.hbs b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs new file mode 100644 index 0000000000..9cf46a1519 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/search-result-user.hbs @@ -0,0 +1,8 @@ +{{#each results as |result|}} +
  • + + {{avatar result imageSize="small"}} + {{unbound result.username}} + +
    • +{{/each}} diff --git a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs index b8f183dd90..ed326e488e 100644 --- a/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs +++ b/app/assets/javascripts/discourse/templates/composer/similar_topics.hbs @@ -2,11 +2,5 @@

    {{i18n 'composer.similar_topics'}}

      - {{#each similarTopics as |t|}} -
    • - {{topic-status topic=t}} - {{topic-link t}} - {{category-link t.category}} -
      • - {{/each}} + {{search-result-topic results=similarTopics}}
    diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index f3e452a4ab..0b6f9735df 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -46,6 +46,8 @@ selected=selected expandGloballyPinned=expandGloballyPinned expandAllPinned=expandAllPinned + expandExcerpts=isSearch + searchTerm=searchTerm topics=model.topics}} {{/if}}
    diff --git a/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs new file mode 100644 index 0000000000..8f366864e8 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/mobile/components/navigation-bar.hbs @@ -0,0 +1,13 @@ +
  • + + {{selectedNavItem.displayName}} + + +
    • +{{#if expanded}} +
      + {{#each navItem in navItems}} + {{navigation-item content=navItem filterMode=filterMode}} + {{/each}} +
    +{{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index acac3c98d5..8b4ead4a85 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -21,17 +21,19 @@ - - - - {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} -  {{input-tip validation=usernameValidation id="username-validation"}} - - - - - - + {{#if usernameRequired}} + + + + {{input value=accountUsername id="new-account-username" name="username" maxlength=maxUsernameLength}} +  {{input-tip validation=usernameValidation id="username-validation"}} + + + + + + + {{/if}} @@ -46,20 +48,20 @@ {{#if passwordRequired}} - - + + + + {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} +  {{input-tip validation=passwordValidation}} + + + + - {{password-field value=accountPassword type="password" id="new-account-password" capsLockOn=capsLockOn}} -  {{input-tip validation=passwordValidation}} + +
    {{i18n 'login.caps_lock_warning'}}
    - - - - - -
    {{i18n 'login.caps_lock_warning'}}
    - - + {{/if}} diff --git a/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs new file mode 100644 index 0000000000..6d5d53e5bb --- /dev/null +++ b/app/assets/javascripts/discourse/templates/modal/upload-customization.hbs @@ -0,0 +1,8 @@ +
    +
    + {{json-file-uploader value=customizationFile extension=".dcstyle.json"}} +
    +
    + {{d-button class='btn-primary' action='createCustomization' type='submit' disabled=notReady icon="plus" label='admin.customize.import'}} +
    +
    diff --git a/app/assets/javascripts/discourse/templates/navigation/categories.hbs b/app/assets/javascripts/discourse/templates/navigation/categories.hbs index 1db91ae46e..6ba5509e9b 100644 --- a/app/assets/javascripts/discourse/templates/navigation/categories.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/categories.hbs @@ -1,11 +1,6 @@ {{bread-crumbs categories=categories}} - +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if canCreateCategory}} diff --git a/app/assets/javascripts/discourse/templates/navigation/category.hbs b/app/assets/javascripts/discourse/templates/navigation/category.hbs index 4a8aee557e..7d874edf17 100644 --- a/app/assets/javascripts/discourse/templates/navigation/category.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/category.hbs @@ -3,12 +3,8 @@ noSubcategories=noSubcategories hideSubcategories=showingSubcategoryList}} - + +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if currentUser}} {{category-notifications-button category=category}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index d95de6b043..529dae5587 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -6,12 +6,7 @@ {{else}} {{bread-crumbs categories=categories}} - +{{navigation-bar navItems=navItems filterMode=filterMode}} {{#if canCreateTopic}} diff --git a/app/assets/javascripts/discourse/templates/search.hbs b/app/assets/javascripts/discourse/templates/search.hbs index 6ad3c15955..a3c58a3add 100644 --- a/app/assets/javascripts/discourse/templates/search.hbs +++ b/app/assets/javascripts/discourse/templates/search.hbs @@ -1,4 +1,6 @@ -{{view "search-text-field" value=term searchContextEnabled=searchContextEnabled searchContext=searchContext id="search-term"}} +{{plugin-outlet "above-search"}} +{{search-text-field value=term searchContextEnabled=searchContextEnabled id="search-term"}} +
    {{#if searchContext}}
    {{else}} - {{#each resultType in content.resultTypes}} + {{#each content.resultTypes as |resultType|}}
    • {{resultType.name}}
      • - {{view "search-results-type" type=resultType.type displayType=resultType.displayType content=resultType.results}} + {{component resultType.componentName results=resultType.results term=term}}
    {{#if resultType.more}} diff --git a/app/assets/javascripts/discourse/templates/search/category_result.hbs b/app/assets/javascripts/discourse/templates/search/category_result.hbs deleted file mode 100644 index ad0c40031b..0000000000 --- a/app/assets/javascripts/discourse/templates/search/category_result.hbs +++ /dev/null @@ -1,3 +0,0 @@ - - {{category-badge this}} - diff --git a/app/assets/javascripts/discourse/templates/search/post_result.hbs b/app/assets/javascripts/discourse/templates/search/post_result.hbs deleted file mode 100644 index 197ba51641..0000000000 --- a/app/assets/javascripts/discourse/templates/search/post_result.hbs +++ /dev/null @@ -1,10 +0,0 @@ - - - {{i18n 'search.post_format' post_number=post_number username=username}} - - {{#unless controller.site.mobileView}} - - {{{unbound blurb}}} - - {{/unless}} - diff --git a/app/assets/javascripts/discourse/templates/search/topic_result.hbs b/app/assets/javascripts/discourse/templates/search/topic_result.hbs deleted file mode 100644 index ef58e870d9..0000000000 --- a/app/assets/javascripts/discourse/templates/search/topic_result.hbs +++ /dev/null @@ -1,10 +0,0 @@ - - - {{topic-status topic=topic disableActions=true}}{{unbound topic.title}}{{category-badge topic.category}} - - {{#unless controller.site.mobileView}} - - {{format-age created_at}} - {{{unbound blurb}}} - - {{/unless}} - diff --git a/app/assets/javascripts/discourse/templates/search/user_result.hbs b/app/assets/javascripts/discourse/templates/search/user_result.hbs deleted file mode 100644 index 057d214573..0000000000 --- a/app/assets/javascripts/discourse/templates/search/user_result.hbs +++ /dev/null @@ -1,4 +0,0 @@ - - {{avatar this imageSize="small"}} - {{unbound username}} - diff --git a/app/assets/javascripts/discourse/templates/site-map.hbs b/app/assets/javascripts/discourse/templates/site-map.hbs index 243082e035..7865eebdc6 100644 --- a/app/assets/javascripts/discourse/templates/site-map.hbs +++ b/app/assets/javascripts/discourse/templates/site-map.hbs @@ -17,7 +17,7 @@ {{/if}}
  • {{#link-to "discovery.latest" class="latest-topics-link"}} - {{i18n 'filters.latest.title'}} + {{i18n 'filters.latest.title.zero'}} {{/link-to}}
    • {{#if showBadgesLink}} diff --git a/app/assets/javascripts/discourse/templates/user-card.hbs b/app/assets/javascripts/discourse/templates/user-card.hbs index 2433c1f7f5..cdd2179867 100644 --- a/app/assets/javascripts/discourse/templates/user-card.hbs +++ b/app/assets/javascripts/discourse/templates/user-card.hbs @@ -1,12 +1,12 @@ {{#if controller.visible}}
    - {{bound-avatar avatar "huge"}} + {{bound-avatar avatar "huge"}}

    - {{username}} {{user-status user currentUser=currentUser}} + {{username}} {{user-status user currentUser=currentUser}}

    {{#if user.name}} @@ -18,7 +18,7 @@ {{/if}} {{#if showName}} -

    {{name}}

    +

    {{name}}

    {{/if}}
    diff --git a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 index ed60610505..15b8541ef3 100644 --- a/app/assets/javascripts/discourse/views/avatar-selector.js.es6 +++ b/app/assets/javascripts/discourse/views/avatar-selector.js.es6 @@ -5,9 +5,12 @@ export default ModalBodyView.extend({ classNames: ['avatar-selector'], title: I18n.t('user.change_avatar.title'), - // *HACK* used to select the proper radio button, cause {{action}} - // stops the default behavior + // *HACK* used to select the proper radio button, because {{action}} stops the default behavior selectedChanged: function() { - Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')]) ); - }.observes('controller.selected') + Em.run.next(() => $('input:radio[name="avatar"]').val([this.get('controller.selected')])); + }.observes('controller.selected').on("didInsertElement"), + + _focusSelectedButton: function() { + Em.run.next(() => $('input:radio[value="' + this.get('controller.selected') + '"]').focus()); + }.on("didInsertElement") }); diff --git a/app/assets/javascripts/discourse/views/search-results-type.js.es6 b/app/assets/javascripts/discourse/views/search-results-type.js.es6 deleted file mode 100644 index f90de08c1e..0000000000 --- a/app/assets/javascripts/discourse/views/search-results-type.js.es6 +++ /dev/null @@ -1,15 +0,0 @@ -export default Ember.CollectionView.extend({ - tagName: 'ul', - itemViewClass: Discourse.GroupedView.extend({ - tagName: 'li', - classNameBindings: ['selected'], - templateName: Discourse.computed.fmt('parentView.displayType', "search/%@_result") - }), - didInsertElement: function(){ - var term = this.get('controller.term'); - if(!_.isEmpty(term)) { - this.$('.blurb').highlight(term.split(/\s+/), {className: 'search-highlight'}); - this.$('.topic-title').highlight(term.split(/\s+/), {className: 'search-highlight'} ); - } - } -}); diff --git a/app/assets/javascripts/discourse/views/search-text-field.js.es6 b/app/assets/javascripts/discourse/views/search-text-field.js.es6 deleted file mode 100644 index 4db554a7de..0000000000 --- a/app/assets/javascripts/discourse/views/search-text-field.js.es6 +++ /dev/null @@ -1,27 +0,0 @@ -/** - This is a text field that supports a dynamic placeholder based on search context. - - @class SearchTextField - @extends Discourse.TextField - @namespace Discourse - @module Discourse -**/ - -import TextField from 'discourse/components/text-field'; - -export default TextField.extend({ - - /** - A dynamic placeholder for the search field based on our context - - @property placeholder - **/ - placeholder: function() { - - if(this.get('searchContextEnabled')){ - return ""; - } - - return I18n.t('search.title'); - }.property('searchContextEnabled') -}); diff --git a/app/assets/javascripts/discourse/views/search.js.es6 b/app/assets/javascripts/discourse/views/search.js.es6 index 92490c1a7f..88ae67861c 100644 --- a/app/assets/javascripts/discourse/views/search.js.es6 +++ b/app/assets/javascripts/discourse/views/search.js.es6 @@ -2,5 +2,11 @@ export default Discourse.View.extend({ tagName: 'div', classNames: ['d-dropdown'], elementId: 'search-dropdown', - templateName: 'search' + templateName: 'search', + keyDown: function(e){ + var term = this.get('controller.term'); + if (e.which === 13 && term && term.length > 2) { + this.get('controller').send('moreOfType', 'topic'); + } + } }); diff --git a/app/assets/javascripts/discourse/views/topic-list-item.js.es6 b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 index d1d0ca7e6d..64073d65dc 100644 --- a/app/assets/javascripts/discourse/views/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 @@ -65,6 +65,10 @@ export default Discourse.View.extend(StringBuffer, { }, expandPinned: function() { + if (this.get('controller.searchTerm')) { + return true; + } + const pinned = this.get('topic.pinned'); if (!pinned) { return false; @@ -130,6 +134,22 @@ export default Discourse.View.extend(StringBuffer, { this.set('topic.highlight', false); this.highlight(); } + + var term = this.get('controller.searchTerm'); + const self = this; + if (term) { + var terms = term.split(/\s+/); + // .main-link a is omitted cause a bit clowny + var excerpt = self.$('.topic-excerpt'); + // some sane wrapping + excerpt.text(excerpt.text().replace(/\S{40,}/g, function(match){ + return match.replace(/(\S)/g, "$1\u200B"); + })); + + terms.forEach(function(word) { + excerpt.highlight(word, {element: 'b', className: 'search-highlight'}); + }); + } }.on('didInsertElement') }); diff --git a/app/assets/javascripts/discourse/views/upload-customization.js.es6 b/app/assets/javascripts/discourse/views/upload-customization.js.es6 new file mode 100644 index 0000000000..c6e336157c --- /dev/null +++ b/app/assets/javascripts/discourse/views/upload-customization.js.es6 @@ -0,0 +1,6 @@ +import ModalBodyView from "discourse/views/modal-body"; + +export default ModalBodyView.extend({ + templateName: 'modal/upload-customization', + title: I18n.t('admin.customize.import_title') +}); diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index bdc35d5438..08b42013a2 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -84,18 +84,31 @@ export default Discourse.View.extend(CleansUp, { }, _willShow(target) { + const rtl = ($('html').css('direction')) === 'rtl'; if (!target) { return; } const width = this.$().width(); + Ember.run.schedule('afterRender', () => { if (target) { let position = target.offset(); if (position) { - position.left += target.width() + 10; - const overage = ($(window).width() - 50) - (position.left + width); - if (overage < 0) { - position.left += overage; - position.top += target.height() + 48; + if (rtl) { // The site direction is rtl + position.right = $(window).width() - position.left + 10; + position.left = 'auto'; + let overage = ($(window).width() - 50) - (position.right + width); + if (overage < 0) { + position.right += overage; + position.top += target.height() + 48; + } + } else { // The site direction is ltr + position.left += target.width() + 10; + + let overage = ($(window).width() - 50) - (position.left + width); + if (overage < 0) { + position.left += overage; + position.top += target.height() + 48; + } } position.top -= $('#main-outlet').offset().top; diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js index 9a3b8c092d..83e3490976 100644 --- a/app/assets/javascripts/main_include.js +++ b/app/assets/javascripts/main_include.js @@ -45,6 +45,7 @@ //= require ./discourse/views/cloaked //= require ./discourse/components/combo-box //= require ./discourse/views/button +//= require ./discourse/components/search-result //= require ./discourse/components/dropdown-button //= require ./discourse/components/notifications-button //= require ./discourse/components/topic-notifications-button diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index ff10678748..61980809a8 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -545,6 +545,9 @@ section.details { .preview-link { margin-left: 15px; } + .export { + float: right; + } padding-left: 10px; width: 70%; .style-name { diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index d6d2fb5b7a..ebd2d26860 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -232,6 +232,13 @@ ol.category-breadcrumb { h2 { float: left; margin: 5px 0 10px; + + .top-date-string { + color: scale-color($primary, $lightness: 60%); + font-weight: normal; + font-size: 0.7em; + text-transform: uppercase; + } } button { diff --git a/app/assets/stylesheets/common/base/modal.scss b/app/assets/stylesheets/common/base/modal.scss index 7f31ee5d95..16fc2cde98 100644 --- a/app/assets/stylesheets/common/base/modal.scss +++ b/app/assets/stylesheets/common/base/modal.scss @@ -138,6 +138,55 @@ .raw-email-textarea { height: 300px; } + .json-uploader { + .jsfu-shade-container { + display: table-row; + width: 100%; + height: 100%; + position: relative; + } + .jsfu-shade { + z-index: 1; + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + background-color: rgba(0, 0, 0, 0.5); + .text { + color: rgb(255,255,255); + position: absolute; + top: 40%; + font-size: 36px; + text-align: center; + line-height: 38px; + margin-left: auto; + margin-right: auto; + left: 0; + right: 0; + } + } + .jsfu-file { + display: table-cell; + vertical-align: middle; + min-width: 120px; + } + .jsfu-separator { + vertical-align: middle; + display: table-cell; + font-size: 36px; + padding-left: 10px; + padding-right: 10px; + } + .jsfu-paste { + display: table-cell; + width: 100%; + textarea { + margin-bottom: 0; + margin-top: 4px; + } + } + } } .password-confirmation { display: none; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 2b4ac55a24..e0b4f0762d 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -160,7 +160,7 @@ aside.quote { pre { code { - white-space: pre-wrap; + word-wrap: normal; display: block; padding: 5px 10px; color: $primary; @@ -197,3 +197,39 @@ blockquote > *:first-child { blockquote > *:last-child { margin-bottom: 0 !important; } + +.gap { + background-color: dark-light-diff($primary, $secondary, 90%, -60%); + padding: 5px 0; + color: lighten($primary, 60%); + cursor: pointer; + text-align: center; + + &.jagged-border { + background-image: + linear-gradient( + 135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -135deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + 45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ), + linear-gradient( + -45deg, + $secondary 50%, rgba(255,255,255,0) 50% + ); + background-position: + top center, top center, + bottom center, bottom center; + background-size: .9em .9em; + background-repeat: repeat-x; + padding: 20px 0; + margin-bottom: 20px; + } + +} diff --git a/app/assets/stylesheets/common/components/badges.css.scss b/app/assets/stylesheets/common/components/badges.css.scss index 55d7b6f8d8..6bc128db4a 100644 --- a/app/assets/stylesheets/common/components/badges.css.scss +++ b/app/assets/stylesheets/common/components/badges.css.scss @@ -171,12 +171,12 @@ } li.bar>.badge-category { - background: dark-light-diff($primary, $secondary, 95%, -65%) !important; + background: dark-light-diff($primary, $secondary, 90%, -65%) !important; color: $primary !important; } li.bullet>.badge-category { - background: dark-light-diff($primary, $secondary, 95%, -65%) !important; + background: dark-light-diff($primary, $secondary, 90%, -65%) !important; color: $primary !important; .badge-category-bg { diff --git a/app/assets/stylesheets/desktop/compose.scss b/app/assets/stylesheets/desktop/compose.scss index be6ffebe7e..d1f2066223 100644 --- a/app/assets/stylesheets/desktop/compose.scss +++ b/app/assets/stylesheets/desktop/compose.scss @@ -59,7 +59,7 @@ li { font-weight: normal; - margin-top: 3px; + margin-top: 8px; } } } @@ -74,6 +74,17 @@ .posts-count { background-color: scale-color($tertiary, $lightness: -40%); } + + ul { + list-style: none; + margin: 0; + padding: 0; + } + .search-link { + .fa, .blurb { + color: scale-color($tertiary, $lightness: -40%); + } + } } .composer-popup:nth-of-type(2) { @@ -288,6 +299,7 @@ } .submit-panel { + width: 28%; position: absolute; display: block; bottom: 8px; diff --git a/app/assets/stylesheets/desktop/header.scss b/app/assets/stylesheets/desktop/header.scss index 6bb1e3b62f..3caae9f485 100644 --- a/app/assets/stylesheets/desktop/header.scss +++ b/app/assets/stylesheets/desktop/header.scss @@ -54,6 +54,7 @@ and (max-width : 570px) { display: block; word-wrap: break-word; font-size: 11px; + line-height: 1.3em; .search-highlight { color: scale-color($primary, $lightness: 25%); } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index c828fc0b8f..45da7a1477 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -242,7 +242,10 @@ // Misc. stuff // -------------------------------------------------- -#list-area .top-lists h2 { margin: 5px 0 10px; } +#list-area .top-lists h2 { + cursor: pointer; + margin: 5px 0 10px; +} #list-area { h2 { diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 081afbda71..692756022e 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -97,6 +97,7 @@ nav.post-controls { .show-replies { margin-left: 0; + font-size: inherit; span.badge-posts {color: scale-color($primary, $lightness: 60%);} &:hover { background: dark-light-diff($primary, $secondary, 90%, -65%); @@ -104,6 +105,7 @@ nav.post-controls { } i { margin-left: 5px; + font-size: 90%; } } @@ -563,6 +565,7 @@ a.mention { padding: 2px 4px; color: $primary; background: dark-light-diff($primary, $secondary, 90%, -60%); + border-radius: 8px; } @@ -709,11 +712,6 @@ $topic-avatar-width: 45px; } .gap { - background-color: dark-light-diff($primary, $secondary, 90%, -60%); - padding: 5px 0; - color: lighten($primary, 30%); - cursor: pointer; - text-align: center; width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}); } diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 1210b069ba..4a4ab4423a 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -6,6 +6,9 @@ // -------------------------------------------------- .list-controls { + .category-breadcrumb.hidden { + display: none; + } margin: 5px; .nav { float: left; @@ -17,6 +20,37 @@ .btn { float: right; margin-left: 8px; + margin-top: 5px; + } + .nav-pills { + position: relative; + } + .nav-pills .drop { + border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); + position: absolute; + z-index: 1000; + background-color: $secondary; + padding: 0 10px 10px 10px; + width: 150px; + top: 100%; + margin: 0; + li { + list-style-type: none; + margin-left: 0; + margin-top: 5px; + padding-top: 10px; + a { + width: 100%; + display: inline-block; + } + } + + } + .nav-pills > li { + background: dark-light-diff($primary, $secondary, 90%, -65%); + i.fa-caret-down { + margin-left: 8px; + } } } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index d29c185a95..3fa744b2fe 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -1,17 +1,14 @@ .gap { - background-color: dark-light-diff($primary, $secondary, 90%, -60%); - padding: 5px 15px; - color: $primary; - text-align: center; - margin: 10px 0; + /* may not need this */ } .time-gap { - border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); color: lighten($primary, 50%); padding-bottom: 3px; margin-bottom: 10px; + text-transform: uppercase; + font-weight: bold; .topic-avatar { margin: 0 5px 0 10px; } @@ -28,9 +25,6 @@ span.badge-posts { .show-replies { display: none; - i { - margin-left: 5px; - } } nav.post-controls { diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb index cd9b7c8541..e4416b1309 100644 --- a/app/controllers/admin/reports_controller.rb +++ b/app/controllers/admin/reports_controller.rb @@ -13,7 +13,12 @@ class Admin::ReportsController < Admin::AdminController end_date = start_date + 1.month end_date = Time.parse(params[:end_date]) if params[:end_date].present? - report = Report.find(report_type, {start_date: start_date, end_date: end_date}) + category_id = if params.has_key?(:category_id) + params[:category_id].blank? ? SiteSetting.uncategorized_category_id : params[:category_id].to_i + end + + report = Report.find(report_type, start_date: start_date, end_date: end_date, category_id: category_id) + raise Discourse::NotFound if report.blank? render_json_dump(report: report) diff --git a/app/controllers/admin/site_customizations_controller.rb b/app/controllers/admin/site_customizations_controller.rb index dc104fd743..30929fe4e0 100644 --- a/app/controllers/admin/site_customizations_controller.rb +++ b/app/controllers/admin/site_customizations_controller.rb @@ -2,6 +2,8 @@ class Admin::SiteCustomizationsController < Admin::AdminController before_filter :enable_customization + skip_before_filter :check_xhr, only: [:show] + def index @site_customizations = SiteCustomization.order(:name) @@ -48,6 +50,26 @@ class Admin::SiteCustomizationsController < Admin::AdminController end end + def show + @site_customization = SiteCustomization.find(params[:id]) + + respond_to do |format| + format.json do + check_xhr + render json: SiteCustomizationSerializer.new(@site_customization) + end + + format.any(:html, :text) do + raise RenderEmpty.new if request.xhr? + + response.headers['Content-Disposition'] = "attachment; filename=#{@site_customization.name.parameterize}.dcstyle.json" + response.sending_file = true + render json: SiteCustomizationSerializer.new(@site_customization) + end + end + + end + private def site_customization_params diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bf9e764b39..aa29468fb2 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -269,7 +269,8 @@ class ApplicationController < ActionController::Base find_opts[:active] = true unless opts[:include_inactive] User.find_by(find_opts) elsif params[:external_id] - SingleSignOnRecord.find_by(external_id: params[:external_id]).try(:user) + external_id = params[:external_id].gsub(/\.json$/, '') + SingleSignOnRecord.find_by(external_id: external_id).try(:user) end raise Discourse::NotFound if user.blank? diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 927519cb49..45d00fbc97 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -248,7 +248,8 @@ class ListController < ApplicationController status: params[:status], filter: params[:filter], state: params[:state], - search: params[:search] + search: params[:search], + q: params[:q] } options[:no_subcategories] = true if params[:no_subcategories] == 'true' options[:slow_platform] = true if slow_platform? diff --git a/app/controllers/similar_topics_controller.rb b/app/controllers/similar_topics_controller.rb new file mode 100644 index 0000000000..31bfe27260 --- /dev/null +++ b/app/controllers/similar_topics_controller.rb @@ -0,0 +1,39 @@ +require_dependency 'similar_topic_serializer' +require_dependency 'search/grouped_search_results' + +class SimilarTopicsController < ApplicationController + + class SimilarTopic + def initialize(topic) + @topic = topic + end + + attr_reader :topic + + def blurb + Search::GroupedSearchResults.blurb_for(@topic.try(:blurb)) + end + end + + def index + params.require(:title) + params.require(:raw) + title, raw = params[:title], params[:raw] + [:title, :raw].each { |key| check_length_of(key, params[key]) } + + # Only suggest similar topics if the site has a minimum amount of topics present. + return render json: [] unless Topic.count_exceeds_minimum? + + topics = Topic.similar_to(title, raw, current_user).to_a + topics.map! {|t| SimilarTopic.new(t) } + render_serialized(topics, SimilarTopicSerializer, root: :similar_topics, rest_serializer: true) + end + + protected + + def check_length_of(key, attr) + str = (key == :raw) ? "body" : key.to_s + raise Discourse::InvalidParameters.new(key) if attr.length < SiteSetting.send("min_#{str}_similar_length") + end + +end diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 287cf432de..b422aa993e 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -77,6 +77,10 @@ class TopicsController < ApplicationController @topic_view.draft = Draft.get(current_user, @topic_view.draft_key, @topic_view.draft_sequence) end + unless @topic_view.topic.visible + response.headers['X-Robots-Tag'] = 'noindex' + end + perform_show_response canonical_url UrlHelper.absolute_without_cdn("#{Discourse.base_uri}#{@topic_view.canonical_path}") @@ -145,29 +149,16 @@ class TopicsController < ApplicationController success ? render_serialized(topic, BasicTopicSerializer) : render_json_error(topic) end - def similar_to - params.require(:title) - params.require(:raw) - title, raw = params[:title], params[:raw] - [:title, :raw].each { |key| check_length_of(key, params[key]) } - - # Only suggest similar topics if the site has a minimum amount of topics present. - return render json: [] unless Topic.count_exceeds_minimum? - - topics = Topic.similar_to(title, raw, current_user).to_a - render_serialized(topics, TopicListItemSerializer, root: :topics) - end - def feature_stats params.require(:category_id) category_id = params[:category_id].to_i - topics = Topic.listable_topics.visible + visible_topics = Topic.listable_topics.visible render json: { - pinned_in_category_count: topics.where(category_id: category_id).where(pinned_globally: false).where.not(pinned_at: nil).count, - pinned_globally_count: topics.where(pinned_globally: true).where.not(pinned_at: nil).count, - banner_count: topics.where(archetype: Archetype.banner).count, + pinned_in_category_count: visible_topics.where(category_id: category_id).where(pinned_globally: false).where.not(pinned_at: nil).count, + pinned_globally_count: visible_topics.where(pinned_globally: true).where.not(pinned_at: nil).count, + banner_count: Topic.listable_topics.where(archetype: Archetype.banner).count, } end @@ -506,11 +497,6 @@ class TopicsController < ApplicationController topic.move_posts(current_user, post_ids_including_replies, args) end - def check_length_of(key, attr) - str = (key == :raw) ? "body" : key.to_s - invalid_param(key) if attr.length < SiteSetting.send("min_#{str}_similar_length") - end - def check_for_status_presence(key, attr) invalid_param(key) unless %w(pinned pinned_globally visible closed archived).include?(attr) end diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 29e1150b0b..923f624078 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -4,7 +4,7 @@ class UploadsController < ApplicationController def create type = params.require(:type) - file = params[:file] || params[:files].first + file = params[:file] || params[:files].try(:first) url = params[:url] client_id = params[:client_id] synchronous = is_api? && params[:synchronous] @@ -52,7 +52,7 @@ class UploadsController < ApplicationController # API can provide a URL if file.nil? && url.present? && is_api? tempfile = FileHelper.download(url, SiteSetting.max_image_size_kb.kilobytes, "discourse-upload-#{type}") rescue nil - filename = File.basename(URI.parse(file).path) + filename = File.basename(URI.parse(url).path) else tempfile = file.tempfile filename = file.original_filename diff --git a/app/controllers/users/omniauth_callbacks_controller.rb b/app/controllers/users/omniauth_callbacks_controller.rb index bb33159a43..b61ff36780 100644 --- a/app/controllers/users/omniauth_callbacks_controller.rb +++ b/app/controllers/users/omniauth_callbacks_controller.rb @@ -34,14 +34,18 @@ class Users::OmniauthCallbacksController < ApplicationController authenticator = self.class.find_authenticator(params[:provider]) - @data = authenticator.after_authenticate(auth) - @data.authenticator_name = authenticator.name + @auth_result = authenticator.after_authenticate(auth) - complete_response_data - - respond_to do |format| - format.html - format.json { render json: @data.to_client_hash } + if @auth_result.failed? + flash[:error] = @auth_result.failed_reason.html_safe + return render('failure') + else + @auth_result.authenticator_name = authenticator.name + complete_response_data + respond_to do |format| + format.html + format.json { render json: @auth_result.to_client_hash } + end end end @@ -69,35 +73,35 @@ class Users::OmniauthCallbacksController < ApplicationController protected def complete_response_data - if @data.user - user_found(@data.user) + if @auth_result.user + user_found(@auth_result.user) elsif SiteSetting.invite_only? - @data.requires_invite = true + @auth_result.requires_invite = true else - session[:authentication] = @data.session_data + session[:authentication] = @auth_result.session_data end end def user_found(user) # automatically activate any account if a provider marked the email valid - if !user.active && @data.email_valid + if !user.active && @auth_result.email_valid user.toggle(:active).save end if ScreenedIpAddress.should_block?(request.remote_ip) - @data.not_allowed_from_ip_address = true + @auth_result.not_allowed_from_ip_address = true elsif ScreenedIpAddress.block_admin_login?(user, request.remote_ip) - @data.admin_not_allowed_from_ip_address = true + @auth_result.admin_not_allowed_from_ip_address = true elsif Guardian.new(user).can_access_forum? && user.active # log on any account that is active with forum access log_on_user(user) Invite.invalidate_for_email(user.email) # invite link can't be used to log in anymore session[:authentication] = nil # don't carry around old auth info, perhaps move elsewhere - @data.authenticated = true + @auth_result.authenticated = true else if SiteSetting.must_approve_users? && !user.approved? - @data.awaiting_approval = true + @auth_result.awaiting_approval = true else - @data.awaiting_activation = true + @auth_result.awaiting_activation = true end end end diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3a10834b85..ad0b3699fc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -39,6 +39,12 @@ class UsersController < ApplicationController user_serializer.topic_post_count = {topic_id => Post.where(topic_id: topic_id, user_id: @user.id).count } end + # This is a hack to get around a Rails issue where values with periods aren't handled correctly + # when used as part of a route. + if params[:external_id] and params[:external_id].ends_with? '.json' + return render_json_dump(user_serializer) + end + respond_to do |format| format.html do @restrict_fields = guardian.restrict_user_fields?(@user) diff --git a/app/jobs/scheduled/daily_performance_report.rb b/app/jobs/scheduled/daily_performance_report.rb new file mode 100644 index 0000000000..343d3740b9 --- /dev/null +++ b/app/jobs/scheduled/daily_performance_report.rb @@ -0,0 +1,55 @@ +module Jobs + class DailyPerformanceReport < Jobs::Scheduled + every 1.day + per_host + + def execute(args) + if SiteSetting.daily_performance_report && + RailsMultisite::ConnectionManagement.current_db == "default" + result = `ruby #{Rails.root}/script/nginx_analyze.rb --limit 1440` + report_data = + if result.strip.empty? + "Report is only available in latest image, please run: +```text +cd /var/discourse +./launcher rebuild app +```" + else + "```text\n#{result}\n```" + end + + PostCreator.create(Discourse.system_user, + topic_id: performance_topic_id, + raw: report_data, + skip_validations: true) + + end + end + + def performance_topic_id + + if SiteSetting.performance_report_topic_id > 0 + topic = Topic.find_by(id: SiteSetting.performance_report_topic_id) + return topic.id if topic + end + + staff_category = Category.find_by(id: SiteSetting.staff_category_id) + raise StandardError, "Staff category was not found" unless staff_category + + post = PostCreator.create(Discourse.system_user, + raw: I18n.t('performance_report.initial_post_raw'), + category: staff_category.name, + title: I18n.t('performance_report.initial_topic_title'), + skip_validations: true) + + + unless post && post.topic_id + raise StandardError, "Could not create or retrieve performance report topic id" + end + + SiteSetting.performance_report_topic_id = post.topic_id + + end + + end +end diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index 694b975e45..b7123f5d52 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -3,13 +3,13 @@ module Jobs every 30.minutes def execute(args) - stats_json = AdminDashboardData.fetch_stats.as_json + stats = AdminDashboardData.fetch_stats.as_json # Add some extra time to the expiry so that the next job run has plenty of time to # finish before previous cached value expires. - $redis.setex AdminDashboardData.stats_cache_key, (AdminDashboardData.recalculate_interval + 5).minutes, stats_json.to_json + $redis.setex AdminDashboardData.stats_cache_key, (AdminDashboardData.recalculate_interval + 5).minutes, stats.to_json - stats_json + stats end end diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 04c199b400..bee0d49b8b 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -2,23 +2,34 @@ require_dependency 'mem_info' class AdminDashboardData - REPORTS = [ + GLOBAL_REPORTS ||= [ 'visits', 'signups', 'topics', 'posts', - 'flags', - 'users_by_trust_level', + 'time_to_first_response', + 'topics_with_no_response', 'likes', + 'flags', 'bookmarks', 'emails', + ] + + PAGE_VIEW_REPORTS ||= ['page_view_total_reqs'] + ApplicationRequest.req_types.keys.select { |r| r =~ /^page_view_/ }.map { |r| r + "_reqs" } + + PRIVATE_MESSAGE_REPORTS ||= [ 'user_to_user_private_messages', 'system_private_messages', - 'moderator_warning_private_messages', 'notify_moderators_private_messages', 'notify_user_private_messages', - 'page_view_total_reqs' - ] + ApplicationRequest.req_types.keys.map{|r| r + "_reqs"} + 'moderator_warning_private_messages', + ] + + HTTP_REPORTS ||= ApplicationRequest.req_types.keys.select { |r| r =~ /^http_/ }.map { |r| r + "_reqs" }.sort + + USER_REPORTS ||= ['users_by_trust_level'] + + # TODO: MOBILE_REPORTS def problems [ rails_env_check, @@ -48,11 +59,13 @@ class AdminDashboardData def self.fetch_stats AdminDashboardData.new end + def self.fetch_cached_stats # The DashboardStats job is responsible for generating and caching this. stats = $redis.get(stats_cache_key) stats ? JSON.parse(stats) : nil end + def self.stats_cache_key 'dash-stats' end @@ -63,7 +76,11 @@ class AdminDashboardData def as_json(_options = nil) @json ||= { - reports: REPORTS.map { |type| Report.find(type).as_json }, + global_reports: AdminDashboardData.reports(GLOBAL_REPORTS), + page_view_reports: AdminDashboardData.reports(PAGE_VIEW_REPORTS), + private_message_reports: AdminDashboardData.reports(PRIVATE_MESSAGE_REPORTS), + http_reports: AdminDashboardData.reports(HTTP_REPORTS), + user_reports: AdminDashboardData.reports(USER_REPORTS), admins: User.admins.count, moderators: User.moderators.count, suspended: User.suspended.count, @@ -75,8 +92,12 @@ class AdminDashboardData } end + def self.reports(source) + source.map { |type| Report.find(type).as_json } + end + + # Could be configurable, multisite need to support it. def self.recalculate_interval - # Could be configurable, multisite need to support it. 30 # minutes end diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb index 63aaf74eab..5edfeb6b71 100644 --- a/app/models/discourse_single_sign_on.rb +++ b/app/models/discourse_single_sign_on.rb @@ -127,28 +127,7 @@ class DiscourseSingleSignOn < SingleSignOn avatar_force_update || sso_record.external_avatar_url != avatar_url) - begin - tempfile = FileHelper.download(avatar_url, SiteSetting.max_image_size_kb.kilobytes, "sso-avatar", true) - - ext = FastImage.type(tempfile).to_s - tempfile.rewind - - upload = Upload.create_for(user.id, tempfile, "external-avatar." + ext, tempfile.size, { origin: avatar_url }) - user.uploaded_avatar_id = upload.id - - unless user.user_avatar - user.build_user_avatar - end - - if !user.user_avatar.contains_upload?(upload.id) - user.user_avatar.custom_upload_id = upload.id - end - rescue => e - # skip saving, we are not connected to the net - Rails.logger.warn "#{e}: Failed to download external avatar: #{avatar_url}, user id #{ user.id }" - ensure - tempfile.close! if tempfile && tempfile.respond_to?(:close!) - end + UserAvatar.import_url_for_user(avatar_url, user) end # change external attributes for sso record diff --git a/app/models/email_token.rb b/app/models/email_token.rb index ce8c6b0241..a7eb036f90 100644 --- a/app/models/email_token.rb +++ b/app/models/email_token.rb @@ -60,7 +60,7 @@ class EmailToken < ActiveRecord::Base end end # redeem invite, if available - Invite.redeem_from_email(user.email) + return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present? user rescue ActiveRecord::RecordInvalid # If the user's email is already taken, just return nil (failure) diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb index e3cb2532a1..e21afde1c2 100644 --- a/app/models/global_setting.rb +++ b/app/models/global_setting.rb @@ -31,6 +31,25 @@ class GlobalSetting {"production" => hash} end + def self.redis_config + @config ||= + begin + c = {} + c[:host] = redis_host if redis_host + c[:port] = redis_port if redis_port + c[:password] = redis_password if redis_password.present? + c[:db] = redis_db if redis_db != 0 + c[:db] = 1 if Rails.env == "test" + if redis_sentinels.present? + c[:sentinels] = redis_sentinels.split(",").map do |address| + host,port = address.split(":") + {host: host, port: port} + end.to_a + end + c.freeze + end + end + class BaseProvider def self.coerce(setting) diff --git a/app/models/notification.rb b/app/models/notification.rb index 884ddaff82..842d657263 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -8,10 +8,9 @@ class Notification < ActiveRecord::Base validates_presence_of :notification_type scope :unread, lambda { where(read: false) } - scope :recent, lambda {|n=nil| n ||= 10; order('notifications.created_at desc').limit(n) } - scope :visible , lambda { where('notifications.topic_id IS NULL OR notifications.topic_id IN ( - SELECT id FROM topics - WHERE deleted_at IS NULL)') } + scope :recent, lambda { |n=nil| n ||= 10; order('notifications.created_at desc').limit(n) } + scope :visible , lambda { joins('LEFT JOIN topics ON notifications.topic_id = topics.id') + .where('topics.id IS NULL OR topics.deleted_at IS NULL') } after_save :refresh_notification_count after_destroy :refresh_notification_count diff --git a/app/models/post.rb b/app/models/post.rb index 0dbe2c6c3b..22fbea3ec9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -493,15 +493,16 @@ class Post < ActiveRecord::Base Jobs.enqueue(:process_post, args) end - def self.public_posts_count_per_day(start_date, end_date) - public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date).group('date(posts.created_at)').order('date(posts.created_at)').count + def self.public_posts_count_per_day(start_date, end_date, category_id=nil) + result = public_posts.where('posts.created_at >= ? AND posts.created_at <= ?', start_date, end_date) + result = result.where('topics.category_id = ?', category_id) if category_id + result.group('date(posts.created_at)').order('date(posts.created_at)').count end def self.private_messages_count_per_day(since_days_ago, topic_subtype) private_posts.with_topic_subtype(topic_subtype).where('posts.created_at > ?', since_days_ago.days.ago).group('date(posts.created_at)').order('date(posts.created_at)').count end - def reply_history(max_replies=100) post_ids = Post.exec_sql("WITH RECURSIVE breadcrumb(id, reply_to_post_number) AS ( SELECT p.id, p.reply_to_post_number FROM posts AS p diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 5fc1330126..20c0d62007 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -39,11 +39,13 @@ class PostAction < ActiveRecord::Base nil end - def self.flag_count_by_date(start_date, end_date) - where('created_at >= ? and created_at <= ?', start_date, end_date) - .where(post_action_type_id: PostActionType.flag_types.values) - .group('date(created_at)').order('date(created_at)') - .count + def self.flag_count_by_date(start_date, end_date, category_id=nil) + result = where('post_actions.created_at >= ? AND post_actions.created_at <= ?', start_date, end_date) + result = result.where(post_action_type_id: PostActionType.flag_types.values) + result = result.joins(post: :topic).where("topics.category_id = ?", category_id) if category_id + result.group('date(post_actions.created_at)') + .order('date(post_actions.created_at)') + .count end def self.update_flagged_posts_count @@ -122,12 +124,15 @@ SQL user_actions end - def self.count_per_day_for_type(post_action_type, since_days_ago=30) - unscoped.where(post_action_type_id: post_action_type) - .where('created_at >= ?', since_days_ago.days.ago) - .group('date(created_at)') - .order('date(created_at)') - .count + def self.count_per_day_for_type(post_action_type, opts=nil) + opts ||= {} + opts[:since_days_ago] ||= 30 + result = unscoped.where(post_action_type_id: post_action_type) + result = result.where('post_actions.created_at >= ?', opts[:since_days_ago].days.ago) + result = result.joins(post: :topic).where('topics.category_id = ?', opts[:category_id]) if opts[:category_id] + result.group('date(post_actions.created_at)') + .order('date(post_actions.created_at)') + .count end def self.agree_flags!(post, moderator, delete_post=false) @@ -275,9 +280,12 @@ SQL end # agree with other flags - PostAction.agree_flags!(post, user) if staff_took_action - # update counters - post_action.try(:update_counters) + if staff_took_action + PostAction.agree_flags!(post, user) + + # update counters + post_action.try(:update_counters) + end post_action rescue ActiveRecord::RecordNotUnique diff --git a/app/models/post_analyzer.rb b/app/models/post_analyzer.rb index b60502b98f..4e2bf369e8 100644 --- a/app/models/post_analyzer.rb +++ b/app/models/post_analyzer.rb @@ -45,11 +45,12 @@ class PostAnalyzer return [] if @raw.blank? return @raw_mentions if @raw_mentions.present? - # strip quotes and code blocks + # strip quotes, code blocks and oneboxes cooked_stripped = cooked_document cooked_stripped.css("aside.quote").remove cooked_stripped.css("pre").remove cooked_stripped.css("code").remove + cooked_stripped.css(".onebox").remove results = cooked_stripped.to_html.scan(PrettyText.mention_matcher) @raw_mentions = results.uniq.map { |un| un.first.downcase.gsub!(/^@/, '') } diff --git a/app/models/report.rb b/app/models/report.rb index 76f5952d55..71dff2fd4b 100644 --- a/app/models/report.rb +++ b/app/models/report.rb @@ -2,7 +2,7 @@ require_dependency 'topic_subtype' class Report - attr_accessor :type, :data, :total, :prev30Days, :start_date, :end_date + attr_accessor :type, :data, :total, :prev30Days, :start_date, :end_date, :category_id def self.default_days 30 @@ -10,14 +10,11 @@ class Report def initialize(type) @type = type - @data = nil - @total = nil - @prev30Days = nil @start_date ||= 1.month.ago.beginning_of_day @end_date ||= Time.zone.now.end_of_day end - def as_json(options = nil) + def as_json(options=nil) { type: type, title: I18n.t("reports.#{type}.title"), @@ -27,16 +24,22 @@ class Report total: total, start_date: start_date, end_date: end_date, + category_id: category_id, prev30Days: self.prev30Days } end + def Report.add_report(name, &block) + singleton_class.instance_eval { define_method("report_#{name}", &block) } + end + def self.find(type, opts=nil) opts ||= {} # Load the report report = Report.new(type) report.start_date = opts[:start_date] if opts[:start_date] report.end_date = opts[:end_date] if opts[:end_date] + report.category_id = opts[:category_id] if opts[:category_id] report_method = :"report_#{type}" if respond_to?(report_method) @@ -46,6 +49,7 @@ class Report else return nil end + report end @@ -60,13 +64,14 @@ class Report end filtered_results = data.where('date >= ? AND date <= ?', report.start_date.to_date, report.end_date.to_date) + filtered_results = filtered_results.where(category_id: report.category_id) if report.category_id report.data = [] filtered_results.order(date: :asc) .group(:date) .sum(:count) .each do |date, count| - report.data << {x: date, y: count} + report.data << { x: date, y: count } end report.total = data.sum(:count) @@ -84,13 +89,35 @@ class Report end def self.report_topics(report) - basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date - add_counts report, Topic.listable_topics, 'topics.created_at' + basic_report_about report, Topic, :listable_count_per_day, report.start_date, report.end_date, report.category_id + countable = Topic.listable_topics + countable = countable.where(category_id: report.category_id) if report.category_id + add_counts report, countable, 'topics.created_at' end def self.report_posts(report) - basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date - add_counts report, Post.public_posts, 'posts.created_at' + basic_report_about report, Post, :public_posts_count_per_day, report.start_date, report.end_date, report.category_id + countable = Post.public_posts + countable = countable.joins(:topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'posts.created_at' + end + + def self.report_time_to_first_response(report) + report.data = [] + Topic.time_to_first_response_per_day(report.start_date, report.end_date, report.category_id).each do |r| + report.data << { x: Date.parse(r["date"]), y: r["hours"].to_f.round(2) } + end + report.total = Topic.time_to_first_response_total(category_id: report.category_id) + report.prev30Days = Topic.time_to_first_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id) + end + + def self.report_topics_with_no_response(report) + report.data = [] + Topic.with_no_response_per_day(report.start_date, report.end_date, report.category_id).each do |r| + report.data << { x: Date.parse(r["date"]), y: r["count"].to_i } + end + report.total = Topic.with_no_response_total(category_id: report.category_id) + report.prev30Days = Topic.with_no_response_total(start_date: report.start_date - 30.days, end_date: report.start_date, category_id: report.category_id) end def self.report_emails(report) @@ -105,7 +132,7 @@ class Report def self.basic_report_about(report, subject_class, report_method, *args) report.data = [] subject_class.send(report_method, *args).each do |date, count| - report.data << {x: date, y: count} + report.data << { x: date, y: count } end end @@ -117,14 +144,16 @@ class Report def self.report_users_by_trust_level(report) report.data = [] User.real.group('trust_level').count.each do |level, count| - report.data << {x: level.to_i, y: count} + report.data << { x: level.to_i, y: count } end end # Post action counts: def self.report_flags(report) - basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date - add_counts report, PostAction.where(post_action_type_id: PostActionType.flag_types.values), 'post_actions.created_at' + basic_report_about report, PostAction, :flag_count_by_date, report.start_date, report.end_date, report.category_id + countable = PostAction.where(post_action_type_id: PostActionType.flag_types.values) + countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'post_actions.created_at' end def self.report_likes(report) @@ -137,10 +166,12 @@ class Report def self.post_action_report(report, post_action_type) report.data = [] - PostAction.count_per_day_for_type(post_action_type).each do |date, count| + PostAction.count_per_day_for_type(post_action_type, category_id: report.category_id).each do |date, count| report.data << { x: date, y: count } end - add_counts report, PostAction.unscoped.where(post_action_type_id: post_action_type), 'post_actions.created_at' + countable = PostAction.unscoped.where(post_action_type_id: post_action_type) + countable = countable.joins(post: :topic).where("topics.category_id = ?", report.category_id) if report.category_id + add_counts report, countable, 'post_actions.created_at' end # Private messages counts: diff --git a/app/models/topic.rb b/app/models/topic.rb index 6f444e1ab4..b3904cac7a 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -106,7 +106,9 @@ class Topic < ActiveRecord::Base has_one :first_post, -> {where post_number: 1}, class_name: Post # When we want to temporarily attach some data to a forum topic (usually before serialization) + attr_accessor :search_data attr_accessor :user_data + attr_accessor :posters # TODO: can replace with posters_summary once we remove old list code attr_accessor :participants attr_accessor :topic_list @@ -357,8 +359,10 @@ class Topic < ActiveRecord::Base custom_fields[key.to_s] end - def self.listable_count_per_day(start_date, end_date) - listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date).group('date(created_at)').order('date(created_at)').count + def self.listable_count_per_day(start_date, end_date, category_id=nil) + result = listable_topics.where('created_at >= ? and created_at <= ?', start_date, end_date) + result = result.where(category_id: category_id) if category_id + result.group('date(created_at)').order('date(created_at)').count end def private_message? @@ -393,7 +397,7 @@ class Topic < ActiveRecord::Base return [] unless candidate_ids.present? - similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity", title: title, raw: raw])) + similar = Topic.select(sanitize_sql_array(["topics.*, similarity(topics.title, :title) + similarity(topics.title, :raw) AS similarity, p.cooked as blurb", title: title, raw: raw])) .joins("JOIN posts AS p ON p.topic_id = topics.id AND p.post_number = 1") .limit(SiteSetting.max_similar_results) .where("topics.id IN (?)", candidate_ids) @@ -846,6 +850,98 @@ class Topic < ActiveRecord::Base SiteSetting.embeddable_hosts.present? && SiteSetting.embed_truncate? && has_topic_embed? end + TIME_TO_FIRST_RESPONSE_SQL ||= <<-SQL + SELECT AVG(t.hours)::float AS "hours", t.created_at AS "date" + FROM ( + SELECT t.id, t.created_at::date AS created_at, EXTRACT(EPOCH FROM MIN(p.created_at) - t.created_at)::float / 3600.0 AS "hours" + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id + /*where*/ + GROUP BY t.id + ) t + GROUP BY t.created_at + ORDER BY t.created_at + SQL + + TIME_TO_FIRST_RESPONSE_TOTAL_SQL ||= <<-SQL + SELECT AVG(t.hours)::float AS "hours" + FROM ( + SELECT t.id, EXTRACT(EPOCH FROM MIN(p.created_at) - t.created_at)::float / 3600.0 AS "hours" + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id + /*where*/ + GROUP BY t.id + ) t + SQL + + def self.time_to_first_response(sql, opts=nil) + opts ||= {} + builder = SqlBuilder.new(sql) + builder.where("t.created_at >= :start_date", start_date: opts[:start_date]) if opts[:start_date] + builder.where("t.created_at < :end_date", end_date: opts[:end_date]) if opts[:end_date] + builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id] + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.where("p.deleted_at IS NULL") + builder.where("p.post_number > 1") + builder.where("p.user_id != t.user_id") + builder.where("EXTRACT(EPOCH FROM p.created_at - t.created_at) > 0") + builder.exec + end + + def self.time_to_first_response_per_day(start_date, end_date, category_id=nil) + time_to_first_response(TIME_TO_FIRST_RESPONSE_SQL, start_date: start_date, end_date: end_date, category_id: category_id) + end + + def self.time_to_first_response_total(opts=nil) + total = time_to_first_response(TIME_TO_FIRST_RESPONSE_TOTAL_SQL, opts) + total.first["hours"].to_f.round(2) + end + + WITH_NO_RESPONSE_SQL ||= <<-SQL + SELECT COUNT(*) as count, tt.created_at AS "date" + FROM ( + SELECT t.id, t.created_at::date AS created_at, MIN(p.post_number) first_reply + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id AND p.user_id != t.user_id AND p.deleted_at IS NULL + /*where*/ + GROUP BY t.id + ) tt + WHERE tt.first_reply IS NULL + GROUP BY tt.created_at + ORDER BY tt.created_at + SQL + + def self.with_no_response_per_day(start_date, end_date, category_id=nil) + builder = SqlBuilder.new(WITH_NO_RESPONSE_SQL) + builder.where("t.created_at >= :start_date", start_date: start_date) if start_date + builder.where("t.created_at < :end_date", end_date: end_date) if end_date + builder.where("t.category_id = :category_id", category_id: category_id) if category_id + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.exec + end + + WITH_NO_RESPONSE_TOTAL_SQL ||= <<-SQL + SELECT COUNT(*) as count + FROM ( + SELECT t.id, MIN(p.post_number) first_reply + FROM topics t + LEFT JOIN posts p ON p.topic_id = t.id AND p.user_id != t.user_id AND p.deleted_at IS NULL + /*where*/ + GROUP BY t.id + ) tt + WHERE tt.first_reply IS NULL + SQL + + def self.with_no_response_total(opts={}) + builder = SqlBuilder.new(WITH_NO_RESPONSE_TOTAL_SQL) + builder.where("t.category_id = :category_id", category_id: opts[:category_id]) if opts[:category_id] + builder.where("t.archetype <> '#{Archetype.private_message}'") + builder.where("t.deleted_at IS NULL") + builder.exec.first["count"].to_i + end + private def update_category_topic_count_by(num) diff --git a/app/models/upload.rb b/app/models/upload.rb index bda663f192..995a185b29 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -34,7 +34,7 @@ class Upload < ActiveRecord::Base optimized_images << thumbnail self.width = width self.height = height - save! + save(validate: false) end end diff --git a/app/models/user.rb b/app/models/user.rb index e0c302031f..da3507ef9d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -429,8 +429,23 @@ class User < ActiveRecord::Base UrlHelper.schemaless UrlHelper.absolute avatar_template end + def self.default_template(username) + if SiteSetting.default_avatars.present? + split_avatars = SiteSetting.default_avatars.split("\n") + if split_avatars.present? + hash = username.each_char.reduce(0) do |result, char| + [((result << 5) - result) + char.ord].pack('L').unpack('l').first + end + + avatar_template = split_avatars[hash.abs % split_avatars.size] + end + else + "#{Discourse.base_uri}/letter_avatar/#{username.downcase}/{size}/#{LetterAvatar.version}.png" + end + end + def self.avatar_template(username,uploaded_avatar_id) - return letter_avatar_template(username) if !uploaded_avatar_id + return default_template(username) if !uploaded_avatar_id username ||= "" hostname = RailsMultisite::ConnectionManagement.current_hostname UserAvatar.local_avatar_template(hostname, username.downcase, uploaded_avatar_id) diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb index 87dd8d5dbb..bc33d1889a 100644 --- a/app/models/user_avatar.rb +++ b/app/models/user_avatar.rb @@ -62,6 +62,29 @@ class UserAvatar < ActiveRecord::Base "#{upload_id}_#{OptimizedImage::VERSION}" end + def self.import_url_for_user(avatar_url, user) + tempfile = FileHelper.download(avatar_url, SiteSetting.max_image_size_kb.kilobytes, "sso-avatar", true) + + ext = FastImage.type(tempfile).to_s + tempfile.rewind + + upload = Upload.create_for(user.id, tempfile, "external-avatar." + ext, tempfile.size, { origin: avatar_url }) + user.uploaded_avatar_id = upload.id + + unless user.user_avatar + user.build_user_avatar + end + + if !user.user_avatar.contains_upload?(upload.id) + user.user_avatar.custom_upload_id = upload.id + end + rescue => e + # skip saving, we are not connected to the net + Rails.logger.warn "#{e}: Failed to download external avatar: #{avatar_url}, user id #{ user.id }" + ensure + tempfile.close! if tempfile && tempfile.respond_to?(:close!) + end + end # == Schema Information diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index 5620bccf00..79ffae02ff 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -11,6 +11,7 @@ class ListableTopicSerializer < BasicTopicSerializer :bumped_at, :unseen, :last_read_post_number, + :linked_post_number, :unread, :new_posts, :pinned, @@ -77,6 +78,22 @@ class ListableTopicSerializer < BasicTopicSerializer !!object.user_data end + def excerpt + if object.search_data + object.search_data[:excerpt] + else + object.excerpt + end + end + + def include_linked_post_number? + object.search_data + end + + def linked_post_number + object.search_data[:post_number] + end + alias :include_last_read_post_number? :has_user_data def unread @@ -90,7 +107,7 @@ class ListableTopicSerializer < BasicTopicSerializer alias :include_new_posts? :has_user_data def include_excerpt? - pinned + pinned || object.search_data end def pinned diff --git a/app/serializers/similar_topic_serializer.rb b/app/serializers/similar_topic_serializer.rb new file mode 100644 index 0000000000..9e6e067e90 --- /dev/null +++ b/app/serializers/similar_topic_serializer.rb @@ -0,0 +1,21 @@ +class SimilarTopicSerializer < ApplicationSerializer + + has_one :topic, serializer: TopicListItemSerializer, embed: :ids + attributes :id, :blurb, :created_at, :url + + def id + object.topic.id + end + + def blurb + object.blurb + end + + def url + object.topic.url + end + + def created_at + object.topic.created_at + end +end diff --git a/app/serializers/site_customization_serializer.rb b/app/serializers/site_customization_serializer.rb new file mode 100644 index 0000000000..1c8ff8f9da --- /dev/null +++ b/app/serializers/site_customization_serializer.rb @@ -0,0 +1,7 @@ +class SiteCustomizationSerializer < ApplicationSerializer + + attributes :id, :name, :key, :enabled, :created_at, :updated_at, + :stylesheet, :header, :footer, :top, + :mobile_stylesheet, :mobile_header, :mobile_footer, :mobile_top, + :head_tag, :body_tag +end diff --git a/app/services/user_activator.rb b/app/services/user_activator.rb index d96c8ca981..63defef4dc 100644 --- a/app/services/user_activator.rb +++ b/app/services/user_activator.rb @@ -23,7 +23,8 @@ class UserActivator end def factory - if SiteSetting.must_approve_users? + invite = Invite.find_by(email: Email.downcase(@user.email)) + if SiteSetting.must_approve_users? && !(invite.present? && !invite.expired? && !invite.destroyed? && invite.link_valid?) ApprovalActivator elsif !user.active? EmailActivator diff --git a/app/views/users/omniauth_callbacks/complete.html.erb b/app/views/users/omniauth_callbacks/complete.html.erb index d2198018a8..3107268530 100644 --- a/app/views/users/omniauth_callbacks/complete.html.erb +++ b/app/views/users/omniauth_callbacks/complete.html.erb @@ -22,7 +22,7 @@

    <%=t "login.close_window" %>

    diff --git a/app/views/users/omniauth_callbacks/failure.html.erb b/app/views/users/omniauth_callbacks/failure.html.erb index 697043807c..c83169acb3 100644 --- a/app/views/users/omniauth_callbacks/failure.html.erb +++ b/app/views/users/omniauth_callbacks/failure.html.erb @@ -1,11 +1,20 @@ -
    - <%if flash[:error]%> -
    - <%=flash[:error]%> + + + <%= render partial: "layouts/head" %> + <%= render partial: "common/special_font_face" %> + <%= render partial: "common/discourse_stylesheet" %> + + +
    + <%if flash[:error].present? %> +
    + <%=flash[:error]%> +
    + <%else%> +
    + <%= t 'login.omniauth_error_unknown' %> +
    + <%end%>
    - <%else%> -
    - <% t 'login.omniauth_error_unknown' %> -
    - <%end%> -
    \ No newline at end of file + + diff --git a/config/cloud/cloud66/deploy_hooks.yml b/config/cloud/cloud66/deploy_hooks.yml index dee74d8d67..6d971570bc 100644 --- a/config/cloud/cloud66/deploy_hooks.yml +++ b/config/cloud/cloud66/deploy_hooks.yml @@ -20,12 +20,6 @@ production: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Copy redis settings - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Copy production.rb file - source: /config/cloud/cloud66/files/production.rb destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb @@ -103,12 +97,6 @@ staging: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Rename redis.yml.sample file - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Rename production.rb.sample file - source: /config/cloud/cloud66/files/production.rb destination: <%= ENV['RAILS_STACK_PATH'] %>/config/environments/production.rb @@ -168,8 +156,6 @@ development: first_thing: # 1. Permissions on postgres box - source: /config/cloud/cloud66/scripts/permissions.sh - destination: /tmp/scripts/permissions.sh - target: postgresql apply_during: build_only execute: true sudo: true @@ -186,12 +172,6 @@ development: destination: <%= ENV['RAILS_STACK_PATH'] %>/Procfile target: rails run_on: all_servers - # 4. Rename redis.yml.sample file - - source: /config/cloud/cloud66/files/redis.yml - destination: <%= ENV['RAILS_STACK_PATH'] %>/config/redis.yml - target: rails - parse: false - run_on: all_servers # 5. Move thin config to server - source: /config/cloud/cloud66/files/thin.yml destination: <%= ENV['RAILS_STACK_PATH'] %>/config/thin.yml @@ -241,4 +221,4 @@ development: target: rails apply_during: build_only execute: true - sudo: true \ No newline at end of file + sudo: true diff --git a/config/cloud/cloud66/files/redis.yml b/config/cloud/cloud66/files/redis.yml deleted file mode 100644 index 25ba0da879..0000000000 --- a/config/cloud/cloud66/files/redis.yml +++ /dev/null @@ -1,22 +0,0 @@ -defaults: &defaults - uri: <%= uri = URI.parse( ENV['REDIS_ADDRESS'].nil? ? ENV['REDIS_PROVIDER_URL'] || "redis://localhost:6379" : "redis://#{ENV['REDIS_ADDRESS']}:6379") %> - host: <%= uri.host %> - port: <%= uri.port %> - password: <%= uri.password %> - db: 0 - -development: - <<: *defaults - -profile: - <<: *defaults - -test: - <<: *defaults - db: 1 - -staging: - <<: *defaults - -production: - <<: *defaults diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf index d489606533..faf88116a2 100644 --- a/config/discourse_defaults.conf +++ b/config/discourse_defaults.conf @@ -92,6 +92,10 @@ redis_db = 0 # redis password redis_password = +# redis sentinels eg +# redis_sentinels = 10.0.0.1:26381,10.0.0.2:26381 +redis_sentinels = + # enable Cross-origin Resource Sharing (CORS) directly at the application level enable_cors = false cors_origin = '' diff --git a/config/initializers/04-message_bus.rb b/config/initializers/04-message_bus.rb index 7ada7b9ffa..308985a6de 100644 --- a/config/initializers/04-message_bus.rb +++ b/config/initializers/04-message_bus.rb @@ -29,7 +29,7 @@ MessageBus.on_disconnect do |site_id| end # Point at our redis -MessageBus.redis_config = YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env].symbolize_keys +MessageBus.redis_config = GlobalSetting.redis_config MessageBus.long_polling_enabled = SiteSetting.enable_long_polling MessageBus.long_polling_interval = SiteSetting.long_polling_interval diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index 3e27e04743..25abdd61dc 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -8,6 +8,9 @@ ar: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -23,6 +26,9 @@ ar: kb: كيلو بايت mb: ميجا tb: تيرا + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -122,7 +128,7 @@ ar: two: "يومان" few: "%{count} أيام" many: "%{count} يومًا" - other: "%{count} يوم" + other: "%{count} أيام" date_year: "MMM D, 'YY" medium_with_ago: x_minutes: @@ -146,6 +152,28 @@ ar: few: "%{count} يوم مضى" many: "%{count} يوم مضى" other: "%{count} يوم مضى" + later: + x_days: + zero: "%{count} يوم مضى" + one: "1 يوم مضى" + two: "يومان مضى {count}%" + few: "أيام مضت {count}%" + many: "أيام مضت {count}%" + other: "أيام مضت {count}%" + x_months: + zero: "بعد أقل من شهر." + one: "بعد شهر." + two: "بعد شهرين." + few: "بعد %{count} أشهر" + many: "بعد %{count} شهر." + other: "بعد %{count} شهر." + x_years: + zero: "بعد أقل من سنة." + one: "بعد سنة واحدة." + two: "بعد سنتين." + few: "بعد %{count} سنوات." + many: "بعد %{count} سنوات." + other: "بعد %{count} سنة." share: topic: 'ضع رابطاً في هذا الموضوع.' post: 'الموضوع رقم %{postNumber}' @@ -167,10 +195,17 @@ ar: age: "العمر" joined: "إنضم" admin_title: "المدير" - flags_title: "الأعلام" + flags_title: "بلاغات" show_more: "أعرض المزيد" show_help: "مساعدة" links: "روابط" + links_lowercase: + zero: "رابط" + one: "رابط" + two: "رابط" + few: "رابط" + many: "روابط" + other: "روابط" faq: "التعليمات" guidelines: "توجيهات " privacy_policy: "سياسة الخصوصية " @@ -190,6 +225,7 @@ ar: every_two_weeks: "كل اسبوعين" every_three_days: "كل ثلاثة أيام" max_of_count: "اقصى {{count}}" + alternation: "أو" character_count: zero: "0 حرف" one: "حرف واحد" @@ -264,8 +300,11 @@ ar: undo: "تراجع" revert: "عكس" failed: "فشل" + switch_to_anon: "وضع التخفي" + switch_from_anon: "الخروج من وضع التخفي" banner: close: "تعطيل البانر" + edit: "تحرير هذا البانر" choose_topic: none_found: "لم يتم العثور على مواضيع." title: @@ -275,14 +314,32 @@ ar: topic: "الموضوع" approve: 'الموافقة' reject: 'الرفض' + delete_user: 'حذف المستخدم' title: "تحتاج موافقة" none: "لا يوجد مشاركات لمراجعتها" edit: "تعديل" cancel: "إلغاء" + view_pending: "عرض المشاركات المعلقة" + has_pending_posts: + zero: " هذا الموضوع لا توجد به مشاركات بانتظار الموافقة" + one: "هذا الموضوع له 1 مشاركة بانتظار الموافقة" + two: "هذا الموضوع له مشاركتان بانتظار الموافقة" + few: "هذا الموضوع له قليل من المشاركات بانتظار الموافقة" + many: "هذا الموضوع له كثير من المشاركات بانتظار الموافقة" + other: "هذا الموضوع له {{count}} مشاركات بانتظار الموافقة" confirm: "حفظ التعديلات" + delete_prompt: "هل أنت متأكد أنك تريد حذف %{username}؟ هذا سيحذف جميع مشاركاتك ويحظر بريدك الإلكتروني و عنوانك الـIP ." approval: title: "المشاركات تحتاج موافقة" description: "لقد استلمنا مشاركتك لكنها تحتاج موافقة المشرف قبل ظهورها. الرجاء الانتظار" + pending_posts: + zero: "ﻻ يوجد مشاركات معلقة." + one: "لديك مشاركة معلقة." + two: "لديك مشاركتين معلقتين." + few: "لديك {{count}} مشاركات معلقة." + many: "لديك {{count}} مشاركة معلقة." + other: "لديك {{count}} مشاركة معلقة." + ok: "موافق" user_action: user_posted_topic: "a href='{{userUrl}}'>{{user}} مشاركاتهذا الموضوع" you_posted_topic: "ك مشاركاتهذا الموضوع" @@ -302,6 +359,7 @@ ar: title: "الأعضاء" likes_given: "الإعجابات المعطاة" likes_received: "الإعجابات المستلمة" + topics_entered: "مدخل" topics_entered_long: "المواضيع المدخلة" time_read: "وقت القراءة" topic_count: "المواضيع" @@ -344,6 +402,7 @@ ar: '3': "المفضلة" '4': "مواضيع" '5': "الردود" + '6': "ردود" '7': "إشارات" '9': "إقتباسات" '10': "تألقت" @@ -412,6 +471,7 @@ ar: dismiss_notifications: "جعل الجميع مقروء" dismiss_notifications_tooltip: "جعل جميع اشعارات غيرمقروء الى مقروء" disable_jump_reply: "لاتذهب الى مشاركة جديدة بعد الرد" + dynamic_favicon: "أعرض عدد الموضوع الجديد / الحديث في أيقونة المتصفح." edit_history_public: "جعل المستخدمين الاخرين يطلعون على تعديلاتي" external_links_in_new_tab: "إفتح كل الروابط الخارجية في صفحة جديدة" enable_quoting: "إسمح بإقتباس التعليقات لنصوص البارزة الملقى عليها ضوء" @@ -425,7 +485,9 @@ ar: github_profile: "Github" mailing_list_mode: "استقبال بريد الكتروني لكل مشاركة جديدة (بإسثناء لو قمت بكتم الموضوع او التصنيف)" watched_categories: "متابع" + watched_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك بجميع المشاركات والمواضيع و بعدد المشاركات الجديدة التي ستظهر بجانب الموضوع. " tracked_categories: "Tracked" + tracked_categories_instructions: "ستتبع بشكل تلقائي جميع المواضيع الجديدة في هذه التصنيفات. عدد المشاركات الجديدة سيظهر بجانب الموضوع." muted_categories: "كتم" muted_categories_instructions: "تلقائيا ستقوم بمتابعة جميع المواضيع في هذا التصنيف , وسيتم اشعارك لجميع المشاركات والمواضيع وكذلك عداد الغيرمقروء والمشاركات الجديدة" delete_account: "حذف الحساب" @@ -455,6 +517,7 @@ ar: set_password: " إعادة تعين الرمز السري" change_about: title: "تعديل معلومات عنّي" + error: "حدث خطأ عند تغيير القيمة." change_username: title: "تغيير اسم المستخدم" confirm: "إذا قمت بتغيير الاسم المستعار، فإن جميع المشاركات التي قمت بالمشاركة بها سيتم الغائها. هل أنت متأكد بقيامك على هذه الخطوة؟" @@ -469,6 +532,7 @@ ar: change_avatar: title: "غير صورتك الشخصية" gravatar: "Gravatar, based on" + gravatar_title: "غير صورتك الشخصية على موقع Gravatar's." refresh_gravatar_title: "حدّث Gravatar" letter_based: "الصورة الافتراضية " uploaded_avatar: "تخصيص صورة" @@ -616,6 +680,7 @@ ar: title: "ايبي مسجل" avatar: title: "صورة الملف الشخصي" + header_title: "الملف والرسائل والعناوين والتفضيلات." title: title: "عنوان" filters: @@ -648,7 +713,9 @@ ar: logout: "تم تسجيل خروجك" refresh: "تحديث" read_only_mode: + enabled: "وضع القراءة فقط مفعل. يمكنك إكمال تصفح الموقع لكن التفاعلات قد لا تعمل." login_disabled: "تسجيل الدخول معطل لأن الموقع في خالة القراءة فقط" + too_few_topics_notice: "قم بإنشاء على الاقل 5 مواضيع عامة و %{posts} ردود عامة للبدء بالمناقشة , المستخدمين الجدد لايمكن أن يحصلوا على مستوى الثقة حتى يكون هناك محتوى لهم للقراءة. هذه الرسالة تظهر فقط للعاملين." learn_more: "تعلم المزيد..." year: 'سنة' year_desc: 'المواضيع المكتوبة خلال 365 يوم الماضية' @@ -662,6 +729,13 @@ ar: unmute: إلغاء الكتم last_post: أخر مشاركة last_reply_lowercase: آخر رد + replies_lowercase: + zero: رد + one: رد + two: ردود + few: ردود + many: ردود + other: ردود summary: enabled_description: "أنت تنظر الى ملخص لهذا الموضوع , مشاركات مثيرة للإهتمام بحسب رأي المجتمع" description: "هناك {{count}} ردود" @@ -755,6 +829,7 @@ ar: title_too_long: "العنوان يجب أن لا يكون أكثر من {{max}} حرف" post_missing: "لا يمكن للمشاركة أن تكون خالية" post_length: "التعليق يجب أن يكون أكثر {{min}} حرف" + try_like: 'هل تجرب زر ؟' category_missing: "يجب عليك اختيارفئة" save_edit: "حفظ التحرير" reply_original: "التعليق على الموضوع الاصلي" @@ -762,11 +837,13 @@ ar: reply: "الرد" cancel: "إلغاء" create_topic: "إنشاء موضوع" + create_pm: "رسالة" title: "او اضغط على Ctrl+Enter" users_placeholder: "اضافة مستخدم" title_placeholder: "ما هو الموضوع المراد مناقشته في جملة واحدة ؟" edit_reason_placeholder: "لمذا تريد التعديل ؟" show_edit_reason: "(اضف سبب التعديل)" + reply_placeholder: "اكتب هنا . استعمل Markdown او BBCode أو HTML للتنسيق . قم بسحب الصورة أو لصقها لرفعها." view_new_post: "الاطلاع على أحدث مشاركاتك" saving: "يتم الحفظ..." saved: "تم الحفظ" @@ -810,9 +887,11 @@ ar: units: "(# of hours)" examples: 'أدخل الساعة (24)' notifications: + title: "الإشعار عندما يتم ذكر @name , أو الردود على مواضيعك أو مشاركاتك أو الرسالة الخاصة ...إلخ" none: "لا يمكن عرض الإشعارات في الوقت الحالي." more: "إظهار إشعارات قديمة" total_flagged: "مجموع المشاركات المعلّم عليها" + mentioned: "

    {{username}} {{description}}

    " quoted: "

    {{username}}" replied: "

    {{username}} {{description}}

    " posted: "

    {{username}} {{description}}

    " @@ -820,10 +899,18 @@ ar: liked: "

    {{username}} {{description}}

    " private_message: "

    {{username}} {{description}}

    " invited_to_private_message: "

    {{username}} {{description}}

    " + invited_to_topic: "

    {{username}} {{description}}

    " invitee_accepted: "

    {{username}} accepted your invitation

    " moved_post: "

    {{username}} نقل{{description}}

    " linked: "

    {{username}} {{description}}

    " granted_badge: "

    استحق'{{description}}'

    " + popup: + mentioned: '{{username}} أشار لك في "{{topic}}" - {{site_title}}' + quoted: '{{username}} نقل لك في "{{topic}}" - {{site_title}}' + replied: '{{username}} رد لك في "{{topic}}" - {{site_title}}' + posted: '{{username}} شارك في "{{topic}}" - {{site_title}}' + private_message: '{{username}} أرسل لك رسالة خاصة في "{{topic}}" - {{site_title}}' + linked: '{{username}} رتبط بمشاركتك من "{{topic}}" - {{site_title}}' upload_selector: title: "اضف صورة" title_with_attachments: "اضف صورة او ملف" @@ -831,9 +918,12 @@ ar: from_the_web: "عن طريق الويب" remote_tip: "رابط لصورة" remote_tip_with_attachments: "رابط لصورة أو ملف ({{authorized_extensions}})" + local_tip: "اضغط لاختيار 10 صور من جهازك" + local_tip_with_attachments: "اضغط لاختيار 10 صور أو ملفات من جهازك ({{authorized_extensions}})" hint: "(تستطيع أيضا أن تسحب و تفلت ملف أو صورة في المحرر لرفعه)" hint_for_supported_browsers: "(تستطيع أيضا أن تسحب وتفلت صورة أو تلصقها في المحرر لرفعها)" uploading: "يتم الرفع" + select_file: "تحديد ملف" image_link: "رابط ستشير له الصورة" search: title: "البحث في المواضيع أو الردود أو الأعضاء أو التصنيفات" @@ -980,6 +1070,7 @@ ar: go_top: "أعلى" go_bottom: "أسفل" go: "اذهب" + jump_bottom: "الذهاب لأخر مشاركة" jump_bottom_with_number: "الذهاب إلى الرد %{post_number}" total: مجموع المشاركات current: المشاركة الحالية @@ -995,21 +1086,29 @@ ar: '2_4': 'سيصلك إشعارات لأنك أضفت مشاركة لهذا الموضوع.' '2_2': 'سيصلك إشعارات لأنك اخترت متابعة الموضوع' '2': 'سيصلك اشعار بسبب انك قراءة هذا الموضوع.' + '1_2': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك' + '1': '.سيتم إشعارك إذا ذكر أحد ما @name أو رد على مشاركاتك' '0_7': 'لن يصلك أي إشعار يخص هذا التصنيف بناء على طلبك.' '0_2': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.' '0': 'لن يصلك أي إشعار يخص هذا الموضوع بناء على طلبك.' watching_pm: title: "تحت المتابعة" + description: "سيتم إشعارك بأية رد على هذه الرسالة، وبعدد الردود الجديدة التي ستظهر ." watching: title: "تحت المتابعة" + description: "سيتم إشعارك بأية رد على هذا الموضوع، وبعدد الردود الجديدة التي ستظهر." tracking_pm: title: "متتبعة" + description: "سيتم عرض عدد الردود الجديدة لهذه الرسالة. سيتم إعلامك إذا ذكر أحد اسمك@ أو ردود لك." tracking: title: "تحت المتابعة" + description: "سيتم عرض عدد الردود جديدة لهذا الموضوع. سيتم إعلامك إذا ذكر أحد name@ أو ردود لك." regular: title: "منتظم" + description: ".سيتم إشعارك إذا ذكر أحد ما @اسمك أو رد لك" regular_pm: title: "منتظم" + description: "سيتم تنبيهك إذا قام احدٌ بالاشارة إلى حسابك @name أو الرد عليك." muted_pm: title: "كتم" description: "لن يتم إشعارك بأي جديد يخص هذه الرسالة الخاصة." @@ -1051,21 +1150,61 @@ ar: success_message: 'تم الإبلاغ عن الموضوع' feature_topic: title: "ترشيح هذا الموضوع" + pin: "اجعل هذا الموضوع يظهر في أعلى هذه الفئة {{categoryLink}}." + confirm_pin: "لديك مسبقاً {{count}} مواضيع معلقة. قد تكون كثرة المواضيع المعلقة عبئاً على لمستخدمين الجدد والزوار. هل أنت متأكد أنك تريد تعليق موضوع آخر في هذه الفئة؟" + unpin: "ازالة هذا الموضوع من أعلى هذه الفئة {{categoryLink}}." + pin_note: "المستخدمون يستطعون إزالة تثبيت الموضوع بشكل خاص بهم." + already_pinned: + zero: "ﻻيوجد مواضيع مثبتة في {{categoryLink}}." + one: "المواضيع المثيتة حالياً في {{categoryLink}} : \n1." + other: "المواضيع المثبتة حالياً في {{categoryLink}} : \n{{count}}." + pin_globally: "جعل الموضوع يظهر في أعلى قائمة المواضيع, حتى يزيل تثبيته أحد الأعضاء العاملين." + confirm_pin_globally: "لديك بالفعل {{count}} الموضوعات معقود على الصعيد العالمي. قد تكون عدة مواضيع معلقة عبئا للمستخدمين الجدد والمجهولين. هل أنت متأكد أنك تريد يعلقون موضوع آخر على الصعيد العالمي؟" + unpin_globally: "إزالة هذا الموضوع من أعلى لجميع القوائم الموضوع." + global_pin_note: "يمكن للمستخدمين بفصل موضوع على حدة لأنفسهم. " + already_pinned_globally: + zero: "لا توجد مواضيع معقود على الصعيد العالمي." + one: "موضوعات معلقة حاليا على الصعيد العالمي: 1." + other: "موضوعات معلقة حاليا على الصعيد العالمي: {{count}}." + make_banner: "أجعل هذا الموضوع يظهر في الإشعار في أعلى كل الصفحة." + remove_banner: "إزالة الإشعار الذي يظهر في اعلى الصفحات" + banner_note: "المستخدمون يستطعون إبعاد الشعار بأغلاقه. موضوع واحد فقط يبقى كشعار لأي وقت معطى." + already_banner: + zero: "لا يوجد إشعار للموضوع" + one: "هناك شعار موضوع حاليا" inviting: "دعوة..." automatically_add_to_groups_optional: "هذه الدعوة تتضمن صلاحيات الدخول على المجموعات : (اختياري , مدير فقط )" automatically_add_to_groups_required: "هذه الدعوة تتضمن صلاحيات الدخول على هذه المجموعات: (يتطلب , مدير" invite_private: + title: 'رسالة دعوة' email_or_username: "دعوات عن طريق اسم المستخدم او البريد الالكتروني" email_or_username_placeholder: "البريد الإلكتروني أو إسم المستخدم" action: "دعوة" + success: "لقد دعونا ذلك المستخدم للمشاركة في هذه الرسالة." error: "للأسف, حدثت مشكلة في دعوة المستخدم" group_name: "اسم المجموعة" invite_reply: title: 'دعوة' + username_placeholder: "اسم المستخدم" + action: 'ارسال دعوة' + help: 'دعوة المستخدمين لهذا الموضوع عن طرق البريد الإلكتروني أو الأشعارات' to_forum: "سيتم ارسال رسالة بريد الكتروني ﻷصدقائك للمشاركة في هذا الموضوع , لابتطلب تسجيل الدخول" + sso_enabled: "أدخل أسم الشخص الذي ترغب بدعوته لهذا الموضوع" + to_topic_blank: "أدخل أسم الشخص أو عنوان بريده الإلكتروني لدعوته لهذا الموضوع" + to_topic_email: "لقد ادخلت عنوان البريد إلإلكتروني. سنقوم بإرسال دعوة تسمح لصديقك بالرد حالاً على هذا الموضوع." + to_topic_username: "لقد ادخلت اسم المستحدم. سنقوم بإرسال إشعار يحتوي على رابط دعوة إلى الموضوع." + to_username: "ضع اسم المستخدم للشخص الذي تريد دعوته. سنقوم بإرسال إشعار يحتوي على رابط دعوة إلى الموضوع." email_placeholder: 'name@example.com' + success_username: "دعونا عضو للمشاركة في هذا الموضوع." login_reply: 'سجل دخولك لرد' filters: + n_posts: + zero: "لا يوجد مشاركات." + one: "مشاركة واحدة." + two: "مشاركتان." + few: "مشاركات قليلة." + many: "مشاركات كثيرة." + other: "{{count}} مشاركات." cancel: "حذف التخصيص" split_topic: title: "موضوع جديد" @@ -1091,9 +1230,18 @@ ar: cancel: الغاء التحديد select_all: تحديد الكل deselect_all: حذف الكل + description: + zero: لم يتم اختيار أي مشاركة. + one: اخترت مشاركة واحدة. + two: اخترت مشاركتين. + few: اخترت {{count}} مشاراكات. + many: اخترت {{count}} مشاراكات. + other: اخترت {{count}} مشاركة. post: + reply: "الرد على {{link}} {{replyAvatar}} {{username}} ." reply_topic: "الرد على {{link}}" quote_reply: "الاقتباس" + edit: "تعديل {{link}} {{replyAvatar}} {{username}} ." edit_reason: "سبب:" post_number: "مشاركات {{number}}" last_edited_on: "آخر تعديل للمشاركة في " @@ -1103,8 +1251,22 @@ ar: show_full: "عرض كامل المشاركة" show_hidden: 'عرض المحتوى المخفي.' expand_collapse: "عرض/إخفاء" + gap: + zero: "لا يوجد ردود مخفية." + one: "مشاهدة رد مخفي." + two: "مشاهدة ردين مخفيين." + few: "مشاهدة {{count}} ردود مخفية." + many: "مشاهدة {{count}} رد مخفي." + other: "مشاهدة {{count}} رد مخفي." more_links: "{{count}} أكثر .." unread: "المشاركة غير مقروءة" + has_replies: + zero: "لا يوجد رد" + one: "رد" + two: "ردان" + few: "ردود قليلة" + many: "ردود كثيرة" + other: "ردود" errors: create: "المعذرة، حدثت مشكلة أثناء إنشاء المشاركة. الرجاء المحاولة مرة أخرى." edit: "المعذرة، حدث خطأ أثناء تحرير مشاركتك. الرجاء المحاولة في وقت لاحق." @@ -1139,6 +1301,13 @@ ar: share: "مشاركة رابط في هذه المشاركة" more: "المزيد" delete_replies: + confirm: + zero: "ﻻ يوجد ردود لحذفها." + one: "هل تريد أيضاً حذف الرد المباشر لهذا الموضوع؟" + two: "هل تريد أيضاً حذف الردين المباشرين لهذا الموضوع؟" + few: "هل تريد أيضاً حذف {{count}} ردود مباشرة لهذه المشاركة؟" + many: "هل تريد أيضاً حذف {{count}} رداً مباشراً لهذه المشاركة؟" + other: "هل تريد أيضاً حذف {{count}} رداً مباشراً لهذه المشاركة؟" yes_value: "نعم، احذف هذه الردود أيضاً" no_value: "لا ، المشاركة فقط" admin: "عمليات المدير" @@ -1168,9 +1337,11 @@ ar: people: off_topic: "{{icons}} بلغ أن هذا لاعلاقة له بالموضوع" spam: "{{icons}} بلغ انه هذا هو سبام" + spam_with_url: "{{icons}} بُلغ انه غير مرغوب به" inappropriate: "{{icons}} بلغ أنه غير لائق" notify_moderators: "{{icons}} تنبيه المشرف" notify_moderators_with_url: "{{icons}} نبه المشرف" + notify_user: "{{icons}} رسالة مُرسلة." bookmark: "{{icons}} اضف في المفضلة" like: "{{icons}} استحسان" vote: "{{icons}} صوت لهذا" @@ -1179,13 +1350,59 @@ ar: spam: "تم الإبلاغ عن الموضوع على أنه سبام" inappropriate: "تم الإبلاغ عن الموضوع على أنه غير لائق" notify_moderators: "تم الإبلاغ عن الموضوع ليشاهده المشرف" + notify_user: "لقد قمت بأرسال رسالة لهذا المستخدم" bookmark: "قمت بتفضيل هذه المشاركة" like: "قمت بإستحسان هذا" vote: "قمت بالتصويت لهذه المشاركة" + by_you_and_others: + off_topic: + zero: "أنت بلّغت بأن هذا خارج عن الموضوع." + one: "أنت وآخر بلّغتما بأن هذا خارج عن الموضوع." + two: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + few: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + many: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + other: "أنت و {{count}} آخرون بلّغتم بأن هذا خارج عن الموضوع." + spam: + zero: "أنت أبلّغت بأن هذا غير مرغوب فيه." + one: "أنت وآخر أبلّغتما بأن هذا غير مرغوب فيه." + two: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + few: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + many: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + other: "أنت و {{count}} آخرون أبلّغتم بأن هذا غير مرغوب فيه." + vote: + zero: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + one: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + two: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + few: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + many: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + other: "أنت و {{count}} أشخاص أخرين صوتو لهذا الموضوع" + by_others: + bookmark: + zero: "لم يفضل أحد هذه المشاركة." + one: " شخص واحد فضل هذه المشاركة." + two: " شخصان فضلا هذه المشاركة." + few: "أشخاص قليلون فضلوا هذه المشاركة." + many: "أشخاص كثيرون فضلوا هذه المشاركة." + other: "{{count}} أشخاص فضلوا هذه المشاركة." + like: + zero: "شخص واحد اعجب بهذا" + one: "{{count}} أشخاص أعجبو بهذا" + two: "{{count}} أشخاص أعجبو بهذا" + few: "{{count}} أشخاص أعجبو بهذا" + many: "{{count}} أشخاص أعجبو بهذا" + other: "{{count}} أشخاص أعجبو بهذا" edits: one: 1 تعديل other: "{{count}} تعديل" zero: لايوجد تعديل + delete: + confirm: + zero: "هل أنت متأكد أنك لا تريد حذف تلك المشاركة؟" + one: "هل أنت متأكد أنك تريد حذف تلك المشاركة؟" + two: "هل أنت متأكد أنك تريد حذف تلك المشاركتين؟" + few: "هل أنت متأكد أنك تريد حذف تلك المشاركات القليلة؟" + many: "هل أنت متأكد أنك تريد حذف تلك المشاركات الكثيرة؟" + other: "هل أنت متأكد أنك تريد حذف كل تلك المشاركات؟" revisions: controls: first: "التعديل الاول" @@ -1217,6 +1434,7 @@ ar: create: 'قسم جديد' save: 'حفظ القسم' slug: 'عنوان التصنيف/Slug' + slug_placeholder: '(اختياري) خط تحت عنوان الموقع' creation_error: حدثت مشكلة اثناء انشاء القسم save_error: حدث خطأ أثناء حفظ التصنيف name: "اسم التصنيف" @@ -1267,6 +1485,7 @@ ar: private_reminder: 'التبليغات ذات خصوصية، تظهر فقط للمشرفين' action: 'التبليغ عن مشاركة' take_action: "أجراء العمليه " + notify_action: 'رسالة' delete_spammer: "حذف مرسلي البريد المزعج" delete_confirm: "أنت على وشك حذف %{posts} المشاركات و%{topics} المواضيع من هذا المستخدم , حذف حساباتهم منهم من التسجيل وحجب الاي بي %{ip_address}, واضافة بريدهم الالكتروني %{email} لقائمة المحجوبين . هل أنت متأكد أن هذا المستخدم سبام ?" yes_delete_spammer: "نعم , حذف مرسلي البريد المزعج" @@ -1288,9 +1507,18 @@ ar: flagging_topic: title: "شكرا لمساعدتنا في ابقاء مجتمعنا نضيفا" action: "التبليغ عن الموضوع" + notify_action: "رسالة" topic_map: title: "ملخص الموضوع" + participants_title: "مشاركين مكررين" links_shown: "اظهار {{totalLinks}} روابط..." + clicks: + zero: "%{count} نقرة" + one: "%{count} نقرة" + two: "%{count} نقرتان" + few: "%{count} نقرات" + many: "%{count} نقرات" + other: "%{count} نقرات" topic_statuses: warning: help: "هذا تحذير رسمي" @@ -1316,12 +1544,33 @@ ar: posts_long: "هناك {{number}} مشاركات في هذا الموضوع" original_post: "المشاركة الاصلية" views: "مشاهدات" + views_lowercase: + zero: "مشاهده" + one: "مشاهد" + two: "مشاهد" + few: "مشاهدات" + many: "مشاهدات" + other: "مشاهدات" replies: "ردود " views_long: "هذا الموضوع قد تمت مشاهدته {{number}} مرات" activity: "النشاط" likes: "اعجابات" + likes_lowercase: + zero: "أعجاب" + one: "أعجاب" + two: "اﻹعجابات" + few: "اﻹعجابات" + many: "اﻹعجابات" + other: "اﻹعجابات" likes_long: "هناك {{number}} اعجابات في هذا الموضوع" users: "مستخدمين" + users_lowercase: + zero: "مستخدم" + one: "مستخدم" + two: "مستخدم" + few: "مستخدمون" + many: "مستخدمون" + other: "مستخدمون" category_title: "قسم" history: "تاريخ" changed_by: "الكاتب {{author}}" @@ -1333,7 +1582,10 @@ ar: with_topics: "%{filter} مواضيع" with_category: "%{filter} %{category} مواضيع" latest: - title: "آخر" + title: + zero: "الأخير" + one: "الآخر (1)" + other: "الآخر ({{count}})" help: "مواضيع بآخر المشاركات" hot: title: "ساخن" @@ -1341,6 +1593,9 @@ ar: read: title: "قراءة" help: "مواضيع قمت بقراءتها بترتيب آخر قراءة" + search: + title: "بحث" + help: "بحث في كل المواضيع" categories: title: "اقسام" title_in: "قسم - {{categoryName}}" @@ -1379,10 +1634,19 @@ ar: top: title: "أعلى" help: "أكثر المواضيع نشاطا خلال سنة, شهر, اسبوع او يوم" - this_year: "هذه السنة" - this_month: "هذا الشهر" - this_week: "هذا الاسبوع" + all: + title: "كل الأوقات" + yearly: + title: "سنوي" + monthly: + title: "شهري" + weekly: + title: "اسبوعي" + daily: + title: "يومي" + all_time: "جميع الأوقات" today: "اليوم" + other_periods: "مشاهدة الأفضل" browser_update: 'للأسف, متصفحك قديم لكي يفتح هذه الصفحة. Please قم بتحديث متصفحك.' permission_types: full: "انشاء / رد / مشاهدة" @@ -1409,8 +1673,16 @@ ar: admins: 'مدراء:' blocked: 'محظور:' suspended: 'موقوف:' + private_messages_short: "الرسائل" + private_messages_title: "الرسائل" + space_free: "{{size}} إضافي" uploads: "عمليات الرفع" backups: "النسخ الاحتياطية" + traffic_short: "المرور" + traffic: "طلبات تطبيقات الويب" + page_views: "طلبات API " + page_views_short: "طلبات API " + show_traffic_report: "عرض تقرير مرور مفصل" reports: today: "اليوم" yesterday: "امس" @@ -1420,15 +1692,28 @@ ar: 7_days_ago: "منذ ٧ ايام" 30_days_ago: "منذ ٣٠ يوم" all: "الكل" + view_table: "جدول" + view_chart: "شريط الرسم البياني" + refresh_report: "تحديث التقرير " + start_date: "تاريخ البدء" + end_date: "تاريخ الإنتهاء" commits: latest_changes: "آخر تغيير: يرجى التحديث" by: "بواسطة" flags: + title: "التبليغات" old: "قديم" active: "نشط" + agree: "أوافق" + agree_title: "أكد هذا البلاغ لكونه صحيح وصالح" + agree_flag_modal_title: "أوافق مع ..." + agree_flag_hide_post: "اوافق (اخفاء المشاركة + ارسال ر.خ)" + agree_flag_restore_post_title: "استعد هذه المشاركة." + defer_flag: "تأجيل" defer_flag_title: "إزالة البلاغ، لا يتطلب منك إجراء في الوقت الحالي." delete: "حذف" delete_title: "حذف المشاركة المرتبطة بهذا البلاغ" + delete_post_defer_flag: "حذف المشاركة مع تأجيل البلاغ" delete_post_defer_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع" delete_post_agree_flag: "حذف المشاركة مع الموافقة على البلاغ" delete_post_agree_flag_title: "حذف المشاركة. اذا كانت المشاركة الاولى, احذف الموضوع" @@ -1448,8 +1733,10 @@ ar: deferred: "مؤجل" flagged_by: "مُبلّغ عنه بواسطة" resolved_by: "تم حلّه بواسطة" + took_action: "اجريت العمليات" system: "النظام" error: "حدث خطأ ما" + reply_message: "الرد" no_results: "لا يوجد بلاغات." visit_topic: "زيارة الموضوع لاتخاذ قرار" was_edited: "تم تعديل المشاركة بعد أول بلاغ" @@ -1471,6 +1758,8 @@ ar: name: "الاسم" add: "اضافة" add_members: "اضافة عضو" + custom: "مخصص" + automatic: "تلقائي" automatic_membership_email_domains: "المستخدمين الذين يمتلكون بريد الالكتروني عنوانه مطابق للعنوان الذي في القائمة سيتم تلقائيا اضافتهم للمجموعة." automatic_membership_retroactive: "اضافة الاعضاء الذين يمتكلون عنوان ايميل مطابق للعنوان الموجود في القائمة." api: @@ -1513,6 +1802,7 @@ ar: filename: "اسم الملف" size: "حجم" upload: + label: "رفع" uploading: "يتم الرفع..." success: "'{{filename}}' تم رفعه بنجاح." error: "هناك مشكلة في رفع '{{filename}}': {{message}}" @@ -1520,22 +1810,27 @@ ar: is_running: "هناك عملية مازالت تعمل ..." failed: "الـ {{operation}} فشلت. الرجاء التحقق من logs." cancel: + label: "إلغاء" title: "الغاء العملية الحالية" confirm: "هل أنت متأكد من رغبتك في الغاء العملية الحالية ؟" backup: + label: "نسخة احتياطية" title: "انشاء نسخة احتياطية" confirm: "هل تريد انشاء نسخة احتياطية جديدة ؟" without_uploads: "نعم (لا تضمن الملفات)" download: + label: "تحميل" title: "تحميل النسخة الاحتياطية" destroy: title: "حذف النسخة الاحتياطية" confirm: "هل أنت متأكد من رغبتك في حذف النسخة الاحتياطية؟" restore: is_disabled: "Restore is disabled in the site settings." + label: "استعادة" title: "اعادة تخزين النسخة الاحتياطية" confirm: "هل أنت متأكد من رغبتك في اعادة تخزين النسخة الاحتياطية؟" rollback: + label: "اعادة السنخة السابقة" title: "Rollback the database to previous working state" confirm: "Are your sure you want to rollback the database to the previous working state?" export_csv: @@ -1549,6 +1844,8 @@ ar: screened_email: "Export full screened email list in CSV format." screened_ip: "Export full screened IP list in CSV format." screened_url: "Export full screened URL list in CSV format." + export_json: + button_text: "تصدير" invite: button_text: "ارسال دعوات" button_title: "ارسال دعوات" @@ -1558,7 +1855,7 @@ ar: css: "CSS" header: "Header" top: "Top" - footer: "Footer" + footer: "تذييل " head_tag: text: "" title: "HTML that will be inserted before the tag" @@ -1566,16 +1863,17 @@ ar: text: "" title: "HTML that will be inserted before the tag" override_default: "Do not include standard style sheet" - enabled: "تفعيل؟" + enabled: "مفعل؟" preview: "معاينة" undo_preview: "ازالة المعاينة" rescue_preview: "الشكل الافتراضي" - explain_preview: "مشاهدة الموقع مع الثيم الجديد" - explain_undo_preview: "الرجوع الى الثيم السابق" - explain_rescue_preview: "مشاهدة الموقع مع الثيم الافتراضي" + explain_preview: "مشاهدة الموقع بهذا الشكل المخصص" + explain_undo_preview: "الرجوع الى الشكل السابق" + explain_rescue_preview: "مشاهدة الموقع بالشكل الافتراضي" save: "حفظ" new: "جديد" new_style: "ثيم جديد" + import: "استيراد" delete: "حذف" delete_confirm: "حذف هذا التخصيص؟" about: "Modify CSS stylesheets and HTML headers on the site. Add a customization to start." @@ -1603,7 +1901,7 @@ ar: name: 'ثانوي' description: 'اللون الاساسي للخلفية, والنص للايقونة' tertiary: - name: 'tertiary' + name: 'ثلاثي' description: 'الروابط، الأزرار، الإشعارات و أشياء أخرى.' quaternary: name: "رباعي" @@ -1652,10 +1950,17 @@ ar: html: "html" text: "نص" last_seen_user: "آخر مستخدم تواجد:" + skipped_reason: "تجاوز السبب" logs: filters: + title: "المنقي" user_placeholder: "اسم المستخدم" + address_placeholder: "name@example.com" + skipped_reason_placeholder: "السبب" logs: + created_at: "مكتوبة" + ip_address: "IP" + post_id: "رقم المشاركة" delete: 'حذف' edit: 'تعديل' save: 'حفظ' @@ -1664,7 +1969,10 @@ ar: do_nothing: "لا تفعل شيء" staff_actions: title: "عمليات المشرفين" - clear_filters: "إظهار الكل" + instructions: "إضغط على أسماء الإعضاء والإجراءات لتصفيه القائمة . إضغط على صورة العرض للإنتقال لصفحة العضو" + clear_filters: "إظهار كل شيء" + staff_user: "عضو إداري" + target_user: "عضو مستهدف" subject: "الموضوع" when: "متى" context: "السياق" @@ -1685,9 +1993,11 @@ ar: delete_site_customization: "حذف هذا التخصيص؟" suspend_user: "حظر المستخدم" unsuspend_user: "رفع الحظر " + revoke_badge: "حذف الشعار" check_email: "التحقق من البريد" delete_topic: "حذف الموضوع" delete_post: "حذف المشاركة" + impersonate: "إنتحال" anonymize_user: "مستخدم مجهول" screened_emails: description: "عندما تتم محاول انشاء حساب جديد, سيتم التحقق من قائمة البريد الالكتروني وسيتم حظر التسجيل لهذا البريد واتخاذ اي اجراء متبع" @@ -1695,6 +2005,7 @@ ar: actions: allow: "سماح" screened_urls: + title: "عناوين مواقع محجوبة" description: "الروابط الالكترونية الموجودة هنا تم استخدامها في مشاركات من قيل مستخدمين سبام " url: "رابط" domain: "عنوان" @@ -1713,18 +2024,28 @@ ar: create: 'اضافة مدير' last_emailed: "آخر بريد الكتروني" not_found: "نعتذر، لا يوجد اسم المستخدم هذا في نظامنا." + id_not_found: "خطاء !! , إسم المستخدم غير موجود" active: "نشط" + show_emails: "عرض الرسائل" nav: new: "جديد" active: "نشط" + pending: "قيد الانتظار" + staff: 'الإدارة' + suspended: 'موقوف' + blocked: 'محظور' titles: active: 'مستخدمين نشطين' new: 'مستخدمين جدد ' admins: 'مستخدمين مدراء' moderators: 'مراقبين' blocked: 'مستخدمين محظورين:' + check_email: + text: "إظهار" user: + suspended_by: "محظور من قبل" delete_all_posts: "حذف جميع المشاركات" + delete_all_posts_confirm: "هل أنت متأكد من أنك تريد حذف %{posts} مشاركات و %{topics} مواضيع ؟" moderator: "مراقب؟" admin: "مدير؟" blocked: "محظور؟" @@ -1732,17 +2053,31 @@ ar: edit_title: "تعديل العنوان" save_title: "حفظ العنوان" refresh_browsers: "تحديث المتصفحات اجبارياً" + log_out: "تسجيل الخروج" unblock: 'إلغاء حظر' block: 'حظر' 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: "وقت القراءة" delete: "حذف المستخدم" + delete_forbidden_because_staff: "لا يمكن حذف مدراء والمشرفين." + delete_posts_forbidden_because_staff: "لا يمكن حذف جميع المشاركات للمدراء والمشرفين. " + delete_and_block: "حذف و حظر this email and IP address" + delete_dont_block: "حذفه فقط" deleted: "تم حذف المستخدم." delete_failed: "حدث خطأ عند حذف المستخدم. يجب التاكد من انك حذفت جميع مشاركات المستخدم قبل محاولة حذف المستخدم." send_activation_email: "ارسل رسالة تفعيل" @@ -1758,7 +2093,17 @@ ar: suspended_explanation: "المستخدم الموقوف لايملك صلاحية تسجيل الدخول" block_explanation: "المستخدم الموقوف لايستطيع أن يشارك" trust_level_change_failed: "هناك مشكلة في تغيير مستوى ثقة المستخدم " + suspend_modal_title: "حظر المستخدم" + trust_level_unlocked_tip: "مستوى الثقة غير مؤمن، والنظام قد ترقية أو تخفيض المستعمل " + lock_trust_level: "قفل مستوى الثقة" + unlock_trust_level: "فتح مستوى الثقة " tl3_requirements: + table_title: "في آخر 100 يوم" + visits: "الزيارات" + days: "أيام" + topics_replied_to: "مواضيع للردود" + topics_viewed: "المواضيع شوهدت" + posts_read: "المنشورات المقروءة" posts_read_all_time: "المشاركات المقروءة (جميع الاوقات)" flagged_posts: "المشاركات المبلغ عنها " flagged_by_users: "المستخدمين الذين بلغوا" @@ -1773,23 +2118,225 @@ ar: locked_will_not_be_promoted: "مستوى الثفة هذا لن يتم الترقية له نهائيا" locked_will_not_be_demoted: "مستوى الثفة هذا لن يتم الخفض له نهائيا" sso: - external_username: "اسم المستخدم" - external_name: "الاسم" + external_id: "ID الخارجي" + external_username: "أسم المستخدم" + external_name: "الأسم" external_email: "البريد الإلكتروني" external_avatar_url: "رابط الملف الشخصي" + user_fields: + title: "حقول المستخدم" + name: "اسم الحقل" + type: "نوع الحقل " + description: "حقل الوصف" + save: "حفظ" + edit: "تعديل" + delete: "حذف" + cancel: "إلغاء" + delete_confirm: "هل انت متأكد من انك تريد حذف هذا الحقل ؟" + required: + title: "المطلوب للأشتراك ؟" + enabled: "مطلوب" site_settings: + title: 'اعدادات' + reset: 'إعادة تعيين' none: 'لا شيء' + clear_filter: "مسح" + add_url: "أضافة رابط" + add_host: "أضافة نطاق" + categories: + all_results: 'كل' + required: 'مطلوب' + users: 'مستخدمون' + email: 'البريد الإلكتروني' + files: 'ملفات' + trust: 'المستويات الموثوقة' + security: 'أمن' + spam: 'سخام' + uncategorized: 'أخرى' + backups: "النسخ الإحتياطية" + login: "تسجيل الدخول" + plugins: "الإضافات " badges: + title: 'شعارات ' + new_badge: شعار جديد + new: 'جديد ' + name: 'إسم ' + badge: 'شعار ' + display_name: إسم العرض + description: الوصف + badge_type: نوع الشعار + badge_grouping: المجموعة + badge_groupings: + modal_title: 'تجميع الشعارات ' + granted_by: 'ممنوح بواسطة ' + granted_at: ممنوح في + reason_help: ( رابط إلى مشاركة أو موضوع ) save: حفظ delete: حذف + delete_confirm: هل أنت متأكد من أنك تريد حذف هذا الشعار ؟ + revoke: تعطيل reason: السبب + edit_badges: 'تعديل الشعارات ' + granted_badges: شارات ممنوحة. + no_user_badges: "%{name} لم يمنح أي شارة." + no_badges: لا يوجد أي شارة يمكن منحها. + multiple_grant: 'يمكن منحه عدة مرات. ' + enabled: تفعيل الشعار + icon: أيقونة + image: صورة + icon_help: "إستخدم فئة الخط او رابط الى صورة" + target_posts: إستعلام يستهدف المشاركات + auto_revoke: إلغاء الاستعلام اليومي + preview: + link_text: "معاينة الشارات الممنوحة." + bad_count_warning: + header: "تحذير !!" + emoji: + title: "الوجه التعبيري" + help: "أضف رموز تعبيرية جديدة التي سوف تكون متاحة للكل . (PROTIP: drag & drop multiple files at once)" + add: "أضافة وجه تعبيري جديد ؟" + name: "الأسم" + image: "صورة" + delete_confirm: "هل أنت متأكد من انك تريد حذف هذا :%{name}: الوجه التعبيري ؟" + lightbox: + download: "تحميل" + search_help: + title: 'بحث عن المساعدة' + keyboard_shortcuts_help: + title: 'أختصارات لوحة المفاتيح' + jump_to: + title: 'اقفز إلى' + home: 'g, h الرئيسية' + latest: 'g, l الأخير' + new: 'g, n جديد' + unread: 'g, u لم يقرأ' + categories: 'g, c الفئات' + top: 'g, t الأعلى' + bookmarks: 'g, b الإشارات المرجعية' + navigation: + back: 'uخلف' + application: + title: 'التطبيقات' + create: 'c انشاء موضوع جديد' + notifications: 'n فتح الإشعارات' + site_map_menu: '= أفتح قائمة الموقع' + user_profile_menu: 'pأفتح قائمة المستخدم' + show_incoming_updated_topics: '. عرض المواضيع المحدثة' + search: '/ البحث' + help: 'pأفتح قائمة المستخدم' + dismiss_topics: 'x, t رفض المواضيع' + actions: + bookmark_topic: 'f تبديل علامة مرجعية الموضوع' + share_post: 's مشاركة الموضوع' + reply_post: 'r الرد على الموضوع' + like: 'l الأعجاب بالموضوع' + bookmark: 'b الإشارات المرجعية الخاصة بالموضوع' + edit: 'l تعديل الموضوع' + delete: 'd حذف الموضوع' badges: + title: شارات + allow_title: "يمكن استخدامه كعنوان" + multiple_grant: "يمكن منحه عدة مرات. " + badge_count: + zero: "%{count} شاره" + one: "%{count} شاره" + two: "%{count} شاراتين" + few: "%{count} شارات" + many: "%{count} شارات" + other: "%{count} شارات" + more_badges: + zero: "+%{count} المزيد" + one: "+%{count} المزيد" + two: "+%{count} المزيد" + few: "+%{count} المزيد" + many: "+%{count} المزيد" + other: "+%{count} المزيد" + granted: + zero: "ﻻيوجد ممنوحات." + one: "ممنوح واحد." + two: "ممنوحان." + few: "%{count} ممنوحات." + many: "%{count} ممنوحات." + other: "%{count} ممنوحات." + select_badge_for_title: حدد شعار لإستخدامه كعنوان + none: "لا شئ" + badge_grouping: + getting_started: + name: البداية + community: + name: مجتمع + trust_level: + name: مستوى الثقة + other: + name: الجميع + posting: + name: نشر badge: + editor: + name: محرر + description: أول موضوع تم تحريره + basic_user: + name: أساسي + member: + name: عضو + description: مُنح دعوات + regular: + name: منتظم + description: منح اعادة تصنيف, اعادة تسمية, اتباع الروابط + leader: + name: قائد + description: منح تحرير عام, تثبيت, اغلاق, ارشفة, تقسيم ودمج + welcome: + name: مرحباً + description: تلقيت إعجاب + autobiographer: + name: الكاتب سيرته بنفسه + description: تصفية عضو ملف التعريفمعلومات + anniversary: + name: ذكرى + description: عضو نشط لمدة عام، شارك مرة واحدة على الأقل + nice_post: + name: مشاركة رائعة + description: 'تلقيت 10 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة ' + good_post: + name: مشاركة جيدة + description: تلقيت 25 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة + great_post: + name: مشاركة ممتازة + description: تلقيت 50 إعجاب لهذه المشاركة . هذا الاشعار يتم إرسالة مرات عديدة + nice_topic: + name: 'موضوع رائع ' + description: تلقيت 10 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة + good_topic: + name: موضوع جيد + description: تلقيت 25 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة + great_topic: + name: موضوع ممتاز + description: 'تلقيت 50 إعجاب لهذا الموضوع . هذا الاشعار يتم إرسالة مرات عديدة ' + nice_share: + name: مشاركة رائعة + description: تم مشاركة رد مع أكثر من 25 زائر + good_share: + name: مشاركة جيدة + description: تم مشاركة رد مع أكثر من 300 زائر + great_share: + name: مشاركة ممتازة + description: تم مشاركة رد مع أكثر من 1000 زائر first_like: name: اول اعجاب + description: أعجب في رد first_flag: name: اول بلاغ description: مشاركة مبلغ عنها + promoter: + name: متعهد + description: دعوة مستخدم + campaigner: + name: ناشط + description: تم دعوة 3 أعضاء (مستوى الثقة 1) + champion: + name: بطل + description: تم دعوة 5 أعضاء (مستوى الثقة 2) first_share: name: اول مشاركة description: مشاركة تعليق @@ -1804,3 +2351,13 @@ ar: description: اطلع على توجيهات المجتمع reader: name: قارئ + description: قراءة أكثر من 100 تعليق في الموضوع + google_search: | +

    البحث في جوجل

    +

    +

    +

    diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 7b75d5a126..fa3bb099bc 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -8,14 +8,24 @@ bs_BA: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' units: + byte: + one: Bajt + few: Bajta + other: Bajta gb: GB kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -29,10 +39,60 @@ bs_BA: long_date_with_year_with_linebreak: "MMM D, 'YY
    LT" tiny: half_a_minute: "< 1m" + less_than_x_seconds: + one: "< 1 sekunda" + few: "< %{count} sekundi" + other: "< %{count} sekundi" + x_seconds: + one: "1 sekunda" + few: "%{count} sekundi" + other: "%{count} sekundi" + less_than_x_minutes: + one: "<1 minuta" + few: "%{count} minuta" + other: "%{count} minuta" date_month: "MMM D" date_year: "MMM 'YY" medium: + x_minutes: + one: "1 minuta" + few: "Par minuta" + other: "%{count} minuta" + x_hours: + one: "1 sahat" + few: "Par sahati" + other: "%{count} sahati" + x_days: + one: "1 dan" + few: "Par dana" + other: "%{count} dana" date_year: "MMM D, 'YY" + medium_with_ago: + x_minutes: + one: "Prije 1 minutu" + few: "Prije par minuta" + other: "%{count} minuta prije" + x_hours: + one: "Prije 1 sahat " + few: "Prije par sahati" + other: "%{count} sahati prije" + x_days: + one: "prije 1 dan " + few: "Prije par dana " + other: "%{count} dana prije" + later: + x_days: + one: "Prije 1 dan" + few: "Prije par dana" + other: "%{count} dana prije" + x_months: + one: "Prije 1 mjesec" + few: "Prije par mjeseci" + other: "%{count} mjeseci prije" + x_years: + one: "Prije 1 godinu" + few: "Prije par godina" + other: "%{count} godine/a prije" share: topic: 'podjeli link ka ovoj temi' post: 'podjeli link ka ovom postu #%{postNumber}' @@ -55,7 +115,12 @@ bs_BA: admin_title: "Admin" flags_title: "Opomene" show_more: "pokaži još" + show_help: "Pomoć" links: "Linkovi" + links_lowercase: + one: "Link" + few: "Link" + other: "Linkovi" faq: "Upoznavanje Foruma" guidelines: "Guidelines" privacy_policy: "Privacy Policy" @@ -73,7 +138,13 @@ bs_BA: daily: "dnevno" weekly: "nedeljno" every_two_weeks: "svake dvije nedelje" + every_three_days: "Svako 3 dana" max_of_count: "maksimalno {{count}}" + alternation: "ili" + character_count: + one: "{{count}} karakter" + few: "{{count}} karaktera" + other: "{{count}} karaktera" suggested_topics: title: "Savetujemo Teme" about: @@ -85,16 +156,39 @@ bs_BA: stat: all_time: "Svih Vremena" last_7_days: "Zadnjih 7 Dana" + last_30_days: "Zadnjih 30 dana" like_count: "Broj Lajkova" topic_count: "Broj Tema" post_count: "Broj Postova" user_count: "Broj Članova" + active_user_count: "Aktivnih korisnika" + contact: "Kontaktirajte nas" + contact_info: "U slučaju da forum ne radi, molimo kontaktirajte nas na %{contact_info}." + bookmarked: + title: "Bookmark" + clear_bookmarks: "Očisti bookmark" + help: + bookmark: "Klikni da bookmarkuješ prvi post u temi" + unbookmark: "Klikni da ukloniš sve bookmarke iz ove teme" bookmarks: not_logged_in: "sorry, you must be logged in to bookmark posts" created: "you've bookmarked this post" not_bookmarked: "you've read this post; click to bookmark it" last_read: "this is the last post you've read; click to bookmark it" remove: "Remove Bookmark" + confirm_clear: "Jeste li sigurni da želite očistiti sve bookmarke iz ove kategorije?" + topic_count_latest: + one: "{{count}} nova ili tema sa editovanim postom." + few: "{{count}} novih ili tema sa editovanim postovima." + other: "{{count}} novih ili tema sa editovanim postovima." + topic_count_unread: + one: "{{count}} nepročitana tema." + few: "{{count}} nepročitanih tema." + other: "{{count}} nepročitanih tema." + topic_count_new: + one: "{{count}} nova tema." + few: "{{count}} novih tema." + other: "{{count}} novih tema." click_to_show: "Klikni da pokažeš." preview: "pregledaj" cancel: "otkaži" @@ -109,13 +203,40 @@ bs_BA: undo: "Undo" revert: "Revert" failed: "Failed" + switch_to_anon: "Anonimni mod" + switch_from_anon: "Napustite anonimni mod" banner: close: "Dismiss this banner." + edit: "Uredite ovaj baner >>" choose_topic: none_found: "Nema pronađenih tema." title: search: "Search for a Topic by name, url or id:" placeholder: "type the topic title here" + queue: + topic: "Tema:" + approve: 'Odobri' + reject: 'Odbij' + delete_user: 'Izbriši korisnika' + title: "Potrebno odobrenje" + none: "Nema postova za pregled." + edit: "Uredi" + cancel: "Odustani" + view_pending: "Vidi postove na čekanju" + has_pending_posts: + one: "Ova tema ima 1 post koji čeka odobrenje" + few: "Ova tema ima {{count}} postova koji čekaju odobrenje" + other: "Ova tema ima {{count}} postova koji čekaju odobrenje" + confirm: "Sačuvaj promjene" + delete_prompt: "Jeste li sigurni da želite izbrisati %{username}? Ovo će izbrisati sve njihove postove i blokirati njihovu email i IP adresu." + approval: + title: "Post treba odobrenje" + description: "Primili smo Vaš novi post ali on treba biti odobren od strane moderatora prije nego bude javno dostupan. Molimo budite strpljivi." + pending_posts: + one: "Imate 1 post na čekanju." + few: "Imate {{count}} postova na čekanju." + other: "Imate {{count}} postova na čekanju." + ok: "OK" user_action: user_posted_topic: "{{user}} posted the topic" you_posted_topic: "You posted the topic" @@ -1004,7 +1125,6 @@ bs_BA: with_topics: "%{filter} teme" with_category: "%{filter} %{category} teme" latest: - title: "Najnovije" help: "teme sa nedavnim postovima" hot: title: "Popularne" @@ -1708,6 +1828,7 @@ bs_BA: allow_title: "allow badge as title?" multiple_grant: "awarded multiple times?" select_badge_for_title: Izaveri bedž za svoj naslov + none: "" badge_grouping: getting_started: name: Da započnete @@ -1741,6 +1862,9 @@ bs_BA: autobiographer: name: Autobiografičar description: Popunio biografiju na svom profilu + anniversary: + name: Godišnjica + description: Aktivan član godinu dana, pisao najmanje jednom nice_post: name: Dobar Post description: Dobio 10 lajkova na postu. Ovaj se bedž može dobiti više puta @@ -1774,6 +1898,8 @@ bs_BA: first_flag: name: Prva Opomena description: Opomenuo post + champion: + description: Pozvao 5 članova (trust level 2) first_share: name: Prvi Share description: Podijelio post diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index d4e65745dc..9ddffd596c 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -8,6 +8,9 @@ cs: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -20,6 +23,9 @@ cs: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 280bbc4497..206cf185a8 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -8,6 +8,9 @@ da: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ da: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -82,6 +88,16 @@ da: x_days: one: "1 dag siden" other: "%{count} dage siden" + later: + x_days: + one: "1 dag senere" + other: "%{count} dage senere" + x_months: + one: "1 måned senere" + other: "%{count} måneder senere" + x_years: + one: "1 år senere" + other: "%{count} år senere" share: topic: 'del et link til dette emne' post: 'indlæg #%{postNumber}' @@ -129,6 +145,7 @@ da: every_two_weeks: "hver anden uge" every_three_days: "hver tredje dag" max_of_count: "max af {{count}}" + alternation: "eller" character_count: one: "{{count}} tegn" other: "{{count}} tegn" @@ -191,6 +208,7 @@ da: switch_from_anon: "Afbryd anonym tilstand" banner: close: "Afvis denne banner." + edit: "Rediger dette banner >>" choose_topic: none_found: "Ingen emner fundet." title: @@ -207,8 +225,8 @@ da: cancel: "Annuller" view_pending: "vis afventende indlæg" has_pending_posts: - one: "Emnet har 1 indlæg der afventer godkendelse" - many: "Emnet har {{count}} der afventer godkendelse" + one: "Det emne har 1 indlæg der afventer godkendelse" + other: "Dette emne har {{count}} indlæg der afventer godkendelse" confirm: "Gem ændringer" delete_prompt: "Er du sikker på, at du vil slette %{username}? Alle brugerens indlæg bliver slettet og email og IP-adresse bliver blokeret." approval: @@ -347,7 +365,9 @@ da: github_profile: "Github" mailing_list_mode: "Send mig en email for hvert nye indlæg (med mindre, at jeg muter emnet eller kategorien)" watched_categories: "Overvåget" + watched_categories_instructions: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner, og antallet af ulæste og nye indlæg vil også stå ved siden af emnet." tracked_categories: "Fulgt" + tracked_categories_instructions: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af nye indlæg vises ved emnet." muted_categories: "Ignoreret" muted_categories_instructions: "Du ignorerer automatisk alle emner i disse kategorier" delete_account: "Slet min konto" @@ -524,6 +544,7 @@ da: title: "Registrerings IP adresse" avatar: title: "Profil Billede" + header_title: "profil, beskeder, bogmærker og indstillinger." title: title: "Titel" filters: @@ -757,9 +778,12 @@ da: from_the_web: "Fra nettet" remote_tip: "link til billede" remote_tip_with_attachments: "link til billede eller fil ({{authorized_extensions}})" + local_tip: "klik for at vælge op til 10 billeder fra din enhed." + local_tip_with_attachments: "klik for at vælge op til 10 billeder eller filer fra din enhed ({{authorized_extensions}})" hint: "(du kan også trække og slippe ind i editoren for at uploade dem)" hint_for_supported_browsers: "(du kan også trække og slippe eller indsætte billeder ind i editoren for at uploade dem)" uploading: "Uploader billede" + select_file: "Vælg fil" image_link: "link som dit billede vil pege på" search: title: "søg efter emner, indlæg, brugere eller kategorier" @@ -895,21 +919,29 @@ da: '2_4': 'Du får notifikationer fordi du har besvaret dette emne.' '2_2': 'Du får notifikationer fordi du følger dette emne.' '2': 'Du får notifikationer fordi du har læst dette emne.' + '1_2': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.' + '1': 'Du vil modtage en notifikation hvis nogen nævner dit @name eller svarer dig.' '0_7': 'Du ignorerer alle notifikationer i denne kategori.' '0_2': 'Du får ingen notifikationer for dette emne.' '0': 'Du får ingen notifikationer for dette emne.' watching_pm: title: "Følger" + description: "Du vil modtage en notifikation for hvert nyt svar i denne besked, og en optælling af nye svar vil blive vist." watching: title: "Overvåger" + description: "Du vil modtage en notifikation for hvert nyt svar i denne tråd, og en optælling af nye svar vil blive vist." tracking_pm: title: "Følger" + description: "En optælling af nye svar vil blive vist for denne besked. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." tracking: title: "Følger" + description: "En optælling af nye svar vil blive vist for denne tråd. Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." regular: title: "Standard" + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." regular_pm: title: "Standard" + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." muted_pm: title: "Lydløs" description: "Du vil aldrig få notifikationer om denne besked." @@ -993,6 +1025,8 @@ da: sso_enabled: "Indtast brugernavnet på den person, du gerne vil invitere til dette emne." to_topic_blank: "Indtast brugernavnet eller en email adresse på den person, du gerne vil invitere til dette emne." to_topic_email: "Du har indtastet en email adresse. Vi vil sende en e-mail invitation, der giver din ven direkte adgang til at svare på dette emne." + to_topic_username: "Du har indtastet et brugernavn. Vi sender en notifikation med en invitation til denne tråd." + to_username: "Indtast brugernavnet på den person du vil invitere. Vi sender en notifikation med et link til denne tråd." email_placeholder: 'e-mail-adresse' success_email: "Vi har e-mailet en invitation til {{emailOrUsername}}. Vi notificerer dig, når invitationen er blevet accepteret. Kig på invitations fanebladet på din bruger side for at se status på dine invitationer." success_username: "Vi har inviteret brugeren til at deltage i dette emne." @@ -1280,10 +1314,13 @@ da: notifications: watching: title: "Kigger" + description: "Du overvåger automatisk alle emner i disse kategorier. Du vil få en notifikation ved alle nye indlæg og emner, og antallet af nye svar vil stå ved siden af emnerne." tracking: title: "Følger" + description: "Du vil automatisk følge alle nye emner i disse kategorier. En optælling af nye svar vises ved emnerne." regular: title: "Standard" + description: "Du vil modtage en notifikation, hvis nogen nævner dit @name eller svarer dig." muted: title: "Ignoreret" description: "Du ignorerer automatisk alle emner i disse kategorier. De vil heller ikke stå i sin \"ulæste\" indikation." @@ -1362,7 +1399,7 @@ da: activity: "Aktivitet" likes: "Likes" likes_lowercase: - one: "lies" + one: "like" other: "likes" likes_long: "der er {{number}} likes i dette emne" users: "Deltagere" @@ -1380,7 +1417,10 @@ da: with_topics: "%{filter} emner" with_category: "%{filter} %{category} emner" latest: - title: "Seneste" + title: + zero: "Seneste" + one: "Senest (1)" + other: "Seneste ({{count}})" help: "de seneste emner" hot: title: "Populære" @@ -1440,10 +1480,8 @@ da: daily: title: "Dagligt" all_time: "Alt" - this_year: "Dette år" - this_month: "Denne måned" - this_week: "Denne uge" today: "I dag" + other_periods: "se top" browser_update: 'Desværre, din browser er for gammel til at kunne virke med dette forum. Opgradér venligst din browser.' permission_types: full: "Opret / Besvar / Se" @@ -1674,6 +1712,8 @@ da: screened_email: "Eksporter den fulde screenede email liste som en CSV fil." screened_ip: "Eksporter den fulde screenede IP liste som en CSV fil." screened_url: "Eksporter den fulde screenede URL liste som en CSV fil." + export_json: + button_text: "Eksporter" invite: button_text: "Send Invitationer" button_title: "Send Invitationer" @@ -1701,6 +1741,8 @@ da: save: "Gem" new: "Ny" new_style: "Ny style" + import: "Importer" + import_title: "Vælg en fil eller indsæt tekst" delete: "Slet" delete_confirm: "Slet denne tilpasning?" about: "Modificer CSS stylesheets og HTML headere på sitet. Tilføj en tilpasning for at starte." @@ -2085,6 +2127,7 @@ da: no_results: "Ingen resultater fundet." clear_filter: "Ryd" add_url: "tilføj URL" + add_host: "tilføj host" categories: all_results: 'Alle' required: 'Obligatoriske' @@ -2320,10 +2363,10 @@ da: description: Inviterede en bruger campaigner: name: Kampagnechef - description: Inviterede 3 medlemmer + description: Inviterede 3 brugere (tillidsniveau 1) champion: name: Mester - description: Inviterede 10 medlemmer + description: Inviterede 5 medlemmer (tillidsniveau 2) first_share: name: Første deling description: Delt et indlæg diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index a97bf4eade..5e3377357b 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -8,6 +8,9 @@ de: js: number: + format: + separator: "," + delimiter: "." human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ de: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "HH:mm" long_no_year: "DD. MMM HH:mm" @@ -82,6 +88,16 @@ de: x_days: one: "vor einem Tag" other: "vor %{count} Tagen" + later: + x_days: + one: "einen Tag später" + other: "%{count} Tage später" + x_months: + one: "einen Monat später" + other: "%{count} Monate später" + x_years: + one: "ein Jahr später" + other: "%{count} Jahre später" share: topic: 'Teile einen Link zu diesem Thema' post: 'Beitrag #%{postNumber}' @@ -129,6 +145,7 @@ de: every_two_weeks: "jede zweite Woche" every_three_days: "alle drei Tage" max_of_count: "von max. {{count}}" + alternation: "oder" character_count: one: "{{count}} Zeichen" other: "{{count}} Zeichen" @@ -208,8 +225,8 @@ de: cancel: "Abbrechen" view_pending: "ausstehende Beiträge anzeigen" has_pending_posts: - one: "Dieses Thema hat 1 Beitrag, der genehmigt werden muss" - many: "Dieses Thema hat {{count}} Beiträge, die genehmigt werden müssen" + one: "Dieses Thema hat einen Beitrag, der genehmigt werden muss" + other: "Dieses Thema hat {{count}} Beiträge, die genehmigt werden müssen" confirm: "Änderungen speichern" delete_prompt: "Bist du sicher, dass du %{username} löschen möchtest? Es werden alle Beiträge des Benutzers gelöscht und dessen E-Mail- und IP-Adresse geblockt." approval: @@ -766,6 +783,7 @@ de: hint: "(du kannst Dateien auch in den Editor ziehen, um diese hochzuladen)" hint_for_supported_browsers: "(du kannst Bilder auch durch Ziehen in den Editor oder durch Einfügen aus der Zwischenablage hochladen)" uploading: "Wird hochgeladen" + select_file: "Datei auswählen" image_link: "Der Link deines Bildes verweist auf" search: title: "suche nach Themen, Beiträgen, Benutzern oder Kategorien" @@ -1397,7 +1415,10 @@ de: with_topics: "%{filter}e Themen" with_category: "%{filter}e Themen in %{category}" latest: - title: "Aktuell" + title: + zero: "Aktuell" + one: "Aktuell (1)" + other: "Aktuell ({{count}})" help: "die zuletzt geänderten Themen" hot: title: "Beliebt" @@ -1692,6 +1713,8 @@ de: screened_email: "Vollständige Liste der gefilterten E-Mail-Adressen im CSV-Format exportieren." screened_ip: "Vollständige Liste der gefilterten IP-Adressen im CSV-Format exportieren." screened_url: "Vollständige Liste der gefilterten URLs im CSV-Format exportieren." + export_json: + button_text: "Exportieren" invite: button_text: "Einladungen versenden" button_title: "Einladungen versenden" @@ -1719,6 +1742,8 @@ de: save: "Speichern" new: "Neu" new_style: "Neuer Style" + import: "Importieren" + import_title: "Datei auswählen oder Text einfügen" delete: "Löschen" delete_confirm: "Diese Anpassung löschen?" about: "Ändere die Stylesheets (CSS) und den HTML-Header auf der Website. Füge eine Anpassung hinzu, um zu starten." @@ -1856,6 +1881,7 @@ de: delete_post: "Beitrag löschen" impersonate: "Nutzersicht" anonymize_user: "Benutzer anonymisieren" + roll_up: "IP-Adressen zusammenfassen" screened_emails: title: "Gefilterte E-Mails" description: "Wenn jemand ein Konto erstellt, werden die folgenden E-Mail-Adressen überprüft und es wird die Anmeldung blockiert oder eine andere Aktion ausgeführt." @@ -2339,10 +2365,10 @@ de: description: Hat einen Benutzer eingeladen campaigner: name: Aktivist - description: Hat 3 Mitglieder geworben + description: Hat 3 Neulinge (Vertrauensstufe 1) eingeladen champion: name: Verfechter - description: Hat 10 Mitglieder geworben + description: Hat 5 Mitglieder (Vertrauensstufe 2) eingeladen first_share: name: Erste Weitergabe description: Hat einen Beitrag geteilt diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 5108eabc35..ee11a3ca18 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -18,6 +18,9 @@ en: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -29,12 +32,17 @@ en: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" 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" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "MMM D, 'YY LT" long_date_without_year: "MMM D, LT" long_date_with_year_without_time: "MMM D, 'YY" @@ -153,6 +161,7 @@ en: every_two_weeks: "every two weeks" every_three_days: "every three days" max_of_count: "max of {{count}}" + alternation: "or" character_count: one: "{{count}} character" other: "{{count}} characters" @@ -248,7 +257,7 @@ en: view_pending: "view pending posts" has_pending_posts: one: "This topic has 1 post awaiting approval" - many: "This topic has {{count}} posts awaiting approval" + other: "This topic has {{count}} posts awaiting approval" confirm: "Save Changes" delete_prompt: "Are you sure you want to delete %{username}? This will remove all of their posts and block their email and ip address." @@ -863,6 +872,7 @@ en: hint: "(you can also drag & drop into the editor to upload them)" hint_for_supported_browsers: "(you can also drag and drop or paste images into the editor to upload them)" uploading: "Uploading" + select_file: "Select File" image_link: "link your image will point to" search: @@ -1565,7 +1575,10 @@ en: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: - title: "Latest" + title: + zero: "Latest" + one: "Latest (1)" + other: "Latest ({{count}})" help: "topics with recent posts" hot: title: "Hot" @@ -1627,9 +1640,9 @@ en: daily: title: "Daily" all_time: "All Time" - this_year: "This year" - this_month: "This month" - this_week: "This week" + this_year: "Year" + this_month: "Month" + this_week: "Week" today: "Today" other_periods: "see top" @@ -1880,6 +1893,8 @@ en: screened_email: "Export full screened email list in CSV format." screened_ip: "Export full screened IP list in CSV format." screened_url: "Export full screened URL list in CSV format." + export_json: + button_text: "Export" invite: button_text: "Send Invites" @@ -1909,6 +1924,8 @@ en: save: "Save" new: "New" new_style: "New Style" + import: "Import" + import_title: "Select a file or paste text" delete: "Delete" delete_confirm: "Delete this customization?" about: "Modify CSS stylesheets and HTML headers on the site. Add a customization to start." @@ -2049,6 +2066,7 @@ en: delete_post: "delete post" impersonate: "impersonate" anonymize_user: "anonymize user" + roll_up: "roll up IP blocks" screened_emails: title: "Screened Emails" description: "When someone tries to create a new account, the following email addresses will be checked and the registration will be blocked, or some other action performed." @@ -2545,10 +2563,10 @@ en: description: Invited a user campaigner: name: Campaigner - description: Invited 3 members + description: Invited 3 basic users (trust level 1) champion: name: Champion - description: Invited 10 members + description: Invited 5 members (trust level 2) first_share: name: First Share description: Shared a post diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index 9ba731e84f..d825b97bf3 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -8,6 +8,9 @@ es: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ es: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -82,6 +88,16 @@ es: x_days: one: "hace 1 día" other: "hace %{count} días" + later: + x_days: + one: "1 día después" + other: "%{count} días después" + x_months: + one: "%{count} mes después" + other: "%{count} meses después" + x_years: + one: "%{count} año después" + other: "%{count} años después" share: topic: 'comparte un enlace a este tema' post: 'post #%{postNumber}' @@ -129,6 +145,7 @@ es: every_two_weeks: "cada dos semanas" every_three_days: "cada tres días" max_of_count: "máximo de {{count}}" + alternation: "o" character_count: one: "{{count}} carácter" other: "{{count}} caracteres" @@ -208,8 +225,8 @@ es: cancel: "Cancelar" view_pending: "ver posts pendientes" has_pending_posts: - one: "Este tema tiene 1 post pendiente de aprobación" - many: "Este tema tiene {{count}} posts pendientes de aprobación" + one: "Este tema tiene 1 post esperando aprobación" + other: "Este tema tiene {{count}} posts esperando aprobación" confirm: "Guardar Cambios" delete_prompt: "¿Seguro que quieres eliminar a %{username}? Esto eliminará todos sus posts y bloqueará su email y dirección IP." approval: @@ -762,10 +779,11 @@ es: remote_tip: "enlace a la imagen" remote_tip_with_attachments: "enlace a la imagen o al archivo ({{authorized_extensions}})" local_tip: "clic para seleccionar hasta 10 imágenes desde tu dispositivo" - local_tip_with_attachments: "clic para seleccionar hasta 10 imágenes o archivos desde tu dispositivo({{authorized_extensions}})" + local_tip_with_attachments: "clic para seleccionar hasta 10 imágenes o archivos desde tu dispositivo ({{authorized_extensions}})" hint: "(también puedes arrastrarlos al editor para subirlos)" hint_for_supported_browsers: "(también puedes arrastrar o pegar imágenes en el editor para subirlas)" uploading: "Subiendo" + select_file: "Selecciona Archivo" image_link: "el link de tu imagen apuntará a" search: title: "buscar temas, posts, usuarios o categorías" @@ -1399,7 +1417,10 @@ es: with_topics: "%{filter} temas" with_category: "Temas de %{filter} %{category}" latest: - title: "Recientes" + title: + zero: "Recientes" + one: "Recientes (1)" + other: "Recientes ({{count}})" help: "temas con posts recientes" hot: title: "Popular" @@ -1694,6 +1715,8 @@ es: screened_email: "Exportar la lista completa de emails vistos en formato CSV." screened_ip: "Exportar la lista completa de IP vistas en formato CSV." screened_url: "Exportar la lista completa de URL vistas en formato CSV." + export_json: + button_text: "Exportar" invite: button_text: "Enviar invitaciones" button_title: "Enviar invitaciones" @@ -1721,6 +1744,8 @@ es: save: "Guardar" new: "Nuevo" new_style: "Nuevo Estilo" + import: "Importar" + import_title: "Selecciona un archivo o pega texto" delete: "Eliminar" delete_confirm: "¿Eliminar esta personalización?" about: "Modifica hojas de estilo CSS y cabeceras HTML en el sitio. Añade una personalización para empezar." @@ -2341,10 +2366,10 @@ es: description: Invitó a un usuario campaigner: name: Partidiario - description: Invitó a 3 miembros + description: Invitó a 3 usuarios básicos (nivel de confianza 1) champion: name: Campeón - description: Invitó a 10 miembros + description: Invitó a 5 miembros (nivel de confianza 2) first_share: name: Primer Compartido description: Compartió un post diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index c412b10cf7..eff0ede16a 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -8,6 +8,9 @@ fa_IR: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ fa_IR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index b3d244cf19..6f55c43704 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -8,6 +8,9 @@ fi: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ fi: kb: Kt mb: Mt tb: Tt + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "H:mm" long_no_year: "D. MMMM[ta] H:mm" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index 1bbcfbc5c3..e999ddc9f0 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -8,6 +8,9 @@ fr: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ fr: kb: Ko mb: Mo tb: To + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "H:mm" long_no_year: "DD MMM H:mm" @@ -82,6 +88,16 @@ fr: x_days: one: "Il y a 1 jour" other: "Il y a %{count} jours" + later: + x_days: + one: "1 jour plus tard" + other: "%{count} jours plus tard" + x_months: + one: "1 mois plus tard" + other: "%{count} mois plus tard" + x_years: + one: "1 année plus tard" + other: "%{count} années plus tard" share: topic: 'partager ce sujet' post: 'message #%{postNumber}' @@ -129,6 +145,7 @@ fr: every_two_weeks: "bi-mensuelles" every_three_days: "tous les trois jours" max_of_count: "maximum sur {{count}}" + alternation: "ou" character_count: one: "{{count}} caractère" other: "{{count}} caractères" @@ -208,8 +225,8 @@ fr: cancel: "Annuler" view_pending: "voir les messages en attente" has_pending_posts: - one: "Ce sujet a un message en attente de validation" - many: "Ce sujet a {{count}} messages en attente de validation" + one: "Ce sujet a 1 message en attente de validation" + other: "Ce sujet a {{count}} messages en attente de validation" confirm: "Sauvegarder les modifications" delete_prompt: "Êtes-vous sûr de vouloir supprimer %{username} ? Cela supprimera tous ses messages et bloquera son courriel et son adresse IP." approval: @@ -766,6 +783,7 @@ fr: hint: "(vous pouvez également faire un glisser-déposer dans l'éditeur pour les télécharger)" hint_for_supported_browsers: "(vous pouvez aussi glisser et déposer ou coller des images dans l'éditeur pour les envoyer) " uploading: "Fichier en cours d'envoi" + select_file: "Sélectionner Fichier" image_link: "lien vers lequel pointe l'image" search: title: "Rechercher les sujets, messages, utilisateurs ou catégories" @@ -912,16 +930,22 @@ fr: '0': 'Vous ignorez toutes les notifications de ce sujet.' watching_pm: title: "Suivre attentivement" + description: "Vous serez notifié de chaque nouvelle réponse dans ce message, et le nombre de nouvelles réponses apparaîtra." watching: title: "Surveiller" + description: "Vous serez notifié de chaque nouvelle réponse dans ce sujet, et le nombre de nouvelles réponses apparaîtra." tracking_pm: title: "Suivi simple" + description: "Le nombre de nouvelles réponses apparaîtra pour ce message. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." tracking: title: "Suivi" + description: "Le nombre de nouvelles réponses apparaîtra pour ce sujet. Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." regular: title: "Normal" + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." regular_pm: title: "Normal" + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." muted_pm: title: "Silencieux" description: "Vous ne serez jamais averti de quoi que ce soit à propos de ce message." @@ -1005,6 +1029,8 @@ fr: sso_enabled: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter sur ce sujet." to_topic_blank: "Entrez le pseudo ou l'adresse email de la personne que vous souhaitez inviter sur ce sujet." to_topic_email: "Vous avez entré une adresse email. Nous allons envoyer une invitation à votre ami lui permettant de répondre immédiatement à ce sujet." + to_topic_username: "Vous avez entré un nom d'utilisateur. Nous allons envoyer une notification avec un lien les invitant sur ce sujet." + to_username: "Entrez le nom d'utilisateur de la personne que vous souhaitez inviter. Nous enverrons une notification avec un lien les invitant sur ce sujet." email_placeholder: 'nom@exemple.com' success_email: "Nous avons envoyé un email à {{emailOrUsername}}. Nous vous avertirons lorsqu'il aura répondu à votre invitation. Suivez l'état de vos invitations dans l'onglet prévu à cet effet sur votre page utilisateur." success_username: "Nous avons invité cet utilisateur à participer à ce sujet." @@ -1292,10 +1318,13 @@ fr: notifications: watching: title: "S'abonner" + description: "Vous surveillerez automatiquement les nouveaux sujets dans ces catégories. Vous serez notifié de tous les nouveaux messages et sujets, et le nombre de nouvelles réponses apparaîtra pour ces sujets." tracking: title: "Suivi" + description: "Vous suivrez automatiquement tous les nouveaux sujets dans ces catégories. Le nombre de nouvelles réponses apparaîtra pour ces sujets." regular: title: "Normal" + description: "Vous serez notifié si quelqu'un mentionne votre @pseudo ou vous répond." muted: title: "Silencieux" description: "Vous ne recevrez aucune notification sur les sujets de ces catégories, et ils n'apparaîtront pas dans votre onglet \"non-lus\"." @@ -1392,7 +1421,10 @@ fr: with_topics: "Sujets %{filter}" with_category: "Sujets %{filter} sur %{category}" latest: - title: "Récents" + title: + zero: "Récents" + one: "Récent (1)" + other: "Récents ({{count}})" help: "sujets avec des messages récents" hot: title: "Populaires" @@ -1687,6 +1719,8 @@ fr: screened_email: "Exporter la liste des adresses de courriel sous surveillance dans un fichier CSV." screened_ip: "Exporter la liste complète des adresses IP sous surveillance dans un fichier CSV." screened_url: "Exporter toutes les URL sous surveillance vers un fichier CSV" + export_json: + button_text: "Exporter" invite: button_text: "Envoyer invitations" button_title: "Envoyer invitations" @@ -1714,6 +1748,8 @@ fr: save: "Sauvegarder" new: "Nouveau" new_style: "Nouveau style" + import: "Importer" + import_title: "Sélectionnez un fichier ou collez du texte" delete: "Supprimer" delete_confirm: "Supprimer cette personnalisation" about: "Modification des feuilles de styles et en-têtes de votre site. Ajouter un style personnalisé pour commencer." @@ -1851,6 +1887,7 @@ fr: delete_post: "supprimer le message" impersonate: "incarner" anonymize_user: "rendre l'utilisateur anonyme" + roll_up: "bloquer des blocs d'IP" screened_emails: title: "Courriels affichés" description: "Lorsque quelqu'un essaye de créé un nouveau compte, les adresses de courriel suivantes seront vérifiées et l'inscription sera bloquée, ou une autre action sera réalisée." @@ -2334,10 +2371,10 @@ fr: description: A invité un utilisateur campaigner: name: Militant - description: A invité 3 membres + description: A invité 3 utilisateurs basiques (Niveau de confiance 1) champion: name: Champion - description: A invité 10 membres + description: A invité 5 membres (Niveau de confiance 2) first_share: name: Premier partage description: A partagé un message diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index cd333a1e3b..d44c80dde7 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -8,6 +8,9 @@ he: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ he: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -346,8 +352,8 @@ he: suspended_reason: "הסיבה: " github_profile: "גיטהאב" mailing_list_mode: "שלחו לי דוא\"ל על כל פרסום חדש (אלא אם אשתיק את המעקב אחר הנושא או הקטגוריה)" - watched_categories: "צופה" - tracked_categories: "במעקב" + watched_categories: "עוקב" + tracked_categories: "רגיל+" muted_categories: "מושתק" muted_categories_instructions: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא נקראו שלך." delete_account: "מחק את החשבון שלי" @@ -758,6 +764,7 @@ he: from_the_web: "מהאינטרנט" remote_tip: "קישור לתמונה" remote_tip_with_attachments: "קישור לתמונה או קובץ ({{authorized_extensions}})" + local_tip: "לחץ לבחירת עד 10 תמונות מהמכשיר שלך" hint: "(ניתן גם לגרור לעורך להעלאה)" hint_for_supported_browsers: "(אתה יכול גם לעשות drag and drop או להדביק תמונות אל תוך העורך כדי להעלות אותן)" uploading: "מעלה" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index 349e5d8df3..b54ec61d02 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -8,6 +8,9 @@ id: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ id: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "j:mm a" long_no_year: "BBB H j:mm a" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 62b313e338..36432b37a0 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -8,6 +8,9 @@ it: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ it: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" @@ -82,6 +88,16 @@ it: x_days: one: "un giorno fa" other: "%{count} giorni fa" + later: + x_days: + one: "1 giorno dopo" + other: "%{count} giorni dopo" + x_months: + one: "1 mese dopo" + other: "%{count} mesi dopo" + x_years: + one: "1 anno dopo" + other: "%{count} anni dopo" share: topic: 'Condividi un link a questa conversazione' post: 'messaggio n°%{postNumber}' @@ -129,6 +145,7 @@ it: every_two_weeks: "bisettimanale" every_three_days: "ogni tre giorni" max_of_count: "massimo di {{count}}" + alternation: "o" character_count: one: "{{count}} carattere" other: "{{count}} caratteri" @@ -209,7 +226,7 @@ it: view_pending: "vedi messaggi in attesa" has_pending_posts: one: "Questo argomento ha 1 messaggio in attesa di approvazione" - many: "Questo argomento ha {{count}} messaggi in attesa di approvazione" + other: "Questo argomento ha {{count}} messaggi in attesa di approvazione" confirm: "Salva Modifiche" delete_prompt: "Sei sicuro di voler eliminare %{username}? Ciò cancellerà tutti i suoi messaggi e bloccherà il suo indirizzo email e l'IP." approval: @@ -749,6 +766,11 @@ it: granted_badge: "

    Guadagnato '{{description}}'

    " popup: mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}' + quoted: '{{username}} ti ha citato in "{{topic}}" - {{site_title}}' + replied: '{{username}} ti ha risposto in "{{topic}}" - {{site_title}}' + posted: '{{username}} ha pubblicato in "{{topic}}" - {{site_title}}' + private_message: '{{username}} ti ha inviato un messaggio privato in "{{topic}}" - {{site_title}}' + linked: '{{username}} ha aggiunto un collegamento a un tuo messaggio da "{{topic}}" - {{site_title}}' upload_selector: title: "Aggiungi un'immagine" title_with_attachments: "Aggiungi un'immagine o un file" @@ -756,6 +778,8 @@ it: from_the_web: "Dal web" remote_tip: "collegamento all'immagine" remote_tip_with_attachments: "collegamento ad un'immagine o a un file ({{authorized_extensions}})" + local_tip: "clicca per selezionare fino a 10 immagini dal tuo dispositivo" + local_tip_with_attachments: "clicca per selezionare fino a 10 immagini o filie dal tuo dispositivo ({{authorized_extensions}})" hint: "(puoi anche trascinarle nell'editor per caricarle)" hint_for_supported_browsers: "(puoi anche trascinare o incollare immagini nell'editor per caricarle)" uploading: "In caricamento" @@ -877,6 +901,7 @@ it: go_top: "alto" go_bottom: "basso" go: "vai" + jump_bottom: "salta all'ultimo messaggio" jump_bottom_with_number: "Passa al messaggio %{post_number}" total: totale messaggi current: messaggio corrente @@ -892,21 +917,29 @@ it: '2_4': 'Riceverai notifiche perché hai pubblicato una risposta a questo argomento.' '2_2': 'Riceverai notifiche perché stai seguendo questo argomento.' '2': 'Riceverai notifiche perché hai letto questo argomento.' + '1_2': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.' + '1': 'Riceverai notifiche se qualcuno menziona il tuo @nome o ti risponde.' '0_7': 'Stai ignorando tutte le notifiche di questa categoria.' '0_2': 'Stai ignorando tutte le notifiche di questo argomento.' '0': 'Stai ignorando tutte le notifiche di questo argomento.' watching_pm: title: "In osservazione" + description: "Riceverai una notifica per ogni nuova risposta a questo messaggio, e comparirà un conteggio delle nuove risposte." watching: title: "In osservazione" + description: "Riceverai una notifica per ogni nuova risposta in questo argomento, e comparirà un conteggio delle nuove risposte." tracking_pm: title: "Seguito" + description: "Per questo messaggio apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." tracking: title: "Seguito" + description: "Per questo argomento apparirà un conteggio delle nuove risposte. Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." regular: title: "Normale" + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." regular_pm: title: "Normale" + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." muted_pm: title: "Silenziato" description: "Non ti verrà notificato nulla per questo messaggio." @@ -949,6 +982,7 @@ it: feature_topic: title: "Poni argomento in primo piano" pin: "Fai apparire questo argomento in cima alla categoria {{categoryLink}}." + confirm_pin: "Hai già {{count}} argomenti puntati. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento in questa categoria?" unpin: "Rimuovi questo argomento dalla cima della categoria {{categoryLink}}." pin_note: "Gli utenti possono spuntare gli argomenti individualmente per loro stessi." already_pinned: @@ -956,10 +990,13 @@ it: one: "Argomenti attualmente puntati in {{categoryLink}}: 1." other: "Argomenti attualmente puntati in {{categoryLink}}: {{count}}." pin_globally: "Poni questo argomento in cima a tutti gli altri finché un membro dello staff non lo spunterà." + confirm_pin_globally: "Hai già {{count}} argomenti puntati globalmente. Troppi argomenti puntati potrebbero essere un peso per gli utenti nuovi o anonimi. Sicuro di voler puntare un altro argomento globalmente?" unpin_globally: "Togli questo argomento dalla cima degli altri argomenti." global_pin_note: "Gli utenti possono spuntare gli argomenti autonomamente per loro stessi." already_pinned_globally: zero: "Non ci sono argomenti puntati globalmente." + one: "Argomenti attualmente puntati globalmente: 1." + other: "Argomenti attualmente puntati globalmente: {{count}}." make_banner: "Rendi questo argomento uno striscione che apparirà in cima a tutte le pagine." remove_banner: "Rimuovi lo striscione che appare in cima a tutte le pagine." banner_note: "Gli utenti possono rimuovere lo striscione chiudendolo. Solo un argomento alla volta può diventare uno striscione." @@ -979,6 +1016,7 @@ it: group_name: "nome gruppo" invite_reply: title: 'Invita' + username_placeholder: "nome utente" action: 'Invia Invito' to_forum: "Invieremo una breve email che permetterà al tuo amico di entrare subito cliccando un collegamento, senza bisogno di effettuare il collegamento." email_placeholder: 'nome@esempio.com' @@ -1039,6 +1077,9 @@ it: one: "(post eliminato dall'autore, sarà automaticamente cancellato in %{count} ore se non contrassegnato)" other: "(messaggio eliminato dall'autore, verrà automaticamente cancellato in %{count} ore se non segnalato)" expand_collapse: "espandi/raggruppa" + gap: + one: "visualizza 1 riposta nascosta" + other: "visualizza {{count}} riposte nascoste" more_links: "{{count}} altri..." unread: "Messaggio non letto" has_replies: @@ -1067,9 +1108,9 @@ it: save: 'Opzioni di salvataggio' controls: reply: "inizia a comporre una risposta a questo messaggio" - like: "il messaggio mi piace" + like: "metti \"Mi piace\" al messaggio" has_liked: "ti è piaciuto questo messaggio" - undo_like: "rimuovi \"mi piace\"" + undo_like: "rimuovi il \"Mi piace\"" edit: "modifica questo messaggio" edit_anonymous: "Spiacente, effettua l'accesso per poter modificare questo messaggio." flag: "segnala privatamente questo post o invia una notifica privata" @@ -1101,14 +1142,14 @@ it: inappropriate: "Segnalalo anche tu" custom_flag: "Segnalalo anche tu" bookmark: "Aggiungi un segnalibro anche tu" - like: "Assegnagli un \"mi piace\" anche tu" + like: "Assegnagli un \"Mi piace\" anche tu" vote: "Votalo anche tu" undo: off_topic: "Rimuovi segnalazione" spam: "Rimuovi segnalazione" inappropriate: "Rimuovi segnalazione" bookmark: "Annulla segnalibro" - like: "Annulla il \"mi piace\"" + like: "Annulla il \"Mi piace\"" vote: "Rimuovi voto" people: off_topic: "{{icons}} l'hanno segnalato come fuori tema" @@ -1117,6 +1158,8 @@ it: inappropriate: "{{icons}} l'hanno segnalato come inappropriato" notify_moderators: "{{icons}} hanno informato i moderatori" notify_moderators_with_url: "{{icons}} hanno informato i moderatori" + notify_user: "{{icons}} ha inviato un messaggio" + notify_user_with_url: "{{icons}} ha inviato un messaggio" bookmark: "{{icons}} l'hanno inserito nei segnalibri" like: "A {{icons}} è piaciuto" vote: "{{icons}} l'hanno votato" @@ -1257,10 +1300,13 @@ it: notifications: watching: title: "In osservazione" + description: "Osserverai automaticamente tutti i nuovi argomenti in queste categorie. Riceverai notifiche su tutti i nuovi messaggi e argomenti e per tali argomenti apparirà il conteggio delle nuove risposte." tracking: title: "Seguendo" + description: "Seguirai automaticamente tutti i nuovi argomenti in queste categorie. Per tali argomenti apparirà un conteggio delle nuove risposte." regular: title: "Normale" + description: "Riceverai una notifica se qualcuno menziona il tuo @nome o ti risponde." muted: title: "Silenziato" description: "Non ti verrà notificato nulla sui nuovi argomenti di queste categorie, e non compariranno nella tua tab dei non letti." @@ -1294,6 +1340,8 @@ it: notify_action: "Messaggio" topic_map: title: "Riassunto Argomento" + participants_title: "Autori Assidui" + links_title: "Collegamenti Di Successo" links_shown: "mostra tutti i {{totalLinks}} collegamenti..." clicks: one: "1 click" @@ -1351,7 +1399,10 @@ it: with_topics: "%{filter} argomenti" with_category: "%{filter} %{category} argomenti" latest: - title: "Più recenti" + title: + zero: "Ultimi" + one: "Ultimo (1)" + other: "Ultimi ({{count}})" help: "argomenti con messaggi recenti" hot: title: "Caldo" @@ -1415,6 +1466,7 @@ it: this_month: "Questo mese" this_week: "Questa settimana" today: "Oggi" + other_periods: "vedi argomenti di punta" browser_update: 'Purtroppo il tuo browser è troppo vecchio per funzionare su questo forum. Per favore aggiorna il browser.' permission_types: full: "Crea / Rispondi / Visualizza" @@ -1643,6 +1695,8 @@ it: screened_email: "Esporta tutta la lista delle email schermate in formato CSV." screened_ip: "Esporta tutta la lista degli IP schermati in formato CSV." screened_url: "Esporta tutta la lista degli URL schermati in formato CSV." + export_json: + button_text: "Esportare" invite: button_text: "Manda Inviti" button_title: "Manda Inviti" @@ -1670,6 +1724,8 @@ it: save: "Salva" new: "Nuovo" new_style: "Nuovo Stile" + import: "Importare" + import_title: "Seleziona un file o incolla del testo" delete: "Cancella" delete_confirm: "Cancella questa personalizzazione?" about: "Modifica i fogli di stile CSS e le intestazioni HTML del sito. Aggiungi una personalizzazione per iniziare." @@ -1718,8 +1774,8 @@ it: name: 'successo' description: 'Utilizzato per indicare che un''azione è stata completata con successo.' love: - name: 'mi piace' - description: "Il colore del bottone \"mi piace\"." + name: 'amo' + description: "Il colore del bottone \"Mi piace\"." wiki: name: 'wiki' description: "Colore base usato per lo sfondo dei messaggi wiki." @@ -1807,6 +1863,7 @@ it: delete_post: "cancella messaggio" impersonate: "impersona" anonymize_user: "rendi anonimo l'utente " + roll_up: "inibisci blocchi di indirizzi IP" screened_emails: title: "Email Scansionate" description: "Quando qualcuno cerca di creare un nuovo account, verrando controllati i seguenti indirizzi email e la registrazione viene bloccata, o eseguita qualche altra azione." @@ -1842,6 +1899,8 @@ it: impersonate: title: "Impersona" help: "Usa questo strumento per impersonare un account utente ai fini del debugging. Una volta finito dovrai scollegarti." + not_found: "Impossibile trovare questo utente." + invalid: "Spiacenti, non puoi impersonare questo utente." users: title: 'Utenti' create: 'Aggiungi Utente Amministratore' @@ -2052,6 +2111,7 @@ it: no_results: "Nessun risultato trovato." clear_filter: "Pulisci" add_url: "aggiungi URL" + add_host: "aggiungi host" categories: all_results: 'Tutti' required: 'Obbligatorie' @@ -2154,11 +2214,13 @@ it: title: 'Scorciatoie da tastiera' jump_to: title: 'Vai A (G)' + home: 'g, h Home' latest: 'g, l Ultimi' new: 'g, n Nuovi' unread: 'g, u Non Letti' categories: 'g, c Categorie' top: 'g, t Alto' + bookmarks: 'g, b Segnalibri' navigation: title: 'Navigazione' jump: '# Vai al messaggio numero' @@ -2249,13 +2311,13 @@ it: description: Membro attivo da un anno, ha scritto almeno una volta nice_post: name: Buon Messaggio - description: Ricevuto 10 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 10 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte good_post: name: Ottimo Messaggio - description: Ricevuto 25 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 25 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte. great_post: name: Fantastico Messaggio - description: Ricevuto 50 "mi piace" in un messaggio. Questa targhetta può essere assegnata più volte. + description: Ricevuto 50 "Mi piace" per un messaggio. Questa targhetta può essere assegnata più volte. nice_topic: name: Argomento Buono description: Ricevuti 10 "Mi piace" per un argomento. Questa targhetta può essere assegnata più volte @@ -2280,6 +2342,15 @@ it: first_flag: name: Prima Segnalazione description: Segnalato un messaggio + promoter: + name: Promotore + description: Ha invitato un utente + campaigner: + name: Pubblicitario + description: Ha invitato 3 utenti Base (livello di esperienza 1) + champion: + name: Campione + description: Ha invitato 5 utenti Assiduo (livello di esperienza 2) first_share: name: Prima Condivisione description: Condiviso un messaggio diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index aac93a7c3a..6946937e68 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -8,6 +8,9 @@ ja: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ ja: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 57795b8664..f190019ff9 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -8,6 +8,9 @@ ko: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ ko: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "a h:mm" long_no_year: "MMM D a h:mm " @@ -66,6 +72,13 @@ ko: other: "%{count}시간 전" x_days: other: "%{count}일 전" + later: + x_days: + other: "%{count}일 후" + x_months: + other: "%{count}달 후" + x_years: + other: "%{count}년 후" share: topic: '토픽을 공유합니다.' post: '포스트 #%{postNumber}' @@ -112,6 +125,7 @@ ko: every_two_weeks: "격주" every_three_days: "3일마다" max_of_count: "max of {{count}}" + alternation: "또는" character_count: other: "{{count}} 자" suggested_topics: @@ -187,8 +201,7 @@ ko: cancel: "취소" view_pending: "대기중인 포스트" has_pending_posts: - one: "이 토픽은 1개의 승인 대기중인 게시글이 있습니다." - many: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." + other: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." confirm: "변경사항 저장" delete_prompt: "Are you sure you want to delete %{username}? This will remove all of their posts and block their email and ip address." approval: @@ -322,9 +335,9 @@ ko: github_profile: "Github" mailing_list_mode: "(토픽이나 카테고리의 알림을 끄지 않는 한) 모든 새로운 글에 대해 메일을 보내주세요." watched_categories: "지켜보기" - watched_categories_instructions: "이 카테고리들에 있는 모든 새로운 토픽을 지켜봅니다. 새로운 글과 토픽이 작성될 때마다 알림이 오고, 읽지 않은 글과 새로운 글 수가 토픽의 리스트에 나타납니다." + watched_categories_instructions: "이 카테고리 내의 새로운 토픽들을 지켜보도록 자동으로 설정됩니다. 새로운 게시글이나 토픽에 대하여 알림을 받게되며 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." tracked_categories: "추적하기" - tracked_categories_instructions: "현재 카테고리에 있는 모든 토픽을 추적합니다. 읽지 않은 글과 새로운 글 수가 나타납니다." + tracked_categories_instructions: "이 카테고리 내의 새로운 토픽들을 추적하도록 자동으로 설정됩니다. 토픽 옆에 읽지 않은 게시글의 수가 표시됩니다." muted_categories: "알림 끄기" muted_categories_instructions: "이 카테고리들에 새로 작성되는 새로운 토픽에 대한 알림이 오지 않도록 합니다. '읽지 않은'탭에서도 보이지 않게 됩니다." delete_account: "내 계정 삭제" @@ -730,11 +743,12 @@ ko: from_the_web: "인터넷에서 가져오기" remote_tip: "이미지 링크" remote_tip_with_attachments: "이미지 또는 파일 링크 ({{authorized_extensions}})" - local_tip: "내 컴퓨터에서 이미지를 가져오기" - local_tip_with_attachments: "기기에서 이미지나 파일 선택을 위해 클릭 ({{authorized_extensions}})" + local_tip: "기기에서 10개 이하의 이미지를 선택" + local_tip_with_attachments: "기기에서 10개 이하의 이미지 또는 파일을 선택 ({{authorized_extensions}})" hint: "(드래그&드랍으로 업로드 가능)" hint_for_supported_browsers: "(이미지 파일을 드래그&드랍하거나 붙여넣기하여 업로드 할 수 있습니다.)" uploading: "업로드 중입니다..." + select_file: "파일 선택" image_link: "이 이미지를 누르면 이동할 링크" search: title: "토픽, 게시글, 사용자, 카테고리 검색" @@ -864,28 +878,28 @@ ko: '2_2': '이 토픽을 추적하고 있어서 알림을 받게 됩니다.' '2': '이 토픽을 읽어서 알림을 받게 됩니다. (설정)' '1_2': '누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다.' - '1': '누군가 당신의 @아이디 로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다.' + '1': '누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다.' '0_7': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' '0_2': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' '0': '당신은 이 토픽에 관한 모든 알림을 무시합니다.' watching_pm: title: "알림 : 주시 중" - description: "메시지의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다." + description: "이 메시지에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." watching: title: "주시 중" - description: "이 토픽의 새로운 게시글은 항상 알림이 동작합니다. 읽지 않은 글의 수는 토픽 옆에 표시됩니다." + description: "이 토픽에 새로운 답글이 있을 때 알림을 받게 되며 새로운 답글의 개수는 표시됩니다." tracking_pm: title: "알림 : 새 글 표시 중" - description: "읽지 않은 글과 새로운 게시물 수를 볼 수 있습니다. 누군가 당신의 @이름 을 언급했거나 당신의 글에 답글을 작성하면 알림을 받습니다." + description: "이 메시지의 읽지않은 응답의 수가 표시됩니다. 누군가 당신의 @name을 언급했거나 당신에게 답글을 작성하면 알림을 받습니다." tracking: title: "새 글 표시 중" - description: "읽지 않은 게시글의 수는 토픽 옆에 표시됩니다. 당신의 @이름 을 언급하거나 당신의 게시글에 답글을 작성한 경우에 알림이 작동합니다." + description: "이 토픽의 새로운 답글의 수가 표시됩니다. 누군가 당신의 @name을 언급했거나 당신에게 답글을 작성하면 알림을 받습니다." regular: title: "알림: 일반" - description: "누군가 당신의 @이름 을 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." + description: "누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." regular_pm: title: "알림: 일반" - description: "누군가 당신의 @이름을 언급했거나 당신의 글에 답글이 달릴 때만 알림을 받게 됩니다." + description: "누군가 당신의 @아아디 으로 언급했거나 당신의 글에 답글이 달릴 때 알림을 받게 됩니다." muted_pm: title: "알림 : 끔" description: "이 메시지에 대해 어떠한 알림도 받지 않지 않습니다." @@ -969,8 +983,8 @@ ko: sso_enabled: "이 토픽에 초대하고 싶은 사람의 아이디를 입력하세요." to_topic_blank: "이 토픽에 초대하고 싶은 사람의 아이디나 이메일주소를 입력하세요." to_topic_email: "이메일 주소를 입력하셨습니다. 당신의 친구에게 이 토픽에 답변 달기가 가능한 초대장을 보내겠습니다." - to_topic_username: "아이디를 입력했습니다. 해당 사용자에게 이 토픽으로 초대하는 링크와 함께 알림을 보내겠습니다." - to_username: "초대하고 싶은 사용자 아이디를 입력하세요. 해당 사용자에게 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." + to_topic_username: "아이디를 입력하셨습니다. 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." + to_username: "초대하려는 사용자의 아이디를 입력하세요. 이 토픽에 초대하는 링크와 함께 알림을 보내겠습니다." email_placeholder: '이메일 주소' success_email: "{{emailOrUsername}}로 초대장을 발송했습니다. 초대를 수락하면 알려 드리겠습니다. 초대상태를 확인하려면 사용자 페이지에서 '초대장' 탭을 선택하세요." success_username: "사용자가 이 토픽에 참여할 수 있도록 초대했습니다." @@ -1299,6 +1313,12 @@ ko: posts: "게시물" posts_lowercase: "게시글" posts_long: "이 토픽의 게시물 수는 {{number}}개 입니다." + posts_likes_MF: | + This topic has {count, plural, one {1 reply} other {# replies}} {ratio, select, + low {with a high like to post ratio} + med {with a very high like to post ratio} + high {with an extremely high like to post ratio} + other {}} original_post: "원본 게시물" views: "조회수" views_lowercase: @@ -1324,7 +1344,10 @@ ko: with_topics: "%{filter} 토픽" with_category: "%{filter} %{category} 토픽" latest: - title: "최신" + title: + zero: "최근" + one: "최근 (1)" + other: "최근 ({{count}})" help: "가장 최근 토픽" hot: title: "인기 있는 글" @@ -1614,6 +1637,8 @@ ko: screened_email: "모든 이메일 목록을 CSV 형식으로 내보내기" screened_ip: "모든 표시된 IP 목록을 CSV 형식으로 내보내기" screened_url: "모든 표시된 URL 목록을 CSV 형식으로 내보내기" + export_json: + button_text: "내보니기" invite: button_text: "초대장 보내기" button_title: "초대장 보내기" @@ -1641,6 +1666,8 @@ ko: save: "저장" new: "새 사용자 지정" new_style: "새로운 스타일" + import: "가져오기" + import_title: "파일을 선택하거나 텍스트를 붙여넣으세요" delete: "삭제" delete_confirm: "이 정의를 삭제 하시겠습니까?" about: "사이트 Customization은 사이트의 스타일시트와 해더를 수정할 수 있게 해줍니다. 새로운 것을 추가하거나 기존 것을 선택해서 편집하세요." @@ -1778,6 +1805,7 @@ ko: delete_post: "게시글 삭제" impersonate: "대역" anonymize_user: "anonymize user" + roll_up: "roll up IP blocks" screened_emails: title: "블락된 이메일들" description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다." @@ -1814,6 +1842,7 @@ ko: title: "이 사용자 행세하기" help: "디버깅 목적으로 사용자 계정으로 로그인 할 수 있습니다. 사용이 끝나면 로그아웃하여야 합니다." not_found: "해당 사용자를 찾을 수 없습니다." + invalid: "죄송합니다. 관리자만 접근할 수 있습니다." users: title: '사용자' create: '관리자 사용자 추가' @@ -2250,10 +2279,10 @@ ko: description: 사용자 초대 campaigner: name: Campaigner - description: Invited 3 members + description: 기본 사용자 3명 초대하기 (신뢰도 1) champion: name: Champion - description: Invited 10 members + description: 기본 사용자 5명 초대하기 (신뢰도 2) first_share: name: 첫 공유 description: 처음으로 글을 공유했습니다. diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 85201bee40..e231eb8b2a 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -8,6 +8,9 @@ nb_NO: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ nb_NO: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" @@ -879,23 +885,32 @@ nb_NO: '2_4': 'Du vil motta varsler fordi du svarte på dette emnet.' '2_2': 'Du vil motta varsler fordi du følger dette emnet.' '2': 'Du vil motta varsler fordi du read this topic.' + '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.' '0_2': 'Du ignorerer alle varsler på dette emnet.' '0': 'Du ignorerer alle varsler på dette emnet.' watching_pm: title: "Følger" + description: "Du vil bli varslet om hvert nye innlegg i denne meldingen. Antall nye tilbakemeldinger vil også bli vist. " watching: title: "Følger" + description: "Du vil bli varslet om hvert nye innlegg i dette emnet. Antall nye tilbakemeldinger vil også bli vist. " tracking_pm: title: "Følger" + description: "Antall nye tilbakemeldinger vil bli vist for denne meldingen. Du vil bli varslet om noen nevner ditt @name eller svarer på din melding. " tracking: title: "Følger" + description: "Antall nye svar vil bli vist for dette emnet. Du vil bli varslet om noen nevner ditt @name eller svarer på ditt innlegg.. " regular: title: "Aktivt medlem" + description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg." regular_pm: title: "Aktivt medlem" + description: "Du vil bli varslet om noen nevner ditt @navn eller svarer på ditt innlegg." muted_pm: title: "Dempet" + description: "Du vil ikke få varslinger om noe i denne meldingnen. " muted: title: "Dempet" description: "du vil ikke bli varslet om noen ting i dette emnet, og det vil ikke visest som ulest." @@ -1027,6 +1042,9 @@ nb_NO: one: "(innlegg som er trukket tilbake av forfatter, blir automatisk slettet etter % {count} time, med mindre de blir flagget)" other: "(innlegg trukket tilbake av forfatter, blir automatisk slettet etter % {count} timer, med mindre det blir rapportert)" expand_collapse: "utvid/vis" + gap: + one: "vis 1 skjult svar" + other: "vis {{count}} skjulte svar" more_links: "{{count}} flere..." unread: "Innlegget er ulest" has_replies: @@ -1331,7 +1349,6 @@ nb_NO: with_topics: "%{filter} emner" with_category: "%{filter} %{category} emner" latest: - title: "Siste" help: "de sist oppdaterte emnene" hot: title: "Populære" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 6672c4410a..da9ac99a11 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -8,6 +8,9 @@ nl: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ nl: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 6712552ec1..c2fe662164 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -8,6 +8,9 @@ pl_PL: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -24,8 +27,10 @@ pl_PL: time: "H:mm" long_no_year: "D MMM H:mm" long_no_year_no_time: "D MMM" + full_no_year_no_time: "MMMM Do" long_with_year: "D MMM YYYY H:mm" long_with_year_no_time: "D MMM YYYY" + full_with_year_no_time: "MMMM Do, YYYY" long_date_with_year: "D MMM 'YY LT" long_date_without_year: "D MMM, LT" long_date_with_year_without_time: "D MMM 'YY" @@ -98,6 +103,19 @@ pl_PL: one: "wczoraj" few: "%{count} dni temu" other: "%{count} dni temu" + later: + x_days: + one: "1 dzień później" + few: "%{count} dni później" + other: "%{count} dni później" + x_months: + one: "1 miesiąc później" + few: "%{count} miesiące później" + other: "%{count} miesięcy później" + x_years: + one: "1 rok później" + few: "%{count} lata później" + other: "%{count} lat później" share: topic: 'udostępnij odnośnik do tego tematu' post: 'wpis #%{postNumber}' @@ -146,6 +164,7 @@ pl_PL: every_two_weeks: "co dwa tygodnie" every_three_days: "co trzy dni" max_of_count: "max z {{count}}" + alternation: "lub" character_count: one: "1 znak" few: "{{count}} znaki" @@ -230,7 +249,8 @@ pl_PL: view_pending: "wyświetl oczekujące wpisy" has_pending_posts: one: "Ten temat posiada 1 wpis oczekujący na akceptację" - many: "Ten temat posiada {{count}} wpisów oczekujących na akceptację" + few: "Ten temat posiada {{count}} wpisy oczekujące na akceptację" + other: "Ten temat posiada {{count}} wpisów oczekujących na akceptację" confirm: "Zapisz zmiany" delete_prompt: "Czy na pewno chcesz usunąć %{username}? Zostaną usunięte wszystkie wpisy utworzone z tego konta oraz zostanie zablokowany powiązany e-mail oraz adres IP." approval: @@ -797,6 +817,7 @@ pl_PL: hint: "(możesz także upuścić plik z katalogu komputera w okno edytora)" hint_for_supported_browsers: "(możesz przeciągnąć lub wkleić obrazy do edytora, aby je wgrać)" uploading: "Wgrywanie" + select_file: "Wybierz plik" image_link: "odnośnik do którego Twój obraz będzie kierował" search: title: "szukaj tematów, wpisów, użytkowników lub kategorii" @@ -1463,7 +1484,10 @@ pl_PL: with_topics: "%{filter} tematy" with_category: "%{filter} tematy w %{category} " latest: - title: "Aktualne" + title: + zero: "Aktualne" + one: "Aktualne (1)" + other: "Aktualne ({{count}})" help: "tematy z ostatnimi wpisami" hot: title: "Gorące" @@ -1523,9 +1547,9 @@ pl_PL: daily: title: "Dziennie" all_time: "Cały czas" - this_year: "W tym roku" - this_month: "W tym miesiącu" - this_week: "W tym tygodniu" + this_year: "Rok" + this_month: "Miesiąc" + this_week: "Tydzień" today: "Dzisiaj" other_periods: "zobacz najważniejsze" browser_update: 'Niestety twoja przeglądarka jest zbyt przestarzała, aby obsłużyć ten serwis. Prosimy zaktualizuj swoją przeglądarkę.' @@ -1763,6 +1787,8 @@ pl_PL: screened_email: "Eksportuj listę monitorowanych adresów email do formatu CSV." screened_ip: "Eksportuj listę monitorowanych IP do formatu CSV." screened_url: "Eksportuj listę monitorowanych URLi do formatu CSV." + export_json: + button_text: "Eksport" invite: button_text: "Wyślij zaproszenia" button_title: "Wysyłanie zaproszeń" @@ -1790,6 +1816,8 @@ pl_PL: save: "Zapisz" new: "Nowy" new_style: "Nowy styl" + import: "Import" + import_title: "Wybierz plik lub wklej tekst" delete: "Usuń" delete_confirm: "Usunąć tę personalizację?" about: "Zmień arkusze stylów CSS i nagłówki HTML w witrynie. Dodaj własne ustawienie aby rozpocząć." @@ -1927,6 +1955,7 @@ pl_PL: delete_post: "usunięcie wpisu" impersonate: "udawanie użytkownika" anonymize_user: "anonimizuj użytkownika" + roll_up: "zwiń bloki IP" screened_emails: title: "Ekranowane emaile" description: "Kiedy ktoś próbuje założyć nowe konto, jego adres email zostaje sprawdzony i rejestracja zostaje zablokowana, lub inna akcja jest podejmowana." @@ -2420,10 +2449,10 @@ pl_PL: description: Zaproszenie użytkownika campaigner: name: Działacz - description: Zaproszenie 3 użytkowników + description: Zaproszenie 3 użytkowników (poziom zaufania 1) champion: name: Czempion - description: Zaproszenie 10 użytkowników + description: Zaproszenie 5 użytkowników (poziom zaufania 2) first_share: name: Pierwsze udostępnienie description: Udostępniono wpis diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 785e03d6d7..0d94fbcc0b 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -8,6 +8,9 @@ pt: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ pt: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "hh:mm" long_no_year: "DD MMM hh:mm" @@ -82,6 +88,16 @@ pt: x_days: one: "1 dia atrás" other: "%{count} dias atrás" + later: + x_days: + one: "1 dia mais tarde" + other: "%{count} dias mais tarde" + x_months: + one: "1 mês mais tarde" + other: "%{count} meses mais tarde" + x_years: + one: "1 ano mais tarde" + other: "%{count} anos mais tarde" share: topic: 'partilhar uma hiperligação para este tópico' post: 'Mensagem #%{postNumber}' @@ -129,6 +145,7 @@ pt: every_two_weeks: "a cada duas semanas" every_three_days: "a cada três dias" max_of_count: "máximo de {{count}}" + alternation: "ou" character_count: one: "{{count}} caracter" other: "{{count}} caracteres" @@ -209,7 +226,7 @@ pt: view_pending: "ver mensagens pendentes" has_pending_posts: one: "Este tópico tem 1 mensagem à espera de aprovação" - many: "Este tópico tem {{count}} mensagens à espera de aprovação" + other: "Este tópico tem {{count}} mensagens à espera de aprovação" confirm: "Guardar Alterações" delete_prompt: "Tem a certeza que deseja eliminar %{username}? Isto irá remover todas as suas mensagens e bloquear os seus emails e endereços ip." approval: @@ -766,6 +783,7 @@ pt: hint: "(pode também arrastar o ficheiro para o editor para fazer o carregamento)" hint_for_supported_browsers: "(pode também arrastar ou colar imagens no editor de forma a carregá-las)" uploading: "A carregar" + select_file: "Selecionar Ficheiro" image_link: "hiperligação da imagem irá apontar para" search: title: "pesquisar tópicos, mensagens, utilizadores, ou categorias" @@ -1399,7 +1417,10 @@ pt: with_topics: "%{filter} tópicos" with_category: "%{filter} %{category} tópicos" latest: - title: "Recentes" + title: + zero: "Último" + one: "Último (1)" + other: "Últimos ({{count}})" help: "tópicos com mensagens recentes" hot: title: "Quente" @@ -1694,6 +1715,8 @@ pt: screened_email: "Exportar lista total de emails selecionados em formato CSV." screened_ip: "Exportar lista total de IP selecionados em formato CSV." screened_url: "Exportar lista total de URL selecionados em formato CSV." + export_json: + button_text: "Exportar" invite: button_text: "Enviar Convites" button_title: "Enviar Convites" @@ -1721,6 +1744,8 @@ pt: save: "Guardar" new: "Novo" new_style: "Novo Estilo" + import: "Importar" + import_title: "Selecione um ficheiro ou cole texto" delete: "Eliminar" delete_confirm: "Remover esta personalização?" about: "Modificar folha de estilo CSS e cabeçalhos HTML no sítio. Adicionar personalização para iniciar." @@ -1858,6 +1883,7 @@ pt: delete_post: "eliminar mensagem" impersonate: "personificar" anonymize_user: "tornar utilizador anónimo" + roll_up: "agregar blocos IP" screened_emails: title: "Emails Filtrados" description: "Quando alguém tenta criar uma nova conta, os seguintes endereços de email serão verificados e o registo será bloqueado, ou outra ação será executada." @@ -2341,10 +2367,10 @@ pt: description: Convidou um utilizador campaigner: name: Partidário - description: Convidou 3 membros + description: Convidou 3 utilizadores básicos (nível de confiança 1) champion: name: Campeão - description: Convidou 10 membros + description: Convidou 5 membros (nível de confiança 2) first_share: name: Primeira Partilha description: Partilhou uma mensagem diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 5afff3516d..1face4d87c 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -8,6 +8,9 @@ pt_BR: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ pt_BR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index d0725a61de..e081d645ec 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -8,6 +8,9 @@ ro: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -20,6 +23,9 @@ ro: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "HH:mm" long_no_year: "DD MMM HH:mm" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 10a1b83c7b..c66ffb5619 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -8,6 +8,9 @@ ru: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -21,6 +24,9 @@ ru: kb: КБ mb: МБ tb: ТБ + short: + thousands: "{{number}}тыс." + millions: "{{number}}млн" dates: time: "HH:mm" long_no_year: "D MMM HH:mm" @@ -114,6 +120,22 @@ ru: few: "%{count} дня назад" many: "%{count} дней назад" other: "%{count} дней назад" + later: + x_days: + one: "1 день спустя" + few: "%{count} дня спустя" + many: "%{count} дней спустя" + other: "%{count} дней спустя" + x_months: + one: "1 месяц спустя" + few: "%{count} месяца спустя" + many: "%{count} месяцев спустя" + other: "%{count} месяцев спустя" + x_years: + one: "1 год спустя" + few: "%{count} года спустя" + many: "%{count} лет спустя" + other: "%{count} лет спустя" share: topic: 'поделиться ссылкой на тему' post: 'ссылка на сообщение #%{postNumber}' @@ -146,7 +168,7 @@ ru: faq: "Вопрос-ответ" guidelines: "Руководство" privacy_policy: "Политика конфиденциальности" - privacy: "Конфиденциальность" + privacy: "Политика конфиденциальности" terms_of_service: "Условия предоставления услуг" mobile_view: "Для мобильных устройств" desktop_view: "Для настольных устройств" @@ -162,6 +184,7 @@ ru: every_two_weeks: "каждые две недели" every_three_days: "каждые 3 дня" max_of_count: "{{count}} макс." + alternation: "или" character_count: one: "{{count}} буква" few: "{{count}} буквы" @@ -249,8 +272,10 @@ ru: cancel: "Отменить" view_pending: "Просмотреть сообщения в очереди" has_pending_posts: - one: "В этой теме 1 сообщение ожидает проверки" - many: "В этой теме {{count}} сообщений ожидают проверки" + one: "В этой теме 1 сообщение, ожидающее проверки" + few: "В этой теме {{count}} сообщения, ожидающих проверки" + many: "В этой теме {{count}} сообщений, ожидающих проверки" + other: "В этой теме {{count}} сообщений, ожидающих проверки" confirm: "Сохранить" delete_prompt: "Вы уверены, что хотите удалить пользователя %{username}? Это приведет к удалению всех его сообщений, а также заблокирует email и ip адрес." approval: @@ -329,9 +354,9 @@ ru: '13': "Входящие" '14': "Ожидает одобрения" categories: - all: "все разделы" - all_subcategories: "все" - no_subcategory: "(нет)" + all: "Все разделы" + all_subcategories: "Все подкатегории" + no_subcategory: "Вне подкатегорий" category: "Раздел" posts: "Сообщения" topics: "Темы" @@ -401,6 +426,7 @@ ru: watched_categories: "Наблюдение" watched_categories_instructions: "Вы будете автоматически отслеживать все новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, плюс рядом со списком тем будет отображено количество новых сообщений." tracked_categories: "Отслеживаемые разделы" + tracked_categories_instructions: "Автоматически следить за всеми новыми темами из следующих разделов. Счетчик новых и непрочитанных сообщений будет появляться рядом с названием темы." muted_categories: "Выключенные разделы" muted_categories_instructions: "Вы не будете получать уведомления о новых темах в этих разделах. Также, они не будут показываться во вкладке Непрочитанное." delete_account: "Удалить мою учётную запись" @@ -820,9 +846,12 @@ ru: from_the_web: "From the web" remote_tip: "ссылка на изображение" remote_tip_with_attachments: "ссылка на изображение или файл ({{authorized_extensions}})" + local_tip: "Нажмите, чтобы выбрать до 10 картинок с вашего устройства" + local_tip_with_attachments: "Нажмите, чтобы выбрать до 10 картинок или файлов с вашего устройства ({{authorized_extensions}})" hint: "(вы так же можете перетащить объект в редактор для его загрузки)" hint_for_supported_browsers: "(вы так же можете перетащить или вставить изображения в редактор для загрузки их на сервер)" uploading: "Загрузка" + select_file: "Выбрать файл" image_link: "ссылка, на которую будет указывать ваше изображение" search: title: "поиск по темам, сообщениям, пользователям или разделам" @@ -972,17 +1001,23 @@ ru: '2_4': 'Вы будете получать уведомления, т.к. ответили в теме.' '2_2': 'Вы будете получать уведомления, т.к. следите за этой темой.' '2': 'Вы будете получать уведомления, т.к. читали эту тему.' + '1_2': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.' + '1': 'Вы будете получать уведомления, если кто-то упомянет ваш @псевдоним или ответит вам.' '0_7': 'Не получать уведомлений из этого раздела.' '0_2': 'Не получать уведомлений по этой теме.' '0': 'Не получать уведомлений по этой теме.' watching_pm: title: "Наблюдать" + description: "Уведомлять по каждому ответу на это сообщение и показывать счетчик новых непрочитанных ответов." watching: title: "Наблюдать" + description: "Уведомлять по каждому новому сообщению в этой теме и показывать счетчик новых непрочитанных ответов." tracking_pm: title: "Следить" + description: "Количество непрочитанных сообщений появится рядом с этим сообщением. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." tracking: title: "Следить" + description: "Количество непрочитанных сообщений появится рядом с названием этой темы. Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." regular: title: "Уведомлять" description: "Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." @@ -991,7 +1026,7 @@ ru: description: "Вам придёт уведомление, только если кто-нибудь упомянет ваш @псевдоним или ответит на ваше сообщение." muted_pm: title: "Без уведомлений" - description: "Вы не будете получать уведомлений, связанных с этой беседой." + description: "Никогда не получать уведомлений, связанных с этой беседой." muted: title: "Без уведомлений" description: "Никогда не получать уведомлений, связанных с этой темой, и не показывать ее во вкладке «Непрочитанные»." @@ -1413,14 +1448,16 @@ ru: notifications: watching: title: "Наблюдать" - description: "Вы будете автоматически отслеживать все новые темы в этих разделах. Вам будут приходить уведомления о новых сообщениях и темах, плюс рядом со списком тем будет отображено количество новых ответов на ваши сообщения." + description: "Автоматически наблюдать за всеми новыми темами в этих разделах и уведомлять меня о новых сообщениях в них. Счетчик новых сообщений будет появляться рядом с названием темы." tracking: title: "Следить" + description: "Автоматически следить за всеми новыми темами в этих разделах. Счетчик новых сообщений будет появляться рядом с названием темы." regular: title: "Уведомлять" + description: "Уведомлять, если кто-нибудь упомянет мой @псевдоним или ответит на мое сообщение." muted: title: "Без уведомлений" - description: "Не получать уведомлений о новых темах из этих разделов и не показывать новые темы во вкладке «Непрочитанные»." + description: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»." flagging: title: 'Спасибо за вашу помощь!' private_reminder: 'жалобы анонимны и видны только персоналу' @@ -1519,7 +1556,10 @@ ru: with_topics: "%{filter} темы" with_category: "%{filter} %{category} темы" latest: - title: "Последние" + title: + zero: "Последние" + one: "Последние (1)" + other: "Последние ({{count}})" help: "темы с недавними сообщениями" hot: title: "Популярные" @@ -1631,11 +1671,11 @@ ru: last_7_days: "7 дней" last_30_days: "30 дней" all_time: "За все время" - 7_days_ago: "7 дней" - 30_days_ago: "30 дней" - all: "Все" - view_table: "таблица" - view_chart: "гистограмма" + 7_days_ago: "7 дней назад" + 30_days_ago: "30 дней назад" + all: "Всего" + view_table: "Таблица" + view_chart: "Гистограмма" refresh_report: "Обновить отчет" start_date: "Дата от" end_date: "Дата до" @@ -1824,6 +1864,8 @@ ru: screened_email: "Экспортировать список email-адресов в CSV формате." screened_ip: "Экспортировать список IP в CSV формате." screened_url: "Экспортировать список URL-адресов в CSV формате." + export_json: + button_text: "Экспорт" invite: button_text: "Отправить приглашения" button_title: "Отправить приглашения" @@ -1851,6 +1893,8 @@ ru: save: "Сохранить" new: "Новое" new_style: "Новый стиль" + import: "Импорт" + import_title: "Выберите файл или вставьте текст" delete: "Удалить" delete_confirm: "Удалить настройки?" about: "Измените CSS стили и HTML заголовки на сайте. Чтобы начать, внесите правки." @@ -2487,14 +2531,14 @@ ru: name: Первая жалоба description: Помог модератору, обратив его внимание на проблемное сообщение promoter: - name: Покровитель - description: Приглашенный пользователь + name: Промоутер + description: Пригласил нового пользователя campaigner: - name: участник кампании - description: Приглашено 3 участника + name: Активист + description: Пригласил троих пользователей, достигших 1-го уровня доверия champion: name: Чемпион - description: Приглашено 10 участников + description: Пригласил пятерых пользователей, достигших 2-го уровня доверия first_share: name: Первый вклад в популярность description: Впервые поделился ссылкой на сообщение @@ -2505,8 +2549,8 @@ ru: name: Первая цитата description: Процитировал другого пользователя read_guidelines: - name: Прочитавший руководство - description: Прочитал руководство сообщества + name: Руководство пользователя + description: Прочитал руководство пользователя reader: name: Читатель description: Прочитал каждое сообщение в теме с более чем 100 сообщениями diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 6c5b418cbc..ebb45125fa 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -8,6 +8,9 @@ sq: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ sq: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 5505456261..11824cc4c5 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -8,6 +8,9 @@ sv: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ sv: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" @@ -82,6 +88,16 @@ sv: x_days: one: "1 dag sedan" other: "%{count} dagar sedan" + later: + x_days: + one: "1 dag senare" + other: "%{count} dagar senare" + x_months: + one: "1 månad senare" + other: "%{count} månader senare" + x_years: + one: "1 år senare" + other: "%{count} år senare" share: topic: 'dela en länk till denna tråd' post: 'inlägg #%{postNumber}' @@ -91,7 +107,7 @@ sv: google+: 'dela denna länk på Google+' email: 'skicka denna länk i ett email' topic_admin_menu: "ämne admin åtgärder" - emails_are_disabled: "Alla utgående email har blivit deaktiverad av en administratör. Inga kungörelser av någon sort kommer att bli skickad." + emails_are_disabled: "All utgående e-post har blivit globalt deaktiverad av en administratör. Inga e-postnotifikationer av något slag kommer att skickas ut." edit: 'redigera titel och kategori för denna tråd' not_implemented: "Denna funktion har inte implementerats än, vi beklagar!" no_value: "Nej" @@ -114,7 +130,7 @@ sv: guidelines: "Riktlinjer" privacy_policy: "Integritetspolicy" privacy: "Integritet" - terms_of_service: "Villkor" + terms_of_service: "Användarvillkor" mobile_view: "Mobilvy" desktop_view: "Desktop-vy" you: "Du" @@ -129,6 +145,7 @@ sv: every_two_weeks: "varannan vecka" every_three_days: "var tredje dag" max_of_count: "max av {{count}}" + alternation: "eller" character_count: one: "{{count}} tecken" other: "{{count}} tecken" @@ -191,6 +208,7 @@ sv: switch_from_anon: "Avsluta anonymt läge" banner: close: "Stäng denna banner" + edit: "Redigera denna banner >>" choose_topic: none_found: "Inga ämnen hittades." title: @@ -207,8 +225,8 @@ sv: cancel: "Avbryt" view_pending: "visa väntande inlägg" has_pending_posts: - one: "Detta ämne har 1 inlägg som inväntar godkännande" - many: "Detta ämne har {{count}} inlägg som inväntar godkännande" + one: "Detta ämne har 1 ämne som inväntar godkännande" + other: "Detta ämne har {{count}} inlägg som inväntar godkännande" confirm: "Spara ändringar" delete_prompt: "Är du säker på att du vill ta bort %{username}? Detta kommer ta bort all deras poster och blockera deras epostadresser samt IP-adresser." approval: @@ -223,8 +241,8 @@ sv: you_posted_topic: "Du postade titeln" user_replied_to_post: "{{user}} svarade på {{post_number}}" you_replied_to_post: "Du svarade på {{post_number}}" - user_replied_to_topic: "{{user}} svarade på tråden" - you_replied_to_topic: "Du svarade på tråden" + user_replied_to_topic: "{{user}} svarade på ämnet" + you_replied_to_topic: "Du svarade på ämnet" user_mentioned_user: "{{user}} nämnde {{another_user}}" user_mentioned_you: "{{user}} nämnde dig" you_mentioned_user: "Du nämnde {{another_user}}" @@ -248,7 +266,7 @@ sv: days_visited: "Besök" days_visited_long: "Dagar Besökta" posts_read: "Läst" - posts_read_long: "Lästa trådar" + posts_read_long: "Lästa ämnen" total_rows: one: "1 användare" other: "%{count} användare" @@ -257,15 +275,15 @@ sv: title: one: "grupp" other: "grupper" - members: "medlemmar" - posts: "inlägg" + members: "Medlemmar" + posts: "Inlägg" alias_levels: title: "Vem kan använda denna grupp som ett alias?" - nobody: "ingen" - only_admins: "bara admins" - mods_and_admins: "bara moderatorer och admins" - members_mods_and_admins: "bara gruppmedlemmar, moderatorer och admins" - everyone: "alla" + nobody: "Ingen" + only_admins: "Bara administratörer" + mods_and_admins: "Bara moderatorer och administratörer" + members_mods_and_admins: "Bara gruppmedlemmar, moderatorer och administratörer" + everyone: "Alla" user_action_groups: '1': "Gillningar givna" '2': "Gillningar mottagna" @@ -286,15 +304,15 @@ sv: no_subcategory: "ingen" category: "Kategori" posts: "Inlägg" - topics: "Diskussioner" + topics: "Ämnen" latest: "Senaste" latest_by: "senast av" toggle_ordering: "slå av/på sorteringskontroll" - subcategories: "Underkategorier:" - topic_stats: "Antal nya trådar" + subcategories: "Underkategorier" + topic_stats: "Antalet nya ämnen." topic_stat_sentence: - one: "%{count} ny tråd under den senaste %{unit}." - other: "%{count} nya trådar under den senaste %{unit}." + one: "%{count} nytt ämne under den senaste %{unit}." + other: "%{count} nya ämnen under den senaste %{unit}." post_stats: "Antalet nya inlägg." post_stat_sentence: one: "%{count} nytt inlägg under den senaste %{unit}." @@ -311,15 +329,15 @@ sv: username: "användarnamn" trust_level: "TL" read_time: "lästid" - topics_entered: "ämnen skapade" + topics_entered: "besökta ämnen" post_count: "# inlägg" confirm_delete_other_accounts: "Är du säker på att du vill ta bort dessa här konton?" user: - said: "{{användarnamn}}:" + said: "{{username}}:" profile: "Profil" mute: "Dämpa" edit: "Redigera inställningar" - download_archive: "Ladda ner Mina Bilder" + download_archive: "Ladda ned mina inlägg" new_private_message: "Nytt meddelande" private_message: "Meddelande" private_messages: "Meddelanden" @@ -333,6 +351,7 @@ sv: dismiss_notifications: "Markera alla som lästa" dismiss_notifications_tooltip: "Markera alla olästa aviseringar som lästa" disable_jump_reply: "Hoppa inte till mitt inlägg efter att jag har svarat" + dynamic_favicon: "Visa antal nya / uppdaterade ämnen på webbläsarikon" edit_history_public: "Låt andra användare se mina ändringar" external_links_in_new_tab: "Öppna alla externa länkar i en ny flik" enable_quoting: "Aktivera citatsvar för markerad text" @@ -346,10 +365,11 @@ sv: github_profile: "Github" mailing_list_mode: "Skicka mig e-post för varje nytt inlägg (om jag inte tystat ämnet eller kategorin)" watched_categories: "Tittade på" - tracked_categories: "Följd" + watched_categories_instructions: "Du kommer automatiskt att bevaka alla nya ämnen i dessa kategorier. Du blir notifierad om alla nya inlägg och ämnen, och en räknare över antalet nya inlägg visas bredvid ämnet." + tracked_categories: "Bevakade" tracked_categories_instructions: "Du kommer automatiskt att följa alla nya ämnen i dessa kategorier. Antalet nya inlägg visas bredvid ämnet." muted_categories: "Tystad" - muted_categories_instructions: "Du kommer inte att få notifieringar om nya trådar inom dessa kategorier, och de kommer inte att visas under din \"oläst\"-tab." + muted_categories_instructions: "Du kommer inte att få notifieringar om nya ämnen inom dessa kategorier, och de kommer inte att visas under din \"oläst\"-flik." delete_account: "Radera mitt konto" delete_account_confirm: "Är du säker på att du vill ta bort ditt konto permanent? Denna åtgärd kan inte ångras!" deleted_yourself: "Ditt konto har tagits bort." @@ -374,14 +394,14 @@ sv: in_progress: "(skickar e-brev)" error: "(fel)" action: "Skicka email för att återställa lösenord" - set_password: "välj lösenord" + set_password: "Ange lösenord" change_about: title: "Ändra Om Mig" error: "Ett fel inträffade när beskrivningen skulle sparas. " change_username: - title: "Byt Användarnamn" - confirm: "Det kan finnas konsekvenser till att byta ditt användarnamn. Är du helt säker på att du vill?" - taken: "Tyvärr det användarnamnet är taget." + title: "Byt användarnamn" + confirm: "Om du byter ditt användarnamn, kommer alla tidigare citeringar av dina inlägg och @namn-omnämningar att bli trasiga. Är du helt säker på att du vill?" + taken: "Tyvärr, det användarnamnet är taget." error: "Det uppstod ett problem under bytet av ditt användarnamn." invalid: "Det användarnamnet är ogiltigt. Det får bara innehålla siffror och bokstäver" change_email: @@ -410,8 +430,8 @@ sv: email: title: "E-post" instructions: "Visas aldrig publikt" - ok: "Vi skickar e-post till dig för bekräftelse." - invalid: "Vänligen ange en giltig e-postadress." + ok: "Vi skickar e-post till dig för bekräftelse" + invalid: "Vänligen ange en giltig e-postadress" authenticated: "Din e-postadress har blivit verifierad av {{provider}}" frequency: zero: "Vi kommer att skicka e-post till dig omedelbart om du inte har läst det som vi skickar e-post till dig om." @@ -437,7 +457,7 @@ sv: enter_email: 'Annvändarnamn hittat; ange matchande e-postadress' prefilled: "E-postadressen matchar det här registrerade användarnamnet" locale: - title: "gränssnittsspråk" + title: "Gränssnittsspråk" instructions: "Språket som används av forumsgränssnittet. Det kommer att ändras när du laddar om sidan." default: "(förvalt värde)" password_confirmation: @@ -464,7 +484,7 @@ sv: other_settings: "Övrigt" categories_settings: "Kategorier" new_topic_duration: - label: "Betrakta trådar som nya när" + label: "Betrakta ämnen som nya när" not_viewed: "Jag har inte tittat dom än" last_here: "skapade sen mitt senaste besök" after_n_days: @@ -473,7 +493,7 @@ sv: after_n_weeks: one: "skapad den senaste veckan" other: "skapad de senaste {{count}} veckorna" - auto_track_topics: "Följ automatiskt nya trådar jag går in i" + auto_track_topics: "Följ automatiskt nya ämnen jag går in i" auto_track_options: never: "aldrig" immediately: "genast" @@ -492,7 +512,7 @@ sv: redeemed: "Inlösta Inbjudnignar" redeemed_at: "Inlöst" pending: "Avvaktande Inbjudningar" - topics_entered: "Besökta trådar" + topics_entered: "Besökta ämnen" posts_read_count: "Inlägg Lästa" expired: "Denna inbjudan har gått ut." rescind: "Ta bort" @@ -524,6 +544,7 @@ sv: title: "IP-adress vid registrering" avatar: title: "Profil Bild" + header_title: "profil, meddelanden, bokmärken och inställningar" title: title: "Titel" filters: @@ -532,7 +553,7 @@ sv: posted_by: "Postat av" sent_by: "Skickat av" private_message: "meddelande" - the_topic: "tråden" + the_topic: "ämnet" loading: "Laddar..." errors: prev_page: "medan vi försökte ladda" @@ -579,7 +600,7 @@ sv: enabled_description: "Sammanfattning över de inlägg som användarna tycker är mest intressanta." description: "Det finns {{count}} svar." description_time: "Det finns {{count}} svar med en uppskattad lästid på {{readingTime}} minuter." - enable: 'Sammanfatta denna tråd' + enable: 'Sammanfatta detta ämne' disable: 'Visa alla inlägg' deleted_filter: enabled_description: "Den här diskussionen innehåller borttagna inlägg som har dolts." @@ -652,14 +673,15 @@ sv: apple_international: "Apple/International" google: "Google" twitter: "Twitter" + emoji_one: "Emoji Ett" composer: emoji: "Emoji :smile:" add_warning: "Det här är en officiell varning" - posting_not_on_topic: "Du svarar på tråden \"{{title}}\", men du besöker just nu en annan tråd." + posting_not_on_topic: "Vilket ämne vill du svara på?" saving_draft_tip: "sparar…" saved_draft_tip: "sparat" saved_local_draft_tip: "sparat lokalt" - similar_topics: "Din tråd liknar..." + similar_topics: "Ditt ämne liknar..." drafts_offline: "utkast offline" error: title_missing: "Du måste ange en rubrik" @@ -670,7 +692,7 @@ sv: try_like: 'Har du provat -knappen?' category_missing: "Du måste välja en kategori" save_edit: "Spara Ändring" - reply_original: "Svara på Ursprungstråd" + reply_original: "Svara på ursprungsämnet" reply_here: "Svara Här" reply: "Svara" cancel: "Avbryt" @@ -714,11 +736,11 @@ sv: redo_title: "Återställ" help: "Markdown Redigeringshjälp" toggler: "Dölj eller visa composer-panelen" - admin_options_title: "Valfria personalinställningar för den här tråden" + admin_options_title: "Valfria personalinställningar för detta ämne" auto_close: - label: "Stäng automatiskt tråden efter:" + label: "Stäng automatiskt ämnet efter:" error: "Vänligen ange ett giltigt värde." - based_on_last_post: "Stäng inte förrän det sista inlägget i tråden är åtminstone så här gammalt." + based_on_last_post: "Stäng inte förrän det sista inlägget i ämnet är åtminstone så här gammalt." all: examples: 'Ange antalet timmar (24), klockslag (17:30) eller tidstämpel (2013-11-22 14:00).' limited: @@ -756,13 +778,15 @@ sv: from_the_web: "Från webben" remote_tip: "länk till bild" remote_tip_with_attachments: "länk till bild eller fil ({{authorized_extensions}})" + local_tip: "klicka för att välja upp till 10 bilder från din enhet" local_tip_with_attachments: "klicka för att välja upp till 10 bilder eller filer från din enhet ({{authorized_extensions}})" hint: "(du kan också dra & släppa in i redigeraren för att ladda upp dem)" hint_for_supported_browsers: "(du kan också dra och släppa eller klistra in bilder i redigeraren för att ladda upp dem)" uploading: "Laddar upp bild" + select_file: "Välj fil" image_link: "länk dit din bild ska peka" search: - title: "sök efter trådar, inlägg, användare, eller kategorier" + title: "sök efter ämnen, inlägg, användare, eller kategorier" no_results: "Inga resultat hittades." searching: "Söker ..." post_format: "#{{post_number}} av {{username}}" @@ -771,7 +795,7 @@ sv: category: "Sök i kategorin \"{{category}}\"" topic: "Sök i denna diskussion" private_messages: "Sök meddelanden" - site_map: "gå till en annan trådlista eller kategori" + site_map: "gå till en annan ämneslista eller kategori" go_back: 'gå tillbaka' not_logged_in_user: 'användarsida med sammanställning av aktuell aktivitet och inställningar' current_user: 'gå till din användarsida' @@ -784,98 +808,98 @@ sv: dismiss_topics: "Avfärda Diskussioner" dismiss_topics_tooltip: "Sluta visa mig dessa diskussioner i min olästalista när nya inlägg har gjorts" dismiss_new: "Avfärda Nya" - toggle: "toggla val av multipla trådar" + toggle: "toggla val av multipla ämnen" actions: "Massändringar" change_category: "Ändra kategori" - close_topics: "Stäng trådar" - archive_topics: "Arkivera trådar" + close_topics: "Stäng ämnen" + archive_topics: "Arkivera ämnen" notification_level: "ändra notifieringsnivå" choose_new_category: "Välj den nya kategorin för ämnena:" selected: one: "Du har markerat 1 diskussion." other: "Du har markerat {{count}} diskussioner." none: - unread: "Du har inga olästa trådar att läsa." - new: "Du har inga nya trådar att läsa." - read: "Du har inte läst några trådar än." - posted: "Du har inte postat i några trådar än." - latest: "Det finns inga senaste trådar. Det är lite sorgligt." - hot: "Det finns inga heta trådar." + unread: "Du har inga olästa ämnen." + new: "Du har inga nya ämnen." + read: "Du har inte läst några ämnen ännu." + posted: "Du har inte postat i några ämnen ännu." + latest: "Det finns inga senaste ämnen, tråkigt nog." + hot: "Det finns inga heta ämnen." bookmarks: "Du har inga bokmärkta ämnen ännu." - category: "Det finns inga {{category}}-trådar." - top: "Det finns inga topptrådar." + category: "Det finns inga ämnen i {{category}}." + top: "Det finns inga toppämnen." search: "Inga sökresultat hittades." educate: - new: '

    Dina nya trådar hamnar här.

    Som standard är trådar sedda som nya och kommer att visa en ny indikator om de skapats de senaste 2 dagarna.

    Du kan ändra detta i dina inställningar.

    ' - unread: '

    Dina olästa trådar hamnar här

    Som standard är trådar sedda som olästa och kommer att visa antal olästa 1 om du:

    • Skapade tråden
    • Svarade på tråden
    • Läst tråden längre än 4 minuter

    Eller om du explicit har satt tråden till Följd eller Sedd via notifieringspanelen längst ned i varje tråd.

    Du kan ändra detta i dina inställningar.

    ' + new: '

    Dina nya ämnen hamnar här.

    Som standard är ämnen sedda som nya och kommer att visa en ny indikator om de skapats de senaste 2 dagarna.

    Du kan ändra detta i dina inställningar.

    ' + unread: '

    Dina olästa ämnen hamnar här

    Som standard är ämnen sedda som olästa och kommer att visa antal olästa 1 om du:

    • Skapade ämnet
    • Svarade på ämnet
    • Läst ämnet längre än 4 minuter

    Eller om du explicit har satt ämnet till Följd eller Sedd via notifieringspanelen längst ned i varje ämne.

    Du kan ändra detta i dina inställningar.

    ' bottom: - latest: "Det finns inga fler senaste trådar att läsa." - hot: "Det finns inga fler heta trådar att läsa." - posted: "Det finns inga fler postade trådar att läsa" - read: "Det finns inga fler lästa trådar att läsa." - new: "Det finns inga fler nya trådar att läsa." - unread: "Det finns inga fler oläsa trådar att läsa." - category: "Det finns inga fler {{category}}-trådar." - top: "Det finns inga fler topptrådar." + latest: "Det finns inga fler senaste ämnen." + hot: "Det finns inga fler heta ämnen." + posted: "Det finns inga fler postade ämnen." + read: "Det finns inga fler lästa ämnen." + new: "Det finns inga fler nya ämnen." + unread: "Det finns inga fler olästa ämnen." + category: "Det finns inga fler ämnen i {{category}}." + top: "Det finns inga fler toppämnen." bookmarks: "Inga fler bokmärkta ämnen hittades." search: "Inga fler sökresultat hittades." topic: - filter_to: "{{post_count}} inlägg i tråd" - create: 'Ny tråd' - create_long: 'Skapa en ny tråd' + filter_to: "{{post_count}} inlägg i ämne" + create: 'Nytt ämne' + create_long: 'Skapa ett nytt ämne' private_message: 'Skriv meddelande' - list: 'Trådar' - new: 'ny tråd' + list: 'Ämnen' + new: 'nytt ämne' unread: 'oläst' new_topics: - one: '1 ny tråd' - other: '{{count}} nya trådar' + one: '1 nytt ämne' + other: '{{count}} nya ämnen' unread_topics: - one: '1 oläst tråd' - other: '{{count}} olästa trådar' - title: 'Tråd' + one: '1 oläst ämne' + other: '{{count}} olästa ämnen' + title: 'Ämne' invalid_access: - title: "Tråden är privat" - description: "Tyvärr, du har inte behörighet till den tråden." + title: "Ämnet är privat" + description: "Tyvärr, du har inte behörighet till det ämnet!" login_required: "Du måste logga in för att se den här diskussionen." server_error: - title: "Tråden misslyckades med att ladda" - description: "Tyvärr, vi kunde inte ladda den tråden, troligen p.g.a. ett anslutningsproblem. Var go försök igen. Om problemet kvarstår, låt oss gärna veta det!" + title: "Ämnet misslyckades med att ladda" + description: "Tyvärr, vi kunde inte ladda det ämnet, möjligtvis på grund av ett anslutningsproblem. Var god och försök igen. Om problemet kvarstår, hör av dig till oss." not_found: - title: "Tråden hittades inte" - description: "Tyvärr, vi kunde inte hitta den tråden. Kanske har den tagits bort av en moderator?" + title: "Ämnet hittades inte" + description: "Tyvärr, vi kunde inte hitta det ämnet. Kanske har den tagits bort av en moderator?" total_unread_posts: one: "du har 1 oläst inlägg i den här diskussionen" other: "du har {{count}} olästa inlägg i den här diskussionen" unread_posts: one: "du har 1 oläst gammalt inlägg i den här tråden" - other: "du har {{count}} olästa gamla inlägg i den här tråden" + other: "du har {{count}} olästa gamla inlägg i det här ämnet" new_posts: one: "det finns 1 nytt inlägg i den här tråden sedan du senast läste den" - other: "det finns {{count}} nya inlägg i den här tråden sedan du senast läste den" + other: "det finns {{count}} nya inlägg i det här ämnet sedan du senast läste det" likes: one: "det finns 1 gillning i den här tråden" - other: "det finns {{count}} gillningar i den här tråden" - back_to_list: "Tillbaka till Trådlistan" - options: "Trådinställningar" - show_links: "visa länkar som finns i den här tråden" - toggle_information: "slå av/på tråddetaljer" - read_more_in_category: "Vill du läsa mer? Bläddra bland andra trådar i {{catLink}} eller {{latestLink}}." + other: "det finns {{count}} gillningar i det här ämnet" + back_to_list: "Tillbaka till ämneslistan" + options: "Ämnesinställningar" + show_links: "visa länkar som finns i det här ämnet" + toggle_information: "slå av/på ämnesdetaljer" + read_more_in_category: "Vill du läsa mer? Bläddra bland andra ämnen i {{catLink}} eller {{latestLink}}." read_more: "Vill du läsa mer? {{catLink}} eller {{latestLink}}." read_more_MF: "Det finns { UNREAD, plural, =0 {} one { 1 oläst } other { # olästa } } { NEW, plural, =0 {} one { {BOTH, select, true{och } false {} other{}} 1 nytt ämne} other { {BOTH, select, true{och } false {} other{}} # nya ämnen} } kvar, eller {CATEGORY, select, true {bläddra bland andra ämnen i {catLink}} false {{latestLink}} other {}}" browse_all_categories: Bläddra bland alla kategorier - view_latest_topics: se de senaste trådarna - suggest_create_topic: Varför inte skapa en tråd? + view_latest_topics: visa senaste ämnen + suggest_create_topic: Varför inte skapa ett ämne? jump_reply_up: hoppa till tidigare svar jump_reply_down: hoppa till senare svar - deleted: "Tråden har raderats" - auto_close_notice: "Den här tråden kommer att stängas automatiskt %{timeLeft}." + deleted: "Ämnet har raderats" + auto_close_notice: "Det här ämnet kommer att stängas automatiskt %{timeLeft}." auto_close_notice_based_on_last_post: "Ämnet stängs %{duration} efter sista svaret." auto_close_title: 'Stäng Inställningar automatiskt' auto_close_save: "Spara" - auto_close_remove: "Stäng inte den här tråden automatiskt" + auto_close_remove: "Stäng inte det här ämnet automatiskt" progress: - title: trådplacering + title: ämnesframsteg go_top: "toppen" go_bottom: "botten" go: "gå" @@ -887,62 +911,100 @@ sv: notifications: reasons: '3_6': 'Du kommer att få notifikationer eftersom du bevakar denna kategori.' - '3_5': 'Du kommer att få notifikationer eftersom du började följa den här tråden automatiskt.' - '3_2': 'Du kommer ta emot notifikationer för att du kollar in denna tråd.' - '3_1': 'Du kommer ta emot notifikationer för att du skapade denna tråd.' - '3': 'Du kommer ta emot notifikationer för att du kollar in denna tråd.' + '3_5': 'Du kommer att ta emot notifikationer eftersom du började följa det här ämnet automatiskt.' + '3_2': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.' + '3_1': 'Du kommer ta emot notifikationer för att du skapade detta ämne.' + '3': 'Du kommer att ta emot notifikationer för att du bevakar detta ämne.' '2_8': 'Du kommer att få notifikationer eftersom du följer denna kategori.' - '2_4': 'Du kommer ta emot notifikationer för att du postade ett svar till denna tråd.' - '2_2': 'Du kommer ta emot notifikationer för att du följer denna tråd.' - '2': 'Du kommer ta emot notifikationer för att du läser denna tråd.' + '2_4': 'Du kommer att ta emot notifikationer för att du postade ett svar till detta ämne.' + '2_2': 'Du kommer att ta emot notifikationer för att du följer detta ämne.' + '2': 'Du kommer att ta emot notifikationer för att du läser detta ämne.' '1_2': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' '1': 'Du kommer få en notifiering om någon nämner ditt @namn eller svarar på ditt inlägg.' '0_7': 'Du ignorerar alla notifikationer i den här kategorin.' - '0_2': 'Du ignorerar alla notifikationer för denna tråd.' - '0': 'Du ignorerar alla notifikationer för denna tråd.' + '0_2': 'Du ignorerar alla notifikationer för detta ämne.' + '0': 'Du ignorerar alla notifikationer för detta ämne.' watching_pm: title: "följda" description: "Du kommer att få en notifiering för varje nytt svar i detta meddelande, samt en räknare med antalet nya svar." watching: title: "Kollar" + description: "Du kommer att notifieras om varje nytt svar i detta ämne, och ett räknare över nya svar visas." tracking_pm: title: "bevakade" + description: "En räknare över antal nya svar visas för detta meddelande. Du notifieras om någon nämner ditt @namn eller svarar dig." tracking: title: "Följer" + description: "En räknare över antal nya svar visas för detta ämne. Du notifieras om någon nämner ditt @namn eller svarar dig." regular: title: "Vanlig" description: "Du kommer att få en notifiering om någon nämner ditt @namn eller svarar dig." regular_pm: title: "Vanlig(t)" + description: "Du kommer att notifieras om någon nämner ditt @namn eller svarar dig." muted_pm: title: "tystade" + description: "Du kommer aldrig bli notifierad om något gällande detta meddelande." muted: title: "Dämpad" - description: "Du kommer aldrig meddelas om denna tråd alls, och den kommer inte visas i din flik med olästa." + description: "Du kommer aldrig meddelas om detta ämne alls, och den kommer inte visas i din \"oläst\"-flik." actions: - recover: "Återställ tråd" - delete: "Radera Tråd" - open: "Öppna Tråd" - close: "Stäng Tråd" + recover: "Återställ ämne" + delete: "Radera ämne" + open: "Öppna ämne" + close: "Stäng ämne" multi_select: "Välj inlägg..." - unarchive: "Dearkivera Tråd" - archive: "Arkivera Tråd" + auto_close: "Stäng automatiskt..." + pin: "Klistra ämne..." + unpin: "Avklistra ämne..." + unarchive: "Dearkivera ämne" + archive: "Arkivera ämne" invisible: "Markera Olistad" visible: "Markera Listad" reset_read: "Återställ Läsdata" + feature: + pin: "Klistra ämne" + unpin: "Avklistra ämne" + pin_globally: "Klistra ämne globalt" + make_banner: "Gör ämne till banner" + remove_banner: "Ta bort banner som ämne" reply: title: 'Svara' - help: 'börja komponera ett svar till denna tråd' + help: 'börja komponera ett svar till detta ämne' clear_pin: title: "Ta bort nål" - help: "Ta bort den nålade statusen från denna tråd så den inte längre hamnar i toppen av din trådlista" + help: "Ta bort den klistrade statusen från detta ämne så den inte längre hamnar i toppen av din ämneslista" share: title: 'Dela' - help: 'dela en länk till denna tråd' + help: 'dela en länk till detta ämne' flag_topic: title: 'Flagga' - help: 'flagga privat denna tråd för uppmärksamhet eller skicka en privat notifiering om den' - success_message: 'Du flaggade framgångsrikt denna tråd.' + help: 'flagga privat detta ämne för uppmärksamhet eller skicka en privat notifiering om den' + success_message: 'Du flaggade framgångsrikt detta ämne.' + feature_topic: + title: "Gör till utvalt ämne" + pin: "Gör detta ämne synligt i toppen av kategorin {{categoryLink}}." + confirm_pin: "Du har redan {{count}} klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne i denna kategori?" + unpin: "Ta bort detta ämne från toppen av kategorin {{categoryLink}}." + pin_note: "Användare kan avklistra ämnet individuellt för sig själva." + already_pinned: + zero: "Det finns inga klistrade ämnen i {{categoryLink}}." + one: "Klistrade ämnen i {{categoryLink}} just nu: 1." + other: "Klistrade ämnen i {{categoryLink}} just nu: {{count}}." + pin_globally: "Gör detta ämne synligt i toppen av alla ämneslistor, tills någon personal oklistrar den." + confirm_pin_globally: "Du har redan {{count}} globalt klistrade ämnen. För många klistrade ämnen kan vara störande för nya och anonyma användare. Är du säker på att du vill klistra ytterligare ett ämne globalt?" + unpin_globally: "Ta bort detta ämne från toppen av alla ämneslistor." + global_pin_note: "Användare kan avklistra ämnet individuellt för sig själva." + already_pinned_globally: + zero: "Det finns inga globalt klistrade ämnen." + one: "Globalt klistrade ämnen just nu: 1." + other: "Globalt klistrade ämnen just nu: {{count}}." + make_banner: "Gör detta ämne till en banner som dyker upp i toppen av alla sidor." + remove_banner: "Ta bort bannern som dyker upp i toppen av alla sidor." + banner_note: "Användare kan avfärda bannern genom att stänga det. Endast ett ämne kan agera banner åt gången." + already_banner: + zero: "Inget ämne är banner." + one: "Det är förnärvarande ett ämne som banner." inviting: "Bjuder in..." automatically_add_to_groups_optional: "Denna inbjudan inkluderar även tillgång till dessa grupper: (valfritt, enbart för administratörer)" automatically_add_to_groups_required: "Denna inbjudan inkluderar även tillgång till dessa grupper: (Krävs, enbart för admninistörer)" @@ -950,14 +1012,24 @@ sv: email_or_username: "Den Inbjudnas E-post eller Användarnamn" email_or_username_placeholder: "e-postadress eller användarnamn" action: "Bjud In" + success: "Vi har bjudit in användaren att delta i detta meddelande." error: "Tyvärr det uppstod ett fel under inbjudandet av den användaren." group_name: "gruppnamn" invite_reply: title: 'Bjud in' username_placeholder: "användarnamn" + action: 'Skicka inbjudan' + help: 'bjud in andra till detta ämne via e-post eller notifieringar' to_forum: "Vi skickar ett kort e-postmeddelande som tillåter din vän att omedelbart delta genom att klicka på en länk, ingen inloggning krävs." + sso_enabled: "Ange användarnamnet för personen du vill bjuda in till detta ämne." + to_topic_blank: "Ange användarnamnet eller e-postadressen för personen som du vill bjuda in till detta ämne." to_topic_email: "Du har angett en e-postadress. Vi skickar en inbjudan som ger din vän möjlighet att svara på detta ämne direkt." + to_topic_username: "Du har angett ett användarnamn. Vi skickar en notifiering med en länk som bjuder in de till detta ämne." + to_username: "Ange användarnamnet för personen du vill bjuda in. Vi skicka en notifiering med en länk som bjuder in de till detta ämne." email_placeholder: 'namn@exampel.se' + success_email: "Vi mailade ut en inbjudan till {{emailOrUsername}}. Vi meddelar dig när inbjudan lösts in. Kolla in inbjudningsfliken på din användarsida för att hålla koll på dina inbjudningar." + success_username: "Vi har bjudit in användaren att delta i detta ämne." + error: "Tyvärr, vi kunde inte bjuda in den personen. Personen kanske redan har blivit inbjuden? (Invites are rate limited)" login_reply: 'Logga in för att svara' filters: n_posts: @@ -965,20 +1037,20 @@ sv: other: "{{count}} inlägg" cancel: "Ta bort filter" split_topic: - title: "Flytta till nyn tråd" - action: "flytta till ny tråd" - topic_name: "Namn på ny tråd" - error: "Ett fel inträffade då inläggen skulle flyttas till den nya tråden." + title: "Flytta till nytt ämne" + action: "flytta till nytt ämne" + topic_name: "Nytt ämnesnamn" + error: "Ett fel inträffade då inläggen skulle flyttas till det nya ämnet." instructions: one: "Du är påväg att skapa en ny tråd och lägga inlägget du har valt i den." - other: "Du är påväg att skapa en ny tråd och lägga de {{count}} inlägg du har valt i den." + other: "Du är påväg att skapa en nytt ämne och lägga de {{count}} inlägg du har valt i den." merge_topic: - title: "Flytta till befintlig tråd" - action: "flytta till befintlig tråd" - error: "Ett fel inträffade då inlägg skulle flyttas till den tråden." + title: "Flytta till befintligt ämne" + action: "flytta till befintligt ämne" + error: "Ett fel inträffade då inlägg skulle flyttas till det ämnet." instructions: - one: "Välj vilken tråd du vill flytta det inlägget till." - other: "Välj vilken tråd du vill flytta de
    {{count}} inläggen till." + one: "Välj vilket ämne du vill flytta det inlägget till." + other: "Välj vilket ämne du vill flytta de
    {{count}} inläggen till." change_owner: title: "Ändra ägare av inlägg" action: "ändra ägare" @@ -1008,7 +1080,7 @@ sv: edit_reason: "Anledning:" post_number: "inlägg {{number}}" last_edited_on: "inlägg senast ändrat den" - reply_as_new_topic: "Svara i ny tråd" + reply_as_new_topic: "Svara som länkat ämne" continue_discussion: "Fortsätter diskussionen från {{postLink}}:" follow_quote: "gå till det citerade inlägget" show_full: "Via hela inlägget" @@ -1195,17 +1267,18 @@ sv: choose: 'Välj en kategori…' edit: 'ändra' edit_long: "Redigera" - view: 'Visa Trådar i Kategori' + view: 'Visa ämnen i kategori' general: 'Allmänt' settings: 'Inställningar' delete: 'Radera Kategori' create: 'Ny Kategori' save: 'Spara kategori' + slug_placeholder: '(Valfritt) streckade ord för url' creation_error: Det uppstod ett fel när kategorin skulle skapas. save_error: Ett fel inträffade då kategorin skulle sparas. name: "Kategorinamn" description: "Beskrivning" - topic: "Kategoritråd" + topic: "kategoriämne" logo: "Kategori Logotypbild" background_image: "Kategori Bakgrundsbild" badge_colors: "Emblemsfärg" @@ -1217,11 +1290,11 @@ sv: delete_error: "Ett fel inträffade vid borttagning av kategorin." list: "Lista Kategorier" no_description: "Lägg till en beskrivning för den här kategorin." - change_in_category_topic: "besök kategorins tråd för att ändra beskrivning" + change_in_category_topic: "Redigera beskrivning" already_used: 'Den här färgen används redan av en annan kategori' security: "Säkerhet" images: "Bilder" - auto_close_label: "Stäng automatiskt tråden efter:" + auto_close_label: "Stäng automatiskt ämnet efter:" auto_close_units: "timmar" email_in: "Egenvald inkommande e-postadress:" email_in_allow_strangers: "Acceptera e-post från anonyma användare utan konton" @@ -1239,6 +1312,7 @@ sv: notifications: watching: title: "Bevakar" + description: "Du kommer automatiskt bevaka alla nya ämnen i dessa kategorier. Du notifieras om alla nya inlägg och ämnen, och en räknare över antalet nya svar visas för dessa ämnen." tracking: title: "Följer" description: "Du kommer automatiskt att följa alla nya ämnen i dessa kategorier. Antalet olästa inlägg kommer att synas för dessa ämnen." @@ -1255,7 +1329,7 @@ sv: take_action: "Åtgärda" notify_action: 'Meddelande' delete_spammer: "Radera spammare" - delete_confirm: "Du håller på att radera %{posts} inlägg och %{topics} trådar från den här användaren, radera hans/hennes konto, blockera IP-adressen %{ip_address}, och lägga till email-adressen %{email} till en permanent blockeringslista. Är du säker på att den här användaren verkligen är en spammare?" + delete_confirm: "Du håller på att radera %{posts} inlägg och %{topics} ämnen från denna användare, radera hans/hennes konto, blockera IP-adressen %{ip_address}, och lägga till email-adressen %{email} till en permanent blockeringslista. Är du säker på att denna användare verkligen är en spammare?" yes_delete_spammer: "Ja, radera spammare" ip_address_missing: "(N/A)" hidden_email_address: "(gömd)" @@ -1274,10 +1348,11 @@ sv: left: "{{n}} kvar" flagging_topic: title: "Tack för att du hjälper oss hålla gemenskapen civiliserad!" - action: "Flagga tråd" + action: "Flagga ämne" notify_action: "Meddelande" topic_map: - title: "Sammanfattning av tråd" + title: "Sammanfattning av ämne" + participants_title: "Flitiga skribenter" links_title: "Populära länkar" links_shown: "visa alla {{totalLinks}} länkar..." clicks: @@ -1292,31 +1367,39 @@ sv: help: "Det här ämnet är stängt; det går inte längre att svara på inlägg" unpinned: title: "Avklistrat" + help: "Detta ämne är oklistrat för dig. Det visas i vanlig ordning" pinned_globally: title: "Klistrat Globalt" help: "Det här ämnet är klistrat globalt; det kommer att visas högst upp i alla listor" pinned: title: "Klistrat" + help: "Detta ämne är klistrat för dig. Det visas i toppen av dess kategori" archived: help: "Det här ämnet är arkiverat; det är fryst och kan inte ändras" invisible: help: "Det här ämnet är olistat; det kommer inte visas i ämneslistorna och kan bara nås via en direktlänk" posts: "Inlägg" posts_lowercase: "inlägg" - posts_long: "{{number}} inlägg i den här tråden" + posts_long: "det finns {{number}} inlägg i detta ämne" + posts_likes_MF: | + Detta ämne har {count, plural, one {1 svar} other {# svar}} {ratio, select, + low {med ett högt förhållande mellan gilla och inlägg} + med {med ett väldigt högt förhållande mellan gilla och inlägg} + high {med ett extremt högt förhållande mellan gilla och inlägg} + other {}} original_post: "Originalinlägg" views: "Visningar" views_lowercase: one: "visning" other: "visningar" replies: "Svar" - views_long: "denna tråd har visats {{number}} gånger" + views_long: "detta ämne har visats {{number}} gånger" activity: "Aktivitet" likes: "Gillningar" likes_lowercase: one: "gillar" other: "gillar" - likes_long: "det finns {{number}} gillningar i den här tråden" + likes_long: "det finns {{number}} gillningar i detta ämne" users: "Användare" users_lowercase: one: "användare" @@ -1332,27 +1415,30 @@ sv: with_topics: "%{filter} ämnen" with_category: "%{filter} %{category} ämnen" latest: - title: "Senaste" - help: "Trådar med nya inlägg" + title: + zero: "Senaste" + one: "Senaste (1)" + other: "Senaste ({{count}})" + help: "ämnen med nya inlägg" hot: title: "Hett" - help: "ett urval av de hetaste trådarna" + help: "ett urval av de hetaste ämnena" read: title: "Lästa" - help: "trådar du har läst, i den ordningen du senast läste dem" + help: "ämnen du har läst, i den ordningen du senast läste dem" search: title: "Sök" help: "sök alla ämnen" categories: title: "Kategorier" title_in: "Kategori - {{categoryName}}" - help: "alla trådar grupperade efter kategori" + help: "alla ämnen grupperade efter kategori" unread: title: zero: "Olästa" one: "Olästa (1)" other: "Olästa ({{count}})" - help: "Trådar du tittar på eller följer med olästa inlägg" + help: "ämnen som du bevakar eller följer med olästa inlägg" lower_title_with_count: one: "1 oläst" other: "{{count}} olästa" @@ -1368,7 +1454,7 @@ sv: help: "ämnen skapade de senaste dagarna" posted: title: "Mina Inlägg" - help: "trådar som du har postat i" + help: "ämnen som du har postat i" bookmarks: title: "Bokmärken" help: "Ämnen du har bokmärkt" @@ -1377,10 +1463,12 @@ sv: zero: "{{categoryName}}" one: "{{categoryName}} (1)" other: "{{categoryName}} ({{count}})" - help: "senaste trådarna i {{categoryName}}-kategorin" + help: "senaste ämnena i kategorin {{categoryName}}" top: title: "Topp" help: "de mest aktiva ämnena det senaste året, månaden, veckan och dagen" + all: + title: "All tid" yearly: title: "Årsvis" monthly: @@ -1389,10 +1477,12 @@ sv: title: "Veckovis" daily: title: "Dagligen" - this_year: "I år" - this_month: "Den här månaden" - this_week: "Den här veckan" + all_time: "All tid" + this_year: "År" + this_month: "Månad" + this_week: "Vecka" today: "Idag" + other_periods: "se toppen" browser_update: 'Tyvärr, din webbläsare är för gammal för att fungera på den här sidan. Vänligenuppgradera din webbläsare.' permission_types: full: "Skapa / svara / se" @@ -1472,13 +1562,13 @@ sv: delete_post_agree_flag_title: "Ta bort inlägg; om det är det första inlägget, ta bort ämnet" delete_flag_modal_title: "Ta bort och..." delete_spammer: "Radera spammare" - delete_spammer_title: "Radera användaren och alla hens inlägg och trådar." + delete_spammer_title: "Radera användaren och alla hans/hennes inlägg och ämnen." disagree_flag_unhide_post: "Håll inte med (avgöm inlägg)" disagree_flag_unhide_post_title: "Ta bort alla flaggor från detta inlägg och gör det synligt igen" disagree_flag: "Håll inte med" disagree_flag_title: "Neka den här flaggningen som ogiltig eller inkorrekt" clear_topic_flags: "Klar" - clear_topic_flags_title: "Tråden har undersökts och eventuella problem har lösts. Klicka på klar för att ta bort flaggorna." + clear_topic_flags_title: "Ämnet har undersökts och eventuella problem har lösts. Klicka på klar för att ta bort flaggorna." more: "(mer svar...)" dispositions: agreed: "Godkände" @@ -1491,7 +1581,7 @@ sv: error: "Någonting gick snett" reply_message: "Svara" no_results: "Det finns inga flaggor." - topic_flagged: "Denna tråd har blivit flaggad." + topic_flagged: "Detta ämne har blivit flaggad." visit_topic: "Besök ämnet för att vidta åtgärder" was_edited: "Inlägget redigerades efter den första flaggningen" previous_flags_count: "Det här inlägget har redan flaggats {{count}} gånger." @@ -1533,6 +1623,8 @@ sv: automatic: "Automatisk" automatic_membership_email_domains: "Användare som registrerar sig med en email där domänen liknar exact en av dom ovanstående domänerna kommer automatiskt att bli tillagd i den här gruppen:" automatic_membership_retroactive: "Avänd samma email domän regel för att lägga till nya avändare" + default_title: "Standardtitel för alla användare i denna grupp" + primary_group: "Automatiskt inställd som primär grupp" api: generate_master: "Generera API-huvudnyckel" none: "Det finns inga aktiva API-nycklar just nu." @@ -1619,6 +1711,8 @@ sv: screened_email: "Exportera hela e-postlistan i CSV-format." screened_ip: "Exportera hela IP-listan i CSV-format." screened_url: "Exportera hela URL-listan i CSV-format." + export_json: + button_text: "Exportera" invite: button_text: "Skicka inbjudningar" button_title: "Skicka inbjudan" @@ -1627,6 +1721,7 @@ sv: long_title: "Sidanpassningar" css: "CSS" header: "Sidhuvud" + top: "Toppen" footer: "Footer" head_tag: text: "" @@ -1645,6 +1740,8 @@ sv: save: "Spara" new: "Ny" new_style: "Ny Stil" + import: "Importera" + import_title: "Välj en fil eller klistra in text" delete: "Radera" delete_confirm: "Radera denna anpassning?" about: "Modifiera CSS stilmallar och HTML sidhuvuden på sidan. Lägg till en anpassning för att börja." @@ -1741,7 +1838,7 @@ sv: last_match_at: "Senast matchad" match_count: "Träffar" ip_address: "IP" - topic_id: "Tråd ID" + topic_id: "Ämnes-ID" post_id: "Inlägg ID" delete: 'Radera' edit: 'Redigera' @@ -1778,7 +1875,7 @@ sv: grant_badge: "ge utmärkelse" revoke_badge: "upphäv utmärkelse" check_email: "kolla epost" - delete_topic: "ta bort tråd" + delete_topic: "ta bort ämne" delete_post: "ta bort inlägg" impersonate: "imitera" anonymize_user: "Anonymisera användare" @@ -1872,7 +1969,7 @@ sv: suspend_reason: "Anledning" suspended_by: "Avstängd av" delete_all_posts: "Radera alla inlägg" - delete_all_posts_confirm: "Du är påväg att radera %{posts} inlägg och %{topics} trådar. Är du säker?" + delete_all_posts_confirm: "Du är påväg att radera %{posts} inlägg och %{topics} ämnen. Är du säker?" suspend: "Stäng av användare" unsuspend: "Lås upp användare" suspended: "Avstängd?" @@ -1900,10 +1997,10 @@ sv: activity: Aktivitet like_count: Gillningar Gedda / Mottagna last_100_days: 'de senaste 100 dagarna' - private_topics_count: Antal Privata Trådar + private_topics_count: Privata ämnen posts_read_count: Inlägg Lästa post_count: Inlägg Skapade - topics_entered: Besökta trådar + topics_entered: Besökta ämnen flags_given_count: Givna Flaggnignar flags_received_count: Mottagna Flaggningar warnings_received_count: Varningar Mottagningar @@ -1945,7 +2042,7 @@ sv: block_failed: 'Ett problem uppstod då användaren skulle blockeras.' deactivate_explanation: "En avaktiverad användare måste bekräfta sin emailadress igen." suspended_explanation: "En avstängd användare kan inte logga in." - block_explanation: "En blockerad användare kan inte posta inlägg eller starta trådar." + block_explanation: "En blockerad användare kan inte posta inlägg eller starta ämnen." trust_level_change_failed: "Ett problem uppstod då användarens förtroendenivå skulle ändras." suspend_modal_title: "Stäng av användare" trust_level_2_users: "Användare med Förtroendenivå 2" @@ -1961,7 +2058,7 @@ sv: requirement_heading: "krav" visits: "besök" days: "dagar" - topics_replied_to: "Trådar svarade på" + topics_replied_to: "Ämnen svarade på" topics_viewed: "Besökta Ämnen" topics_viewed_all_time: "Besökta Ämnen (totalt)" posts_read: "Lästa Inlägg" @@ -2040,6 +2137,7 @@ sv: developer: 'Utvecklare' embedding: "Inbäddning" uncategorized: 'Övrigt' + backups: "Säkerhetskopior" login: "Inloggning" plugins: "Tillägg" badges: @@ -2049,7 +2147,7 @@ sv: name: Namn badge: Utmärkelse display_name: Visa namn - description: beskrivning + description: Beskrivning badge_type: Utmärkelsetyp badge_grouping: Grupp badge_groupings: @@ -2057,8 +2155,8 @@ sv: granted_by: Utfärdad av granted_at: Utfärdad vid reason_help: (En länk till ett inlägg eller ämne) - save: spara - delete: ta bort + save: Spara + delete: Ta bort delete_confirm: Är du säker på att du vill ta bort den utmärkelsen? revoke: Upphäv reason: Anledning @@ -2070,19 +2168,34 @@ sv: grant: Utfärda no_user_badges: "%{name} har inte beviljats några utmärkelser." no_badges: Det finns inga utmärkelser som kan utfärdas. + none_selected: "Välj en utmärkelse för att komma igång" allow_title: Tillåt att utmärkelse används som titel multiple_grant: Kan utfärdas flera gånger listable: Visa utmärkelse på den offentliga utmärkelsesidan enabled: Aktivera utmärkelse icon: Ikon image: Bild + icon_help: "Använd antingen en Font Awesome-klass eller en URL till en bild" + trigger: Trigger trigger_type: none: "Uppdatera dagligen" + post_revision: "När en användare redigerar eller skapar ett inlägg" + trust_level_change: "När en användare byter förtroendenivå" + user_change: "När en användare redigeras eller skapas" preview: + link_text: "Förhandsvisa utfärdade utmärkelser" bad_count_warning: header: "VARNING!" + grant_count: + zero: "Inga utmärkelser som ska tilldelas." + one: "1 utmärkelse som ska tilldelas." + other: "%{count} utmärkelser som ska tilldelas." + sample: "Exempel:" grant: with: %{username} + with_post: %{username} för inlägg i %{link} + with_post_time: %{username} för inlägg i %{link} vid kl. %{time} + with_time: %{username} vid kl. %{time} emoji: title: "Emoji" help: "Lägg till en ny emoji för andra att använda. (TIPS: dra och släpp flera filer på en och samma gång)" @@ -2103,23 +2216,28 @@ sv: new: 'g, n Ny' unread: 'g, u Olästa' categories: 'g, c Kategorier' + top: 'g, t Upp till toppen' bookmarks: 'g, b Bokmärken' navigation: title: 'Navigering' jump: '# Gå till inlägg #' back: 'Tillbaka' - open: 'ö eller Välj Öppna vald tråd' + up_down: 'k/j Flytta markering ↑ ↓' + open: 'ö eller Välj Öppna valt ämne' next_prev: 'shift+j/shift+k Nästa/föregående avsnitt' application: - create: 's Skapa en ny tråd' + create: 's Skapa ett nytt ämne' notifications: 'n Öppna notifikationer' site_map_menu: '= Öppna webbplatsmeny' user_profile_menu: 'p Öppna användarmeny' show_incoming_updated_topics: '. Visa uppdaterade ämnen' search: 'Sök' help: '? Öppna tangentbordshjälp' + dismiss_new_posts: 'x, r Avfärda nya/inlägg' + dismiss_topics: 'x, t Avfärda ämnen' actions: title: 'Åtgärder' + pin_unpin_topic: 'shift+p Klistra/oklistra ämne' share_topic: 'shift+s Dela ämne' share_post: 's Dela inlägg' reply_as_new_topic: 't Svara med länkat ämne' @@ -2127,21 +2245,45 @@ sv: reply_post: 'r Svara på inlägg' quote_post: 'q Citera inlägg' like: 'Gilla inlägg' - flag: '! flagga inlägg' - bookmark: 'b bokmärk inlägg' - edit: 'e redigera inlägg' - delete: 'd radera inlägg' + flag: '! Flagga inlägg' + bookmark: 'b Bokmärk inlägg' + edit: 'e Redigera inlägg' + delete: 'd Radera inlägg' mark_muted: 'm, m Tysta ämne' + mark_regular: 'm, r Vanligt (standard) ämne' mark_tracking: 'm, t Följd diskussion' mark_watching: 'm, w Bevaka ämne' badges: title: Utmärkelser allow_title: "kan användas som titel" + multiple_grant: "kan tilldelas flera gånger" + badge_count: + one: "1 Utmärkelse" + other: "%{count} Utmärkelser" + more_badges: + one: "+1 till" + other: "+%{count} till" + granted: + one: "1 utfärdad" + other: "%{count} utfärdade" + select_badge_for_title: Välj en utmärkelse som används som din titel + none: "" + badge_grouping: + getting_started: + name: Komma igång + trust_level: + name: Förtroendenivå + other: + name: Övrigt + posting: + name: Inlägg badge: basic_user: name: Grundläggande member: name: Medlem + regular: + name: Vanligt leader: name: Ledare welcome: @@ -2163,14 +2305,14 @@ sv: name: Fantastiskt inlägg description: Fick 50 gilla på ett inlägg. Denna utmärkelse kan utfärdas flera gånger. nice_topic: - name: Bra tråd - description: Fick 10 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Bra ämne + description: Fick 10 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. good_topic: - name: Jättebra tråd - description: Fick 25 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Jättebra ämne + description: Fick 25 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. great_topic: - name: Fantastisk tråd - description: Fick 50 gilla på en tråd. Denna utmärkelse kan utfärdas flera gånger. + name: Fantastiskt ämne + description: Fick 50 gilla på ett ämne. Denna utmärkelse kan utfärdas flera gånger. nice_share: name: Bra delning description: Delade ett inlägg med 25 unika besökare @@ -2197,7 +2339,7 @@ sv: description: Delade ett inlägg first_link: name: Första länk - description: Länkade internt till en annan tråd + description: Länkade internt till ett annat ämne first_quote: name: Första citation description: Citerade en användare diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 9df92b323b..9a58660e77 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -8,6 +8,9 @@ te: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -19,6 +22,9 @@ te: kb: కేబీ mb: యంబీ tb: టీబీ + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "MMM D h:mm a" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 29f41d018c..c69547cbb1 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -8,6 +8,9 @@ tr_TR: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ tr_TR: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" @@ -66,6 +72,13 @@ tr_TR: other: "%{count} saat önce" x_days: other: "%{count} gün önce" + later: + x_days: + other: "%{count} gün sonra" + x_months: + other: "%{count} ay sonra" + x_years: + other: "%{count} yıl sonra" share: topic: 'bu konunun bağlantısını paylaşın' post: '#%{postNumber} nolu gönderiyi paylaşın' @@ -82,12 +95,12 @@ tr_TR: yes_value: "Evet" generic_error: "Üzgünüz, bir hata oluştu." generic_error_with_reason: "Bir hata oluştu: %{error}" - sign_up: "Hesap oluştur" - log_in: "Oturum aç" + sign_up: "Üye Ol" + log_in: "Giriş Yap" age: "Yaş" joined: "Katıldı" admin_title: "Yönetici" - flags_title: "Raporlar" + flags_title: "Bayraklar" show_more: "devamını göster" show_help: "yardım" links: "Bağlantılar" @@ -98,8 +111,8 @@ tr_TR: privacy_policy: "Gizlilik Sözleşmesi" privacy: "Gizlilik" terms_of_service: "Kullanım Koşulları" - mobile_view: "Mobil görünümü" - desktop_view: "Masaüstü görünümü" + mobile_view: "Mobil Görünüm" + desktop_view: "Masaüstü Görünüm" you: "Siz" or: "ya da" now: "hemen şimdi" @@ -112,10 +125,11 @@ tr_TR: every_two_weeks: "her iki haftada bir" every_three_days: "her üç günde bir" max_of_count: "azami {{count}}" + alternation: "ya da" character_count: other: "{{count}} karakter" suggested_topics: - title: "Önerilen konular" + title: "Önerilen Konular" about: simple_title: "Hakkında" title: "%{title} Hakkında" @@ -123,19 +137,19 @@ tr_TR: our_admins: "Yöneticilerimiz" our_moderators: "Moderatörlerimiz" stat: - all_time: "Tüm zamanlar" + all_time: "Tüm Zamanlar" last_7_days: "Son 7 gün" last_30_days: "Son 30 gün" like_count: "Beğeniler" topic_count: "Konular" post_count: "Gönderiler" - user_count: "Yeni kullanıcılar" + user_count: "Yeni Kullanıcılar" active_user_count: "Aktif Kullanıcılar" - contact: "Bize ulaşın" + contact: "Bize Ulaşın" contact_info: "Bu siteyi etkileyen kritik bir problem ya da acil bir durum oluştuğunda, lütfen %{contact_info} adresi üzerinden bizimle iletişime geçin." bookmarked: title: "İşaretle" - clear_bookmarks: "İşaretlenenleri yemizle" + clear_bookmarks: "İşaretlenenleri Temizle" help: bookmark: "Bu konudaki ilk gönderiyi işaretlemek için tıklayın" unbookmark: "Bu konudaki bütün işaretleri kaldırmak için tıklayın" @@ -144,7 +158,7 @@ tr_TR: created: "bu gönderiyi işaretlediniz" not_bookmarked: "bu gönderiyi okudunuz; işaretlemek için tıklayın" last_read: "bu okuduğunuz son gönderi; işaretlemek için tıklayın" - remove: "İşareti kaldır" + remove: "İşareti Kaldır" confirm_clear: "Bu konuya ait tüm işaretleri kaldırmak istediğinize emin misiniz?" topic_count_latest: other: "{{count}} yeni ya da güncellenmiş konular." @@ -155,19 +169,19 @@ tr_TR: click_to_show: "Görüntülemek için tıklayın." preview: "önizleme" cancel: "iptal" - save: "Değişiklikleri kaydet" + save: "Değişiklikleri Kaydet" saving: "Kaydediliyor..." saved: "Kaydedildi!" upload: "Yükle" uploading: "Yükleniyor..." uploaded: "Yüklendi!" enable: "Etkinleştir" - disable: "Devredışı bırak" - undo: "Geri al" - revert: "Eski haline getir" + disable: "Devredışı Bırak" + undo: "Geri Al" + revert: "Eski Haline Getir" failed: "Başarısız oldu" - switch_to_anon: "Anonim ol" - switch_from_anon: "Anonim modundan çık" + switch_to_anon: "Anonim Ol" + switch_from_anon: "Anonim Modundan Çık" banner: close: "Bu manşeti yoksay." edit: "Bu manşeti düzenle >>" @@ -180,19 +194,18 @@ tr_TR: topic: "Konu:" approve: 'Onayla' reject: 'Reddet' - delete_user: 'Kullanıcıyı sil' - title: "Onay gerektirir" + delete_user: 'Kullanıcıyı Sil' + title: "Onay Gerektirir" none: "Gözden geçirilecek bir gönderi yok." edit: "Düzenle" cancel: "İptal" view_pending: "bekleyen yazıları görüntüleyin" has_pending_posts: - one: "Onay bekleyen 1 yazı var" - many: "Onay bekleyen {{count}} yazı var" - confirm: "Düzenlemeleri kaydet" + other: "Bu ve {{count}} konu onay bekliyor." + confirm: "Düzenlemeleri Kaydet" delete_prompt: "%{username} kullanıcısını silmek istediğinize emin misiniz? Bu işlem kullanıcının tüm gönderilerini silecek, e-posta ve ip adresini engelleyecek." approval: - title: "Gönderi onay gerektirir" + title: "Gönderi Onay Gerektirir" description: "Gönderinizi aldık fakat gösterilmeden önce bir moderatör tarafından onaylanması gerekiyor. Lütfen sabırlı olun." pending_posts: other: "Bekleyen {{count}} yazınız bulunmaktadır." @@ -213,21 +226,21 @@ tr_TR: sent_by_you: "Sizin tarafınızdan yollandı" directory: filter_name: "kullanıcı adına göre filtrele" - title: "Tüm kullanıcılar" + title: "Kullanıcılar" likes_given: "Verilen" likes_received: "Alınan" topics_entered: "Açıldı" - topics_entered_long: "Açılan konular" - time_read: "Okuma zamanı" + topics_entered_long: "Açılan Konular" + time_read: "Okuma Zamanı" topic_count: "Konular" - topic_count_long: "Oluşturulan konular" + topic_count_long: "Oluşturulan Konular" post_count: "Cevaplar" - post_count_long: "Gönderilen cevaplar" + post_count_long: "Gönderilen Cevaplar" no_results: "Sonuç bulunamadı." days_visited: "Ziyaretler" - days_visited_long: "Ziyaret günleri" + days_visited_long: "Ziyaret Günü" posts_read: "Okunmuşlar" - posts_read_long: "Okunmuş gönderiler" + posts_read_long: "Okunmuş Gönderiler" total_rows: other: "%{count} kullanıcı" groups: @@ -238,14 +251,14 @@ tr_TR: posts: "Gönderiler" alias_levels: title: "Kimler bu grubu ikinci adı olarak kullanabilir?" - nobody: " Hiç kimse" - only_admins: "Sadece yöneticiler" - mods_and_admins: "Sadece moderatörler ve yöneticiler" - members_mods_and_admins: "Sadece grup üyeleri, moderatörler ve yöneticiler" + nobody: " Hiç Kimse" + only_admins: "Sadece Yöneticiler" + mods_and_admins: "Sadece Moderatörler ve Yöneticiler" + members_mods_and_admins: "Sadece Grup Üyeleri, Moderatörler ve Yöneticiler" everyone: "Herkes" user_action_groups: - '1': "Verilen beğeniler" - '2': "Alınan beğeniler" + '1': "Verilen Beğeniler" + '2': "Alınan Beğeniler" '3': "İşaretlenenler" '4': "Konular" '5': "Cevaplar" @@ -258,13 +271,13 @@ tr_TR: '13': "Gelen Kutusu" '14': "Bekleyen" categories: - all: "Tüm kategoriler" + all: "Tüm Kategoriler" all_subcategories: "hepsi" no_subcategory: "hiçbiri" category: "Kategori" posts: "Gönderiler" topics: "Konular" - latest: "En son" + latest: "En Son" latest_by: "son gönderen" toggle_ordering: "sıralama kontrolünü aç/kapa" subcategories: "Alt kategoriler" @@ -275,7 +288,7 @@ tr_TR: post_stat_sentence: other: "%{unit} beri %{count} yeni gönderi." ip_lookup: - title: IP adresi ara + title: IP Adresi Ara hostname: Sunucu ismi location: Yer location_not_found: (bilinmeyen) @@ -293,17 +306,17 @@ tr_TR: said: "{{username}}:" profile: "Profil" mute: "Sustur" - edit: "Ayarları düzenle" - download_archive: "Gönderilerimi indir" - new_private_message: "Yeni mesaj" + edit: "Ayarları Düzenle" + download_archive: "Gönderilerimi İndir" + new_private_message: "Yeni esaj" private_message: "Mesaj" private_messages: "Mesajlar" activity_stream: "Aktivite" preferences: "Seçenekler" bookmarks: "İşaretlenenler" bio: "Hakkımda" - invited_by: "Tarafından davet edildi" - trust_level: "Güven seviyesi" + invited_by: "Tarafından Davet Edildi" + trust_level: "Güven Seviyesi" notifications: "Bildirimler" dismiss_notifications: "Hepsini okunmuş olarak işaretle" dismiss_notifications_tooltip: "Tüm okunmamış bildirileri okunmuş olarak işaretle" @@ -322,12 +335,12 @@ tr_TR: github_profile: "Github" mailing_list_mode: "(Konuyu veya kategoriyi susturmadığım takdirde) her yeni gönderi için bana bir e-posta yolla" watched_categories: "Gözlendi" - watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konu yanında belirecek." + watched_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konular size bildirilecek. Ayrıca, okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." tracked_categories: "Takip edildi" tracked_categories_instructions: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." muted_categories: "Susturuldu" muted_categories_instructions: "Bu kategorideki yeni konular okunmamışlar sekmenizde belirmeyecek, ve haklarında hiçbir bildirim almayacaksınız." - delete_account: "Hesabımı sil" + delete_account: "Hesabımı Sil" delete_account_confirm: "Hesabınızı kalıcı olarak silmek istediğinize emin misiniz? Bu işlemi geri alamazsınız!" deleted_yourself: "Hesabınız başarıyla silindi." delete_yourself_not_allowed: "Hesabınızı şu an silemezsiniz. Hesabınızı silmesi için bir yönetici ile iletişime geçin." @@ -337,8 +350,8 @@ tr_TR: muted_users: "Susturuldu" muted_users_instructions: "Bu kullanıcılardan gelen tüm bildirileri kapa." staff_counters: - flags_given: "yararlı raporlar" - flagged_posts: "rapor edilen gönderiler" + flags_given: "yararlı bayraklar" + flagged_posts: "bayraklanan gönderiler" deleted_posts: "silinen gönderiler" suspensions: "uzaklaştırmalar" warnings_received: "uyarılar" @@ -350,19 +363,19 @@ tr_TR: success: "(e-posta gönderildi)" in_progress: "(e-posta yollanıyor)" error: "(hata)" - action: "Parola sıfırlama e-postası gönder" - set_password: "Parola belirle" + action: "Parola Sıfırlama E-postası Gönder" + set_password: "Parola Belirle" change_about: - title: "Hakkımda'yı değiştir" + title: "Hakkımda'yı Değiştir" error: "Değer değiştirilirken bir hata oluştu." change_username: - title: "Kullanıcı adını değiştir" + title: "Kullanıcı Adını Değiştir" confirm: "Kullanıcı adınızı degiştirmeniz halinde, eski gönderilerinizden yapılan tüm alıntılar ve @isim bahsedilişler bozulacak. Bunu yapmak istediginize gerçekten emin misiniz?" taken: "Üzgünüz, bu kullanıcı adı alınmış." error: "Kullanıcı adınızı değiştirirken bir hata oluştu." invalid: "Bu kullanıcı adı geçersiz. Sadece sayı ve harf içermelidir." change_email: - title: "E-posta adresini değiştirin" + title: "E-posta Adresini Değiştirin" taken: "Üzgünüz, bu e-posta kullanılabilir değil." error: "E-posta adresinizi değiştirirken bir hata oluştu. Belki bu adres zaten kullanımdadır?" success: "Adresinize bir e-posta gönderdik. Lütfen onaylama talimatlarını uygulayınız." @@ -379,10 +392,10 @@ tr_TR: image_is_not_a_square: "Uyarı: resminizi kırptık; genişlik ve yükseklik eşit değildi." cache_notice: "Profil görselinizi başarıyla değiştirdiniz, fakat tarayıcınızın önbelleklemesinden ötürü gözükmesi biraz zaman alabilir." change_profile_background: - title: "Profil arkaplanı" + title: "Profil Arkaplanı" instructions: "Profil arkaplanları ortalanacak ve genişlikleri 850px olacak. " change_card_background: - title: "Kullanıcı kartı arkaplanı" + title: "Kullanıcı Kartı Arkaplanı" instructions: "Profil arkaplanları ortalanacak ve genişlikleri 590px olacak. " email: title: "E-posta" @@ -419,15 +432,15 @@ tr_TR: default: "(varsayılan)" password_confirmation: title: "Tekrar Parola" - last_posted: "Son gönderi" + last_posted: "Son Gönderi" last_emailed: "Son E-posta Atılan" - last_seen: "Son görülme" + last_seen: "Son Görülme" created: "Katıldı" - log_out: "Oturumu kapat" + log_out: "Oturumu Kapat" location: "Yer" card_badge: - title: "Kullanıcı kartı rozeti" - website: "Web sayfası" + title: "Kullanıcı Kartı Rozeti" + website: "Web Sayfası" email_settings: "E-posta" email_digests: title: "Burayı ziyaret etmediğim zamanlarda bana yeni şeylerin özetini içeren bir email yolla:" @@ -462,17 +475,17 @@ tr_TR: user: "Davet Edilen Kullanıcı" none: "Henüz buraya kimseyi davet etmediniz." truncated: "İlk {{count}} davetler gösteriliyor." - redeemed: "Kabul edilen davetler" + redeemed: "Kabul Edilen Davetler" redeemed_at: "Kabul Edildi" - pending: "Bekleyen davetler" + pending: "Bekleyen Davetler" topics_entered: "Görüntülenmiş Konular" - posts_read_count: "Okunmuş yazılar" + posts_read_count: "Okunmuş Yazılar" expired: "Bu davetin süresi doldu." rescind: "Kaldır" rescinded: "Davet kaldırıldı" reinvite: "Davetiyeyi Tekrar Yolla" reinvited: "Davetiye tekrar yollandı" - time_read: "Okunma zamanı" + time_read: "Okunma Zamanı" days_visited: "Ziyaret Edilen Günler" account_age_days: "Gün içinde Hesap yaş" create: "Davet Yolla" @@ -494,9 +507,9 @@ tr_TR: ip_address: title: "Son IP Adresi" registration_ip_address: - title: "Kayıt anındaki IP adresi" + title: "Kayıt Anındaki IP Adresi" avatar: - title: "Profil görseli" + title: "Profil Görseli" header_title: "profil, mesajlar, işaretliler ve seçenekler" title: title: "Başlık" @@ -565,10 +578,10 @@ tr_TR: remove_allowed_user: "Bu mesajlaşmadan {{name}} isimli kullanıcıyı çıkarmak istediğinize emin misiniz?" email: 'E-posta' username: 'Kullanıcı Adı' - last_seen: 'Son görülme' + last_seen: 'Son Görülme' created: 'Oluşturuldu' created_lowercase: 'oluşturuldu' - trust_level: 'Güven seviyesi' + trust_level: 'Güven Seviyesi' search_hint: 'kullanıcı adı, e-posta veya IP adresi' create_account: title: "Yeni Hesap Oluştur" @@ -585,7 +598,7 @@ tr_TR: complete_username_not_found: "Hiçbir hesap kullanıcı adı %{username} ile eşleşmiyor" complete_email_not_found: "Hiçbir hesap %{email} adresi ile eşleşmiyor" login: - title: "Oturum aç" + title: "Giriş Yap" username: "Kullanıcı" password: "Parola" email_placeholder: "e-posta veya kullanıcı adı" @@ -644,8 +657,8 @@ tr_TR: try_like: ' butonunu denediniz mi?' category_missing: "Bir kategori seçmelisiniz" save_edit: "Değişikliği Kaydet" - reply_original: "Ana konuyu cevapla" - reply_here: "Buradan cevapla" + reply_original: "Ana Konuyu Cevapla" + reply_here: "Buradan Cevapla" reply: "Cevapla" cancel: "İptal et" create_topic: "Konu Oluştur" @@ -702,7 +715,7 @@ tr_TR: title: "@isim bahsedilişleri, gönderileriniz ve konularınıza verilen cevaplar, mesajlarla vb. ilgili bildiriler" none: "Şu an için bildirimler yüklenemiyor." more: "daha eski bildirimleri görüntüle" - total_flagged: "tüm rapor edilen gönderiler" + total_flagged: "tüm bayraklanan gönderiler" mentioned: "

    {{username}} {{description}}

    " quoted: "

    {{username}} {{description}}

    " replied: "

    {{username}} {{description}}

    " @@ -735,6 +748,7 @@ tr_TR: hint: "(editöre sürekle & bırak yaparak da yükleyebilirsiniz)" hint_for_supported_browsers: "(resimleri, editöre sürükle & bırak yaparak ya da yapıştırarak da yükleyebilirsiniz)" uploading: "Yükleniyor" + select_file: "Dosya seçin" image_link: "resminizin yönleneceği bağlantı" search: title: "konular, gönderiler, kullanıcılar, veya kategoriler arasında ara" @@ -752,19 +766,19 @@ tr_TR: current_user: 'kendi kullanıcı sayfana git' topics: bulk: - reset_read: "Okunmuşları sıfırla" - delete: "Konuları sil" + reset_read: "Okunmuşları Sıfırla" + delete: "Konuları Sil" dismiss_posts: "Gönderileri Yoksay" dismiss_posts_tooltip: "Bu konulardaki okunmamışların sayısını sıfırla ama yeni gönderiler oluşturulduğunda okunmamışlar listemde göster" - dismiss_topics: "Konuları yoksay" + dismiss_topics: "Konuları Yoksay" dismiss_topics_tooltip: "Bu konularda yeni gönderiler oluşturulunca okunmamış listemde gösterme" - dismiss_new: "Yenileri yoksay" + dismiss_new: "Yenileri Yoksay" toggle: "konuların toplu seçimini aç/kapa" - actions: "Toplu işlemler" - change_category: "Kategoriyi değiştir" - close_topics: "Konuları kapat" - archive_topics: "Konuları arşivle" - notification_level: "Bildirim seviyesini değiştir" + actions: "Toplu İşlemler" + change_category: "Kategoriyi Değiştir" + close_topics: "Konuları Kapat" + archive_topics: "Konuları Arşivle" + notification_level: "Bildirim Seviyesini Değiştir" choose_new_category: "Konular için yeni bir kategori seçin:" selected: other: "{{count}} konu seçtiniz." @@ -795,7 +809,7 @@ tr_TR: search: "Daha fazla arama sonucu yok." topic: filter_to: "Bu konuda {{post_count}} gönderi" - create: 'Yeni konu' + create: 'Yeni Konu' create_long: 'Yeni bir konu oluştur' private_message: 'Mesajlaşma başlat' list: 'Konular' @@ -825,7 +839,7 @@ tr_TR: likes: other: "bu konuda {{count}} beğeni var" back_to_list: "Konu listesine geri dön" - options: "Konu seçenekleri" + options: "Konu Seçenekleri" show_links: "Bu konunun içindeki bağlantıları göster. " toggle_information: "konu ayrıntılarını aç/kapa" read_more_in_category: "Daha fazlası için {{catLink}} kategorisine göz atabilir ya da {{latestLink}}bilirsiniz." @@ -839,9 +853,9 @@ tr_TR: deleted: "Konu silindi " auto_close_notice: "Bu konu otomatik olarak kapanacak %{timeLeft}." auto_close_notice_based_on_last_post: "Bu konu son cevaptan %{duration} sonra kapanacak." - auto_close_title: 'Otomatik kapatma ayarları' + auto_close_title: 'Otomatik Kapatma Ayarları' auto_close_save: "Kaydet" - auto_close_remove: "Bu konuyu otomatik olarak kapatma" + auto_close_remove: "Bu Konuyu Otomatik Olarak Kapatma" progress: title: konu gidişatı go_top: "en üst" @@ -875,10 +889,10 @@ tr_TR: title: "Gözleniyor" description: "Bu konudaki her yeni gönderi için bir bildirim alacaksınız. Okunmamış ve yeni gönderilerin sayısı konunun yanında belirecek." tracking_pm: - title: "Takip ediliyor" + title: "Takip Ediliyor" description: "Okunmamış ve yeni gönderi sayısı mesajın yanında belirecek. Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." tracking: - title: "Takip ediliyor" + title: "Takip Ediliyor" description: "Okunmamış ve yeni gönderi sayısı başlığın yanında belirecek. Birisi @isim şeklinde sizden bahsederse ya da gönderinize cevap verirse bildirim alacaksınız." regular: title: "Standart" @@ -893,25 +907,25 @@ tr_TR: title: "Susturuldu" description: "Bu konu okunmamışlar sekmenizde belirmeyecek, ve hakkında hiç bir bildirim almayacaksınız." actions: - recover: "Konuyu geri getir" - delete: "Konuyu sil" - open: "Konuyu aç" - close: "Konuyu kapat" - multi_select: "Gönderileri seç..." - auto_close: "Otomatik kapat..." - pin: "Başa tuttur..." - unpin: "Baştan kaldır..." - unarchive: "Konuyu arşivden kaldır" - archive: "Konuyu arşivle" - invisible: "Listelenmemiş yap" - visible: "Listelenmiş yap" - reset_read: "Görüntüleme verilerini sıfırla" + recover: "Konuyu Geri Getir" + delete: "Konuyu Sil" + open: "Konuyu Aç" + close: "Konuyu Kapat" + multi_select: "Gönderileri Seç..." + auto_close: "Otomatik Kapat..." + pin: "Başa Tuttur..." + unpin: "Baştan Kaldır..." + unarchive: "Konuyu Arşivden Kaldır" + archive: "Konuyu Arşivle" + invisible: "Listelenmemiş Yap" + visible: "Listelenmiş Yap" + reset_read: "Görüntüleme Verilerini Sıfırla" feature: - pin: "Başa tuttur" - unpin: "Baştan kaldır" - pin_globally: "Her yerde başa tuttur" - make_banner: "Manşet konusu" - remove_banner: "Manşet konusunu kaldır" + pin: "Başa Tuttur" + unpin: "Baştan Kaldır" + pin_globally: "Her Yerde Başa Tuttur" + make_banner: "Manşet Konusu" + remove_banner: "Manşet Konusunu Kaldır" reply: title: 'Cevapla' help: 'bu konuya bir cevap oluşturmaya başlayın' @@ -922,9 +936,9 @@ tr_TR: title: 'Paylaş' help: 'bu konunun bağlantısını paylaşın' flag_topic: - title: 'Rapor et' - help: 'bu gönderiyi kontrol edilmesi için özel olarak rapor edin ya da bununla ilgili özel bir bildirim yollayın' - success_message: 'Bu konuyu başarıyla rapor ettiniz.' + title: 'Bayrakla' + help: 'bu gönderiyi kontrol edilmesi için özel olarak bayraklayın ya da bununla ilgili özel bir bildirim yollayın' + success_message: 'Bu konuyu başarıyla bayrakladınız.' feature_topic: title: "Bu konuyu ön plana çıkar" pin: "Bu konu {{categoryLink}} kategorinin en üstünde görünsün." @@ -949,11 +963,11 @@ tr_TR: already_banner: zero: "Manşet konusu yok." one: "Şu an bir manşet konusu var." - inviting: "Davet ediliyor..." + inviting: "Davet Ediliyor..." automatically_add_to_groups_optional: "Bu davet şu gruplara erişimi de içerir: (opsiyonel, sadece yöneticiler için)" automatically_add_to_groups_required: "Bu davet şu gruplara erişimi de içerir: (Gerekli, sadece yöneticiler için)" invite_private: - title: 'Mesajlaşmaya davet et' + title: 'Mesajlaşmaya Davet Et' email_or_username: "Davet edilenin e-postası ya da kullanıcı adı" email_or_username_placeholder: "e-posta ya da kullanıcı adı" action: "Davet et" @@ -961,9 +975,9 @@ tr_TR: error: "Üzgünüz, kullanıcı davet edilirken bir hata oluştu." group_name: "grup adı" invite_reply: - title: 'Davet et' + title: 'Davet Et' username_placeholder: "kullanıcıadı" - action: 'Davet gönder' + action: 'Davet Gönder' help: 'e-posta veya bildiri aracılığıyla başkalarını bu konuya davet edin' to_forum: "Arkadaşınıza, oturum açması gerekmeden, bir bağlantıya tıklayarak katılabilmesi için kısa bir e-posta göndereceğiz. " sso_enabled: "Bu konuya davet etmek istediğiniz kişinin kullanıcı adını girin." @@ -975,29 +989,29 @@ tr_TR: success_email: "{{emailOrUsername}} kullanıcısına davet e-postalandı. Davet kabul edildiğinde size bir bildiri göndereceğiz. Davetlerinizi takip etmek için kullanıcı sayfanızdaki davetler sekmesine göz atın." success_username: "Kullanıcıyı bu konuya katılması için davet ettik." error: "Üzgünüz, kullanıcıyı davet edemedik. Zaten davet edilmiş olabilir mi? (Davetler oran sınırlarına tabiidir.)" - login_reply: 'Cevaplamak için oturum açmalısınız' + login_reply: 'Cevaplamak için oturum açın' filters: n_posts: other: "{{count}} gönderi" cancel: "Filteri kaldır" split_topic: - title: "Yeni konuya geç" + title: "Yeni Konuya Geç" action: "yeni konuya geç" - topic_name: "Yeni konu adı" + topic_name: "Yeni Konu Adı" error: "Gönderiler yeni konuya taşınırken bir hata oluştu." instructions: other: "Yeni bir konu oluşturmak ve bu konuyu seçtiğiniz {{count}} gönderi ile doldurmak üzeresiniz." merge_topic: - title: "Var olan bir konuya taşı" + title: "Var Olan Bir Konuya Taşı" action: "var olan bir konuya taşı" - error: "Gönderiler konuya taşınırken bir hata oluştu." + error: "Gönderiler konuya aşınırken bir hata oluştu." instructions: other: "Lütfen bu {{count}} gönderiyi taşımak istediğiniz konuyu seçin. " change_owner: - title: "Gönderilerin sahibini değiştir" + title: "Gönderilerin Sahibini Değiştir" action: "sahipliğini değiştir" error: "Gönderilerin sahipliği değiştirilirken bir hata oluştu." - label: "Gönderilerin yeni sahibi" + label: "Gönderilerin Yeni Sahibi" placeholder: "yeni sahibin kullanıcı adı" instructions: other: "Lütfen {{old_user}} kullanıcısına ait {{count}} gönderinin yeni sahibini seçin." @@ -1020,13 +1034,13 @@ tr_TR: edit_reason: "Neden: " post_number: "gönderi {{number}}" last_edited_on: "gönderinin en son düzenlenme tarihi" - reply_as_new_topic: "Bağlantılı konu olarak cevapla" + reply_as_new_topic: "Bağlantılı Konu Olarak Cevapla" continue_discussion: "{{postLink}} Gönderisinden tartışmaya devam ediliyor:" follow_quote: "alıntılanan mesaja git" - show_full: "Gönderinin tamamını göster" + show_full: "Gönderinin Tamamını Göster" show_hidden: 'Gizlenmiş içeriği görüntüle.' deleted_by_author: - other: "(yazarı tarafından geri alınan gönderi, %{count} saat içinde otomatik olarak silinecek.)" + other: "(yazarı tarafından geri alınan gönderi, bayraklanmadığı takdirde %{count} saat içinde otomatik olarak silinecek.)" expand_collapse: "aç/kapat" gap: other: "gizlenen {{count}} yorumu gör" @@ -1062,7 +1076,7 @@ tr_TR: undo_like: "beğenmekten vazgeç" edit: "bu gönderiyi düzenle" edit_anonymous: "Üzgünüz, ama bu gönderiyi düzenleyebilmek için oturum açmalısınız." - flag: "bu gönderiyi kontrol edilmesi için özel olarak rapor edin ya da bununla ilgili özel bir bildirim yollayın" + flag: "bu gönderiyi kontrol edilmesi için özel olarak bayraklayın ya da bununla ilgili özel bir bildirim yollayın" delete: "bu gönderiyi sil" undelete: "bu gönderinin silinmesini geri al" share: "bu gönderinin bağlantısını paylaşın" @@ -1073,21 +1087,21 @@ tr_TR: yes_value: "Evet, cevapları da sil" no_value: "Hayır, sadece bu gönderiyi" admin: "gönderiyle alakalı yönetici işlemleri" - wiki: "Wiki yap" - unwiki: "Wiki'yi kaldır" - convert_to_moderator: "Görevli rengi ekle" - revert_to_regular: "Görevli rengini kaldır" - rebake: "HTML'i yeniden yapılandır" + wiki: "Wiki Yap" + unwiki: "Wiki'yi Kaldır" + convert_to_moderator: "Görevli Rengi Ekle" + revert_to_regular: "Görevli Rengini Kaldır" + rebake: "HTML'i Yeniden Yapılandır" unhide: "Gizleme" actions: - flag: 'Rapor et' + flag: 'Bayrakla' defer_flags: other: "Bayrağı ertele" it_too: - off_topic: "Bir de rapor et" + off_topic: "Bir de bayrakla" spam: "Bir de rapor et" inappropriate: "Bir de rapor et" - custom_flag: "Bir de rapor et" + custom_flag: "Bir de bayrakla" bookmark: "Bir de işaretle" like: "Sen de beğen" vote: "Bir de oyla" @@ -1099,10 +1113,10 @@ tr_TR: like: "Beğenini geri al" vote: "Oyunu geri al" people: - off_topic: "{{icons}} konu dışı olarak rapor edildi" - spam: "{{icons}} spam olarak rapor edildi" - spam_with_url: "{{icons}} bu linki spam olarak işaretledi" - inappropriate: "{{icons}} uygunsuz olarak rapor edildi" + off_topic: "{{icons}} konu dışı olarak bayrakladı" + spam: "{{icons}} spam olarak bayrakladı" + spam_with_url: "{{icons}} bu linki spam olarak bayrakladı" + inappropriate: "{{icons}} uygunsuz olarak bayrakladı" notify_moderators: "{{icons}} bildirim gönderilen moderatörler" notify_moderators_with_url: "{{icons}} bildirim gönderilen moderatörler" notify_user: "{{icons}} mesaj yolladı" @@ -1111,23 +1125,23 @@ tr_TR: like: "{{icons}} bunu beğendi" vote: "{{icons}} bunun için oyladı" by_you: - off_topic: "Bunu konu dışı olarak rapor ettiniz" - spam: "Bunu spam olarak rapor ettiniz" - inappropriate: "Bunu uygunsuz olarak rapor ettiniz" - notify_moderators: "Bunu moderasyon için rapor ettiniz" + off_topic: "Bunu konu dışı olarak bayrakladınız" + spam: "Bunu spam olarak bayrakladınız" + inappropriate: "Bunu uygunsuz olarak bayrakladınız" + notify_moderators: "Bunu moderasyon için bayrakladınız" notify_user: "Bu kullanıcıya mesaj yolladınız" bookmark: "Bu gönderiyi işaretlediniz" like: "Bunu beğendiniz" vote: "Bu gönderiyi oyladınız" by_you_and_others: off_topic: - other: "Siz ve {{count}} diğer kişi bunu konu dışı olarak rapor etti" + other: "Siz ve {{count}} diğer kişi bunu konu dışı olarak bayrakladı" spam: - other: "Siz ve {{count}} diğer kişi bunu spam olarak rapor etti" + other: "Siz ve {{count}} diğer kişi bunu spam olarak bayrakladı" inappropriate: - other: "Siz ve {{count}} diğer kişi bunu uygunsuz olarak rapor etti" + other: "Siz ve {{count}} diğer kişi bunu uygunsuz olarak bayrakladı" notify_moderators: - other: "Siz ve {{count}} diğer kişi bunu denetlenmesi için rapor etti" + other: "Siz ve {{count}} diğer kişi bunu denetlenmesi için bayrakladı" notify_user: other: "Siz ve {{count}} diğer kişi bu kullanıcıya mesaj yolladı" bookmark: @@ -1138,13 +1152,13 @@ tr_TR: other: "Siz ve {{count}} kişi bu gönderiyi oyladı" by_others: off_topic: - other: "{{count}} kişi bunu konu dışı olarak rapor etti" + other: "{{count}} kişi bunu konu dışı olarak bayrakladı" spam: - other: "{{count}} kişi bunu spam olarak rapor etti" + other: "{{count}} kişi bunu spam olarak bayrakladı" inappropriate: - other: "{{count}} kişi bunu uygunsuz olarak rapor etti" + other: "{{count}} kişi bunu uygunsuz olarak bayrakladı" notify_moderators: - other: "{{count}} kişi bunu moderasyon için rapor etti" + other: "{{count}} kişi bunu moderasyon için bayrakladı" notify_user: other: "{{count}} bu kullanıcıya mesaj yolladı" bookmark: @@ -1185,21 +1199,21 @@ tr_TR: choose: 'Kategori seç…' edit: 'düzenle' edit_long: "Düzenle" - view: 'Bu kategorideki konuları görüntüle' + view: 'Bu Kategorideki Konuları Görüntüle' general: 'Genel' settings: 'Ayarlar' - delete: 'Kategoriyi sil' - create: 'Yeni kategori' - save: 'Kategoriyi kaydet' - slug: 'Kategori kalıcı bağlantısı' + delete: 'Kategoriyi Sil' + create: 'Yeni Kategori' + save: 'Kategoriyi Kaydet' + slug: 'Kategori Kalıcı Bağlantısı' slug_placeholder: '(Opsiyonel) bağlantı için tire ile ayırılmış kelimeler' creation_error: Kategori oluşturulurken hata oluştu. save_error: Kategori kaydedilirken hata oluştu. name: "Kategori Adı" description: "Açıklama" topic: "kategori konusu" - logo: "Kategori logosu görseli" - background_image: "Kategori arka planı görseli" + logo: "Kategori Logosu Görseli" + background_image: "Kategori Arka Planı Görseli" badge_colors: "Rozet renkleri" background_color: "Arka plan rengi" foreground_color: "Ön plan rengi" @@ -1209,7 +1223,7 @@ tr_TR: delete_error: "Kategoriyi silinirken bir hata oluştu." list: "Kategorileri Listele" no_description: "Lütfen bu kategori için bir açıklama girin." - change_in_category_topic: "Açıklamayı düzenle" + change_in_category_topic: "Açıklamayı Düzenle" already_used: 'Bu renk başka bir kategori için kullanıldı' security: "Güvenlik" images: "Resimler" @@ -1220,20 +1234,20 @@ tr_TR: email_in_disabled: "E-posta üzerinden yeni konu oluşturma özelliği Site Ayarları'nda devre dışı bırakılmış. E-posta üzerinden yeni konu oluşturma özelliğini etkinleştirmek için," email_in_disabled_click: '"e-postala" ayarını etkinleştir' allow_badges_label: "Bu kategoride rozet verilmesine izin ver" - edit_permissions: "İzinleri düzenle" - add_permission: "İzin ekle" + edit_permissions: "İzinleri Düzenle" + add_permission: "İzin Ekle" this_year: "bu yıl" position: "pozisyon" - default_position: "Varsayılan pozisyon" + default_position: "Varsayılan Pozisyon" position_disabled: "Kategoriler etkinlik sıralarına göre görünecekler. Listelerdeki kategorilerin sıralamalarını kontrol edebilmek için," position_disabled_click: '"sabitlenmiş kategori pozisyonları" ayarını etklinleştirin.' - parent: "Üst kategori" + parent: "Üst Kategori" notifications: watching: title: "Gözleniyor" description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak gözleyeceksiniz. Tüm yeni gönderi ve konularla ilgili bildiri alacaksınız, ayrıca okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." tracking: - title: "Takip ediliyor" + title: "Takip Ediliyor" description: "Bu kategorilerdeki tüm yeni konuları otomatik olarak takip edeceksiniz. Okunmamış ve yeni gönderilerin sayısı ilgili konunun yanında belirecek." regular: title: "Standart" @@ -1243,22 +1257,22 @@ tr_TR: description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve okunmamışlar sekmenizde belirmeyecek. " flagging: title: 'Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!' - private_reminder: 'rapor edilenler özeldir, sadece görevlilere gözükür' - action: 'Gönderiyi rapor et' - take_action: "Harekete geç" + private_reminder: 'bayraklar özeldir, sadece görevlilere gözükür' + action: 'Gönderiyi Bayrakla' + take_action: "Harekete Geç" notify_action: 'Mesaj' - delete_spammer: "Spamcıyı sil" + delete_spammer: "Spamcıyı Sil" delete_confirm: "Bu kullanıcının %{posts} gönderisini ve %{topics} konusunu silmek, hesabını kapatmak, kullandığı IP Adresi %{ip_address} üzerinden hesap açılmasını engellemek, ve %{email} e-posta adresini kalıcı engellenenler listesine eklemek üzeresiniz. Bu kullanıcının gerçekten spamci olduğuna emin misiniz?" yes_delete_spammer: "Evet, spamcıyı sil" ip_address_missing: "(uygulanamaz)" hidden_email_address: "(gizli)" - submit_tooltip: "Özel raporu gönder" - take_action_tooltip: "Topluluğunuzdan daha fazla içerik raporu beklemek yerine bunu siz hızlıca yaparak eşiğe erişebilirsiniz" - cant: "Üzgünüz, şu an bu gönderiyi rapor edemezsiniz." + submit_tooltip: "Özel bayrağı gönder" + take_action_tooltip: "Topluluğunuzdan daha fazla bayrak beklemek yerine bunu siz hızlıca yaparak eşiğe erişebilirsiniz" + cant: "Üzgünüz, şu an bu gönderiyi bayraklayamazsınız." formatted_name: - off_topic: "Konu dışı" + off_topic: "Konu Dışı" inappropriate: "Uygunsuz" - spam: "SPAM" + spam: "Spam" custom_placeholder_notify_user: "Açıklayıcı, yapıcı ve her zaman nazik olun." custom_placeholder_notify_moderators: "Sizi neyin endişelendirdiğini açıklayıcı bir dille bize bildirin ve mümkün olan yerlerde konu ile alakalı bağlantıları paylaşın." custom_message: @@ -1267,10 +1281,10 @@ tr_TR: left: "{{n}} kaldı" flagging_topic: title: "Topluluğumuzun medeni kalmasına yardımcı olduğunuz için teşekkürler!" - action: "Konuyu rapor et" + action: "Konuyu Bayrakla" notify_action: "Mesaj" topic_map: - title: "Konu özeti" + title: "Konu Özeti" participants_title: "Yoğun konular" links_title: "Popüler bağlantılar" links_shown: "tüm {{totalLinks}} bağlantıları göster..." @@ -1287,10 +1301,10 @@ tr_TR: title: "Başa tutturma kaldırıldı" help: "Bu konu sizin için başa tutturulmuyor; normal sıralama içerisinde görünecek" pinned_globally: - title: "Her yerde başa tutturuldu" + title: "Her Yerde Başa Tutturuldu" help: "Bu konu her yerde başa tutturuldu; tüm listelerin başında görünecek" pinned: - title: "Başa tutturuldu" + title: "Başa Tutturuldu" help: "Bu konu sizin için başa tutturuldu; kendi kategorisinin en üstünde görünecek" archived: help: "Bu başlık arşive kaldırıldı; donduruldu ve değiştirilemez" @@ -1305,7 +1319,7 @@ tr_TR: med {beğeni/gönderi oranı çok yüksek cevap} high {beğeni/gönderi oranı aşırı yüksek cevap} other {}} var - original_post: "Orijinal gönderi" + original_post: "Orijinal Gönderi" views: "Gösterim" views_lowercase: other: "gösterim" @@ -1330,7 +1344,10 @@ tr_TR: with_topics: "%{filter} konular" with_category: "%{filter} %{category} konular" latest: - title: "En son" + title: + zero: "Son içerikler" + one: "(1) Son içerik" + other: "({{count}}) Son içerik" help: "yakın zamanda gönderi alan konular" hot: title: "Sıcak" @@ -1380,7 +1397,7 @@ tr_TR: title: "En Popüler" help: "geçtiğimiz yıl, ay, hafta veya gündeki en etkin başlıklar" all: - title: "Tüm zamanlar" + title: "Tüm Zamanlar" yearly: title: "Yıllık" monthly: @@ -1389,10 +1406,10 @@ tr_TR: title: "Haftalık" daily: title: "Günlük" - all_time: "Tüm zamanlar" - this_year: "Bu yıl" - this_month: "Bu ay" - this_week: "Bu hafta" + all_time: "Tüm Zamanlar" + this_year: "Yıl" + this_month: "Ay" + this_week: "Hafta" today: "Bugün" other_periods: "yukarı bak" browser_update: 'Malesef, tarayıcınız bu site için çok eski. Lütfen tarayıcınızı güncelleyin.' @@ -1403,10 +1420,10 @@ tr_TR: admin_js: type_to_filter: "filtre girin..." admin: - title: 'Discourse yönetici paneli' + title: 'Discourse Yönetici Paneli' moderator: 'Moderatör' dashboard: - title: "Yönetici paneli" + title: "Yönetici Paneli" last_updated: "Yönetici panelinin son güncellenmesi:" version: "Versiyon" up_to_date: "Sisteminiz güncel durumda!" @@ -1435,70 +1452,70 @@ tr_TR: traffic: "Uygulama web istekleri" page_views: "API istekleri" page_views_short: "API istekleri" - show_traffic_report: "Detaylı trafik raporunu görüntüle" + show_traffic_report: "Detaylı Trafik Raporunu Görüntüle" reports: today: "Bugün" yesterday: "Dün" - last_7_days: "Son 7 gün" - last_30_days: "Son 30 gün" - all_time: "Tüm zamanlar" - 7_days_ago: "7 gün önce" - 30_days_ago: "30 gün önce" + last_7_days: "Son 7 Gün" + last_30_days: "Son 30 Gün" + all_time: "Tüm Zamanlar" + 7_days_ago: "7 Gün Önce" + 30_days_ago: "30 Gün Önce" all: "Hepsi" view_table: "tablo" view_chart: "sütunlu grafik" refresh_report: "Raporu Yenile" start_date: "Başlangıç tarihi" - end_date: "Bitiş tarihi" + end_date: "Bitiş Tarihi" commits: latest_changes: "En son değişiklikler: lütfen sık güncelleyin!" by: "tarafından" flags: - title: "Raporlar" + title: "Bayraklar" old: "Eski" active: "Etkin" agree: "Onayla" - agree_title: "Bu raporu geçerli ve doğru olarak onayla" + agree_title: "Bu bayrağı geçerli ve doğru olarak onayla" agree_flag_modal_title: "Onayla ve..." agree_flag_hide_post: "Onayla (gönderiyi gizle + özel mesaj yolla)" agree_flag_hide_post_title: "Bu gönderiyi gizle ve otomatik olarak kullanıcıya acilen düzenleme yapmasını belirten bir mesaj gönder" agree_flag_restore_post: "Kabul ediyorum (gönderiyi geri getir)" agree_flag_restore_post_title: "Gönderiyi geri getir" - agree_flag: "Raporu onayla" - agree_flag_title: "Raporu onayla ve gönderide değişiklik yapma" + agree_flag: "Bayrağı onayla" + agree_flag_title: "Bayrağı onayla ve gönderide değişiklik yapma" defer_flag: "Ertele" - defer_flag_title: "Bu raporu kaldır; şu an için bir seçeneği uygulamak gerekmiyor." + defer_flag_title: "Bu bayrağı kaldır; şu an için bir seçeneği uygulamak gerekmiyor." delete: "Sil" - delete_title: "Bu raporun ait olduğu gönderiyi sil." - delete_post_defer_flag: "Gönderiyi sil ve raporu ertele" + delete_title: "Bu bayrağın ait olduğu gönderiyi sil." + delete_post_defer_flag: "Gönderiyi sil ve bayrağı ertele" delete_post_defer_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil." - delete_post_agree_flag: "Gönderiyi sil ve raporu onayla" + delete_post_agree_flag: "Gönderiyi sil ve bayrağı onayla" delete_post_agree_flag_title: "Gönderiyi sil; başka gönderi yoksa, konuyu da sil." delete_flag_modal_title: "Sil ve..." - delete_spammer: "Spamcıyı sil" + delete_spammer: "Spamcıyı Sil" delete_spammer_title: "Kullanıcıyı ve kullanıcıya ait tüm konu ve gönderileri kaldır. " disagree_flag_unhide_post: "Onaylama (gönderiyi gizleme)" - disagree_flag_unhide_post_title: "Bu gönderiye ait tüm raporları kaldır ve gönderiyi tekrar görünür hale getir" + disagree_flag_unhide_post_title: "Bu gönderiye ait tüm bayrakları kaldır ve gönderiyi tekrar görünür hale getir" disagree_flag: "Onaylama" - disagree_flag_title: "Bu raporu geçersiz ya da yanlış sayarak reddet" + disagree_flag_title: "Bu bayrağı geçersiz ya da yanlış sayarak reddet" clear_topic_flags: "Tamam" - clear_topic_flags_title: "Bu konu araştırıldı ve sorunlar çözüldü. Raporları kaldırmak için Tamam butonuna basın. " + clear_topic_flags_title: "Bu konu araştırıldı ve sorunlar çözüldü. Bayrakları kaldırmak için Tamam butonuna basın. " more: "(daha fazla cevap...)" dispositions: agreed: "onaylandı" disagreed: "onaylanmadı" deferred: "ertelendi" - flagged_by: "Rapor eden" + flagged_by: "Bayraklayan" resolved_by: "Çözen" took_action: "İşlem uygulandı" system: "Sistem" error: "Bir şeyler ters gitti" reply_message: "Yanıtla" - no_results: "Rapor edilen içerik yok." - topic_flagged: "Bu konu rapor edildi." + no_results: "Bayraklanan içerik yok." + topic_flagged: "Bu konu bayraklandı." visit_topic: "Aksiyon almak için konuyu ziyaret edin" - was_edited: "İlk rapor edilmesinden sonra gönderi düzenlendi" - previous_flags_count: "Bu gönderi daha önce {{count}} defa rapor edilmiş." + was_edited: "İlk bayraktan edilmesinden sonra gönderi düzenlendi" + previous_flags_count: "Bu gönderi daha önce {{count}} defa bayraklanmış." summary: action_type_3: other: "konu dışı x{{count}}" @@ -1511,10 +1528,10 @@ tr_TR: action_type_8: other: "spam x{{count}}" groups: - primary: "Ana grup" + primary: "Ana Grup" no_primary: "(ana grup yok)" title: "Grup" - edit: "Grupları düzenle" + edit: "Grupları Düzenle" refresh: "Yenile" new: "Yeni" selector_placeholder: "kullanıcı adı girin" @@ -1535,26 +1552,26 @@ tr_TR: default_title: "Bu gruptaki tüm kullanıcılar için varsayılan başlık" primary_group: "Otomatik olarak ana grup yap" api: - generate_master: "Ana API anahtarı üret" + generate_master: "Ana API Anahtarı Üret" none: "Şu an etkin API anahtarı bulunmuyor." user: "Kullanıcı" title: "API" - key: "API anahtarı" + key: "API Anahtarı" generate: "Oluştur" - regenerate: "Tekrar oluştur" + regenerate: "Tekrar Oluştur" revoke: "İptal Et" confirm_regen: "API anahtarını yenisi ile değiştirmek istediğinize emin misiniz?" confirm_revoke: "Anahtarı iptal etmek istediğinize emin misiniz?" info_html: "API anahtarınız JSON çağrıları kullanarak konu oluşturup güncelleyebilmenize olanak sağlayacaktır." - all_users: "Tüm kullanıcılar" + all_users: "Tüm Kullanıcılar" note_html: "Bu anahtarı gizli tutun, anahtara sahip kullanıcılar her hangi bir kullanıcı adı altında istedikleri gönderiyi oluşturabilirler." plugins: title: "Eklentiler" - installed: "Yüklü eklentiler" + installed: "Yüklü Eklentiler" name: "İsim" none_installed: "Yüklenmiş herhangi bir eklentiniz yok." version: "Versiyon" - change_settings: "Ayarları değiştir" + change_settings: "Ayarları Değiştir" howto: "Nasıl eklenti yükleyebilirim?" backups: title: "Yedekler" @@ -1576,7 +1593,7 @@ tr_TR: filename: "Dosya adı" size: "Boyut" upload: - label: "Yedek yükle" + label: "Yedek Yükle" title: "Bu oluşuma bir yedekleme yükle" uploading: "Yükleniyor..." success: "'{{filename}}' başarıyla yüklendi." @@ -1589,7 +1606,7 @@ tr_TR: title: "Devam eden işlemi iptal et" confirm: "Devam eden işlemi iptal etmek istediğinize emin misiniz?" backup: - label: "Yedek oluştur" + label: "Yedek Oluştur" title: "Yedek oluştur" confirm: "Yeni bir yedekleme başlatmak istiyor musunuz?" without_uploads: "Evet (dosya eklemeyin)" @@ -1601,7 +1618,7 @@ tr_TR: confirm: "Bu yedeği yok etmek istediğinize emin misiniz?" restore: is_disabled: "Geri getirme site ayarlarında devredışı bırakılmış." - label: "Geri yükle" + label: "Geri Yükle" title: "Yedeği geri getir" confirm: "Yedeği geri getirmek istediğinize emin misiniz?" rollback: @@ -1620,16 +1637,18 @@ tr_TR: screened_email: "Tüm taranmış e-postalar listesini CSV formatında dışa aktar." screened_ip: "Tüm taranmış IPler listesini CSV formatında dışa aktar." screened_url: "Tüm taranmış URLler listesini CSV formatında dışa aktar." + export_json: + button_text: "Dışarı aktar" invite: - button_text: "Davetleri gönder" - button_title: "Davetleri gönder" + button_text: "Davetleri Gönder" + button_title: "Davetleri Gönder" customize: title: "Özelleştir" long_title: "Site Özelleştirmeleri" css: "CSS" header: "Başlık" - top: "Üst kısım" - footer: "Alt kısım" + top: "En Kısım" + footer: "Alt Kısım" head_tag: text: "" title: " etiketinden önce eklenecek HTML" @@ -1646,7 +1665,9 @@ tr_TR: explain_rescue_preview: "Websitesine varsayılan stil sayfası ile bak" save: "Kaydet" new: "Yeni" - new_style: "Yeni stil" + new_style: "Yeni Stil" + import: "İçeri aktar" + import_title: "Bir dosya seçin ya da kopyalayıp, yapıştırın" delete: "Sil" delete_confirm: "Bu özelleştirmeyi sil?" about: "Websitesindeki CSS stil sayfalarını ve HTML başlıklarını değiştir. Özelleştirme ekleyerek başla." @@ -1655,12 +1676,12 @@ tr_TR: copy: "Kopyala" css_html: title: "CSS/HTML" - long_title: "CSS ve HTML özelleştirmeleri" + long_title: "CSS ve HTML Özelleştirmeleri" colors: title: "Renkler" - long_title: "Renk düzenleri" + long_title: "Renk Düzenleri" about: "Websitesindeki renkleri CSS yazmadan değiştir. Renk düzeni ekleyerek başla." - new_name: "Yeni renk düzeni" + new_name: "Yeni Renk Düzeni" copy_name_prefix: "Kopyası" delete_confirm: "Bu renk düzenini sil?" undo: "geri al" @@ -1709,24 +1730,24 @@ tr_TR: test_error: "Test e-postasının gönderilmesinde sorun yaşandı. Lütfen e-posta ayarlarınızı tekrar kontrol edin, yer sağlayıcınızın e-posta bağlantılarını bloke etmediğinden emin olun, ve tekrar deneyin." sent: "Gönderildi" skipped: "Atlandı" - sent_at: "Gönderildiği zaman" + sent_at: "Gönderildiği Zaman" time: "Zaman" user: "Kullanıcı" - email_type: "E-posta türü" - to_address: "Gönderi adresi" + email_type: "E-posta Türü" + to_address: "Gönderi Adresi" test_email_address: "test için e-posta adresi" - send_test: "Test e-postası gönder" + send_test: "Test E-postası Gönder" sent_test: "gönderildi!" - delivery_method: "Gönderme metodu" - preview_digest: "Özeti önizle" + delivery_method: "Gönderme Metodu" + preview_digest: "Özeti Önizle" preview_digest_desc: "Etkin olmayan kullanıcılara gönderilen haftalık özet e-postalarının içeriğini özleyin" refresh: "Yenile" format: "Format" html: "html" text: "yazı" - last_seen_user: "Son görülen kullanıcı:" - reply_key: "Cevapla tuşu" - skipped_reason: "Nedeni atla" + last_seen_user: "Son Görülen Kullanıcı:" + reply_key: "Cevapla Tuşu" + skipped_reason: "Nedeni Atla" logs: none: "Hiç bir kayıt bulunamadı." filters: @@ -1740,7 +1761,7 @@ tr_TR: title: "Kayıtlar" action: "İşlem" created_at: "Oluşturuldu" - last_match_at: "En son eşlenen" + last_match_at: "En Son Eşlenen" match_count: "Eşleşmeler" ip_address: "IP" topic_id: "Konu IDsi" @@ -1752,11 +1773,11 @@ tr_TR: block: "engelle" do_nothing: "hiçbir şey yapma" staff_actions: - title: "Görevli seçenekleri" + title: "Görevli Seçenekleri" instructions: "Kullanıcı adları ve aksiyonlara tıklayarak listeyi filtrele. Profil resimlerine tıklayarak kullanıcı sayfalarına git." - clear_filters: "Hepsini göster" - staff_user: "Görevli kullanıcı" - target_user: "Hedef kullanıcı" + clear_filters: "Hepsini Göster" + staff_user: "Görevli Kullanıcı" + target_user: "Hedef Kullanıcı" subject: "Konu" when: "Ne zaman" context: "Durum" @@ -1785,13 +1806,13 @@ tr_TR: impersonate: "rolüne gir" anonymize_user: "kullanıcıyı anonimleştir" screened_emails: - title: "Taranmış e-postalar" + title: "Taranmış E-postalar" description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir aksiyon alınacak." - email: "E-posta adresi" + email: "E-posta Adresi" actions: - allow: "İzin ver" + allow: "İzin Ver" screened_urls: - title: "Taranmış bağlantılar" + title: "Taranmış Bağlantılar" description: "Burada listenen URLler spamci olduğu tespit edilmiş kullanıcılar tarafından gönderilerde kullanılmış." url: "Bağlantı" domain: "Alan Adı" @@ -1805,7 +1826,7 @@ tr_TR: actions: block: "Engelle" do_nothing: "İzin Ver" - allow_admin: "Yöneticiye izin ver" + allow_admin: "Yöneticiye İzin Ver" form: label: "Yeni:" ip_address: "IP adresi" @@ -1823,12 +1844,12 @@ tr_TR: invalid: "Üzgünüz, bu kullanıcının rolüne giremezsiniz." users: title: 'Kullanıcılar' - create: 'Yönetici kullanıcı ekle' - last_emailed: "Son e-posta gönderimi" + create: 'Yönetici Kullanıcı Ekle' + last_emailed: "Son E-posta Gönderimi" not_found: "Üzgünüz, bu kullanıcı adı sistemde yok." id_not_found: "Üzgünüz, bu kullanıcı adı sistemimizde bulunmuyor." active: "Etkin" - show_emails: "E-postaları göster" + show_emails: "E-postaları Göster" nav: new: "Yeni" active: "Etkin" @@ -1843,9 +1864,9 @@ tr_TR: reject_selected: other: "({{count}}) kullanıcıyı reddet" titles: - active: 'Etkin kullanıcılar' - new: 'Yeni kullanıcılar' - pending: 'Gözden geçirilmeyi bekleyen kullanıcılar' + active: 'Etkin Kullanıcılar' + new: 'Yeni Kullanıcılar' + pending: 'Gözden Geçirilmeyi Bekleyen Kullanıcılar' newuser: 'Güven seviyesi 0 (Yeni kullanıcı) olan kullanıcılar' basic: 'Güven seviyesi 1 (Acemi kullanıcı) olan kullanıcılar' regular: 'Güven seviyesi 2 (Üye) olan kullanıcılar' @@ -1854,9 +1875,9 @@ tr_TR: staff: "Görevli" admins: 'Yöneticiler' moderators: 'Moderatörler' - blocked: 'Engellenen kullanıcılar' - suspended: 'Uzaklaştırılmış kullanıcılar' - suspect: 'Kuşkulanılan kullanıcılar' + blocked: 'Engellenen Kullanıcılar' + suspended: 'Uzaklaştırılmış Kullanıcılar' + suspect: 'Kuşkulanılan Kullanıcılar' reject_successful: other: "Başarıyla reddedilmiş %{count} kullanıcı." reject_failures: @@ -1882,44 +1903,44 @@ tr_TR: admin: "Yönetici mi?" blocked: "Engellendi mi?" show_admin_profile: "Yönetici" - edit_title: "Başlığı düzenle" - save_title: "Başlığı kaydet" + edit_title: "Başlığı Düzenle" + save_title: "Başlığı Kaydet" refresh_browsers: "Tarayıcıyı sayfa yenilemesine zorla" refresh_browsers_message: "Mesaj tüm kullanıcılara gönderildi!" - show_public_profile: "Herkese açık profili görüntüle" + show_public_profile: "Herkese Açık Profili Görüntüle" impersonate: 'Rolüne gir' ip_lookup: "IP Arama" - log_out: "Oturumu kapat" + log_out: "Çıkış Yap" logged_out: "Kullanıcının tüm cihazlarda oturumu kapatılmış" - revoke_admin: 'Yöneticiliğini iptal et' - grant_admin: 'Yönetici yetkisi ver' - revoke_moderation: 'Moderasyonu iptal et' - grant_moderation: 'Moderasyon yetkisi ver' - unblock: 'Engeli kaldır' + revoke_admin: 'Yöneticiliğini İptal Et' + grant_admin: 'Yönetici Yetkisi Ver' + revoke_moderation: 'Moderasyonu İptal Et' + grant_moderation: 'Moderasyon Yetkisi Ver' + unblock: 'Engeli Kaldır' block: 'Engelle' reputation: İtibar permissions: İzinler activity: Aktivite like_count: Beğenileri / Beğendikleri last_100_days: 'son 100 günde' - private_topics_count: Özel konular - posts_read_count: Okuduğu gönderiler - post_count: Oluşturduğu gönderiler - topics_entered: Görüntülediği konular - flags_given_count: Rapor ettikleri - flags_received_count: Rapor edildikleri - warnings_received_count: Uyarılar alındı - flags_given_received_count: 'Rapor edildikleri / ettikleri' + private_topics_count: Özel Konular + posts_read_count: Okuduğu Gönderiler + post_count: Oluşturduğu Gönderiler + topics_entered: Görüntülediği Konular + flags_given_count: Verilen Bayraklar + flags_received_count: Alınan Bayraklar + warnings_received_count: Uyarılar Alındı + flags_given_received_count: 'Alınan / Verilen Bayraklar' approve: 'Onayla' approved_by: "onaylayan" approve_success: "Kullanıcı onaylandı ve etkinleştirme bilgilerini içeren bir e-posta yollandı." approve_bulk_success: "Tebrikler! Seçilen tüm kullanıcılar onaylandı ve bilgilendirildi." - time_read: "Okuma süresi" - anonymize: "Kullanıcıyı anonimleştir" + time_read: "Okunma Süresi" + anonymize: "Kullanıcıyı Anonimleştir" anonymize_confirm: "Bu hesabı anonimleştirmek istediğinize EMİN misiniz? Kullanıcı adı ve e-posta değiştirilecek, ve tüm profil bilgileri sıfırlanacak." anonymize_yes: "Evet, bu hesap anonimleştir" anonymize_failed: "Hesap anonimleştirilirken bir hata oluştu." - delete: "Kullanıcıyı sil" + delete: "Kullanıcıyı Sil" delete_forbidden_because_staff: "Yöneticiler ve moderatörler silinemez." delete_posts_forbidden_because_staff: "Yöneticiler ve moderatörlerin tüm gönderileri silinemez." delete_forbidden: @@ -1933,12 +1954,12 @@ tr_TR: delete_dont_block: "Sadece sil" deleted: "Kullanıcı silinmiş." delete_failed: "Kullanıcı silinirken bir hata oluştu. Kullanıcıyı silmeye çalışmadan önce tüm gönderilerin silindiğinden emin olun. " - send_activation_email: "Etkinleştirme e-postası gönder" + send_activation_email: "Etkinleştirme E-postası Gönder" activation_email_sent: "Etkinleştirme e-postası gönderildi." send_activation_email_failed: "Tekrar etkinleştirme e-postası gönderilirken bir sorun yaşandı. %{error}" activate: "Hesabı aktifleştir" activate_failed: "Kullanıcı etkinleştirilirken bir sorun yaşandı." - deactivate_account: "Hesabı pasifleştir" + deactivate_account: "Hesabı Pasifleştir" deactivate_failed: "Kullanıcı deaktive edilirken bir sorun yaşandı." unblock_failed: 'Kullanıcının engeli kaldırılırken bir sorun yaşandı.' block_failed: 'Kullanıcı engellenirken bir sorun yaşandı.' @@ -1946,29 +1967,29 @@ tr_TR: suspended_explanation: "Uzaklaştırılmış kullanıcılar sistemde oturum açamaz." block_explanation: "Engellenmiş bir kullanıcı gönderi oluşturamaz veya konu başlatamaz." trust_level_change_failed: "Kullanıcının güven seviyesi değiştirilirken bir sorun yaşandı." - suspend_modal_title: "Kullanıcıyı uzaklaştır" - trust_level_2_users: "Güven seviyesi 2 olan kullanıcılar" - trust_level_3_requirements: "Güven seviyesi 3 gereksinimleri" + suspend_modal_title: "Kullanıcıyı Uzaklaştır" + trust_level_2_users: "Güven Seviyesi 2 Olan Kullanıcılar" + trust_level_3_requirements: "Güven Seviyesi 3 Gereksinimleri" trust_level_locked_tip: "güven seviyesi kitlendi, sistem kullanıcının seviyesini ne yükseltebilecek ne de düşürebilecek" trust_level_unlocked_tip: "güven seviyesi kilidi çözüldü, sistem kullanıcının seviyesini yükseltebilir ya da düşürebilir" - lock_trust_level: "Güven seviyesini kilitle" - unlock_trust_level: "Güvenlik seviyesi kilidini aç" + lock_trust_level: "Güven Seviyesini Kilitle" + unlock_trust_level: "Güvenlik Seviyesi Kilidini Aç" tl3_requirements: - title: "Güven seviyesi 3 için gerekenler" + title: "Güven Seviyesi 3 için Gerekenler" table_title: "Son 100 günde:" value_heading: "Değer" requirement_heading: "Gereksinim" visits: "Ziyaretler" days: "gün" - topics_replied_to: "Cevaplanan konular" - topics_viewed: "Görüntülenmiş konular" - topics_viewed_all_time: "Görüntülenmiş konular (Tüm zamanlar)" - posts_read: "Okunmuş gönderiler" - posts_read_all_time: "Okunmuş gönderiler (Tüm zamanlarda)" - flagged_posts: "Rapor edilen gönderiler" - flagged_by_users: "Rapor eden kullanıcılar" - likes_given: "Verilen beğeniler" - likes_received: "Alınan beğeniler" + topics_replied_to: "Cevaplanan Konular" + topics_viewed: "Görüntülenmiş Konular" + topics_viewed_all_time: "Görüntülenmiş Konular (Tüm zamanlar)" + posts_read: "Okunmuş Gönderiler" + posts_read_all_time: "Okunmuş Gönderiler (Tüm zamanlarda)" + flagged_posts: "Bayraklanan Gönderiler" + flagged_by_users: "Bayraklayan Kullanıcılar" + likes_given: "Verilen Beğeniler" + likes_received: "Alınan Beğeniler" likes_received_days: "Alınan beğeniler: tekil günlük" likes_received_users: "Alınan beğeniler: tekil kullanıcı" qualifies: "Güven seviyesi 3 için yeterli." @@ -1979,20 +2000,20 @@ tr_TR: locked_will_not_be_promoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman yükseltilmeyecek." locked_will_not_be_demoted: "Güven seviyesi kilitlendi. Seviyesi hiç bir zaman düşürülmeyecek." sso: - title: "Tek oturum açma" + title: "Tek Oturum Açma" external_id: "Harici ID" external_username: "Kullanıcı adı" external_name: "İsim" external_email: "E-posta" - external_avatar_url: "Profil görseli bağlantısı" + external_avatar_url: "Profil Görseli Bağlantısı" user_fields: - title: "Kullanıcı alanları" + title: "Kullanıcı Alanları" help: "Kullanıcıların doldurabileceği alanlar ekleyin." - create: "Kullanıcı alanı oluştur" + create: "Kullanıcı Alanı Oluştur" untitled: "İsimsiz" - name: "Alan adı" - type: "Alan türü" - description: "Alan açıklaması" + name: "Alan Adı" + type: "Alan Türü" + description: "Alan Açıklaması" save: "Kaydet" edit: "Düzenle" delete: "Sil" @@ -2011,11 +2032,11 @@ tr_TR: enabled: "profilde gösteriliyor" disabled: "profilde gösterilmiyor" field_types: - text: 'Yazı alanı' + text: 'Yazı Alanı' confirm: 'Onay' site_text: none: "Düzenlemeye başlamak için içerik tipi seçin." - title: 'Yazı içeriği' + title: 'Yazı İçeriği' site_settings: show_overriden: 'Sadece değiştirdiklerimi göster' title: 'Ayarlar' @@ -2024,51 +2045,51 @@ tr_TR: no_results: "Hiç sonuç bulunamadı." clear_filter: "Temizle" add_url: "URL ekle" - add_host: "SUNUCU ekle" + add_host: "sunucu ekle" categories: all_results: 'Hepsi' - required: 'Gerekli ayarlar' - basic: 'Genel ayarlar' + required: 'Gerekli Ayarlar' + basic: 'Genel Ayarlar' users: 'Kullanıcılar' posting: 'Gönderiler' email: 'E-posta' files: 'Dosyalar' - trust: 'Güven seviyeleri' + trust: 'Güven Seviyeleri' security: 'Güvenlik' - onebox: "Tek kutu" + onebox: "Tek Kutu" seo: 'SEO' spam: 'Spam' - rate_limits: 'Oran sınırları' + rate_limits: 'Oran Sınırları' developer: 'Geliştirici' embedding: "Yerleştirme" legal: "Yasal" uncategorized: 'Diğer' backups: "Yedekler" - login: "Oturum açma" + login: "Oturum Açma" plugins: "Eklentiler" badges: title: Rozetler - new_badge: Yeni rozet + new_badge: Yeni Rozet new: Yeni name: İsim badge: Rozet - display_name: Görünen ad + display_name: Görünen Ad description: Açıklama - badge_type: Rozet türü + badge_type: Rozet Türü badge_grouping: Grup badge_groupings: - modal_title: Rozet gruplamaları - granted_by: Tarafından verildi - granted_at: Tarihinde verildi + modal_title: Rozet Gruplamaları + granted_by: Tarafından Verildi + granted_at: Tarihinde Verildi reason_help: (Bir mesaj ya da konuya bağlantı) save: Kaydet delete: Sil delete_confirm: Bu rozeti silmek istediğinize emin misiniz? - revoke: İptal et + revoke: İptal Et reason: Neden expand: Genişlet … revoke_confirm: Bu rozeti iptal etmek istediğinize emin misiniz? - edit_badges: Rozetleri düzenle + edit_badges: Rozetleri Düzenle grant_badge: Rozet Ver granted_badges: Verilen Rozetler grant: Ver @@ -2122,11 +2143,11 @@ tr_TR: lightbox: download: "indir" search_help: - title: 'Yardımda ara' + title: 'Yardımda Ara' keyboard_shortcuts_help: - title: 'Klavye kısayolları' + title: 'Klavye Kısayolları' jump_to: - title: 'Şuraya geç' + title: 'Şuraya Geç' home: 'g, h Anasayfa' latest: 'g, l En Son' new: 'g, n Yeniler' @@ -2163,7 +2184,7 @@ tr_TR: reply_post: 'r Gönderiyi cevapla' quote_post: 'q Gönderiyi alıntıla' like: 'l Gönderiyi beğen' - flag: '! Gönderiyi rapor et' + flag: '! Gönderiyi Bayrakla' bookmark: 'b Gönderiyi işaretle' edit: 'e Gönderiyi düzenle' delete: 'd Gönderiyi sil' @@ -2178,7 +2199,7 @@ tr_TR: badge_count: other: "%{count} Rozet" more_badges: - other: "%{count}+ daha" + other: "+%{count} Daha" granted: other: "%{count} kez verildi" select_badge_for_title: Ünvan olarak kullanmak için bir rozet seçin @@ -2189,7 +2210,7 @@ tr_TR: community: name: Topluluk trust_level: - name: Güven seviyesi + name: Güven Seviyesi other: name: Diğer posting: @@ -2214,53 +2235,53 @@ tr_TR: name: Hoş geldiniz description: Bir beğeni aldı autobiographer: - name: Otobiyografi yazarı + name: Otobiyografi Yazarı description: Kullanıcı profil bilgilerini doldurmuş anniversary: name: Yıldönümü description: Bir yıldır aktif kullanıcı, en az bir kere gönderi oluşturmuş. nice_post: - name: Güzel gönderi + name: Güzel Gönderi description: Bir gönderiden 10 beğeni alındı. Bu rozet birden fazla defa verilebilir. good_post: - name: İyi gönderi + name: İyi Gönderi description: Bir gönderiden 25 beğeni alındı. Bu rozet birden fazla defa verilebilir. great_post: - name: Harika gönderi + name: Harika Gönderi description: Bir gönderiden 50 beğeni alındı. Bu rozet birden fazla defa verilebilir. nice_topic: - name: Güzel konu + name: Güzel Konu description: Bir konuda 10 beğeni almış. Bu rozet birden çok kez kazanılabilir. good_topic: - name: İyi konu + name: İyi Konu description: Bir konuda 25 beğeni almış. Bu rozet birden çok kez kazanılabilir. great_topic: - name: Harika konu + name: Harika Konu description: Bir konuda 50 beğeni almış. Bu rozet birden çok kez kazanılabilir. nice_share: - name: Güzel paylaşım + name: Güzel Paylaşım description: 25 tekil kullanıcı ile bir gönderiyi paylaşmış good_share: - name: İyi paylaşım + name: İyi Paylaşım description: 300 tekil kullanıcı ile bir gönderiyi paylaşmış great_share: - name: Harika paylaşım + name: Harika Paylaşım description: 1000 tekil kullanıcı ile bir gönderiyi paylaşmış first_like: name: İlk beğeni description: Bir gönderi beğendi first_flag: - name: İlk rapor - description: Bir gönderiyi rapor etti + name: İlk Bayrak + description: Bir gönderiyi bayrakladı promoter: name: Destekçi description: Kullanıcı davet etti campaigner: name: Katılanlar - description: 3 üye davet etti + description: 3 normal kullanıcı davet etti (Güven seviyesi 1) champion: name: Şampiyon - description: 10 üye davet etti + description: 5 kullanıcı davet etti (Güven seviyesi 2) first_share: name: İlk paylaşım description: Bir gönderi paylaştı diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 304aa41fea..5a50f99bbd 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -8,6 +8,9 @@ uk: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -20,6 +23,9 @@ uk: kb: КБ mb: МБ tb: ТБ + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "HH:mm" tiny: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 1918bfdbd9..1612675919 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -8,6 +8,9 @@ zh_CN: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ zh_CN: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "ah:mm" long_no_year: "MMMDoah:mm" @@ -66,6 +72,13 @@ zh_CN: other: "%{count}小时前" x_days: other: "%{count}日前" + later: + x_days: + other: "%{count}天后" + x_months: + other: "%{count}月后" + x_years: + other: "%{count}年后" share: topic: '分享本主题的链接' post: '#%{postNumber} 楼' @@ -112,6 +125,7 @@ zh_CN: every_two_weeks: "每两周" every_three_days: "每三天" max_of_count: "最多 {{count}}" + alternation: "或" character_count: other: "%{count} 个字符" suggested_topics: @@ -170,6 +184,7 @@ zh_CN: switch_from_anon: "退出匿名模式" banner: close: "隐藏横幅。" + edit: "编辑横幅>>" choose_topic: none_found: "没有找到主题。" title: @@ -186,8 +201,7 @@ zh_CN: cancel: "取消" view_pending: "查看待审核帖子" has_pending_posts: - one: "这个主题有 1 个帖子等待审核" - many: "这个主题有 {{count}} 个帖子等待审核" + other: "这个主题有 {{count}} 个帖子等待审核" confirm: "保存修改" delete_prompt: "你确定要删除%{username}？这将删除他们的所有帖子并封禁这个邮箱和 IP 地址。" approval: @@ -730,6 +744,7 @@ zh_CN: hint: "（你也可以通过拖放至编辑器的方式来上传）" hint_for_supported_browsers: "（你也可以通过拖放或粘帖图片至编辑器的方式来上传）" uploading: "上传中" + select_file: "选择文件" image_link: "链接你的图片到" search: title: "搜索主题、帖子、用户或分类" @@ -858,6 +873,8 @@ zh_CN: '2_4': '因为你在此主题内发表了回复，所以你将收到相关通知。' '2_2': '因为你在追踪此主题，所以你将收到相关通知。' '2': '因为你阅读了此主题，所以你将收到相关通知。' + '1_2': '如果某人@你或者回复你,你将收到通知。' + '1': '如果某人@你或者回复你,你将收到通知。' '0_7': '你将忽略关于此分类的所有通知。' '0_2': '你将忽略关于此主题的所有通知。' '0': '你将忽略关于此主题的所有通知。' @@ -1312,7 +1329,10 @@ zh_CN: with_topics: "%{filter}主题" with_category: "%{category}的%{filter}主题" latest: - title: "最新" + title: + zero: "最新" + one: "最新（1）" + other: "最新（{{count}}）" help: "最新发布的帖子" hot: title: "热门" @@ -1338,13 +1358,13 @@ zh_CN: other: "{{count}} 条未读" new: lower_title_with_count: - one: "1 个近期主题" - other: "{{count}} 个近期主题" - lower_title: "近期主题" + one: "1 近期" + other: "{{count}} 近期" + lower_title: "近期" title: - zero: "近期主题" - one: "近期主题（1）" - other: "近期主题（{{count}}）" + zero: "近期" + one: "近期（1）" + other: "近期（{{count}}）" help: "最近几天创建的主题" posted: title: "我的帖子" @@ -1602,6 +1622,8 @@ zh_CN: screened_email: "以 CSV 格式导出所有已显示的电子邮件列表。" screened_ip: "以 CSV 格式导出所有已显示的IP地址列表。" screened_url: "以 CSV 格式导出所有已显示的URL列表。" + export_json: + button_text: "导出" invite: button_text: "发送邀请" button_title: "发送邀请" @@ -1629,6 +1651,8 @@ zh_CN: save: "保存" new: "新建" new_style: "新样式" + import: "导入" + import_title: "选择一个文件或者粘贴文本" delete: "删除" delete_confirm: "删除本定制内容？" about: "修改站点的 CSS 样式表和 HTML 头部。添加一个自定义方案开始。" @@ -2006,6 +2030,7 @@ zh_CN: no_results: "找不到结果。" clear_filter: "清除" add_url: "增加链接" + add_host: "添加主机" categories: all_results: '全部' required: '必填' @@ -2238,10 +2263,10 @@ zh_CN: description: 已邀请了 1 个用户 campaigner: name: 资深推广 - description: 已邀请了 3 个用户 + description: 邀请3个基础用户（信任等级1） champion: name: 元老推广 - description: 已邀请了 10 个用户 + description: 邀请5个会员（信任等级2） first_share: name: 首次分享 description: 已分享了一个帖子 diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 679a2135e5..1b408dfbb3 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -8,6 +8,9 @@ zh_TW: js: number: + format: + separator: "." + delimiter: "," human: storage_units: format: '%n %u' @@ -18,6 +21,9 @@ zh_TW: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}k" + millions: "{{number}}M" dates: time: "h:mm" long_no_year: "MMM D h:mm a" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 37ebdabf7f..890025e7b2 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -7,69 +7,250 @@ ar: dates: - short_date_no_year: "يوم شهر" + short_date_no_year: "يوم شهر سنة" short_date: "يوم شهر سنة" + long_date: "شهر يوم، سنه ساعة :دقائق" title: "ديسكورس" topics: "عناوين" posts: "منشورات" loading: "تحميل" + powered_by_html: 'مدعوم من ديسكورس ,لتفعيل أفضل رؤية مع جافاسكربت' log_in: "تسجيل الدخول" via: "%{username} من موقع %{site_name}" is_reserved: "محجوز" + purge_reason: "حذف آلي للحسابات المهجوره وغير النشطه " disable_remote_images_download_reason: "لقد تم تعطيل تحميل الصور عن بعد بسبب عدم وجود مساحة كافية" + anonymous: "مجهولون" errors: + format: '%{attribute} %{message}' messages: too_long_validation: "إنها محددة بعدد حروف %{max} حرف; لقد أدخلت %{length}." invalid_boolean: "قيمة منطقية غير صحيحة" + taken: "تم حجزه من قبل " + accepted: يجب أن تُقبل + blank: لا يمكن جعله فارغا + present: يجب أن يكون فارغ + confirmation: "ليست متوافقه%{attribute}" + empty: لا يمكن جعله فارغا + equal_to: يجب أن تكون مساوي لـ %{count} + even: يجب أن يكون منتظم + exclusion: محجوز + greater_than: يجب أن تكون أكبر من %{count} + greater_than_or_equal_to: يجب أن تكون أكبر من أو تساوي %{count} + inclusion: غير متضمن في القائمة + invalid: فاشل + less_than: يجب أن يكون أقل من %{count} + less_than_or_equal_to: يجب أن تكون أقل من أو تساوي %{count} + not_a_number: ليس رقم + not_an_integer: يجب أن يكون عدد صحيح + odd: يجب أن يكون مفرد + record_invalid: 'التحقق من الفشل: %{errors}' + restrict_dependent_destroy: + one: "لا يمكن حذف السجل " + many: "لا يمكن حذف السجل لاعتماده %{record} موجود" + too_long: + zero: طويل جدا (الحد الأقصى بدون الحروف) + one: طويل جدا (الحد الأقصى حرف واحد) + two: طويل جدا (الحد الأقصى حرفين) + few: طويل جدا (الحد الأقصى حروف قليلة) + many: طويل جدا (الحد الأقصى حروف كثيرة) + other: طويل جدا (الحد الأقصى %{count} حروف) + too_short: + zero: قصير جدا (الحد الأدنى بدون حروف) + one: قصير جدا (الحد الأدنى حرف واحد) + two: قصير جدا (الحد الأدنى حرفين) + few: قصير جدا (الحد الأدنى حروف قليلة) + many: قصير جدا (الحد الأدنى حروف كثيرة) + other: قصير جدا (الحد الأدنى %{count} حروف) + wrong_length: + zero: طول خاطئ (يجب أن يكون بدون حروف) + one: طول خاطئ (يجب أن يكون حرف واحد) + two: طول خاطئ (يجب أن يكون حرفين) + few: طول خاطئ (يجب أن يكون حروف قليلة) + many: طول خاطئ (يجب أن يكون حروف كثيرة) + other: طول خاطئ (يجب أن يكون %{count} حروف) + other_than: "يجب أن تكون غير %{count}" + template: + body: 'هناك مشاكل بالحقول التالية ' + header: + zero: لا أخطاء تمنع هذا %{model} من الحفظ + one: خطأ واحد منع هذا %{model} من الحفظ + two: خطأن منعا هذا %{model} من الحفظ + few: أخطاء قليل تمنع هذا %{model} من الحفظ + many: أخطاء كثيرة تمنع هذا %{model} من الحفظ + other: '%{count} أخطاء منعت هذا %{model} من الحفظ' embed: load_from_remote: "هناك خطأ في تحميل هذا المنشور." bulk_invite: file_should_be_csv: "الملف المرفوع يجب أن يكون بنسق وامتداد txt أو csv" backup: + operation_already_running: "هناك عملية قيد العمل حاليا. لا يمكن بدء مهمة جديدة في الوقت الحالي " backup_file_should_be_tar_gz: "ملف الاحتياط يجب أن يكون أرشيف .tar.gz." + not_enough_space_on_disk: "ليست هناك مساحة كافية على القرص لتحميل هذه النسخة الاحتياطية" not_logged_in: "يجب عليك تسجيل الدخول لفعل هذا." + not_found: "تعذر العثور على رابط العنوان المطلوب" + invalid_access: "لا تمتلك صلاحيات لعرض المطلوب " + read_only_mode_enabled: "الموقع في وضع القراءة فقط . تم تعطيل التفاعلات " + too_many_replies: + zero: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـعدم الرد في نفس الموضوع." + one: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـرد واحد في نفس الموضوع." + two: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردّين في نفس الموضوع." + few: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردود قليلة في نفس الموضوع." + many: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـردود كثيرة في نفس الموضوع." + other: "نحن نعتذر، لكن الأعضاء الجدد مقيدين مؤقتا بـ%{count} ردود في نفس الموضوع." embed: start_discussion: "إبدأ نقاش" continue: "الاستمرار في هذا النقاش" + more_replies: + zero: "لا يوجد رد إضافي" + one: "رد واحد إضافي" + two: "ردّين إضافيين" + few: "ردود قليلة إضافية" + many: "ردود كثيرة إضافية" + other: "%{count} ردود إضافية" loading: "تحميل النقاش" + permalink: "الرابط الثابت" + imported_from: "هذا موضوع نقاش مصاحب للمدخل الأصلي على %{link}" + in_reply_to: "{اسم المستخدم}%" + replies: + zero: "لا يوجد رد" + one: "رد واحد" + two: "ردّين" + few: "ردود قليلة" + many: "ردود كثيرة" + other: "%{count} ردود" too_many_mentions: zero: "عذراً، لا يمكنكم تنويه مستخدمين آخرين." - one: "عذراً، يمكنكم فقط تنويه مستخدم واحد في هذا المنشور." + one: "عذراً، يمكنك فقط تنويه مستخدم واحد في هذا المنشور." + other: "عذرا, يمكنك تذكير %{count} مستخدمين فقط في المشاركة." + too_many_mentions_newuser: + zero: "عذرا, المستخدمون الجدد لا يمكنهم تذكير المستخدمين الأخرين." + one: "عذرا, المستخدمون الجدد يمكنهم تذكير مستخدم واحد أخر فقط في المشاركة." + other: "عذرا, المستخدمون الجدد يمكنهم تذكير %{count} مستخجمين فقط في المشاركة." too_many_images: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع الصور في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع صورة واحدة فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} صور فقط في المشاركة." too_many_attachments: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع مرفقات في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع مرفق واحد فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} مرفقات فقط في المشاركة." too_many_links: zero: "عذراً. الأعضاء الجدد لا يمكنهم وضع الروابط في المنشورات." one: "عذراً. الأعضاء الجدد يمكنهم وضع رابط واحد فقط في المنشور." + other: "عذرا, المستخدمون الجدد يمكنهم وضع %{count} روابط فقط في المشاركة." + spamming_host: "عذرا لا يمكنك مشاركة رابط لهذا المضيف." + user_is_suspended: "المستخدمون الموقوفون لا يسمح لهم بالمشاركة." + topic_not_found: "هناك خطأ. ربما هذا الموضوع أغلق أو حذف وأنت تبحث عنه." + just_posted_that: "هذا مماثل لما شاركته مؤخرا" has_already_been_used: "هو مستخدم بالفعل" + invalid_characters: "يحتوي احرف غير صالحة " + is_invalid: "غير صالح حاول ان تضع وصف اكثر" next_page: "الصفحة التالية ←" prev_page: "→ الصفحة السابقة " + page_num: "الصفحة رقم %{num}" + home_title: "الصفحة الرئيسية " + topics_in_category: "المواضيع في '%{category}' الفئة" + rss_posts_in_topic: "مغذي RSS لـ'%{topic}'" + rss_topics_in_category: "مغذي RSS للمواضيع في '%{category}' الفئة" + author_wrote: "كتب %{author} :" + num_posts: "تعليق " num_participants: "المشاركين" read_full_topic: "قراءة العنوان كامل" + private_message_abbrev: "رسالة" rss_description: latest: "آخر المواضيع" hot: "عناوين ساخنة" + posts: "اخر المشاركات " + too_late_to_edit: "تم انشاء هذا التعليق منذ فترة وليس بالامكان تعديله او حذفه" excerpt_image: "صورة" + queue: + delete_reason: "حذف عبر طابور مشاركة معتدل" groups: + errors: + can_not_modify_automatic: "لا يمكنك تعديل مجموعة تلقائية" + member_already_exist: " '%{username}' هو بالفعل عضو في هذه المجموع" default_names: everyone: "الجميع" admins: "المسؤولين" + moderators: "مشرفين" staff: "العاملين" + trust_level_0: "مستوى_الثقة_0" + trust_level_1: "مستوى_الثقة_1" + trust_level_2: "مستوى_الثقة_2" + trust_level_3: "مستوى_الثقة_3" + trust_level_4: "مستوى_الثقة_4" + education: + until_posts: + zero: "لا يوجد مشاركات" + one: "مشاركة واحدة" + two: "مشاركتين" + few: "مشاركات قليلة" + many: "مشاركات كثيرة" + other: "%{count} مشاركات" activerecord: + attributes: + category: + name: "اسم الفئة" + post: + raw: "متن النص" + user_profile: + bio_raw: "معلومات عنّي" errors: + messages: + is_invalid: "غير صالح حاول ان تضع وصف اكثر" + has_already_been_used: "مستخدم بالفعل " models: + topic: + attributes: + base: + warning_requires_pm: "يمكنك ارفاق تحذيرات في الرسائل الخاصة فقط " + too_many_users: "يمكنك ارسال التحذيرات لمستخدم واحد فقط في نفس الوقت" + cant_send_pm: "عذرا، لا يمكنك إرسال رسالة خاصة لهذا المستخدم." + no_user_selected: "يجب تحديد مستخدم موجود " user: attributes: + password: + common: "كلمة المرور هذه ضعيفة وهي من اكثر 10000 كلمة مرور مستخدمة يرجى استخدام كلمة مرور اكثر امنا" + same_as_username: "كلمة المرور هي نفس اسم المستخدم. يرجى أختيار كلمة مرور أخرى أكثر امناً" + same_as_email: "كلمة المرور هي نفس عنوان البريد الألكتروني الخاص بك. يرجى أختيار كلمة مرور أخرى أكثر أماناً" ip_address: signup_not_allowed: "التسجيل غير مسموح من هذا الحساب." color_scheme_color: attributes: hex: - invalid: "هذا لون غير صالح" + invalid: "هذا اللون غير صالح" + user_profile: + no_info_me: "
    مجال المعلومات عني لملف تعريفك فارغ حاليا، هل تريد أن تملأه؟
    " + no_info_other: "
    %{name} لم يدخلوا أي شيء في مجال المعلومات عني لملفهم بعد
    " + vip_category_name: "استراحة" + vip_category_description: "الفئة مخصصة للأعضاء ذوي مستوى الثقة 3 أو أعلى." + meta_category_description: "نقاش حول هذا الموقع, كيفية تنظيمه والعمل عليه أكثر وكيف يمكننا تحسينه." + staff_category_name: "الإدارة" + staff_category_description: "فئة مخصصة للنقاش في مواضيع الإدارة. المواضيع مرئية فقط للأدارة وللمشرفين." + lounge_welcome: + title: "مرحبا بك في الاستراحة." + category: + topic_prefix: "عن الفئة %{category}." + errors: + uncategorized_parent: "غير مصنف لا يمكن أن يكون فئة الأم" + self_parent: "الفئة الفرعية لا يمكن ان تكون كالفئة الرئيسية." + depth: "لا يمكنك تضمين فئة فرعية تحت فئة فرعية اخرى" + email_in_already_exist: "البريد الإلكتروني الوارد '%{email_in}' مستخدم حاليا للفئة '%{category_name}'." + cannot_delete: + uncategorized: "لايمكن حذف الغير مصنف" + has_subcategories: "لايمكن حذف هذه الفئة لأنها تحتوي على فئات فرعية " + topic_exists: + zero: "لا يمكنك حذف هذه الفئة ﻷنها لا تملك موضوع.أقدم موضوع هو %{topic_link}." + one: "لا يمكنك حذف هذه الفئة ﻷن لها موضوع واحد.أقدم موضوع هو %{topic_link}." + two: "لا يمكنك حذف هذه الفئة ﻷن لها موضوعان.أقدم موضوع هو %{topic_link}." + few: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع قليلة.أقدم موضوع هو %{topic_link}." + many: "لا يمكنك حذف هذه الفئة ﻷن لها مواضيع كثيرة.أقدم موضوع هو %{topic_link}." + other: "لا يمكنك حذف هذه الفئة ﻷن لها %{count} مواضيع.أقدم موضوع هو %{topic_link}." + topic_exists_no_oldest: "لايمكن حذف هذه الفئة لعدد المواضيع التي تحتويه. عدد المواضيع %{count}." trust_levels: + newuser: + title: "مستخدم جديد " basic: title: "مستخدم أساسي" regular: @@ -78,35 +259,452 @@ ar: title: "منتظم" elder: title: "قائد" + change_failed_explanation: "حاولت تخفيض رتبة %{user_name} إلى '%{new_trust_level}'. أيضا مستوى الثقة لهم حاليا '%{current_trust_level}'. %{user_name} سيبقى في '%{current_trust_level}' - إذا رغبت في تخفيض رتبة عضو أنظر لمستوى الثقة أولاً." + rate_limiter: + slow_down: "لقد أنجزت هذا العمل مرات كثيرة، حاول مجددا." + too_many_requests: "لدينا حد يومي لعدد المرات التي يمكن للعمل أن ينجز بها. رجاءا انتظر %{time_left} قبل المحاولة مجدداً." + hours: + zero: "1 ساعة" + one: "1 ساعة" + two: "%{count} ساعة" + few: "%{count} ساعات" + many: "%{count} ساعات" + other: "%{count} ساعات" + minutes: + zero: "1 دقيقة" + one: "1 دقيقة" + two: "%{count} دقيقة" + few: "%{count} دقائق" + many: "%{count} دقائق" + other: "%{count} دقائق" + seconds: + zero: "1 ثانية" + one: "1 ثانية" + two: "%{count} ثواني" + few: "%{count} ثواني" + many: "%{count} ثواني" + other: "%{count} ثواني" + datetime: + distance_in_words: + half_a_minute: "< 1 دقيقة" + less_than_x_seconds: + zero: "< صفر ثانية" + one: "< ثانية واحدة" + two: "< ثانيتان" + few: "< ثواني قليلة" + many: "< ثواني كثيرة" + other: "< %{count} ثوان" + distance_in_words_verbose: + half_a_minute: "الأن" + x_seconds: + zero: "1 ثانية مضت" + one: "1 ثانية مضت" + two: "%{count} ثواني مضت" + few: "%{count} ثواني مضت" + many: "%{count} ثواني مضت" + other: "%{count} ثواني مضت" + x_minutes: + zero: "1 دقيقة مضت" + one: "1 دقيقة مضت" + two: "%{count} دقائق مضت" + few: "%{count} دقائق مضت" + many: "%{count} دقائق مضت" + other: "%{count} دقائق مضت" + about_x_hours: + zero: "1 ساعة مضت" + one: "1 ساعة مضت" + two: "%{count} ساعات مضت" + few: "%{count} ساعات مضت" + many: "%{count} ساعات مضت" + other: "%{count} ساعات مضت" + x_days: + zero: "1 يوم مضى" + one: "1 يوم مضى" + two: "%{count} أيام مضت" + few: "%{count} أيام مضت" + many: "%{count} أيام مضت" + other: "%{count} أيام مضت" + about_x_months: + zero: "حوالي 1 شهر مضى" + one: "حوالي 1 شهر مضى" + two: "حوالي %{count} أشهر مضت" + few: "حوالي %{count} أشهر مضت" + many: "حوالي %{count} أشهر مضت" + other: "حوالي %{count} أشهر مضت" + x_months: + zero: "1 شهر مضى" + one: "1 شهر مضى" + two: "%{count} أشهر مضىت" + few: "%{count} أشهر مضىت" + many: "%{count} أشهر مضىت" + other: "%{count} أشهر مضىت" + about_x_years: + zero: "حوالي 1 سنة مضت" + one: "حوالي 1 سنة مضت" + two: "حوالي %{count} سنوات مضت" + few: "حوالي %{count} سنوات مضت" + many: "حوالي %{count} سنوات مضت" + other: "حوالي %{count} سنوات مضت" + over_x_years: + zero: "منذ 1 سنة مضت" + one: "منذ 1 سنة مضت" + two: "منذ %{count} سنوات مضت" + few: "منذ %{count} سنوات مضت" + many: "منذ %{count} سنوات مضت" + other: "منذ %{count} سنوات مضت" + password_reset: + choose_new: "يرجى اختيار كلمة مرور جديدة" + choose: "يرجى أختيار كلمة مرور" + update: 'تحديث كلمة المرور' + save: 'تعين كلمة المرور' + title: 'إعادة تعين كلمة المرور' + success: "تم تغير كلمة المرور بنجاح ويمكنك تسجيل الدخول الأن " + success_unapproved: "تم تغير كلمة المرور بنجاح." change_email: confirmed: "تم تحديث بريدك اﻹلكتروني" + error: "حدث خطأ عند تغير بريدك الإلكتروني. ربما يكون هذا البريد الإلكتروني قد أستوخدم من قبل ؟" activation: - action: "تفعيل حسابك" + action: "تم تفعيل حسابك" + welcome_to: "مرحبا بك في %{site_name}!" + post_action_types: + off_topic: + title: 'خارج الموضوع' + long_form: 'أبلغ أن هذا خارج الموضوع.' + spam: + title: 'سخام' + long_form: 'تبليغ على أنه سخام' + email_title: '"%{title}" تم الأبلاغ على أنه سخام' + email_body: "%{link}\n\n%{message}" + inappropriate: + title: 'غير مناسب' + notify_user: + title: 'رسالة @{{username}}' + long_form: 'العضو أرسل' + email_title: 'مشاركتك في "%{title}"' + email_body: "%{link}\n\n%{message}" + notify_moderators: + title: "شيء آخر " + description: 'تتطلب هذه الوظيفة الاهتمام مشرف لسبب آخر غير المذكورة اعلاه.' + email_body: "%{link}\n\n%{message}" + bookmark: + title: 'المفضلة' + description: 'فضل هذه المشاركة' + long_form: 'فضلت هذه المشاركة' + like: + title: 'إعجاب' + description: 'أُعجَب بهذه المشاركة' + long_form: 'أعجبت بهذه' + vote: + title: 'تصويت' + description: 'صوت لهذا المنشور' + long_form: 'صوت لهذا المنشور' + topic_flag_types: + spam: + title: 'مؤذي' + description: 'هذا الموضوع هو الإعلان. ليس من المفيد أو المناسب لهذا الموقع، ولكن الترويجية في الطبيعة.' + long_form: 'ترفع علم هذا كدعاية' + inappropriate: + title: 'غير مناسب' + long_form: 'ترفع علم هذا عن صورة غير ملائمة' + notify_moderators: + title: "شيء آخر " + archetypes: + regular: + title: "موضوع عادي" + unsubscribed: + title: 'غير مشترك' + description: "لقد تم إلغاء اشتراكك. ونحن لن نتصال بك مرة أخرى!" + error: "خطأ في إلغاء الإشتراك" + resubscribe: + action: "إعادة الاشتراك." reports: + visits: + title: "عضو زائر" + xaxis: "يوم" + yaxis: "عدد الزيارات" + signups: + title: "مستخدمين جدد" + xaxis: "يوم" + yaxis: "عدد المستخدمين الجدد" topics: title: "المواضيع" + xaxis: "اليوم" + yaxis: "عدد المواضيع الجديدة" posts: title: "المشاركات" + xaxis: "اليوم" yaxis: "عدد المشاركات الجديدة" likes: title: "اﻹعجابات" + xaxis: "يوم" yaxis: "عدد اﻹعجابات الجديدة" + flags: + title: "الأبلاغ" + xaxis: "يوم" + yaxis: "عدد الإبلاغات" + bookmarks: + title: "المفضلة" + xaxis: "يوم" + starred: + title: "متألق" + xaxis: "يوم" users_by_trust_level: + xaxis: "مستوى الثقة" yaxis: "عدد اﻷعضاء" + emails: + title: "رسائل البريد الإلكتروني أرسلت" + xaxis: "يوم" + yaxis: "عدد رسائل البريد الإلكتروني" user_to_user_private_messages: + xaxis: "يوم" yaxis: "عدد الرسائل" system_private_messages: + title: "النظام" + xaxis: "اليوم" yaxis: "عدد الرسائل" moderator_warning_private_messages: + title: "تحذير مشرف " + xaxis: "يوم" yaxis: "عدد الرسائل" notify_moderators_private_messages: + xaxis: "اليوم" yaxis: "عدد الرسائل" notify_user_private_messages: + xaxis: "اليوم" yaxis: "عدد الرسائل" top_referrers: + xaxis: "مستخدم" + num_clicks: "نقرات" num_topics: "المواضيع" top_traffic_sources: + xaxis: "مجال" + num_clicks: "نقرات" num_topics: "المواضيع" num_users: "اﻷعضاء" top_referred_topics: xaxis: "موضوع" + num_clicks: "نقرات" + page_view_anon_reqs: + title: "مجهولون" + xaxis: "يوم" + page_view_logged_in_reqs: + xaxis: "يوم" + page_view_crawler_reqs: + xaxis: "يوم" + page_view_total_reqs: + title: "مجموع" + xaxis: "يوم" + http_2xx_reqs: + xaxis: "يوم" + http_3xx_reqs: + xaxis: "يوم" + http_4xx_reqs: + xaxis: "يوم" + http_5xx_reqs: + xaxis: "يوم" + http_total_reqs: + title: "مجموع" + xaxis: "يوم" + topics_with_no_response: + yaxis: "مجموع" + content_types: + education_new_topic: + title: "مستخدم جديد للتعليم: موضوعات الأولى" + usage_tips: + title: "توجيه مستخدم الجديد" + description: "الإرشادات والمعلومات الأساسية للمستخدمين الجدد. " + site_settings: + min_topic_title_length: "الحد الأدنى المسموح به موضوع طول اللقب في الأحرف" + enable_emoji: "تمكين الرموز التعبيرية " + errors: + invalid_email: "بريد الكتروني غير صالح " + invalid_username: "لا يوجد مستخدم بهذا الاسم " + search: + types: + topic: 'نتائج ' + user: 'مستخدمين ' + sso: + not_found: "لا تستطيع البحث او انشاء حساب جديد , راجع ادارة الموقع " + account_not_approved: "الحساب بإنتظار الموافقة , ستتلقى إشعار بالبريد الكتروني بعد الموافقة " + unknown_error: "حدث خطأ أثناء تحديث المعلومات، راجع إدارة الموقع" + timeout_expired: "انتهى وقت الجلسة , يرجى تسجيل الدخول مرة اخرى " + original_poster: "المشاركات الأصلية " + most_posts: "معظم المشاركات" + most_recent_poster: "معظم المشاركات الاخيرة " + frequent_poster: "تكرار المشاركات " + topic_statuses: + closed_enabled: "تم اغلاق هذا الموضوع لا يسمح باضافة ردود جديدة" + closed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + autoclosed_disabled: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + autoclosed_disabled_lastpost: "تم فتح هذا الموضوع الان ويسمح باضافة ردود جديدة " + login: + incorrect_username_email_or_password: "اسم المستخدم او كلمة المرور او البريد الالكتروني غير صحيح" + new_registrations_disabled: "لا يُسمح بتسجيل حساب جديد بهذا الوقت " + password_too_long: "الحد الاقصى لكلمة المرور 200 حرف" + missing_user_field: "لم تُكمل كافة الحقول المطلوبة " + close_window: "تم التحقق . اغلق هذه النافذة للإستمرار" + user: + username: + long: "يجب ان تكون الاحرف اكثر من %{max} " + characters: "يجب ان تحتوي الارقام والاحرف الصغيرة فقط " + must_begin_with_alphanumeric: "يجب ان يبدأ بحرف أو رقم " + email: + not_allowed: "بريد الكتروني غير مسموح . يرجى استخدام بريد الكتروني آخر " + blocked: "غير مسموح" + ip_address: + blocked: "لا يُسمح بتسجيل جديد من عنوان ip الخاص بك " + invite_password_instructions: + subject_template: "تعيين كلمة مرور %{site_name} حسابك" + test_mailer: + subject_template: "[%{site_name}] بريد الكتروني بهدف الاختبار" + new_version_mailer: + subject_template: "[%{site_name}] يوجد اصدار جديد , تحديث متوفر" + flags_reminder: + please_review: "يرجى مراجعة ذلك " + flags_dispositions: + agreed: "شكراً لإعلامنا سننظر في الأمر " + agreed_and_deleted: "شكراً لإعلامنا سنتحقق من المشكلة ونزيل المشاركة" + disagreed: "شكراً لإعلامنا سننظر في ذلك " + deferred: "شكراً لإعلامنا سننظر في ذلك " + deferred_and_deleted: "شكرا لاعلامنا تم ازالة هذا التعليق " + system_messages: + csv_export_succeeded: + subject_template: "اكتمل تصدير البيانات" + csv_export_failed: + subject_template: "فشل تصدير البيانات" + email_reject_trust_level: + subject_template: "[%{site_name}] بريد الكتروني -- غير موثوق" + email_reject_no_account: + subject_template: "[%{site_name}] بريد الكتروني -- حساب غير معروف" + email_reject_empty: + subject_template: "[%{site_name}] بريد الكتروني -- بدون محتوى" + email_reject_parsing: + subject_template: "[%{site_name}] بريد الكتروني -- محتواه غير معروف" + email_reject_invalid_access: + subject_template: "[%{site_name}] بريد الكتروني -- غير صالح" + too_many_spam_flags: + subject_template: "حساب جديد مقفول" + blocked_by_staff: + subject_template: "الحساب مُعطل" + unblocked: + subject_template: "الحساب مُفعل " + download_remote_images_disabled: + subject_template: "الغاء تفعيل تحميل الصور عن بعد " + subject_re: "اعادة " + user_notifications: + previous_discussion: "الردود السابقة " + unsubscribe: + title: "غير مشترك " + digest: + new_activity: "يوجد نشاط جديد في المواضيع والمشاركات الخاصة بك:" + top_topics: "اشهر المشاركات " + other_new_topics: "اشهر المواضيع " + click_here: "أنقر هنا" + read_more: "قراءة المزيد" + page_not_found: + title: "الصفحة المطلوبة غير موجودة او ليس لديك صلاحيات لرؤيتها " + popular_topics: "شعبي " + see_more: "المزيد" + search_title: "البحث في الموقع" + deleted: 'حذف' + upload: + pasted_image_filename: "لصق الصورة " + email_log: + anonymous_user: "المستخدم مجهول" + seen_recently: "تم رؤية هذا المستخدم مسبقاً" + notification_already_read: "تم قراءة هذه الاشعارات " + post_deleted: "تم حذف الموضوع من قبل كاتبه " + already_read: "المستخدم قرأ هذه المشاركة " + message_blank: "رسالة فارغة" + message_to_blank: "رسالة فارغة " + body_blank: "محتوى فارغ " + color_schemes: + base_theme_name: "قاعدة" + about: "حول " + guidelines: "ارشادات" + csv_export: + boolean_yes: "نعم" + boolean_no: "لا" + static_topic_first_reply: | + تعديل محتويات المنشور الاول في هذا الموضوع %{page_name} page. + badges: + long_descriptions: + autobiographer: | + Blah blah blah + Blah blah blah + first_like: | + Blah blah blah + Blah blah blah + first_link: | + Blah blah blah + Blah blah blah + first_quote: | + Blah blah blah + Blah blah blah + first_share: | + Blah blah blah + Blah blah blah + read_guidelines: | + Blah blah blah + Blah blah blah + reader: | + Blah blah blah + Blah blah blah + editor: | + Blah blah blah + Blah blah blah + nice_share: | + Blah blah blah + Blah blah blah + welcome: | + Blah blah blah + Blah blah blah + anniversary: | + Blah blah blah + Blah blah blah + good_share: | + Blah blah blah + Blah blah blah + great_share: | + Blah blah blah + Blah blah blah + nice_post: | + Blah blah blah + Blah blah blah + nice_topic: | + Blah blah blah + Blah blah blah + good_post: | + Blah blah blah + Blah blah blah + good_topic: | + Blah blah blah + Blah blah blah + great_post: | + Blah blah blah + Blah blah blah + great_topic: | + Blah blah blah + Blah blah blah + basic: | + Blah blah blah + Blah blah blah + member: | + Blah blah blah + Blah blah blah + regular: | + Blah blah blah + Blah blah blah + leader: | + Blah blah blah + Blah blah blah + admin_login: + success: "البريد أُرسل" + error: "خطأ!" + email_input: "مدير البريد الإيكتروني" + submit_button: "أرسل البريد الإلكتروني" + discourse_hub: + access_token_problem: "أخبر المدير : أرجوك قم بتحديث إعدادات الموقع لإضافة مفتاح الدخول الصحيح لـ ديسكورس" + performance_report: + initial_post_raw: 'هذا الموضوع يحتوي على معلومات الاداء اليومي للموقع ' + initial_topic_title: التبليغ عن اداء الموقع diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index 26466b8f9c..2ba80c9249 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -173,7 +173,7 @@ de: - Behandle deine Gesprächspartner mit demselben Respekt, den du von ihnen erwartest. - - Kritk ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen. + - Kritik ist in Ordnung, aber bitte kritisiere nur *Ideen*, nicht Menschen. Beachte bitte auch [unsere Richtlinien](/guidelines). Dieser Hilfetext wird nur bei deinen ersten %{education_posts_text} Beiträgen angezeigt. avatar: | @@ -387,6 +387,7 @@ de: continue_button: "Weiter zu %{site_name}" welcome_to: "Willkommen bei %{site_name}!" approval_required: "Bevor du auf das Forum zugreifen kannst, muss dein neues Konto noch von einem Moderator genehmigt werden. Du erhältst eine E-Mail, sobald dies geschehen ist!" + missing_session: "Wir können nicht erkennen ob dein Konto angelegt wurde. Bitte stelle sicher dass Cookies aktiviert sind." post_action_types: off_topic: title: 'Am Thema vorbei' @@ -761,6 +762,7 @@ de: sso_overrides_username: "Überschreibt lokale Benutzernamen mit externen Seiten-Usernamen von SSO Daten (WARNUNG: Diskrepanzen können aufgrund von Unterschieden in Benutzernamenlängen/-anforderungen, auftreten)" sso_overrides_name: "Ersetzt den lokal gespeicherten vollen Namen mit dem vollen Namen der externen Seite aus den SSO Daten" sso_overrides_avatar: "Überschreibt den Avatar des Benutzers mit dem Avatar aus der SSO Payload. Wenn aktiv, dann sollte allow_uploaded_avatars deaktiviert werden." + sso_not_approved_url: "Nicht genehmigte SSO-Accounts zu dieser URL weiterleiten" enable_local_logins: "Aktiviere Login mit lokal gespeicherten Benutzernamen und Passwörtern. (Anmerkung: muss aktiviert sein, damit Einladungen funktionieren)" allow_new_registrations: "Erlaube das Registrieren neuer Benutzerkonten. Wird dies deaktiviert, so kann niemand mehr ein neues Konto erstellen." enable_yahoo_logins: "Aktiviere Yahoo Authentifizierung." @@ -795,6 +797,7 @@ de: max_topics_per_day: "Maximale Anzahl der Themen, die ein Nutzer pro Tag erstellen kann." max_private_messages_per_day: "Maximale Zahl Direktnachrichten, die ein Nutzer pro Tag erstellen kann." max_invites_per_day: "Maximale Zahl an Einladungen, die ein Nutzer pro Tag verschicken kann." + max_topic_invitations_per_day: "Maximale Zahl an Themen-Einladungen, die ein Nutzer pro Tag verschicken kann." suggested_topics: "Anzahl der empfohlenen Themen am Ende eines Themas." limit_suggested_to_category: "Zeige nur Themen der aktuellen Kategorie in vorgeschlagenen Themen." clean_up_uploads: "Lösche verwaiste Uploads, um illegales Hosting zu vermeiden. ACHTUNG: du solltest ein Backup deines /uploads-Verzeichnis erstellen, bevor du diese Funktion aktivierst." @@ -950,6 +953,7 @@ de: notify_about_flags_after: "Wenn es Markierungen gibt, dich nach nach dieser Anzahl von Stunden behandelt wurden, sende eine E-Mail an den contact_email. Setze dies auf 0 um es zu deaktivieren." enable_cdn_js_debugging: "Ermöglicht die Anzeige vollständiger Fehler auf /logs, indem alle eingebetteten JavaScripts Cross-Origin Zugriffsberechtigungen erhalten." show_create_topics_notice: "Administratoren eine Warnmeldung anzeigen, wenn im Forum weniger als 5 öffentlich sichtbare Themen existieren." + delete_drafts_older_than_n_days: Lösche Entwürfe, die mehr als (n) Tage alt sind. vacuum_db_days: "Führe VACUUM FULL ANALYZE aus, um nach Migrationen Speicher in der Datenbank zurückzugewinnen (zum Deaktivieren auf 0 setzen)" prevent_anons_from_downloading_files: "Nichtangemeldeten Benutzern das Herunterladen von Anhängen verbieten. WARNUNG: dies verhindert auch das Herunterladen jeglicher Ressourcen für Website-Anpassungen, die als Anhänge gespeichert wurden." enable_emoji: "Aktiviere emoji" @@ -1057,6 +1061,7 @@ de: not_allowed_from_ip_address: "Du kannst dich von dieser IP-Adresse aus nicht als %{username} anmelden." admin_not_allowed_from_ip_address: "Du kannst dich von dieser IP-Adresse aus nicht als Administrator anmelden." suspended: "Du kannst dich bis zum %{date} nicht anmelden." + suspended_with_reason: "Dieser Nutzer ist bis zum %{date} suspendiert: %{reason}" errors: "%{errors}" not_available: " Nicht verfügbar. Versuche %{suggestion}?" something_already_taken: "Etwas ist schief gelaufen. Möglicherweise ist der Benutzername bereits registriert. Probiere den 'Passwort vergessen'-Link." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 9216c07e48..6e0d42b25d 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -304,7 +304,7 @@ en: vip_category_name: "Lounge" vip_category_description: "A category exclusive to members with trust level 3 and higher." - meta_category_name: "Meta" + meta_category_name: "Site Feedback" meta_category_description: "Discussion about this site, its organization, how it works, and how we can improve it." staff_category_name: "Staff" @@ -675,6 +675,14 @@ en: title: "Total" xaxis: "Day" yaxis: "Total requests" + time_to_first_response: + title: "Time to first response" + xaxis: "Day" + yaxis: "Average time (hours)" + topics_with_no_response: + title: "Topics with no response" + xaxis: "Day" + yaxis: "Total" dashboard: rails_env_warning: "Your server is running in %{env} mode." @@ -745,7 +753,7 @@ en: max_topic_title_length: "Maximum allowed topic title length in characters" min_private_message_title_length: "Minimum allowed title length for a message in characters" min_search_term_length: "Minimum valid search term length in characters" - allow_uncategorized_topics: "Allow topics to be created without a category." + allow_uncategorized_topics: "Allow topics to be created without a category. WARNING: If there are any uncategorized topics, you must recategorize them before turning this off." uncategorized_description: "The description of the uncategorized category. Leave blank for no description." allow_duplicate_topic_titles: "Allow topics with identical, duplicate titles." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -885,9 +893,9 @@ en: enable_sso_provider: "Implement Discourse SSO provider protocol at the /session/sso_provider endpoint, requires sso_secret to be set" sso_url: "URL of single sign on endpoint" sso_secret: "Secret string used to cryptographically authenticate SSO information, be sure it is 10 characters or longer" - sso_overrides_email: "Overrides local email with external site email from SSO payload (WARNING: discrepancies can occur due to normalization of local emails)" - sso_overrides_username: "Overrides local username with external site username from SSO payload (WARNING: discrepancies can occur due to differences in username length/requirements)" - sso_overrides_name: "Overrides local full name with external site full name from SSO payload" + sso_overrides_email: "Overrides local email with external site email from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to normalization of local emails)" + sso_overrides_username: "Overrides local username with external site username from SSO payload on every login, and prevent local changes. (WARNING: discrepancies can occur due to differences in username length/requirements)" + sso_overrides_name: "Overrides local full name with external site full name from SSO payload on every login, and prevent local changes." sso_overrides_avatar: "Overrides user avatar with external site avatar from SSO payload. If enabled, disabling allow_uploaded_avatars is highly recommended" sso_not_approved_url: "Redirect unapproved SSO accounts to this URL" @@ -1111,6 +1119,9 @@ en: enable_mobile_theme: "Mobile devices use a mobile-friendly theme, with the ability to switch to the full site. Disable this if you want to use a custom stylesheet that is fully responsive." dominating_topic_minimum_percent: "What percentage of posts a user has to make in a topic before being reminded about overly dominating a topic." + + daily_performance_report: "Analyze NGINX logs daily and post a Staff Only topic with details" + suppress_uncategorized_badge: "Don't show the badge for uncategorized topics in topic lists." global_notice: "Display an URGENT, EMERGENCY global banner notice to all visitors, change to blank to hide it (HTML allowed)." @@ -1448,7 +1459,7 @@ 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: "This topic is temporarily closed due to a large number of community flags." system_messages: post_hidden: @@ -1484,47 +1495,47 @@ en: - Selecting a topic title will always take you to the **next unread reply** in the topic. To enter at the top or bottom, select the reply count or last reply date instead. - + - While reading a topic, select the progress bar at the bottom right for full navigation controls. Quickly jump back to the top by selecting the topic title. Press ? for a list of super-speedy keyboard shortcuts. - + ## Replying - - To reply to the **topic in general**, use at the very bottom of the topic. + - To reply to the **topic in general**, use at the very bottom of the topic. - - To reply to a **specific person**, use on their post. + - To reply to a **specific person**, use on their post. - - To reply with **a new topic**, use to the right of the post. Both old and new topics will be automatically linked together. + - To reply with **a new topic**, use to the right of the post. Both old and new topics will be automatically linked together. To insert a quote, select the text you wish to quote, then press any Reply button. Repeat for multiple quotes! - + To notify someone about your reply, mention their name. Type `@` to begin selecting a username. - + To use [standard Emoji](http://www.emoji.codes/), just type `:` to match by name, or use the traditional smileys `;)` - + ## Actions There are action buttons at the bottom of each post: - + To let someone know that you enjoyed and appreciated their post, use the **like** button. Share the love! - If you see a problem with someone's post, privately let them, or [our staff](/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. + If you see a problem with someone's post, privately let them, or [our staff](%{base_url}/about), know about it with the **flag** button. You can also **share** a link to a post, or **bookmark** it for later reference on your user page. ## Notifications When someone replies to you, quotes your post, or mentions your `@username`, a number will immediately appear at the top right of the page. Use it to access your **notifications**. - + Don't worry about missing a reply – you'll be emailed any notifications that arrive when you are away. @@ -1536,11 +1547,11 @@ en: You will see the blue new and unread number indicators next to these topics: - + You can change your notifications for any topic via the notification control at the bottom of the topic. - + You can also set notification state per category, if you want to watch every new topic in a specific category. @@ -1590,7 +1601,7 @@ en: subject_template: "Backup completed successfully" text_body_template: "The backup was successful. - Visit the [admin > backup section](/admin/backups) to download your new backup." + Visit the [admin > backup section](%{base_url}/admin/backups) to download your new backup." backup_failed: subject_template: "Backup failed" @@ -2400,10 +2411,11 @@ en:

    - + - + +
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarks
    in:bookmarksin:first
    posts_count:nummin_age:daysmax_age:days

    @@ -2494,3 +2506,7 @@ en: discourse_hub: access_token_problem: "Tell an admin: Please update the site settings to include the correct discourse_org_access_key." + + performance_report: + initial_post_raw: This topic includes daily performance reports for your site. + initial_topic_title: Website performance reports diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 0d04125421..2a65f5f882 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -382,7 +382,7 @@ fr: one: "il y a presque un an" other: "il y a presque %{count} ans" password_reset: - no_token: "Désolé, ce lien de modification de mot de passe est trop vieux. Connectez-vous à nouveau et sélectionnez \"J'ai oublié mon mot de passe\" afin d'obtenir un nouveau lien." + no_token: "Désolé, ce lien de changement de mot de passe est trop vieux. Sélectionnez 'J'ai oublié mon mot de passe' pour obtenir un nouveau lien." choose_new: "Veuillez choisir un nouveau mot de passe" choose: "Veuillez choisir un mot de passe" update: 'Mettre à jour le mot de passe ' @@ -595,6 +595,14 @@ fr: title: "Total" xaxis: "Jour" yaxis: "Total des requêtes" + time_to_first_response: + title: "Délai de première réponse" + xaxis: "Jour" + yaxis: "Temps moyen (heures)" + topics_with_no_response: + title: "Sujets sans réponses" + xaxis: "Jour" + yaxis: "Total" dashboard: rails_env_warning: "Votre serveur fonctionne dans l'environnement de %{env}." ruby_version_warning: "Vous exécutez une version de Ruby 2.0.0 qui est connu pour avoir des problèmes. Migrez vers le patch 247 ou supérieur." @@ -685,6 +693,7 @@ fr: 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." show_subcategory_list: "Voir les sous-catégories à la place de la liste des sujets lorsqu'on entre dans la catégorie." 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 modifier ceci, vous devez exécuter la commande \"rake posts:rebake\"" exclude_rel_nofollow_domains: "Une liste de domaines pour lesquels l'attribut nofollow ne sera pas ajouté aux liens. tld.com autorisera automatiquement sub.tld.com également. Au minimum, vous devriez ajouter le domaine de premier niveau (TLD) de ce site pour aider les robots d'indexation à trouver tout le contenu. Si d'autres parties du site sont sur d'autre domaines, ajoutez-les aussi." post_excerpt_maxlength: "Longueur maximale d'un extrait / résumé de message." @@ -952,12 +961,14 @@ fr: sequential_replies_threshold: "Nombre de messages qu'un utilisateur doit poster d'affilé dans un sujet avant d'être rappelé à l'ordre pour multiple réponses." enable_mobile_theme: "Les appareils mobiles utilisent un thème adapté aux mobiles, avec la possibilité de passer à la totalité du site. Désactivez cette option si vous voulez utiliser une feuille de style personnalisée qui répond à tous les types de client." dominating_topic_minimum_percent: "Quel est le pourcentage de messages un utilisateur doit poster dans un sujet avant d'être rappelé à l'ordre pour laissé la communauté répondre." + daily_performance_report: "Analyser les logs de NGINX quotidiennement et poster un sujet Responsables Uniquement avec les détails" suppress_uncategorized_badge: "Ne pas afficher le badge pour les sujets non catégorisés dans les listes des sujets." global_notice: "Affiche un bandeau global URGENT pour tout les utilisateurs du site, laissez vide pour le cacher (HTML autorisé)." disable_edit_notifications: "Désactiver les notifications de modifications par l'utilisateur système lorsque l'option 'download_remote_images_to_local' est activée." full_name_required: "Le nom complet est requis dans le profil utilisateur." enable_names: "Autoriser l'affichage des noms complets des utilisateurs dans leur profil, sur leur carte d'utilisateur et dans les courriels. Décocher pour cacher les noms complets partout." display_name_on_posts: "Afficher le nom complet de l'utilisateur dans ses messages en plus de son @pseudo." + show_time_gap_days: "Si deux messages sont publiés à ce nombre de jours d'écart, affichez cette durée dans le sujet." invites_per_page: "Afficher les invitations sur la page de l'utilisateur." short_progress_text_threshold: "Si le nombre de messages dans un sujet dépasse ce nombre, la barre de progression affichera uniquement le numéro de message actuel. Si vous modifiez la largeur de la barre de progression, vous devrez peut-être modifier cette valeur." default_code_lang: "Coloration syntaxique par défaut appliquée à la syntaxe des langages de programmation des blocs de code GitHub (lang-auto, Ruby, Python, etc)" @@ -986,6 +997,7 @@ fr: enforce_square_emoji: "Forcer tous les emojiis à être carrés." approve_post_count: "Le nombre de messages d'un nouvel utilisateur qui doivent être approuvés" approve_unless_trust_level: "Les messages des utilisateurs qui n'ont pas atteint ce niveau de confiance doivent être approuvés" + notify_about_queued_posts_after: "Si des messages sont en attente de modération depuis ce nombre d'heures, un email sera envoyé à l'email de contact. Désactivez ces emails en indiquant 0." errors: invalid_email: "Adresse de courriel invalide." invalid_username: "Il n'y a pas d'utilisateur ayant ce pseudo." @@ -1193,8 +1205,38 @@ fr: [mj]: https://www.mailjet.com/pricing new_version_mailer: subject_template: "[%{site_name}] Nouvelle version de Discourse, mise à jour disponible" + text_body_template: | + Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. + + Votre version: %{installed_version} + Nouvelle version: **%{new_version}** + + Vous voulez peut-être: + + - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). + + - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) + + - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] mise à jour disponible" + text_body_template: | + Une nouvelle version de [Discourse](http://www.discourse.org) est disponible. + + Votre version: %{installed_version} + Nouvelle version: **%{new_version}** + + Vous voulez peut-être: + + - Voir les nouveautés sur le [changelog de GitHub](https://github.com/discourse/discourse/commits/master). + + - Mettre à jour depuis votre navigateur en allant sur [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) + + - Visiter [meta.discourse.org](http://meta.discourse.org) pour vous tenir au courant, discuter et avoir de l'aide à propos de Discourse. + + ### Notes de mise à jour + + %{notes} flags_reminder: flags_were_submitted: one: "Il y a un signalement qui a été soumis il y a plus de %{count} heures." @@ -1205,6 +1247,14 @@ fr: subject_template: one: "un signalement en attente de traitement" other: "%{count} signalements en attente de traitement." + 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, + + Des messages de nouveaux utilisateurs sont en attente de modération. [Ils peuvent être approuvés ou rejetés ici](%{base_url}/queued-posts). flag_reasons: off_topic: "Votre message a été signalé comme étant **hors sujet**: la communauté considère qu'il ne correspond au sujet en discussion, qui est fixé par son titre et son premier message." inappropriate: "Votre message a été signalé comme étant **inapproprié**: la communauté considère que son contenu est offensif, abusif ou enfreint notre [règlement interne](/guidelines)." @@ -1216,7 +1266,7 @@ fr: disagreed: "Merci de nous en informer. Nous travaillons à sa résolution." deferred: "Merci de nous en informer. Nous travaillons à sa résolution." deferred_and_deleted: "Merci de nous en informer. Nous avons supprimé le message." - temporarily_closed_due_to_flags: "Ce sujet est temporairement clos dû à un trop grand nombre de signalements" + temporarily_closed_due_to_flags: "Ce sujet est temporairement fermé à cause d'un grand nombre de signalements de la communauté." system_messages: post_hidden: subject_template: "Message caché suite à un signalement par la communauté" @@ -1243,7 +1293,7 @@ fr: text_body_template: "Merci d'avoir accepté votre invitation sur %{site_name} et bienvenue !\n\nNous avons créé un nouveau compte : **%{username}**, et vous y êtes connecté. Vous pouvez changer votre pseudo en allant sur [votre profil][prefs].\n\nPour vous reconnecter :\n\n1. Toujours **utiliser la même adresse de courriel que celle de l'invitation** que vous avez reçue. Autrement, nous ne pourrons pas vous reconnaître.\n\n2. Créer un mot de passe unique sur votre [sur votre profil][prefs] et connectez-vous avec. \n\n%{new_user_tips}\n\nNous croyons au [comportement communautaire civilisé](%{base_url}/guidelines) en tous temps.\n\nAmusez-vous bien !\n\n(Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message).\n\n[prefs] : %{user_preferences_url}\n" backup_succeeded: subject_template: "Sauvegarde terminée avec succès" - text_body_template: "La sauvegarde a été un succès.\nVisitez la section [Administration > sauvegardes](/admin/backups) pour télécharger votre dernière sauvegarde." + text_body_template: "La sauvegarde a bien réussie.\nVisitez [la section admin > sauvegarde](%{base_url}/admin/backups) pour télécharger votre nouvelle sauvegarde." backup_failed: subject_template: "Échec de la sauvegarde" text_body_template: | @@ -1907,29 +1957,6 @@ fr: \ ?](#cookies)\n\nOui. Les cookies sont de petits fichiers qu'un site ou son prestataire de services transfert sur le disque dur de votre ordinateur via votre navigateur Web (si vous permettez). Ces cookies permettent au site de reconnaître votre navigateur et, si vous avez un compte enregistré, l'associer à votre compte enregistré.\n\nNous utilisons des cookies pour comprendre et sauvegarder vos préférences pour de futures visites et compiler des données globales sur le trafic du site et les interactions avec le site afin que nous puissions offrir de meilleures expériences de navigation et de meilleurs outils à l'avenir. Nous pouvons conclure des contrats avec des fournisseurs de services tiers pour nous aider à mieux comprendre les visiteurs du site. Ces fournisseurs de services ne sont pas autorisés à utiliser les renseignements recueillis en notre nom, sauf pour nous aider à mener et à améliorer notre entreprise.\n\n\n\n## [Divulguons-nous des informations à des tiers?](#disclose)\n\nNous ne vendons pas, ni échangeons, ou même transférerons vos renseignements personnelles à des tiers. Ceci n'inclut pas les tiers de confiance qui nous aident à exploiter notre site, la conduite de nos affaires, ou vous servir, tant que ces parties conviennent à garder ces informations\ \ confidentiels. Nous pouvons également divulguer vos informations lorsque nous croyons nécessaire de se conformer à la loi, appliquer nos politiques de site, ou la nôtre ou d'autres droits, la propriété ou la sécurité. Toutefois, des informations non personnelles des visiteurs peuvent être fournis à d'autres parties pour le marketing, la publicité, ou d'autres utilisations.\n\n\n\n## [Liens vers des tiers](#third-party)\n\nParfois, à notre discrétion, nous pouvons inclure ou offrir des produits ou services de tiers sur notre site. Ces sites tiers ont des politiques de confidentialité distinctes et indépendantes. Nous n'avons donc aucune responsabilité pour le contenu et les activités de ces sites. Néanmoins, nous cherchons à protéger l'intégrité de notre site et sommes disposés à accueillir tous les commentaires au sujet de ces sites. \n\n\n\n## [Protection des mineurs](#coppa)\n\nNotre site, produits et services sont dirigés vers les personnes qui ont au moins 13 ans ou plus. Si ce serveur est aux Etats-Unis, et que vous êtes sous l'âge de 13 ans, conformément aux exigences de la COPPA ([Children's Online Privacy Protection Act](http://fr.wikipedia.org/wiki/Children%27s_Online_Privacy_Protection_Act)), n'utiliser pas ce site. ## [Politique de confidentialité en ligne](#online) Cette politique de confidentialité en ligne s'applique uniquement aux informations collectées sur notre site et non aux informations recueillies hors connexion. ## [Votre consentement](#consent) En utilisant notre site, vous consentez à la Politique de confidentialité de notre site web.\n\n\n\n## [Changements à notre politique de confidentialité](#changes)\n\nSi nous décidons de changer notre politique de confidentialité, nous afficherons ces modifications sur cette page.\n\nCe document est soumis à la licence creative commons CC-BY-SA.\n" - static: - search_help: | -

    Astuces

    -

    -

      -
    • Les résultats dont le titre correspond à la recherche sont retournés en priorité. Donc, en cas de doutes, recherchez dans les titres
      • -
    • Pour obtenir de meilleurs résultats, utilisez toujours des mots rares ou peu fréquents
      • -
    • Dès que possible, limitez vos recherches à une catégorie en particulier, à un utilisateur ou à un sujet
      • -
    -

    -

    Paramètres

    -

    - - - - - - -
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarks
    -

    -

    - rainbows category:parks status:open order:latest recherchera les sujets qui contiennent le mot "rainbows", qui sont dans la catégorie "parks" et qui ne sont ni fermés ni archivé. Les résultats seront triés par la date du dernier message publié. -

    badges: long_descriptions: autobiographer: | @@ -2011,3 +2038,6 @@ fr: submit_button: "Envoyer un courriel" discourse_hub: access_token_problem: "En informer un administrateur : Veuillez mettre à jour les paramètres du site afin de renseigner une clé discourse_org_access_key correcte." + performance_report: + initial_post_raw: Ce sujet comprend des rapports de performance journaliers concernant votre site. + initial_topic_title: Rapports de performances du site diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index 1a5b7f3e08..ac4d2733d7 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -344,7 +344,7 @@ it: one: "quasi 1 anno fa" other: "quasi %{count} anni fa" password_reset: - no_token: "Siamo spiacenti ma il collegamento per il cambio password è troppo vecchio. Collegati di nuovo e seleziona 'Ho dimenticato la password' per ottenere un nuovo collegamento." + no_token: "Spiacenti, il collegamento per il cambio password è scaduto. Seleziona 'Ho dimenticato la password' per ottenere un nuovo collegamento." choose_new: "Per favore scegli una nuova password." choose: "Per favore scegli una password" update: 'Aggiorna Password' @@ -557,6 +557,14 @@ it: title: "Totali" xaxis: "Giorno" yaxis: "Richieste totali" + time_to_first_response: + title: "Tempo per la prima risposta" + xaxis: "Giorno" + yaxis: "Tempo medio (ore)" + topics_with_no_response: + title: "Argomenti senza risposta" + xaxis: "Giorno" + yaxis: "Totali" dashboard: rails_env_warning: "Il tuo server è in modalità %{env}." ruby_version_warning: "Stai eseguendo la versione 2.0.0 di Ruby che ha problemi noti. Effettua l'upgrade alla patch livello 247 o seguenti." @@ -647,7 +655,9 @@ it: 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." show_subcategory_list: "Quando si accede ad una categoria, mostra l'elenco di sottocategorie anziché l'elenco di argomenti. " fixed_category_positions: "Se attivo, potrai ordinare le categorie. Se non attivo, le categorie vengono elencate in ordine di attività." + fixed_category_positions_on_create: "Se spuntato, 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\"" + exclude_rel_nofollow_domains: "Una lista di domini a cui non aggiungere \"nofollow\" ai collegamenti. Inoltre tld.com autorizzerà automaticamente sub.tld.com. Dovresti perlomeno aggiungere il dominio di primo livello di questo sito, per aiutare i motori di ricerca a trovare tutto il contenuto. Se parti del tuo sito si trovano su altri domini, aggiungi anche quelli." post_excerpt_maxlength: "Lunghezza massima dell'estratto / riassunto di un messaggio." post_onebox_maxlength: "Lunghezza massima in caratteri di un messaggio Discourse in Onebox." onebox_domains_whitelist: "Lista di domini per i quali consentire la funzione di onebox; questi domini devono supportare OpenGraph o oEmbed. Testali su http://iframely.com/debug" @@ -679,6 +689,9 @@ it: cooldown_minutes_after_hiding_posts: "Quanti minuti l'utente deve attendere prima di poter modificare un messaggio che è stato nascosto a causa di segnalazioni" max_topics_in_first_day: "Numero massimo di argomenti che l'utente può creare nel suo primo giorno di forum" max_replies_in_first_day: "Numero massimo di risposte che un utente può pubblicare nel suo primo giorno sul sito" + tl2_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 2 (Assiduo), moltiplicando per questo numero" + tl3_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 3 (Esperto) moltiplicando per questo numero" + tl4_additional_likes_per_day_multiplier: "Aumenta il limite di \"Mi piace\" al giorno ammessi per gli utenti con livello di esperienza 4 (Veterano), moltiplicando per questo numero" num_flags_to_block_new_user: "Se i messaggi di un nuovo utente ricevono segnalazioni di spam da num_users_to_block_new_user diversi utenti, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità." num_users_to_block_new_user: "Se i messaggi di un nuovo utente ricevono num_flags_to_block_new_user segnalazioni di spam da così tanti utenti diversi, nascondi tutti i messaggi dell'utente e impediscigli ulteriori invii. 0 per disabilitare questa funzionalità." notify_mods_when_user_blocked: "Se un utente è bloccato automaticamente, manda un messaggio ai moderatori." @@ -713,6 +726,7 @@ it: email_token_grace_period_hours: "I messaggi di password dimenticata / attivazione account sono ancora validi per un periodo di grazia di (n) ore dopo essere stati convalidati." enable_badges: "Attiva il sistema a targhette" allow_index_in_robots_txt: "Specifica nel file robots.txt che questo sito permette l'indicizzazione da parte dei motori di ricerca." + email_domains_blacklist: "Una lista di domini email separati dal carattere pipe \"|\" con cui gli utenti non possono registrare un account. Ad esempio: mailinator.com/trashmail.net" forgot_password_strict: "Non informare gli utenti dell'esistenza dell'account quando richiamano la finestra per la password dimenticata." log_out_strict: "Quando si fa logout, esci da TUTTE le sessioni dell'utente su tutti i dispositivi" version_checks: "Verifica su Discourse Hub l'esistenza di aggiornamenti e mostra i messaggi per le nuove versioni nel cruscotto /admin" @@ -1208,6 +1222,8 @@ it: 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. \n\nSe non hai fatto tu questa richiesta, ignora tranquillamente questa email.\n\nClicca sul seguente collegamento per scegliere una password:\n%{base_url}/users/password-reset/%{email_token}\n" + admin_login: + subject_template: "[%{site_name}] Login" account_created: subject_template: "[%{site_name}] Il Tuo Nuovo Account " text_body_template: | @@ -1265,6 +1281,7 @@ it: spam_hosts: "Questo nuovo utente ha tentato di creare più messaggi con collegamenti allo stesso dominio. Guarda l'impostazione newuser_spam_host_threeshold." email_log: no_user: "Non trovo l'utente con l'id %{user_id}" + anonymous_user: "L'utente è anonimo" suspended_not_pm: "L'utente è sospeso, non è un messaggio" seen_recently: "L'utente è stato visto di recente" post_not_found: "Non trovo un messaggio con id %{post_id}" @@ -1349,6 +1366,33 @@ it: good_share: "Bla bla bla \nBla bla bla\n" great_share: "Bla bla bla \nBla bla bla \n" nice_post: "Bla bla bla \nBla bla bla \n" + nice_topic: | + Blah blah blah + Blah blah blah + good_post: | + Blah blah blah + Blah blah blah + good_topic: | + Blah blah blah + Blah blah blah + great_post: | + Blah blah blah + Blah blah blah + great_topic: | + Blah blah blah + Blah blah blah + basic: | + Blah blah blah + Blah blah blah + member: | + Blah blah blah + Blah blah blah + regular: | + Blah blah blah + Blah blah blah + leader: | + Blah blah blah + Blah blah blah admin_login: success: "email Inviata" error: "Errore!" diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index 0aa196677d..57df510e94 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -259,6 +259,7 @@ pl_PL: uncategorized_parent: "Inne nie mogą być podkategorią innej kategorii." self_parent: "Podkategoria nie może być swoim rodzicem" depth: "Nie możesz umieścić subkategorii w innej subkategorii" + email_in_already_exist: "Przychodzący adres email '%{email_in}' jest teraz używany w tej '%{category_name}' kategorii. " cannot_delete: uncategorized: "Nie można usunąć kategorii Inne" has_subcategories: "Nie można usunąć tej kategorii ponieważ posiada podkategorie. " @@ -388,6 +389,7 @@ pl_PL: few: "prawie %{count} lata temu" other: "prawie %{count} lat temu" password_reset: + no_token: "Przepraszamy, link do zmiany hasła jest już nieaktualny. Wybierz opcje 'Zapomniałem hasła', aby otrzymać nowy link. " choose_new: "Wybierz nowe hasło" choose: "Wprowadź hasło" update: 'Zmień hasło' @@ -407,9 +409,10 @@ pl_PL: continue_button: "Przejdź do %{site_name}" 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." post_action_types: off_topic: - title: 'Nie-na-temat' + title: 'Nie na temat' description: 'Ten post jest niezwiązany z obecną dyskusją zdefiniowaną przez tytuł i pierwszy post, i powinien zostać przeniesiony gdzieś indziej.' long_form: 'oflagowano jako nie-na-temat' spam: @@ -423,7 +426,9 @@ pl_PL: description: 'Ten wpis zawiera treści które umiarkowana osoba może uznać za wulgarne, obraźliwe lub naruszające wytyczne społeczności.' long_form: 'oflagowano jako niewłaściwe' notify_user: + title: 'Powiadom @{{username}}' description: 'Ten wpis zawiera coś o czym chciałbym porozmawiać z tą osobą bezpośrednio i prywatnie. Bez oflagowania.' + long_form: 'użytkownik został powiadomiony' email_title: 'Twój wpis w "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: @@ -460,6 +465,7 @@ pl_PL: email_title: 'Temat "%{title}" wymaga uwagi moderatora' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

    Twój wpis został oflagowany przez społeczność. Sprawdź swoje prywatne wiadomości.

    ' user_must_edit: '

    Ten wpis został oflagowany przez społeczność i został tymczasowo ukryty.

    ' archetypes: regular: @@ -596,6 +602,14 @@ pl_PL: title: "Łącznie" xaxis: "Dzień" yaxis: "Razem zapytań" + time_to_first_response: + title: "Czas na pierwszą odpowiedź. " + xaxis: "Dzień" + yaxis: "Średni czas (w godzinach)" + topics_with_no_response: + title: "Tematy bez odpowiedzi" + xaxis: "Dzień" + yaxis: "Łącznie" dashboard: rails_env_warning: "Twój serwer działa w trybie %{env}" ruby_version_warning: "Używasz Ruby w wersji 2.0.0, która może powodować problemy. Zaktualizuj się do patch level 247 lub późniejszej. " @@ -608,6 +622,7 @@ pl_PL: twitter_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą Twittera (enable_twitter_logins), ale klucz i sekret nie są ustawione. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' github_config_warning: 'Serwer jest skonfigurowany by pozwalać na rejestrację i logowanie za pomocą GitHuba (enable_github_logins), ale id klienta i sekret nie są ustawione. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' s3_config_warning: 'Serwer jest skonfigurowany by przesyłać pliki na s3, ale przynajmniej jedno z następujących ustawień nie jest ustawione: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Przejdź do ustawień serwisu i zmień ustawienia. Zobacz ten poradnik by dowiedzieć się więcej.' + s3_backup_config_warning: 'Serwer jest skonfigurowany tak, aby wysyłać kopie zapasowe do s3, ale jedno z ustawień nie jest ustawione prawidłowo: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Idź do ustawień strony i zaktualizuj ustawienia. Zobacz Jak ustawić wysyłanie zdjęć do S3 .' image_magick_warning: 'Serwer jest skonfigurowany by tworzyć miniaturki dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą ulubionego menedżera pakietów lub pobierz najnowszą wersję.' failing_emails_warning: '%{num_failed_jobs} prac emailowych nie powiodło się. Sprawdź plik config/discourse.conf i upewnij się, że ustawienia serwera poczty są poprawne. Zobacz nieudane prace w Sidekiqu.' default_logo_warning: "Ustaw logo dla swojej strony. Zaktualizuj logo_url, logo_small_url i favicon_url tutaj: ustawienia strony." @@ -616,6 +631,8 @@ pl_PL: title_nag: "Wprowadź nazwę swojej strony. Zaktualizuj tytuł w Ustawieniach strony." site_description_missing: "Wprowadź jedno zdanie opisujące Twoją stronę, które pojawi się w wynikach wyszukiwania. Zaktualizuj opis strony w Ustawieniach strony." consumer_email_warning: "Twój serwis jest skonfigurowany by używać Gmaila (lub innego konsumenckiego serwisu poczty) do wysyłania emaili. Gmail ogranicza jak dużo wiadomości możesz wysłać. Rozważ wykorzystanie dostawcy serwisu pocztowego jak mandrill.com by zagwarantować dostarczanie poczty." + site_contact_username_warning: "Wprowadź nazwę użytkownika zespołu, aby wysłać ważny szablon automatycznej wiadomości. Zaktualizuj site_contact_username w Ustawieniach Strony " + notification_email_warning: "Emaile z powiadomieniami nie zostały wysłane z prawidłowego adresu email na twojej domenie; dostawca usługi email może być niekonsekwentny i nierzetelny. Ustaw prawidłowy email w notification_email w Ustawieniach Strony." content_types: education_new_reply: title: "Edukacja nowych użytkowników: Pierwsze odpowiedzi" @@ -667,6 +684,7 @@ pl_PL: educate_until_posts: "Wyświetlaj okno edukacyjne po rozpoczęciu pisania dopóki nowy użytkownik nie napisze tylu wpisów." title: "Nazwa tej strony używana w tagu title." site_description: "Opis strony w jednym zdaniu, wykorzystywany w meta tagu description." + contact_email: "Adres email kogoś, z kim należy się kontaktować w kwestii serwisu. Istotne informacje z discourse.org dotyczące krytycznych aktualizacji mogą być wysyłane pod ten adres." contact_url: "URL kontaktowy dla tego serwisu. Używany na podstronie /about." queue_jobs: "DEVELOPER ONLY! WARNING! By default, queue jobs in sidekiq. If disabled, your site will be broken." crawl_images: "Pobieraj grafiki ze zdalnych URLi aby ustawić poprawną wysokość i szerokość w tagu img." @@ -676,11 +694,13 @@ pl_PL: ninja_edit_window: "Przez tyle sekund po utworzeniu nowego wpisu jego kolejne edycje nie będą tworzyć nowych wersji w historii wpisu." post_edit_time_limit: "Autor może edytować lub usunąć swój wpis przez tyle minut po jego utworzeniu. Ustawienie 0 oznacza 'zawsze'." edit_history_visible_to_public: "Pozwól wszystkim przeglądać poprzednie wersje edytowanych wpisów. Gdy wyłączone, jedynie obsługa/staff może." + 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." show_subcategory_list: "Po wejściu do kategorii, zamiast listy tematów wyświetlaj listę podkategorii." 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). " post_excerpt_maxlength: "Maksymalna długość podsumowania / streszczenia wpisu." post_onebox_maxlength: "Maksymalna długość (ilość znaków) treści wpisu osadzonego via Onebox" onebox_domains_whitelist: "Lista domen dla których włączony jest oneboxing; te domeny powinny wspierać OpenGraph lub oEmbed. Można to sprawdzić na http://iframely.com/debug" @@ -907,7 +927,6 @@ pl_PL: subject_template: "Witaj na %{site_name}!" backup_succeeded: subject_template: "Kopia zapasowa jest gotowa" - text_body_template: "Kopia zapasowa została wykonana pomyślnie.\nOdwiedź [admin > kopie zapasowe](/admin/backups) aby ją pobrać." backup_failed: subject_template: "Kopia zapasowa nieudana" text_body_template: | @@ -1091,3 +1110,119 @@ pl_PL: title: "FAQ" tos_topic: title: "Warunki użytkowania" + privacy_topic: + body: "\n\n## [Jakie dane o Tobie zbieramy?](#collect)\n\nZbieramy takie informacje jak: kiedy zarejestrowałeś się na naszej stronie; kiedy uczestniczyłeś w życiu forum poprzez czytanie, pisanie oraz udoskolananie zawartości tu udostępnianej.\n\nPodczas rejestracji na naszej stronie mogłeś być zapytany o twoje imię i nazwisko oraz adres email. Możesz też przeglądać naszą stronę bez konieczności rejestracji. Twój adres email będzie weryfikowany poprzez przesłanie na niego unikalnego linku. Jeżeli kilknołeś ten link, wiemy że ten adres email należy do Ciebie. \n\nPodczas rejestracji oraz pisania treści zbieramy dane o twoim adresie IP. Możemy też zachowywać logi serwera, które\ + \ pobierają dane o twoim adresie IP zawsze kiedy logujesz się na nasz serwer. \n\n\n\n## [Do czego używamy twoich danych?](#use)\n\nKażda z informacji jakie od Ciebie zbieramy może być wykorzystana w następujący sposób:\n\n* Aby przystosować naszą stronę dla Ciebie — twoje informacje pomagają nam lepiej odpowiadać na twoje indywidualne potrzeby. \n* Aby ulepszyć naszą strone — cały czas ulepszamy naszą stronę na podstawie informacji otrzymanych od Ciebie.\n* Aby ulepszyć obsługę klienta — twoje informacje pomagają nam na efektywniejsze obsługiwanie twoich prośb. \n* Aby wysyłać Tobie okresowe wiadomości email — Adres email, który podałeś może być użyty\ + \ aby wysyłać Tobie informację o stronie, powiadomienia, odpowiedzi, wiadomości i wątki skierowane do Ciebie. \n\n\n\n## [Jak chronimy twoje dane?](#protect)\n\nWdrażamy różne środki bezpieczeństwa, aby podnosić poziom bezpieczeństwa twoich danych osobowych, kiedy podajesz, potwierdzasz albo udzielasz dostępu do informacji osobistych. \n\n\n\n## [Jaką mamy politykę przechowywania danych?](#data-retention)\n\nDokładamy wszelkich starań, aby:\n\n* Nie przechowywać danych o twoim adresie IP dłużej niż 90 dni. \n* Nie przechowywać danych o adresie IP przypisanym do twojego konta dłużej niż 5 lat.\n\n\n\n\n## [Czy używamy\ + \ plików cookies?](#cookies)\n\nTak. Cookies to małe pliki, wysyłane przez serwis internetowy, który odwiedzamy i zapisywane na urządzeniu końcowym (komputerze, laptopie, smartfonie), z którego korzystamy podczas przeglądania stron internetowych. Pozwalają naszej stronie na rozpoznanie czy jesteś naszym użytkownikiem.\n\nUżywamy ich, aby zrozumieć i zapisać twoje preferencje. Dzięki nim możemy zapewnić Tobie lepszą jakość dostarczanych usług. Możemy teżudostępniać je firmom trzecim, aby mogły rozpoznawać twoje zachowania. \n\n\n\n## [Czy udostępniamy jakiekolwiek informacje osobom trzecim?](#disclose)\n\nNie sprzedajemy, anie nie oddajemy żadnych informacji naszym partnerom.\ + \ emy używa do celów komercyjnych, marketingowych i innych. \n\n\n\n## [Linki osób trzecich](#third-party)\n\nNa naszej stronie możemy promować linki osób trzecich. Strony te mają swoją oddzielną politykę prywatności. Nie bierzemy żadnej odpowiedzialności za te strony. \n\n\n\n## [Children's Online Privacy Protection Act Compliance](#coppa)\n\nOur site, products and services are all directed to people who are at least 13 years old or older. If this server is in the USA, and you are under the age of 13, per the requirements of COPPA ([Children's Online Privacy Protection Act](http://en.wikipedia.org/wiki/Children)), do not use this site.\n\n\n\n## [Online Privacy Policy Only](#online)\n\nTa polityka prywatności odnosi się tylko do danych zbieranych przez przez naszą strone, nie odnosi się ona do informacji zbieranych w trybie offline. \n\n\n\n## [Twoja Zgoda](#consent)\n\nKorzystając z tej strony zgadzasz się na jej politykę prywatności.\n\n\n\n## [Zmiany w polityce prywatności](#changes)\n\nJeżeli zostaną zmienione zasady polityki prywatności, zostaną one opublikowane na tej stronie. \n\nThis document is CC-BY-SA. It was last updated May 31, 2013.\n" + static: + search_help: |+ +

    Triki

    +

    +

      +
    • Powiązania tytułów są bardzo ważne, aby w razie wątpliwości móc je wyszukać
      • +
    • Unikatowe oraz rzadkie wyrazy zawsze będą dawać lepsze rezultaty
      • +
    • Ilekroć to możliwe, ogranicz zakres wyszukiwania do wybranych kategorii, użytkowników lub tematów
      • +
    +

    +

    Opcje

    +

    + + + + + + + +
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarksin:first
    posts_count:nummin_age:daysmax_age:days
    +

    +

    + rainbows category:parks status:open order:latest will search for topics containing the word "rainbows" in the category "parks" that are not closed or archived, ordered by date of last post. +

    + + badges: + long_descriptions: + autobiographer: | + Bla bla bla + Bla bla bla + first_like: | + Bla bla bla + Bla bla bla + first_link: | + Bla bla bla + Bla bla bla + first_quote: | + Bla bla bla + Bla bla bla + first_share: | + Bla bla bla + Bla bla bla + read_guidelines: | + Bla bla bla + Bla bla bla + reader: | + Bla bla bla + Bla bla bla + editor: | + Bla bla bla + Bla bla bla + first_flag: "Flagowanie jest bardzo ważne dla twojego forum. Jeżeli zauważysz jakieś posty, które potrzebują moderacji\nnie wahaj się, aby je oflagować. Możesz użyć też okna do flagowania, aby wysłać wiadomość do użytkowników, jak osiągniesz\n1. poziom zaufania. \n" + nice_share: |+ + Bla bla bla + Bla bla bla + + welcome: | + Bla bla bla + Bla bla bla + anniversary: | + Bla bla bla + Bla bla bla + good_share: | + Bla bla bla + Bla bla bla + great_share: | + Bla bla bla + Bla bla bla + nice_post: | + Bla bla bla + Bla bla bla + nice_topic: | + Bla bla bla + Bla bla bla + good_post: | + Bla bla bla + Bla bla bla + good_topic: | + Bla bla bla + Bla bla bla + great_post: | + Bla bla bla + Bla bla bla + great_topic: | + Bla bla bla + Bla bla bla + basic: | + Bla bla bla + Bla bla bla + member: |+ + Bla bla bla + Bla bla bla + + regular: | + Bla bla bla + Bla bla bla + leader: | + Bla bla bla + Bla bla bla + admin_login: + success: "Email wysłany" + error: "Błąd!" + email_input: "Email administratora. " + submit_button: "Wyślij Email. " + discourse_hub: + access_token_problem: "Powiedz administratorowi tej witryny: Zaktualizuj na poprawne ustawienia discourse_org_access_key." + performance_report: + initial_post_raw: 'Ten temat zawiera codzienne raporty wydajności dla twojej witryny. ' + initial_topic_title: 'Testy wydajności witryny. ' diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index 51b153d192..1307537756 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -383,7 +383,7 @@ pt: one: "há quase 1 ano atrás" other: "há quase %{count} anos atrás" password_reset: - no_token: "Desculpe, essa hiperligação para mudar a palavra-passe é muito antiga. Inicie sessão novamente e selecione 'Esqueci a minha palavra-passe' para receber uma nova hiperligação." + no_token: "Desculpe, essa hiperligação para mudar a palavra-passe é muito antiga. Selecione 'Esqueci a minha palavra-passe' para receber uma nova hiperligação." choose_new: "Por favor escolha uma nova palavra-passe" choose: "Por favor escolha uma palavra-passe" update: 'Atualizar Palavra-passe' @@ -596,6 +596,14 @@ pt: title: "Total" xaxis: "Dia" yaxis: "Total de pedidos" + time_to_first_response: + title: "Tempo para a próxima resposta" + xaxis: "Dia" + yaxis: "Tempo médio (horas)" + topics_with_no_response: + title: "Tópicos sem resposta" + xaxis: "Dia" + yaxis: "Total" dashboard: rails_env_warning: "O seu servidor está a executar em modo %{env}." ruby_version_warning: "Está a utilizar uma versão do Ruby 2.0.0 que é conhecida por ter alguns problemas. Por favor atualize para o nível 247 ou posterior." @@ -686,6 +694,7 @@ pt: 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." show_subcategory_list: "Mostrar lista de subcategorias em vez de lista de tópicos quando inserida uma categoria." 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 (requere 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\"" exclude_rel_nofollow_domains: "Uma lista de domínios em que nofollow não deve ser adicionado a linkls.tld.com irá permitir automaticamente sub.tld.com. Como mínimo, deve adicionar o domínio de alto nível deste sítio para ajudar os rastreadores da internet a encontrarem todo o conteúdo. Se outras partes do seu sítio estão em outros domínicios, adicione-os também." post_excerpt_maxlength: "Tamanho máximo do excerto/sumário de uma mensagem." @@ -953,12 +962,14 @@ pt: sequential_replies_threshold: "Número de mensagens que um utilizador tem que fazer em linha num tópico antes de ser relembrado acerca de demasiadas respostas sequenciais." enable_mobile_theme: "Os dispositivos móveis usam um tema mobile-friendly, com a possibilidade de mudar para o sítio completo. Desative isto se quer usar um estilo personalizado que é totalmente responsivo." dominating_topic_minimum_percent: "Que percentagem de mensagens um utilizador tem que fazer num tópico antes de ser relembrado sobre dominar demasiado um tópico." + daily_performance_report: "Analise os logs diários NGINX e publique um tópico visível apenas para o pessoal com detalhes" suppress_uncategorized_badge: "Não mostrar distintivos para tópicos sem categoria nas listagens de tópicos." global_notice: "Exibir um banner global URGENTE, EMERGÊNCIA a todos os visitantes, mudar para branco para esconder (HTML permitido)." disable_edit_notifications: "Desativa notificações de edição do sistema quando 'download_remote_images_to_local' está ativo." full_name_required: "O nome completo é um campo obrigatório no perfil de utilizador." enable_names: "Mostrar o nome completo do utilizador no seu perfil, cartão de utilizador, e emails. Desativar para esconder o nome completo em todos os locais." display_name_on_posts: "Mostrar o nome completo de um utilizador nas suas mensagens em adição ao seu @nome-de-utilizador." + show_time_gap_days: "Se duas mensagens são feitas com todos estes dias de diferença, exibir a diferença de tempo no tópico." invites_per_page: "Convites por defeito exibidos na página do utilizador." short_progress_text_threshold: "Após o número de mensagens num tópico passar acima deste número, a barra de progresso irá apenas mostrar o número da mensagem atual. Se alterar a largura da barra de progresso, poderá ter que mudar este valor." default_code_lang: "Linguagem de programação por defeito a aplicar no destaque da sintaxe em blocos de código GitHub (lang-auto, ruby, python, etc.)" @@ -987,6 +998,7 @@ pt: enforce_square_emoji: "Forçar uma relação de aspecto quadrado para todos os emojis." approve_post_count: "A quantidade de mensagens de um novo utilizador que devem ser aprovadas" approve_unless_trust_level: "Mensagens para utilizadores abaixo deste nível de confiança devem ser aprovados" + notify_about_queued_posts_after: "Se não houver mensagens que estiveram à espera de revisão por mais do que estas horas, um email será enviado para o email de contacto. Configure para 0 para desativar estes emails." errors: invalid_email: "Endereço de email inválido." invalid_username: "Não existe nenhum utilizador com esse nome de utilizador." @@ -1173,6 +1185,14 @@ pt: subject_template: one: "1 sinalização à espera de ser tratada" other: "%{count} sinalizações à espera de serem tratadas" + 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á, + + Existem mensagens de novos utilizadores que estão à espera de revisão. [Podem ser aprovadas ou rejeitadas aqui](%{base_url}/queued-posts). flag_reasons: off_topic: "A sua mensagem foi marcada como **fora do contexto**: a comunidade sente que não se enquadra neste tópico, conforme o seu título e a sua primeira mensagem." inappropriate: "A sua mensagem foi sinalizada como **inapropriada**: a comunidade sente que é ofensiva, abusiva ou que é uma violação das nossas [diretrizes da comunidade](/guidelines)." @@ -1184,16 +1204,16 @@ pt: disagreed: "Obrigado por nos informar. Estamos a analisá-lo." deferred: "Obrigado por nos informar. Estamos a analisá-lo." deferred_and_deleted: "Obrigado por nos informar. Removemos a mensagem." - temporarily_closed_due_to_flags: "O tópico está temporariamente fechado devido a um grande número de sinalizações da comunidade." + temporarily_closed_due_to_flags: "Este tópico está fechado temporariamente devido a um grande número de bandeiras da comunidade. " system_messages: post_hidden: subject_template: "Mensagem oculta devido a sinalizações da comunidade" text_body_template: "Olá,\n\nEsta é uma mensagem automática de %{site_name} para informá-lo que a sua mensagem foi oculta. \n\n%{base_url}%{url} \n\n%{flag_reason}\n\nMúltiplos membros da comunidade sinalizaram esta mensagem antes de ser escondida, por isso considere como poderá rever a sua mensagem para refletir o seu feedback. **Pode editar a sua mensagem após %{edit_delay} minutos, e esta será automaticamente exibida.**\n\nContudo, se a mensagem for escondida pela comunidade uma segunda vez, irá manter-se escondida até ser tratada pelo pessoal – e poderão ainda ocorrer ações, incluindo uma possível suspensão da sua conta.\n\nPara orientação adicional, por favor consulte as [diretrizes da comunidade](%{base_url}/guidelines).\n" usage_tips: - text_body_template: "Aqui ficam algumas dicas para que possa começar: \n\n## Leitura \n\nPara ler mais, **simplesmente continue a arrastar para baixo!** \n\nÀ medida que novas mensagens ou novos tópicos vão surgindo, estes irão surgir automaticamente – não é necessário atualizar a página. \n\n## Navegação \n\n- Para pesquisar, a sua página de utilizador, ou o menu ☰, utilize **o ícone no canto superior direito**. \n\n- Selecionar o título de um tópico irá levá-lo sempre à **próxima mensagem não lida** no tópico. Para inserir no início ou no final, selecione a contagem de respostas ou a data da última resposta.\n\n \n\n- Ao ler um tópico, selecione a barra de progresso no canto inferior direito para controlos de navegação completos. Salte rapidamente para o topo ao selecionar o título do tópico. Pressione ? para uma lista rápida de atalhos do teclado. \n\n\n\n## Responder \n\n- Para responder ao **tópico em geral**, utilize no final de cada tópico. \n\n- Para responder a uma **pessoa específica**, utilize nas suas mensagens. \n\n- Para responder com um **novo tópico**, utilize à direita desta mensagem. Tanto os tópicos antigos como os novos serão ligados automaticamente.\n\nPara inserir uma citação, selecione o texto que deseja citar, e de seguida pressione qualquer botão de Resposta. Repita para múltiplas citações!\n \n\nPara notificar alguém da sua resposta, mencione o seu nome. Digite `@` para começar a selecionar um nome de utilizador.\n\n\n\nPara utilizar [Emoji padrão](http://www.emoji.codes/), simplesmente digite `:` para encontrar por nome, ou os tradicionais risonhos `;)` \n\n\n\n## Ações \n\nExistem botões de ação no final de cada mensagem. \n\n<\n\nPara deixar alguém saber que gostou e apreciou as suas mensagens, utilize o botão **gosto**. Partilhe o amor!\n\nSe vir um problema com uma mensagem de alguém, avise a pessoa em privado, ou avise [o nosso pessoal](/about) sobre a mesma utilizando o botão **sinalizar**. Pode também **partilhar** uma hiperligação para uma mensagem, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador. \n\n## Notificações \n\nQuando alguém responde à sua mensagem, cita a sua mensagem\ - \ ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o para aceder às suas **notificações**. \n\n\n\nNão se preocupe em falhar uma resposta – irá receber notificações por email que chegam quando está ausente. \n\n## As Suas Preferências \n\n- Todos os tópicos com menos de **dois dias** são considerados novos.\n\n- Qualquer tópico em que tenha **participado ativamente** (respondido, criado, ou lido por um extenso período) será acompanhado automaticamente.\n\n Verá o indicador numérico e o indicador azul (novo) junto desses tópicos: \n\n\n\nPode alterar as suas notificações para qualquer tópico através do controlo de notificaçõesno final do tópico \n\n\n\nPode também alterar as configurações de estados de notificação por categoria, se quer observar cada novo tópico numa categoria específica.\n\nPara alterar qualquer uma destas configurações, consulte [as suas preferências] (%{base_url}/my/preferences). \n\n##Confiança da Comunidade \n\nÀ medida que for participando, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e limitações de novos utilizadores serão automaticamente removidas.\ - \ Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar novas capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" + text_body_template: "Aqui ficam algumas dicas para que possa começar: \n\n## Leitura \n\nPara ler mais, **simplesmente continue a arrastar para baixo!**\n\nÀ medida que novas mensagens ou novos tópicos vão surgindo, estes irão surgir automaticamente – não é necessário atualizar a página. \n\n## Navegação \n\n- Para pesquisar, a sua página de utilizador, ou o menu ☰, utilize **o ícone no canto superior direito**. \n\n- Selecionar o título de um tópico irá levá-lo sempre à **próxima mensagem não lida** no tópico. Para inserir no início ou no final, selecione a contagem de respostas ou alternativamente, a data da última resposta. \n\n\n\n- Ao ler um tópico, selecione a barra de progresso no canto inferior direito para controlos de navegação completos. Salte rapidamente para o topo ao selecionar o título do tópico. Pressione ? para uma lista rápida de atalhos do teclado. \n\n\n\n## Responder \n\n– Para responder ao **tópico em geral**, utilize no final de cada tópico. \n\n- Para responder a uma **pessoa específica**, utilize nas suas mensagens. \n\n- Para\ + \ responder com um **novo tópico**, utilize à direita desta mensagem. Tanto os tópicos antigos como os novos serão ligados automaticamente.\n\nPara inserir uma citação, selecione o texto que deseja citar, e de seguida pressione qualquer botão de Resposta. Repetir para múltiplas citações! \n\n\n\nPara notificar alguém da sua resposta, mencione o seu nome. Digite `@` para começar a selecionar um nome de utilizador. \n\n\n\t\nPara utilizar [Emoji padrão](http://www.emoji.codes/), simplesmente digite `:` para encontrar por nome, ou os tradicionais risonhos `;)`\n\n\n\n## Ações\n\nExistem botões de ação no final de cada mensagem. \n\n\n\nPara deixar alguém saber que gostou e apreciou as suas mensagens, utilize o botão **gosto**. Partilhe o amor! \n\nSe vir um problema com uma mensagem de alguém, avise a pessoa em privado, ou avise [o nosso pessoal](%{base_url}/about), sobre a mesma utilizando o botão **sinalizar**. Pode também **partilhar** uma hiperligação para uma\ + \ mensagem, ou **marcá-la** para mais tarde ter a referência na sua página de utilizador. \n\n## Notificações\n\nQuando alguém lhe responde, cita a sua mensagem ou menciona o seu `@nome-de-utilizador`, um número irá aparecer imediatamente no canto superior direito na página. Utilize-o para aceder às suas **notificações**. \n\n\nNão se preocupe em falhar uma resposta – irá receber notificações por email que chegamquando está ausente. \n\n## As Suas Preferências \n\n- Todos os tópicos com menos de **dois dias** são considerados novos. \n\n- Qualquer tópico em que tenha **participado ativamente** (respondido, criado, ou lido por um extenso período) será acompanhado automaticamente. \n\nVerá o indicador numérico e o indicador azul (novo) junto desses tópicos: \n\n\n\nPode alterar as suas notificações para qualquer tópico através do controlo de notificações no final do tópico \n\n\n\nPode também alterar as configurações de estados de notificação por categoria, se quer observar cada novo tópico numa categoria específica.\n\nPara alterar qualquer uma destas configurações, consulte [as suas preferências] (%{base_url}/my/preferences). \n\n##Confiança\ + \ da Comunidade \n\nÀ medida que for participando, irá ganhar confiança por parte da comunidade, tornar-se um cidadão completo e limitações de novos utilizadores serão automaticamente removidas. Com um [nível de confiança] suficientemente alto (https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), irá ganhar novas capacidades para ajudar-nos a gerir a comunidade em conjunto.\n" welcome_user: subject_template: "Bem-vindo a %{site_name}!" text_body_template: | @@ -1230,7 +1250,7 @@ pt: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Cópia de segurança completa corretamente" - text_body_template: "A cópia de segurança foi feita corretamente.\nVisite a [admin > secção de cópias de segurança](/admin/backups) para descarregar a sua nova cópia de segurança." + text_body_template: "A cópia de segurança foi bem-sucedida.\nVisite [admin > secção de cópias de segurança](%{base_url}/admin/backups) para descarregar a sua nova cópia de segurança." backup_failed: subject_template: "A cópia de segurança falhou" text_body_template: | @@ -1752,7 +1772,7 @@ pt:

    Dicas

      -
    • A correspondência de títulos está priorizada, por isso em caso de dúvida, pesquise por títulos
      • +
    • A correspondência de títulos está priorizada, por isso em caso de dúvida, pesquise por títulos
    • Palavras únicas e incomuns irão sempre produzir os melhores resultados
    • Sempre que possível, direcione a sua pesquisa para uma categoria, utilizador ou tópico em particular
    @@ -1761,15 +1781,15 @@ pt:

    - + - + +
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarks
    in:bookmarksin:first
    posts_count:nummin_age:daysmax_age:days

    - rainbows category:parks status:open order:latest - irá retornar uma pesquisa por tópicos que contém a palavra "rainbows" na categoria "parks" que não estão fechados ou arquivados, ordenados pela data da última mensagem. + rainbows category:parks status:open order:latest irá retornar uma pesquisa por tópicos que contém a palavra "rainbows" na categoria "parks" que não estão fechados ou arquivados, ordenados pela data da última mensagem.

    badges: long_descriptions: @@ -1853,3 +1873,6 @@ pt: submit_button: "Enviar Email" discourse_hub: access_token_problem: "Dizer a um administrador: Por favor atualize as configurações do sítio para incluir a discourse_org_access_key correta." + performance_report: + initial_post_raw: Este tópico inclui relatórios diários de desempenho para o seu sítio. + initial_topic_title: Relatórios de desempenho do sítio diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 29473bc707..3e36d1e7f7 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -143,6 +143,7 @@ ru: rss_description: latest: "Последние темы" hot: "Популярные темы" + posts: "Последние сообщения" too_late_to_edit: "Это сообщение нельзя изменить или удалить, т.к. оно было создано очень давно." excerpt_image: "изображение" queue: @@ -317,62 +318,62 @@ ru: other: "%{count} секунд" datetime: distance_in_words: - half_a_minute: "< 1мин" + half_a_minute: "< 1 мин" less_than_x_seconds: - one: "< 1с" - few: "< %{count}с" - many: "< %{count}с" - other: "< %{count}с" + one: "< 1 сек" + few: "< %{count} сек" + many: "< %{count} сек" + other: "< %{count} сек" x_seconds: - one: "1с" - few: "%{count}с" - many: "%{count}с" - other: "%{count}с" + one: "1 сек" + few: "%{count} сек" + many: "%{count} сек" + other: "%{count} сек" less_than_x_minutes: - one: "< 1м" - few: "< %{count}м" - many: "< %{count}м" - other: "< %{count}м" + one: "< 1 мин" + few: "< %{count} мин" + many: "< %{count} мин" + other: "< %{count} мин" x_minutes: - one: "1м" - few: "%{count}м" - many: "%{count}м" - other: "%{count}м" + one: "1 мин" + few: "%{count} мин" + many: "%{count} мин" + other: "%{count} мин" about_x_hours: - one: "1ч" - few: "%{count}ч" - many: "%{count}ч" - other: "%{count}ч" + one: "1 ч" + few: "%{count} ч" + many: "%{count} ч" + other: "%{count} ч" x_days: - one: "1д" - few: "%{count}д" - many: "%{count}д" - other: "%{count}д" + one: "1 дн" + few: "%{count} дн" + many: "%{count} дн" + other: "%{count} дн" about_x_months: - one: "1мес" - few: "%{count}мес" - many: "%{count}мес" - other: "%{count}мес" + one: "1 мес" + few: "%{count} мес" + many: "%{count} мес" + other: "%{count} мес" x_months: - one: "1мес" - few: "%{count}мес" - many: "%{count}мес" - other: "%{count}мес" + one: "1 мес" + few: "%{count} мес" + many: "%{count} мес" + other: "%{count} мес" about_x_years: - one: "1г" - few: "1г" - many: "%{count}г" - other: "%{count}г" + one: "1 год" + few: "%{count} года" + many: "%{count} лет" + other: "%{count} лет" over_x_years: - one: "> 1г" - few: "> 1г" - many: "> %{count}г" - other: "> %{count}г" + one: "> 1 года" + few: "> %{count} года" + many: "> %{count} лет" + other: "> %{count} лет" almost_x_years: - one: "1г" - few: "1г" - many: "%{count}г" - other: "%{count}г" + one: "1 год" + few: "%{count} года" + many: "%{count} лет" + other: "%{count} лет" distance_in_words_verbose: half_a_minute: "только что" less_than_x_seconds: @@ -381,13 +382,13 @@ ru: many: "только что" other: "только что" x_seconds: - one: "1 секунда назад" - few: "1 секунда назад" + one: "1 секунду назад" + few: "%{count} секунды назад" many: "%{count} секунд назад" other: "%{count} секунд назад" less_than_x_minutes: one: "менее 1 минуты назад" - few: "менее %{count} минуты назад" + few: "менее %{count} минут назад" many: "менее %{count} минут назад" other: "менее %{count} минут назад" x_minutes: @@ -402,17 +403,17 @@ ru: other: "%{count} часов назад" x_days: one: "1 день назад" - few: "1 день назад" - many: "%{count} дня назад" - other: "%{count} дня назад" + few: "%{count} дня назад" + many: "%{count} дней назад" + other: "%{count} дней назад" about_x_months: one: "около 1 месяца назад" - few: "около 1 месяца назад" + few: "около %{count} месяцев назад" many: "около %{count} месяцев назад" other: "около %{count} месяцев назад" x_months: one: "1 месяц назад" - few: "1 месяц назад" + few: "%{count} месяца назад" many: "%{count} месяцев назад" other: "%{count} месяцев назад" about_x_years: @@ -431,9 +432,9 @@ ru: many: "почти %{count} лет назад" other: "почти %{count} лет назад" password_reset: - no_token: "К сожалению данная ссылка на изменение пароля устарела. Нажмите на Вход, затем выберите \"Я забыл мой пароль\" для получения новой ссылки для восстановления пароля." - choose_new: "Пожалуйста, введите новый пароль" - choose: "Пожалуйста, выберите пароль" + no_token: "К сожалению, данная ссылка на восстановление пароля устарела. Чтобы получить новую ссылку, нажмите на кнопку \"Вход\", затем \"Я забыл мой пароль\"." + choose_new: "Придумайте новый пароль" + choose: "Придумайте пароль" update: 'Обновить пароль' save: 'Установить пароль' title: 'Сбросить пароль' @@ -530,119 +531,127 @@ ru: description: "Вы снова подписаны на рассылку." reports: visits: - title: "Посещения пользователей" - xaxis: "День" + title: "Визиты форумчан" + xaxis: "Дата" yaxis: "Количество визитов" signups: - title: "Новые пользователи" - xaxis: "День" - yaxis: "Количество новых пользователей" + title: "Регистрации" + xaxis: "Дата" + yaxis: "Количество регистраций" topics: - title: "Новые темы" - xaxis: "День" + title: "Темы" + xaxis: "Дата" yaxis: "Количество новых тем" posts: title: "Сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество новых сообщений" likes: title: "Симпатии" - xaxis: "День" - yaxis: "Количество новых симпатий" + xaxis: "Дата" + yaxis: "Количество выраженных симпатий" flags: title: "Жалобы" - xaxis: "День" - yaxis: "Количество жалоб" + xaxis: "Дата" + yaxis: "Количество поданных жалоб" bookmarks: title: "Закладки" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество новых закладок" starred: - title: "Отмечено" - xaxis: "День" - yaxis: "Количество отмеченных тем" + title: "Избранное" + xaxis: "Дата" + yaxis: "Тем добавлено в избранное" users_by_trust_level: - title: "Пользователей по уровню доверия" + title: "Пользователи по уровню доверия" xaxis: "Уровень доверия" yaxis: "Количество пользователей" emails: title: "Электронные письма" - xaxis: "День" - yaxis: "Количество электронных сообщений" + xaxis: "Дата" + yaxis: "Количество электронных писем" user_to_user_private_messages: title: "Личные сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество сообщений" system_private_messages: title: "Системные сообщения" - xaxis: "День" + xaxis: "Дата" yaxis: "Количество сообщений" moderator_warning_private_messages: title: "Предупреждения модераторов" - xaxis: "День" - yaxis: "Количество сообщений" + xaxis: "Дата" + yaxis: "Количество предупреждений" notify_moderators_private_messages: - title: "Оповещений модераторам" - xaxis: "День" - yaxis: "Количество сообщений" + title: "Жалобы модераторам" + xaxis: "Дата" + yaxis: "Количество жалоб" notify_user_private_messages: - title: "Оповещение пользователю" + title: "Жалобы пользователям" xaxis: "День" - yaxis: "Количество сообщений" + yaxis: "Количество жалоб" top_referrers: - title: "Топ ссылающихся" + title: "Топ распространителей" xaxis: "Пользователь" - num_clicks: "Переходов" + num_clicks: "Заходов" num_topics: "Тем" top_traffic_sources: - title: "Топ источников траффика" + title: "Топ источников трафика" xaxis: "Домен" num_clicks: "Переходов" num_topics: "Тем" - num_users: "Количество пользователей" + num_users: "Пользователей" top_referred_topics: - title: "Топ ссылающихся тем" + title: "Топ тем, на которые ссылаются" xaxis: "Тема" - num_clicks: "Переходов" + num_clicks: "Заходов" page_view_anon_reqs: title: "Анонимы" xaxis: "Дата" - yaxis: "Анонимные запросы API" + yaxis: "Анонимные API запросы" page_view_logged_in_reqs: - title: "Пользователи" + title: "Форумчане" xaxis: "Дата" - yaxis: "Авторизованные запросы API" + yaxis: "Авторизованные API запросы" page_view_crawler_reqs: title: "Поисковики" xaxis: "Дата" - yaxis: "Запросы API поисковиков и кравлеров" + yaxis: "API запросы поисковиков" page_view_total_reqs: title: "Всего" xaxis: "Дата" - yaxis: "Всего запросов API" + yaxis: "Всего API запросов" http_background_reqs: title: "Фоновые" xaxis: "Дата" - yaxis: "Просмотров" + yaxis: "Запросы для обновлений в режиме реального времени" http_2xx_reqs: - title: "Статус 2xx (OK)" + title: "HTTP 2xx (OK)" xaxis: "Дата" - yaxis: "Запросов" + yaxis: "Успешные запросы (статус 2xx)" http_3xx_reqs: - title: "HTTP 3xx (Переадресация)" - xaxis: "День" - yaxis: "Переадресация (статус 3xx)" + title: "HTTP 3xx (переадресация)" + xaxis: "Дата" + yaxis: "Запросы с переадресацией (статус 3xx)" http_4xx_reqs: title: "HTTP 4xx (ошибка клиента)" - xaxis: "День" - yaxis: "Ошибки клиента (статус 4xx)" + xaxis: "Дата" + yaxis: "Запросы с ошибкой клиента (статус 4xx)" http_5xx_reqs: title: "HTTP 5xx (ошибка сервера)" - xaxis: "День" - yaxis: "Ошибки сервера (статус 5xx)" + xaxis: "Дата" + yaxis: "Запросы с ошибкой сервера (статус 5xx)" http_total_reqs: title: "Всего" - xaxis: "День" + xaxis: "Дата" + yaxis: "Всего" + time_to_first_response: + title: "Время до первого ответа" + xaxis: "Дата" + yaxis: "Среднее время, часов" + topics_with_no_response: + title: "Темы без ответов" + xaxis: "Дата" yaxis: "Всего" dashboard: rails_env_warning: "Ваш сервер работает в режиме %{env}." @@ -927,6 +936,9 @@ ru: topic_views_heat_low: "После этого количества просмотров, поле просмотров слегка подсвечивается." topic_views_heat_medium: "После этого количества просмотров, поле просмотров умеренно подсвечивается." topic_views_heat_high: "После этого количества просмотров, поле просмотров заметно подсвечивается." + cold_age_days_low: "Колличество дней по истечению которого, дата последней активности в топике станет немного тусклее." + cold_age_days_medium: "Колличество дней по истечению которого, дата последней активности в топике станет значительно тусклее." + cold_age_days_high: "Колличество дней по истечению которого, дата последней активности в топике станет совсем тусклой." history_hours_low: "Колличество часов по истечению которого, пометка о редактировании данного поста будет слегка подсвечена. " history_hours_medium: "Колличество часов по истечению которого, пометка о редактировании данного поста будет подсвечена сильнее. " history_hours_high: "Колличество часов по истечению которого, пометка о редактировании данного поста будет сильно подсвечена. " @@ -1252,35 +1264,31 @@ ru: new_version_mailer: subject_template: "[%{site_name}] Ихууу, доступна новая версия Discourse!" text_body_template: | - Доступна новая версия [Discourse](http://www.discourse.org). + Доступна новая версия [движка вашего форума](http://www.discourse.org). - Установленная версия: %{installed_version} + Ваша версия: %{installed_version} Новая версия: **%{new_version}** - Что дальше: + - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Узнать, что нового в [GitHub](https://github.com/discourse/discourse/commits/master). + - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Запустить обновление. Для этого перейдите по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) и нажмите на кнопку "Обновить". - - - Посетить сайт англоязычного сообщества Discourse [meta.discourse.org](http://meta.discourse.org), чтобы узнать о новостях, почитать интересные дискуссии или спросить о помощи или совете. + - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. new_version_mailer_with_notes: subject_template: "[%{site_name}] новые обновления" text_body_template: | - Доступна новая версия [Discourse](http://www.discourse.org). + Доступна новая версия [движка вашего форума](http://www.discourse.org). - Установленная версия: %{installed_version} + Ваша версия: %{installed_version} Новая версия: **%{new_version}** - Что дальше: + - Узнать, что нового (на английском) - на сайте [GitHub changelog](https://github.com/discourse/discourse/commits/master). - - Узнать, что нового в [GitHub](https://github.com/discourse/discourse/commits/master). + - Обновить движок прямо из браузера - по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). - - Запустить обновление. Для этого перейдите по ссылке [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) и нажмите на кнопку "Обновить". + - Посетить сайт [англоязычного сообщества Discourse](http://meta.discourse.org), где можно почитать новости и задать вопросы. - - Посетить сайт англоязычного сообщества Discourse [meta.discourse.org](http://meta.discourse.org), чтобы узнать о новостях, почитать интересные дискуссии или спросить о помощи или совете. - - ### Release notes + ### Что новенького %{notes} flags_reminder: @@ -1297,6 +1305,16 @@ ru: few: "%{count} жалобы ожидают рассмотрения" many: "%{count} жалоб ожидают рассмотрения" other: "%{count} жалоб ожидают рассмотрения" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 сообщение ожидает проверки" + few: "[%{site_name}] %{count} сообщения ожидают проверки" + many: "[%{site_name}] %{count} сообщений ожидают проверки" + other: "[%{site_name}] %{count} сообщений ожидают проверки" + text_body_template: | + Привет, + + Поступили новые сообщения, требующие проверки. [Проверку можно выполнить тут](%{base_url}/queued-posts). flag_reasons: off_topic: "Сообщество считает, что ваше сообщение **не относится к теме**, учитывая ее заголовок и первое сообщение." inappropriate: "Сообщество считает ваше сообщение **неприемлемым**, т.е. оскорбительным, непристойным или нурашающим [кодекс чести](/guidelines)." @@ -1308,7 +1326,7 @@ ru: disagreed: "Спасибо за информацию. Уже рассматриваем." deferred: "Спасибо за информацию. Уже рассматриваем." deferred_and_deleted: "Спасибо за информацию. Сообщение удалено." - temporarily_closed_due_to_flags: "Эта тема временно закрыта из-за большого количества жалоб" + temporarily_closed_due_to_flags: "Эта тема временно закрыта из-за большого количества жалоб." system_messages: post_hidden: subject_template: "Сообщение скрыто по причине поступления множественных жалоб" @@ -1364,7 +1382,7 @@ ru: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Резервное копирование успешно завершено" - text_body_template: "Резервная копия создана.\nПерейдите в [Админку > Резервные копии](/admin/backups), чтобы скачать её." + text_body_template: "Резервная копия создана.\nПерейдите в [Админку > Резервные копии](%{base_url}/admin/backups), чтобы её скачать." backup_failed: subject_template: "Резервное копирование не удалось" text_body_template: | @@ -1430,8 +1448,18 @@ ru: Попробуйте отправить с другого почтового ящика, или, если вы считаете, что произошла ошибка, свяжитесь с персоналом - модератором или администратором. email_reject_empty: subject_template: "[%{site_name}] Неполадки с письмом - отсутствует текст" + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст в самом верху письма. + + Если ошибка все равно осталась, но вы уверены, что составили письмо верно, проверьте, чтобы в письме были и текстовая, и HTML весрии текста. email_reject_parsing: subject_template: "[%{site_name}] Неполадки с письмом - Недопустимый контент." + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Система не смогла обнаружить тект сообщения в теле письма. Советуем убедится в том, что вы написали желаемый текст **в самом верху письма**. email_reject_invalid_access: subject_template: "[%{site_name}] Системное сообщение -- Доступ запрещен" text_body_template: | @@ -1473,10 +1501,24 @@ ru: Мы не смогли найти адресата. Убедитесь что адресат указан в поле To: (а не в Cc: или Bcc:), и то что имейл указа верно. email_reject_topic_not_found: subject_template: "[%{site_name}] Системное сообщение -- Тема не найдена" + text_body_template: | + К сожалению, ваше письмо к %{destination} с заголовком %{former_title} не может быть обработано. + + Тема, в которую вы пишите, не существует. Возможно, она была удалена. Если вы считаете, что произошла ошибка при обработке письма, обратитесь к модератору или администратору. email_reject_topic_closed: 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: | @@ -1964,23 +2006,24 @@ ru:

    Подсказки

      -
    • Заголовок всегда приоритетнее, когда возникают сомнения, ищите по заголовку
      • -
    • Уникальные, редкие слова всегда дают наилучшие результаты
      • -
    • Если это возможно, сужайте поиск до определенной категории, по пользователям, или темам
      • +
    • Если не получается найти то, что нужно, ищите по словам из заголовка, т.к. заголовки всегда приоритетнее в результатах поиска.
      • +
    • Самые точные результаты поиска будут по уникальным и не частовстречающимся словам.
      • +
    • Попробуйте сузить поиск до определенного раздела, автора или даже определенной темы.

    -

    Варианты

    +

    Возможности поиска

    - - - - - - -
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarks
    + + + + + + + +
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:single_user
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarksin:first
    posts_count:nummin_age:daysmax_age:days

    - rainbows category:parks status:open order:latest будет искать в открытых темах, не из архива, с содержанием слова "rainbows" в категории "parks" и отсортирует результаты по дате последнего сообщенияt. + Пример: радуга category:парки status:open order:latest. Такой поиск выдаст незакрытые и незаархивированные темы со словом "радуга", отсортированные по дате последнего сообщения.

    badges: long_descriptions: @@ -2062,3 +2105,6 @@ ru: submit_button: "отправить письмо" discourse_hub: access_token_problem: "Пожалуйста, обновите настройки сайта, чтобы задать верный discourse_org_access_key." + performance_report: + initial_post_raw: Эта тема содержит ежедневные отчеты активности форума. + initial_topic_title: Отчеты активности форума diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index ab112f0e4f..b92ea32898 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -83,7 +83,7 @@ sv: other: "%{count} till svar" loading: "Laddar Discussion..." permalink: "Permalänk" - imported_from: "Detta är ett syskon diskussions ämne för det ursprungliga inlägget på %{link}" + imported_from: "Detta är ett kopplat diskussionsämne till det ursprungliga inlägget på %{link}" in_reply_to: "▶ %{username}" replies: one: "1 svar" @@ -119,16 +119,16 @@ sv: prev_page: "← föregående sida" page_num: "Sida %{num}" home_title: "Hem" - topics_in_category: "Trådar i kategorin '%{category}'" + topics_in_category: "Ämnen i kategorin '%{category}'" rss_posts_in_topic: "RSS-flöde för '%{topic}'" - rss_topics_in_category: "RSS-flöde för trådar i kategorin '%{category}'" + rss_topics_in_category: "RSS-flöde för ämnen i kategorin '%{category}'" author_wrote: "%{author} skrev:" num_posts: "Inlägg:" num_participants: "Deltagare" read_full_topic: "Läs hela ämnet" rss_description: - latest: "Senaste trådar" - hot: "Heta trådar" + latest: "Aktuella ämnen" + hot: "Heta ämnen" posts: "Senaste inläggen" too_late_to_edit: "Inlägget skapades för långt tillbaka i tiden. Det kan inte lägre redigeras eller tas bort." excerpt_image: "bild" @@ -159,9 +159,53 @@ sv: - Vem skulle kunna vara intresserad av detta? Varför är det viktigt? Vad för typ av svar förväntar du dig? - - Inkludera vanligt förekommande ord i din tråd så att andra kan *hitta* det. För att gruppera din tråd med relaterade trådar, välj en kategori. + - Inkludera vanligt förekommande ord i ditt ämne så att andra kan *hitta* det. För att gruppera ditt ämne med relaterade ämnen, välj en kategori. - För mer, [see our community guidelines](/guidelines). This panel will only appear for your first %{education_posts_text}. + För mer, [see our community guidelines](/guidelines). + new-reply: | + Välkommen till %{site_name} — **tack för att du bidrar!** + + - Bidrar ditt svar något till konversationen på något sätt? + + - Var snäll mot andra medlemmar. + + - Konstruktiv kritik välkomnas, men kritisera då *idéer* och inte personer. + + För mer, [läs våra riktlinjer](/guidelines). Detta meddelande syns enbart vid dina första %{education_posts_text}. + avatar: | + ### Vad sägs om en ny bild för ditt konto? + + Du har skapat några ämnen och postat några svar, men din profilbild är inte lika unik som dig - det är samma standardbild som alla nya användare får. + + Har du inte funderat på att **[besöka din användarprofil](%{profile_path})** och ladda upp ett eget foto som representerar dig? + + Det är lättare att följa diskussioner och hitta intressanta personer i konversationer när alla har en unik profilbild! + sequential_replies: | + ### Överväg att svara på flera inlägg på en och samma gång + + Istället för flera svar i följd till ett ämne, kan du överväga ett enda svar som innehåller citat från tidigare inlägg eller @namn-referenser. + + Du kan redigera ditt tidigare svar och lägga till ett citat genom att markera text och välja knappen citera som dyker upp. + + Det blir lättare för alla att läsa ämnen som har färre in-på-djupet-svar istället för flera små, individuella svar. + dominating_topic: | + ### Låt andra gå med i konversationen + + Detta ämne är uppenbarligen viktigt för dig – du har postat mer än %{percent}% av alla svar här. + + Är du säker på att du ger tillräckligt med tid till andra personer att också få dela med sig av deras synpunkt? + too_many_replies: | + ### Du har nått svarsgränsen för detta ämne + + Tyvärr, men nya användare är tillfälligt begränsade till %{newuser_max_replies_per_topic} svar i samma ämne. + + Istället för att lägga till ytterligare ett svar, vänligen överväg att redigera dina tidigare svar, eller besök andra ämnen. + reviving_old_topic: | + ### Återuppliva detta ämne? + + Senaste svaret i detta ämne är nu över %{days} dagar gammalt. Ditt svar kommer att lyfta upp ämnet till toppen av listan och notifiera alla tidigare involverade i ämnet. + + Är du säker på att du vill fortsätta denna gamla konversation? activerecord: attributes: category: @@ -201,7 +245,8 @@ sv: vip_category_description: "En kategori exklusiv för medlemmar med en pålitlighetsnivå av 3 eller högre." meta_category_description: "Diskussion om den här webbplatsen, dess organisation, hur den fungerar och hur vi kan förbättra den." staff_category_name: "Personal" - staff_category_description: "Privat kategori för personal diskussioner. Ämnen här är bara synliga till administratörer och moderatorer." + staff_category_description: "Privat kategori för personaldiskussioner. Ämnen är bara synliga för administratörer och moderatorer." + assets_topic_body: "Detta är ett permanent ämne, endast synligt för personal, med syfte att lagra bilder och filer som ska användas till webbplatsens design. Radera ej detta ämne!\n\n\nSå här fungerar det:\n\n\n1. Svara på detta ämne.\n2. Ladda upp alla bilder du vill använda som logotyp, favicon och så vidare här. (Använd verktygfältets uppladdningsikon i inläggsredigeraren, eller dra-och-släpp eller klistra in bilder)\n3. Skicka ditt svar för att posta det.\n4. Högerklicka på bilderna i ditt nya inlägg för att få sökvägen till de uppladdade bilderna, eller klicka på redigera-ikonen för att redigera inlägget och på så sätt hämta sökvägen till bilderna. Kopiera bildernas sökväg. \n5. Klistra in bildernas sökvägar i de [grundläggande inställningarna](/admin/site_settings/category/required).\n\n\nOm du behöver möjliggöra uppladdning av flera olika filtyper, redigera `authorized_extensions` i [inställningarna för filer](/admin/site_settings/category/files)." lounge_welcome: title: "Välkommen till loungen" category: @@ -315,13 +360,13 @@ sv: other: "nästan %{count} år sedan" password_reset: choose_new: "Var god välj ett nytt lösenord" - choose: "Var god välj ett nytt lösenord" + choose: "Var god välj ett lösenord" update: 'Uppdatera Lösenord' save: 'Välj lösenord' title: 'Återställ Lösenord' success: "Du har lyckats med att byta ditt lösenord och är nu inloggad." success_unapproved: "Du lyckades med att byta ditt lösenord." - continue: "Continue to %{site_name}" + continue: "Fortsätt till %{site_name}" change_email: confirmed: "Din e-post har uppdaterats." please_continue: "Fortsätt till %{site_name}" @@ -333,6 +378,7 @@ sv: continue_button: "Fortsätt till %{site_name}" welcome_to: "Välkommen till %{site_name}!" approval_required: "En moderator måste manuellt godkänna ditt nya konto innan du kan komma åt detta forum. Du kommer få ett mail när ditt konto har godkänts!" + missing_session: "Vi kan inte upptäcka om ditt konto skapades. Se till att ha cookies aktiverade." post_action_types: off_topic: title: 'Off-Topic' @@ -343,15 +389,19 @@ sv: description: 'Detta inlägg är en annons. Den bidrar inte till eller är inte relevant för det aktuella ämnet, utan är promotion.' long_form: 'flagga detta som spam' email_title: '"%{title}" flaggades som skräp' + email_body: "%{link}\n\n%{message}" inappropriate: title: 'Olämpligt' description: 'Detta inläggs innehåll är inkluderar saker som som en förnuftig person skulle betrakta som stötande, kränkande eller överträdelse av våra community riktlinjerr.' long_form: 'flagga detta som olämpligt' notify_user: title: 'Meddela @{{username}}' + description: 'Detta inlägg innehåller något som jag, direkt och privat, vill tala med denna person om. Detta ger ingen flagga.' email_title: 'Du postade i "%{title}"' email_body: "%{link}\n\n%{message}" notify_moderators: + title: "Övrigt" + description: 'Detta inlägg kräver en moderators uppmärksamhet av ett annat skäl än de som nämns ovan.' long_form: 'flaggade det här för granskning av moderator' email_title: 'Ett inlägg i "%{title}" kräver uppmärksamhet från en moderator' email_body: "%{link}\n\n%{message}" @@ -374,16 +424,30 @@ sv: long_form: 'flaggad som spam' inappropriate: title: 'Olämpligt' + description: 'Detta ämne har innehåll som en förnuftig person skulle anse som stötande, kränkande eller våldsamt gentemot våra riktlinjer.' long_form: 'flaggad som olämplig' notify_moderators: + title: "Annat" + description: 'Detta ämne kräver en moderators uppmärksamhet baserat på riktlinjerna, användarvillkoren, eller an annat skäl som inte nämns ovan.' long_form: 'flaggade det här för granskning av moderator' + email_title: 'Ämnet "%{title}" kräver moderators uppmärksamhet' + email_body: "%{link}\n\n%{message}" + flagging: + you_must_edit: '

    Ditt inlägg blev flaggat av commynityn. Vänligen läs dina meddelanden.

    ' + user_must_edit: '

    Detta inlägg blev flaggat av communityn och är dolt för tillfället.

    ' archetypes: regular: - title: "Vanlig Tråd" + title: "Vanligt ämne" + banner: + message: + make: "Detta ämne är nu en banner. Den dyker upp i toppen av alla sidor tills den blir avfärdad av användaren." + remove: "Detta ämne är inte längre en banner. Den kommer inte att dyka upp i toppen av varje sida." unsubscribed: title: 'Avprenumererad' description: "Du har blivit avprenumererad. Vi kommer inte att kontakta dig igen!" oops: "Om du inte menade att göra detta, klicka nedan." + error: "Fel vid avprenumeration" + preferences_link: "Du kan också avprenumerera från sammanfattningsmejlen via dinainställningar" not_found_description: "Tyvärr, vi kunde inte avprenumerera dig. Det är möjligt att länken i ditt mail har löpt ut." resubscribe: action: "Återprenumerera" @@ -396,24 +460,24 @@ sv: yaxis: "Besök" signups: title: "Nya användare" - xaxis: "Day" - yaxis: "Number of new users" + xaxis: "Dag" + yaxis: "Antalet nya användare" topics: - title: "Topics" - xaxis: "Day" - yaxis: "Number of new topics" + title: "Ämnen" + xaxis: "Dag" + yaxis: "Antalet nya ämnen" posts: - title: "Posts" - xaxis: "Day" - yaxis: "Number of new posts" + title: "Inlägg" + xaxis: "Dag" + yaxis: "Antalet nya inlägg" likes: - title: "Likes" - xaxis: "Day" - yaxis: "Number of new likes" + title: "Gillningar" + xaxis: "Dag" + yaxis: "Antalet nya gillningar" flags: - title: "Flags" - xaxis: "Day" - yaxis: "Number of flags" + title: "Flaggor" + xaxis: "Dag" + yaxis: "Antalet flaggor" bookmarks: title: "Bokmärken" xaxis: "Dag" @@ -421,15 +485,15 @@ sv: starred: title: "Favoriserad" xaxis: "Dag" - yaxis: "Antal favoriserade trådar" + yaxis: "Antal favoriserade ämnen" users_by_trust_level: - title: "Users per Trust Level" - xaxis: "Trust Level" - yaxis: "Number of Users" + title: "Användare per förtroendenivå" + xaxis: "Förtroendenivå" + yaxis: "Antal användare" emails: - title: "Emails Sent" - xaxis: "Day" - yaxis: "Number of Emails" + title: "E-post skickade" + xaxis: "Dag" + yaxis: "Antalet mejl" user_to_user_private_messages: title: "Användare-till-användare" xaxis: "Dag" @@ -454,16 +518,16 @@ sv: title: "Toppreferenter" xaxis: "Användare" num_clicks: "Klick" - num_topics: "Trådar" + num_topics: "Ämnen" top_traffic_sources: title: "Vanligaste trafikkällor" xaxis: "Domän" num_clicks: "Klick" - num_topics: "Trådar" + num_topics: "Ämnen" num_users: "Användare" top_referred_topics: - title: "Mest refererade trådar" - xaxis: "Tråd" + title: "Mest refererade ämnen" + xaxis: "Ämne" num_clicks: "Klick" page_view_anon_reqs: title: "Anonym" @@ -495,15 +559,23 @@ sv: http_total_reqs: title: "Totala" xaxis: "Dag" + time_to_first_response: + title: "Tid till första respons" + xaxis: "Dag" + topics_with_no_response: + title: "Ämnen med ingen respons" + xaxis: "Dag" + yaxis: "Totalt" dashboard: rails_env_warning: "Your server is running in %{env} mode." ruby_version_warning: "Du använder en version av Ruby 2.0.0 som är känd för att ha problem. Uppgradera till patch-nivå 247 eller senare." host_names_warning: "Your config/database.yml file is using the default localhost hostname. Update it to use your site's hostname." gc_warning: 'Your server is using default ruby garbage collection parameters, which will not give you the best performance. Read this topic on performance tuning: Tuning Ruby and Rails for Discourse.' sidekiq_warning: 'Sidekiq is not running. Many tasks, like sending emails, are executed asynchronously by sidekiq. Please ensure at least one sidekiq process is running. Learn about Sidekiq here.' - memory_warning: 'Your server is running with less than 1 GB of total memory. At least 1 GB of memory is recommended.' + memory_warning: 'Din server körs med mindre än 1 GB minne. Minne på minst 1 GB är rekommenderat.' s3_config_warning: 'Servern är konfigurerad till att ladda upp filer till s3, men minst en av följande inställningar är inte satt: s3_access_key_id, s3_secret_access_key eller s3_upload_bucket. Gå till Inställningar och uppdatera dem. Se "How to set up image uploads to S3?" för att lära dig mer.' default_logo_warning: "Ange de grafiska logotyperna för din webbplats. Uppdatera logo_url, logo_small och favicon_url i Inställningar." + contact_email_missing: "Ange en e-postadress för webbplatsen så att du kan nås vid brådskande ärenden. Uppdatera i webbplatsinställningar." contact_email_invalid: "Webbplatsens e-postadress för kontakt är ogiltig. Uppdatera den i Inställningar." title_nag: "Ange namnet på webbplatsen. Uppdatera titel i Inställningar." site_description_missing: "Ange en beskrivning om din webbplats i en mening, som dyker upp i sökresultat. Uppdatera site_description i Inställningar." @@ -540,14 +612,21 @@ sv: description: "HTML som läggs till före taggen ." site_settings: censored_words: "Ord som automatiskt ersätts med ■■■■" + delete_old_hidden_posts: "Auto-radera alla dolda inlägg som varit dolda i mer än 30 dagar." default_locale: "Standardspråk för den här instansen av Discourse (ISO 639-1-kod)" allow_user_locale: "Tillåt användare att själva välja språk" min_post_length: "Minsta tillåtna inläggslängd i antal tecken" + min_first_post_length: "Minst antal tillåtna tecken i första inlägget (ämnestext)" + min_private_message_post_length: "Minst antal tillåtna tecken i inlägg för meddelanden" + min_search_term_length: "Minsta giltiga teckenlängd på sökterm" + allow_uncategorized_topics: "Tillåt att ämnen kan skapas utan en kategori." + uncategorized_description: "Beskrivningen av den okategoriserade kategorin. Lämna tomt för ingen beskrivning." allow_duplicate_topic_titles: "Tillåt ämnen med identiska rubriker." unique_posts_mins: "Hur många minuter innan en användare kan göra ett inlägg med precis samma innehåll igen" title: "Namnet på denna webbplats som används i titel-taggen." site_description: "Beskriv denna webbplats i en mening, som sedan används i meta-description-taggen." queue_jobs: "Köa diverse jobb i sidekiq, om urkryssat så körs köer infogat" + fixed_category_positions: "Om markerad, kommer du kunna ordna kategorier i en bestämd ordning. Om omarkerad, sorteras kategorierna baserat på aktivitet." favicon_url: "En favicon för till webbplats, se http://en.wikipedia.org/wiki/Favicon" apple_touch_icon_url: "Ikon som används för Apples touch-enheter. Rekommenderad storlek är 144*144 pixlar." enable_long_polling: "Message bus used for notification can use long polling" @@ -555,14 +634,23 @@ sv: auto_track_topics_after: "Global default milliseconds before a topic is automatically tracked, users can override (0 for always, -1 for never)" new_topic_duration_minutes: "Global default number of minutes a topic is considered new, users can override (-1 for always, -2 for last visit)" flags_required_to_hide_post: "Number of flags that cause a post to be automatically hidden and PM sent to the user (0 for never)" - max_topics_in_first_day: "Maximalt antal trådar en användare får skapa under sin första dag på sidan" + max_topics_in_first_day: "Max antal ämnen en användare får skapa under sin första dag på webbplatsen" max_replies_in_first_day: "Maximalt antal svar en användare får skapa under sin första dag på sidan" notify_mods_when_user_blocked: "Om en användare blockeras automatiskt, skicka ett meddelande till alla moderatorer." + ga_tracking_code: "Google analytics (ga.js) spårningskod, exempelvis: UA-12345678-9; se http://google.com/analytics" + allow_moderators_to_create_categories: "Tillåt moderatorer att skapa nya kategorier" + top_menu: "Bestäm vilka objekt som visas i hemsidans navigation, och i vilken ordning. Exempel: latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "Determine which items appear on the post menu, and in what order. Example 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" + site_contact_username: "Ett giltigt personalanvändarnamn att skicka alla automatiserade meddelanden ifrån. Om lämnad blank används det System-kontot." + send_welcome_message: "Skicka ett välkomstmeddelande till alla nya användare tillsammans med en snabbstartsguide." + show_email_on_profile: "Visa en användares e-postadress på deras profil (endast synlig för de själva och för personal)" + enable_badges: "Aktivera utmärkelsesystemet" + new_version_emails: "Skicka ett mejl till contact_email när en ny version av Discourse finns tillgängligt." port: "DEVELOPER ONLY! WARNING! Use this HTTP port rather than the default of port 80. Leave blank for default of 80." force_hostname: "DEVELOPER ONLY! WARNING! Specify a hostname in the URL. Leave blank for default." invite_expiry_days: "How long user invitation keys are valid, in days" + min_password_length: "Minsta lösenordslängd." enable_yahoo_logins: "Enable Yahoo authentication" enable_twitter_logins: "Enable Twitter authentication, requires twitter_consumer_key and twitter_consumer_secret" twitter_consumer_key: "Consumer key for Twitter authentication, registered at http://dev.twitter.com" @@ -573,16 +661,79 @@ sv: enable_github_logins: "Enable Github authentication, requires github_client_id and github_client_secret" github_client_id: "Client id for Github authentication, registered at https://github.com/settings/applications" github_client_secret: "Client secret for Github authentication, registered at https://github.com/settings/applications" + backup_daily: "Automatiskt skapa en säkerhetskopia av webbplatsen en gång per dag." active_user_rate_limit_secs: "How frequently we update the 'last_seen_at' field, in seconds" previous_visit_timeout_hours: "How long a visit lasts before we consider it the 'previous' visit, in hours" - min_trust_to_create_topic: "Minsta förtroendenivå som krävs för att skapa en ny tråd" + rate_limit_create_topic: "Efter att ha skapat ett ämne, måste användare vänta (n) sekunder innan de kan skapa ett nytt." + rate_limit_create_post: "Efter att ha skrivit ett inlägg, måste användare vänta (n) sekunder innan de skriver ett nytt." + rate_limit_new_user_create_topic: "Efter att ha skapat ett ämne, måste nya användare vänta (n) sekunder innan de kan skapa ett nytt." + rate_limit_new_user_create_post: "Efter att ha skrivit ett inlägg, måste nya användare vänta (n) sekunder innan de kan skriva ett nytt." + max_likes_per_day: "Max antal gilla per användare och dag." + max_flags_per_day: "Max antal flaggningar per användare och dag." + max_bookmarks_per_day: "Max antal bokmärken per användare och dag." + max_edits_per_day: "Max antal redigeringar per användare och dag." + max_topics_per_day: "Max antal ämnen en användare kan skapa per dag." + max_private_messages_per_day: "Max antal meddelanden användare kan skapa per dag." + max_invites_per_day: "Max antal inbjudningar en användare kan skicka per dag." + max_topic_invitations_per_day: "Max antal ämnesinbjudningar en användare kan skicka per dag." + suggested_topics: "Antal föreslagna ämnen som visas i botten av ett ämne." + limit_suggested_to_category: "Visa bara ämnen från den aktuella kategorin bland föreslagna ämnen." + avatar_sizes: "Lista på automatiskt genererade avatar-storlekar." + default_invitee_trust_level: "Förvald förtroendenivå (0-4) för inbjudna användare." + default_trust_level: "Förvald förtroendenivå (0-4) för alla nya användare. VARNING! En ändring av detta sätter dig i stor risk för skräppost." + tl1_requires_topics_entered: "Antal ämnen en användare måste öppna innan en befordran till förtroendenivå 1." + tl1_requires_read_posts: "Antal inlägg en ny användare måste läsa innan en befordran till förtroendenivå 1." + tl1_requires_time_spent_mins: "Antal minuter en ny användare måste läsa inlägg innan en befordran till förtroendenivå 1." + tl2_requires_topics_entered: "Antal ämnen en användare måste besöka innan en befordran till förtroendenivå 2." + tl2_requires_read_posts: "Antal inlägg en användare måste läsa innan en befordran till förtroendenivå 2." + tl2_requires_time_spent_mins: "Antalet minuter en användare måste läsa inlägg innan en befordran till förtroendenivå 2." + tl2_requires_days_visited: "Antalet dagar en användare måste besöka webbplatsen innan en befordran till förtroendenivå 2." + tl2_requires_likes_received: "Antalet gillningar en användare måste mottaga innan en befordran till förtroendenivå 2." + tl2_requires_likes_given: "Antalet gillningar en användare måste ge innan en befordran till förtroendenivå 2." + tl2_requires_topic_reply_count: "Antalet ämnen en användare måste svara på innan en befordran till förtroendenivå 2." + tl3_requires_days_visited: "Minsta antal dagar en användare måste ha besökt webbplatsen de senaste 100 dagarna för att bli kvalificerad till en befordran till förtroendenivå 3. (0 till 100)" + tl3_requires_topics_replied_to: "Minsta antalet ämnen en användare behöver ha svarat på de senaste 100 dagarna för att bli kvalificerad till en befordran till förtroendenivå 3. (0 eller högre)" + tl3_requires_topics_viewed_all_time: "Minsta antalet ämnen en användare måste ha tittat på för att bli kvalificerad för förtroendenivå 3." + tl3_requires_posts_read_all_time: "Minsta antalet inlägg en användare måste ha läst för att bli kvalificerad för förtroendenivå 3." + tl3_requires_likes_received: "Minsta antalet mottagna gillningar under de senaste 100 dagarna för att bli kvalificerad för en befordran till förtroendenivå 3." + min_trust_to_create_topic: "Lägsta förtroendenivå som krävs för att skapa ett nytt ämne." + newuser_max_links: "Antalet länkar en ny användare kan lägga till i ett inlägg." + newuser_max_images: "Antalet bilder en ny användare kan lägga till i ett inlägg." + newuser_max_attachments: "Antalet bilagor en ny användare kan lägga till i ett inlägg." + newuser_max_mentions_per_post: "Max antal @namn-omnämningar en ny användare kan göra i ett inlägg." + newuser_max_replies_per_topic: "Max antal svar en ny användare kan göra i ett enda ämne innan någon svarar dem." + max_mentions_per_post: "Max antal @namn-omnämningar vem som helst kan göra i ett inlägg." + create_thumbnails: "Skapa miniatyrer och \"lightboxa\" bilder som är för stora för att passa in i ett inlägg." + email_time_window_mins: "Vänta (n) minuter innan något notifikationsmejl skickas ut, för att ge användare chansen att redigera och slutföra deras inlägg." + title_max_word_length: "Den maximala tillåtna ordlängden, i tecken, i ett ämnes titel." title_fancy_entities: "Convert common ASCII characters to fancy HTML entities in topic titles, ala SmartyPants http://daringfireball.net/projects/smartypants/" + category_colors: "En lista över tillåtna hexadecimala färgvärden för kategorier." + category_style: "Visuell still för kategori-utmärkelser." + topic_views_heat_low: "Efter så här många visningar, blir visningsfältet något betonat." + topic_views_heat_medium: "Efter så här många visningar, blir visningsfältet måttligt betonat." + topic_views_heat_high: "Efter så här många visningar, blir visningsfältet starkt betonat." + cold_age_days_low: "Efter så här många dagars konversation, blir sista aktivitetsdatumet något nedtonat." + cold_age_days_medium: "Efter så här många dagars konversation, blir datumet för sista aktiviteten måttligt nedtonat." + cold_age_days_high: "Efter så här många dagars konversation, blir datumet för sista aktiviteten starkt nedtonat." + history_hours_low: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn något betonat." + history_hours_medium: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn måttligt betonat." + history_hours_high: "Ett inlägg som redigerats inom så här många timmar, har redigeringsindikatorn starkt betonat." faq_url: "Om du har en FAQ någon annanstans som du vill använda, skriv den fullständiga URL:en här." privacy_policy_url: "Om du har ett dokument med en integritetspolicy någon annanstans som du vill använda, skriv den fullständiga URL:en här." + auto_respond_to_flag_actions: "Aktivera automatiskt svar vid hantering av en flagga." + reply_by_email_enabled: "Aktivera möjlighet att svara på ämnen via e-post." + disable_emails: "Förhindra Discourse från att skicka någon form av e-post" + pop3_polling_ssl: "Använd SSL vid anslutning till POP3-servern. (Rekommenderat)" + email_editable: "Tillåt användare att ändra deras e-postadress efter registrering." default_digest_email_frequency: "Hur ofta användare får emailutskick som standard. De kan ändra detta val under sina inställningar." enable_user_directory: "Tillhandahåll en bläddringsbar användarkatalog" allow_anonymous_posting: "Tillåt användare att växla till anonymt läge" + anonymous_posting_min_trust_level: "Lägsta förtroendenivå som krävs för att aktivera anonyma inlägg" + allow_profile_backgrounds: "Tillåt användare att ladda upp profilbakgrunder." full_name_required: "Fullständigt namn är ett obligatoriskt fält i en användares profil." + display_name_on_posts: "Visa en användares fullständiga namn på deras inlägg som tillägg till deras @användarnamn." + show_time_gap_days: "Om två inlägg är gjorda med så här många dagar emellan, visa tidsskillnaden i ämnet." + enable_emoji: "Aktivera emoji" errors: invalid_email: "Felaktig e-postadress." invalid_username: "Det finns ingen användare med detta användarnamn." @@ -590,79 +741,239 @@ sv: invalid_integer_min: "Värdet måste vara %{max} eller större." invalid_integer_max: "Värdet får inte vara större än %{max}." invalid_integer: "Värdet måste vara ett heltal." + must_include_latest: "Toppmenyn måste inkludera 'senaste'-fliken." + invalid_string: "Ogiltigt värde." + invalid_string_min_max: "Måste vara mellan %{min} och %{max} tecken." + invalid_string_min: "Måste vara minst %{min} tecken." + invalid_string_max: "Måste vara högst %{max} tecken." notification_types: - mentioned: "%{display_username} mentioned you in %{link}" - liked: "%{display_username} liked your post in %{link}" - replied: "%{display_username} replied to your post in %{link}" - quoted: "%{display_username} quoted your post in %{link}" - edited: "%{display_username} edited your post in %{link}" - posted: "%{display_username} posted in %{link}" - moved_post: "%{display_username} moved your post to %{link}" - invitee_accepted: "%{display_username} accepted your invitation" + mentioned: "%{display_username} nämnde dig i %{link}" + liked: "%{display_username} gillade ditt inlägg i %{link}" + replied: "%{display_username} svarade på ditt inlägg i %{link}" + quoted: "%{display_username} citerade ditt inlägg i %{link}" + edited: "%{display_username} redigerade ditt inlägg i %{link}" + posted: "%{display_username} skrev i %{link}" + moved_post: "%{display_username} flyttade ditt inlägg till %{link}" + private_message: "%{display_username} har skickat ett meddelande till dig: %{link}" + invited_to_private_message: "%{display_username} har bjudit in dig till en privat konversation: %{link}" + invited_to_topic: "%{display_username} har bjudit in dig till ett ämne: %{link}" + invitee_accepted: "%{display_username} accepterade din inbjudan" + linked: "%{display_username} länkade dig i %{link}" + granted_badge: "Du förtjänade %{link}" search: within_post: "#%{post_number} av %{username}" types: - category: 'Categories' + category: 'Kategorier' topic: 'Resultat' - user: 'Users' - original_poster: "Original Poster" - most_posts: "Most Posts" - most_recent_poster: "Most Recent Poster" - frequent_poster: "Frequent Poster" + user: 'Användare' + sso: + account_not_approved: "Konto inväntar godkännande. Du kommer att få ett e-postmeddelande när kontot väl är godkänt." + original_poster: "Ursprunglig skribent" + most_posts: "Mest inlägg" + most_recent_poster: "Senaste skribent" + frequent_poster: "Flitig skribent" move_posts: existing_topic_moderator_post: - one: "Jag flyttade ett inlägg till en existerande tråd: %{topic_link}" - other: "Jag flyttade %{count} inlägg till en existerande tråd: %{topic_link}" + one: "Jag flyttade ett inlägg till ett existerande ämne: %{topic_link}" + other: "Jag flyttade %{count} inlägg till ett existerande ämne: %{topic_link}" 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." - closed_enabled: "This topic is now closed. New replies are no longer allowed." - closed_disabled: "This topic is now opened. New replies are allowed." - autoclosed_disabled: "Den här tråden är nu öppen. Nya svar är tillåtna." - pinned_disabled: "This topic is now unpinned. It will no longer appear at the top of its category." + 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." + closed_enabled: "Detta ämne är nu stängt. Nya svar tillåts inte längre." + closed_disabled: "Detta ämne är nu öppnat. Nya svar är tillåtna." + autoclosed_enabled_days: + one: "Detta ämne stängdes automatiskt efter 1 dag. Nya svar är ej längre tillåtet." + other: "Detta ämne stängdes automatiskt efter %{count} dagar. Nya svar är ej längre tillåtna." + autoclosed_enabled_hours: + one: "Detta ämne stängdes automatiskt efter 1 timme. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt efter %{count} timmar. Nya svar är ej längre tillåtna." + autoclosed_enabled_minutes: + one: "Detta ämne stängdes automatiskt efter 1 minut. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt efter %{count} minuter. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_days: + one: "Detta ämne stängdes automatiskt 1 dag efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} dagar efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_hours: + one: "Detta ämne stängdes automatiskt 1 timme efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} timmar efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_enabled_lastpost_minutes: + one: "Detta ämne stängdes automatiskt 1 minut efter det senaste svaret. Nya svar är ej längre tillåtna." + other: "Detta ämne stängdes automatiskt %{count} minuter efter det senaste svaret. Nya svar är ej längre tillåtna." + autoclosed_disabled: "Detta ämne är nu öppet. Nya svar är tillåtna." + autoclosed_disabled_lastpost: "Detta ämne är nu öppnat. Nya svar är tillåtna." + pinned_enabled: "Detta ämne är nu klistrat. Det dyker upp i toppen av dess kategori tills den blir avklistrad av personal för alla, eller av enskilda användare för de själva." + pinned_disabled: "Detta ämne är nu oklistrat. Det dyker längre inte upp i toppen av dess kategori." login: - not_approved: "Your account hasn't been approved yet. You will be notified by email when you are ready to log in." - 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 active and ready." - 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_approved: "Ditt konto har inte blivit godkänt ännu. Du kommer att meddelas via e-post när du kan logga in." + incorrect_username_email_or_password: "Felaktigt användarnamn, e-post eller lösenord" + wait_approval: "Tack för din registrering. Vi meddelar dig när ditt konto blivit godkänt." + active: "Ditt konto är aktiverat och redo att användas." + not_activated: "Du kan inte logga in ännu. Vi har skickat ett aktiveringsmejl till dig. Vänligen följ instruktionerna i mejlet för att aktivera ditt konto." not_allowed_from_ip_address: "Du kan inte logga in som %{username} från den IP-adressen." admin_not_allowed_from_ip_address: "Du kan inte logga in som admin från den IP-adressen." suspended: "Du kan inte logga in förrän %{date}." suspended_with_reason: "Konto avstängt t.o.m. %{date}: %{reason}" errors: "%{errors}" - not_available: "Not available. Try %{suggestion}?" - something_already_taken: "Something went wrong, perhaps the username or email is already registered. Try the forgot password link." - omniauth_error_unknown: "Something went wrong processing your log in, please try again." + not_available: "Inte tillgänglig. Testa %{suggestion}?" + something_already_taken: "Något gick fel. Kanske är användarnamnet eller e-postadressen redan registrerat. Testa glömt lösenord-länken." + omniauth_error_unknown: "Något gick fel med din inloggning, var god och försök igen." + password_too_long: "Lösenord har en gräns på 200 tecken." + missing_user_field: "Du har inte fyllt i alla användarfält" user: + no_accounts_associated: "Inga kopplade konton" username: - unique: "must be unique" - blank: "must be present" - must_begin_with_alphanumeric: "must begin with a letter or number" + short: "måste var minst %{min} tecken" + long: "får högst vara %{max} tecken" + characters: "får endast innehålla nummer, bokstäver och understreck" + unique: "måste vara unikt" + blank: "måste finnas" + must_begin_with_alphanumeric: "måste börja med en bokstav eller siffra" email: - not_allowed: "is not allowed from that email provider. Please use another email address." + not_allowed: "är inte en tillåten e-postleverantör. Vänligen använd en annan e-postadress." blocked: "är inte tillåtet." + ip_address: + blocked: "Nya registreringar är inte tillåtna från din IP-adress." + max_new_accounts_per_registration_ip: "Nya registreringar är inte tillåtet från din IP-adress (maxgräns uppnådd). Kontakta personal." + invite_mailer: + subject_template: "%{invitee_name} har bjudit in dig till '%{topic_title}' på %{site_domain_name}" + text_body_template: | + %{invitee_name} har bjudit in dig till en diskussion + + > **%{topic_title}** + > + > %{topic_excerpt} + + på + + > %{site_title} -- %{site_description} + + Om du är intresserad, klicka på länken nedan: + + %{invite_link} + + Denna inbjudan är från en betrodd användare, så du kan direkt delta och svara i diskussionen. + invite_forum_mailer: + subject_template: "%{invitee_name} har bjudit in dig till %{site_domain_name}" + text_body_template: | + %{invitee_name} har bjudit in dig till + + > **%{site_title}** + > + > %{site_description} + + Om du är intresserad, klicka på länken nedan: + + %{invite_link} + + Denna inbjudan kommer från en betrodd användare, så du behöver inte logga in. + invite_password_instructions: + subject_template: "Ange lösenord för ditt konto på %{site_name}" + text_body_template: | + Tack för att du accepterade inbjudan till %{site_name} -- välkommen! + + Klicka på länken för att ange ett lösenord nu: + %{base_url}/users/password-reset/%{email_token} + + Om du inte kommer ihåg ditt lösenord, eller inte skaffat något ännu, välj "jag har glömt mitt lösenord" när du loggar in med din e-postadress. test_mailer: subject_template: "[%{site_name}] Email Deliverability Test" new_version_mailer: subject_template: "[%{site_name}] Ny version av Discourse, uppdatering tillgänglig" + text_body_template: | + En ny version av [Discourse](http://www.discourse.org) finns tillgängligt. + + Din version: %{installed_version} + Ny version: **%{new_version}** + + Du kanske vill: + + - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Uppgradera från din webbläsare på [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse. new_version_mailer_with_notes: subject_template: "[%{site_name}] uppdatering tillgänglig" + text_body_template: | + En ny version av [Discourse](http://www.discourse.org) finns tillgängligt. + + Din version: %{installed_version} + Ny version: **%{new_version}** + + Du kanske vill: + + - Se vad som är nytt i [GitHub changelog](https://github.com/discourse/discourse/commits/master). + + - Uppgradera från din webbläsare på [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade). + + - Besöka [meta.discourse.org](http://meta.discourse.org) för nyheter, diskussioner och support för Discourse. + + ### Release notes + + %{notes} flags_reminder: + flags_were_submitted: + one: "Dessa flaggor skickades in för mer än 1 timme sedan." + other: "Dessa flaggor skickades in för mer än %{count} timmar sedan." + please_review: "Var god och granska dessa." post_number: "inlägg" + subject_template: + one: "1 flagga väntar på att bli hanterad" + other: "%{count} flaggor väntar på att bli hanterade" + flag_reasons: + off_topic: "Ditt inlägg blev flaggat som **off-topic**. Medlemmarna i forumet kände att det inte är passande för ämnet, som definieras av titeln och det första inlägget." + inappropriate: "Ditt inlägg blev flaggat som **olämpligt**. Medlemmarna i forumet kände att det är störande, kränkande eller att det strider mot [våra riktlinjer](/guidelines)." + spam: "Ditt inlägg blev flaggat som **skräppost**. Medlemmarna i forumet kände att det är reklam, något som är överdrivet säljande istället för att vara nyttigt eller relevant för ämnet." + notify_moderators: "Ditt inlägg blev flaggat **för moderators uppmärksamhet**. Medlemmarna i forumet kände att något i inlägget kräver manuellt ingripande av personal." flags_dispositions: agreed: "Tack för att du meddelade oss. Vi håller med om att det finns ett problem och vi undersöker det. " agreed_and_deleted: "Tack för att du meddelade oss. Vi håller med om att det finns ett problem och vi har raderat inlägget." disagreed: "Tack för att du meddelande oss. Vi undersöker det." deferred: "Tack för att du meddelande oss. Vi undersöker det." deferred_and_deleted: "Tack för att du meddelande oss. Vi har raderat inlägget." + temporarily_closed_due_to_flags: "Detta ämne är tillfälligt stängt på grund av ett stort antal flaggor." system_messages: post_hidden: subject_template: "Post hidden due to community flagging" welcome_user: subject_template: "Välkommen till %{site_name}!" + text_body_template: | + Tack för att du gått med i %{site_name}, och välkommen! + + %{new_user_tips} + + Vi tror på ett [civiliserat beteende](%{base_url}/guidelines) vid alla tillfällen. + + Njut av din vistelse! + + (Om du som ny användare behöver komma i kontakt med vår [personal](%{base_url}/about), svara bara på detta meddelande) welcome_invite: subject_template: "Välkommen till %{site_name}!" + text_body_template: | + Tack för att du accepterade din inbjudan till %{site_name} -- välkommen! + + Vi har skapat ett nytt konto **%{username}** till dig och du är inloggad. Du kan byta namn genom att besöka [din användarprofil][prefs]. + + För att logga in senare: + + 1. Använda alltid **samma e-postadress som från din ursprungliga inbjudan** när du loggar in. Annars vet vi inte att det är du! + + 2. Skapa ett unikt lösenord för [din användarprofil][prefs], och använd det för att logga in. + + %{new_user_tips} + + Vi tror på ett [civiliserat beteende](%{base_url}/guidelines) vid alla tillfällen. + + Njut av din vistelse! + + (Om du som ny användare behöver komma i kontakt med vår [personal](%{base_url}/about), svara bara på detta meddelande.) + + [prefs]: %{user_preferences_url} + backup_succeeded: + subject_template: "Säkerhetskopia skapades utan problem" + text_body_template: "Säkerhetskopieringen lyckades.\nBesök [admin > Säkerhetskopior](/admin/backups) för att ladda ned din nya säkerhetskopia." + backup_failed: + subject_template: "Säkerhetskopiering misslyckades" restore_succeeded: text_body_template: "Återställningen lyckades." restore_failed: @@ -676,9 +987,9 @@ sv: text_body_template: |+ Hej, - det här är ett automatiskt meddelande från %{site_name} för att informera dig om att ditt konto har blivit avblockerat efter en granskning av personalen. + Det här är ett automatiskt meddelande från %{site_name} för att informera dig om att ditt konto har blivit avblockerat efter en granskning från personalen. - Du kan nu skapa nya svar och trådar igen. + Du kan nu skapa nya svar och ämnen igen. pending_users_reminder: subject_template: @@ -690,61 +1001,73 @@ sv: previous_discussion: "Föregående Svar" unsubscribe: title: "Unsubscribe" - description: "Not interested in getting these emails? No problem! Click below to unsubscribe instantly:" + description: "Inte intresserad av att få dessa mejl? Inga problem! Klicka nedan för att avprenumerera." + reply_by_email: "För att svara, svara på detta mejl eller besök %{base_url}%{url} i din webbläsare." visit_link_to_respond: "För att svara, besök %{base_url}%{url} i din webbläsare." posted_by: "Postat av %{username} den %{post_date}" + user_invited_to_private_message_pm: + subject_template: "[%{site_name}] %{username} har bjudit in dig till en privat konversation '%{topic_title}'" + user_invited_to_topic: + subject_template: "[%{site_name}] %{username} har bjudit in dig till ett ämne '%{topic_title}'" user_replied: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} replied to your post in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_quoted: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} quoted you in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_mentioned: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} mentioned you in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} user_posted: + subject_template: "[%{site_name}] %{topic_title}" text_body_template: | - %{username} posted in '%{topic_title}' on %{site_name}: - - --- %{message} + %{context} + --- - Please visit this link to respond: %{base_url}%{url} + %{respond_instructions} digest: - new_activity: "New activity on your topics and posts:" + new_activity: "Ny aktivitet i dina ämnen och inlägg:" top_topics: "Populära inlägg" - other_new_topics: "Populära trådar" - click_here: "click here" - from: "%{site_name} digest" + other_new_topics: "Populära ämnen" + click_here: "klicka här" + from: "%{site_name} sammanfattning" read_more: "Läs Mer" + more_topics_category: "Fler nya ämnen:" forgot_password: - subject_template: "[%{site_name}] Password reset" + subject_template: "[%{site_name}] Återställning av lösenord" text_body_template: | - Somebody asked to reset your password on [%{site_name}](%{base_url}). + Någon bad om att få återställa ditt lösenord på [%{site_name}](%{base_url}). - If it was not you, you can safely ignore this email. + Om detta inte var du, kan du utan problem ignorera detta mejl. - Click the following link to choose a new password: + Klicka på följande länk för att välja ett nytt lösenord: %{base_url}/users/password-reset/%{email_token} + set_password: + subject_template: "[%{site_name}] Ange lösenord" + admin_login: + subject_template: "[%{site_name}] Logga in" + account_created: + subject_template: "[%{site_name}] Ditt nya konto" authorize_email: subject_template: "[%{site_name}] Confirm your new email address" text_body_template: | @@ -757,23 +1080,36 @@ sv: subject_template: "[%{site_name}] Activate your new account" text_body_template: "Välkommen till %{site_name}!\n\nKlicka på följande länk för att bekräfta och aktivera ditt nya konto:\n%{base_url}/users/activate-account/%{email_token}\n\nOm länken ovan inte går att klicka på kan du kopiera och klistra in länken i adressfältet i din webbläsare. \n" page_not_found: + title: "Sidan du sökte existerar inte eller är privat." popular_topics: "Populära" recent_topics: "Senaste" see_more: "Mer" + search_title: "Sök på sajten" + search_google: "Google" + login_required: + welcome_message: | + #[Välkommen till %{title}](#welcome) + Ett konto krävs för att logga in. Var god och skapa ett konto eller logga in för att fortsätta. terms_of_service: title: "Användarvillkor" signup_form_message: 'Jag har läst och accepterat Användarvillkoren.' deleted: 'raderad' upload: pasted_image_filename: "Inklistrad bild" + attachments: + too_large: "Tyvärr, filen du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb)." images: + too_large: "Tyvärr, bilden du försöker ladda upp är för stor (maxstorlek är %{max_size_kb}kb). Ändra storleken och försök igen." + unknown_image_type: "Tyvärr, men filen du försökte ladda upp ser inte ut att vara en bild." size_not_found: "Vi beklagar, men vi kunde inte avgöra bildens storlek. Kanske är din bildfil skadad?" email_log: no_user: "Kan inte hitta användare med id %{user_id}" anonymous_user: "Användare är anonym" seen_recently: "Användare sågs senast" + post_not_found: "Kan inte hitta ett inlägg med id %{post_id}" post_deleted: "inlägg raderades av författaren" user_suspended: "användare blev avstängd" + message_blank: "meddelande är tomt" about: "Om" guidelines: "Riktlinjer" privacy: "Integritet" @@ -787,13 +1123,81 @@ sv: title: "Villkor" badges: long_descriptions: + autobiographer: | + Bla bla bla + Bla bla bla + first_like: | + Bla bla bla + Bla bla bla + first_link: | + Bla bla bla + Bla bla bla + first_quote: |+ + Bla bla bla + Bla bla bla + + first_share: |+ + Bla bla bla + Bla bla bla + + read_guidelines: | + Bla bla bla + Bla bla bla + reader: | + Bla bla bla + Bla bla bla + editor: | + Bla bla bla + Bla bla bla + nice_share: | + Bla bla bla + Bla bla bla + welcome: | + Bla bla bla + Bla bla bla + anniversary: |+ + Bla bla bla + Bla bla bla + + good_share: | + Bla bla bla + Bla bla bla + great_share: | + Bla bla bla + Bla bla bla nice_post: | Bla bla bla Bla bla bla nice_topic: | Bla bla bla Bla bla bla + good_post: | + Bla bla bla + Bla bla bla + good_topic: | + Bla bla bla + Bla bla bla + great_post: | + Bla bla bla + Bla bla bla + great_topic: | + Bla bla bla + Bla bla bla + basic: | + Bla bla bla + Bla bla bla + member: | + Bla bla bla + Bla bla bla + regular: | + Bla bla bla + Bla bla bla + leader: |+ + Bla bla bla + Bla bla bla + admin_login: success: "E-post skickat" error: "Fel!" + email_input: "E-post till administratör" submit_button: "Skicka e-post" diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 9b2b94f1b7..40121c2239 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -213,7 +213,7 @@ tr_TR: no_info_other: "
    %{name} profilinde Hakkımda kısmına henüz bir şey girmedi
    " vip_category_name: "Lobi" vip_category_description: "Güven seviyesi 3 ve üzerinde olan üyelere özel kategori." - meta_category_name: "Meta" + meta_category_name: "Site geri bildirimi" meta_category_description: "Bu site, sitenin organizasyonu, nasıl çalıştığı ve nasıl geliştirilebileceği ile ilgili tartışma alanı." staff_category_name: "Görevliler" staff_category_description: "Görevliler arası konuşmalar için özel kategori. Konular sadece admin ve moderatörlere gözükür." @@ -327,7 +327,7 @@ tr_TR: almost_x_years: other: "yaklaşık %{count} yıl önce" password_reset: - no_token: "Üzgünüz, şifre değiştirme bağlantısı güncel değil. Yeni bağlantı almak için tekrar giriş yapın ve 'Şifremi unuttum\"'u seçin." + no_token: "Üzgünüz ancak bu şifre sıfırlama bağlantısının üzerinden bayağı bir süre geçmiş. Lütfen tekrar bir şifre sıfırlama isteği oluşturun." choose_new: "Lütfen yeni bir parola seçin" choose: "Lütfen parola seçin" update: 'Parolayı Güncelle' @@ -540,6 +540,14 @@ tr_TR: title: "Toplam" xaxis: "Gün" yaxis: "Toplam istekler" + time_to_first_response: + title: "İlk yanıtın verilme süresi" + xaxis: "Gün" + yaxis: "Ortalama süre (saat)" + topics_with_no_response: + title: "Hiç yanıtlanmamış konular" + xaxis: "Gün" + yaxis: "Toplam" dashboard: rails_env_warning: "Sunucunuz %{env} modunda çalışıyor." ruby_version_warning: "Problemli olduğu bilinegelen Ruby 2.0.0 sürümünü kullanmaktasınız. Yama seviyesi 247 veya daha yenisine güncelleme yapınız." @@ -897,6 +905,7 @@ tr_TR: sequential_replies_threshold: "Kullanıcının ardarda çok fazla cevap gönderdiğine dair uyarı alması için, bir konuda üstüste yapması gereken gönderi sayısı. " enable_mobile_theme: "Mobil cihazlar mobil uyumlu temayı kullanır, dilerse masaüstü görünüme geçebilirler. Eğer özel, duyarlı bir stil kullanıyorsanız bunu devredışı bırakın." dominating_topic_minimum_percent: "Konuyu domine ettiğine dair uyarı almadan önce konudaki gönderilerin yüzde kaçının kullanıcıya ait olması gerekir." + daily_performance_report: "NGINX kayıtlarını analiz edip detaylı bir şekilde günlük Yetkili kategorisinde bir konu içerisinde paylaş." suppress_uncategorized_badge: "Kategorisiz konular için olan rozeti konu listesinde gösterme." global_notice: "Tüm ziyaretçilere İVEDİ ACİL DURUM global manşet uyarısı göster, saklamak için boş bırakın (HTML kullanılabilir)." disable_edit_notifications: " 'download_remote_images_to_local' etkin olduğunda, sistem kullanıcısından gelen düzenleme bildirilerini devre dışı bırakır" @@ -931,6 +940,7 @@ tr_TR: enforce_square_emoji: "Tüm emojileri kare en-boy oranına zorla" approve_post_count: "Yeni bir kullanıcıdan onaylanması gereken gönderi sayısı" approve_unless_trust_level: "Bu güven seviyesi altındaki kullanıcılardan gelen gönderilerin onaylanması gerekir" + notify_about_queued_posts_after: "Bu kadar saat geçmesine rağmen hala incelenmemiş konular varsa, iletişim adresine e-posta gönder. Devre dışı bırakmak için 0 girin." errors: invalid_email: "Geçersiz e-posta adresi." invalid_username: "Bu kullanıcı adı ile bir kullanıcı bulunmuyor." @@ -1094,6 +1104,12 @@ tr_TR: how_to_disable: '"Bayraklarla ilgili bilgilendirme süresi" ayarından bu hatırlatma e-postasının gönderimini devre dışı bırakabilir ya da sıklığını değiştirebilirsiniz. ' subject_template: other: "İlgilenilmesi gereken %{count} bayrak var" + queued_posts_reminder: + subject_template: + other: "[%{site_name}] %{count} konu incelenmeyi bekliyor." + text_body_template: | + Merhaba, + Yeni kullanıcılar tarafından oluşturulmuş ve onayınızı bekleyen konular bulunuyor. [Konuları şuradan inceleyebilirsiniz.](%{base_url}/queued-posts). flag_reasons: off_topic: "Gönderiniz **konu-dışı** olarak bayraklandı: 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 bayraklandı: topluluk gönderinizin saldırgan, kaba ya da [topluluk yönergelerine](/guidelines) aykırı olduğunu düşünüyor." @@ -1105,7 +1121,7 @@ tr_TR: disagreed: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz." deferred: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Konu ile ilgileniyoruz." deferred_and_deleted: "Bizi bilgilendirdiğiniz için teşekkür ederiz. Gönderiyi kaldırdık." - temporarily_closed_due_to_flags: "Bu konu, topluluk tarafından bayraklanma sayısı çok olduğu için geçici olarak kapatıldı" + temporarily_closed_due_to_flags: "Bu konu topluluk tarafından çok fazla rapor edildiği için geçici olarak kapatılmıştır." system_messages: post_hidden: subject_template: "Topluluk tarafından bayraklandığı için gönderiniz gizlendi" @@ -1135,7 +1151,7 @@ tr_TR: text_body_template: "%{site_name} davetiyenizi onayladığınız için teşekkürler -- hoşgeldiniz! \n\nSizin için yeni bir hesap oluşturduk: **%{username}**, ve sisteme girişiniz yapıldı. [Kullanıcı profilinizi][prefs] ziyaret ederek kullanıcı adınızı değiştirebilirsiniz. \n\nDaha sonra tekrar giriş yapmak için: \n\n1. Giriş yaparken her zaman **ilk davetiyenizdekiyle aynı email adresini kullanın**. Yoksa sizin olduğunuzu anlayamayız! \n\n2. [Kullanıcı profiliniz][prefs] için yeni bir şifre oluşturun ve o şifre ile giriş yapın. \n\n%{new_user_tips} \n\nBiz her zaman [medeni topluluk davranışına](%{base_url}/guidelines) inanıyoruz. \n\nZiyaretinizin keyfini çıkarın!\n\n(Eğer yeni bir kullanıcı olarak [görevlilerle](%{base_url}/about) iletişim kurmak isterseniz, bu mesajı cevaplamanız yeterli.) \n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "Yedekleme başarıyla tamamlandı" - text_body_template: "Yedekleme başarıyla tamamlandı.\n\n[admin > backup section](/admin/backups) bölümünden yeni yedeği indirebilirsiniz." + text_body_template: "Yedekleme işlemi başarıyla tamamlandı.\nYeni yedeğinizi [Yönetici Paneli > Yedekler](%{base_url}/admin/backups) adresinden indirebilirsiniz." backup_failed: subject_template: "Yedekleme başarısız" text_body_template: "Yedekleme başarısız oldu. \n\nKayıtlar burada:\n\n```\n\n%{logs}\n\n```\n\n" @@ -1940,3 +1956,6 @@ tr_TR: submit_button: "E-posta Gönder" discourse_hub: access_token_problem: "Admin'e iletin: Lütfen doğru discourse_org_access_key içerecek şekilde site ayarlarını güncelleyin." + performance_report: + initial_post_raw: Bu konu siteniz hakkında günlük performans raporlarını içerir. + initial_topic_title: Site performansı raporları diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 2310e3b7bf..767fed18f9 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -126,6 +126,7 @@ zh_CN: rss_description: latest: "最新主题" hot: "最热主题" + posts: "最新帖子" too_late_to_edit: "这个主题在很早之前创建。不能被编辑或者被删除。" excerpt_image: "图片" queue: @@ -352,7 +353,6 @@ zh_CN: almost_x_years: other: "将近 %{count} 年前" password_reset: - no_token: "抱歉，密码修改链接已过期。再登录一次并选择“我忘记了密码”获得一个新的链接。" choose_new: "请选择一个新密码" choose: "请选择一个密码" update: '更新密码' @@ -565,6 +565,13 @@ zh_CN: title: "总量" xaxis: "天" yaxis: "总请求数" + time_to_first_response: + xaxis: "天" + yaxis: "平均时间（小时）" + topics_with_no_response: + title: "没有回复的帖子" + xaxis: "天" + yaxis: "总量" dashboard: rails_env_warning: "你的服务器运行在 %{env} 模式。" ruby_version_warning: "你正在使用 Ruby 2.0.0，这个版本有较多的问题。请升级至 p247 或更新版。" @@ -1155,38 +1162,8 @@ zh_CN: [sc]: http://sendcloud.sohu.com/ new_version_mailer: subject_template: "[%{site_name}] 有新的 Discourse 版本，可供升级" - text_body_template: | - 有新版本的 Discourse 可供升级。 - - 你的版本：%{installed_version} - 新版本：**%{new_version}** - - 你可能想要： - - - 查看 [GitHub 改动日志](https://github.com/discourse/discourse/commits/master) 中的更新内容。 - - - 访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade)，然后按下“升级”按钮。 - - - 访问 [meta.discourse.org](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。 new_version_mailer_with_notes: subject_template: "[%{site_name}] 可以升级" - text_body_template: | - 有新版本的 [Discourse](http://www.discourse.org) 可供升级。 - - 你的版本：%{installed_version} - 新版本：**%{new_version}** - - 你可能想要： - - - 查看[GitHub 改动日志](https://github.com/discourse/discourse/commits/master)中的更新内容。 - - - 访问 [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade) ，然后按下“升级”按钮。 - - - 访问 [meta.discourse.org](http://meta.discourse.org) 获取 Discourse 的最新资讯、讨论和支持。 - - ### 发行注记 - - %{notes} flags_reminder: flags_were_submitted: other: "这些标记在过去 %{count} 内被提交。" @@ -1206,7 +1183,6 @@ zh_CN: disagreed: "感谢通知我们。我们正在了解情况。" deferred: "感谢通知我们。我们正在调查情况。" deferred_and_deleted: "感谢通知我们。我们已经删除了帖子。" - temporarily_closed_due_to_flags: "帖子因为多次社群标记暂时关闭" system_messages: post_hidden: subject_template: "%{site_name} 提示：由于论坛用户标记，系统隐藏了你的帖子" @@ -1241,7 +1217,6 @@ zh_CN: text_body_template: "感谢你接受邀请加入%{site_name} —— 欢迎！\n\n我们为你创建了账号：**%{username}**，同时你已经登录了。你可以在任何时候访问[你的用户设置][prefs]来修改它。\n\n要再次登入，或者：\n\n1. 永远 **使用收到邀请的邮箱地址**登录，。否则我们就无法分辨是不是你本人！\n\n2. 在 %{site_name} 的[用户设置][prefs]页面创建一个密码，然后使用该密码来登入。 \n\n%{new_user_tips}\n\n我们始终相信[讨论应该文明](%{base_url}/guidelines)。\n\n好好享受你在论坛的时光吧！\n\n（如果你在新用户级别需要和[职员](%{base_url}/about)沟通的话，直接回复这个消息。）\n\n[prefs]: %{user_preferences_url}\n" backup_succeeded: subject_template: "备份成功完成" - text_body_template: "备份成功。\n访问[管理 > 备份](/admin/backups)下载你的新备份文件。" backup_failed: subject_template: "备份失败" text_body_template: | @@ -1521,7 +1496,7 @@ zh_CN: new_activity: "在你的主题和帖子里的动态：" top_topics: "热门帖子" other_new_topics: "热门主题" - unsubscribe: "这封来自 %{site_link} 的摘要邮件是你一段时间没有访问后发送给你的。点击 %{unsubscribe_link} 取消订阅。" + unsubscribe: "这是封来自%{site_link}的摘要邮件，因为你长时间没有访问而发送。%{unsubscribe_link}取消订阅。" click_here: "点击此处" from: "%{site_name} 摘要" read_more: "阅读更多" @@ -1749,29 +1724,6 @@ zh_CN: 如果我们决定更改我们的隐私政策，我们将在此页更新这些改变。 文档以 CC-BY-SA 发布。最后更新时间为2013年5月31日。 - static: - search_help: | -

    小技巧

    -

    -

      -
    • 匹配有优先级。所以有疑问时，搜索标题
      • -
    • 独一无二的、不常见的单词将总是产生最好的结果
      • -
    • 只要有可能，限制你的搜索范围至一个特定的分类、用户或主题
      • -
    -

    -

    选项

    -

    - - - - - - -
    order:viewsorder:latest
    status:openstatus:closedstatus:archivedstatus:norepliesstatus:singleuser
    category:foouser:foo
    in:likesin:postedin:watchingin:trackingin:private
    in:bookmarks
    -

    -

    - 彩虹 category:公园 status:open order:latest 将搜索在“公园”分类中没有关闭或存档中的包含“彩虹”的主题，并按最后一个帖子的日期来排序。 -

    badges: long_descriptions: autobiographer: | @@ -1852,3 +1804,6 @@ zh_CN: submit_button: "发送邮件" discourse_hub: access_token_problem: "告诉管理员：请更新站点设置，应使用正确的 discourse_org_access_key。" + performance_report: + initial_post_raw: 这个主题包括你网站的每日性能报告 + initial_topic_title: 网站性能报告 diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf index 5e436fcf24..7daa8a3752 100644 --- a/config/nginx.sample.conf +++ b/config/nginx.sample.conf @@ -90,6 +90,13 @@ server { add_header Access-Control-Allow-Origin *; } + location = /srv/status { + access_log off; + log_not_found off; + proxy_pass http://discourse; + break; + } + location ~ ^/assets/ { expires 1y; # asset pipeline enables this diff --git a/config/redis.yml b/config/redis.yml deleted file mode 100644 index 5e8b2b5c34..0000000000 --- a/config/redis.yml +++ /dev/null @@ -1,21 +0,0 @@ -defaults: &defaults - host: <%= GlobalSetting.redis_host %> - port: <%= GlobalSetting.redis_port %> - password: <%= GlobalSetting.redis_password %> - db: <%= GlobalSetting.redis_db %> - -development: - <<: *defaults - -profile: - <<: *defaults - -test: - <<: *defaults - db: 1 - -staging: - <<: *defaults - -production: - <<: *defaults diff --git a/config/routes.rb b/config/routes.rb index 86ceb31d2e..45fb97610a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -275,7 +275,8 @@ Discourse::Application.routes.draw do get "users/:username/notifications" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} get "users/:username/pending" => "users#show", constraints: {username: USERNAME_ROUTE_FORMAT} delete "users/:username" => "users#destroy", constraints: {username: USERNAME_ROUTE_FORMAT} - get "users/by-external/:external_id" => "users#show" + # 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 "user-badges/:username" => "user_badges#username" @@ -409,7 +410,10 @@ Discourse::Application.routes.draw do put "topics/bulk" put "topics/reset-new" => 'topics#reset_new' post "topics/timings" - get "topics/similar_to" + + get 'topics/similar_to' => 'similar_topics#index' + resources :similar_topics + get "topics/feature_stats" get "topics/created-by/:username" => "list#topics_by", as: "topics_by", constraints: {username: USERNAME_ROUTE_FORMAT} get "topics/private-messages/:username" => "list#private_messages", as: "topics_private_messages", constraints: {username: USERNAME_ROUTE_FORMAT} diff --git a/config/site_settings.yml b/config/site_settings.yml index 792b824ed7..ab50ecfd4f 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -416,7 +416,7 @@ posting: client: true default: false show_time_gap_days: - default: 4 + default: 7 client: true short_progress_text_threshold: client: true @@ -806,7 +806,7 @@ uncategorized: min_search_term_length: client: true default: 3 - max_similar_results: 7 + max_similar_results: 5 minimum_topics_similar: 50 new_topic_duration_minutes: 2880 @@ -870,6 +870,9 @@ uncategorized: sequential_replies_threshold: 2 dominating_topic_minimum_percent: 20 + # Reporting + daily_performance_report: false + global_notice: default: "" client: true @@ -881,13 +884,19 @@ uncategorized: lounge_category_id: default: -1 hidden: true + meta_category_id: default: -1 hidden: true + staff_category_id: default: -1 hidden: true + performance_report_topic_id: + default: -1 + hidden: true + notify_about_flags_after: 48 enable_cdn_js_debugging: false diff --git a/lib/auth/result.rb b/lib/auth/result.rb index 6bb016c007..461c8f7c9f 100644 --- a/lib/auth/result.rb +++ b/lib/auth/result.rb @@ -3,17 +3,27 @@ class Auth::Result :email_valid, :extra_data, :awaiting_activation, :awaiting_approval, :authenticated, :authenticator_name, :requires_invite, :not_allowed_from_ip_address, - :admin_not_allowed_from_ip_address + :admin_not_allowed_from_ip_address, :omit_username + + attr_accessor :failed, + :failed_reason + + def initialize + @failed = false + end + + def failed? + !!@failed + end def session_data - { - email: email, + { email: email, username: username, email_valid: email_valid, + omit_username: omit_username, name: name, authenticator_name: authenticator_name, - extra_data: extra_data - } + extra_data: extra_data } end def to_client_hash @@ -42,7 +52,8 @@ class Auth::Result username: UserNameSuggester.suggest(username || name || email), # this feels a tad wrong auth_provider: authenticator_name.capitalize, - email_valid: !!email_valid + email_valid: !!email_valid, + omit_username: !!omit_username } end end diff --git a/lib/autospec/reload_css.rb b/lib/autospec/reload_css.rb index 58e31811f6..e6bd00a6fa 100644 --- a/lib/autospec/reload_css.rb +++ b/lib/autospec/reload_css.rb @@ -27,11 +27,13 @@ class Autospec::ReloadCss if paths.any? { |p| p =~ /\.(css|s[ac]ss)/ } # todo connect to dev instead? ActiveRecord::Base.establish_connection - s = DiscourseStylesheets.new(:desktop) # TODO: what about mobile? - s.compile - s.ensure_digestless_file + [:desktop, :mobile].each do |style| + s = DiscourseStylesheets.new(style) + s.compile + s.ensure_digestless_file + paths << "public" + s.stylesheet_relpath_no_digest + end ActiveRecord::Base.clear_active_connections! - paths << "public" + s.stylesheet_relpath_no_digest end paths.map! do |p| hash = nil @@ -41,7 +43,7 @@ class Autospec::ReloadCss p = p.sub(/\.sass/, "") p = p.sub(/\.scss/, "") p = p.sub(/^app\/assets\/stylesheets/, "assets") - { name: p, hash: hash } + { name: p, hash: hash || SecureRandom.hex } end message_bus.publish "/file-change", paths end diff --git a/lib/discourse.rb b/lib/discourse.rb index 5c97377533..bb614b70f7 100644 --- a/lib/discourse.rb +++ b/lib/discourse.rb @@ -354,7 +354,9 @@ module Discourse end def self.sidekiq_redis_config - { url: $redis.url, namespace: 'sidekiq' } + conf = GlobalSetting.redis_config.dup + conf[:namespace] = 'sidekiq' + conf end def self.static_doc_topic_ids diff --git a/lib/discourse_redis.rb b/lib/discourse_redis.rb index 8cf03960f3..b4943fde9e 100644 --- a/lib/discourse_redis.rb +++ b/lib/discourse_redis.rb @@ -6,18 +6,11 @@ class DiscourseRedis def self.raw_connection(config = nil) config ||= self.config - redis_opts = {host: config['host'], port: config['port'], db: config['db']} - redis_opts[:password] = config['password'] if config['password'] - Redis.new(redis_opts) + Redis.new(config) end def self.config - @config ||= YAML.load(ERB.new(File.new("#{Rails.root}/config/redis.yml").read).result)[Rails.env] - end - - def self.url(config=nil) - config ||= self.config - "redis://#{(':' + config['password'] + '@') if config['password']}#{config['host']}:#{config['port']}/#{config['db']}" + GlobalSetting.redis_config end def initialize(config=nil) @@ -30,10 +23,6 @@ class DiscourseRedis @redis end - def url - self.class.url(@config) - end - def self.ignore_readonly yield rescue Redis::CommandError => ex diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb index 1857885f97..becdfce8f7 100644 --- a/lib/pretty_text.rb +++ b/lib/pretty_text.rb @@ -25,15 +25,8 @@ module PrettyText return "" unless user.present? # TODO: Add support for ES6 and call `avatar-template` directly - if !user.uploaded_avatar_id && SiteSetting.default_avatars.present? - split_avatars = SiteSetting.default_avatars.split("\n") - if split_avatars.present? - hash = username.each_char.reduce(0) do |result, char| - [((result << 5) - result) + char.ord].pack('L').unpack('l').first - end - - avatar_template = split_avatars[hash.abs % split_avatars.size] - end + if !user.uploaded_avatar_id + avatar_template = User.default_template(username) else avatar_template = user.avatar_template end diff --git a/lib/scheduler/manager.rb b/lib/scheduler/manager.rb index fda3c300e6..2f2b42d4a9 100644 --- a/lib/scheduler/manager.rb +++ b/lib/scheduler/manager.rb @@ -118,16 +118,18 @@ module Scheduler end def self.without_runner(redis=nil) - self.new(redis, true) + self.new(redis, skip_runner: true) end - def initialize(redis = nil, skip_runner = false) + def initialize(redis = nil, options=nil) @redis = $redis || redis @random_ratio = 0.1 - unless skip_runner + unless options && options[:skip_runner] @runner = Runner.new(self) self.class.current = self end + + @hostname = options && options[:hostname] @manager_id = SecureRandom.hex end @@ -139,6 +141,10 @@ module Scheduler @current = manager end + def hostname + @hostname ||= `hostname`.strip + end + def schedule_info(klass) ScheduleInfo.new(klass, self) end @@ -162,17 +168,22 @@ module Scheduler def reschedule_orphans! lock do - redis.zrange(Manager.queue_key, 0, -1).each do |key| - klass = get_klass(key) - next unless klass - info = schedule_info(klass) + reschedule_orphans_on! + reschedule_orphans_on!(hostname) + end + end - if ['QUEUED', 'RUNNING'].include?(info.prev_result) && - (info.current_owner.blank? || !redis.get(info.current_owner)) - info.prev_result = 'ORPHAN' - info.next_run = Time.now.to_i - info.write! - end + def reschedule_orphans_on!(hostname=nil) + redis.zrange(Manager.queue_key(hostname), 0, -1).each do |key| + klass = get_klass(key) + next unless klass + info = schedule_info(klass) + + if ['QUEUED', 'RUNNING'].include?(info.prev_result) && + (info.current_owner.blank? || !redis.get(info.current_owner)) + info.prev_result = 'ORPHAN' + info.next_run = Time.now.to_i + info.write! end end end @@ -185,24 +196,30 @@ module Scheduler def tick lock do - (key, due), _ = redis.zrange Manager.queue_key, 0, 0, withscores: true - return unless key - if due.to_i <= Time.now.to_i - klass = get_klass(key) - unless klass - # corrupt key, nuke it (renamed job or something) - redis.zrem Manager.queue_key, key - return - end - info = schedule_info(klass) - info.prev_run = Time.now.to_i - info.prev_result = "QUEUED" - info.prev_duration = -1 - info.next_run = nil - info.current_owner = identity_key - info.schedule! - @runner.enq(klass) + schedule_next_job + schedule_next_job(hostname) + end + end + + def schedule_next_job(hostname=nil) + (key, due), _ = redis.zrange Manager.queue_key(hostname), 0, 0, withscores: true + + return unless key + if due.to_i <= Time.now.to_i + klass = get_klass(key) + unless klass + # corrupt key, nuke it (renamed job or something) + redis.zrem Manager.queue_key(hostname), key + return end + info = schedule_info(klass) + info.prev_run = Time.now.to_i + info.prev_result = "QUEUED" + info.prev_duration = -1 + info.next_run = nil + info.current_owner = identity_key + info.schedule! + @runner.enq(klass) end end @@ -256,19 +273,27 @@ module Scheduler end def identity_key - @identity_key ||= "_scheduler_#{`hostname`}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}" + @identity_key ||= "_scheduler_#{hostname}:#{Process.pid}:#{self.class.seq}:#{SecureRandom.hex}" end def self.lock_key "_scheduler_lock_" end - def self.queue_key - "_scheduler_queue_" + def self.queue_key(hostname=nil) + if hostname + "_scheduler_queue_#{hostname}_" + else + "_scheduler_queue_" + end end - def self.schedule_key(klass) - "_scheduler_#{klass}" + def self.schedule_key(klass,hostname=nil) + if hostname + "_scheduler_#{klass}_#{hostname}" + else + "_scheduler_#{klass}" + end end end end diff --git a/lib/scheduler/schedule.rb b/lib/scheduler/schedule.rb index 822e06fa37..a00fe1330f 100644 --- a/lib/scheduler/schedule.rb +++ b/lib/scheduler/schedule.rb @@ -17,6 +17,15 @@ module Scheduler::Schedule @every end + # schedule job indepndently on each host (looking at hostname) + def per_host + @per_host = true + end + + def is_per_host + @per_host + end + def schedule_info manager = Scheduler::Manager.without_runner manager.schedule_info self diff --git a/lib/scheduler/schedule_info.rb b/lib/scheduler/schedule_info.rb index 9416ffa3bd..755bc621a9 100644 --- a/lib/scheduler/schedule_info.rb +++ b/lib/scheduler/schedule_info.rb @@ -86,6 +86,7 @@ module Scheduler end def write! + clear! redis.set key, { next_run: @next_run, @@ -95,7 +96,7 @@ module Scheduler current_owner: @current_owner }.to_json - redis.zadd Manager.queue_key, @next_run , @klass + redis.zadd queue_key, @next_run , @klass end def del! @@ -104,7 +105,19 @@ module Scheduler end def key - Manager.schedule_key(@klass) + if @klass.is_per_host + Manager.schedule_key(@klass, @manager.hostname) + else + Manager.schedule_key(@klass) + end + end + + def queue_key + if @klass.is_per_host + Manager.queue_key(@manager.hostname) + else + Manager.queue_key + end end def redis @@ -114,7 +127,7 @@ module Scheduler private def clear! redis.del key - redis.zrem Manager.queue_key, @klass + redis.zrem queue_key, @klass end end diff --git a/lib/search.rb b/lib/search.rb index 97779db687..1395cb7fd3 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -95,18 +95,18 @@ class Search end def initialize(term, opts=nil) - term = process_advanced_search!(term) - if term.present? - @term = Search.prepare_data(term.to_s) - @original_term = PG::Connection.escape_string(@term) - end - @opts = opts || {} @guardian = @opts[:guardian] || Guardian.new @search_context = @opts[:search_context] @include_blurbs = @opts[:include_blurbs] || false @limit = Search.per_facet + term = process_advanced_search!(term) + if term.present? + @term = Search.prepare_data(term.to_s) + @original_term = PG::Connection.escape_string(@term) + end + if @search_pms && @guardian.user @opts[:type_filter] = "private_messages" @search_context = @guardian.user @@ -125,7 +125,9 @@ class Search # Query a term def execute - return nil if @term.blank? || @term.length < (@opts[:min_search_term_length] || SiteSetting.min_search_term_length) + if @term.blank? || @term.length < (@opts[:min_search_term_length] || SiteSetting.min_search_term_length) + return nil unless @filters.present? + end # If the term is a number or url to a topic, just include that topic if @opts[:search_for_id] && @results.type_filter == 'topic' @@ -145,58 +147,128 @@ class Search @results end + def self.advanced_filter(trigger,&block) + (@advanced_filters ||= {})[trigger] = block + end + + def self.advanced_filters + @advanced_filters + end + + advanced_filter(/status:open/) do |posts| + posts.where('NOT topics.closed AND NOT topics.archived') + end + + advanced_filter(/status:closed/) do |posts| + posts.where('topics.closed') + end + + advanced_filter(/status:archived/) do |posts| + posts.where('topics.archived') + end + + advanced_filter(/status:noreplies/) do |posts| + posts.where("topics.posts_count = 1") + end + + advanced_filter(/status:single_user/) do |posts| + posts.where("topics.participant_count = 1") + end + + advanced_filter(/posts_count:(\d+)/) do |posts, match| + posts.where("topics.posts_count = ?", match.to_i) + end + + advanced_filter(/in:first/) do |posts| + posts.where("posts.post_number = 1") + end + + advanced_filter(/in:(likes|bookmarks)/) do |posts, match| + if @guardian.user + post_action_type = PostActionType.types[:like] if match == "likes" + post_action_type = PostActionType.types[:bookmark] if match == "bookmarks" + + posts.where("posts.id IN ( + SELECT pa.post_id FROM post_actions pa + WHERE pa.user_id = #{@guardian.user.id} AND + pa.post_action_type_id = #{post_action_type} AND + deleted_at IS NULL + )") + end + end + + advanced_filter(/in:posted/) do |posts| + posts.where("posts.user_id = #{@guardian.user.id}") if @guardian.user + end + + advanced_filter(/in:(watching|tracking)/) do |posts,match| + if @guardian.user + level = TopicUser.notification_levels[match.to_sym] + posts.where("posts.topic_id IN ( + SELECT tu.topic_id FROM topic_users tu + WHERE tu.user_id = #{@guardian.user.id} AND + tu.notification_level >= #{level} + )") + + end + end + + advanced_filter(/category:(.+)/) do |posts,match| + category_id = Category.find_by('name ilike ?', match).try(:id) + posts.where("topics.category_id = ?", category_id) + end + + advanced_filter(/user:(.+)/) do |posts,match| + user_id = User.find_by('username_lower = ?', match.downcase).try(:id) + posts.where("posts.user_id = #{user_id}") + end + + advanced_filter(/min_age:(\d+)/) do |posts,match| + n = match.to_i + posts.where("topics.created_at > ?", n.days.ago) + end + + advanced_filter(/max_age:(\d+)/) do |posts,match| + n = match.to_i + posts.where("topics.created_at < ?", n.days.ago) + end + private + def process_advanced_search!(term) term.to_s.split(/\s+/).map do |word| - if word == 'status:open' - @status = :open - nil - elsif word == 'status:closed' - @status = :closed - nil - elsif word == 'status:archived' - @status = :archived - nil - elsif word == 'status:noreplies' - @posts_count = 1 - nil - elsif word == 'status:singleuser' - @single_user = true - nil - elsif word == 'order:latest' + + found = false + + Search.advanced_filters.each do |matcher, block| + if word =~ matcher + (@filters ||= []) << [block, $1] + found = true + end + end + + if word == 'order:latest' @order = :latest nil + elsif word =~ /topic:(\d+)/ + topic_id = $1.to_i + if topic_id > 1 + topic = Topic.find_by(id: topic_id) + if @guardian.can_see?(topic) + @search_context = topic + end + end + nil elsif word == 'order:views' @order = :views nil - elsif word =~ /category:(.+)/ - @category_id = Category.find_by('name ilike ?', $1).try(:id) - nil - elsif word =~ /user:(.+)/ - @user_id = User.find_by('username_lower = ?', $1.downcase).try(:id) - nil - elsif word == 'in:likes' - @liked_only = true - nil - elsif word == 'in:posted' - @posted_only = true - nil - elsif word == 'in:watching' - @notification_level = TopicUser.notification_levels[:watching] - nil - elsif word == 'in:tracking' - @notification_level = TopicUser.notification_levels[:tracking] - nil elsif word == 'in:private' @search_pms = true nil - elsif word == 'in:bookmarks' - @bookmarked_only = true - nil else - word + found ? nil : word end end.compact.join(' ') end @@ -210,8 +282,8 @@ class Search else @limit = Search.per_facet + 1 unless @search_context - user_search - category_search + user_search if @term.present? + category_search if @term.present? end topic_search end @@ -306,60 +378,23 @@ class Search posts = posts.where("topics.archetype <> ?", Archetype.private_message) end - if is_topic_search - posts = posts.joins('JOIN users u ON u.id = posts.user_id') - posts = posts.where("posts.raw || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%") - else - posts = posts.where("post_search_data.search_data @@ #{ts_query}") - end - - if @status == :open - posts = posts.where('NOT topics.closed AND NOT topics.archived') - elsif @status == :archived - posts = posts.where('topics.archived') - elsif @status == :closed - posts = posts.where('topics.closed') - end - - if @single_user - posts = posts.where("topics.featured_user1_id IS NULL AND topics.last_post_user_id = topics.user_id") - end - - if @posts_count - posts = posts.where("topics.posts_count = #{@posts_count}") - end - - if @user_id - posts = posts.where("posts.user_id = #{@user_id}") - end - - if @guardian.user - if @liked_only || @bookmarked_only - - post_action_type = PostActionType.types[:like] if @liked_only - post_action_type = PostActionType.types[:bookmark] if @bookmarked_only - - posts = posts.where("posts.id IN ( - SELECT pa.post_id FROM post_actions pa - WHERE pa.user_id = #{@guardian.user.id} AND - pa.post_action_type_id = #{post_action_type} - )") + if @term.present? + if is_topic_search + posts = posts.joins('JOIN users u ON u.id = posts.user_id') + posts = posts.where("posts.raw || ' ' || u.username || ' ' || u.name ilike ?", "%#{@term}%") + else + posts = posts.where("post_search_data.search_data @@ #{ts_query}") end - - if @posted_only - posts = posts.where("posts.user_id = #{@guardian.user.id}") - end - - if @notification_level - posts = posts.where("posts.topic_id IN ( - SELECT tu.topic_id FROM topic_users tu - WHERE tu.user_id = #{@guardian.user.id} AND - tu.notification_level >= #{@notification_level} - )") - end - end + @filters.each do |block, match| + if block.arity == 1 + posts = instance_exec(posts, &block) || posts + else + posts = instance_exec(posts, match, &block) || posts + end + end if @filters + # If we have a search context, prioritize those posts first if @search_context.present? @@ -380,11 +415,7 @@ class Search end - if @category_id - posts = posts.where("topics.category_id = ?", @category_id) - end - - if @order == :latest + if @order == :latest || @term.blank? if opts[:aggregate_search] posts = posts.order("MAX(posts.created_at) DESC") else @@ -452,10 +483,6 @@ class Search # double wrapping so we get correct row numbers post_sql = "SELECT *, row_number() over() row_number FROM (#{post_sql}) xxx" - # p Topic.exec_sql(post_sql).to_a - # puts post_sql - # p Topic.exec_sql("SELECT topic_id FROM topic_allowed_users WHERE user_id = 2").to_a - posts = Post.includes(:topic => :category) .joins("JOIN (#{post_sql}) x ON x.id = posts.topic_id AND x.post_number = posts.post_number") .order('row_number') diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb index 742b1493b6..c3f661313d 100644 --- a/lib/search/grouped_search_results.rb +++ b/lib/search/grouped_search_results.rb @@ -3,7 +3,6 @@ require 'sanitize' class Search class GroupedSearchResults - include ActiveModel::Serialization class TextHelper @@ -26,11 +25,7 @@ class Search end def blurb(post) - cooked = SearchObserver::HtmlScrubber.scrub(post.cooked).squish - terms = @term.split(/\s+/) - blurb = TextHelper.excerpt(cooked, terms.first, radius: 100) - blurb = TextHelper.truncate(cooked, length: 200) if blurb.blank? - Sanitize.clean(blurb) + GroupedSearchResults.blurb_for(post.cooked, @term) end def add(object) @@ -43,6 +38,18 @@ class Search end end + + def self.blurb_for(cooked, term=nil) + cooked = SearchObserver::HtmlScrubber.scrub(cooked).squish + + blurb = nil + if term + terms = term.split(/\s+/) + blurb = TextHelper.excerpt(cooked, terms.first, radius: 100) + end + blurb = TextHelper.truncate(cooked, length: 200) if blurb.blank? + Sanitize.clean(blurb) + end end end diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 13c3f9bb4b..6bda1c0abc 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -27,6 +27,7 @@ class TopicQuery search slow_platform filter + q ).map(&:to_sym) # Maps `order` to a columns in `topics` @@ -71,7 +72,52 @@ class TopicQuery end def list_search - create_list(:latest, {}, latest_results) + + results = nil + + if @options[:q].present? + search = Search.execute(@options[:q], + type_filter: 'topic', + guardian: Guardian.new(@user)) + + topic_ids = search.posts.map(&:topic_id) + + if topic_ids.present? + sql = topic_ids.each_with_index.map do |id, idx| + "SELECT #{idx} pos, #{id} id" + end.join(" UNION ALL ") + + results = Topic + .unscoped + .joins("JOIN (#{sql}) X on X.id = topics.id") + .order("X.pos") + + posts_map = {} + search.posts.each do |p| + (posts_map[p.topic_id] ||= []) << p + end + end + end + + results ||= Topic.where("1=0") + + if @user + results = results.joins("LEFT OUTER JOIN topic_users AS tu ON (topics.id = tu.topic_id AND tu.user_id = #{@user.id.to_i})") + .references('tu') + end + + list = create_list(:latest, {unordered: true}, results) + + + list.topics.each do |topic| + if posts = posts_map[topic.id] + if post = posts.shift + topic.search_data = {excerpt: search.blurb(post), post_number: post.post_number} + end + end + end + + list end def list_read @@ -167,7 +213,7 @@ class TopicQuery end unpinned_topics = topics.where("NOT ( #{pinned_clause} )") - pinned_topics = topics.where(pinned_clause) + pinned_topics = topics.dup.offset(nil).where(pinned_clause) per_page = options[:per_page] || per_page_setting limit = per_page unless options[:limit] == false @@ -176,7 +222,7 @@ class TopicQuery if page == 0 (pinned_topics + unpinned_topics)[0...limit] if limit else - offset = (page * per_page - pinned_topics.count) - 1 + offset = (page * per_page) - pinned_topics.count - 1 offset = 0 unless offset > 0 unpinned_topics.offset(offset).to_a end diff --git a/lib/version.rb b/lib/version.rb index 07e3e7d582..a4881bc7f9 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 4 TINY = 0 - PRE = 'beta3' + PRE = 'beta4' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 index da48d4abbf..42087e2933 100644 --- a/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 +++ b/plugins/poll/assets/javascripts/components/poll-results-number.js.es6 @@ -1,4 +1,4 @@ -import round from "discourse/plugins/poll/lib/round"; +import round from "discourse/lib/round"; export default Em.Component.extend({ tagName: "span", diff --git a/plugins/poll/config/locales/client.ar.yml b/plugins/poll/config/locales/client.ar.yml index 37fab858e2..6a4702e0a6 100644 --- a/plugins/poll/config/locales/client.ar.yml +++ b/plugins/poll/config/locales/client.ar.yml @@ -17,7 +17,14 @@ ar: one: "مجموع التصويت" other: "مجموع الأصوات" average_rating: "متوسط التصنيف: %{average} " + multiple: + help: + at_least_min_options: "من المفترض أن تختار على الأقل %{count} خيارات ." + up_to_max_options: "يجب عليك إختيار على الأكثر %{count} خيارات ." + x_options: "يجب عليك إختيار %{count} خيارات ." + between_min_and_max_options: "يجب عليك إختيار بين %{min} و %{max} خيارات ." cast-votes: + title: "إدراج تصويتك ." label: "صوت اﻵن!" show-results: title: "عرض نتائج التصويت" @@ -25,3 +32,13 @@ ar: hide-results: title: "العودة إلى تصويتاتك" label: "إخفاء النتائج" + open: + title: "فتح التصويت " + label: "فتح" + confirm: "هل بالفعل تاريد فتح هذا التصويت ؟" + close: + title: "إغلاق التصويت" + label: "إغلاق" + confirm: "هل أنت متأكد من إنك تريد إغلاق هذا التصويت ؟" + error_while_toggling_status: "هناك خطاء عند محاولة تبديل حالة التصويت ." + error_while_casting_votes: "هناك خطاء عن محاولة إدراج صوتك ." diff --git a/plugins/poll/config/locales/client.sv.yml b/plugins/poll/config/locales/client.sv.yml index 6f2835adb7..1dbe605d42 100644 --- a/plugins/poll/config/locales/client.sv.yml +++ b/plugins/poll/config/locales/client.sv.yml @@ -23,7 +23,7 @@ sv: x_options: "Du måste välja %{count} alternativ." between_min_and_max_options: "Du kan välja mellan %{min} och %{max} alternativ." cast-votes: - title: "Lägg din röster" + title: "Lägg dina röster" label: "Rösta nu!" show-results: title: "Visa omröstningsresultatet" diff --git a/plugins/poll/config/locales/server.ar.yml b/plugins/poll/config/locales/server.ar.yml index 4bb9a6b925..7fcef197a3 100644 --- a/plugins/poll/config/locales/server.ar.yml +++ b/plugins/poll/config/locales/server.ar.yml @@ -6,5 +6,28 @@ # https://www.transifex.com/projects/p/discourse-org/ ar: + site_settings: + poll_enabled: "المستخدمين المسموح لهم إنشاء استطلاع رأي" + poll_maximum_options: "أقصى عدد من الخيارات المسموحة في استطلاع الرأي." poll: - cannot_change_polls_after_5_minutes: "لا يمكنك إضافة، حذف أو إعادة تسمية التصويتات بعد الـ5 دقائق اﻷولى." + multiple_polls_without_name: "هناك عدة استطلاعات رأي بدون اسم. استخدم خاصية 'name' لتحديد استطلاعاتك الفريدة." + multiple_polls_with_same_name: "هناك عدة استطلاعات رأي متشابهة بالاسم : %{name}. استخدم خاصية 'name' لتحدي استطلاعك الفريد." + default_poll_must_have_at_least_2_options: "استطلاع الرأي يجب أن يكون على الأقل 2 من الخيارات." + named_poll_must_have_at_least_2_options: "استطلاع الرأي المسمى %{name} يجب أن يكون على الأقل 2 من الخيارات." + default_poll_must_have_less_options: "استطلاع الرأي يجب أن يكون أقل من %{max} الخيارات." + named_poll_must_have_less_options: "استطلاع الرأي المسمى %{name} يجب أقل من %{max} الخيارات." + default_poll_must_have_different_options: "استطلاع الرأي يجب أن يكون مختلف الخيارات." + named_poll_must_have_different_options: "استطلاع الرأي المسمى %{name} يجب أن يكون مختلف الخيارات." + default_poll_with_multiple_choices_has_invalid_parameters: "معلمات استطلاع الرأي ذات الخيار المتعدد غير صالحة." + named_poll_with_multiple_choices_has_invalid_parameters: "معلمات استطلاع الرأي المسمى %{name} ذات الخيار المتعدد غير صالحة." + requires_at_least_1_valid_option: "يجب أن تختار أختيار 1 صحيح على الأقل." + cannot_change_polls_after_5_minutes: "لا يمكنك إضافة أو حذف أو إعادة تسمية استطلاعات الرأي بعد الـ5 دقائق اﻷولى." + op_cannot_edit_options_after_5_minutes: "لا تستطيع إضافة أو حذف خيارات استطلاع الرأي بعد أول 5 دقائق. أرجو أن تتصل بالمسؤول إذا احتجت لتحرير خيارات الرأي." + staff_cannot_add_or_remove_options_after_5_minutes: "لا تستطيع إضافة أو حذف خيارات استطلاع الرأي بعد أول 5 دقائق. يجب عليك إغلاق هذا الموضوع وإنشاء جديد بدلا عنه." + no_polls_associated_with_this_post: "لا استطلاعات رأي مرتبطة مع هذا الاستطلاع." + no_poll_with_this_name: "استطلاع الرأي المسمى %{name} غير مرتبط مع هذا الاستطلاع." + post_is_deleted: "لا يمكنك عمل حذف مشاركة." + topic_must_be_open_to_vote: "الموضوع يجب أن يكون مفتوح للتصويت." + poll_must_be_open_to_vote: "يجب أن تكون الاستطلاعات مفتوحة للتصويت." + topic_must_be_open_to_toggle_status: "الموضوع يجب أن يكون مفتوح لتبديل الحالة." + only_staff_or_op_can_toggle_status: "فقط الأعضاء العاملين أو المعلنين الأصليين يمكنهم تبديل حالة الاستطلاع." diff --git a/plugins/poll/config/locales/server.sv.yml b/plugins/poll/config/locales/server.sv.yml index 982550ad14..d13c1eee1d 100644 --- a/plugins/poll/config/locales/server.sv.yml +++ b/plugins/poll/config/locales/server.sv.yml @@ -10,8 +10,24 @@ sv: poll_enabled: "Tillåt användare att skapa omröstningar?" poll_maximum_options: "Maximalt antal alternativ tillåtna i en omröstning." poll: + multiple_polls_without_name: "Det finns flera omröstningar utan ett namn. Använd attributet 'namn' för att unikt identifiera dina omröstningar." + multiple_polls_with_same_name: "Det finns flera omröstningar med samma namn: %{name}. Använd attributet 'namn' för att unikt identifiera din omröstningar." default_poll_must_have_at_least_2_options: "Omröstningen måste ha minst 2 alternativ." named_poll_must_have_at_least_2_options: "Omröstningen med namnet %{name} måste ha minst 2 alternativ." default_poll_must_have_less_options: "Omröstningen måste ha mindre än %{max} alternativ." + named_poll_must_have_less_options: "Omröstningen med namnet %{name} måste ha mindre än %{max} alternativ." default_poll_must_have_different_options: "Omröstningen måste ha olika alternativ." + named_poll_must_have_different_options: "Omröstning med namnet %{name} måste ha olika alternativ." + default_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med flera val har ogiltiga parametrar." + named_poll_with_multiple_choices_has_invalid_parameters: "Omröstning med namnet %{name} med flera val har ogiltiga parametrar." requires_at_least_1_valid_option: "Du måste välja minst 1 giltigt alternativ." + cannot_change_polls_after_5_minutes: "Du kan inte lägga till, ta bort eller byta namn på omröstningar efter de första 5 minutrarna." + op_cannot_edit_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter det första 5 minutrarna. Vänligen kontakta en moderator om du behöver redigera ett omröstningsalternativ." + staff_cannot_add_or_remove_options_after_5_minutes: "Du kan inte lägga till eller ta bort omröstningsalternativ efter de första 5 minutrarna. Du får stänga detta ämne och skapa ett nytt i sådana fall." + no_polls_associated_with_this_post: "Inga omröstningar är knutet till detta inlägg." + no_poll_with_this_name: "Ingen omröstning med namnet %{name} är knuten till detta inlägg." + post_is_deleted: "Kan inte göra något med ett raderat inlägg." + topic_must_be_open_to_vote: "Detta ämne måste vara öppet för att kunna rösta." + poll_must_be_open_to_vote: "Omröstning måste vara öppen för att kunna rösta." + topic_must_be_open_to_toggle_status: "Ämnet måste vara öppet för att kunna växla status." + only_staff_or_op_can_toggle_status: "Endast personal eller ursprungsskribenten kan växla status på en omröstning." diff --git a/public/403.ar.html b/public/403.ar.html index 1e2006dd1a..12d30120a4 100644 --- a/public/403.ar.html +++ b/public/403.ar.html @@ -1,6 +1,6 @@ -لا يمكنك عمل ذلك (403) +لا يمكنك فعل ذلك (403)