diff --git a/.image_optim.yml b/.image_optim.yml index ba5d735b27..4a9ad0555c 100644 --- a/.image_optim.yml +++ b/.image_optim.yml @@ -1,11 +1,11 @@ skip_missing_workers: true -allow_lossy: true +allow_lossy: false # PNG advpng: false -optipng: false +optipng: + level: 2 pngcrush: false pngout: false -pngquant: - quality: !ruby/range 75..90 +pngquant: false # JPG jpegrecompress: false diff --git a/.travis.yml b/.travis.yml index 9c2e282d89..352361f0f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ env: - DISCOURSE_HOSTNAME=www.example.com - RUBY_GC_MALLOC_LIMIT=50000000 matrix: + - "RAILS_MASTER=0" - "RAILS42=1" - "RAILS_MASTER=1" - - "RAILS_MASTER=0" addons: postgresql: 9.3 diff --git a/Gemfile.lock b/Gemfile.lock index 57b8795210..593d89ab1f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -164,10 +164,10 @@ GEM mock_redis (0.14.0) moneta (0.8.0) msgpack (0.5.11) - multi_json (1.11.0) + multi_json (1.11.2) multi_xml (0.5.5) multipart-post (2.0.0) - mustache (0.99.8) + mustache (1.0.2) netrc (0.10.3) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) @@ -206,11 +206,11 @@ GEM omniauth-twitter (1.0.1) multi_json (~> 1.3) omniauth-oauth (~> 1.0) - onebox (1.5.21) - moneta (~> 0.7) - multi_json (~> 1.7) - mustache (~> 0.99) - nokogiri (~> 1.6.1) + onebox (1.5.22) + moneta (~> 0.8) + multi_json (~> 1.11) + mustache + nokogiri (~> 1.6.6) openid-redis-store (0.0.2) redis ruby-openid diff --git a/app/assets/fonts/zocial-regular-webfont.eot b/app/assets/fonts/zocial-regular-webfont.eot deleted file mode 100644 index 5db5d21666..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.eot and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.svg b/app/assets/fonts/zocial-regular-webfont.svg deleted file mode 100644 index 130d83ca10..0000000000 --- a/app/assets/fonts/zocial-regular-webfont.svg +++ /dev/null @@ -1,333 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/assets/fonts/zocial-regular-webfont.ttf b/app/assets/fonts/zocial-regular-webfont.ttf deleted file mode 100644 index a043566360..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.ttf and /dev/null differ diff --git a/app/assets/fonts/zocial-regular-webfont.woff b/app/assets/fonts/zocial-regular-webfont.woff deleted file mode 100644 index 5a91cf3056..0000000000 Binary files a/app/assets/fonts/zocial-regular-webfont.woff and /dev/null differ diff --git a/app/assets/javascripts/admin/components/admin-form-row.js.es6 b/app/assets/javascripts/admin/components/admin-form-row.js.es6 new file mode 100644 index 0000000000..e7cef2edb0 --- /dev/null +++ b/app/assets/javascripts/admin/components/admin-form-row.js.es6 @@ -0,0 +1,3 @@ +export default Ember.Component.extend({ + classNames: ['row'] +}); diff --git a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 b/app/assets/javascripts/admin/components/admin-report-counts.js.es6 index 25bf94db21..46ab32f609 100644 --- a/app/assets/javascripts/admin/components/admin-report-counts.js.es6 +++ b/app/assets/javascripts/admin/components/admin-report-counts.js.es6 @@ -1,3 +1,5 @@ export default Ember.Component.extend({ - tagName: 'tr' + tagName: 'tr', + reverseColors: Ember.computed.match('report.type', /^(time_to_first_response|topics_with_no_response)$/), + classNameBindings: ['reverseColors'] }); diff --git a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 index bc96a0fc74..bccec30932 100644 --- a/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 +++ b/app/assets/javascripts/admin/components/admin-user-field-item.js.es6 @@ -6,6 +6,17 @@ export default Ember.Component.extend(bufferedProperty('userField'), { editing: Ember.computed.empty('userField.id'), classNameBindings: [':user-field'], + cantMoveUp: Discourse.computed.propertyEqual('userField', 'firstField'), + cantMoveDown: Discourse.computed.propertyEqual('userField', 'lastField'), + + userFieldsDescription: function() { + return I18n.t('admin.user_fields.description'); + }.property(), + + bufferedFieldType: function() { + return UserField.fieldTypeById(this.get('buffered.field_type')); + }.property('buffered.field_type'), + _focusOnEdit: function() { if (this.get('editing')) { Ember.run.scheduleOnce('afterRender', this, '_focusName'); @@ -36,26 +47,40 @@ export default Ember.Component.extend(bufferedProperty('userField'), { }.property('userField.editable', 'userField.required', 'userField.show_on_profile'), actions: { - save: function() { + save() { const self = this; - const attrs = this.get('buffered').getProperties('name', 'description', 'field_type', 'editable', 'required', 'show_on_profile'); + const buffered = this.get('buffered'); + const attrs = buffered.getProperties('name', + 'description', + 'field_type', + 'editable', + 'required', + 'show_on_profile', + 'options'); - this.get('userField').save(attrs).then(function(res) { - self.set('userField.id', res.user_field.id); + this.get('userField').save(attrs).then(function() { self.set('editing', false); self.commitBuffer(); }).catch(popupAjaxError); }, - edit: function() { + moveUp() { + this.sendAction('moveUpAction', this.get('userField')); + }, + + moveDown() { + this.sendAction('moveDownAction', this.get('userField')); + }, + + edit() { this.set('editing', true); }, - destroy: function() { + destroy() { this.sendAction('destroyAction', this.get('userField')); }, - cancel: function() { + cancel() { const id = this.get('userField.id'); if (Ember.isEmpty(id)) { this.sendAction('destroyAction', this.get('userField')); diff --git a/app/assets/javascripts/admin/components/value-list.js.es6 b/app/assets/javascripts/admin/components/value-list.js.es6 index c995097a9d..3aa66ff187 100644 --- a/app/assets/javascripts/admin/components/value-list.js.es6 +++ b/app/assets/javascripts/admin/components/value-list.js.es6 @@ -1,14 +1,81 @@ export default Ember.Component.extend({ classNameBindings: [':value-list'], + _enableSorting: function() { + const self = this; + const placeholder = document.createElement("div"); + placeholder.className = "placeholder"; + + let dragging = null; + let over = null; + let nodePlacement; + + this.$().on('dragstart.discourse', '.values .value', function(e) { + dragging = e.currentTarget; + e.dataTransfer.effectAllowed = 'move'; + e.dataTransfer.setData("text/html", e.currentTarget); + }); + + this.$().on('dragend.discourse', '.values .value', function() { + Ember.run(function() { + dragging.parentNode.removeChild(placeholder); + dragging.style.display = 'block'; + + // Update data + const from = Number(dragging.dataset.index); + let to = Number(over.dataset.index); + if (from < to) to--; + if (nodePlacement === "after") to++; + + const collection = self.get('collection'); + const fromObj = collection.objectAt(from); + collection.replace(from, 1); + collection.replace(to, 0, [fromObj]); + self._saveValues(); + }); + return false; + }); + + this.$().on('dragover.discourse', '.values', function(e) { + e.preventDefault(); + dragging.style.display = 'none'; + if (e.target.className === "placeholder") { return; } + over = e.target; + + const relY = e.originalEvent.clientY - over.offsetTop; + const height = over.offsetHeight / 2; + const parent = e.target.parentNode; + + if (relY > height) { + nodePlacement = "after"; + parent.insertBefore(placeholder, e.target.nextElementSibling); + } else if(relY < height) { + nodePlacement = "before"; + parent.insertBefore(placeholder, e.target); + } + }); + }.on('didInsertElement'), + + _removeSorting: function() { + this.$().off('dragover.discourse').off('dragend.discourse').off('dragstart.discourse'); + }.on('willDestroyElement'), + _setupCollection: function() { const values = this.get('values'); - this.set('collection', (values && values.length) ? values.split("\n") : []); + if (this.get('inputType') === "array") { + this.set('collection', values || []); + } else { + this.set('collection', (values && values.length) ? values.split("\n") : []); + } }.on('init').observes('values'), - _collectionChanged: function() { - this.set('values', this.get('collection').join("\n")); - }.observes('collection.@each'), + _saveValues: function() { + if (this.get('inputType') === "array") { + this.set('values', this.get('collection')); + } else { + this.set('values', this.get('collection').join("\n")); + } + }, inputInvalid: Ember.computed.empty('newValue'), @@ -24,11 +91,14 @@ export default Ember.Component.extend({ this.get('collection').addObject(this.get('newValue')); this.set('newValue', ''); + + this._saveValues(); }, removeValue(value) { const collection = this.get('collection'); collection.removeObject(value); + this._saveValues(); } } }); 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 be6834333d..08e4e3215b 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 @@ -10,6 +10,14 @@ import showModal from 'discourse/lib/show-modal'; **/ export default Ember.ArrayController.extend({ + undoPreviewUrl: function() { + return Discourse.getURL("/?preview-style="); + }.property(), + + defaultStyleUrl: function() { + return Discourse.getURL("/?preview-style=default"); + }.property(), + actions: { /** diff --git a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 index 0eb041c55b..70963a147e 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-fields.js.es6 @@ -1,39 +1,60 @@ -import UserField from 'admin/models/user-field'; +import { popupAjaxError } from 'discourse/lib/ajax-error'; -export default Ember.ArrayController.extend({ +const MAX_FIELDS = 20; + +export default Ember.Controller.extend({ fieldTypes: null, - createDisabled: Em.computed.gte('model.length', 20), + createDisabled: Em.computed.gte('model.length', MAX_FIELDS), - userFieldsDescription: function() { - return I18n.t('admin.user_fields.description'); - }.property(), - - userFieldsName: function() { - return I18n.t('admin.user_fields.name'); - }.property(), - - _performDestroy: function(f, model) { - return f.destroy().then(function() { - model.removeObject(f); + arrangedContent: function() { + return Ember.ArrayProxy.extend(Ember.SortableMixin).create({ + sortProperties: ['position'], + content: this.get('model') }); - }, + }.property('model'), actions: { - createField: function() { - this.pushObject(UserField.create({ field_type: 'text' })); + createField() { + const f = this.store.createRecord('user-field', { field_type: 'text', position: MAX_FIELDS }); + this.get('model').pushObject(f); }, - destroy: function(f) { - var model = this.get('model'), - self = this; + moveUp(f) { + const idx = this.get('arrangedContent').indexOf(f); + if (idx) { + const prev = this.get('arrangedContent').objectAt(idx-1); + const prevPos = prev.get('position'); + + prev.update({ position: f.get('position') }); + f.update({ position: prevPos }); + } + }, + + moveDown(f) { + const idx = this.get('arrangedContent').indexOf(f); + if (idx > -1) { + const next = this.get('arrangedContent').objectAt(idx+1); + const nextPos = next.get('position'); + + next.update({ position: f.get('position') }); + f.update({ position: nextPos }); + } + }, + + destroy(f) { + const model = this.get('model'); // Only confirm if we already been saved if (f.get('id')) { bootbox.confirm(I18n.t("admin.user_fields.delete_confirm"), function(result) { - if (result) { self._performDestroy(f, model); } + if (result) { + f.destroyRecord().then(function() { + model.removeObject(f); + }).catch(popupAjaxError); + } }); } else { - self._performDestroy(f, model); + model.removeObject(f); } } } diff --git a/app/assets/javascripts/admin/models/site_customization.js b/app/assets/javascripts/admin/models/site_customization.js index f7b6346a95..19fcbad266 100644 --- a/app/assets/javascripts/admin/models/site_customization.js +++ b/app/assets/javascripts/admin/models/site_customization.js @@ -44,7 +44,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({ this.set('originals', originals); }.on('init'), - previewUrl: function() { return "/?preview-style=" + this.get('key'); }.property('key'), + previewUrl: function() { return Discourse.getURL("/?preview-style=" + this.get('key')); }.property('key'), disableSave: function() { return !this.get('changed') || this.get('saving'); }.property('changed'), save: function() { diff --git a/app/assets/javascripts/admin/models/user-field.js.es6 b/app/assets/javascripts/admin/models/user-field.js.es6 index e5c3348efd..c6a1a1f6be 100644 --- a/app/assets/javascripts/admin/models/user-field.js.es6 +++ b/app/assets/javascripts/admin/models/user-field.js.es6 @@ -1,54 +1,25 @@ -var UserField = Ember.Object.extend({ - destroy: function() { - var self = this; - return new Ember.RSVP.Promise(function(resolve) { - var id = self.get('id'); - if (id) { - return Discourse.ajax("/admin/customize/user_fields/" + id, { type: 'DELETE' }).then(function() { - resolve(); - }); - } - resolve(); - }); - }, +import RestModel from 'discourse/models/rest'; - save: function(attrs) { - var id = this.get('id'); - if (!id) { - return Discourse.ajax("/admin/customize/user_fields", { - type: "POST", - data: { user_field: attrs } - }); - } else { - return Discourse.ajax("/admin/customize/user_fields/" + id, { - type: "PUT", - data: { user_field: attrs } - }); - } - } +const UserField = RestModel.extend(); + +const UserFieldType = Ember.Object.extend({ + name: Discourse.computed.i18n('id', 'admin.user_fields.field_types.%@') }); UserField.reopenClass({ - findAll: function() { - return Discourse.ajax("/admin/customize/user_fields").then(function(result) { - return result.user_fields.map(function(uf) { - return UserField.create(uf); - }); - }); - }, - - fieldTypes: function() { + fieldTypes() { if (!this._fieldTypes) { this._fieldTypes = [ - Ember.Object.create({id: 'text', name: I18n.t('admin.user_fields.field_types.text') }), - Ember.Object.create({id: 'confirm', name: I18n.t('admin.user_fields.field_types.confirm') }) + UserFieldType.create({ id: 'text' }), + UserFieldType.create({ id: 'confirm' }), + UserFieldType.create({ id: 'dropdown', hasOptions: true }) ]; } return this._fieldTypes; }, - fieldTypeById: function(id) { + fieldTypeById(id) { return this.fieldTypes().findBy('id', id); } }); diff --git a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 index a540f343cc..5770165ff7 100644 --- a/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 +++ b/app/assets/javascripts/admin/routes/admin-user-fields.js.es6 @@ -2,13 +2,10 @@ import UserField from 'admin/models/user-field'; export default Discourse.Route.extend({ model: function() { - return UserField.findAll(); + return this.store.findAll('user-field'); }, setupController: function(controller, model) { - controller.setProperties({ - model: model, - fieldTypes: UserField.fieldTypes() - }); + controller.setProperties({ model, fieldTypes: UserField.fieldTypes() }); } }); diff --git a/app/assets/javascripts/admin/templates/backups_index.hbs b/app/assets/javascripts/admin/templates/backups_index.hbs index ca8830a0e8..c6a6598be6 100644 --- a/app/assets/javascripts/admin/templates/backups_index.hbs +++ b/app/assets/javascripts/admin/templates/backups_index.hbs @@ -21,10 +21,10 @@
{{fa-icon "download"}}{{i18n 'admin.backups.operations.download.label'}} {{#if isOperationRunning}} - {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" disabled="true" title="admin.backups.operations.is_running"}} + {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" disabled="true" title="admin.backups.operations.is_running"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{else}} - {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger no-text" title="admin.backups.operations.destroy.title"}} + {{d-button icon="trash-o" action="destroyBackup" actionParam=backup class="btn-danger" title="admin.backups.operations.destroy.title"}} {{d-button icon="play" action="startRestore" actionParam=backup disabled=restoreDisabled title=restoreTitle label="admin.backups.operations.restore.label"}} {{/if}}
diff --git a/app/assets/javascripts/admin/templates/components/admin-form-row.hbs b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs new file mode 100644 index 0000000000..aee95b6701 --- /dev/null +++ b/app/assets/javascripts/admin/templates/components/admin-form-row.hbs @@ -0,0 +1,14 @@ +
+ {{#if label}} + + {{else}} +   + {{/if}} +
+
+ {{#if wrapLabel}} + + {{else}} + {{yield}} + {{/if}} +
diff --git a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs index 8e1bd8c176..36fa8c3b81 100644 --- a/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs +++ b/app/assets/javascripts/admin/templates/components/admin-user-field-item.hbs @@ -1,45 +1,51 @@ {{#if editing}} -
-
- {{input value=buffered.name class="user-field-name" placeholder=userFieldsName}} -
-
- {{input value=buffered.description class="user-field-desc" placeholder=userFieldsDescription}} -
-
- {{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}} -
-
- {{d-button action="save" class="btn-primary" icon="check" label="admin.user_fields.save"}} - {{d-button action="cancel" class="btn-danger" icon="times" label="admin.user_fields.cancel"}} -
-
-
-
- -
-
- -
-
- -
-
+ {{#admin-form-row label="admin.user_fields.type"}} + {{combo-box content=fieldTypes valueAttribute="id" value=buffered.field_type}} + {{/admin-form-row}} + + {{#admin-form-row label="admin.user_fields.name"}} + {{input value=buffered.name class="user-field-name"}} + {{/admin-form-row}} + + {{#admin-form-row label="admin.user_fields.description"}} + {{input value=buffered.description class="user-field-desc"}} + {{/admin-form-row}} + + {{#if bufferedFieldType.hasOptions}} + {{#admin-form-row label="admin.user_fields.options"}} + {{value-list values=buffered.options inputType="array"}} + {{/admin-form-row}} + {{/if}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.editable}} {{i18n 'admin.user_fields.editable.title'}} + {{/admin-form-row}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.required}} {{i18n 'admin.user_fields.required.title'}} + {{/admin-form-row}} + + {{#admin-form-row wrapLabel="true"}} + {{input type="checkbox" checked=buffered.show_on_profile}} {{i18n 'admin.user_fields.show_on_profile.title'}} + {{/admin-form-row}} + + {{#admin-form-row}} + {{d-button action="save" class="btn-primary" icon="check" label="admin.user_fields.save"}} + {{d-button action="cancel" class="btn-danger" icon="times" label="admin.user_fields.cancel"}} + {{/admin-form-row}} {{else}}
-
{{userField.name}}
-
{{{userField.description}}}
+
+ {{userField.name}} +
+ {{{userField.description}}} +
{{fieldName}}
-
{{d-button action="edit" class="btn-default" icon="pencil" label="admin.user_fields.edit"}} {{d-button action="destroy" class="btn-danger" icon="trash-o" label="admin.user_fields.delete"}} + {{d-button action="moveUp" icon="arrow-up" disabled=cantMoveUp}} + {{d-button action="moveDown" icon="arrow-down" disabled=cantMoveDown}}
{{flags}}
diff --git a/app/assets/javascripts/admin/templates/components/site-setting.hbs b/app/assets/javascripts/admin/templates/components/site-setting.hbs index eb117c0f4d..15821600ee 100644 --- a/app/assets/javascripts/admin/templates/components/site-setting.hbs +++ b/app/assets/javascripts/admin/templates/components/site-setting.hbs @@ -6,8 +6,8 @@ {{#if dirty}}
- {{d-button class="ok no-text" action="save" icon="check"}} - {{d-button class="cancel no-text" action="cancel" icon="times"}} + {{d-button class="ok" action="save" icon="check"}} + {{d-button class="cancel" action="cancel" icon="times"}}
{{else if setting.overridden}} {{d-button action="resetDefault" icon="undo" label="admin.site_settings.reset"}} diff --git a/app/assets/javascripts/admin/templates/components/value-list.hbs b/app/assets/javascripts/admin/templates/components/value-list.hbs index 74904f92e8..6f6e1aa194 100644 --- a/app/assets/javascripts/admin/templates/components/value-list.hbs +++ b/app/assets/javascripts/admin/templates/components/value-list.hbs @@ -1,11 +1,11 @@ {{#if collection}}
- {{#each collection as |value|}} -
+ {{#each collection as |value index|}} +
{{d-button action="removeValue" actionParam=value icon="times" - class="btn-small no-text"}} + class="btn-small"}} {{value}}
{{/each}} @@ -14,5 +14,5 @@
{{text-field value=newValue placeholderKey=addKey}} - {{d-button action="addValue" icon="plus" class="btn-primary btn-small no-text" disabled=inputInvalid}} + {{d-button action="addValue" icon="plus" class="btn-primary btn-small" disabled=inputInvalid}}
diff --git a/app/assets/javascripts/admin/templates/customize_css_html.hbs b/app/assets/javascripts/admin/templates/customize_css_html.hbs index e2cc7951a0..f4dce62b09 100644 --- a/app/assets/javascripts/admin/templates/customize_css_html.hbs +++ b/app/assets/javascripts/admin/templates/customize_css_html.hbs @@ -65,9 +65,9 @@ {{#unless selectedItem.changed}} {{i18n 'admin.customize.preview'}} | - {{i18n 'admin.customize.undo_preview'}} + {{i18n 'admin.customize.undo_preview'}} | - {{i18n 'admin.customize.rescue_preview'}}
+ {{i18n 'admin.customize.rescue_preview'}}
{{/unless}}
diff --git a/app/assets/javascripts/admin/templates/permalinks.hbs b/app/assets/javascripts/admin/templates/permalinks.hbs index 47717627b6..7d6e1ff8fc 100644 --- a/app/assets/javascripts/admin/templates/permalinks.hbs +++ b/app/assets/javascripts/admin/templates/permalinks.hbs @@ -10,9 +10,9 @@
{{i18n 'admin.permalink.url'}}
-
{{i18n 'admin.permalink.topic_id'}}
-
{{i18n 'admin.permalink.post_id'}}
-
{{i18n 'admin.permalink.category_id'}}
+
{{i18n 'admin.permalink.topic_title'}}
+
{{i18n 'admin.permalink.post_title'}}
+
{{i18n 'admin.permalink.category_title'}}
{{i18n 'admin.permalink.external_url'}}
diff --git a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs index 4fbf2db55e..2a143e07ed 100644 --- a/app/assets/javascripts/admin/templates/permalinks_list_item.hbs +++ b/app/assets/javascripts/admin/templates/permalinks_list_item.hbs @@ -1,7 +1,23 @@
{{url}}
-
{{topic_id}}
-
{{post_id}}
-
{{category_id}}
-
{{external_url}}
+
+ {{#if topic_id}} + {{topic_title}} + {{/if}} +
+
+ {{#if post_id}} + #{{post_number}} {{post_topic_title}} + {{/if}} +
+
+ {{#if category_id}} + {{category_name}} + {{/if}} +
+
+ {{#if external_url}} + {{external_url}} + {{/if}} +
diff --git a/app/assets/javascripts/admin/templates/user-fields.hbs b/app/assets/javascripts/admin/templates/user-fields.hbs index 7f6bab02f5..3a89a0e06e 100644 --- a/app/assets/javascripts/admin/templates/user-fields.hbs +++ b/app/assets/javascripts/admin/templates/user-fields.hbs @@ -4,13 +4,21 @@

{{i18n 'admin.user_fields.help'}}

{{#if model}} - {{#each model as |uf|}} - {{admin-user-field-item userField=uf fieldTypes=fieldTypes destroyAction="destroy"}} + {{#each arrangedContent as |uf|}} + {{admin-user-field-item userField=uf + fieldTypes=fieldTypes + firstField=arrangedContent.firstObject + lastField=arrangedContent.lastObject + destroyAction="destroy" + moveUpAction="moveUp" + moveDownAction="moveDown"}} {{/each}} {{/if}} - + {{d-button disabled=createDisabled + class="btn-primary" + action="createField" + label="admin.user_fields.create" + icon="plus"}} +
diff --git a/app/assets/javascripts/admin/templates/user_index.hbs b/app/assets/javascripts/admin/templates/user_index.hbs index 9d2c510b31..302db5f4d0 100644 --- a/app/assets/javascripts/admin/templates/user_index.hbs +++ b/app/assets/javascripts/admin/templates/user_index.hbs @@ -350,8 +350,8 @@ {{combo-box content=model.customGroups value=model.primary_group_id nameProperty="name" none="admin.groups.no_primary"}} {{/if}} {{#if primaryGroupDirty}} - {{d-button icon="check" class="ok no-text" action="savePrimaryGroup"}} - {{d-button icon="times" class="cancel no-text" action="resetPrimaryGroup"}} + {{d-button icon="check" class="ok" action="savePrimaryGroup"}} + {{d-button icon="times" class="cancel" action="resetPrimaryGroup"}} {{/if}}
diff --git a/app/assets/javascripts/discourse/adapters/rest.js.es6 b/app/assets/javascripts/discourse/adapters/rest.js.es6 index ec25f2d134..5a64730aba 100644 --- a/app/assets/javascripts/discourse/adapters/rest.js.es6 +++ b/app/assets/javascripts/discourse/adapters/rest.js.es6 @@ -17,10 +17,14 @@ function rethrow(error) { } export default Ember.Object.extend({ - pathFor(store, type, findArgs) { - let path = "/" + Ember.String.underscore(store.pluralize(type)); - if (ADMIN_MODELS.indexOf(type) !== -1) { path = "/admin" + path; } + basePath(store, type) { + if (ADMIN_MODELS.indexOf(type) !== -1) { return "/admin/"; } + return "/"; + }, + + pathFor(store, type, findArgs) { + let path = this.basePath(store, type, findArgs) + Ember.String.underscore(store.pluralize(type)); if (findArgs) { if (typeof findArgs === "object") { @@ -51,9 +55,10 @@ export default Ember.Object.extend({ update(store, type, id, attrs) { const data = {}; - data[Ember.String.underscore(type)] = attrs; + const typeField = Ember.String.underscore(type); + data[typeField] = attrs; return ajax(this.pathFor(store, type, id), { method: 'PUT', data }).then(function(json) { - return new Result(json[type], json); + return new Result(json[typeField], json); }); }, diff --git a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 b/app/assets/javascripts/discourse/adapters/topic-list.js.es6 index 46a3a56683..bb7375597d 100644 --- a/app/assets/javascripts/discourse/adapters/topic-list.js.es6 +++ b/app/assets/javascripts/discourse/adapters/topic-list.js.es6 @@ -1,6 +1,6 @@ import RestAdapter from 'discourse/adapters/rest'; -function finderFor(filter, params) { +export function finderFor(filter, params) { return function() { let url = Discourse.getURL("/") + filter + ".json"; @@ -9,7 +9,7 @@ function finderFor(filter, params) { encoded = []; keys.forEach(function(p) { - const value = params[p]; + const value = encodeURI(params[p]); if (typeof value !== 'undefined') { encoded.push(p + "=" + value); } diff --git a/app/assets/javascripts/discourse/adapters/user-field.js.es6 b/app/assets/javascripts/discourse/adapters/user-field.js.es6 new file mode 100644 index 0000000000..f57240a116 --- /dev/null +++ b/app/assets/javascripts/discourse/adapters/user-field.js.es6 @@ -0,0 +1,7 @@ +import RestAdapter from 'discourse/adapters/rest'; + +export default RestAdapter.extend({ + basePath() { + return "/admin/customize/"; + } +}); diff --git a/app/assets/javascripts/discourse/components/combo-box.js.es6 b/app/assets/javascripts/discourse/components/combo-box.js.es6 index 5fdd914e82..d74410e89b 100644 --- a/app/assets/javascripts/discourse/components/combo-box.js.es6 +++ b/app/assets/javascripts/discourse/components/combo-box.js.es6 @@ -3,8 +3,9 @@ export default Ember.Component.extend({ attributeBindings: ['tabindex'], classNames: ['combobox'], valueAttribute: 'id', + nameProperty: 'name', - buildData(o) { + _buildData(o) { let result = ""; if (this.resultAttributes) { this.resultAttributes.forEach(function(a) { @@ -14,19 +15,15 @@ export default Ember.Component.extend({ return result; }, - realNameProperty: function() { - return this.get('nameProperty') || 'name'; - }.property('nameProperty'), - render(buffer) { - const nameProperty = this.get('realNameProperty'), - none = this.get('none'); + const nameProperty = this.get('nameProperty'); + const none = this.get('none'); // Add none option if required if (typeof none === "string") { buffer.push('"); } else if (typeof none === "object") { - buffer.push(""); + buffer.push(""); } let selected = this.get('value'); @@ -35,18 +32,20 @@ export default Ember.Component.extend({ if (this.get('content')) { const self = this; this.get('content').forEach(function(o) { - let val = o[self.get('valueAttribute')]; + let val = o[self.get('valueAttribute')] || o; if (!Em.isNone(val)) { val = val.toString(); } const selectedText = (val === selected) ? "selected" : ""; - buffer.push(""); + const name = Ember.get(o, nameProperty) || o; + buffer.push(""); }); } }, valueChanged: function() { const $combo = this.$(), - val = this.get('value'); + val = this.get('value'); + if (val !== undefined && val !== null) { $combo.select2('val', val.toString()); } else { @@ -54,13 +53,11 @@ export default Ember.Component.extend({ } }.observes('value'), - contentChanged: function() { + _rerenderOnChange: function() { this.rerender(); }.observes('content.@each'), _initializeCombo: function() { - const $elem = this.$(), - self = this; // Workaround for https://github.com/emberjs/ember.js/issues/9813 // Can be removed when fixed. Without it, the wrong option is selected @@ -70,12 +67,14 @@ export default Ember.Component.extend({ // observer for item names changing (optional) if (this.get('nameChanges')) { - this.addObserver('content.@each.' + this.get('realNameProperty'), this.rerender); + this.addObserver('content.@each.' + this.get('nameProperty'), this.rerender); } + const $elem = this.$(); $elem.select2({formatResult: this.comboTemplate, minimumResultsForSearch: 5, width: 'resolve'}); const castInteger = this.get('castInteger'); + const self = this; $elem.on("change", function (e) { let val = $(e.target).val(); if (val && val.length && castInteger) { diff --git a/app/assets/javascripts/discourse/components/d-button.js.es6 b/app/assets/javascripts/discourse/components/d-button.js.es6 index 7673e60ac4..45fe5effce 100644 --- a/app/assets/javascripts/discourse/components/d-button.js.es6 +++ b/app/assets/javascripts/discourse/components/d-button.js.es6 @@ -2,9 +2,11 @@ import { iconHTML } from 'discourse/helpers/fa-icon'; export default Ember.Component.extend({ tagName: 'button', - classNameBindings: [':btn'], + classNameBindings: [':btn', 'noText'], attributeBindings: ['disabled', 'translatedTitle:title'], + noText: Ember.computed.empty('translatedLabel'), + translatedTitle: function() { const title = this.get('title'); return title ? I18n.t(title) : this.get('translatedLabel'); diff --git a/app/assets/javascripts/discourse/components/highlight-text.js.es6 b/app/assets/javascripts/discourse/components/highlight-text.js.es6 new file mode 100644 index 0000000000..ca783a23b7 --- /dev/null +++ b/app/assets/javascripts/discourse/components/highlight-text.js.es6 @@ -0,0 +1,13 @@ +export default Ember.Component.extend({ + tagName: 'span', + + _highlightOnInsert: function() { + const term = this.get('highlight'); + const self = this; + + if(!_.isEmpty(term)) { + self.$().highlight(term.split(/\s+/), {className: 'search-highlight'}); + } + }.observes('highlight').on('didInsertElement') + +}); diff --git a/app/assets/javascripts/admin/components/nav-item.js.es6 b/app/assets/javascripts/discourse/components/nav-item.js.es6 similarity index 100% rename from app/assets/javascripts/admin/components/nav-item.js.es6 rename to app/assets/javascripts/discourse/components/nav-item.js.es6 diff --git a/app/assets/javascripts/discourse/components/post-menu.js.es6 b/app/assets/javascripts/discourse/components/post-menu.js.es6 index 89417192ed..33800387f2 100644 --- a/app/assets/javascripts/discourse/components/post-menu.js.es6 +++ b/app/assets/javascripts/discourse/components/post-menu.js.es6 @@ -85,8 +85,10 @@ const PostMenuComponent = Ember.Component.extend(StringBuffer, { // Delegate click actions click(e) { - const $target = $(e.target), - action = $target.data('action') || $target.parent().data('action'); + const $target = $(e.target); + const action = $target.data('action') || $target.parent().data('action'); + + if ($target.prop('disabled') || $target.parent().prop('disabled')) { return; } if (!action) return; const handler = this["click" + action.classify()]; diff --git a/app/assets/javascripts/discourse/components/small-action.js.es6 b/app/assets/javascripts/discourse/components/small-action.js.es6 new file mode 100644 index 0000000000..50e42f19ab --- /dev/null +++ b/app/assets/javascripts/discourse/components/small-action.js.es6 @@ -0,0 +1,52 @@ +const icons = { + 'closed.enabled': 'lock', + 'closed.disabled': 'unlock-alt', + 'autoclosed.enabled': 'lock', + 'autoclosed.disabled': 'unlock-alt', + 'archived.enabled': 'folder', + 'archived.disabled': 'folder-open', + 'pinned.enabled': 'thumb-tack', + 'pinned.disabled': 'thumb-tack unpinned', + 'pinned_globally.enabled': 'thumb-tack', + 'pinned_globally.disabled': 'thumb-tack unpinned', + 'visible.enabled': 'eye', + 'visible.disabled': 'eye-slash' +}; + +export default Ember.Component.extend({ + layoutName: 'components/small-action', // needed because `time-gap` inherits from this + classNames: ['small-action'], + + description: function() { + const actionCode = this.get('actionCode'); + if (actionCode) { + const dt = new Date(this.get('post.created_at')); + const when = Discourse.Formatter.relativeAge(dt, {format: 'medium-with-ago'}); + var result = I18n.t(`action_codes.${actionCode}`, {when}); + var cooked = this.get('post.cooked'); + + result = "

" + result + "

"; + + if (!Em.isEmpty(cooked)) { + result += "
" + cooked + "
"; + } + + return result; + } + }.property('actionCode', 'post.created_at', 'post.cooked'), + + icon: function() { + return icons[this.get('actionCode')] || 'exclamation'; + }.property('actionCode'), + + actions: { + edit: function() { + this.sendAction('editPost', this.get('post')); + }, + + delete: function() { + this.sendAction('deletePost', this.get('post')); + } + } + +}); diff --git a/app/assets/javascripts/discourse/components/time-gap.js.es6 b/app/assets/javascripts/discourse/components/time-gap.js.es6 index 7b7b9a6c49..3cd887ec43 100644 --- a/app/assets/javascripts/discourse/components/time-gap.js.es6 +++ b/app/assets/javascripts/discourse/components/time-gap.js.es6 @@ -1,22 +1,19 @@ -export default Ember.Component.extend({ - classNameBindings: [':time-gap'], +import SmallActionComponent from 'discourse/components/small-action'; - render(buffer) { - const gapDays = this.get('gapDays'); +export default SmallActionComponent.extend({ + classNames: ['time-gap'], + icon: 'clock-o', - buffer.push("
"); - - let timeGapWords; + description: function() { + const gapDays = this.get('daysAgo'); if (gapDays < 30) { - timeGapWords = I18n.t('dates.later.x_days', {count: gapDays}); + return I18n.t('dates.later.x_days', {count: gapDays}); } else if (gapDays < 365) { const gapMonths = Math.floor(gapDays / 30); - timeGapWords = I18n.t('dates.later.x_months', {count: gapMonths}); + return I18n.t('dates.later.x_months', {count: gapMonths}); } else { const gapYears = Math.floor(gapDays / 365); - timeGapWords = I18n.t('dates.later.x_years', {count: gapYears}); + return I18n.t('dates.later.x_years', {count: gapYears}); } - - buffer.push("
" + timeGapWords + "
"); - } + }.property(), }); diff --git a/app/assets/javascripts/discourse/components/user-field.js.es6 b/app/assets/javascripts/discourse/components/user-field.js.es6 index a1c6f56b4d..625067622e 100644 --- a/app/assets/javascripts/discourse/components/user-field.js.es6 +++ b/app/assets/javascripts/discourse/components/user-field.js.es6 @@ -1,6 +1,10 @@ export default Ember.Component.extend({ classNameBindings: [':user-field', 'field.field_type'], - layoutName: function() { - return "components/user-fields/" + this.get('field.field_type'); - }.property('field.field_type') + layoutName: Discourse.computed.fmt('field.field_type', 'components/user-fields/%@'), + + noneLabel: function() { + if (!this.get('field.required')) { + return 'user_fields.none'; + } + }.property('field.required') }); diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index 75695d8055..8ad012dd28 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -168,15 +168,15 @@ export default Ember.ObjectController.extend(Presence, { }.property('model.loading'), save(force) { - const composer = this.get('model'), - self = this; + const composer = this.get('model'); + const self = this; // Clear the warning state if we're not showing the checkbox anymore if (!this.get('showWarning')) { this.set('model.isWarning', false); } - if(composer.get('cantSubmitPost')) { + if (composer.get('cantSubmitPost')) { const now = Date.now(); this.setProperties({ 'view.showTitleTip': now, diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index b5812eb6a9..a668d4cc88 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -394,11 +394,8 @@ export default DiscourseController.extend(ModalFunctionality, { let userFields = this.site.get('user_fields'); if (userFields) { - userFields = userFields.map(function(f) { - return Ember.Object.create({ - value: null, - field: f - }); + userFields = _.sortBy(userFields, 'position').map(function(f) { + return Ember.Object.create({ value: null, field: f }); }); } this.set('userFields', userFields); diff --git a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 index a69daece73..71a316ef02 100644 --- a/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 +++ b/app/assets/javascripts/discourse/controllers/discovery/topics.js.es6 @@ -16,37 +16,15 @@ const 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(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(); - } - + if (sortBy === this.get('order')) { + this.toggleProperty('ascending'); } else { - if (sortBy === this.get('order')) { - this.toggleProperty('ascending'); - } else { - this.setProperties({ order: sortBy, ascending: false }); - } - this.get('model').refreshSort(sortBy, this.get('ascending')); + this.setProperties({ order: sortBy, ascending: false }); } + this.get('model').refreshSort(sortBy, this.get('ascending')); }, // Show newly inserted topics @@ -128,6 +106,7 @@ const controllerOpts = { new: Discourse.computed.endWith('model.filter', 'new'), top: Em.computed.notEmpty('period'), yearly: Em.computed.equal('period', 'yearly'), + quarterly: Em.computed.equal('period', 'quarterly'), monthly: Em.computed.equal('period', 'monthly'), weekly: Em.computed.equal('period', 'weekly'), daily: Em.computed.equal('period', 'daily'), diff --git a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 index a00c79a5b3..990d2b83ae 100644 --- a/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/feature-topic.js.es6 @@ -10,15 +10,23 @@ export default ObjectController.extend(ModalFunctionality, { pinnedGloballyCount: 0, bannerCount: 0, + reset: function() { + this.set("model.pinnedInCategoryUntil", null); + this.set("model.pinnedGloballyUntil", null); + }, + categoryLink: function() { return categoryLinkHTML(this.get("model.category"), { allowUncategorized: true }); }.property("model.category"), unPinMessage: function() { - return this.get("model.pinned_globally") ? - I18n.t("topic.feature_topic.unpin_globally") : - I18n.t("topic.feature_topic.unpin", { categoryLink: this.get("categoryLink") }); - }.property("categoryLink", "model.pinned_globally"), + let name = "topic.feature_topic.unpin"; + if (this.get("model.pinned_globally")) name += "_globally"; + if (moment(this.get("model.pinned_until")) > moment()) name += "_until"; + const until = moment(this.get("model.pinned_until")).format("LL"); + + return I18n.t(name, { categoryLink: this.get("categoryLink"), until: until }); + }.property("categoryLink", "model.{pinned_globally,pinned_until}"), pinMessage: function() { return I18n.t("topic.feature_topic.pin", { categoryLink: this.get("categoryLink") }); @@ -28,6 +36,30 @@ export default ObjectController.extend(ModalFunctionality, { return I18n.t("topic.feature_topic.already_pinned", { categoryLink: this.get("categoryLink"), count: this.get("pinnedInCategoryCount") }); }.property("categoryLink", "pinnedInCategoryCount"), + pinDisabled: function() { + return !this._isDateValid(this.get("parsedPinnedInCategoryUntil")); + }.property("parsedPinnedInCategoryUntil"), + + pinGloballyDisabled: function() { + return !this._isDateValid(this.get("parsedPinnedGloballyUntil")); + }.property("pinnedGloballyUntil"), + + parsedPinnedInCategoryUntil: function() { + return this._parseDate(this.get("model.pinnedInCategoryUntil")); + }.property("model.pinnedInCategoryUntil"), + + parsedPinnedGloballyUntil: function() { + return this._parseDate(this.get("model.pinnedGloballyUntil")); + }.property("model.pinnedGloballyUntil"), + + _parseDate(date) { + return moment(date, ["YYYY-MM-DD", "YYYY-MM-DD HH:mm"]); + }, + + _isDateValid(parsedDate) { + return parsedDate.isValid() && parsedDate > moment(); + }, + onShow() { this.set("loading", true); diff --git a/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 new file mode 100644 index 0000000000..a763a94c3d --- /dev/null +++ b/app/assets/javascripts/discourse/controllers/full-page-search.js.es6 @@ -0,0 +1,33 @@ +import DiscourseController from 'discourse/controllers/controller'; +import { translateResults } from 'discourse/lib/search-for-term'; + +export default DiscourseController.extend({ + loading: Em.computed.not('model'), + queryParams: ['q'], + q: null, + modelChanged: function(){ + if (this.get('searchTerm') !== this.get('q')) { + this.set('searchTerm', this.get('q')); + } + }.observes('model'), + + qChanged: function(){ + var model = this.get('model'); + if (model && this.get('model.q') !== this.get('q')){ + this.set('searchTerm', this.get('q')); + this.send('search'); + } + }.observes('q'), + actions: { + search: function(){ + var self = this; + this.set('q', this.get('searchTerm')); + this.set('model', null); + + Discourse.ajax('/search', {data: {q: this.get('searchTerm')}}).then(function(results) { + self.set('model', translateResults(results) || {}); + self.set('model.q', self.get('q')); + }); + } + } +}); diff --git a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 index 79fb9561bf..7832d4ab51 100644 --- a/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 +++ b/app/assets/javascripts/discourse/controllers/navigation/default.js.es6 @@ -9,18 +9,6 @@ export default DiscourseController.extend({ navItems: function() { return Discourse.NavItem.buildList(null, {filterMode: this.get('filterMode')}); - }.property('filterMode'), + }.property('filterMode') - isSearch: Em.computed.equal('filterMode', '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('q', this.get('searchTerm')); - model.refreshSort(); - } - } }); diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 066b000a26..aace6f8e0f 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -99,19 +99,6 @@ export default ObjectController.extend(SelectedPostsCount, BufferedContent, { this.set('selectedReplies', []); }.on('init'), - _togglePinnedStates(property) { - const value = this.get('model.pinned_at') ? false : true, - topic = this.get('content'); - - // optimistic update - topic.setProperties({ - pinned_at: value, - pinned_globally: value - }); - - return topic.saveStatus(property, value); - }, - actions: { deleteTopic() { this.deleteTopic(); @@ -371,27 +358,31 @@ export default ObjectController.extend(SelectedPostsCount, BufferedContent, { togglePinned() { const value = this.get('model.pinned_at') ? false : true, - topic = this.get('content'); + topic = this.get('content'), + until = this.get('model.pinnedInCategoryUntil'); // optimistic update topic.setProperties({ pinned_at: value ? moment() : null, - pinned_globally: false + pinned_globally: false, + pinned_until: value ? until : null }); - return topic.saveStatus("pinned", value); + return topic.saveStatus("pinned", value, until); }, pinGlobally() { - const topic = this.get('content'); + const topic = this.get('content'), + until = this.get('model.pinnedGloballyUntil'); // optimistic update topic.setProperties({ pinned_at: moment(), - pinned_globally: true + pinned_globally: true, + pinned_until: until }); - return topic.saveStatus("pinned_globally", true); + return topic.saveStatus("pinned_globally", true, until); }, toggleArchived() { diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js index e5b9048401..62febca1a7 100644 --- a/app/assets/javascripts/discourse/dialects/dialect.js +++ b/app/assets/javascripts/discourse/dialects/dialect.js @@ -475,7 +475,7 @@ Discourse.Dialect = { **/ replaceBlock: function(args) { - this.registerBlock(args.start.toString(), function(block, next) { + var fn = function(block, next) { var linebreaks = dialect.options.traditional_markdown_linebreaks || Discourse.SiteSettings.traditional_markdown_linebreaks; @@ -565,7 +565,13 @@ Discourse.Dialect = { var emitterResult = args.emitter.call(this, contentBlocks, match, dialect.options); if (emitterResult) { result.push(emitterResult); } return result; - }); + }; + + if (args.priority) { + fn.priority = args.priority; + } + + this.registerBlock(args.start.toString(), fn); }, /** diff --git a/app/assets/javascripts/discourse/dialects/table_dialect.js b/app/assets/javascripts/discourse/dialects/table_dialect.js new file mode 100644 index 0000000000..ad1bb375df --- /dev/null +++ b/app/assets/javascripts/discourse/dialects/table_dialect.js @@ -0,0 +1,52 @@ +var flattenBlocks = function(blocks) { + var result = ""; + blocks.forEach(function(b) { + result += b; + if (b.trailing) { result += b.trailing; } + }); + + // bypass newline insertion + return result.replace(/[\n\r]/g, " "); +}; + +var emitter = function(contents) { + // TODO event should be fired when sanitizer loads + if (window.html4 && window.html4.ELEMENTS.td !== 1) { + window.html4.ELEMENTS.table = 0; + window.html4.ELEMENTS.tbody = 1; + window.html4.ELEMENTS.td = 1; + window.html4.ELEMENTS.thead = 1; + window.html4.ELEMENTS.th = 1; + window.html4.ELEMENTS.tr = 1; + } + return ['table', {"class": "md-table"}, flattenBlocks.apply(this, [contents])]; +}; + +var tableBlock = { + start: /(]*>)([\S\s]*)/igm, + stop: /<\/table>/igm, + rawContents: true, + emitter: emitter, + priority: 1 +}; + +var init = function(){ + if (Discourse.SiteSettings.allow_html_tables) { + Discourse.Markdown.whiteListTag("table"); + Discourse.Markdown.whiteListTag("table", "class", "md-table"); + Discourse.Markdown.whiteListTag("tbody"); + Discourse.Markdown.whiteListTag("thead"); + Discourse.Markdown.whiteListTag("tr"); + Discourse.Markdown.whiteListTag("th"); + Discourse.Markdown.whiteListTag("td"); + Discourse.Dialect.replaceBlock(tableBlock); + + } +}; + +if (Discourse.SiteSettings) { + init(); +} else { + Discourse.initializer({initialize: init, name: 'enable-html-tables'}); +} + diff --git a/app/assets/javascripts/discourse/helpers/period-title.js.es6 b/app/assets/javascripts/discourse/helpers/period-title.js.es6 index 82c1e6ba58..d8267547a7 100644 --- a/app/assets/javascripts/discourse/helpers/period-title.js.es6 +++ b/app/assets/javascripts/discourse/helpers/period-title.js.es6 @@ -1,6 +1,7 @@ const TITLE_SUBS = { all: 'all_time', yearly: 'this_year', + quarterly: 'this_quarter', monthly: 'this_month', daily: 'today', }; @@ -13,6 +14,9 @@ export default Ember.Handlebars.makeBoundHelper(function (period, options) { case 'yearly': dateString = moment().subtract(1, 'year').format(I18n.t('dates.long_with_year_no_time')) + " - " + moment().format(I18n.t('dates.long_with_year_no_time')); break; + case 'quarterly': + dateString = moment().subtract(3, 'month').format(I18n.t('dates.long_no_year_no_time')) + " - " + moment().format(I18n.t('dates.long_no_year_no_time')); + break; case 'weekly': dateString = moment().subtract(1, 'week').format(I18n.t('dates.long_no_year_no_time')) + " - " + moment().format(I18n.t('dates.long_no_year_no_time')); break; diff --git a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 b/app/assets/javascripts/discourse/helpers/topic-link.js.es6 index 105ec123a9..9c2a73870e 100644 --- a/app/assets/javascripts/discourse/helpers/topic-link.js.es6 +++ b/app/assets/javascripts/discourse/helpers/topic-link.js.es6 @@ -3,5 +3,7 @@ import registerUnbound from 'discourse/helpers/register-unbound'; registerUnbound('topic-link', function(topic) { var title = topic.get('fancyTitle'); var url = topic.linked_post_number ? topic.urlForPostNumber(topic.linked_post_number) : topic.get('lastUnreadUrl'); - return new Handlebars.SafeString("" + title + ""); + + var extraClass = topic.get('last_read_post_number') === topic.get('highest_post_number') ? " visited" : ""; + return new Handlebars.SafeString("" + title + ""); }); diff --git a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 index 2164be0256..fa8514e6d5 100644 --- a/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 +++ b/app/assets/javascripts/discourse/initializers/url-redirects.js.es6 @@ -6,5 +6,6 @@ export default { Discourse.URL.rewrite(/^\/category\//, "/c/"); Discourse.URL.rewrite(/^\/group\//, "/groups/"); Discourse.URL.rewrite(/\/private-messages\/$/, "/messages/"); + Discourse.URL.rewrite(/^\/users\/([^\/]+)\/?$/, "/users/$1/activity"); } }; diff --git a/app/assets/javascripts/discourse/lib/copy-text.js.es6 b/app/assets/javascripts/discourse/lib/copy-text.js.es6 new file mode 100644 index 0000000000..8730362339 --- /dev/null +++ b/app/assets/javascripts/discourse/lib/copy-text.js.es6 @@ -0,0 +1,34 @@ +/** + * Copy text to the clipboard. Must be called from within a user gesture (Chrome). + */ +export default function(text, element) { + let supported = false; + try { + // Chrome: This only returns true within a user gesture. + // Chrome: queryCommandEnabled() only returns true if a selection is + // present, so we use queryCommandSupported() instead for the fail-fast. + if (document.queryCommandSupported('copy')) { + supported = true; + } + } catch (e) { + // Ignore + } + if (!supported) { + return; + } + + let newRange = document.createRange(); + newRange.selectNode(element); + const selection = window.getSelection(); + selection.removeAllRanges(); + selection.addRange(newRange); + + try { + if (document.execCommand("copy")) { + return true; + } + } catch (e) { + // Ignore + } + return false; +} diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 index b9c7a5656c..00287b21a5 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 +++ b/app/assets/javascripts/discourse/lib/emoji/emoji-toolbar.js.es6 @@ -1,27 +1,48 @@ +// note that these categories are copied from Slack +// be careful, there are ~20 differences in synonyms, e.g. :boom: vs. :collision: +// a few Emoji are actually missing from the Slack categories as well (?), and were added var groups = [ { - name: "emoticons", - icons: ["smile","smiley","grinning","blush","relaxed","wink","heart_eyes","kissing_heart","kissing_closed_eyes","kissing","kissing_smiling_eyes","stuck_out_tongue_winking_eye","stuck_out_tongue_closed_eyes","stuck_out_tongue","flushed","grin","pensive","relieved","unamused","disappointed","persevere","cry","joy","sob","sleepy","disappointed_relieved","cold_sweat","sweat_smile","sweat","weary","tired_face","fearful","scream","angry","rage","triumph","confounded","laughing","yum","mask","sunglasses","sleeping","dizzy_face","astonished","worried","frowning","anguished","smiling_imp","imp","open_mouth","grimacing","neutral_face","confused","hushed","no_mouth","innocent","smirk","expressionless","man_with_gua_pi_mao","man_with_turban","cop","construction_worker","guardsman","baby","boy","girl","man","woman","older_man","older_woman","person_with_blond_hair","angel","princess","smiley_cat","smile_cat","heart_eyes_cat","kissing_cat","smirk_cat","scream_cat","crying_cat_face","joy_cat","pouting_cat","japanese_ogre","japanese_goblin","see_no_evil","hear_no_evil","speak_no_evil","skull","alien","poop","fire","sparkles","star2","dizzy","boom","anger","sweat_drops","droplet","zzz","dash","ear","eyes","nose","tongue","lips","thumbsup","thumbsdown","ok_hand","punch","fist","v","wave","raised_hand","open_hands","point_up_2","point_down","point_right","point_left","raised_hands","pray","point_up","clap","muscle","walking","runner","dancer","couple","family","two_men_holding_hands","two_women_holding_hands","couplekiss","couple_with_heart","dancers","ok_woman","no_good","information_desk_person","raising_hand","massage","haircut","nail_care","bride_with_veil","person_with_pouting_face","person_frowning","bow","tophat","crown","womans_hat","athletic_shoe","mans_shoe","sandal","high_heel","boot","shirt","necktie","womans_clothes","dress","running_shirt_with_sash","jeans","kimono","bikini","briefcase","handbag","pouch","purse","eyeglasses","ribbon","closed_umbrella","lipstick","yellow_heart","blue_heart","purple_heart","green_heart","heart","broken_heart","heartpulse","heartbeat","two_hearts","sparkling_heart","revolving_hearts","cupid","love_letter","kiss","ring","gem","bust_in_silhouette","busts_in_silhouette","speech_balloon","footprints","thought_balloon"] + name: "people", + fullname: "People", + tabicon: "grinning", + icons: ["grinning", "grin", "joy", "smiley", "smile", "sweat_smile", "laughing", "innocent", "smiling_imp", "imp", "wink", "blush", "relaxed", "yum", "relieved", "heart_eyes", "sunglasses", "smirk", "neutral_face", "expressionless", "unamused", "sweat", "pensive", "confused", "confounded", "kissing", "kissing_heart", "kissing_smiling_eyes", "kissing_closed_eyes", "stuck_out_tongue", "stuck_out_tongue_winking_eye", "stuck_out_tongue_closed_eyes", "disappointed", "worried", "angry", "rage", "cry", "persevere", "triumph", "disappointed_relieved", "frowning", "anguished", "fearful", "weary", "sleepy", "tired_face", "grimacing", "sob", "open_mouth", "hushed", "cold_sweat", "scream", "astonished", "flushed", "sleeping", "dizzy_face", "no_mouth", "mask", "smile_cat", "joy_cat", "smiley_cat", "heart_eyes_cat", "smirk_cat", "kissing_cat", "pouting_cat", "crying_cat_face", "scream_cat", "footprints", "bust_in_silhouette", "busts_in_silhouette", "baby", "boy", "girl", "man", "woman", "family", "couple", "two_men_holding_hands", "two_women_holding_hands", "dancers", "bride_with_veil", "person_with_blond_hair", "man_with_gua_pi_mao", "man_with_turban", "older_man", "older_woman", "cop", "construction_worker", "princess", "guardsman", "angel", "santa", "ghost", "japanese_ogre", "japanese_goblin", "hankey", "skull", "alien", "space_invader", "bow", "information_desk_person", "no_good", "ok_woman", "raising_hand", "person_with_pouting_face", "person_frowning", "massage", "haircut", "couple_with_heart", "couplekiss", "raised_hands", "clap", "hand", "ear", "eyes", "nose", "lips", "kiss", "tongue", "nail_care", "wave", "+1", "-1", "point_up", "point_up_2", "point_down", "point_left", "point_right", "ok_hand", "v", "facepunch", "fist", "raised_hand", "muscle", "open_hands", "pray"] }, { name: "nature", - icons: ["dog","wolf","cat","mouse","hamster","rabbit","frog","tiger","koala","bear","pig","pig_nose","cow","boar","monkey_face","monkey","horse","sheep","elephant","panda_face","penguin","bird","baby_chick","hatched_chick","hatching_chick","chicken","snake","turtle","bug","bee","ant","beetle","snail","octopus","shell","tropical_fish","fish","dolphin","whale","whale2","cow2","ram","rat","water_buffalo","tiger2","rabbit2","dragon","racehorse","goat","rooster","dog2","pig2","mouse2","ox","dragon_face","blowfish","crocodile","camel","dromedary_camel","leopard","cat2","poodle","feet","bouquet","cherry_blossom","tulip","four_leaf_clover","rose","sunflower","hibiscus","maple_leaf","leaves","fallen_leaf","herb","ear_of_rice","mushroom","cactus","palm_tree","evergreen_tree","deciduous_tree","chestnut","seedling","blossom","globe_with_meridians","sun_with_face","full_moon_with_face","new_moon_with_face","new_moon","waxing_crescent_moon","first_quarter_moon","waxing_gibbous_moon","full_moon","waning_gibbous_moon","last_quarter_moon","waning_crescent_moon","last_quarter_moon_with_face","first_quarter_moon_with_face","crescent_moon","earth_africa","earth_americas","earth_asia","volcano","milky_way","stars","star","sunny","partly_sunny","cloud","zap","umbrella","snowflake","snowman","cyclone","foggy","rainbow","ocean"] + fullname: "Nature", + tabicon: "leaves", + icons: ["seedling", "evergreen_tree", "deciduous_tree", "palm_tree", "cactus", "tulip", "cherry_blossom", "rose", "hibiscus", "sunflower", "blossom", "bouquet", "ear_of_rice", "herb", "four_leaf_clover", "maple_leaf", "fallen_leaf", "leaves", "mushroom", "chestnut", "rat", "mouse2", "mouse", "hamster", "ox", "water_buffalo", "cow2", "cow", "tiger2", "leopard", "tiger", "rabbit2", "rabbit", "cat2", "cat", "racehorse", "horse", "ram", "sheep", "goat", "rooster", "chicken", "baby_chick", "hatching_chick", "hatched_chick", "bird", "penguin", "elephant", "dromedary_camel", "camel", "boar", "pig2", "pig", "pig_nose", "dog2", "poodle", "dog", "wolf", "bear", "koala", "panda_face", "monkey_face", "see_no_evil", "hear_no_evil", "speak_no_evil", "monkey", "dragon", "dragon_face", "crocodile", "snake", "turtle", "frog", "whale2", "whale", "dolphin", "octopus", "fish", "tropical_fish", "blowfish", "shell", "snail", "bug", "ant", "bee", "beetle", "feet", "zap", "fire", "crescent_moon", "sunny", "partly_sunny", "cloud", "droplet", "sweat_drops", "umbrella", "dash", "snowflake", "star2", "star", "stars", "sunrise_over_mountains", "sunrise", "rainbow", "ocean", "volcano", "milky_way", "mount_fuji", "japan", "globe_with_meridians", "earth_africa", "earth_americas", "earth_asia", "new_moon", "waxing_crescent_moon", "first_quarter_moon", "moon", "full_moon", "waning_gibbous_moon", "last_quarter_moon", "waning_crescent_moon", "new_moon_with_face", "full_moon_with_face", "first_quarter_moon_with_face", "last_quarter_moon_with_face", "sun_with_face"] + }, + { + name: "food", + fullname: "Food & Drink", + tabicon: "hamburger", + icons: ["tomato", "eggplant", "corn", "sweet_potato", "grapes", "melon", "watermelon", "tangerine", "lemon", "banana", "pineapple", "apple", "green_apple", "pear", "peach", "cherries", "strawberry", "hamburger", "pizza", "meat_on_bone", "poultry_leg", "rice_cracker", "rice_ball", "rice", "curry", "ramen", "spaghetti", "bread", "fries", "dango", "oden", "sushi", "fried_shrimp", "fish_cake", "icecream", "shaved_ice", "ice_cream", "doughnut", "cookie", "chocolate_bar", "candy", "lollipop", "custard", "honey_pot", "cake", "bento", "stew", "egg", "fork_and_knife", "tea", "coffee", "sake", "wine_glass", "cocktail", "tropical_drink", "beer", "beers", "baby_bottle"] + }, + { + name: "celebration", + fullname: "Celebration", + tabicon: "gift", + icons: ["ribbon", "gift", "birthday", "jack_o_lantern", "christmas_tree", "tanabata_tree", "bamboo", "rice_scene", "fireworks", "sparkler", "tada", "confetti_ball", "balloon", "dizzy", "sparkles", "boom", "mortar_board", "crown", "dolls", "flags", "wind_chime", "crossed_flags", "izakaya_lantern", "ring", "heart", "broken_heart", "love_letter", "two_hearts", "revolving_hearts", "heartbeat", "heartpulse", "sparkling_heart", "cupid", "gift_heart", "heart_decoration", "purple_heart", "yellow_heart", "green_heart", "blue_heart"] + }, + { + name: "activity", + fullname: "Activities", + tabicon: "soccer", + icons: ["runner", "walking", "dancer", "rowboat", "swimmer", "surfer", "bath", "snowboarder", "ski", "snowman", "bicyclist", "mountain_bicyclist", "horse_racing", "tent", "fishing_pole_and_fish", "soccer", "basketball", "football", "baseball", "tennis", "rugby_football", "golf", "trophy", "running_shirt_with_sash", "checkered_flag", "musical_keyboard", "guitar", "violin", "saxophone", "trumpet", "musical_note", "notes", "musical_score", "headphones", "microphone", "performing_arts", "ticket", "tophat", "circus_tent", "clapper", "art", "dart", "8ball", "bowling", "slot_machine", "game_die", "video_game", "flower_playing_cards", "black_joker", "mahjong", "carousel_horse", "ferris_wheel", "roller_coaster"] + }, + { + name: "travel", + fullname: "Travel & Places", + tabicon: "airplane", + icons: ["train", "mountain_railway", "railway_car", "steam_locomotive", "monorail", "bullettrain_side", "bullettrain_front", "train2", "metro", "light_rail", "station", "tram", "bus", "oncoming_bus", "trolleybus", "minibus", "ambulance", "fire_engine", "police_car", "oncoming_police_car", "rotating_light", "taxi", "oncoming_taxi", "car", "oncoming_automobile", "blue_car", "truck", "articulated_lorry", "tractor", "bike", "busstop", "fuelpump", "construction", "vertical_traffic_light", "traffic_light", "rocket", "helicopter", "airplane", "seat", "anchor", "ship", "speedboat", "boat", "aerial_tramway", "mountain_cableway", "suspension_railway", "passport_control", "customs", "baggage_claim", "left_luggage", "yen", "euro", "pound", "dollar", "statue_of_liberty", "moyai", "foggy", "tokyo_tower", "fountain", "european_castle", "japanese_castle", "city_sunrise", "city_sunset", "night_with_stars", "bridge_at_night", "house", "house_with_garden", "office", "department_store", "factory", "post_office", "european_post_office", "hospital", "bank", "hotel", "love_hotel", "wedding", "church", "convenience_store", "school", "cn", "de", "es", "fr", "gb", "it", "jp", "kr", "ru", "us"] }, { name: "objects", - icons: ["bamboo","gift_heart","dolls","school_satchel","mortar_board","flags","fireworks","sparkler","wind_chime","rice_scene","jack_o_lantern","ghost","santa","christmas_tree","gift","tanabata_tree","tada","confetti_ball","balloon","crossed_flags","crystal_ball","movie_camera","camera","video_camera","vhs","cd","dvd","minidisc","floppy_disk","computer","iphone","telephone","telephone_receiver","pager","fax","satellite","tv","radio","loud_sound","sound","speaker","mute","bell","no_bell","loudspeaker","mega","hourglass_flowing_sand","hourglass","alarm_clock","watch","unlock","lock","lock_with_ink_pen","closed_lock_with_key","key","mag_right","bulb","flashlight","high_brightness","low_brightness","electric_plug","battery","mag","bathtub","bath","shower","toilet","wrench","nut_and_bolt","hammer","door","smoking","bomb","gun","knife","pill","syringe","moneybag","yen","dollar","pound","euro","credit_card","money_with_wings","calling","e-mail","inbox_tray","outbox_tray","envelope","envelope_with_arrow","incoming_envelope","postal_horn","mailbox","mailbox_closed","mailbox_with_mail","mailbox_with_no_mail","postbox","package","pencil","page_facing_up","page_with_curl","bookmark_tabs","bar_chart","chart_with_upwards_trend","chart_with_downwards_trend","scroll","clipboard","date","calendar","card_index","file_folder","open_file_folder","scissors","pushpin","paperclip","black_nib","pencil2","straight_ruler","triangular_ruler","closed_book","green_book","blue_book","orange_book","notebook","notebook_with_decorative_cover","ledger","books","book","bookmark","name_badge","microscope","telescope","newspaper","art","clapper","microphone","headphones","musical_score","musical_note","notes","musical_keyboard","violin","trumpet","saxophone","guitar","space_invader","video_game","black_joker","flower_playing_cards","mahjong","game_die","dart","football","basketball","soccer","baseball","tennis","8ball","rugby_football","bowling","golf","mountain_bicyclist","bicyclist","checkered_flag","horse_racing","trophy","ski","snowboarder","swimmer","surfer","fishing_pole_and_fish"] - }, - { - name: "foods", - icons: ["coffee","tea","sake","baby_bottle","beer","beers","cocktail","tropical_drink","wine_glass","fork_and_knife","pizza","hamburger","fries","poultry_leg","meat_on_bone","spaghetti","curry","fried_shrimp","bento","sushi","fish_cake","rice_ball","rice_cracker","rice","ramen","stew","oden","dango","egg","bread","doughnut","custard","icecream","ice_cream","shaved_ice","birthday","cake","cookie","chocolate_bar","candy","lollipop","honey_pot","apple","green_apple","tangerine","lemon","cherries","grapes","watermelon","strawberry","peach","melon","banana","pear","pineapple","sweet_potato","eggplant","tomato","corn"] - }, - { - name: "places", - icons: ["house","house_with_garden","school","office","post_office","hospital","bank","convenience_store","love_hotel","hotel","wedding","church","department_store","european_post_office","city_sunset","city_dusk","japanese_castle","european_castle","tent","factory","tokyo_tower","japan","mount_fuji","sunrise_over_mountains","sunrise","night_with_stars","statue_of_liberty","bridge_at_night","carousel_horse","ferris_wheel","fountain","roller_coaster","ship","sailboat","speedboat","rowboat","anchor","rocket","airplane","seat","helicopter","steam_locomotive","tram","station","mountain_railway","train2","bullettrain_side","bullettrain_front","light_rail","metro","monorail","train","railway_car","trolleybus","bus","oncoming_bus","blue_car","oncoming_automobile","red_car","taxi","oncoming_taxi","articulated_lorry","truck","rotating_light","police_car","oncoming_police_car","fire_engine","ambulance","minibus","bike","aerial_tramway","suspension_railway","mountain_cableway","tractor","barber","busstop","ticket","vertical_traffic_light","traffic_light","warning","construction","beginner","fuelpump","izakaya_lantern","slot_machine","hotsprings","moyai","circus_tent","performing_arts","round_pushpin","triangular_flag_on_post","cn","us","in","jp","br","ru","de","ng","gb","fr","mx","kr","id","ph","eg","vn","tr","it","es","ca","pl","ar","co","ir","za","my","pk","au","th","ma","tw","nl","ua","sa","ke","ve","pe","ro","cl","uz","bd","kz","be","se","cz","sd","hu","pt","ch","at","tz"] - }, - { - name: "symbols", - icons: ["hash","one","two","three","four","five","six","seven","eight","nine","zero","keycap_ten","1234","symbols","arrow_up","arrow_down","arrow_left","arrow_right","capital_abcd","abcd","abc","arrow_upper_right","arrow_upper_left","arrow_lower_right","arrow_lower_left","left_right_arrow","arrow_up_down","arrows_counterclockwise","arrow_backward","arrow_forward","arrow_up_small","arrow_down_small","leftwards_arrow_with_hook","arrow_right_hook","information_source","rewind","fast_forward","arrow_double_up","arrow_double_down","arrow_heading_down","arrow_heading_up","ok","twisted_rightwards_arrows","repeat","repeat_one","new","up","cool","free","ng","signal_strength","cinema","koko","u6307","u7a7a","u6e80","u5408","u7981","ideograph_advantage","u5272","u55b6","u6709","u7121","restroom","mens","womens","baby_symbol","wc","potable_water","put_litter_in_its_place","parking","wheelchair","no_smoking","u6708","u7533","sa","m","passport_control","baggage_claim","left_luggage","customs","accept","secret","congratulations","cl","sos","id","no_entry_sign","underage","no_mobile_phones","do_not_litter","non-potable_water","no_bicycles","no_pedestrians","children_crossing","no_entry","eight_spoked_asterisk","sparkle","negative_squared_cross_mark","white_check_mark","eight_pointed_black_star","heart_decoration","vs","vibration_mode","mobile_phone_off","a","b","ab","o2","diamond_shape_with_a_dot_inside","loop","recycle","aries","taurus","gemini","cancer","leo","virgo","libra","scorpius","sagittarius","capricorn","aquarius","pisces","ophiuchus","six_pointed_star","atm","chart","heavy_dollar_sign","currency_exchange","copyright","registered","tm","part_alternation_mark","wavy_dash","top","end","back","on","soon","x","o","exclamation","question","grey_exclamation","grey_question","bangbang","interrobang","arrows_clockwise","clock12","clock1230","clock1","clock130","clock2","clock230","clock3","clock330","clock4","clock430","clock5","clock530","clock6","clock7","clock8","clock9","clock10","clock11","clock630","clock730","clock830","clock930","clock1030","clock1130","heavy_multiplication_x","heavy_plus_sign","heavy_minus_sign","heavy_division_sign","spades","hearts","clubs","diamonds","white_flower","100","heavy_check_mark","ballot_box_with_check","radio_button","link","curly_loop","trident","black_square_button","white_square_button","black_medium_square","white_medium_square","black_medium_small_square","white_medium_small_square","black_small_square","white_small_square","small_red_triangle","white_large_square","black_large_square","black_circle","white_circle","red_circle","large_blue_circle","small_red_triangle_down","large_orange_diamond","large_blue_diamond","small_orange_diamond","small_blue_diamond"] + fullname: "Objects & Symbols", + tabicon: "eyeglasses", + icons: ["watch", "iphone", "calling", "computer", "alarm_clock", "hourglass_flowing_sand", "hourglass", "camera", "video_camera", "movie_camera", "tv", "radio", "pager", "telephone_receiver", "phone", "fax", "minidisc", "floppy_disk", "cd", "dvd", "vhs", "battery", "electric_plug", "bulb", "flashlight", "satellite", "credit_card", "money_with_wings", "moneybag", "gem", "closed_umbrella", "pouch", "purse", "handbag", "briefcase", "school_satchel", "lipstick", "eyeglasses", "womans_hat", "sandal", "high_heel", "boot", "mans_shoe", "athletic_shoe", "bikini", "dress", "kimono", "womans_clothes", "shirt", "necktie", "jeans", "door", "shower", "bathtub", "toilet", "barber", "syringe", "pill", "microscope", "telescope", "crystal_ball", "wrench", "hocho", "nut_and_bolt", "hammer", "bomb", "smoking", "gun", "bookmark", "newspaper", "key", "email", "envelope_with_arrow", "incoming_envelope", "e-mail", "inbox_tray", "outbox_tray", "package", "postal_horn", "postbox", "mailbox_closed", "mailbox", "mailbox_with_mail", "mailbox_with_no_mail", "page_facing_up", "page_with_curl", "bookmark_tabs", "chart_with_upwards_trend", "chart_with_downwards_trend", "bar_chart", "date", "calendar", "low_brightness", "high_brightness", "scroll", "clipboard", "book", "notebook", "notebook_with_decorative_cover", "ledger", "closed_book", "green_book", "blue_book", "orange_book", "books", "card_index", "link", "paperclip", "pushpin", "scissors", "triangular_ruler", "round_pushpin", "straight_ruler", "triangular_flag_on_post", "file_folder", "open_file_folder", "black_nib", "pencil2", "memo", "lock_with_ink_pen", "closed_lock_with_key", "lock", "unlock", "mega", "loudspeaker", "sound", "loud_sound", "speaker", "mute", "zzz", "bell", "no_bell", "thought_balloon", "speech_balloon", "children_crossing", "mag", "mag_right", "no_entry_sign", "no_entry", "name_badge", "no_pedestrians", "do_not_litter", "no_bicycles", "non-potable_water", "no_mobile_phones", "underage", "accept", "ideograph_advantage", "white_flower", "secret", "congratulations", "u5408", "u6e80", "u7981", "u6709", "u7121", "u7533", "u55b6", "u6708", "u5272", "u7a7a", "sa", "koko", "u6307", "chart", "sparkle", "eight_spoked_asterisk", "negative_squared_cross_mark", "white_check_mark", "eight_pointed_black_star", "vibration_mode", "mobile_phone_off", "vs", "a", "b", "ab", "cl", "o2", "sos", "id", "parking", "wc", "cool", "free", "new", "ng", "ok", "up", "atm", "aries", "taurus", "gemini", "cancer", "leo", "virgo", "libra", "scorpius", "sagittarius", "capricorn", "aquarius", "pisces", "restroom", "mens", "womens", "baby_symbol", "wheelchair", "potable_water", "no_smoking", "put_litter_in_its_place", "arrow_forward", "arrow_backward", "arrow_up_small", "arrow_down_small", "fast_forward", "rewind", "arrow_double_up", "arrow_double_down", "arrow_right", "arrow_left", "arrow_up", "arrow_down", "arrow_upper_right", "arrow_lower_right", "arrow_lower_left", "arrow_upper_left", "arrow_up_down", "left_right_arrow", "arrows_counterclockwise", "arrow_right_hook", "leftwards_arrow_with_hook", "arrow_heading_up", "arrow_heading_down", "twisted_rightwards_arrows", "repeat", "repeat_one", "zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "keycap_ten", "1234", "hash", "abc", "abcd", "capital_abcd", "information_source", "signal_strength", "cinema", "symbols", "heavy_plus_sign", "heavy_minus_sign", "wavy_dash", "heavy_division_sign", "heavy_multiplication_x", "heavy_check_mark", "arrows_clockwise", "tm", "copyright", "registered", "currency_exchange", "heavy_dollar_sign", "curly_loop", "loop", "part_alternation_mark", "exclamation", "bangbang", "question", "grey_exclamation", "grey_question", "interrobang", "x", "o", "100", "end", "back", "on", "top", "soon", "cyclone", "m", "ophiuchus", "six_pointed_star", "beginner", "trident", "warning", "hotsprings", "recycle", "anger", "diamond_shape_with_a_dot_inside", "spades", "clubs", "hearts", "diamonds", "ballot_box_with_check", "white_circle", "black_circle", "radio_button", "red_circle", "large_blue_circle", "small_red_triangle", "small_red_triangle_down", "small_orange_diamond", "small_blue_diamond", "large_orange_diamond", "large_blue_diamond", "black_small_square", "white_small_square", "black_large_square", "white_large_square", "black_medium_square", "white_medium_square", "black_medium_small_square", "white_medium_small_square", "black_square_button", "white_square_button", "clock1", "clock2", "clock3", "clock4", "clock5", "clock6", "clock7", "clock8", "clock9", "clock10", "clock11", "clock12", "clock130", "clock230", "clock330", "clock430", "clock530", "clock630", "clock730", "clock830", "clock930", "clock1030", "clock1130", "clock1230"] } ]; @@ -67,7 +88,7 @@ var initializeUngroupedIcons = function(){ try { if (localStorage && !localStorage.emojiUsage) { localStorage.emojiUsage = "{}"; } } catch(e){ -/* localStorage can be disabled, or cookies disabled, do not crash script here +/* localStorage can be disabled, or cookies disabled, do not crash script here * TODO introduce a global wrapper for dealing with local storage * */ } @@ -120,8 +141,16 @@ var toolbar = function(selected){ if (!recentlyUsedIcons) { initializeRecentlyUsedIcons(); } return _.map(groups, function(g, i){ - var icon = g.name === "recent" ? "star2" : g.icons[0]; - var row = {src: Discourse.Emoji.urlFor(icon), groupId: i}; + var icon = g.tabicon; + var title = g.fullname; + if (g.name === "recent") { + icon = "star2"; + title = "Recent"; + } else if (g.name === "ungrouped") { + icon = g.icons[0]; + title = "Custom"; + } + var row = {src: Discourse.Emoji.urlFor(icon), title: title, groupId: i}; if(i === selected){ row.selected = true; } diff --git a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb index 3358a665a7..ef7856a748 100644 --- a/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb +++ b/app/assets/javascripts/discourse/lib/emoji/emoji.js.erb @@ -99,6 +99,7 @@ var translations = { ':|' : 'expressionless', ':-|' : 'expressionless', ':/' : 'confused', + '8-)' : 'sunglasses', ";P" : 'stuck_out_tongue_winking_eye', ";-P" : 'stuck_out_tongue_winking_eye', ":$" : 'blush', 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 a63eacad71..e5348a6a13 100644 --- a/app/assets/javascripts/discourse/lib/search-for-term.js.es6 +++ b/app/assets/javascripts/discourse/lib/search-for-term.js.es6 @@ -1,5 +1,67 @@ import Topic from 'discourse/models/topic'; +export function translateResults(results, opts) { + if (!opts) opts = {}; + + // Topics might not be included + if (!results.topics) { results.topics = []; } + if (!results.users) { results.users = []; } + if (!results.posts) { results.posts = []; } + if (!results.categories) { results.categories = []; } + + const topicMap = {}; + results.topics = results.topics.map(function(topic){ + topic = Topic.create(topic); + topicMap[topic.id] = topic; + return topic; + }); + + results.posts = results.posts.map(function(post){ + post = Discourse.Post.create(post); + post.set('topic', topicMap[post.topic_id]); + return post; + }); + + results.users = results.users.map(function(user){ + user = Discourse.User.create(user); + return user; + }); + + results.categories = results.categories.map(function(category){ + return Discourse.Category.list().findProperty('id', category.id); + }).compact(); + + 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){ + const type = pair[0], name = pair[1]; + if (results[name].length > 0) { + var result = { + results: results[name], + componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type), + type, + more: r['more_' + name] + }; + + if (result.more && name === "posts" && opts.fullSearchUrl) { + result.more = false; + result.moreUrl = opts.fullSearchUrl; + } + + results.resultTypes.push(result); + } + }); + + const noResults = !!(results.topics.length === 0 && + results.posts.length === 0 && + results.users.length === 0 && + results.categories.length === 0); + + return noResults ? null : Em.Object.create(results); +} + function searchForTerm(term, opts) { if (!opts) opts = {}; @@ -16,63 +78,7 @@ function searchForTerm(term, opts) { } return Discourse.ajax('/search/query', { data: data }).then(function(results){ - // Topics might not be included - if (!results.topics) { results.topics = []; } - if (!results.users) { results.users = []; } - if (!results.posts) { results.posts = []; } - if (!results.categories) { results.categories = []; } - - const topicMap = {}; - results.topics = results.topics.map(function(topic){ - topic = Topic.create(topic); - topicMap[topic.id] = topic; - return topic; - }); - - results.posts = results.posts.map(function(post){ - post = Discourse.Post.create(post); - post.set('topic', topicMap[post.topic_id]); - return post; - }); - - results.users = results.users.map(function(user){ - user = Discourse.User.create(user); - return user; - }); - - results.categories = results.categories.map(function(category){ - return Discourse.Category.list().findProperty('id', category.id); - }).compact(); - - 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){ - const type = pair[0], name = pair[1]; - if (results[name].length > 0) { - var result = { - results: results[name], - componentName: "search-result-" + ((opts.searchContext && opts.searchContext.type === 'topic' && type === 'topic') ? 'post' : type), - type, - more: r['more_' + name] - }; - - if (result.more && name === "posts" && opts.fullSearchUrl) { - result.more = false; - result.moreUrl = opts.fullSearchUrl; - } - - results.resultTypes.push(result); - } - }); - - const noResults = !!(results.topics.length === 0 && - results.posts.length === 0 && - results.users.length === 0 && - results.categories.length === 0); - - return noResults ? null : Em.Object.create(results); + return translateResults(results, opts); }); } diff --git a/app/assets/javascripts/discourse/models/composer.js.es6 b/app/assets/javascripts/discourse/models/composer.js.es6 index 6148efa04c..49838fdf72 100644 --- a/app/assets/javascripts/discourse/models/composer.js.es6 +++ b/app/assets/javascripts/discourse/models/composer.js.es6 @@ -114,6 +114,7 @@ const Composer = RestModel.extend({ // whether to disable the post button cantSubmitPost: function() { + // can't submit while loading if (this.get('loading')) return true; @@ -199,12 +200,9 @@ const Composer = RestModel.extend({ } }.property('privateMessage'), - /** - Number of missing characters in the reply until valid. - - @property missingReplyCharacters - **/ missingReplyCharacters: function() { + const postType = this.get('post.post_type'); + if (postType === this.site.get('post_types.small_action')) { return 0; } return this.get('minimumPostLength') - this.get('replyLength'); }.property('minimumPostLength', 'replyLength'), diff --git a/app/assets/javascripts/discourse/models/post-stream.js.es6 b/app/assets/javascripts/discourse/models/post-stream.js.es6 index 8052ee4048..5a45ddcc59 100644 --- a/app/assets/javascripts/discourse/models/post-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/post-stream.js.es6 @@ -767,14 +767,12 @@ const PostStream = RestModel.extend({ // If the result was 404 the post is not found if (status === 404) { - topic.set('errorTitle', I18n.t('topic.not_found.title')); topic.set('notFoundHtml', result.jqXHR.responseText); return; } // If the result is 403 it means invalid access if (status === 403) { - topic.set('errorTitle', I18n.t('topic.invalid_access.title')); topic.set('noRetry', true); if (Discourse.User.current()) { topic.set('message', I18n.t('topic.invalid_access.description')); @@ -785,7 +783,6 @@ const PostStream = RestModel.extend({ } // Otherwise supply a generic error message - topic.set('errorTitle', I18n.t('topic.server_error.title')); topic.set('message', I18n.t('topic.server_error.description')); } diff --git a/app/assets/javascripts/discourse/models/rest.js.es6 b/app/assets/javascripts/discourse/models/rest.js.es6 index 843e22eb1b..6396f8e548 100644 --- a/app/assets/javascripts/discourse/models/rest.js.es6 +++ b/app/assets/javascripts/discourse/models/rest.js.es6 @@ -18,7 +18,6 @@ const RestModel = Ember.Object.extend(Presence, { const self = this; self.set('isSaving', true); return store.update(type, this.get('id'), props).then(function(res) { - const payload = self.__munge(res.payload || res.responseJson); if (payload.success === "OK") { diff --git a/app/assets/javascripts/discourse/models/topic.js.es6 b/app/assets/javascripts/discourse/models/topic.js.es6 index 2481f2574b..0f06dc4847 100644 --- a/app/assets/javascripts/discourse/models/topic.js.es6 +++ b/app/assets/javascripts/discourse/models/topic.js.es6 @@ -2,7 +2,6 @@ import RestModel from 'discourse/models/rest'; const Topic = RestModel.extend({ message: null, - errorTitle: null, errorLoading: false, fancyTitle: function() { @@ -154,13 +153,17 @@ const Topic = RestModel.extend({ this.saveStatus(property, !!this.get(property)); }, - saveStatus(property, value) { + saveStatus(property, value, until) { if (property === 'closed' && value === true) { this.set('details.auto_close_at', null); } return Discourse.ajax(this.get('url') + "/status", { type: 'PUT', - data: { status: property, enabled: !!value } + data: { + status: property, + enabled: !!value, + until: until + } }); }, diff --git a/app/assets/javascripts/discourse/models/user-stream.js.es6 b/app/assets/javascripts/discourse/models/user-stream.js.es6 index ac3883ba38..1870d484d6 100644 --- a/app/assets/javascripts/discourse/models/user-stream.js.es6 +++ b/app/assets/javascripts/discourse/models/user-stream.js.es6 @@ -68,7 +68,7 @@ export default RestModel.extend({ if (result && result.user_actions) { const copy = Em.A(); result.user_actions.forEach(function(action) { - action.title = Discourse.Emoji.unescape(action.title); + action.title = Discourse.Emoji.unescape(Handlebars.Utils.escapeExpression(action.title)); copy.pushObject(Discourse.UserAction.create(action)); }); diff --git a/app/assets/javascripts/discourse/models/user.js.es6 b/app/assets/javascripts/discourse/models/user.js.es6 index aecb9cbc4c..8e9c8e5350 100644 --- a/app/assets/javascripts/discourse/models/user.js.es6 +++ b/app/assets/javascripts/discourse/models/user.js.es6 @@ -395,7 +395,7 @@ const User = RestModel.extend({ }.observes("watched_category_ids"), canDeleteAccount: function() { - return this.get('can_delete_account') && ((this.get('reply_count')||0) + (this.get('topic_count')||0)) <= 1; + return !Discourse.SiteSettings.enable_sso && this.get('can_delete_account') && ((this.get('reply_count')||0) + (this.get('topic_count')||0)) <= 1; }.property('can_delete_account', 'reply_count', 'topic_count'), "delete": function() { diff --git a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 index 98e1194df9..779822ee39 100644 --- a/app/assets/javascripts/discourse/routes/app-route-map.js.es6 +++ b/app/assets/javascripts/discourse/routes/app-route-map.js.es6 @@ -99,4 +99,6 @@ export default function() { }); this.resource('queued-posts', { path: '/queued-posts' }); + + this.route('full-page-search', {path: '/search'}); } diff --git a/app/assets/javascripts/discourse/routes/full-page-search.js.es6 b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 new file mode 100644 index 0000000000..b092136ee5 --- /dev/null +++ b/app/assets/javascripts/discourse/routes/full-page-search.js.es6 @@ -0,0 +1,18 @@ +import { translateResults } from 'discourse/lib/search-for-term'; + +export default Discourse.Route.extend({ + queryParams: { + q: { + } + }, + model: function(params) { + return PreloadStore.getAndRemove("search", function() { + return Discourse.ajax('/search', {data: {q: params.q}}); + }).then(function(results){ + var model = translateResults(results) || {}; + model.q = params.q; + return model; + }); + } + +}); diff --git a/app/assets/javascripts/discourse/routes/topic.js.es6 b/app/assets/javascripts/discourse/routes/topic.js.es6 index 963afc35ce..63762c7b55 100644 --- a/app/assets/javascripts/discourse/routes/topic.js.es6 +++ b/app/assets/javascripts/discourse/routes/topic.js.es6 @@ -61,6 +61,7 @@ const TopicRoute = Discourse.Route.extend(ShowFooter, { showFeatureTopic() { showModal('featureTopic', { model: this.modelFor('topic'), title: 'topic.feature_topic.title' }); this.controllerFor('modal').set('modalClass', 'feature-topic-modal'); + this.controllerFor('feature_topic').reset(); }, showInvite() { diff --git a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 index e11dea722e..df9e7fadcf 100644 --- a/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-invited-index.js.es6 @@ -1,5 +1,5 @@ export default Discourse.Route.extend({ beforeModel: function() { - this.replaceWith('userInvited.show', 'redeemed'); + this.replaceWith('userInvited.show', 'pending'); } }); diff --git a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 index a5e391093f..6c42105dd6 100644 --- a/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 +++ b/app/assets/javascripts/discourse/routes/user-invited-show.js.es6 @@ -8,6 +8,12 @@ export default Discourse.Route.extend(ShowFooter, { return Discourse.Invite.findInvitedBy(this.modelFor('user'), params.filter); }, + afterModel: function(model) { + if (!model.can_see_invite_details) { + this.replaceWith('userInvited.show', 'redeemed'); + } + }, + setupController(controller, model) { controller.setProperties({ model: model, diff --git a/app/assets/javascripts/discourse/templates/application.hbs b/app/assets/javascripts/discourse/templates/application.hbs index 6b9b133219..23822e0f40 100644 --- a/app/assets/javascripts/discourse/templates/application.hbs +++ b/app/assets/javascripts/discourse/templates/application.hbs @@ -1,6 +1,6 @@ {{render "header"}} -
+
{{outlet}} {{render "user-card"}}
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 341d355d47..6d323d7aab 100644 --- a/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs +++ b/app/assets/javascripts/discourse/templates/components/basic-topic-list.hbs @@ -5,7 +5,6 @@ hideCategory=hideCategory topics=topics expandExcerpts=expandExcerpts - searchTerm=searchTerm }} {{else}}
diff --git a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs index 902c468486..756b976c33 100644 --- a/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs +++ b/app/assets/javascripts/discourse/templates/components/bread-crumbs.hbs @@ -4,4 +4,6 @@ {{category-drop category=secondCategory parentCategory=firstCategory categories=childCategories subCategory="true" noSubcategories=noSubcategories}} {{/if}} +{{plugin-outlet "bread-crumbs-right" tagName="li"}} +
diff --git a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs index 30d9bc49fe..4dad7efb0c 100644 --- a/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs +++ b/app/assets/javascripts/discourse/templates/components/bulk-select-button.hbs @@ -1,5 +1,5 @@ {{#if selected}}
- {{d-button action="showBulkActions" icon="wrench" class="no-text"}} + {{d-button action="showBulkActions" icon="wrench"}}
{{/if}} diff --git a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs index 2f6b95c498..614e48e38b 100644 --- a/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs +++ b/app/assets/javascripts/discourse/templates/components/header-extra-info.hbs @@ -9,10 +9,6 @@ {{#if topic.details.loaded}} {{topic-status topic=topic}} {{{topic.fancyTitle}}} - {{else}} - {{#if topic.errorLoading}} - {{topic.errorTitle}} - {{/if}} {{/if}} {{#if topic.details.loaded}} diff --git a/app/assets/javascripts/admin/templates/components/nav-item.hbs b/app/assets/javascripts/discourse/templates/components/nav-item.hbs similarity index 100% rename from app/assets/javascripts/admin/templates/components/nav-item.hbs rename to app/assets/javascripts/discourse/templates/components/nav-item.hbs diff --git a/app/assets/javascripts/discourse/templates/components/small-action.hbs b/app/assets/javascripts/discourse/templates/components/small-action.hbs new file mode 100644 index 0000000000..b05c658088 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/small-action.hbs @@ -0,0 +1,15 @@ +
{{fa-icon icon}}
+
+ {{#if post}} + {{#if post.can_delete}} + + {{/if}} + {{#if post.can_edit}} + + {{/if}} + + {{avatar post imageSize="small"}} + + {{/if}} + {{{description}}} +
diff --git a/app/assets/javascripts/discourse/templates/components/topic-map.hbs b/app/assets/javascripts/discourse/templates/components/topic-map.hbs index 8043f66028..b851f03bcd 100644 --- a/app/assets/javascripts/discourse/templates/components/topic-map.hbs +++ b/app/assets/javascripts/discourse/templates/components/topic-map.hbs @@ -69,7 +69,7 @@ {{#each infoLinks as |link|}} - {{link.clicks}} + {{link.clicks}} diff --git a/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs new file mode 100644 index 0000000000..9c5d37ec0b --- /dev/null +++ b/app/assets/javascripts/discourse/templates/components/user-fields/dropdown.hbs @@ -0,0 +1,6 @@ + +
+ {{combo-box content=field.options value=value none=noneLabel}} + {{#if field.required}}*{{/if}} +

{{{field.description}}}

+
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs index 0b6f9735df..f3e452a4ab 100644 --- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs +++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs @@ -46,8 +46,6 @@ selected=selected expandGloballyPinned=expandGloballyPinned expandAllPinned=expandAllPinned - expandExcerpts=isSearch - searchTerm=searchTerm topics=model.topics}} {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs index 8a519786e8..e7ed62a92a 100644 --- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs +++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs @@ -1,6 +1,6 @@
diff --git a/app/assets/javascripts/discourse/templates/full-page-search.hbs b/app/assets/javascripts/discourse/templates/full-page-search.hbs new file mode 100644 index 0000000000..848215c73e --- /dev/null +++ b/app/assets/javascripts/discourse/templates/full-page-search.hbs @@ -0,0 +1,45 @@ +
+ {{input type="text" value=searchTerm class="input-xxlarge search no-blur" action="search"}} + +
+ +{{#conditional-loading-spinner condition=loading}} + +{{#unless model.posts}} +

{{i18n "search.no_results"}} {{i18n "search.search_help"}} +

+{{/unless}} + +{{#each model.posts as |result|}} +
+
+ {{avatar result imageSize="tiny"}} + + {{topic-status topic=result.topic disableActions=true}}{{unbound result.topic.title}} + {{category-link result.topic.category}} +
+
+ + {{format-age result.created_at}} + {{#if result.blurb}} + - + {{/if}} + + {{#if result.blurb}} + {{#highlight-text highlight=controller.q}} + {{{unbound result.blurb}}} + {{/highlight-text}} + {{/if}} +
+
+{{/each}} + +{{#if model.posts}} +

+ {{i18n "search.no_more_results"}} + {{i18n "search.search_help"}} +

+{{/if}} + +{{/conditional-loading-spinner}} + diff --git a/app/assets/javascripts/discourse/templates/header.hbs b/app/assets/javascripts/discourse/templates/header.hbs index 4d71d1eb22..3a8bd239ed 100644 --- a/app/assets/javascripts/discourse/templates/header.hbs +++ b/app/assets/javascripts/discourse/templates/header.hbs @@ -1,4 +1,4 @@ -
+
{{home-logo minimized=showExtraInfo}} diff --git a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs index be857517d0..12f0309d6c 100644 --- a/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs +++ b/app/assets/javascripts/discourse/templates/modal/avatar_selector.hbs @@ -7,7 +7,7 @@
- {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled class="no-text" icon="refresh"}} + {{d-button action="refreshGravatar" title="user.change_avatar.refresh_gravatar_title" disabled=gravatarRefreshDisabled icon="refresh"}}
{{#if allowImageUpload}}
diff --git a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs index 73e0176055..07b6430795 100644 --- a/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs +++ b/app/assets/javascripts/discourse/templates/modal/feature-topic.hbs @@ -1,80 +1,94 @@
{{#if model.pinned_at}}
-
- {{d-button action="unpin" icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}} -
-

{{{unPinMessage}}}

{{#if model.pinned_globally}} -

{{i18n "topic.feature_topic.global_pin_note"}}

{{#conditional-loading-spinner size="small" condition=loading}} {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}} {{/conditional-loading-spinner}}

+

{{i18n "topic.feature_topic.global_pin_note"}}

{{else}} -

{{i18n "topic.feature_topic.pin_note"}}

{{#conditional-loading-spinner size="small" condition=loading}} {{{alreadyPinnedMessage}}} {{/conditional-loading-spinner}}

+

{{i18n "topic.feature_topic.pin_note"}}

{{/if}} +

{{{unPinMessage}}}

+

{{d-button action="unpin" icon="thumb-tack" label="topic.feature.unpin" class="btn-primary"}}

{{else}}
-
- {{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary"}} -
-

{{{pinMessage}}}

-

{{i18n "topic.feature_topic.pin_note"}}

{{#conditional-loading-spinner size="small" condition=loading}} {{{alreadyPinnedMessage}}} {{/conditional-loading-spinner}}

+

+ {{i18n "topic.feature_topic.pin_note"}} +

+

+ {{{pinMessage}}} + {{fa-icon "clock-o"}} + {{input type="date" value=model.pinnedInCategoryUntil}} +

+

+ {{d-button action="pin" icon="thumb-tack" label="topic.feature.pin" class="btn-primary" disabled=pinDisabled}} +

-
- {{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary"}} -
-

{{i18n "topic.feature_topic.pin_globally"}}

-

{{i18n "topic.feature_topic.global_pin_note"}}

{{#conditional-loading-spinner size="small" condition=loading}} {{{i18n "topic.feature_topic.already_pinned_globally" count=pinnedGloballyCount}}} {{/conditional-loading-spinner}}

+

+ {{i18n "topic.feature_topic.global_pin_note"}} +

+

+ {{i18n "topic.feature_topic.pin_globally"}} + {{fa-icon "clock-o"}} + {{input type="date" value=model.pinnedGloballyUntil}} +

+

+ {{d-button action="pinGlobally" icon="thumb-tack" label="topic.feature.pin_globally" class="btn-primary" disabled=pinGloballyDisabled}} +

{{/if}}
-
- {{#if model.isBanner}} - {{d-button action="removeBanner" icon="thumb-tack" label="topic.feature.remove_banner" class="btn-primary"}} - {{else}} - {{d-button action="makeBanner" icon="thumb-tack" label="topic.feature.make_banner" class="btn-primary"}} - {{/if}} -
- {{#if model.isBanner}} -

{{i18n "topic.feature_topic.remove_banner"}}

- {{else}} -

{{i18n "topic.feature_topic.make_banner"}}

- {{/if}} -

{{i18n "topic.feature_topic.banner_note"}}

{{#conditional-loading-spinner size="small" condition=loading}} {{{i18n "topic.feature_topic.already_banner" count=bannerCount}}} {{/conditional-loading-spinner}}

+

+ {{i18n "topic.feature_topic.banner_note"}} +

+

+ {{#if model.isBanner}} + {{i18n "topic.feature_topic.remove_banner"}} + {{else}} + {{i18n "topic.feature_topic.make_banner"}} + {{/if}} +

+

+ {{#if model.isBanner}} + {{d-button action="removeBanner" icon="thumb-tack" label="topic.feature.remove_banner" class="btn-primary"}} + {{else}} + {{d-button action="makeBanner" icon="thumb-tack" label="topic.feature.make_banner" class="btn-primary"}} + {{/if}} +

diff --git a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs index 394153f71b..4423fe5f72 100644 --- a/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs +++ b/app/assets/javascripts/discourse/templates/modal/upload_selector.hbs @@ -38,7 +38,7 @@
{{i18n 'cancel'}} diff --git a/app/assets/javascripts/discourse/templates/navigation/default.hbs b/app/assets/javascripts/discourse/templates/navigation/default.hbs index 529dae5587..b02c503fd8 100644 --- a/app/assets/javascripts/discourse/templates/navigation/default.hbs +++ b/app/assets/javascripts/discourse/templates/navigation/default.hbs @@ -1,9 +1,3 @@ -{{#if isSearch}} -
- {{input type="text" value=searchTerm class="input-xxlarge search" action="search"}} - -
-{{else}} {{bread-crumbs categories=categories}} {{navigation-bar navItems=navItems filterMode=filterMode}} @@ -11,4 +5,3 @@ {{#if canCreateTopic}} {{/if}} -{{/if}} diff --git a/app/assets/javascripts/discourse/templates/post-small-action.hbs b/app/assets/javascripts/discourse/templates/post-small-action.hbs new file mode 100644 index 0000000000..42c11c5246 --- /dev/null +++ b/app/assets/javascripts/discourse/templates/post-small-action.hbs @@ -0,0 +1,9 @@ +{{post-gap post=this postStream=controller.model.postStream before="true"}} + +{{small-action actionCode=action_code + post=this + daysAgo=view.daysAgo + editPost="editPost" + deletePost="deletePost"}} + +{{post-gap post=this postStream=controller.model.postStream before="false"}} diff --git a/app/assets/javascripts/discourse/templates/post.hbs b/app/assets/javascripts/discourse/templates/post.hbs index 8ff38ff55f..bcdc0f7f82 100644 --- a/app/assets/javascripts/discourse/templates/post.hbs +++ b/app/assets/javascripts/discourse/templates/post.hbs @@ -1,7 +1,7 @@ {{post-gap post=this postStream=controller.model.postStream before="true"}} {{#if hasTimeGap}} - {{time-gap gapDays=daysSincePrevious}} + {{time-gap daysAgo=daysSincePrevious}} {{/if}}
@@ -128,3 +128,4 @@ {{post-gap post=this postStream=controller.model.postStream before="false"}} +{{plugin-outlet "post-bottom"}} diff --git a/app/assets/javascripts/discourse/templates/share.hbs b/app/assets/javascripts/discourse/templates/share.hbs index cdc48cfb58..019da99478 100644 --- a/app/assets/javascripts/discourse/templates/share.hbs +++ b/app/assets/javascripts/discourse/templates/share.hbs @@ -1,6 +1,5 @@ {{#if controller.link}}

{{view.title}}

- {{i18n 'share.copied'}} {{#if date}} {{displayDate}} diff --git a/app/assets/javascripts/discourse/templates/topic-entrance.hbs b/app/assets/javascripts/discourse/templates/topic-entrance.hbs index 3dbe96f871..399ac0bdaf 100644 --- a/app/assets/javascripts/discourse/templates/topic-entrance.hbs +++ b/app/assets/javascripts/discourse/templates/topic-entrance.hbs @@ -1,7 +1,7 @@ -{{#d-button action="enterTop" class="full no-text jump-top"}} +{{#d-button action="enterTop" class="full jump-top"}} {{fa-icon 'caret-up'}} {{{topDate}}} {{/d-button}} -{{#d-button action="enterBottom" class="full no-text jump-button"}} +{{#d-button action="enterBottom" class="full jump-button"}} {{{bottomDate}}} {{fa-icon 'caret-down'}} {{/d-button}} diff --git a/app/assets/javascripts/discourse/templates/topic.hbs b/app/assets/javascripts/discourse/templates/topic.hbs index 26e8bbc017..5267a9febc 100644 --- a/app/assets/javascripts/discourse/templates/topic.hbs +++ b/app/assets/javascripts/discourse/templates/topic.hbs @@ -26,8 +26,8 @@ {{plugin-outlet "edit-topic"}} - {{d-button action="finishedEditingTopic" class="btn-primary btn-small no-text submit-edit" icon="check"}} - {{d-button action="cancelEditingTopic" class="btn-small no-text cancel-edit" icon="times"}} + {{d-button action="finishedEditingTopic" class="btn-primary btn-small submit-edit" icon="check"}} + {{d-button action="cancelEditingTopic" class="btn-small cancel-edit" icon="times"}} {{else}}

{{#unless model.is_warning}} diff --git a/app/assets/javascripts/discourse/templates/user-invited-show.hbs b/app/assets/javascripts/discourse/templates/user-invited-show.hbs index f591b52d25..29c5f62bf4 100644 --- a/app/assets/javascripts/discourse/templates/user-invited-show.hbs +++ b/app/assets/javascripts/discourse/templates/user-invited-show.hbs @@ -6,13 +6,13 @@
    - {{nav-item route='userInvited.show' routeParam='redeemed' label='user.invited.redeemed_tab'}} {{nav-item route='userInvited.show' routeParam='pending' label='user.invited.pending_tab'}} + {{nav-item route='userInvited.show' routeParam='redeemed' label='user.invited.redeemed_tab'}}
- {{d-button action="showInvite" label='user.invited.create' class='btn'}} + {{d-button icon="plus" action="showInvite" label="user.invited.create" class="btn"}} {{#if canBulkInvite}} {{resumable-upload target="/invites/upload" success="uploadSuccess" error="uploadError" uploadText=uploadText}} {{/if}} diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs index 76f5446c9c..9a29f36a87 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.hbs +++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs @@ -91,7 +91,7 @@ {{! we want the "huge" version even though we're downsizing it to "large" in CSS }} {{bound-avatar model "huge"}} {{#if allowAvatarUpload}} - {{d-button action="showAvatarSelector" class="pad-left no-text" icon="pencil"}} + {{d-button action="showAvatarSelector" class="pad-left" icon="pencil"}} {{else}} {{#unless ssoOverridesAvatar}} {{fa-icon "pencil"}} @@ -216,17 +216,17 @@
- + {{category-group categories=model.watchedCategories blacklist=selectedCategories}}
{{i18n 'user.watched_categories_instructions'}}
- + {{category-group categories=model.trackedCategories blacklist=selectedCategories}}
{{i18n 'user.tracked_categories_instructions'}}
- + {{category-group categories=model.mutedCategories blacklist=selectedCategories}}
{{i18n 'user.muted_categories_instructions'}}
@@ -235,7 +235,7 @@
- + {{user-selector excludeCurrentUser=true usernames=model.muted_usernames class="user-selector"}}
{{i18n 'user.muted_users_instructions'}}
diff --git a/app/assets/javascripts/discourse/views/composer.js.es6 b/app/assets/javascripts/discourse/views/composer.js.es6 index 354ed503dc..36a4777933 100644 --- a/app/assets/javascripts/discourse/views/composer.js.es6 +++ b/app/assets/javascripts/discourse/views/composer.js.es6 @@ -584,15 +584,18 @@ const ComposerView = Discourse.View.extend(Ember.Evented, { }.property('model.categoryId'), replyValidation: function() { + const postType = this.get('model.post.post_type'); + if (postType === this.site.get('post_types.small_action')) { return; } + const replyLength = this.get('model.replyLength'), - missingChars = this.get('model.missingReplyCharacters'); + missingChars = this.get('model.missingReplyCharacters'); let reason; if (replyLength < 1) { reason = I18n.t('composer.error.post_missing'); } else if (missingChars > 0) { reason = I18n.t('composer.error.post_length', {min: this.get('model.minimumPostLength')}); - let tl = Discourse.User.currentProp("trust_level"); + const tl = Discourse.User.currentProp("trust_level"); if (tl === 0 || tl === 1) { reason += "
" + I18n.t('composer.error.try_like'); } diff --git a/app/assets/javascripts/discourse/views/full-page-search.js.es6 b/app/assets/javascripts/discourse/views/full-page-search.js.es6 new file mode 100644 index 0000000000..b05aa16848 --- /dev/null +++ b/app/assets/javascripts/discourse/views/full-page-search.js.es6 @@ -0,0 +1,5 @@ +import ScrollTop from 'discourse/mixins/scroll-top'; + +export default Ember.View.extend(ScrollTop, { + +}); diff --git a/app/assets/javascripts/discourse/views/header.js.es6 b/app/assets/javascripts/discourse/views/header.js.es6 index d2cfdb9322..906c479fe4 100644 --- a/app/assets/javascripts/discourse/views/header.js.es6 +++ b/app/assets/javascripts/discourse/views/header.js.es6 @@ -76,11 +76,12 @@ export default Discourse.View.extend({ $dropdown.find('input[type=text]').focus().select(); $html.on('click.d-dropdown', function(e) { - return $(e.target).closest('.d-dropdown').length > 0 ? true : hideDropdown.apply(self); + return $(e.target).closest('.d-dropdown').length > 0 ? true : hideDropdown(); }); $dropdown.on('click.d-dropdown', function(e) { - return $(e.target).closest('a').not('.search-link, .filter-type').length > 0 ? hideDropdown.apply(self) : true; + if(e.shiftKey || e.metaKey || e.ctrlKey || e.which === 2) return true; + return $(e.target).closest('a').not('.search-link, .filter-type').length > 0 ? hideDropdown() : true; }); $html.data('hide-dropdown', hideDropdown); diff --git a/app/assets/javascripts/discourse/views/post.js.es6 b/app/assets/javascripts/discourse/views/post.js.es6 index af93ef94ad..12891e215c 100644 --- a/app/assets/javascripts/discourse/views/post.js.es6 +++ b/app/assets/javascripts/discourse/views/post.js.es6 @@ -2,7 +2,6 @@ const DAY = 60 * 50 * 1000; const PostView = Discourse.GroupedView.extend(Ember.Evented, { classNames: ['topic-post', 'clearfix'], - templateName: 'post', classNameBindings: ['needsModeratorClass:moderator:regular', 'selected', 'post.hidden:post-hidden', @@ -13,6 +12,10 @@ const PostView = Discourse.GroupedView.extend(Ember.Evented, { post: Ember.computed.alias('content'), + templateName: function() { + return (this.get('post.post_type') === this.site.get('post_types.small_action')) ? 'post-small-action' : 'post'; + }.property('post.post_type'), + historyHeat: function() { const updatedAt = this.get('post.updated_at'); if (!updatedAt) { return; } diff --git a/app/assets/javascripts/discourse/views/share.js.es6 b/app/assets/javascripts/discourse/views/share.js.es6 index ab052c2c5c..4bc44acd9f 100644 --- a/app/assets/javascripts/discourse/views/share.js.es6 +++ b/app/assets/javascripts/discourse/views/share.js.es6 @@ -1,3 +1,4 @@ + export default Discourse.View.extend({ templateName: 'share', elementId: 'share-link', @@ -18,34 +19,13 @@ export default Discourse.View.extend({ return null; }.property('controller.link'), - copyLink($element) { - const element = $element[0]; - try { - if (document.queryCommandSupported('copy')) { - let newRange = document.createRange(); - newRange.selectNode(element); - const selection = window.getSelection(); - selection.removeAllRanges(); - selection.addRange(newRange); - - if (document.execCommand("copy")) { - this.set('controller.copied', true); - } - } - } catch (e) { - // Ignore - } - }, - linkChanged: function() { const self = this; - this.set('controller.copied', false); if (this.present('controller.link')) { Em.run.next(function() { if (!self.capabilities.touch) { var $linkInput = $('#share-link input'); $linkInput.val(self.get('controller.link')); - self.copyLink($linkInput); // Wait for the fade-in transition to finish before selecting the link: window.setTimeout(function() { @@ -55,7 +35,9 @@ export default Discourse.View.extend({ var $linkForTouch = $('#share-link .share-for-touch a'); $linkForTouch.attr('href',self.get('controller.link')); $linkForTouch.html(self.get('controller.link')); - self.copyLink($linkForTouch); + var range = window.document.createRange(); + range.selectNode($linkForTouch[0]); + window.getSelection().addRange(range); } }); } 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 64073d65dc..d1d0ca7e6d 100644 --- a/app/assets/javascripts/discourse/views/topic-list-item.js.es6 +++ b/app/assets/javascripts/discourse/views/topic-list-item.js.es6 @@ -65,10 +65,6 @@ 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; @@ -134,22 +130,6 @@ 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/locales/i18n.js b/app/assets/javascripts/locales/i18n.js index 61ebac3941..c88b055160 100644 --- a/app/assets/javascripts/locales/i18n.js +++ b/app/assets/javascripts/locales/i18n.js @@ -52,6 +52,8 @@ I18n.PLACEHOLDER = /(?:\{\{|%\{)(.*?)(?:\}\}?)/gm; I18n.fallbackRules = {}; +I18n.noFallbacks = false; + I18n.pluralizationRules = { en: function(n) { return n === 0 ? ["zero", "none", "other"] : n === 1 ? "one" : "other"; @@ -192,6 +194,15 @@ I18n.interpolate = function(message, options) { I18n.translate = function(scope, options) { options = this.prepareOptions(options); var translation = this.lookup(scope, options); + // Fallback to the default locale + if (!translation && this.currentLocale() !== this.defaultLocale && !this.noFallbacks) { + options.locale = this.defaultLocale; + translation = this.lookup(scope, options); + } + if (!translation && this.currentLocale() !== 'en' && !this.noFallbacks) { + options.locale = 'en'; + translation = this.lookup(scope, options); + } try { if (typeof translation === "object") { @@ -513,6 +524,7 @@ I18n.enable_verbose_localization = function(){ var keys = {}; var t = I18n.t; + I18n.noFallbacks = true; I18n.t = I18n.translate = function(scope, value){ var current = keys[scope]; diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss index c19763d3cf..3f87f8fb9d 100644 --- a/app/assets/stylesheets/common.scss +++ b/app/assets/stylesheets/common.scss @@ -1,7 +1,7 @@ @import "vendor/normalize"; +@import "vendor/font_awesome/font-awesome"; @import "common/foundation/helpers"; @import "common/foundation/base"; -@import "vendor/font_awesome/font-awesome"; @import "vendor/select2"; @import "common/foundation/mixins"; @import "common/foundation/variables"; diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss index 05891ad344..166829bb16 100644 --- a/app/assets/stylesheets/common/admin/admin_base.scss +++ b/app/assets/stylesheets/common/admin/admin_base.scss @@ -773,6 +773,9 @@ table.api-keys { i.fa { color: $primary; } + i.fa-heart { + color: $love; + } } th { @@ -816,6 +819,15 @@ table.api-keys { } } } + + tr.reverse-colors { + td.value.trending-down i.down { + color: $success; + } + td.value.trending-up i.up { + color: $danger; + } + } } &.detected-problems { @@ -1423,15 +1435,31 @@ tr.not-activated { float: left; } - .form-element { + .form-element, .form-element-desc { float: left; - width: 25%; + min-height: 30px; + padding: 0.25em 0; + + &.input-area { + width: 75%; + input[type=text] { + width: 50%; + } + } + + &.label-area { + width: 25%; + label { + margin: 0.5em 1em 0 0; + text-align: right; + font-weight: bold; + } + } } .controls { float: right; text-align: right; - width: 20%; } .clearfix { @@ -1459,12 +1487,21 @@ table#user-badges { white-space: nowrap; overflow: hidden; text-overflow: ellipsis; + + cursor: move; } .values { margin-bottom: 10px; } + .placeholder { + border-bottom: 1px solid #ddd; + padding: 3px; + margin-right: 10px; + height: 30px; + } + input[type=text] { width: 90%; } @@ -1473,12 +1510,22 @@ table#user-badges { // Permalinks .permalinks { - .url, .external_url { - width: 300px; + .url, .topic, .category, .external_url, .post { + text-overflow: ellipsis; + white-space: nowrap; } - .action, .topic_id, .post_id, .category_id { + .url { + width: 200px; + } + .topic, .post, .external_url { + width: 180px; + } + .category { + width: 140px; + } + .action { text-align: center; - width: 9.9099%; + width: 8%; } } diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss index ebd2d26860..7518c2cc0d 100644 --- a/app/assets/stylesheets/common/base/_topic-list.scss +++ b/app/assets/stylesheets/common/base/_topic-list.scss @@ -16,10 +16,15 @@ } } +html.anon .topic-list a.title:visited:not(.badge-notification) {color: scale-color($primary, $lightness: 45%);} +.topic-list a.title.visited:not(.badge-notification) {color: scale-color($primary, $lightness: 45%);} + .topic-list { width: 100%; border-collapse: collapse; + + > tbody > tr { &.has-excerpt .star { vertical-align: top; @@ -191,6 +196,10 @@ ol.category-breadcrumb { float: left; margin-right: 5px; } + + .bread-crumbs-right-outlet { + float: left; + } } .list-controls .category-dropdown-menu { diff --git a/app/assets/stylesheets/common/base/discourse.scss b/app/assets/stylesheets/common/base/discourse.scss index d9bf627978..43da67c1e5 100644 --- a/app/assets/stylesheets/common/base/discourse.scss +++ b/app/assets/stylesheets/common/base/discourse.scss @@ -4,8 +4,13 @@ img.avatar { .container { @extend .clearfix; +} + +.wrap { + @extend .clearfix; margin-right: auto; margin-left: auto; + padding: 0 8px; .contents { position: relative; } diff --git a/app/assets/stylesheets/common/base/onebox.scss b/app/assets/stylesheets/common/base/onebox.scss index 37dab75c7e..2ff7b0d3aa 100644 --- a/app/assets/stylesheets/common/base/onebox.scss +++ b/app/assets/stylesheets/common/base/onebox.scss @@ -48,7 +48,7 @@ a.loading-onebox { margin-right: 10px; } h3, h4 { - margin: 0 !important; + margin: 0; } code { max-height: 400px; @@ -117,7 +117,7 @@ aside.onebox { h3, h4 { font-size: 1.17em; - margin: 10px 0 !important; + margin: 10px 0; } a[href] { @@ -239,6 +239,23 @@ pre.onebox code { margin-left:100px; } -.twitterstatus .onebox-body p { - white-space: pre-wrap; +//Onebox - Twitter - Status +aside.onebox.twitterstatus .onebox-body { + h4 { + margin-bottom: 0; + } +} +.onebox.twitterstatus { + .thumbnail { + float: left; + } + p { + float: left; + white-space: pre-wrap; + margin-top: 5px; + width: 100%; + } + .date { + clear: left; + } } diff --git a/app/assets/stylesheets/common/base/search.scss b/app/assets/stylesheets/common/base/search.scss new file mode 100644 index 0000000000..33b5263269 --- /dev/null +++ b/app/assets/stylesheets/common/base/search.scss @@ -0,0 +1,51 @@ +.fps-result { + + .badge-wrapper span.badge-category { + max-width: inherit; + } + + margin-bottom: 28px; + max-width: 675px; + .topic { + a { + color: scale-color($primary, $lightness: 10%); + } + line-height: 20px; + } + .avatar { + position: relative; + top: -3px; + margin-right: 4px; + } + .search-link { + .topic-statuses, .topic-title { + font-size: 1.4em; + } + } + .blurb { + font-size: 1.0em; + line-height: 24px; + word-wrap: break-word; + clear: both; + color: scale-color($primary, $lightness: 20%); + .date { + color: scale-color($primary, $lightness: 40%); + } + + .search-highlight { + color: scale-color($primary, $lightness: 25%); + } + } +} + +.search.row { + margin-bottom: 15px; + input { + height: 22px; + padding-left: 6px; + } +} + +.search-footer { + margin-bottom: 30px; +} diff --git a/app/assets/stylesheets/common/base/topic-admin-menu.scss b/app/assets/stylesheets/common/base/topic-admin-menu.scss index fb7b3b6f93..79cb3cbbdb 100644 --- a/app/assets/stylesheets/common/base/topic-admin-menu.scss +++ b/app/assets/stylesheets/common/base/topic-admin-menu.scss @@ -30,30 +30,36 @@ } } -.modal-body.feature-topic .feature-section { - display: block; - .button { - width: 33%; - display: inline-block; - vertical-align: top; - margin-top: 15px; +.modal-body.feature-topic { + padding: 5px; + max-height: 500px; + hr { + margin: 10px 0; } - .desc { - display: inline-block; - vertical-align: middle; - max-width: 60%; - margin-left: 10px; - p { - margin: 10px 0; + .feature-section { + display: block; + .badge-wrapper { + margin-right: 0; + } + input[type="date"] { + width: 120px; + margin: 0; + } + .desc { + display: inline-block; + vertical-align: middle; + margin-left: 10px; + p:first-of-type { + margin: 0; + } + p { + margin: 10px 0 0; + } } } } + .mobile-view .feature-topic .feature-section { - .button { - width: auto; - display: block; - margin: 0 10px; - } .desc { display: block; clear: both; diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss index 7e2444b2cc..ec590ae39c 100644 --- a/app/assets/stylesheets/common/base/topic-post.scss +++ b/app/assets/stylesheets/common/base/topic-post.scss @@ -243,4 +243,70 @@ blockquote > *:last-child { } +table.md-table { + thead { + border-bottom: 2px solid lighten($primary, 80%); + th { + text-align: left; + padding-bottom: 2px; + } + } + td,th { + padding: 3px 3px 3px 10px; + } + tr { + border-bottom: 1px solid lighten($primary, 80%); + } +} + +.small-action { + .topic-avatar { + padding: 5px 0; + border-top: none; + float: left; + i { + font-size: 35px; + width: 45px; + text-align: center; + color: lighten($primary, 75%); + } + } + + .small-action-desc { + padding: 0.5em 0 0.5em 4em; + margin-top: 5px; + text-transform: uppercase; + font-weight: bold; + font-size: 0.9em; + color: lighten($primary, 50%); + + .custom-message { + text-transform: none; + margin: 15px 0px 5px; + font-weight: normal; + font-size: 14px; + p { + margin: 5px 0; + } + } + + .avatar { + margin-right: 0.8em; + float: left; + } + + > p { + margin: 0; + padding-top: 4px; + } + } + + button { + background: transparent; + border: 0; + float: right; + } + + clear: both; +} diff --git a/app/assets/stylesheets/common/base/topic.scss b/app/assets/stylesheets/common/base/topic.scss index af7f87704a..18701110bc 100644 --- a/app/assets/stylesheets/common/base/topic.scss +++ b/app/assets/stylesheets/common/base/topic.scss @@ -49,6 +49,7 @@ #suggested-topics h3 .badge-wrapper.box span, #suggested-topics h3 .badge-wrapper.bar span { display: inline; + overflow: inherit; } #suggested-topics h3 .badge-wrapper.bullet span.badge-category, { diff --git a/app/assets/stylesheets/common/base/upload.scss b/app/assets/stylesheets/common/base/upload.scss index 60c1f55785..97fdf508ec 100644 --- a/app/assets/stylesheets/common/base/upload.scss +++ b/app/assets/stylesheets/common/base/upload.scss @@ -1,15 +1,3 @@ -.add-upload .fa-plus { - font-size: 0.714em; - position: relative; - left: -5px; - bottom: -5px; - text-shadow: - -1px -1px 0 scale-color($tertiary, $lightness: -10%), - 1px 1px 0 scale-color($tertiary, $lightness: -10%), - 1px -1px 0 scale-color($tertiary, $lightness: -10%), - -1px 1px 0 scale-color($tertiary, $lightness: -10%); -} - .uploaded-image-preview { background-position: center center; background-size: cover; diff --git a/app/assets/stylesheets/common/base/user.scss b/app/assets/stylesheets/common/base/user.scss index a1d5a3f967..cbca0bece7 100644 --- a/app/assets/stylesheets/common/base/user.scss +++ b/app/assets/stylesheets/common/base/user.scss @@ -15,6 +15,12 @@ } } +.user-main { + i.fa-heart { + color: $love !important; + } +} + .user-field { .required { text-align: top; @@ -65,7 +71,6 @@ } } - } .avatar-selector { diff --git a/app/assets/stylesheets/common/components/buttons.css.scss b/app/assets/stylesheets/common/components/buttons.css.scss index 0964956a8b..0c05fd1982 100644 --- a/app/assets/stylesheets/common/components/buttons.css.scss +++ b/app/assets/stylesheets/common/components/buttons.css.scss @@ -5,6 +5,7 @@ // Base // -------------------------------------------------- + .btn { display: inline-block; margin: 0; @@ -125,20 +126,21 @@ color: $secondary; } &:before { - margin-right: 7px; - font-family: zocial; - line-height: 0.9; + margin-right: 9px; + font-family: FontAwesome; + line-height: 1.6em; + font-size: 1.3em; } &.google, &.google_oauth2 { background: $google; &:before { - content: "G"; + content: $fa-var-google; } } &.facebook { background: $facebook; &:before { - content: "f"; + content: $fa-var-facebook; } } &.cas { @@ -147,19 +149,19 @@ &.twitter { background: $twitter; &:before { - content: "T"; + content: $fa-var-twitter; } } &.yahoo { background: $yahoo; &:before { - content: "Y"; + content: $fa-var-yahoo; } } &.github { background: $github; &:before { - content: "g"; + content: $fa-var-github; } } } diff --git a/app/assets/stylesheets/desktop/discourse.scss b/app/assets/stylesheets/desktop/discourse.scss index 52997e7b1f..0d117b4ae2 100644 --- a/app/assets/stylesheets/desktop/discourse.scss +++ b/app/assets/stylesheets/desktop/discourse.scss @@ -6,7 +6,7 @@ body { min-width: $medium-width; } - .container, + .wrap, .full-width { width: $medium-width; } @@ -17,7 +17,7 @@ and (max-width : 570px) { body { min-width: 0; } - .container, + .wrap, .full-width { min-width: 0; } diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss index 45da7a1477..2e90524da0 100644 --- a/app/assets/stylesheets/desktop/topic-list.scss +++ b/app/assets/stylesheets/desktop/topic-list.scss @@ -298,15 +298,6 @@ button.dismiss-read { @media all and (max-width : 850px) { - // add some left padding to topics otherwise everything is 100% flush - // with left edge in portrait tablet, which looks awful - #topic-title { - padding-left: 10px; - } - .container.posts { - padding-left: 10px; - } - .nav-pills { > li > a { font-size: 1em; @@ -315,7 +306,6 @@ and (max-width : 850px) { } .list-controls { - padding: 0 5px; .btn { font-size: 1em diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss index 8f051d1e92..873ed56a2e 100644 --- a/app/assets/stylesheets/desktop/topic-post.scss +++ b/app/assets/stylesheets/desktop/topic-post.scss @@ -1,8 +1,5 @@ -.container { - @extend .clearfix; +.wrap { max-width: $large-width; - margin-right: auto; - margin-left: auto; } .full-width { @@ -137,10 +134,8 @@ nav.post-controls { &:active { background: dark-light-diff($tertiary, $secondary, 50%, -35%); - box-shadow: inset 0 1px 3px rgba(0,0,0, .3); - + box-shadow: inset 0 1px 3px rgba(0,0,0, .3); } - } .create i { @@ -156,13 +151,13 @@ nav.post-controls { margin-left: 3px; transition: all linear 0.15s; - &:hover { + &:hover { background: dark-light-diff($primary, $secondary, 90%, -60%); color: $primary; } &:active { - box-shadow: inset 0 1px 3px rgba(0,0,0, .4); + box-shadow: inset 0 1px 3px rgba(0,0,0, .4); } &.hidden { @@ -186,6 +181,9 @@ nav.post-controls { &.has-like[disabled]:hover { background: transparent; } + &.has-like[disabled]:active { + box-shadow: none; + } &.bookmark {padding: 8px 11px; } @@ -590,7 +588,7 @@ a.mention { } .deleted { - .topic-body { + .topic-body, .small-action { background-color: dark-light-diff(rgba($danger,.7), $secondary, 50%, -60%); } } @@ -729,35 +727,15 @@ $topic-avatar-width: 45px; width: calc(#{$topic-avatar-width} + #{$topic-body-width} + 2 * #{$topic-body-width-padding}); } -.time-gap { +.small-action { width: 755px; border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); - .topic-avatar { - padding: 5px 0; - border-top: none; - } -} - -.time-gap .topic-avatar i { - font-size: 35px; - width: 45px; - text-align: center; - color: lighten($primary, 75%); -} -.time-gap-words { - display: inline-block; - padding: 0.5em 1em; - margin-top: 9px; - text-transform: uppercase; - font-weight: bold; - font-size: 0.9em; - color: lighten($primary, 60%); } .posts-wrapper { position: relative; -webkit-font-smoothing: subpixel-antialiased; - } +} .dropdown { position: relative; diff --git a/app/assets/stylesheets/mobile/discourse.scss b/app/assets/stylesheets/mobile/discourse.scss index 30ebb6a6ee..f4a32585b6 100644 --- a/app/assets/stylesheets/mobile/discourse.scss +++ b/app/assets/stylesheets/mobile/discourse.scss @@ -6,12 +6,20 @@ body { background-color: $secondary; } +// This sets the space between the application content and the edge of the +// screen. This value is required in 'mobile/header.scss' to set the position +// of the drop-down menu. +$mobile-wrapper-padding: 10px; +.wrap { + padding: 0 $mobile-wrapper-padding; +} + body { .boxed { height: 100%; .contents { - padding: 10px; + padding: 10px 0; } &.white { background-color: $secondary; diff --git a/app/assets/stylesheets/mobile/header.scss b/app/assets/stylesheets/mobile/header.scss index ad2cfcb96b..08bb4dfb17 100644 --- a/app/assets/stylesheets/mobile/header.scss +++ b/app/assets/stylesheets/mobile/header.scss @@ -5,12 +5,12 @@ .d-header { #site-logo { - max-width: 135px; + max-width: 125px; } // some protection for text-only site titles .title { - max-width: 140px; + max-width: 130px; height: 39px; overflow: hidden; padding: 0; @@ -43,6 +43,7 @@ .d-dropdown { width: 290px; margin-top: -1px; + right: -$mobile-wrapper-padding; // Line-up with edge of screen, not edge of padding // Common diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss index 4a4ab4423a..5f71cddcad 100644 --- a/app/assets/stylesheets/mobile/topic-list.scss +++ b/app/assets/stylesheets/mobile/topic-list.scss @@ -9,7 +9,7 @@ .category-breadcrumb.hidden { display: none; } - margin: 5px; + margin: 5px 0; .nav { float: left; margin-right: 15px; @@ -71,7 +71,7 @@ th, td { - padding: 7px 5px; + padding: 7px 0; color: scale-color($primary, $lightness: 50%); } @@ -223,7 +223,7 @@ tr.category-topic-link { .topic-list-bottom { - margin: 20px 12px 0 12px; + margin: 20px 0 0 0; } diff --git a/app/assets/stylesheets/mobile/topic-post.scss b/app/assets/stylesheets/mobile/topic-post.scss index e9c9ab8f87..ae7b0ae823 100644 --- a/app/assets/stylesheets/mobile/topic-post.scss +++ b/app/assets/stylesheets/mobile/topic-post.scss @@ -167,7 +167,7 @@ a.star { .topic-map { - margin: 10px; + margin: 10px 0; background: dark-light-diff($primary, $secondary, 97%, -45%); border: 1px solid dark-light-diff($primary, $secondary, 90%, -65%); border-top: none; // would cause double top border @@ -300,8 +300,9 @@ a.star { } #topic-footer-buttons { + @include clearfix; border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -60%); - padding: 20px 10px 0 10px; + padding: 20px 0 0 0; .fa-bookmark.bookmarked { color: $tertiary; } } @@ -313,7 +314,7 @@ a.star { #suggested-topics { clear: left; - padding: 20px 10px 15px 10px; + padding: 20px 0 15px 0; th.views, td.views, td.activity, th.activity, th.likes, td.likes { display: none; } @@ -344,7 +345,7 @@ span.post-count { #topic-title { z-index: 1000; margin: 0 0 0 0 !important; - padding: 15px 10px 15px 10px; + padding: 15px 0; } .topic-post { @@ -511,3 +512,17 @@ span.highlighted { .read-state { display: none; } + +.small-action .small-action-desc { + .custom-message { + margin-left: -40px; + } +} + +.small-action .topic-avatar { + padding: 0; +} + +.small-action.time-gap .topic-avatar { + margin-top: -5px; +} diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss index 78cfe1b6f9..db76dd41f7 100644 --- a/app/assets/stylesheets/mobile/topic.scss +++ b/app/assets/stylesheets/mobile/topic.scss @@ -14,8 +14,8 @@ .edits {margin-right: 5px;} #topic-title { - margin-bottom: 20px; - margin: 0 60px 10px 20px; + //margin-bottom: 20px; + margin: 0 60px 10px 0; h1 { font-size: 1.5em; line-height: 1.25em; diff --git a/app/controllers/admin/permalinks_controller.rb b/app/controllers/admin/permalinks_controller.rb index 9c2eb47fb2..875110e87a 100644 --- a/app/controllers/admin/permalinks_controller.rb +++ b/app/controllers/admin/permalinks_controller.rb @@ -3,12 +3,8 @@ class Admin::PermalinksController < Admin::AdminController before_filter :fetch_permalink, only: [:destroy] def index - filter = params[:filter] - - permalinks = Permalink - permalinks = permalinks.where('url ILIKE :filter OR external_url ILIKE :filter', filter: "%#{params[:filter]}%") if filter.present? - permalinks = permalinks.limit(100).order('created_at desc').to_a - + url = params[:filter] + permalinks = Permalink.filter_by(url) render_serialized(permalinks, PermalinkSerializer) end diff --git a/app/controllers/admin/user_fields_controller.rb b/app/controllers/admin/user_fields_controller.rb index e5e8c9c3a9..0980381ec4 100644 --- a/app/controllers/admin/user_fields_controller.rb +++ b/app/controllers/admin/user_fields_controller.rb @@ -1,40 +1,58 @@ class Admin::UserFieldsController < Admin::AdminController def self.columns - [:name, :field_type, :editable, :description, :required, :show_on_profile] + [:name, :field_type, :editable, :description, :required, :show_on_profile, :position] end def create field = UserField.new(params.require(:user_field).permit(*Admin::UserFieldsController.columns)) + + field.position = (UserField.maximum(:position) || 0) + 1 field.required = params[:required] == "true" + fetch_options(field) + json_result(field, serializer: UserFieldSerializer) do field.save end end def index - render_serialized(UserField.all, UserFieldSerializer, root: 'user_fields') + user_fields = UserField.all.includes(:user_field_options).order(:position) + render_serialized(user_fields, UserFieldSerializer, root: 'user_fields') end def update - field_params = params.require(:user_field) - + field_params = params[:user_field] field = UserField.where(id: params.require(:id)).first Admin::UserFieldsController.columns.each do |col| - field.send("#{col}=", field_params[col] || false) + unless field_params[col].nil? + field.send("#{col}=", field_params[col]) + end end + UserFieldOption.where(user_field_id: field.id).delete_all + fetch_options(field) - json_result(field, serializer: UserFieldSerializer) do - field.save + if field.save + render_serialized(field, UserFieldSerializer, root: 'user_field') + else + render_json_error(field) end end def destroy field = UserField.where(id: params.require(:id)).first field.destroy if field.present? - render nothing: true + render json: success_json end + protected + + def fetch_options(field) + options = params[:user_field][:options] + if options.present? + field.user_field_options_attributes = options.map {|o| {value: o} }.uniq + end + end end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index aa29468fb2..b1a665be4b 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -155,6 +155,8 @@ class ApplicationController < ActionController::Base else SiteSetting.default_locale end + + I18n.fallbacks.ensure_loaded! end def store_preloaded(key, json) @@ -307,7 +309,7 @@ class ApplicationController < ActionController::Base def preload_current_user_data store_preloaded("currentUser", MultiJson.dump(CurrentUserSerializer.new(current_user, scope: guardian, root: false))) - serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report([current_user.id]), each_serializer: TopicTrackingStateSerializer) + serializer = ActiveModel::ArraySerializer.new(TopicTrackingState.report(current_user.id), each_serializer: TopicTrackingStateSerializer) store_preloaded("topicTrackingStates", MultiJson.dump(serializer)) end @@ -434,7 +436,7 @@ class ApplicationController < ActionController::Base def build_not_found_page(status=404, layout=false) category_topic_ids = Category.pluck(:topic_id).compact - @container_class = "container not-found-container" + @container_class = "wrap not-found-container" @top_viewed = Topic.where.not(id: category_topic_ids).top_viewed(10) @recent = Topic.where.not(id: category_topic_ids).recent(10) @slug = params[:slug].class == String ? params[:slug] : '' diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 45d00fbc97..17e1a49545 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -69,7 +69,7 @@ class ListController < ApplicationController # Note the first is the default and we don't add a title if (filter.to_s != current_homepage) && use_crawler_layout? - filter_title = I18n.t("js.filters.#{filter.to_s}.title") + filter_title = I18n.t("js.filters.#{filter.to_s}.title", count: 0) if list_opts[:category] @title = I18n.t('js.filters.with_category', filter: filter_title, category: Category.find(list_opts[:category]).name) else diff --git a/app/controllers/permalinks_controller.rb b/app/controllers/permalinks_controller.rb index 4211c85fb5..f78256da04 100644 --- a/app/controllers/permalinks_controller.rb +++ b/app/controllers/permalinks_controller.rb @@ -2,7 +2,7 @@ class PermalinksController < ApplicationController skip_before_filter :check_xhr, :preload_json def show - url = request.fullpath[1..-1] + url = request.fullpath permalink = Permalink.find_by_url(url) diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index ad0e8cb540..0d301b1bbb 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -131,8 +131,14 @@ class PostsController < ApplicationController changes[:category_id] = params[:post][:category_id] if params[:post][:category_id] end + # We don't need to validate edits to small action posts by staff + opts = {} + if post.post_type == Post.types[:small_action] && current_user.staff? + opts[:skip_validations] = true + end + revisor = PostRevisor.new(post) - if revisor.revise!(current_user, changes) + if revisor.revise!(current_user, changes, opts) TopicLink.extract_from(post) QuotedPost.extract_from(post) end diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index f78087a4f9..7430d9f410 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -2,10 +2,30 @@ require_dependency 'search' class SearchController < ApplicationController + skip_before_filter :check_xhr, only: :show + def self.valid_context_types %w{user topic category private_messages} end + def show + search = Search.new(params[:q], type_filter: 'topic', guardian: guardian, include_blurbs: true, blurb_length: 300) + result = search.execute + + serializer = serialize_data(result, GroupedSearchResultSerializer, :result => result) + + respond_to do |format| + format.html do + store_preloaded("search", MultiJson.dump(serializer)) + end + + format.json do + render_json_dump(serializer) + end + end + + end + def query params.require(:term) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 8c7c69c11f..88e30c3924 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -165,13 +165,16 @@ class TopicsController < ApplicationController def status params.require(:status) params.require(:enabled) - status, topic_id = params[:status], params[:topic_id].to_i - enabled = (params[:enabled] == 'true') + params.permit(:until) + + status = params[:status] + topic_id = params[:topic_id].to_i + enabled = params[:enabled] == 'true' check_for_status_presence(:status, status) @topic = Topic.find_by(id: topic_id) guardian.ensure_can_moderate!(@topic) - @topic.update_status(status, enabled, current_user) + @topic.update_status(status, enabled, current_user, until: params[:until]) render nothing: true end diff --git a/app/controllers/uploads_controller.rb b/app/controllers/uploads_controller.rb index 1036e19363..9affe7d0f1 100644 --- a/app/controllers/uploads_controller.rb +++ b/app/controllers/uploads_controller.rb @@ -1,6 +1,6 @@ class UploadsController < ApplicationController before_filter :ensure_logged_in, except: [:show] - skip_before_filter :preload_json, :check_xhr, only: [:show] + skip_before_filter :preload_json, :check_xhr, :redirect_to_login_if_required, only: [:show] def create type = params.require(:type) @@ -30,6 +30,7 @@ class UploadsController < ApplicationController RailsMultisite::ConnectionManagement.with_connection(params[:site]) do |db| return render_404 unless Discourse.store.internal? return render_404 if SiteSetting.prevent_anons_from_downloading_files && current_user.nil? + return render_404 if SiteSetting.login_required? && db == "default" && current_user.nil? if upload = Upload.find_by(sha1: params[:sha]) || Upload.find_by(id: params[:id], url: request.env["PATH_INFO"]) opts = { filename: upload.original_filename } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 678a1dd33e..2dadd8db44 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -56,7 +56,7 @@ module ApplicationHelper end def html_classes - "#{mobile_view? ? 'mobile-view' : 'desktop-view'} #{mobile_device? ? 'mobile-device' : 'not-mobile-device'} #{rtl_class}" + "#{mobile_view? ? 'mobile-view' : 'desktop-view'} #{mobile_device? ? 'mobile-device' : 'not-mobile-device'} #{rtl_class} #{current_user ? '' : 'anon'}" end def rtl_class diff --git a/app/jobs/base.rb b/app/jobs/base.rb index 8127d755be..5441f26e87 100644 --- a/app/jobs/base.rb +++ b/app/jobs/base.rb @@ -227,7 +227,8 @@ module Jobs end def self.enqueue_at(datetime, job_name, opts={}) - enqueue_in( [(datetime - Time.zone.now).to_i, 0].max, job_name, opts ) + secs = [(datetime - Time.zone.now).to_i, 0].max + enqueue_in(secs, job_name, opts) end def self.cancel_scheduled_job(job_name, params={}) diff --git a/app/jobs/regular/unpin_topic.rb b/app/jobs/regular/unpin_topic.rb new file mode 100644 index 0000000000..ff894ca6bc --- /dev/null +++ b/app/jobs/regular/unpin_topic.rb @@ -0,0 +1,16 @@ +module Jobs + + class UnpinTopic < Jobs::Base + + def execute(args) + topic_id = args[:topic_id] + + raise Discourse::InvalidParameters.new(:topic_id) unless topic_id.present? + + topic = Topic.find_by(id: topic_id) + topic.update_pinned(false) if topic.present? + end + + end + +end diff --git a/app/jobs/scheduled/about_stats.rb b/app/jobs/scheduled/about_stats.rb new file mode 100644 index 0000000000..d745f8a0d6 --- /dev/null +++ b/app/jobs/scheduled/about_stats.rb @@ -0,0 +1,13 @@ +module Jobs + class AboutStats < Jobs::Scheduled + include Jobs::Stats + + every 30.minutes + + def execute(args) + stats = About.new.stats + set_cache(About, stats) + stats + end + end +end diff --git a/app/jobs/scheduled/dashboard_stats.rb b/app/jobs/scheduled/dashboard_stats.rb index b7123f5d52..ab716b5756 100644 --- a/app/jobs/scheduled/dashboard_stats.rb +++ b/app/jobs/scheduled/dashboard_stats.rb @@ -1,16 +1,13 @@ module Jobs class DashboardStats < Jobs::Scheduled + include Jobs::Stats + every 30.minutes def execute(args) - 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.to_json - + stats = AdminDashboardData.new.as_json + set_cache(AdminDashboardData, stats) stats end - end end diff --git a/app/jobs/scheduled/ensure_db_consistency.rb b/app/jobs/scheduled/ensure_db_consistency.rb index 9dd2a162b8..609dd3184a 100644 --- a/app/jobs/scheduled/ensure_db_consistency.rb +++ b/app/jobs/scheduled/ensure_db_consistency.rb @@ -11,6 +11,7 @@ module Jobs TopicFeaturedUsers.ensure_consistency! PostRevision.ensure_consistency! UserStat.update_view_counts(13.hours.ago) + Topic.ensure_consistency! end end end diff --git a/app/jobs/stats.rb b/app/jobs/stats.rb new file mode 100644 index 0000000000..637091cc6a --- /dev/null +++ b/app/jobs/stats.rb @@ -0,0 +1,9 @@ +module Jobs + module Stats + def set_cache(klass, stats) + # 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 klass.stats_cache_key, (klass.recalculate_stats_interval + 5).minutes, stats.to_json + end + end +end diff --git a/app/models/about.rb b/app/models/about.rb index 34fb8eadf1..1c96d032e2 100644 --- a/app/models/about.rb +++ b/app/models/about.rb @@ -1,9 +1,18 @@ class About include ActiveModel::Serialization + include StatsCacheable attr_accessor :moderators, :admins + def self.stats_cache_key + 'about-stats' + end + + def self.fetch_stats + About.new.stats + end + def version Discourse::VERSION::STRING end diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 517ed57772..a1dfa5f78a 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -1,6 +1,7 @@ require_dependency 'mem_info' class AdminDashboardData + include StatsCacheable GLOBAL_REPORTS ||= [ 'visits', @@ -57,13 +58,7 @@ 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 + AdminDashboardData.new.as_json end def self.stats_cache_key @@ -97,11 +92,6 @@ class AdminDashboardData source.map { |type| Report.find(type).as_json } end - # Could be configurable, multisite need to support it. - def self.recalculate_interval - 30 # minutes - end - def rails_env_check I18n.t("dashboard.rails_env_warning", env: Rails.env) unless Rails.env.production? end diff --git a/app/models/concerns/stats_cacheable.rb b/app/models/concerns/stats_cacheable.rb new file mode 100644 index 0000000000..d7364111f4 --- /dev/null +++ b/app/models/concerns/stats_cacheable.rb @@ -0,0 +1,24 @@ +module StatsCacheable + extend ActiveSupport::Concern + + module ClassMethods + def stats_cache_key + raise 'Stats cache key has not been set.' + end + + def fetch_stats + raise 'Not implemented.' + end + + # Could be configurable, multisite need to support it. + def recalculate_stats_interval + 30 # minutes + end + + def fetch_cached_stats + # The scheduled Stats job is responsible for generating and caching this. + stats = $redis.get(stats_cache_key) + stats ? JSON.parse(stats) : nil + end + end +end diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb index 30f2da1b4b..ec6146162b 100644 --- a/app/models/directory_item.rb +++ b/app/models/directory_item.rb @@ -59,7 +59,7 @@ class DirectoryItem < ActiveRecord::Base AND COALESCE(t.visible, true) AND p.deleted_at IS NULL AND (NOT (COALESCE(p.hidden, false))) - AND COALESCE(p.post_type, :regular_post_type) != :moderator_action + AND COALESCE(p.post_type, :regular_post_type) = :regular_post_type AND u.id > 0 GROUP BY u.id", period_type: period_types[period_type], @@ -68,8 +68,7 @@ class DirectoryItem < ActiveRecord::Base was_liked_type: UserAction::WAS_LIKED, new_topic_type: UserAction::NEW_TOPIC, reply_type: UserAction::REPLY, - regular_post_type: Post.types[:regular], - moderator_action: Post.types[:moderator_action] + regular_post_type: Post.types[:regular] end end end diff --git a/app/models/global_setting.rb b/app/models/global_setting.rb index e21afde1c2..78058e3e3c 100644 --- a/app/models/global_setting.rb +++ b/app/models/global_setting.rb @@ -23,7 +23,10 @@ class GlobalSetting hash[s] = val end end - hash["host_names"] = [ hostname ] + hostnames = [ hostname ] + hostnames << backup_hostname if backup_hostname.present? + + hash["host_names"] = hostnames hash["database"] = db_name hash["prepared_statements"] = !!self.db_prepared_statements diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb index 969c20bbe7..a70c86e63a 100644 --- a/app/models/optimized_image.rb +++ b/app/models/optimized_image.rb @@ -99,6 +99,7 @@ class OptimizedImage < ActiveRecord::Base def self.resize_instructions(from, to, dimensions, opts={}) # NOTE: ORDER is important! %W{ + convert #{from}[0] -gravity center -background transparent @@ -113,17 +114,18 @@ class OptimizedImage < ActiveRecord::Base def self.resize_instructions_animated(from, to, dimensions, opts={}) %W{ + gifsicle #{from} - -coalesce - -gravity center - -thumbnail #{dimensions}^ - -extent #{dimensions} - #{to} + --colors=256 + --resize-fit #{dimensions} + --optimize=3 + --output #{to} } end def self.downsize_instructions(from, to, dimensions, opts={}) %W{ + convert #{from}[0] -gravity center -background transparent @@ -133,14 +135,7 @@ class OptimizedImage < ActiveRecord::Base end def self.downsize_instructions_animated(from, to, dimensions, opts={}) - %W{ - #{from} - -coalesce - -gravity center - -background transparent - -resize #{dimensions}#{!!opts[:force_aspect_ratio] ? "\\!" : "\\>"} - #{to} - } + resize_instructions_animated(from, to, dimensions, opts) end def self.resize(from, to, width, height, opts={}) @@ -164,7 +159,7 @@ class OptimizedImage < ActiveRecord::Base end def self.convert_with(instructions, to) - `convert #{instructions.join(" ")} &> /dev/null` + `#{instructions.join(" ")} &> /dev/null` return false if $?.exitstatus != 0 ImageOptim.new.optimize_image!(to) diff --git a/app/models/permalink.rb b/app/models/permalink.rb index c7c7d567e3..086df29440 100644 --- a/app/models/permalink.rb +++ b/app/models/permalink.rb @@ -80,6 +80,16 @@ class Permalink < ActiveRecord::Base return category.url if category nil end + + def self.filter_by(url=nil) + permalinks = Permalink + .includes(:topic, :post, :category) + .order('permalinks.created_at desc') + + permalinks.where!('url ILIKE :url OR external_url ILIKE :url', url: "%#{url}%") if url.present? + permalinks.limit!(100) + permalinks.to_a + end end # == Schema Information diff --git a/app/models/post.rb b/app/models/post.rb index 7a0a98dca6..7dfe6c3e57 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -73,7 +73,7 @@ class Post < ActiveRecord::Base end def self.types - @types ||= Enum.new(:regular, :moderator_action) + @types ||= Enum.new(:regular, :moderator_action, :small_action) end def self.cook_methods @@ -99,10 +99,10 @@ class Post < ActiveRecord::Base # consistency checks should fix, but message # is safe to skip MessageBus.publish("/topic/#{topic_id}", { - id: id, - post_number: post_number, - updated_at: Time.now, - type: type + id: id, + post_number: post_number, + updated_at: Time.now, + type: type }, group_ids: topic.secure_group_ids) if topic end @@ -179,10 +179,12 @@ class Post < ActiveRecord::Base new_cooked = Plugin::Filter.apply(:after_post_cook, self, cooked) - if new_cooked != cooked && new_cooked.blank? - Rails.logger.warn("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}") - elsif new_cooked.blank? - Rails.logger.warn("Blank post detected post: #{self.url}\nraw: #{self.raw}") + if post_type == Post.types[:regular] + if new_cooked != cooked && new_cooked.blank? + Rails.logger.warn("Plugin is blanking out post: #{self.url}\nraw: #{self.raw}") + elsif new_cooked.blank? + Rails.logger.warn("Blank post detected post: #{self.url}\nraw: #{self.raw}") + end end new_cooked diff --git a/app/models/post_action.rb b/app/models/post_action.rb index 20c0d62007..90c25b715c 100644 --- a/app/models/post_action.rb +++ b/app/models/post_action.rb @@ -205,7 +205,7 @@ SQL end def staff_already_replied?(topic) - topic.posts.where("user_id IN (SELECT id FROM users WHERE moderator OR admin) OR post_type = :post_type", post_type: Post.types[:moderator_action]).exists? + topic.posts.where("user_id IN (SELECT id FROM users WHERE moderator OR admin) OR (post_type != :regular_post_type)", regular_post_type: Post.types[:regular]).exists? end def self.create_message_for_post_action(user, post, post_action_type_id, opts) @@ -465,7 +465,7 @@ SQL # the threshold has been reached, we will close the topic waiting for intervention message = I18n.t("temporarily_closed_due_to_flags") - topic.update_status("closed", true, Discourse.system_user, message) + topic.update_status("closed", true, Discourse.system_user, message: message) end def self.auto_hide_if_needed(acting_user, post, post_action_type) diff --git a/app/models/top_topic.rb b/app/models/top_topic.rb index ca7290a673..6cfd437599 100644 --- a/app/models/top_topic.rb +++ b/app/models/top_topic.rb @@ -32,7 +32,7 @@ class TopTopic < ActiveRecord::Base def self.periods - @@periods ||= [:all, :yearly, :monthly, :weekly, :daily].freeze + @@periods ||= [:all, :yearly, :quarterly, :monthly, :weekly, :daily].freeze end def self.sort_orders @@ -181,10 +181,11 @@ class TopTopic < ActiveRecord::Base def self.start_of(period) case period - when :yearly then 1.year.ago - when :monthly then 1.month.ago - when :weekly then 1.week.ago - when :daily then 1.day.ago + when :yearly then 1.year.ago + when :monthly then 1.month.ago + when :quarterly then 3.months.ago + when :weekly then 1.week.ago + when :daily then 1.day.ago end end @@ -207,38 +208,56 @@ end # # Table name: top_topics # -# id :integer not null, primary key -# topic_id :integer -# yearly_posts_count :integer default(0), not null -# yearly_views_count :integer default(0), not null -# yearly_likes_count :integer default(0), not null -# monthly_posts_count :integer default(0), not null -# monthly_views_count :integer default(0), not null -# monthly_likes_count :integer default(0), not null -# weekly_posts_count :integer default(0), not null -# weekly_views_count :integer default(0), not null -# weekly_likes_count :integer default(0), not null -# daily_posts_count :integer default(0), not null -# daily_views_count :integer default(0), not null -# daily_likes_count :integer default(0), not null -# yearly_score :float default(0.0) -# monthly_score :float default(0.0) -# weekly_score :float default(0.0) -# daily_score :float default(0.0) +# id :integer not null, primary key +# topic_id :integer +# yearly_posts_count :integer default(0), not null +# yearly_views_count :integer default(0), not null +# yearly_likes_count :integer default(0), not null +# monthly_posts_count :integer default(0), not null +# monthly_views_count :integer default(0), not null +# monthly_likes_count :integer default(0), not null +# weekly_posts_count :integer default(0), not null +# weekly_views_count :integer default(0), not null +# weekly_likes_count :integer default(0), not null +# daily_posts_count :integer default(0), not null +# daily_views_count :integer default(0), not null +# daily_likes_count :integer default(0), not null +# daily_score :float default(0.0) +# weekly_score :float default(0.0) +# monthly_score :float default(0.0) +# yearly_score :float default(0.0) +# all_score :float default(0.0) +# daily_op_likes_count :integer default(0), not null +# weekly_op_likes_count :integer default(0), not null +# monthly_op_likes_count :integer default(0), not null +# yearly_op_likes_count :integer default(0), not null +# quarterly_posts_count :integer default(0), not null +# quarterly_views_count :integer default(0), not null +# quarterly_likes_count :integer default(0), not null +# quarterly_score :float default(0.0) +# quarterly_op_likes_count :integer default(0), not null # # Indexes # -# index_top_topics_on_daily_likes_count (daily_likes_count) -# index_top_topics_on_daily_posts_count (daily_posts_count) -# index_top_topics_on_daily_views_count (daily_views_count) -# index_top_topics_on_monthly_likes_count (monthly_likes_count) -# index_top_topics_on_monthly_posts_count (monthly_posts_count) -# index_top_topics_on_monthly_views_count (monthly_views_count) -# index_top_topics_on_topic_id (topic_id) UNIQUE -# index_top_topics_on_weekly_likes_count (weekly_likes_count) -# index_top_topics_on_weekly_posts_count (weekly_posts_count) -# index_top_topics_on_weekly_views_count (weekly_views_count) -# index_top_topics_on_yearly_likes_count (yearly_likes_count) -# index_top_topics_on_yearly_posts_count (yearly_posts_count) -# index_top_topics_on_yearly_views_count (yearly_views_count) +# index_top_topics_on_daily_likes_count (daily_likes_count) +# index_top_topics_on_daily_op_likes_count (daily_op_likes_count) +# index_top_topics_on_daily_posts_count (daily_posts_count) +# index_top_topics_on_daily_views_count (daily_views_count) +# index_top_topics_on_monthly_likes_count (monthly_likes_count) +# index_top_topics_on_monthly_op_likes_count (monthly_op_likes_count) +# index_top_topics_on_monthly_posts_count (monthly_posts_count) +# index_top_topics_on_monthly_views_count (monthly_views_count) +# index_top_topics_on_quarterly_likes_count (quarterly_likes_count) +# index_top_topics_on_quarterly_op_likes_count (quarterly_op_likes_count) +# index_top_topics_on_quarterly_posts_count (quarterly_posts_count) +# index_top_topics_on_quarterly_views_count (quarterly_views_count) +# index_top_topics_on_topic_id (topic_id) UNIQUE +# index_top_topics_on_weekly_likes_count (weekly_likes_count) +# index_top_topics_on_weekly_op_likes_count (weekly_op_likes_count) +# index_top_topics_on_weekly_posts_count (weekly_posts_count) +# index_top_topics_on_weekly_views_count (weekly_views_count) +# index_top_topics_on_yearly_likes_count (yearly_likes_count) +# index_top_topics_on_yearly_op_likes_count (yearly_op_likes_count) +# index_top_topics_on_yearly_posts_count (yearly_posts_count) +# index_top_topics_on_yearly_views_count (yearly_views_count) # diff --git a/app/models/topic.rb b/app/models/topic.rb index b3904cac7a..60ad4cc567 100644 --- a/app/models/topic.rb +++ b/app/models/topic.rb @@ -106,7 +106,6 @@ 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 @@ -407,8 +406,8 @@ class Topic < ActiveRecord::Base similar end - def update_status(status, enabled, user, message=nil) - TopicStatusUpdate.new(self, user).update!(status, enabled, message) + def update_status(status, enabled, user, opts={}) + TopicStatusUpdate.new(self, user).update!(status, enabled, opts) end # Atomically creates the next post number @@ -490,15 +489,18 @@ class Topic < ActiveRecord::Base true end - def add_moderator_post(user, text, opts={}) + def add_moderator_post(user, text, opts=nil) + opts ||= {} new_post = nil Topic.transaction do creator = PostCreator.new(user, raw: text, - post_type: Post.types[:moderator_action], + post_type: opts[:post_type] || Post.types[:moderator_action], + action_code: opts[:action_code], no_bump: opts[:bump].blank?, skip_notifications: opts[:skip_notifications], - topic_id: self.id) + topic_id: self.id, + skip_validations: true) new_post = creator.create increment!(:moderator_posts_count) end @@ -724,9 +726,17 @@ class Topic < ActiveRecord::Base TopicUser.change(user.id, id, cleared_pinned_at: nil) end - def update_pinned(status, global=false) - update_column(:pinned_at, status ? Time.now : nil) - update_column(:pinned_globally, global) + def update_pinned(status, global=false, pinned_until=nil) + pinned_until = Time.parse(pinned_until) rescue nil + + update_columns( + pinned_at: status ? Time.now : nil, + pinned_globally: global, + pinned_until: pinned_until + ) + + Jobs.cancel_scheduled_job(:unpin_topic, topic_id: self.id) + Jobs.enqueue_at(pinned_until, :unpin_topic, topic_id: self.id) if pinned_until end def draft_key @@ -743,6 +753,11 @@ class Topic < ActiveRecord::Base end end + def self.ensure_consistency! + # unpin topics that might have been missed + Topic.where("pinned_until < now()").update_all(pinned_at: nil, pinned_globally: false, pinned_until: nil) + end + def self.auto_close Topic.where("NOT closed AND auto_close_at < ? AND auto_close_user_id IS NOT NULL", 1.minute.ago).each do |t| t.auto_close diff --git a/app/models/topic_status_update.rb b/app/models/topic_status_update.rb index 4f23d7c3de..64dcc256e8 100644 --- a/app/models/topic_status_update.rb +++ b/app/models/topic_status_update.rb @@ -1,21 +1,20 @@ TopicStatusUpdate = Struct.new(:topic, :user) do - def update!(status, enabled, message=nil) + def update!(status, enabled, opts={}) status = Status.new(status, enabled) Topic.transaction do - change(status) + change(status, opts) highest_post_number = topic.highest_post_number - - create_moderator_post_for(status, message) + create_moderator_post_for(status, opts[:message]) update_read_state_for(status, highest_post_number) end end private - def change(status) + def change(status, opts={}) if status.pinned? || status.pinned_globally? - topic.update_pinned(status.enabled?, status.pinned_globally?) + topic.update_pinned(status.enabled?, status.pinned_globally?, opts[:until]) elsif status.autoclosed? topic.update_column('closed', status.enabled?) else @@ -49,8 +48,6 @@ TopicStatusUpdate = Struct.new(:topic, :user) do locale_key = status.locale_key locale_key << "_lastpost" if topic.auto_close_based_on_last_post message_for_autoclosed(locale_key) - else - I18n.t(status.locale_key) end end @@ -69,7 +66,9 @@ TopicStatusUpdate = Struct.new(:topic, :user) do end def options_for(status) - { bump: status.reopening_topic? } + { bump: status.reopening_topic?, + post_type: Post.types[:small_action], + action_code: status.action_code } end Status = Struct.new(:name, :enabled) do @@ -85,8 +84,12 @@ TopicStatusUpdate = Struct.new(:topic, :user) do !enabled? end + def action_code + "#{name}.#{enabled? ? 'enabled' : 'disabled'}" + end + def locale_key - "topic_statuses.#{name}_#{enabled? ? 'enabled' : 'disabled'}" + "topic_statuses.#{action_code.gsub('.', '_')}" end def reopening_topic? diff --git a/app/models/topic_tracking_state.rb b/app/models/topic_tracking_state.rb index 0bf3fa7096..e5272922f9 100644 --- a/app/models/topic_tracking_state.rb +++ b/app/models/topic_tracking_state.rb @@ -114,7 +114,7 @@ class TopicTrackingState ).where_values[0] end - def self.report(user_ids, topic_id = nil) + def self.report(user_id, topic_id = nil) # Sam: this is a hairy report, in particular I need custom joins and fancy conditions # Dropping to sql_builder so I can make sense of it. @@ -138,25 +138,25 @@ class TopicTrackingState last_read_post_number, c.id AS category_id, tu.notification_level - FROM users u - INNER JOIN user_stats AS us ON us.user_id = u.id - FULL OUTER JOIN topics ON 1=1 + FROM topics + JOIN users u on u.id = :user_id + JOIN user_stats AS us ON us.user_id = u.id + JOIN categories c ON c.id = topics.category_id LEFT JOIN topic_users tu ON tu.topic_id = topics.id AND tu.user_id = u.id - LEFT JOIN categories c ON c.id = topics.category_id - WHERE u.id IN (:user_ids) AND + WHERE u.id = :user_id AND topics.archetype <> 'private_message' AND ((#{unread}) OR (#{new})) AND (topics.visible OR u.admin OR u.moderator) AND topics.deleted_at IS NULL AND - ( category_id IS NULL OR NOT c.read_restricted OR u.admin OR category_id IN ( + ( NOT c.read_restricted OR u.admin OR category_id IN ( SELECT c2.id FROM categories c2 JOIN category_groups cg ON cg.category_id = c2.id - JOIN group_users gu ON gu.user_id = u.id AND cg.group_id = gu.group_id + JOIN group_users gu ON gu.user_id = :user_id AND cg.group_id = gu.group_id WHERE c2.read_restricted ) ) AND NOT EXISTS( SELECT 1 FROM category_users cu WHERE last_read_post_number IS NULL AND - cu.user_id = u.id AND + cu.user_id = :user_id AND cu.category_id = topics.category_id AND cu.notification_level = #{CategoryUser.notification_levels[:muted]}) @@ -169,7 +169,7 @@ SQL sql << " ORDER BY topics.bumped_at DESC ) SELECT * FROM x LIMIT 500" SqlBuilder.new(sql) - .map_exec(TopicTrackingState, user_ids: user_ids, topic_id: topic_id) + .map_exec(TopicTrackingState, user_id: user_id, topic_id: topic_id) end diff --git a/app/models/upload.rb b/app/models/upload.rb index b8e0a1e5f5..59a647f769 100644 --- a/app/models/upload.rb +++ b/app/models/upload.rb @@ -65,8 +65,8 @@ class Upload < ActiveRecord::Base w = svg["width"].to_i h = svg["height"].to_i else - # fix orientation first - fix_image_orientation(file.path) + # fix orientation first (but not for GIFs) + fix_image_orientation(file.path) unless filename =~ /\.GIF$/i # retrieve image info image_info = FastImage.new(file) rescue nil w, h = *(image_info.try(:size) || [0, 0]) @@ -80,7 +80,7 @@ class Upload < ActiveRecord::Base # crop images depending on their type if CROPPED_IMAGE_TYPES.include?(options[:image_type]) - allow_animation = false + allow_animation = SiteSetting.allow_animated_thumbnails max_pixel_ratio = Discourse::PIXEL_RATIOS.max case options[:image_type] diff --git a/app/models/user_field.rb b/app/models/user_field.rb index 648163326a..e060795098 100644 --- a/app/models/user_field.rb +++ b/app/models/user_field.rb @@ -1,5 +1,7 @@ class UserField < ActiveRecord::Base validates_presence_of :name, :description, :field_type + has_many :user_field_options, dependent: :destroy + accepts_nested_attributes_for :user_field_options def self.max_length 2048 diff --git a/app/models/user_field_option.rb b/app/models/user_field_option.rb new file mode 100644 index 0000000000..b603fcaea5 --- /dev/null +++ b/app/models/user_field_option.rb @@ -0,0 +1,2 @@ +class UserFieldOption < ActiveRecord::Base +end diff --git a/app/serializers/about_serializer.rb b/app/serializers/about_serializer.rb index df8eebc177..7111c6ac47 100644 --- a/app/serializers/about_serializer.rb +++ b/app/serializers/about_serializer.rb @@ -8,4 +8,8 @@ class AboutSerializer < ApplicationSerializer :locale, :version, :https + + def stats + object.class.fetch_cached_stats || Jobs::AboutStats.new.execute({}) + end end diff --git a/app/serializers/admin_post_serializer.rb b/app/serializers/admin_post_serializer.rb index 38a31992dc..2dd29df5c0 100644 --- a/app/serializers/admin_post_serializer.rb +++ b/app/serializers/admin_post_serializer.rb @@ -46,7 +46,7 @@ class AdminPostSerializer < ApplicationSerializer end def moderator_action - object.post_type == Post.types[:moderator_action] + object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action] end def deleted_by diff --git a/app/serializers/listable_topic_serializer.rb b/app/serializers/listable_topic_serializer.rb index 79ffae02ff..94963913e2 100644 --- a/app/serializers/listable_topic_serializer.rb +++ b/app/serializers/listable_topic_serializer.rb @@ -11,7 +11,6 @@ class ListableTopicSerializer < BasicTopicSerializer :bumped_at, :unseen, :last_read_post_number, - :linked_post_number, :unread, :new_posts, :pinned, @@ -79,19 +78,7 @@ class ListableTopicSerializer < BasicTopicSerializer 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] + object.excerpt end alias :include_last_read_post_number? :has_user_data @@ -107,7 +94,7 @@ class ListableTopicSerializer < BasicTopicSerializer alias :include_new_posts? :has_user_data def include_excerpt? - pinned || object.search_data + pinned end def pinned diff --git a/app/serializers/permalink_serializer.rb b/app/serializers/permalink_serializer.rb index 2d621ed72d..98f2062f79 100644 --- a/app/serializers/permalink_serializer.rb +++ b/app/serializers/permalink_serializer.rb @@ -1,3 +1,31 @@ class PermalinkSerializer < ApplicationSerializer - attributes :id, :url, :topic_id, :post_id, :category_id, :external_url + attributes :id, :url, :topic_id, :topic_title, :topic_url, :post_id, :post_url, :post_number, :post_topic_title, :category_id, :category_name, :category_url, :external_url + + def topic_title + object.try(:topic).try(:title) + end + + def topic_url + object.try(:topic).try(:url) + end + + def post_url + object.try(:post).try(:url) + end + + def post_number + object.try(:post).try(:post_number) + end + + def post_topic_title + object.try(:post).try(:topic).try(:title) + end + + def category_name + object.try(:category).try(:name) + end + + def category_url + object.try(:category).try(:url) + end end diff --git a/app/serializers/post_serializer.rb b/app/serializers/post_serializer.rb index daf5d6fafe..4111fbbde2 100644 --- a/app/serializers/post_serializer.rb +++ b/app/serializers/post_serializer.rb @@ -57,7 +57,8 @@ class PostSerializer < BasicPostSerializer :wiki, :user_custom_fields, :static_doc, - :via_email + :via_email, + :action_code def initialize(object, opts) super(object, opts) @@ -281,6 +282,10 @@ class PostSerializer < BasicPostSerializer scope.is_staff? ? object.version : object.public_version end + def include_action_code? + object.action_code.present? + end + private def post_actions diff --git a/app/serializers/topic_view_serializer.rb b/app/serializers/topic_view_serializer.rb index 1fd56f54a1..9cda8e1c01 100644 --- a/app/serializers/topic_view_serializer.rb +++ b/app/serializers/topic_view_serializer.rb @@ -43,6 +43,7 @@ class TopicViewSerializer < ApplicationSerializer :pinned_globally, :pinned, # Is topic pinned and viewer hasn't cleared the pin? :pinned_at, # Ignores clear pin + :pinned_until, :details, :highest_post_number, :last_read_post_number, @@ -177,6 +178,10 @@ class TopicViewSerializer < ApplicationSerializer object.topic.pinned_at end + def pinned_until + object.topic.pinned_until + end + def actions_summary result = [] return [] unless post = object.posts.try(:first) diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb index ccf02e031c..f6dcf2b9fb 100644 --- a/app/serializers/user_action_serializer.rb +++ b/app/serializers/user_action_serializer.rb @@ -32,7 +32,7 @@ class UserActionSerializer < ApplicationSerializer def excerpt cooked = object.cooked || PrettyText.cook(object.raw) - PrettyText.excerpt(cooked, 300) if cooked + PrettyText.excerpt(cooked, 300, { keep_emojis: true }) if cooked end def avatar_template @@ -68,7 +68,7 @@ class UserActionSerializer < ApplicationSerializer end def moderator_action - object.post_type == Post.types[:moderator_action] + object.post_type == Post.types[:moderator_action] || object.post_type == Post.types[:small_action] end def include_reply_to_post_number? diff --git a/app/serializers/user_field_serializer.rb b/app/serializers/user_field_serializer.rb index 8638b2c04d..7c06898061 100644 --- a/app/serializers/user_field_serializer.rb +++ b/app/serializers/user_field_serializer.rb @@ -5,5 +5,15 @@ class UserFieldSerializer < ApplicationSerializer :field_type, :editable, :required, - :show_on_profile + :show_on_profile, + :position, + :options + + def options + object.user_field_options.pluck(:value) + end + + def include_options? + options.present? + end end diff --git a/app/serializers/user_serializer.rb b/app/serializers/user_serializer.rb index 737b1f39ec..fc35edd2cd 100644 --- a/app/serializers/user_serializer.rb +++ b/app/serializers/user_serializer.rb @@ -196,7 +196,7 @@ class UserSerializer < BasicUserSerializer end def bio_excerpt - object.user_profile.bio_excerpt(350 ,keep_newlines: true) + object.user_profile.bio_excerpt(350 , { keep_newlines: true, keep_emojis: true }) end def include_suspend_reason? diff --git a/app/services/post_alerter.rb b/app/services/post_alerter.rb index 59250eae3f..64853e9155 100644 --- a/app/services/post_alerter.rb +++ b/app/services/post_alerter.rb @@ -24,7 +24,7 @@ class PostAlerter end create_notification(user, Notification.types[:private_message], post) end - elsif post.post_type != Post.types[:moderator_action] + elsif post.post_type == Post.types[:regular] # If it's not a private message and it's not an automatic post caused by a moderator action, notify the users notify_post_users(post) end diff --git a/app/services/post_owner_changer.rb b/app/services/post_owner_changer.rb index bf8868591b..c7aa0b7511 100644 --- a/app/services/post_owner_changer.rb +++ b/app/services/post_owner_changer.rb @@ -16,7 +16,6 @@ class PostOwnerChanger @topic.user = @new_owner if post.is_first_post? if post.user == nil - post.recover! @topic.recover! if post.is_first_post? end post.topic = @topic diff --git a/app/views/application/_header.html.erb b/app/views/application/_header.html.erb index 7129203bca..a179dbc0c8 100644 --- a/app/views/application/_header.html.erb +++ b/app/views/application/_header.html.erb @@ -1,5 +1,5 @@
-
+
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb index 98332fec1f..012592f0df 100644 --- a/app/views/common/_discourse_javascript.html.erb +++ b/app/views/common/_discourse_javascript.html.erb @@ -33,6 +33,7 @@ Discourse.Environment = '<%= Rails.env %>'; Discourse.SiteSettings = PreloadStore.get('siteSettings'); Discourse.LetterAvatarVersion = '<%= LetterAvatar.version %>'; + I18n.defaultLocale = '<%= SiteSetting.default_locale %>'; PreloadStore.get("customEmoji").forEach(function(emoji) { Discourse.Dialect.registerEmoji(emoji.name, emoji.url); }); diff --git a/app/views/common/_special_font_face.html.erb b/app/views/common/_special_font_face.html.erb index d6b169e353..27e5cb67e9 100644 --- a/app/views/common/_special_font_face.html.erb +++ b/app/views/common/_special_font_face.html.erb @@ -21,12 +21,4 @@ font-weight: normal; font-style: normal; } - - @font-face { - font-family: 'zocial'; - src: url('<%=asset_path "zocial-regular-webfont.woff" %>?<%= font_domain %>') format('woff'), - url('<%=asset_path "zocial-regular-webfont.ttf" %>?<%= font_domain %>') format('truetype'); - font-weight: normal; - font-style: normal; - } diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 479ee1f5a7..a740289035 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -38,7 +38,7 @@

<% @posts.each do |post| %> - + - + + + <% end %>
" title="<%= post[:user].username %>"> @@ -15,9 +15,9 @@

<%= link_to post[:title], post[:url] %>

<%= raw post[:excerpt] %>

 - <%= raw post[:html_reason_counts] %> -
<%= raw post[:html_reason_counts] %>
diff --git a/app/views/search/show.html.erb b/app/views/search/show.html.erb new file mode 100644 index 0000000000..e69de29bb2 diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 76404ccfa7..9478eefd8f 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -61,4 +61,4 @@ image: @topic_view.image_url) %> <% end %> -<% content_for(:title) { @topic_view.title } %> +<% content_for(:title) { "#{@topic_view.page_title}" } %> diff --git a/config/cloud/cloud66/files/production.rb b/config/cloud/cloud66/files/production.rb index b7f03a0977..db662574be 100644 --- a/config/cloud/cloud66/files/production.rb +++ b/config/cloud/cloud66/files/production.rb @@ -23,11 +23,6 @@ Discourse::Application.configure do # Specifies the header that your server uses for sending files config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # you may use other configuration here for mail eg: sendgrid config.action_mailer.delivery_method = :smtp diff --git a/config/discourse_defaults.conf b/config/discourse_defaults.conf index faf88116a2..3b2ae347d9 100644 --- a/config/discourse_defaults.conf +++ b/config/discourse_defaults.conf @@ -46,6 +46,9 @@ db_prepared_statements = true # hostname running the forum hostname = "www.example.com" +# backup hostname mainly for cdn use +backup_hostname = + # address of smtp server used to send emails smtp_address = diff --git a/config/environments/production.rb b/config/environments/production.rb index 30263174ad..013e37f597 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -24,10 +24,6 @@ Discourse::Application.configure do config.log_level = :info - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - if GlobalSetting.smtp_address settings = { address: GlobalSetting.smtp_address, diff --git a/config/environments/profile.rb b/config/environments/profile.rb index 43531b0d5c..1784a23528 100644 --- a/config/environments/profile.rb +++ b/config/environments/profile.rb @@ -27,10 +27,6 @@ Discourse::Application.configure do # Specifies the header that your server uses for sending files config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - # we recommend you use mailcatcher https://github.com/sj26/mailcatcher config.action_mailer.smtp_settings = { address: "localhost", port: 1025 } diff --git a/config/initializers/i18n.rb b/config/initializers/i18n.rb new file mode 100644 index 0000000000..00dab6775c --- /dev/null +++ b/config/initializers/i18n.rb @@ -0,0 +1,35 @@ +# order: after 02-freedom_patches.rb + +# Include pluralization module +require 'i18n/backend/pluralization' +I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization) + +# Include fallbacks module +require 'i18n/backend/fallbacks' +I18n.backend.class.send(:include, I18n::Backend::Fallbacks) + +# Configure custom fallback order +class FallbackLocaleList < Hash + def [](locale) + # user locale, site locale, english + # TODO - this can be extended to be per-language for a better user experience + # (e.g. fallback zh_TW to zh_CN / vice versa) + [locale, SiteSetting.default_locale.to_sym, :en].uniq.compact + end + + def ensure_loaded! + self[I18n.locale].each { |l| I18n.ensure_loaded! l } + end +end + +class NoFallbackLocaleList < FallbackLocaleList + def [](locale) + [locale] + end +end + +if Rails.env.production? + I18n.fallbacks = FallbackLocaleList.new +else + I18n.fallbacks = NoFallbackLocaleList.new +end diff --git a/config/initializers/pluralization.rb b/config/initializers/pluralization.rb deleted file mode 100644 index 0a567d4451..0000000000 --- a/config/initializers/pluralization.rb +++ /dev/null @@ -1,2 +0,0 @@ -require "i18n/backend/pluralization" -I18n::Backend::Simple.send(:include, I18n::Backend::Pluralization) diff --git a/config/locales/client.ar.yml b/config/locales/client.ar.yml index d635a2dacd..91b805ba72 100644 --- a/config/locales/client.ar.yml +++ b/config/locales/client.ar.yml @@ -596,7 +596,6 @@ ar: every_two_weeks: "كل أسبوعين" email_direct: "تلقي رسالة إلكترونية عند اقتباس مشاركة لك أو الرد على عليها أو في حالة ذكر اسمك @username" email_private_messages: "إرسال إشعار بالبريد الإلكتروني عندما يرسل لك شخصاً رسالة خاصة" - email_always: "لاتفعل ارسال رسائل بريدية اذا كنت متفاعل مع الموقع" other_settings: "اخرى" categories_settings: "اقسام" new_topic_duration: @@ -775,6 +774,7 @@ ar: email_placeholder: "البريد الإلكتروني أو إسم المستخدم" caps_lock_warning: "Caps Lock is on" error: "مشكل غير معروف" + rate_limit: "الرجاء اﻹنتظارقبل محاولة تسجيل الدخول مجدداً." blank_username_or_password: "أدخل اسم المستخدم أو البريد الإلكتروني و كلمة المرور." reset_password: ' إعادة تعيين الرمز السري' logging_in: "...تسجيل الدخول " @@ -914,10 +914,7 @@ 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: "رابط ستشير له الصورة" @@ -1951,6 +1948,7 @@ ar: none_installed: "لاتملك اي اضافة مثبته" version: "الاصدار" change_settings: "تغيير الاعدادت" + change_settings_short: "الاعدادات" howto: "كيف اثبت اضافة؟" backups: title: "نسخة احتياطية" diff --git a/config/locales/client.bs_BA.yml b/config/locales/client.bs_BA.yml index 0875af53a2..9af4196203 100644 --- a/config/locales/client.bs_BA.yml +++ b/config/locales/client.bs_BA.yml @@ -245,17 +245,30 @@ bs_BA: posted_by_you: "Posted by you" sent_by_user: "Sent by {{user}}" sent_by_you: "Sent by you" + directory: + title: "Korisnici" + topic_count: "Teme" + post_count: "Replike" + days_visited: "Posijete" + total_rows: + one: "%{count} korisnik" + few: "%{count} korisnika" + other: "%{count} korisnika" groups: - visible: "Group is visible to all users" + visible: "Grupa je vidljiva svim korisnicima" + title: + one: "grupa" + few: "grupe" + other: "grupe" members: "Članovi" posts: "Postovi" alias_levels: title: "Who can use this group as an alias?" nobody: "Niko" only_admins: "Samo admini" - mods_and_admins: "Only moderators and Admins" - members_mods_and_admins: "Only group members, moderators and admins" - everyone: "Everyone" + mods_and_admins: "Samo moderatori i Admini" + members_mods_and_admins: "Samo članovi grupe, moderatori i admini" + everyone: "Svatko" user_action_groups: '1': "Dati Lajkovi" '2': "Dobijeni Lajkovi" @@ -412,7 +425,6 @@ bs_BA: weekly: "nedeljno" email_direct: "Receive an email when someone quotes you, replies to your post, or mentions your @username" email_private_messages: "Receive an email when someone sends you a private message" - email_always: "Do not suppress email notifications when I am active on the site" other_settings: "Other" categories_settings: "Categories" new_topic_duration: @@ -674,7 +686,6 @@ bs_BA: remote_tip: "link do slike http://primjer.com/slika.jpg" remote_tip_with_attachments: "link to image or file http://primjer.com/file.ext (allowed extensions: {{authorized_extensions}})." hint: "(možete i mišom prenijeti vaše slike direktno iz vašeg foldera ovdje)" - hint_for_supported_browsers: "(možete i mišom prenijeti vaše slike direktno iz vašeg foldera ovdje a možete i copy/paste sliku)" uploading: "Uplodujem" image_link: "link do vaše slike će pokazivati" search: diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 3876a908ef..6fd47bff08 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" @@ -506,7 +512,6 @@ cs: every_two_weeks: "každé dva týdny" email_direct: "Zašli mi email, pokud mě někde cituje, odpoví na můj příspěvek, zmíní mé @jméno nebo mě pozve do tématu." email_private_messages: "Zašli mi email, pokud mi někdo pošle zprávu." - email_always: "Posílat upozorňovací emaily, i když jsem zrovna na webu aktivní." other_settings: "Ostatní" categories_settings: "Kategorie" new_topic_duration: @@ -540,8 +545,10 @@ cs: none: "Zatím jste nikoho nepozvali." truncated: "Showing the first {{count}} invites." redeemed: "Uplatněné pozvánky" + redeemed_tab: "Uplatněno" redeemed_at: "Uplatněno" pending: "Nevyřízené pozvánky" + pending_tab: "Čeká na schválení" topics_entered: "Zobrazil témat" posts_read_count: "Přečteno příspěvků" expired: "Poznávka je už prošlá." @@ -670,6 +677,7 @@ cs: email_placeholder: "emailová adresa nebo uživatelské jméno" caps_lock_warning: "zapnutý Caps Lock" error: "Neznámá chyba" + rate_limit: "Počkejte před dalším pokusem se přihlásit." blank_username_or_password: "Vyplňte prosím email nebo uživatelské jméno, a heslo." reset_password: 'Resetovat heslo' logging_in: "Přihlašuji..." @@ -809,10 +817,7 @@ cs: from_the_web: "Z webu" remote_tip: "odkaz na obrázek" remote_tip_with_attachments: "odkaz na obrázek nebo osubor ({{authorized_extensions}})" - local_tip: "klikněte pro vybrání až 10 obrázků z vašeho zařízení" - local_tip_with_attachments: "klikněte pro vybrání až 10 obrázků nebo souborů z vašeho zařízení ({{authorized_extensions}})" hint: "(můžete také rovnou soubor do editoru přetáhnout)" - hint_for_supported_browsers: "(můžete také rovnou obrázky do editoru přetáhnout)" uploading: "Nahrávám" select_file: "Vyberte soubor" image_link: "adresa na kterou má váš obrázek odkazovat" @@ -1102,6 +1107,7 @@ cs: one: "Vyberte prosím nového autora příspěvku od {{old_user}}." few: "Vyberte prosím nového autora {{count}} příspěvků od {{old_user}}." other: "Vyberte prosím nového autora {{count}} příspěvků od {{old_user}}." + instructions_warn: "Poznámka: Žádná upozornění na tento příspěvek nebudou zpětně přenesena na nového uživatele.
Varování: V současné chvíli, žádná data svázaná s příspěvkem nebudou přenesena na nového uživatele. Používejte opatrně." multi_select: select: 'vybrat' selected: 'vybráno ({{count}})' @@ -1138,6 +1144,22 @@ cs: other: "zobrazit {{count}} skrytých odpovědí" more_links: "{{count}} dalších..." unread: "Příspěvek je nepřečtený." + has_replies: + one: "{{count}} odpověď" + few: "{{count}} odpovědi" + other: "{{count}} odpovědí" + has_likes: + one: "{{count}} líbí se mi" + few: "{{count}} líbí se mi" + other: "{{count}} líbí se mi" + has_likes_title: + one: "1 člověku se líbí tento příspěvek" + few: "{{count}} lidem se líbí tento příspěvek" + other: "{{count}} lidem se líbí tento příspěvek" + has_likes_title_you: + zero: "tento příspěvek se mi líbí" + one: "vám a 1 další osobě se tento příspěvek líbí" + other: "vám a {{count}} dalším lidem se tento příspěvek líbí" errors: create: "Bohužel nastala chyba při vytváření příspěvku. Prosím zkuste to znovu." edit: "Bohužel nastala chyba při editaci příspěvku. Prosím zkuste to znovu." @@ -1324,12 +1346,14 @@ cs: category: can: 'smí… ' none: '(bez kategorie)' + all: 'Všechny kategorie' choose: 'Vyberte kategorii…' edit: 'upravit' edit_long: "Upravit" view: 'Zobrazit témata v kategorii' general: 'Základní' settings: 'Nastavení' + topic_template: "Šablona tématu" delete: 'Smazat kategorii' create: 'Nová kategorie' save: 'Uložit kategorii' @@ -1546,6 +1570,7 @@ cs: this_month: "Měsíc" this_week: "Týden" today: "Dnes" + other_periods: "viz nahoře" browser_update: 'Bohužel, váš prohlížeč je příliš starý, aby na něm Discourse mohl fungovat. Prosím aktualizujte svůj prohlížeč.' permission_types: full: "Vytvářet / Odpovídat / Prohlížet" @@ -1579,6 +1604,7 @@ cs: suspended: 'Zakázáno:' private_messages_short: "Msgs" private_messages_title: "Zprávy" + mobile_title: "Mobilní verze" space_free: "{{size}} prázdné" uploads: "Nahrané soubory" backups: "zálohy" @@ -1715,7 +1741,12 @@ cs: name: "Název" none_installed: "Nemáte nainstalované žádné pluginy." version: "Verze" + enabled: "Zapnutý?" + is_enabled: "A" + not_enabled: "N" + cant_disable: "-" change_settings: "Změnit nastavení" + change_settings_short: "Nastavení" howto: "Jak nainstaluji pluginy?" backups: title: "Zálohy" @@ -1771,11 +1802,13 @@ cs: confirm: "Are your sure you want to rollback the database to the previous working state?" export_csv: user_archive_confirm: "Jste si jistí, že chcete stáhnout všechny své příspěvky?" + success: "Export byl spuštěn. O dokončení celého procesu budete informování pomocí zprávy." failed: "Exportování selhalo. Prosím zkontrolujte logy." rate_limit_error: "Příspěvky mohou být staženy jednou za den. Prosíme, zkuste to znovu zítra." button_text: "Export" button_title: user: "Exportovat kompletní seznam uživatelů v CSV formátu." + staff_action: "Exportovat kompletní akce redakce v CSV formátu." screened_email: "Exportovat kompletní seznam emailů v CSV formátu." screened_ip: "Exportovat kompletní seznam IP adres v CSV formátu." screened_url: "Exportovat kompletní seznam URL v CSV formátu." @@ -1968,6 +2001,7 @@ cs: title: "Chybové záznamy" impersonate: title: "Přihlásit se jako" + not_found: "Tento uživatel nebyl nalezen." users: title: 'Uživatelé' create: 'Přidat administrátora' @@ -2232,6 +2266,7 @@ cs: grant: Udělit no_user_badges: "%{name} nezískal žádné oznaky." no_badges: Nejsou tu žádné odznaky, které by se dali rozdat. + none_selected: "Vyberte odznak, abyste mohli začít" allow_title: Povolit užití odzanku jako titul multiple_grant: Může být přiděleno několikrát listable: Zobrazit odznak na veřejné stránce s odzanky @@ -2239,11 +2274,17 @@ cs: icon: Ikona image: Obrázek icon_help: "Použijte buď Font Awesome nebo URL k obrázku." + query: Dotaz na odznak (SQL) trigger: Spouštěč trigger_type: none: "Aktualizujte denně" + post_action: "Když uživatel reaguje na příspěvek" + post_revision: "Když uživatel upraví nebo vytvoří příspěvek" + trust_level_change: "Když uživatel změní důvěryhodnost" user_change: "Když je uživatel upraven nebo vytvořen" preview: + sql_error_header: "Bohužel, nastala chyba s dotazem." + error_help: "Prohlédněte si následující odkazy, které vám zodpoví dotazy o odznacích." bad_count_warning: header: "VAROVÁNÍ!" grant_count: diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 5cd0bb618f..27dce6e189 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -482,7 +482,7 @@ da: every_two_weeks: "hver anden uge" email_direct: "Send mig en email når nogen citerer mig, svarer på mit indlæg, nævner mit @brugernavn eller inviterer mig til et emne" email_private_messages: "Send mig en email når nogen sender mig en besked" - email_always: "Send email notifikationer, selvom jeg er aktiv på forummet" + email_always: "Send mig email-notifikationer, selv når jeg er aktiv på websitet" other_settings: "Andre" categories_settings: "Kategorier" new_topic_duration: @@ -512,8 +512,10 @@ da: none: "Du har ikke inviteret nogen endnu." truncated: "Viser de første {{count}} invitationer." redeemed: "Brugte invitationer" + redeemed_tab: "Indløst" redeemed_at: "Invitation brugt" pending: "Udestående invitationer" + pending_tab: "Afventende" topics_entered: "Emner åbnet" posts_read_count: "Indlæg læst" expired: "Denne invitation er forældet" @@ -641,6 +643,7 @@ da: email_placeholder: "e-mail eller brugernavn" caps_lock_warning: "Caps Lock er sat til" error: "Ukendt fejl" + rate_limit: "Vent venligst, før du prøver at logge på igen." blank_username_or_password: "Skriv din email adresse eller brugernavn og dit password" reset_password: 'Nulstil adgangskode' logging_in: "Logger ind..." @@ -780,10 +783,10 @@ 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}})" + local_tip: "vælg billeder fra din enhed" + local_tip_with_attachments: "vælg 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)" + hint_for_supported_browsers: "Du kan også trække og slippe eller indsætte billeder i editoren for at uploade dem" uploading: "Uploader billede" select_file: "Vælg fil" image_link: "link som dit billede vil pege på" @@ -2245,6 +2248,21 @@ da: name: "Navn" image: "Billede" delete_confirm: "Er du sikker på du vil slette emotikonnet: %{name} ?" + permalink: + title: "Permalinks" + url: "URL" + topic_id: "Emne ID" + topic_title: "Emne" + post_id: "Indlæg ID" + post_title: "Indlæg" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Ekstern URL" + delete_confirm: Er du sikker på at du vil slette dette permalink? + form: + label: "Ny:" + add: "Tilføj" + filter: "Søg (URL eller ekstern URL)" lightbox: download: "download" search_help: diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 8832f72ee1..9bd7efab1e 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -475,14 +475,14 @@ de: website: "Website" email_settings: "E-Mail" email_digests: - title: "Schicke eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:" + title: "Sende eine E-Mail mit Neuigkeiten, wenn ich länger nicht hier bin:" daily: "täglich" every_three_days: "alle drei Tage" weekly: "wöchentlich" every_two_weeks: "alle drei Tage" email_direct: "Sende mir eine E-Mail, wenn mich jemand zitiert, auf meine Beiträge antwortet, meinen @Namen erwähnt oder mich zu einem Thema einlädt." email_private_messages: "Sende mir eine E-Mail, wenn mir jemand eine Nachricht sendet." - email_always: "E-Mail-Benachrichtigungen nicht unterdrücken, während ich im Forum aktiv bin" + email_always: "Benachrichtige mich per E-Mail auch während ich auf dieser Website aktiv bin" other_settings: "Andere" categories_settings: "Kategorien" new_topic_duration: @@ -512,8 +512,10 @@ de: none: "Du hast bis jetzt noch niemanden hierher eingeladen." truncated: "Zeige die ersten {{count}} Einladungen." redeemed: "Angenommene Einladungen" + redeemed_tab: "Angenommen" redeemed_at: "Angenommen" pending: "Ausstehende Einladungen" + pending_tab: "Ausstehend" topics_entered: "Betrachtete Themen" posts_read_count: "Gelesene Beiträge" expired: "Diese Einladung ist abgelaufen." @@ -641,6 +643,7 @@ de: email_placeholder: "E-Mail oder Benutzername" caps_lock_warning: "Feststelltaste ist aktiviert" error: "Unbekannter Fehler" + rate_limit: "Warte bitte ein wenig, bevor du erneut versuchst dich anzumelden." blank_username_or_password: "Bitte gib deine E-Mail-Adresse oder deinen Benutzernamen und dein Passwort ein." reset_password: 'Passwort zurücksetzen' logging_in: "Anmeldung läuft..." @@ -780,10 +783,10 @@ de: from_the_web: "Aus dem Web" remote_tip: "Link zu Bild" remote_tip_with_attachments: "Link zu Bild oder Datei ({{authorized_extensions}})" - local_tip: "durch Klicken kannst du bis zu 10 Bilder von deinem Gerät auswählen" - local_tip_with_attachments: "durch Klicken kannst du bis zu 10 Bilder oder Dateien von deinem Gerät auswählen ({{authorized_extensions}})" + local_tip: "wähle auf deinem Gerät gespeicherte Bilder aus" + local_tip_with_attachments: "wähle auf deinem Gerät gespeicherte Bilder oder Dateien aus ({{authorized_extensions}})" 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)" + 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" @@ -2244,6 +2247,21 @@ de: name: "Name" image: "Bild" delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?" + permalink: + title: "Permanentlinks" + url: "URL" + topic_id: "Themen-ID" + topic_title: "Thema" + post_id: "Beitrags-ID" + post_title: "Beitrag" + category_id: "Kategorie-ID" + category_title: "Kategorie" + external_url: "Externe URL" + delete_confirm: Möchtest du wirklich diesen Permanentlink löschen? + form: + label: "Neu:" + add: "Hinzufügen" + filter: "Suche (URL oder externe URL)" lightbox: download: "herunterladen" search_help: diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 4b6020abf9..e1c4b3c9eb 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -114,12 +114,31 @@ en: topic: 'share a link to this topic' post: 'post #%{postNumber}' close: 'close' - copied: 'copied to clipboard' twitter: 'share this link on Twitter' facebook: 'share this link on Facebook' google+: 'share this link on Google+' email: 'send this link in an email' + action_codes: + autoclosed: + enabled: 'closed this topic %{when}' + disabled: 'opened this topic %{when}' + closed: + enabled: 'closed this topic %{when}' + disabled: 'opened this topic %{when}' + archived: + enabled: 'archived this topic %{when}' + disabled: 'unarchived this topic %{when}' + pinned: + enabled: 'pinned this topic %{when}' + disabled: 'unpinned this topic %{when}' + pinned_globally: + enabled: 'pinned globally this topic %{when}' + disabled: 'unpinned this topic %{when}' + visible: + enabled: 'listed this topic %{when}' + disabled: 'unlisted this topic %{when}' + topic_admin_menu: "topic admin actions" emails_are_disabled: "All outgoing email has been globally disabled by an administrator. No email notifications of any kind will be sent." @@ -375,6 +394,9 @@ en: post_count: "# posts" confirm_delete_other_accounts: "Are you sure you want to delete these accounts?" + user_fields: + none: "(select an option)" + user: said: "{{username}}:" profile: "Profile" @@ -539,7 +561,7 @@ en: email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" email_private_messages: "Send me an email when someone messages me" - email_always: "Do not suppress email notifications when I am active on the site" + email_always: "Send me email notifications even when I am active on the site" other_settings: "Other" categories_settings: "Categories" @@ -871,10 +893,10 @@ en: from_the_web: "From the web" remote_tip: "link to image" remote_tip_with_attachments: "link to image or file ({{authorized_extensions}})" - local_tip: "click to select up to 10 images from your device" - local_tip_with_attachments: "click to select up to 10 images or files from your device ({{authorized_extensions}})" + local_tip: "select images from your device" + local_tip_with_attachments: "select images or files from your device ({{authorized_extensions}})" 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)" + 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" @@ -882,6 +904,8 @@ en: search: title: "search topics, posts, users, or categories" no_results: "No results found." + no_more_results: "No more results found." + search_help: Search help searching: "Searching ..." post_format: "#{{post_number}} by {{username}}" @@ -1110,17 +1134,19 @@ en: feature_topic: title: "Feature this topic" - pin: "Make this topic appear at the top of the {{categoryLink}} category." + pin: "Make this topic appear at the top of the {{categoryLink}} category until" confirm_pin: "You already have {{count}} pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic in this category?" unpin: "Remove this topic from the top of the {{categoryLink}} category." + unpin_until: "Remove this topic from the top of the {{categoryLink}} category or wait until %{until}." pin_note: "Users can unpin the topic individually for themselves." already_pinned: zero: "There are no topics pinned in {{categoryLink}}." one: "Topics currently pinned in {{categoryLink}}: 1." other: "Topics currently pinned in {{categoryLink}}: {{count}}." - pin_globally: "Make this topic appear at the top of all topic lists, until a staff member unpins it." + pin_globally: "Make this topic appear at the top of all topic lists until" confirm_pin_globally: "You already have {{count}} globally pinned topics. Too many pinned topics may be a burden for new and anonymous users. Are you sure you want to pin another topic globally?" unpin_globally: "Remove this topic from the top of all topic lists." + unpin_globally_until: "Remove this topic from the top of all topic lists or wait until %{until}." global_pin_note: "Users can unpin the topic individually for themselves." already_pinned_globally: zero: "There are no topics pinned globally." @@ -1651,6 +1677,8 @@ en: title: "All Time" yearly: title: "Yearly" + quarterly: + title: "Quarterly" monthly: title: "Monthly" weekly: @@ -1659,6 +1687,7 @@ en: title: "Daily" all_time: "All Time" this_year: "Year" + this_quarter: "Quarter" this_month: "Month" this_week: "Week" today: "Today" @@ -2316,6 +2345,7 @@ en: delete: "Delete" cancel: "Cancel" delete_confirm: "Are you sure you want to delete that user field?" + options: "Options" required: title: "Required at signup?" enabled: "required" @@ -2332,6 +2362,7 @@ en: field_types: text: 'Text Field' confirm: 'Confirmation' + dropdown: "Dropdown" site_text: none: "Choose a type of content to begin editing." @@ -2447,8 +2478,11 @@ en: title: "Permalinks" url: "URL" topic_id: "Topic ID" + topic_title: "Topic" post_id: "Post ID" + post_title: "Post" category_id: "Category ID" + category_title: "Category" external_url: "External URL" delete_confirm: Are you sure you want to delete this permalink? form: diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index b7b25f9184..c6ac0008f1 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -178,9 +178,9 @@ es: unbookmark: "Clic para quitar todos los marcadores de este tema" bookmarks: not_logged_in: "Lo sentimos, debes iniciar sesión para guardar posts en marcadores." - created: "has marcado este post como favorito" - not_bookmarked: "has leído este post, haz clic para marcarlo como favorito" - last_read: "este es el último post que has leído; haz clic para marcarlo como favorito" + created: "has guardado este post en marcadores" + not_bookmarked: "has leído este post, haz clic para guardarlo en marcadores" + last_read: "este es el último post que has leído; haz clic para guardarlo en marcadores" remove: "Eliminar marcador" confirm_clear: "¿Seguro que deseas borrar todos los marcadores de este tema?" topic_count_latest: @@ -482,7 +482,7 @@ es: every_two_weeks: "cada dos semanas" email_direct: "Envíame un email cuando alguien me cite, responda a mis posts, mencione mi @usuario o me invite a un tema" email_private_messages: "Notifícame por email cuando alguien me envíe un mensaje" - email_always: "No detener notificaciones por e-mail cuando estoy activo en el sitio" + email_always: "Quiero recibir notificaciones por email incluso cuando esté de forma activa por el sitio" other_settings: "Otros" categories_settings: "Categorías" new_topic_duration: @@ -512,8 +512,10 @@ es: none: "No has invitado a nadie todavía." truncated: "Mostrando las primeras {{count}} invitaciones." redeemed: "Invitaciones aceptadas" + redeemed_tab: "Usado" redeemed_at: "Aceptada" pending: "Invitaciones Pendientes" + pending_tab: "Pendiente" topics_entered: "Temas Vistos" posts_read_count: "Posts leídos" expired: "Esta invitación ha caducado." @@ -641,6 +643,7 @@ es: email_placeholder: "dirección de e-mail o nombre de usuario" caps_lock_warning: "Está activado Bloqueo de Mayúsculas" error: "Error desconocido" + rate_limit: "Por favor, espera un poco antes de volver a intentar iniciar sesión." blank_username_or_password: "Por favor, introducir tu e-mail o usuario, y tu contraseña." reset_password: 'Restablecer Contraseña' logging_in: "Iniciando Sesión" @@ -780,10 +783,10 @@ es: from_the_web: "Desde la web" 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: "selecciona las imágenes desde tu dispositivo" + local_tip_with_attachments: "selecciona 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)" + hint_for_supported_browsers: "también puedes arrastrar y soltar o pegar imágenes al editor para subirlas" uploading: "Subiendo" select_file: "Selecciona Archivo" image_link: "el link de tu imagen apuntará a" @@ -2246,6 +2249,21 @@ es: name: "Nombre" image: "Imagen" delete_confirm: "¿Estás seguro de querer eliminar el emoji :%{name}:?" + permalink: + title: "Enlaces permanentes" + url: "URL" + topic_id: "ID del tema" + topic_title: "Tema" + post_id: "ID del post" + post_title: "Post" + category_id: "Id de la categoría" + category_title: "Categoría" + external_url: "URL externa" + delete_confirm: ¿Seguro que quieres eliminar este enlace permanente? + form: + label: "Nuevo:" + add: "Añadir" + filter: "Buscar (URL o URL externa)" lightbox: download: "descargar" search_help: diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 3464a1f903..2e80df4fae 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" @@ -317,7 +323,7 @@ fa_IR: dismiss_notifications: "علامت گذاری همه به عنوان خوانده شده" dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده" disable_jump_reply: "بعد از پاسخ من به پست من پرش نکن" - dynamic_favicon: "Show new / updated topic count on browser icon" + dynamic_favicon: " تعداد موضوعات جدید یا بروز شده را روی آیکون مرورگر نمایش بده" edit_history_public: "اجازه بده کاربران دیگر اصلاحات نوشته مرا ببینند" external_links_in_new_tab: "همهٔ پیوندهای برون‌رو را در یک تب جدید باز کن" enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده" @@ -446,7 +452,7 @@ fa_IR: every_two_weeks: "هر دو هفته " email_direct: "به من ایمیل ارسال کن هنگامی که کسی از من نقل قول کرد، به نوشته های من پاسخ داد، یا به من اشاره کرد @username یا مرا به موضوعی دعوت کرد." email_private_messages: "به من ایمیل ارسال کن وقتی کسی به من پیام خصوصی فرستاد" - email_always: "برای من ایمیل آگاه سازی نفرست هنگامی که در سایت فعال هستم" + email_always: "ایمیل های اعلان را وقتی در سایت فعال هستم برای من بفرست" other_settings: "موارد دیگر" categories_settings: "دسته‌بندی ها" new_topic_duration: @@ -472,8 +478,10 @@ fa_IR: none: "هنوز هیچ‌کسی را به اینجا فرانخوانده‌اید" truncated: "نمایش {{count}} فراخوانهٔ نخست" redeemed: "آزاد سازی دعوتنامه" + redeemed_tab: "آزاد شده" redeemed_at: "آزاد سازی" pending: "دعوت های بی‌پاسخ" + pending_tab: "در انتظار" topics_entered: "موضوعات بازدید شد" posts_read_count: "خواندن نوشته ها" expired: "این دعوت منقضی شده است." @@ -600,6 +608,7 @@ fa_IR: email_placeholder: "نشانی رایانامه یا نام کاربری" caps_lock_warning: "Caps Lock روشن است" error: "خطای ناشناخته" + rate_limit: "لطفا قبل از ورود مجدد اندکی صبر کنید" blank_username_or_password: "لطفا نام کاربری یا ایمیل خود ، با پسورد وارد نمایید." reset_password: 'نوسازی گذرواژه' logging_in: "درون آمدن..." @@ -739,10 +748,10 @@ fa_IR: from_the_web: "از وب" remote_tip: "لینک به تصویر" remote_tip_with_attachments: "لطفا لینک تصویر یا فایل ({{authorized_extensions}})" - local_tip: "برای انتخاب یک تا ۱۰ تصویر از روی دستگاه خود کلیک کنید" - local_tip_with_attachments: "برای انتخاب یک تا ۱۰ تصویر یا فایل از روی دستگاه خود کلیک کنید ({{authorized_extensions}})" + local_tip: "عکس ها را از روی سیستم خود انتخاب کنید" + local_tip_with_attachments: "عکس ها را از روی سیستم خود انتخاب کنید ({{authorized_extensions}})" hint: "(برای آپلود می توانید فایل را کیشده و در ویرایشگر رها کنید)" - hint_for_supported_browsers: "(شما همچنین می توانید با کشیدن و رها کردن یا چسباندن تصاویر در ویرایشگر آن ها را بار گذاری نمایید)" + hint_for_supported_browsers: "برای آپلود می توانید فایل را کشیده و در ویرایشگر رها کنید یا آنها را paste کنید" uploading: "در حال بروز رسانی " select_file: "انتخاب فایل" image_link: "به لینک تصویر خود اشاره کنید" @@ -1042,6 +1051,16 @@ fa_IR: other: "{{count}} پاسخ پنهان را مشاهده کنید" more_links: "{{count}} مورد دیگر..." unread: "نوشته خوانده نشده است" + has_replies: + other: "{{count}} پاسخ" + has_likes: + other: "{{count}} لایک" + has_likes_title: + other: "{{count}} کاربر این مورد را پسندیده اند" + has_likes_title_you: + zero: "شما این نوشته را پسندیده اید" + one: "شما و یک کاربر دیگر این مورد را پسندیده اید" + other: "شما و {{count}} کاربر دیگر این مورد را پسندیده اید" errors: create: "متأسفیم، در فرستادن نوشته شما خطایی روی داد. لطفاً دوباره تلاش کنید." edit: "متأسفیم، در ویرایش نوشته شما خطایی روی داد. لطفاً دوباره تلاش کنید." @@ -1190,12 +1209,14 @@ fa_IR: category: can: 'can… ' none: '(بدون دسته)' + all: 'همهٔ دسته‌بندی ها' choose: 'انتخاب یک دسته بندی…' edit: 'ویرایش' edit_long: "ویرایش" view: 'نمایش موضوعات در دسته' general: 'عمومی' settings: 'تنظیمات' + topic_template: "قالب موضوع" delete: 'پاک کردن دسته' create: 'دسته بندی جدید' save: 'ذخیره سازی دسته بندی' @@ -1439,6 +1460,7 @@ fa_IR: suspended: 'تعلیق شده:' private_messages_short: "پیام" private_messages_title: "پیام" + mobile_title: "موبایل" space_free: "{{size}} آزاد" uploads: "بارگذاری ها" backups: "پشتیبان ها" @@ -1565,7 +1587,12 @@ fa_IR: name: "نام" none_installed: "شما هیچ افزونه نصب شده ای ندارید" version: "نسخه" + enabled: "فعال شده؟" + is_enabled: "Y" + not_enabled: "N" + cant_disable: "-" change_settings: "تغییر تنظیمات" + change_settings_short: "تنظیمات" howto: "چگونه یک افزونه نصب کنیم؟" backups: title: "پشتیبان گیری" @@ -2135,6 +2162,21 @@ fa_IR: name: "نام" image: "تصویر" delete_confirm: "آیا مطمئنید که می‌خواهید شکلک :{name}%: را پاک کنید؟" + permalink: + title: " پیوند دائمی" + url: "آدرس" + topic_id: "شناسه موضوع" + topic_title: "موضوع" + post_id: "شناسه نوشته" + post_title: "نوشته" + category_id: "شناسه دسته بندی" + category_title: "دسته بندی" + external_url: " آدرس خارجی" + delete_confirm: آیا مطمئنید که می‌خواهید این لینک دائمی را پاک کنید؟ + form: + label: "جدید:" + add: "افزودن" + filter: "جستجو (آدرس یا آدرس خارجی)" lightbox: download: "دریافت" search_help: diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index 3d3055ef9f..efd88374fe 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" @@ -256,7 +262,7 @@ fi: time_read: "Lukuaika" topic_count: "Ketjut" topic_count_long: "Luotuja ketjuja" - post_count: "Vastaukset" + post_count: "Vastauksia" post_count_long: "Kirjoitettuja vastauksia" no_results: "Ei tuloksia." days_visited: "Vierailut" @@ -476,7 +482,7 @@ fi: every_two_weeks: "joka toinen viikko" email_direct: "Lähetä minulle sähköposti, jos joku lainaa viestiäni, vastaa viestiini, viittaa @nimeeni, tai kutsuu minut viestiketjuun" email_private_messages: "Lähetä minulle sähköposti, kun joku lähettää minulle viestin" - email_always: "Älä jätä lähettämättä sähköposti-ilmoituksia, vaikka olen aktiivinen palstalla." + email_always: "Lähetä sähköposti-ilmoitukset, vaikka olen aktiivinen palstalla." other_settings: "Muut" categories_settings: "Keskustelualueet" new_topic_duration: @@ -506,8 +512,10 @@ fi: none: "Et ole vielä kutsunut ketään." truncated: "Näytetään ensimmäiset {{count}} kutsua." redeemed: "Hyväksytyt kutsut" + redeemed_tab: "Hyväksytyt" redeemed_at: "Hyväksytty" pending: "Odottavat kutsut" + pending_tab: "Odottavat" topics_entered: "Avatut ketjut" posts_read_count: "Luetut viestit" expired: "Tämä kutsu on rauennut." @@ -591,7 +599,7 @@ fi: last_reply_lowercase: edellinen vastaus replies_lowercase: one: vastaus - other: vastaukset + other: vastauksia summary: enabled_description: "Tarkastelet tiivistelmää tästä ketjusta, sen mielenkiintoisimpia viestejä käyttäjien toiminnan perusteella." description: "Tässä kejussa on {{count}} viestiä." @@ -635,6 +643,7 @@ fi: email_placeholder: "sähköposti tai käyttäjätunnus" caps_lock_warning: "Caps Lock on päällä" error: "Tuntematon virhe" + rate_limit: "Ole hyvä ja odota hetki ennen kuin yrität kirjautua uudelleen." blank_username_or_password: "Kirjoita sähköpostiosoite tai käyttäjänimi ja salasana." reset_password: 'Nollaa salasana' logging_in: "Kirjaudutaan..." @@ -774,10 +783,10 @@ fi: from_the_web: "Netistä" remote_tip: "linkki kuvaan" remote_tip_with_attachments: "linkki kuvaan tai tiedostoon ({{authorized_extensions}})" - local_tip: "klikkaa valitaksesi enintään 10 kuvaa laitteeltasi" - local_tip_with_attachments: "klikkaa valitaksesi enintään 10 kuvaa tai tiedostoa laitteeltasi ({{authorized_extensions}})" + local_tip: "valitse kuvia laitteeltasi" + local_tip_with_attachments: "valitse kuvia tai tiedostoja laitteeltasi ({{authorized_extensions}})" hint: "(voit myös raahata ne editoriin ladataksesi ne sivustolle)" - hint_for_supported_browsers: "(voit myös raahata tai liittää kuvia editoriin ladataksesi ne sivustolle)" + hint_for_supported_browsers: "voit myös raahata tai liittää kuvia editoriin ladataksesi ne sivustolle" uploading: "Lähettää" select_file: "Valitse tiedosto" image_link: "linkki, johon kuvasi osoittaa" @@ -896,8 +905,8 @@ fi: auto_close_remove: "Älä sulje tätä ketjua automaattisesti" progress: title: ketjun edistyminen - go_top: "ylös" - go_bottom: "alas" + go_top: "alkuun" + go_bottom: "loppuun" go: "siirry" jump_bottom: "hyppää viimeisimpään viestiin" jump_bottom_with_number: "hyppää viestiin %{post_number}" @@ -1091,6 +1100,19 @@ fi: other: "näytä {{count}} piilotettua vastausta" more_links: "{{count}} lisää..." unread: "Viesti on lukematon" + has_replies: + one: "{{count}} vastaus" + other: "{{count}} vastausta" + has_likes: + one: "{{count}} tykkäys" + other: "{{count}} tykkäystä" + has_likes_title: + one: "1 käyttäjä tykkäsi tästä viestistä" + other: "{{count}} käyttäjää tykkäsi tästä viestistä" + has_likes_title_you: + zero: "sinä tykkäsit tästä viestistä" + one: "sinä ja 1 muu tykkäsitte tästä viestistä" + other: "Sinä ja {{count}} muuta tykkäsivät tästä viestistä" errors: create: "Pahoittelut, viestin luonti ei onnistunut. Ole hyvä ja yritä uudelleen." edit: "Pahoittelut, viestin muokkaus ei onnistunut. Ole hyvä ja yritä uudelleen." @@ -1258,12 +1280,14 @@ fi: category: can: 'voivat… ' none: '(ei aluetta)' + all: 'Kaikki alueet' choose: 'Valitse alue…' edit: 'muokkaa' edit_long: "Muokkaa" view: 'Katsele alueen ketjuja' general: 'Yleistä' settings: 'Asetukset' + topic_template: "Ketjun sapluuna" delete: 'Poista alue' create: 'Uusi alue' save: 'Tallenna alue' @@ -1387,7 +1411,7 @@ fi: views_lowercase: one: "katselu" other: "katselut" - replies: "Vastaukset" + replies: "Vastauksia" views_long: "tätä ketjua on katseltu {{number}} kertaa" activity: "Toiminta" likes: "Tykkäykset" @@ -1511,6 +1535,7 @@ fi: suspended: 'Hyllytetyt:' private_messages_short: "YV:t" private_messages_title: "Viestit" + mobile_title: "Mobiili" space_free: "{{size}} vapaata" uploads: "lataukset" backups: "varmuuskopiot" @@ -1642,7 +1667,12 @@ fi: name: "Nimi" none_installed: "Sinulla ei ole yhtään asennettua lisäosaa." version: "Versio" + enabled: "Otettu käyttöön?" + is_enabled: "K" + not_enabled: "E" + cant_disable: "-" change_settings: "Asetukset" + change_settings_short: "Asetukset" howto: "Kuinka asennan lisäosia?" backups: title: "Varmuuskopiot" @@ -2219,6 +2249,21 @@ fi: name: "Nimi" image: "Kuva" delete_confirm: "Oletko varma, että haluat poistaa emojin :%{name}:?" + permalink: + title: "Ikilinkit" + url: "URL" + topic_id: "Ketjun ID" + topic_title: "Ketju" + post_id: "Viestin ID" + post_title: "Viesti" + category_id: "Alueen ID" + category_title: "Alue" + external_url: "Ulkoinen URL" + delete_confirm: Oletko varma, että haluat poistaa tämän ikilinkin? + form: + label: "Uusi:" + add: "Lisää" + filter: "Etsi (URL tai ulkoinen URL)" lightbox: download: "lataa" search_help: @@ -2232,7 +2277,7 @@ fi: new: 'g, n Uudet' unread: 'g, u Lukemattomat' categories: 'g, c Alueet' - top: 'g, t Ylös' + top: 'g, t Huiput' bookmarks: 'g, b Kirjanmerkit' navigation: title: 'Navigointi' diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index b69a520ea4..902837454e 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -23,7 +23,7 @@ fr: mb: Mo tb: To short: - thousands: "{{number}}m" + thousands: "{{number}}k" millions: "{{number}}M" dates: time: "H:mm" @@ -482,7 +482,7 @@ fr: every_two_weeks: "toutes les deux semaines" email_direct: "M'envoyer un courriel quand quelqu'un me cite, répond à mon message ou mentionne mon @pseudo ou m'invite à rejoindre un sujet" email_private_messages: "M'envoyer un courriel quand quelqu'un m'envoie un message privé" - email_always: "Ne pas recevoir de courriel de notifications lorsque je suis actif sur le site" + email_always: "Recevoir des notifications par email même lorsque je suis actif sur le site" other_settings: "Autre" categories_settings: "Catégories" new_topic_duration: @@ -512,8 +512,10 @@ fr: none: "Vous n'avez encore invité personne." truncated: "Affichage des {{count}} premières invitations." redeemed: "Invitations acceptées" + redeemed_tab: "Utilisés" redeemed_at: "Acceptée le" pending: "Invitations en attente" + pending_tab: "En attente" topics_entered: "Sujets consultés" posts_read_count: "Messages lus" expired: "Cette invitation a expirée." @@ -641,6 +643,7 @@ fr: email_placeholder: "courriel ou pseudo" caps_lock_warning: "Majuscules vérrouillées" error: "Erreur inconnue" + rate_limit: "Merci de patienter avant de vous reconnecter." blank_username_or_password: "Merci de saisir votre courriel ou pseudo, et mot de passe." reset_password: 'Réinitialiser le mot de passe' logging_in: "Connexion en cours…" @@ -780,10 +783,10 @@ fr: from_the_web: "Depuis le web" remote_tip: "lien vers l'image" remote_tip_with_attachments: "lien vers l'image ou le fichier ({{authorized_extensions}})" - local_tip: "cliquez pour sélectionner jusqu'à 10 images depuis votre ordinateur" - local_tip_with_attachments: "cliquez pour sélectionner jusqu'à 10 images ou fichiers depuis votre ordinateur ({{authorized_extensions}})" + local_tip: "sélectionnez des images depuis votre appareil" + local_tip_with_attachments: "sélectionnez des images depuis votre appareil ({{authorized_extensions}})" 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) " + 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" @@ -2250,6 +2253,21 @@ fr: name: "Nom" image: "Image" delete_confirm: "Etes vous sûr de vouloir supprimer l'emoji :%{name}: ?" + permalink: + title: "Premaliens" + url: "URL" + topic_id: "ID sujet" + topic_title: "Sujet" + post_id: "ID message" + post_title: "Message" + category_id: "ID catégorie" + category_title: "Catégorie" + external_url: "URL externe" + delete_confirm: Êtes-vous sur de vouloir supprimer ce permalien ? + form: + label: "Nouveau :" + add: "Ajouter" + filter: "Rechercher (URL ou URL externe)" lightbox: download: "télécharger" search_help: diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 244bcbcc49..2e168c65cd 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -8,6 +8,8 @@ he: js: number: + format: + delimiter: "," human: storage_units: format: '%n %u' @@ -19,12 +21,17 @@ he: kb: KB mb: MB tb: TB + short: + thousands: "k{{number}}" + 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" @@ -82,6 +89,16 @@ he: x_days: one: "אתמול" other: "לפני %{count} ימים" + later: + x_days: + one: "אחרי יום אחד" + other: "אחרי {{count}}% ימים" + x_months: + one: "אחרי חודש אחד" + other: "אחרי {{count}}% חודשים" + x_years: + one: "אחרי שנה אחת" + other: "אחרי {{count}}% שנים" share: topic: 'שתפו קישור לנושא זה' post: 'פרסום #%{postNumber}' @@ -129,6 +146,7 @@ he: every_two_weeks: "דו-שבועית" every_three_days: "כל שלושה ימים" max_of_count: "מקסימום של {{count}}" + alternation: "או" character_count: one: "תו אחד" other: "{{count}} תווים" @@ -191,6 +209,7 @@ he: switch_from_anon: "יצאה ממצב אנונימי" banner: close: "שחרור באנר זה." + edit: "ערוך את הבאנר" choose_topic: none_found: "לא נמצאו נושאים." title: @@ -206,6 +225,9 @@ he: edit: "ערוך" cancel: "ביטול" view_pending: "הצג הודעות ממתינות" + has_pending_posts: + one: " בנושא זה ישנה הודעה אחת הממתינה לאישור" + other: "בנושא זה ישנם {{count}} הודעות הממתינות לאישור" confirm: "שמור שינויים" delete_prompt: "אתה בטוח שאתה רוצה למחוק את המשתמש %{username}? פעולה זו תמחק את כל ההודעות , תחסום את הדואר האלקטרוני וכתובת ה-IP של המשתמש." approval: @@ -344,7 +366,9 @@ he: github_profile: "גיטהאב" mailing_list_mode: "שלחו לי דוא\"ל על כל פרסום חדש (אלא אם אשתיק את המעקב אחר הנושא או הקטגוריה)" watched_categories: "עוקב" + watched_categories_instructions: "תעקבו באופן אוטומטי אחרי כל הנושאים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ונושא חדש." tracked_categories: "רגיל+" + tracked_categories_instructions: "בקטגוריות אלה סך הפרסומים החדשים שלא נקראו יופיע לצד שם הנושא." muted_categories: "מושתק" muted_categories_instructions: "לא תקבלו התראות על נושאים חדשים בקטגוריות אלו, והם לא יופיעו בעמוד הלא נקראו שלך." delete_account: "מחק את החשבון שלי" @@ -457,7 +481,7 @@ he: every_two_weeks: "כל שבועיים" email_direct: "שלחו לי דוא\"ל כשמישהו/י מצטטים אותי, מגיבם לפרסום שלי, מזכירים את @שם_המשתמש/ת שלי, או מזמינים אותי לנושא" email_private_messages: "שלחו לי דוא\"ל כשמישהו/י שולחים לי מסר" - email_always: "אל תמנעו התראות דוא\"ל כאשר אני פעיל/ה באתר" + email_always: "שלח לי נוטיפקציות מייל גם כשאני פעיל/ה באתר. " other_settings: "אחר" categories_settings: "קטגוריות" new_topic_duration: @@ -487,8 +511,10 @@ he: none: "עוד לא הזמנת לכאן אף אחד." truncated: "מראה את {{count}} ההזמנות הראשונות." redeemed: "הזמנות נוצלו" + redeemed_tab: "נענו" redeemed_at: "נפדו ב" pending: "הזמנות ממתינות" + pending_tab: "ממתין" topics_entered: "נושאים נצפו" posts_read_count: "הודעות נקראו" expired: "פג תוקף ההזמנה." @@ -616,6 +642,7 @@ he: email_placeholder: "דואר אלקטרוני או סיסמה" caps_lock_warning: "מקש Caps Lock לחוץ" error: "שגיאה לא ידועה" + rate_limit: "בבקשה המתן לפני שתנסה להתחבר שוב." blank_username_or_password: "אנא הקישור את כתובת הדוא\"ל או שם המשתמש/ת שלכם וסיסמא." reset_password: 'אפס סיסמה' logging_in: "מתחבר...." @@ -755,10 +782,12 @@ he: from_the_web: "מהאינטרנט" remote_tip: "קישור לתמונה" remote_tip_with_attachments: "קישור לתמונה או קובץ ({{authorized_extensions}})" - local_tip: "לחץ לבחירת עד 10 תמונות מהמכשיר שלך" + local_tip: "בחר תמונות ממכשירך" + local_tip_with_attachments: "בחר תמונות או קבצים ממכשירך ({{authorized_extensions}})" hint: "(ניתן גם לגרור לעורך להעלאה)" - hint_for_supported_browsers: "(אתה יכול גם לעשות drag and drop או להדביק תמונות אל תוך העורך כדי להעלות אותן)" + hint_for_supported_browsers: "אתה יכול גם לגרור או להדביק תמונות לעורך כדי להעלות אותם" uploading: "מעלה" + select_file: "בחר קובץ" image_link: "קישור לתמונה יצביע ל" search: title: "חיפוש נושאים, פרסומים, משתמשים או קטגוריות" @@ -863,7 +892,7 @@ he: read_more: "רוצה לקרוא עוד? {{catLink}} or {{latestLink}}." browse_all_categories: עיין בכל הקטגוריות view_latest_topics: הצגת נושאים מדוברים - suggest_create_topic: מדוע לא ליצור נושא? + suggest_create_topic: לחץ כאן כדי ליצור נושא חדש. jump_reply_up: קפיצה לתגובה קודמת jump_reply_down: קפיצה לתגובה מאוחרת deleted: "הנושא הזה נמחק" @@ -877,6 +906,7 @@ he: go_top: "למעלה" go_bottom: "למטה" go: "קדימה" + jump_bottom: "עבור להודעה האחרונה" jump_bottom_with_number: "קפיצה להודעה %{post_number}" total: סך הכל הודעות current: הודעה נוכחית @@ -892,21 +922,29 @@ he: '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: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." regular_pm: title: "רגיל" + description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." muted_pm: title: "מושתק" description: "לעולם לא תקבל/י התראה בנוגע להודעה זו." @@ -954,12 +992,15 @@ he: pin_note: "המשתמש/ת יכולים להסיר את הנושא באופן עצמאי עבור עצמם." already_pinned: zero: "אין נושאים מוצמדים בקטגוריה {{categoryLink}}." + one: "נושאים שנעוצים ב {{categoryLink}}: 1." + other: "נושאים שנעוצים ב{{categoryLink}}: {{count}}." pin_globally: "גרמו לנושא זה להופיע בראש כל רשימות הנושאים, עד שחבר/ת צוות מסירים אותו." confirm_pin_globally: "יש לך כבר {{count}} נושאים המוצמדים באופן גלובאלי. עודף נושאים מוצמדים עשוי להכביד על משתמשים חדשים או אנונימיים. האם את/ה בטוחים שאתם מעוניינים להצמיד נושא גלובאלי נוסף?" unpin_globally: "הסרת נושא זה מראש כל רשימות הנושאים." global_pin_note: "משתמשים יכולים להסיר את הצמדת הנושא באופן עצמאי לעצמם." already_pinned_globally: zero: "אין נושאים המוצמדים באופן גלובלי." + one: "נושאים שכרגע נעוצים גלובלית: 1." other: "נושאים שכרגע מוצמדים גלובלית: {{count}}." make_banner: "הפכו נושא זה לבאנר אשר מופיע בראש כל העמודים." remove_banner: "הסרת הבאנר שמופיע בראש כל העמודים." @@ -971,6 +1012,7 @@ he: automatically_add_to_groups_optional: "הזמנה זו כוללת גישה לקבוצות הללו: (אופציונלי, רק מנהל/ת)" automatically_add_to_groups_required: "הזמנה זו כוללת גישה לקבוצות הללו: (חובה, רק מנהל/ת)" invite_private: + title: 'הזמן להודעה' email_or_username: "כתובת דואר אלקטרוני או שם משתמש של המוזמן" email_or_username_placeholder: "כתובת דואר אלקטרוני או שם משתמש" action: "הזמנה" @@ -986,6 +1028,8 @@ he: sso_enabled: "הכנס את שם המשתמש של האדם שברצונך להזמין לנושא זה." to_topic_blank: "הכנס את שם המשתמש או כתובת דואר האלקטרוני של האדם שברצונך להזמין לנושא זה." to_topic_email: "הזנת כתובת אימייל. אנחנו נשלח הזמנה שתאפשר לחברך להשיב לנושא הזה." + to_topic_username: "הזנת שם משתמש/ת. נשלח התראה עם לינק הזמנה לנושא הזה. " + to_username: "הכנסת את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." email_placeholder: 'name@example.com' success_email: "שלחנו הזמנה ל: {{emailOrUsername}}. נודיע לך כשהזמנה תענה. בדוק את טאב ההזמנות בעמוד המשתמש שלך בשביל לעקוב אחרי ההזמנות ששלחת. " success_username: "הזמנו את המשתמש להשתתף בנושא." @@ -1049,8 +1093,24 @@ he: one: "(ההודעה בוטלה על ידי הכותב, היא תמחק אוטומטית בעוד %{count} שעות אלא אם תסומן בדגל)" other: "(ההודעה בוטלה על ידי הכותב/ת, היא תמחק אוטומטית בעוד %{count} שעות אלא אם כן היא תסומן )" expand_collapse: "הרחב/צמצם" + gap: + one: "הצג הודעה אחת שהוסתרה" + other: "הצג {{count}} הודעות שהוסתרו" more_links: "עוד {{count}}..." unread: "הפוסט טרם נקרא" + has_replies: + one: "תגובה אחת" + other: "{{count}} תגובות" + has_likes: + one: "לייק אחד" + other: "{{count}} לייקים " + has_likes_title: + one: "מישהו אחד אהב את התגובה הזו" + other: "{{count}} אנשים אהבו את התגובה הזו" + has_likes_title_you: + zero: "אתה אהבת את התגובה הזו" + one: "אתה ואדם נוסף אהבתם את התגובה הזו" + other: "אתה ו{{count}} אנשים נוספים אהבתם את התגובה הזו" errors: create: "סליחה, הייתה שגיאה ביצירת ההודעה שלך. אנא נסה שנית." edit: "סליחה, הייתה שגיאה בעריכת ההודעה שלך. אנא נסה שנית." @@ -1125,6 +1185,7 @@ he: notify_moderators: "{{icons}} הודיעו למנהלים" notify_moderators_with_url: "{{icons}} הודיעו למנהלים" notify_user: "{{icons}} שלח הודעה" + notify_user_with_url: "{{icons}} שלח הודעה" bookmark: "{{icons}} סימנו כמועדף" like: "{{icons}} נתנו לייק" vote: "{{icons}} הצביעו עבור זה" @@ -1150,6 +1211,9 @@ he: notify_moderators: one: "אתה ועוד אחד דגללתם את זה עבור ניהול" other: "את/ה ועוד {{count}} אנשים אחרים סמנתם את זה לניהול" + notify_user: + one: "אתה ו-1 נוסף שלחתם הודעה למשתמש הזה. " + other: "אתה ו{{count}} אנשים נוספים שלחתם הודעה למשתמש הזה" bookmark: one: "אתה ועוד אחד סימנתם הודעה זו כמועדפת" other: "אתה ועוד {{count}} אנשים אחרים סימנתם הודעה זו כמועדפת" @@ -1200,6 +1264,7 @@ he: last: "מהדורה אחרונה" hide: "הסתרת שינויים" show: "הצגת שינויים" + comparing_previous_to_current_out_of_total: "{{קודם}} {{נוכחי}} / {כוללl}}" displays: inline: title: "הצג את הפלט עם תוספות והסרות בתוכו" @@ -1213,12 +1278,14 @@ he: category: can: 'יכול… ' none: '(ללא קטגוריה)' + all: 'כל הקטגוריות' choose: 'בחר קטגוריה…' edit: 'ערוך' edit_long: "עריכה" view: 'הצג נושאים בקטגוריה' general: 'כללי' settings: 'הגדרות' + topic_template: "תבנית נושא" delete: 'מחק קטגוריה' create: 'קטגוריה חדשה' save: 'שמור קטגוריה' @@ -1262,10 +1329,13 @@ he: notifications: watching: title: "עוקב" + description: "תעקבו באופן אוטומטי אחרי כל הנושאים החדשים בקטגוריות אלה. תקבלו התראה על כל פרסום ונושא חדש." tracking: title: "רגיל+" + description: "בקטגוריות אלה סך הפרסומים החדשים שלא נקראו יופיע לצד שם הנושא." regular: title: "רגיל" + description: "תקבלו התראה אם מישהו יזכיר את @שם_המשתמש/ת שלך או ישיב לפרסום שלך." muted: title: "מושתק" description: "לא תקבל התראות בנוגע לנושאים חדשים בקטגוריות האלה, והם לא יופיעו בלשונית ה\"לא נקראו\" שלך." @@ -1274,6 +1344,7 @@ he: private_reminder: 'דגלים הם פרטיים וניתנים לצפייה ע"י הצוות בלבד' action: 'סימון פרסום' take_action: "בצע פעולה" + notify_action: 'הודעה' delete_spammer: "מחק ספאמר" delete_confirm: "אתה עומד למחוק %{posts} הודעות ו-%{topics} נושאים של המשתמש הזה, להסיר את החשבון שלהם, לחסור הרשמה מכתובת ה-IP שלהם %{ip_address}, ולהוסיף את כתובת הדואר האלקטרוני %{email} לרשימה שחורה. אתה בטוח שזה באמת ספאמר?" yes_delete_spammer: "כן, מחק ספאמר" @@ -1295,6 +1366,7 @@ he: flagging_topic: title: "תודה על עזרתך לשמירה על תרבות הקהילה שלנו!" action: "סימון נושא" + notify_action: "הודעה" topic_map: title: "סיכום נושא" participants_title: "מפרסמים מתמידים" @@ -1360,6 +1432,10 @@ he: with_topics: "%{filter} נושאים" with_category: "%{filter} %{category} נושאים" latest: + title: + zero: "הכי מאוחר" + one: "הכי מאוחר" + other: "{{count}} הכי מאוחרים" help: "נושאים עם תגובות לאחרונה" hot: title: "חם" @@ -1418,7 +1494,12 @@ he: title: "שבועי" daily: title: "יומי" + all_time: "כל הזמנים" + this_year: "שנה" + this_month: "חודש" + this_week: "שבוע" today: "היום" + other_periods: "ראה חלק עליון" browser_update: 'למרבה הצער, הדפדפן שלכם זקן מידי מכדי לעבוד באתר זה.. אנא שדרגו את הדפדפן שלכם.' permission_types: full: "צרו / תגובה/ צפייה" @@ -1450,7 +1531,9 @@ he: admins: 'מנהלים ראשיים:' blocked: 'חסומים:' suspended: 'מושעים:' + private_messages_short: "הודעות" private_messages_title: "הודעות" + mobile_title: "סלולר" space_free: "{{size}} חופשיים" uploads: "העלאות" backups: "גיבויים" @@ -1484,6 +1567,7 @@ he: agree_title: "אישור סימון זה כתקין ונכון" agree_flag_modal_title: "הסכמה ו..." agree_flag_hide_post: "קבחה (הסתרת פרסום + שליחת מסר פרטי)" + agree_flag_hide_post_title: "הסתרת הודעה זו ושליחה אוטומטית של הודעה פרטית למשתמש/ת שמאיצה בהם לערוך אותה" agree_flag_restore_post: "הסכמה (שחזור הפרסום)" agree_flag_restore_post_title: "שחזור פרסום זה" agree_flag: "הסכמה עם הסימון" @@ -1560,6 +1644,7 @@ he: automatic_membership_email_domains: "משתמשים אשר נרשמים עם מארח דוא\"ל שתואם בדיוק לאחד מהרשימה, יוספו באופן אוטומטי לקבוצה זו:" automatic_membership_retroactive: "החלת כלל מארח דוא\"ל זהה כדי להוסיף משתמשים רשומים" default_title: "ברירת המחדל לכל המשתמשים בקבוצה זו" + primary_group: "קבע כקבוצה ראשית באופן אוטומטי" api: generate_master: "ייצר מפתח מאסטר ל-API" none: "אין מפתחות API פעילים כרגע." @@ -1580,7 +1665,9 @@ he: name: "שם" none_installed: "אין לך הרחבות מותקנות" version: "גרסה" + enabled: "מאופשר?" change_settings: "שינוי הגדרות" + change_settings_short: "הגדרות" howto: "איך אני מתקין/מתקינה הרחבות?" backups: title: "גיבויים" @@ -1603,6 +1690,7 @@ he: size: "גודל" upload: label: "העלה" + title: "טען גיבוי לinstance הזה" uploading: "מעלה..." success: "'{{filename}}' הועלה בהצלחה." error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}" @@ -1630,10 +1718,12 @@ he: title: "שחזר את הגיבוי" confirm: "אתה בטוח שברצונך לשחזר את הגיבוי הזה?" rollback: + label: "חזור לאחור" title: "הזחר את מסד הנתונים למצב עבודה קודם" confirm: "אתה בטוח שברצונך להחזיר את מסד הנתונים למצב עבודה קודם?" export_csv: user_archive_confirm: "האם את/ה בטוח/ה שאתם רוצים להוריד את הפרסומים שלכם?" + success: "יצוא החל, תקבלו הודעה כשהתהליך יסתיים" failed: "הייצוא נכשל. אנא בדקו ברישומי הלוג." rate_limit_error: "ניתן להוריד פרסומים פעם ביום, אנא נסו שוב מחר." button_text: "ייצוא" @@ -1643,6 +1733,8 @@ he: screened_email: "יצוא רשימת דוא\"ל מלאה בפורמט CSV" screened_ip: "יצוא רשימת IP מלאה בפורמט CSV" screened_url: "יצוא רשימת URL מלאה בפורמט CSV" + export_json: + button_text: "ייצוא" invite: button_text: "משלוח הזמנות" button_title: "משלוח הזמנות" @@ -1670,6 +1762,8 @@ he: save: "שמור" new: "חדש" new_style: "סגנון חדש" + import: "יבוא" + import_title: "בחר קובץ או הדביקו טקסט" delete: "מחק" delete_confirm: "מחק את ההתאמה הזו?" about: "שינוי סגנונות CSS וכותרות HTML באתר. הוספת התאמות כדי להתחיל לערוך." @@ -1842,6 +1936,8 @@ he: impersonate: title: "התחזות" help: "השתמשו בכלי כזה כדי להתחזות לחשבון משתמש לצרכי דיבוג. עליכם להתנתק ברגע שתסיימו." + not_found: "לא ניתן למצוא את המשתמש הזה." + invalid: "סליחה, אך אינך מורשה להתחזות למשתמש הזה." users: title: 'משתמשים' create: 'הוסף מנהל' @@ -2052,6 +2148,7 @@ he: no_results: "לא נמצאו תוצאות." clear_filter: "נקה" add_url: "הוספת כתובת URL" + add_host: "הוסיפו מארח" categories: all_results: 'הכל' required: 'נדרש' @@ -2146,6 +2243,21 @@ he: name: "שם" image: "תמונה" delete_confirm: "האם את/ה בטוח/ה שאתם רוצים למחוק את האמוג'י :%{name}:?" + permalink: + title: "קישורים קבועים" + url: "כתובת" + topic_id: "מזהה לנושא" + topic_title: "נושא" + post_id: "מזהה לפרסום" + post_title: "הודעה" + category_id: "מזהה לקטגוריה" + category_title: "קטגוריה" + external_url: "ID חיצוני" + delete_confirm: אתה בטוח שברצונך למחוק את הלינק הקבוע? + form: + label: "חדש:" + add: "הוסף" + filter: "חפש (כתובת או כתובת חיצונית)" lightbox: download: "הורד" search_help: @@ -2154,11 +2266,13 @@ he: title: 'קיצורי מקלדת' jump_to: title: 'קפוץ ל' + home: 'g, h בית' latest: 'g, l Latest' new: 'g, n New' unread: 'g, u Unread' categories: 'g, c Categories' top: 'g, t Top' + bookmarks: 'סימניות g, b' navigation: title: 'ניווט' jump: '# מעבר לפרסום #' @@ -2280,6 +2394,15 @@ he: first_flag: name: סימון ראשון description: סימן/סימנה פרסום + promoter: + name: מקדם + description: הזמן משתמש + campaigner: + name: קמפיינר + description: הזמן 3 משתמשים בסיסים (דרגת אמון 1) + champion: + name: אלוף + description: הזמן 5 משתמשים (דרגת אמון 2) first_share: name: שיתוף ראשון description: שיתף/שיתפה פרסום diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 954e72da52..358bc4f4b3 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" @@ -476,7 +482,6 @@ it: every_two_weeks: "ogni due settimane" email_direct: "Inviami un'email quando qualcuno mi cita, risponde a un mio messaggio, menziona il mio @nome o mi invita ad un argomento" email_private_messages: "Inviami una email quando qualcuno mi scrive un messaggio" - email_always: "Non sospendere le notifiche via email anche quando sono attivo sul sito" other_settings: "Altro" categories_settings: "Categorie" new_topic_duration: @@ -774,10 +779,7 @@ 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" select_file: "Seleziona File" image_link: "collegamento a cui la tua immagine punterà" @@ -1079,6 +1081,15 @@ it: other: "visualizza {{count}} riposte nascoste" more_links: "{{count}} altri..." unread: "Messaggio non letto" + has_replies: + one: "{{count}} Risposta" + other: "{{count}} Risposte" + has_likes: + one: "{{count}} \"Mi piace\"" + other: "{{count}} \"Mi piace\"" + has_likes_title: + one: "A 1 persona piace questo messaggio" + other: "A {{count}} persone piace questo messaggio" errors: create: "Spiacenti, si è verificato un errore nel creare il tuo messaggio. Prova di nuovo." edit: "Spiacenti, si è verificato un errore nel modificare il tuo messaggio. Prova di nuovo." @@ -1624,7 +1635,12 @@ it: name: "Nome" none_installed: "Non hai installato nessun plugin." version: "Versione" + enabled: "Abilitato?" + is_enabled: "S" + not_enabled: "N" + cant_disable: "-" change_settings: "Cambia Impostazioni" + change_settings_short: "Impostazioni" howto: "Come installo i plugin?" backups: title: "Backup" @@ -2201,6 +2217,8 @@ it: name: "Nome" image: "Immagine" delete_confirm: "Sicuro di voler cancellare l'emoji :%{name}:?" + permalink: + url: "URL" lightbox: download: "scaricamento" search_help: diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index ccce75db0c..b3f83e4348 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -355,6 +355,7 @@ ja: flags_given: "役に立ったフラグ" flagged_posts: "フラグを立てたポスト" deleted_posts: "削除したポスト" + suspensions: "停止中" warnings_received: "注意" messages: all: "すべて" @@ -451,7 +452,7 @@ ja: every_two_weeks: "２週間に１回" email_direct: "他ユーザから私がタグされた場合、または投稿したポストに返信があった場合、または私のユーザ名にメンションがあった場合、またはトピックへの招待があった場合、メールで通知を受け取る。" email_private_messages: "メッセージを受け取ったときにメールで通知を受け取る。" - email_always: "ログインしている際にメール通知を受け取る。" + email_always: "フォーラムにアクティブに参加している状態でも常にメール通知を受け取る" other_settings: "その他" categories_settings: "カテゴリ設定" new_topic_duration: @@ -477,8 +478,10 @@ ja: none: "まだ招待を送っていません" truncated: "最初の {{count}} 個の招待履歴を表示しています。" redeemed: "受理された招待" + redeemed_tab: "受理" redeemed_at: "受理日" pending: "保留中の招待" + pending_tab: "保留中" topics_entered: "閲覧したトピック数" posts_read_count: "読んだポスト" expired: "この招待の有効期限が切れました。" @@ -605,6 +608,7 @@ ja: email_placeholder: "メールアドレスかユーザ名" caps_lock_warning: "Caps Lockがオンになっています。" error: "不明なエラー" + rate_limit: "しばらく待ってから再度ログインをお試しください。" blank_username_or_password: "あなたのメールアドレスかユーザ名、そしてパスワードを入力して下さい。" reset_password: 'パスワードをリセット' logging_in: "ログイン中..." @@ -666,7 +670,7 @@ ja: create_pm: "メッセージ" title: "またはCtrl+Enter" users_placeholder: "ユーザの追加" - title_placeholder: "このディスカッションを簡潔に説明してください。" + title_placeholder: "トピックのタイトルを入力してください。" edit_reason_placeholder: "編集する理由は何ですか?" show_edit_reason: "(編集理由を追加)" reply_placeholder: "ここに入力してください。Markdown、BBCode、HTMLが利用できます。ドラッグもしくはペーストで画像をアップロードできます。" @@ -744,10 +748,10 @@ ja: from_the_web: "Web から" remote_tip: "画像へのリンク" remote_tip_with_attachments: "画像かファイルへのリンク ({{authorized_extensions}})" - local_tip: "お使いのデバイスから10枚までの画像をクリックして選択します" - local_tip_with_attachments: "お使いのデバイスから10ファイルまでの画像またはファイルをクリックして選択します ({{authorized_extensions}})" + local_tip: "ローカルからアップロードする画像を選択" + local_tip_with_attachments: "ローカルからアップロードする画像またはファイルを選択 ({{authorized_extensions}})" hint: "(アップロードする画像をエディタにドラッグ&ドロップすることもできます)" - hint_for_supported_browsers: "(アップロードする画像をエディタにドラッグ&ドロップまたは貼り付けることもできます)" + hint_for_supported_browsers: "アップロードする画像をエディタにドラッグ&ドロップまたは貼り付けることもできます" uploading: "アップロード中" select_file: "ファイル選択" image_link: "イメージのリンク先" @@ -845,6 +849,7 @@ ja: toggle_information: "トピック詳細をトグル" read_more_in_category: "{{catLink}} の他のトピックを見る or {{latestLink}}。" read_more: "{{catLink}} or {{latestLink}}。" + read_more_MF: "{ UNREAD, plural, =0 {} one { 未読 1つ } other { 未読 #つ } } { NEW, plural, =0 {} one { {BOTH, select, true{} false {} other{}} 新規トピック 1つ} other { {BOTH, select, true{} false {} other{}} 新規トピック #つ} } remaining, or {CATEGORY, select, true {{catLink}の他のトピックを読む} false {{latestLink}} other {}}" browse_all_categories: 全てのカテゴリを閲覧する view_latest_topics: 最新のトピックを見る suggest_create_topic: 新しいトピックを作成しますか？ @@ -1049,7 +1054,13 @@ ja: has_replies: other: "{{count}} つの回答" has_likes: - other: "{{count}} つのリンク" + other: "{{count}} 個のいいね！" + has_likes_title: + other: "{{count}}人のユーザがこの回答に「いいね！」しました" + has_likes_title_you: + zero: "この投稿に「いいね！」する" + one: "あなたと1人がこの回答に「いいね！」しました" + other: "あなたと他{{count}}人がこの回答に「いいね！」しました" errors: create: "申し訳ありませんが、ポスト作成中にエラーが発生しました。もう一度やり直してください。" edit: "申し訳ありませんが、ポスト編集中にエラーが発生しました。もう一度やり直してください。" @@ -1205,6 +1216,7 @@ ja: view: 'カテゴリ内のトピックを見る' general: '一般' settings: '設定' + topic_template: "トピックテンプレート" delete: 'カテゴリを削除する' create: '新しいカテゴリ' save: 'カテゴリを保存する' @@ -1414,6 +1426,7 @@ ja: this_month: "月" this_week: "週" today: "本日" + other_periods: "次の期間のトピックを見る" browser_update: 'ここで動作するにはブラウザのバージョンが古すぎます。 。 ここでブラウザアップグレード.' permission_types: full: "作成できる / 回答できる / 閲覧できる" @@ -1447,6 +1460,7 @@ ja: suspended: '停止中:' private_messages_short: "メッセージ" private_messages_title: "メッセージ" + mobile_title: "モバイル" space_free: "{{size}} free" uploads: "アップロード" backups: "バックアップ" @@ -1573,6 +1587,10 @@ ja: name: "名前" none_installed: "インストール済みのプラグインはありません" version: "バージョン" + enabled: "有効" + is_enabled: "有効" + not_enabled: "無効" + cant_disable: "-" change_settings: "設定変更" change_settings_short: "設定" howto: "プラグインをインストールするには？" @@ -1808,6 +1826,7 @@ ja: delete_post: "ポスト削除" impersonate: "なりすまし" anonymize_user: "匿名ユーザ" + roll_up: "IPブロックをロールアップ" screened_emails: title: "ブロック対象アドレス" description: "新規アカウント作成時、次のメールアドレスからの登録をブロックする。" @@ -2143,6 +2162,21 @@ ja: name: "名前" image: "画像" delete_confirm: "Are you sure you want to delete the :%{name}: emoji?" + permalink: + title: "パーマリンク" + url: "URL" + topic_id: "トピックID" + topic_title: "トピック" + post_id: "ポストID" + post_title: "ポスト" + category_id: "カテゴリID" + category_title: "カテゴリ" + external_url: "外部URL" + delete_confirm: このパーマリンクを削除してもよろしいですか？ + form: + label: "新規:" + add: "追加" + filter: "検索(URL または 外部URL)" lightbox: download: "ダウンロード" search_help: @@ -2293,7 +2327,7 @@ ja: description: サイト内投稿のリンクを挿入した first_quote: name: 最初の投稿 - description: ユーザにタグ付けました + description: ユーザにタグを付けた read_guidelines: name: ガイドラインを読んだ description: community guidelinesを読みました diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 990ee66fd8..e86aaa6677 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,19 +21,22 @@ ko: kb: KB mb: MB tb: TB + short: + thousands: "{{number}}천" + millions: "{{number}}백만" dates: time: "a h:mm" - long_no_year: "M. D. a h:mm" - long_no_year_no_time: "M. D." + long_no_year: "M D a h:mm" + long_no_year_no_time: "MMM D" full_no_year_no_time: "MMMM Do" - long_with_year: "YYYY. M. D. a h:mm" - long_with_year_no_time: "YYYY. M. D." - full_with_year_no_time: "YYYY년 MMMM Do" - long_date_with_year: "'YY. M. D. LT" - long_date_without_year: "M. D. LT" - long_date_with_year_without_time: "'YY. M. D. " - long_date_without_year_with_linebreak: "M. D.
LT" - long_date_with_year_with_linebreak: "'YY. M. D.
LT" + long_with_year: "YYYY MMM D a h:mm" + long_with_year_no_time: "YYYY MMM D" + full_with_year_no_time: "YYYY MMMM Do" + long_date_with_year: "'YY MMM D. LT" + long_date_without_year: "MMM D, LT" + long_date_with_year_without_time: "'YY MMM D" + long_date_without_year_with_linebreak: "MMM D
LT" + long_date_with_year_with_linebreak: "'YY MMM D
LT" tiny: half_a_minute: "< 1분" less_than_x_seconds: @@ -51,8 +57,8 @@ ko: other: "> %{count}년" almost_x_years: other: "%{count}년" - date_month: "M. D." - date_year: "'YY. M." + date_month: "MMM D" + date_year: "'YY MMM" medium: x_minutes: other: "%{count}분" @@ -60,7 +66,7 @@ ko: other: "%{count}시간" x_days: other: "%{count}일" - date_year: "MMM D, 'YY" + date_year: "'YY MMM D" medium_with_ago: x_minutes: other: "%{count}분 전" @@ -292,7 +298,7 @@ ko: phone: 전화 other_accounts: "현재 IP주소의 다른 계정들:" delete_other_accounts: "삭제 %{count}" - username: "사용자이름" + username: "아이디" trust_level: "TL" read_time: "읽은 시간" topics_entered: "입력된 제목:" @@ -365,8 +371,8 @@ ko: title: "내 소개 변경" error: "값을 변경하는데 에러가 발생했습니다." change_username: - title: "사용자 이름 변경" - confirm: "사용자 이름을 변경합니다. 모든 @이름 멘션이 끊어집니다. 사용자 이름을 변경하는게 확실한가요?" + title: "아이디 변경" + confirm: "아이디를을 변경하면 모든 인용과 @아이디 멘션이 끊어집니다. 그래도 진행하시겠습니까?" taken: "죄송합니다. 이미 사용 중인 아이디입니다." error: "아이디를 변경하는 중에 오류가 발생했습니다." invalid: "아이디가 잘못되었습니다. 숫자와 문자를 포함해야합니다." @@ -446,7 +452,6 @@ ko: every_two_weeks: "격주" email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 멘션했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기" email_private_messages: "누군가 나에게 메시지를 보냈을때 이메일 보내기" - email_always: "싸이트에 방문 중 일 때 이메일 알림을 보내지 마세요." other_settings: "추가 사항" categories_settings: "카테고리" new_topic_duration: @@ -472,8 +477,10 @@ ko: none: "어떤 초대도 발견되지 않았습니다." truncated: "처음 {{count}}개 초대장 보여주기" redeemed: "초대를 받았습니다." + redeemed_tab: "Redeemed" redeemed_at: "에 초대되었습니다." pending: "초대를 보류합니다." + pending_tab: "보류" topics_entered: "토픽이 입력되었습니다." posts_read_count: "게시물 읽기" expired: "이 초대장의 기한이 만료되었습니다." @@ -587,7 +594,7 @@ ko: action: "비밀번호를 잊어버렸습니다." invite: "사용자 이름 또는 이메일 주소를 입력하시면 비밀번호 재설정 이메일을 보내드립니다." reset: "암호 재설정" - complete_username: "내 계정의 사용자이름이 %{username}이라면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다." + complete_username: "자신의 아이디가 %{username}이라면, 곧 비밀번호 초기화 방법과 관련된 안내 메일을 받게 됩니다." complete_email: "만약 계정이 %{email}과 일치한다면, 비밀번호를 재설정하는 방법에 대한 이메일을 곧 받게 됩니다." complete_username_found: "%{username}과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요." complete_email_found: "%{email}과 일치하는 계정을 찾았습니다. 비밀번호를 초기화하는 방법이 담긴 메일을 발송하였으니 확인하여 주십시요." @@ -600,6 +607,7 @@ ko: email_placeholder: "이메일 주소 또는 사용자 이름" caps_lock_warning: "Caps Lock 켜짐" error: "알 수없는 오류" + rate_limit: "다시 로그인 하기전에 잠시만 기다려주세요." blank_username_or_password: "이메일 또는 사용자명과 비밀번호를 입력해 주세요." reset_password: '암호 재설정' logging_in: "로그인 중.." @@ -739,10 +747,7 @@ ko: 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: "이 이미지를 누르면 이동할 링크" @@ -1042,6 +1047,16 @@ ko: other: "{{count}}개의 숨겨진 답글 보기" more_links: "{{count}}개 더..." unread: "읽지 않은 포스트" + has_replies: + other: "{{count}} 답글" + has_likes: + other: "{{count}} 좋아요" + has_likes_title: + other: "{{count}}명이 이 게시글을 좋아합니다" + has_likes_title_you: + zero: "이 게시글을 좋아합니다." + one: "당신과 다른 1명이 이 게시글을 좋아합니다." + other: "당신과 {{count}}명이 이 게시글을 좋아합니다." errors: create: "죄송합니다. 게시물을 만드는 동안 오류가 발생했습니다. 다시 시도하십시오." edit: "죄송합니다. 게시물을 수정하는 중에 오류가 발생했습니다. 다시 시도하십시오." @@ -1190,12 +1205,14 @@ ko: category: can: '허용' none: '(카테고리 없음)' + all: '모든 카테고리' choose: '카테고리를 선택하세요…' edit: '편집' edit_long: "카테고리 편집" view: '카테고리안의 토픽보기' general: '일반' settings: '설정' + topic_template: "토픽 템플릿" delete: '카테고리 삭제' create: '새 카테고리' save: '카테고리 저장' @@ -1318,7 +1335,7 @@ ko: views_lowercase: other: "조회" replies: "답변" - views_long: "이 토픽은 {{number}}번 조회 되었습니다." + views_long: "이 토픽은 {{number}}번 읽혔습니다." activity: "활동" likes: "좋아요" likes_lowercase: @@ -1439,6 +1456,7 @@ ko: suspended: '접근금지:' private_messages_short: "메시지" private_messages_title: "메시지" + mobile_title: "모바일" space_free: "{{size}} free" uploads: "업로드" backups: "백업" @@ -1565,7 +1583,12 @@ ko: name: "이름" none_installed: "설치된 플러그인이 없습니다." version: "버전" + enabled: "활성화?" + is_enabled: "예" + not_enabled: "아니요" + cant_disable: "-" change_settings: "설정 변경" + change_settings_short: "설정" howto: "플러그인은 어떻게 설치하나요?" backups: title: "백업" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 6e5391feba..85165dbd18 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -482,7 +482,7 @@ nb_NO: every_two_weeks: "annenhver uke" email_direct: "Motta en e-post når noen siterer deg, svarer på dine innlegg, nevner ditt brukernavn eller inviterer deg til et emne" email_private_messages: "Motta en e-post når noen sender deg en melding" - email_always: "Ikke stans e-postvarsler mens jeg er aktiv på nettstedet." + email_always: "Send meg varsler på epost selv når jeg er aktiv på nettstedet" other_settings: "Annet" categories_settings: "Kategorier" new_topic_duration: @@ -512,8 +512,10 @@ nb_NO: none: "Du har ikke invitert noen hit ennå." truncated: "Viser de første {{count}} invitasjoner." redeemed: "Løs inn invitasjoner" + redeemed_tab: "Brukt" redeemed_at: "Løst inn ved" pending: "Ventende invitasjoner" + pending_tab: "På vent" topics_entered: "Emner vist" posts_read_count: "Innlegg lest" expired: "Denne invitasjonen har utløpt" @@ -641,6 +643,7 @@ nb_NO: email_placeholder: "e-postadresse eller brukernavn" caps_lock_warning: "Caps Lock er på" error: "Ukjent feil" + rate_limit: "Vennligst vent litt før du logger inn igjen." blank_username_or_password: "Vennligst oppgi din e-postadresse eller brukernavn og ditt passord." reset_password: 'Nullstill passord' logging_in: "Logger på..." @@ -780,10 +783,10 @@ nb_NO: from_the_web: "Fra nettet" remote_tip: "link til bilde" remote_tip_with_attachments: "link til bilde eller fil ({{authorized_extensions}})" - local_tip: "klikk for å velge opp til 10 bilder fra din enhet" - local_tip_with_attachments: "klikk for å velge opp til 10 bilder fra din enhet ({{authorized_extensions}})" + local_tip: "velg bilder fra din enhet" + local_tip_with_attachments: "velg bilder eller filer fra din enhet ({{authorized_extensions}})" hint: "(du kan også drag & drop inn i editoren for å laste dem opp)" - hint_for_supported_browsers: "(du kan også drag og drop eller lime inn bilder inn i editoren for å laste dem opp)" + hint_for_supported_browsers: "du kan også dra og slippe eller lime inn bilder i editoren for å laste dem opp" uploading: "Laster opp bilde" select_file: "Velg Fil" image_link: "lenken som bildet skal peke til" @@ -888,6 +891,7 @@ nb_NO: toggle_information: "vis/skjul emnedetaljer" read_more_in_category: "Vil du lese mer? Bla gjennom andre emner i {{catLink}} eller {{latestLink}}." read_more: "Vil du lese mer? {{catLink}} eller {{latestLink}}." + read_more_MF: "There { UNREAD, plural, =0 {} one { is 1 unread } other { are # unread } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} 1 new topic} other { {BOTH, select, true{and } false {are } other{}} # new topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}" browse_all_categories: Se alle kategorier view_latest_topics: se siste emner suggest_create_topic: Hvorfor ikke opprette et emne? @@ -964,9 +968,9 @@ nb_NO: visible: "Vist Emnet" reset_read: "Tilbakestill Lesedata" feature: - pin: "Lås Emne" - unpin: "Lås Opp Emne" - pin_globally: "Lås Emne Globalt" + pin: "Fest Emnet" + unpin: "Løsgjør Emnet" + pin_globally: "Fest Emnet Globalt" make_banner: "Banneremne" remove_banner: "Fjern Banneremne" reply: @@ -1089,7 +1093,7 @@ nb_NO: show_hidden: 'Se skjult innhold' deleted_by_author: 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)" + 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" @@ -1396,6 +1400,12 @@ nb_NO: posts: "Innlegg" posts_lowercase: "innlegg" posts_long: "{{number}} innlegg i dette emnet" + 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: "Originalt Innlegg" views: "Visninger" views_lowercase: @@ -2185,6 +2195,7 @@ nb_NO: delete_confirm: Er du sikker på at du vil slette dette merket? revoke: Tilbakedra reason: Grunn + expand: Ekspander revoke_confirm: Er du sikker på at du vil tilbakedra dette merket? edit_badges: Rediger merker grant_badge: Tildel merke @@ -2237,6 +2248,21 @@ nb_NO: name: "Navn" image: "Bilde" delete_confirm: "Sikker på at du vil slette: %{name}: emoji?" + permalink: + title: "Permalenker" + url: "URL" + topic_id: "Emne ID" + topic_title: "Emne" + post_id: "Innlegg ID" + post_title: "Innlegg" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Ekstern URL" + delete_confirm: Er du sikker du vil slette denne permalenken? + form: + label: "Ny:" + add: "Legg til" + filter: "Søk (URL eller ekstern URL)" lightbox: download: "last ned" search_help: @@ -2377,6 +2403,7 @@ nb_NO: name: Forfrem description: Inviterte en bruker campaigner: + name: Campaigner description: Inviterte 3 medlemmer (tillitsnivå 1) champion: name: Mester diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index 807773a4a7..14060b79b5 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,12 +22,17 @@ 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" 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" @@ -85,10 +93,13 @@ nl: later: x_days: one: "1 dag later" - other: "%{count} dagen geleden" + other: "%{count} dagen later" x_months: - one: "1 maand geleden" - other: "%{count} maanden geleden" + one: "1 maand later" + other: "%{count} maanden later" + x_years: + one: "1 jaar later" + other: "%{count} jaren later" share: topic: 'deel een link naar deze topic' post: 'bericht #%{postNumber}' @@ -98,7 +109,7 @@ nl: google+: 'deel deze link op Google+' email: 'deel deze link via e-mail' topic_admin_menu: "Adminacties voor topic" - emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie zal verstuurd worden" + emails_are_disabled: "Alle uitgaande e-mails zijn uitgeschakeld door een beheerder. Geen enkele vorm van e-mail notificatie wordt verstuurd." edit: 'bewerk de titel en categorie van deze topic' not_implemented: "Die functie is helaas nog niet beschikbaar. Sorry!" no_value: "Nee" @@ -136,6 +147,7 @@ nl: every_two_weeks: "elke twee weken" every_three_days: "elke drie dagen" max_of_count: "maximaal {{count}}" + alternation: "of" character_count: one: "{{count}} teken" other: "{{count}} tekens" @@ -157,12 +169,12 @@ nl: user_count: "Nieuwe leden" active_user_count: "Actieve leden" contact: "Neem contact met ons op" - contact_info: "In het geval van een kritieke kwestie of dringende vraagstukken in verband met deze site neem contact op met ons op via %{contact_info}." + contact_info: "In het geval van een kritieke kwestie of dringende vraagstukken in verband met deze site, neem contact op met ons op via %{contact_info}." bookmarked: title: "Voeg toe aan favorieten" clear_bookmarks: "Verwijder favorieten" help: - bookmark: "Klik om het eerste bericht in dit topic toe te voegen aan je favorieten" + bookmark: "Klik om het eerste bericht van dit topic toe te voegen aan je favorieten" unbookmark: "Klik om alle favorieten in dit topic te verwijderen" bookmarks: not_logged_in: "sorry, je moet ingelogd zijn om berichten aan je favorieten toe te kunnen voegen" @@ -198,6 +210,7 @@ nl: switch_from_anon: "Verlaat anonieme modus" banner: close: "Verberg deze banner." + edit: "Wijzig deze banner >>" choose_topic: none_found: "Geen topics gevonden." title: @@ -213,6 +226,9 @@ nl: edit: "Wijzig" cancel: "Annuleer" view_pending: "bekijk wachtende berichten" + has_pending_posts: + one: "Voor deze topic staat 1 bericht klaar om goedgekeurd te worden" + other: "Voor dit topic staan {{count}} berichten klaar om goedgekeurd te worden" confirm: "Sla wijzigingen op" delete_prompt: "Weet je zeker dat je %{username} wilt verwijderen? Dit zal alle zijn berichten verwijderen en zal zijn email en ip-adres blokkeren." approval: @@ -243,7 +259,7 @@ nl: likes_received: "Ontvangen" topics_entered: "Bezocht" topics_entered_long: "Topics bezocht" - time_read: "Tijd Gelezen" + time_read: "Tijd gelezen" topic_count: "Topics" topic_count_long: "Topics gemaakt" post_count: "Antwoorden" @@ -324,7 +340,7 @@ nl: mute: "Negeer" edit: "Wijzig voorkeuren" download_archive: "Download mijn berichten" - new_private_message: "Nieuw Bericht" + new_private_message: "Nieuw bericht" private_message: "Bericht" private_messages: "Berichten" activity_stream: "Activiteit" @@ -351,7 +367,9 @@ nl: github_profile: "Github" mailing_list_mode: "Ontvang een mail als er een nieuw bericht op het forum geplaatst is (tenzij je het topic of de betreffende categorie op stil zet)" watched_categories: "In de gaten gehouden" + watched_categories_instructions: "Je krijgt automatisch alle nieuwe topics in deze categorie te zien. Je ontvangt notificaties bij nieuwe berichten en topics, naast het topic wordt het aantal nieuwe berichten weergegeven. " tracked_categories: "Gevolgd" + tracked_categories_instructions: "Je volgt automatisch alle nieuwe topics in deze categorie. Naast het topic wordt het aantal nieuwe berichten weergegeven." muted_categories: "Genegeerd" muted_categories_instructions: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën en ze verschijnen niet op je ongelezen overzicht." delete_account: "Verwijder mijn account" @@ -381,6 +399,7 @@ nl: set_password: "Stel wachtwoord in" change_about: title: "Wijzig bio" + error: "Het veranderen van deze waarde is mislukt." change_username: title: "Wijzig gebruikersnaam" confirm: "Het wijzigen van je gebruikersnaam kan consequenties hebben. Weet je zeker dat je dit wil doen?" @@ -393,10 +412,11 @@ nl: error: "Het veranderen van je e-mailadres is mislukt. Misschien is deze al in gebruik?" success: "We hebben een mail gestuurd naar dat adres. Volg de bevestigingsinstructies in die mail." change_avatar: - title: "Wijzig je profiel afbeelding" + title: "Wijzig je profielafbeelding" gravatar: "Gravatar, gebaseerd op" + gravatar_title: "Verander je avatar op de Gravatar website" refresh_gravatar_title: "Laad je Gravatar opnieuw" - letter_based: "Door systeem toegekende profiel afbeelding" + letter_based: "Door systeem toegekende profielafbeelding" uploaded_avatar: "Eigen afbeelding" uploaded_avatar_empty: "Voeg een eigen afbeelding toe" upload_title: "Upload je afbeelding" @@ -405,18 +425,18 @@ nl: cache_notice: "Je hebt je avatar succesvol veranderd, maar het kan even duren voordat deze zichtbaar is wegens browser caching." change_profile_background: title: "Profielachtergrond" - instructions: "Profiel achtergronden worden gecentreerd en hebben een standaard breedte van 850px." + instructions: "Profielachtergronden worden gecentreerd en hebben een standaard breedte van 850px." change_card_background: title: "Achtergrond gebruikersprofiel" - instructions: "Achtergrond afbeeldingen worden gecentreerd en hebben een standaard breedte van 590px." + instructions: "Achtergrondafbeeldingen worden gecentreerd en hebben een standaard breedte van 590px." email: title: "E-mail" instructions: "Nooit publiekelijk vertonen" - ok: "We sturen een email ter bevestiging" - invalid: "Vul een geldig email adres in " - authenticated: "Je email is geauthenticeerd door {{provider}}" + ok: "We sturen een e-mail ter bevestiging" + invalid: "Vul een geldig e-mailadres in " + authenticated: "Je e-mail is geauthenticeerd door {{provider}}" frequency: - zero: "We zullen je onmiddelijk e-mailen als je het ding waarover we je e-mailen niet gelezen hebt." + zero: "We zullen je onmiddelijk e-mailen als je hetgeen waarover we je e-mailen niet gelezen hebt." one: "We zullen je alleen maar e-mailen als we je de laatste paar minuten niet gezien hebben." other: "We zullen je alleen maar e-mailen als we je de laatste {{count}} minuten niet gezien hebben." name: @@ -436,7 +456,7 @@ nl: too_short: "Je gebruikersnaam is te kort." too_long: "Je gebruikersnaam is te lang." checking: "Kijken of gebruikersnaam beschikbaar is..." - enter_email: 'Gebruikersnaam gevonden. Vul het bijbehorende emailadres in.' + enter_email: 'Gebruikersnaam gevonden. Vul het bijbehorende e-mailadres in.' prefilled: "Je e-mailadres komt overeen met je geregistreerde gebruikersnaam." locale: title: "Interfacetaal" @@ -460,9 +480,9 @@ nl: every_three_days: "elke drie dagen" weekly: "wekelijks" every_two_weeks: "elke twee weken" - email_direct: "Stuur me een email wanneer iemand me citeert, reageert op mijn bericht, mijn @gebruikersnaam noemt of uitnodigt voor een topic." + email_direct: "Stuur me een e-mail wanneer iemand me citeert, reageert op mijn bericht, mijn @gebruikersnaam noemt of uitnodigt voor een topic." email_private_messages: "Ontvang een mail wanneer iemand je een bericht heeft gestuurd." - email_always: "E-mailnotificaties niet onderdrukken als ik actief ben op de site" + email_always: "Stuur me e-mail notificaties, zelfs als ik ben actief op de site" other_settings: "Overige" categories_settings: "Categorieën" new_topic_duration: @@ -492,8 +512,10 @@ nl: none: "Je hebt nog niemand uitgenodigd." truncated: "De eerste {{count}} uitnodigingen." redeemed: "Verzilverde uitnodigingen" + redeemed_tab: "Verzilverd" redeemed_at: "Verzilverd" pending: "Uitstaande uitnodigingen" + pending_tab: "Uitstaand" topics_entered: "Topics bekeken" posts_read_count: "Berichten gelezen" expired: "Deze uitnodiging is verlopen." @@ -516,7 +538,7 @@ nl: too_short: "Je wachtwoord is te kort." common: "Dat wachtwoord wordt al te vaak gebruikt." same_as_username: "Je wachtwoord is hetzelfde als je gebruikersnaam." - same_as_email: "Je wachtwoord is hetzelfde als je email." + same_as_email: "Je wachtwoord is hetzelfde als je e-mail." ok: "Je wachtwoord ziet er goed uit." instructions: "Minimaal %{count} tekens." associated_accounts: "Logins" @@ -526,6 +548,7 @@ nl: title: "Registratie IP-adres" avatar: title: "Profielfoto" + header_title: "profiel, berichten, favorieten en voorkeuren" title: title: "Titel" filters: @@ -558,9 +581,9 @@ nl: logout: "Je bent uitgelogd." refresh: "Ververs" read_only_mode: - enabled: "Alleen lezen modus is aangezet. Je kan de site bekijken, maar interacties werken mogelijk niet." + enabled: "Alleen-lezen modus is aangezet. Je kan de site bekijken, maar interacties werken mogelijk niet." login_disabled: "Zolang de site in read-only modus is, kan er niet ingelogd worden." - too_few_topics_notice: "Maak ten minste 5 openbare topics en %{posts} openbare berichten aan om de discussie te starten. Nieuwe gebruikers kunnen geen vertrouwensniveau's verdienen tenzij er berichten zijn die zij kunnen lezen. Dit bericht wordt alleen getoond aan de beheerders." + too_few_topics_notice: "Maak ten minste 5 openbare topics en %{posts} openbare berichten aan om de conversatie te starten. Nieuwe gebruikers kunnen geen vertrouwensniveau's verdienen tenzij er berichten zijn die zij kunnen lezen. Dit bericht wordt alleen getoond aan de beheerders." learn_more: "leer meer..." year: 'jaar' year_desc: 'topics die in de afgelopen 365 dagen gemaakt zijn' @@ -581,7 +604,7 @@ nl: enabled_description: "Je leest een samenvatting van dit topic: alleen de meeste interessante berichten zoals bepaald door de community. " description: "Er zijn {{count}} reacties." description_time: "Er zijn {{count}} reacties met een gemiddelde leestijd van {{readingTime}} minuten." - enable: 'Samenvatting van topic' + enable: 'Samenvatting Topic' disable: 'Alle berichten' deleted_filter: enabled_description: "Dit topic bevat verwijderde berichten, die niet getoond worden." @@ -598,7 +621,7 @@ nl: created: 'Gemaakt' created_lowercase: 'gemaakt' trust_level: 'Trustlevel' - search_hint: 'gebruikersnaam, email of IP adres' + search_hint: 'gebruikersnaam, e-mail of IP-adres' create_account: title: "Maak een nieuw account" failed: "Er ging iets mis, wellicht is het e-mailadres al geregistreerd. Probeer de 'Wachtwoord vergeten'-link." @@ -620,6 +643,7 @@ nl: email_placeholder: "e-mail of gebruikersnaam" caps_lock_warning: "Caps Lock staat aan" error: "Er is een onbekende fout opgetreden" + rate_limit: "Wacht even voor je opnieuw probeert in te loggen." blank_username_or_password: "Vul je email of gebruikersnaam en je wachtwoord in." reset_password: 'Herstel wachtwoord' logging_in: "Inloggen..." @@ -630,7 +654,7 @@ nl: requires_invite: "Toegang tot dit forum is alleen op uitnodiging." not_activated: "Je kan nog niet inloggen. We hebben je een activatie-mail gestuurd (naar {{sentTo}}). Volg de instructies in die mail om je account te activeren." not_allowed_from_ip_address: "Je kunt niet inloggen vanaf dat IP-adres." - admin_not_allowed_from_ip_address: "Je kan jezelf niet aanmelden vanaf dat IP adres." + admin_not_allowed_from_ip_address: "Je kan jezelf niet aanmelden vanaf dat IP-adres." resend_activation_email: "Klik hier om de activatiemail opnieuw te ontvangen." sent_activation_email_again: "We hebben een nieuwe activatiemail gestuurd naar {{currentEmail}}. Het kan een aantal minuten duren voor deze aan komt. Check ook je spamfolder." google: @@ -659,7 +683,7 @@ nl: emoji: "Emoji :smile:" add_warning: "Dit is een officiële waarschuwing." posting_not_on_topic: "In welke topic wil je je antwoord plaatsen?" - saving_draft_tip: "Opslaan..." + saving_draft_tip: "opslaan..." saved_draft_tip: "opgeslagen" saved_local_draft_tip: "lokaal opgeslagen" similar_topics: "Jouw topic lijkt op..." @@ -677,7 +701,7 @@ nl: reply_here: "Reageer hier" reply: "Reageer" cancel: "Annuleer" - create_topic: "Maak Topic" + create_topic: "Maak topic" create_pm: "Bericht" title: "Of druk op Ctrl-Return" users_placeholder: "Voeg een lid toe" @@ -759,9 +783,12 @@ nl: from_the_web: "Vanaf het web" remote_tip: "link naar afbeelding" remote_tip_with_attachments: "vul een url in van een afbeelding of bestand (toegestane extensies: {{authorized_extensions}})." + local_tip: "selecteer afbeeldingen van uw apparaat" + local_tip_with_attachments: "Selecteer afbeeldingen of bestanden van je apparaat ({{authorized_extensions}})" hint: "(je kan afbeeldingen ook slepen in de editor om deze te uploaden)" - hint_for_supported_browsers: "(je kan ook afbeeldingen hierheen slepen of copy/pasten om ze te uploaden)" + hint_for_supported_browsers: "je kunt afbeeldingen ook slepen of plakken in de editor om ze te uploaden" uploading: "Uploaden" + select_file: "Selecteer een bestand" image_link: "de link waar je afbeelding naar verwijst" search: title: "zoek naar topics, berichten, gebruikers of categorieën" @@ -881,6 +908,7 @@ nl: go_top: "bovenaan" go_bottom: "onderkant" go: "ga" + jump_bottom: "spring naar laatste bericht" jump_bottom_with_number: "spring naar bericht %{post_number}" total: totaal aantal berichten current: huidige bericht @@ -896,21 +924,29 @@ nl: '2_4': 'Je ontvangt notificaties omdat je een reactie in dit topic hebt geplaatst.' '2_2': 'Je ontvangt notificaties omdat je dit topic volgt.' '2': 'Je ontvangt notificaties omdat je dit topic hebt gelezen.' + '1_2': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou.' + '1': 'Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou.' '0_7': 'Je negeert alle notificaties in deze categorie.' '0_2': 'Je negeert alle notificaties in deze topic.' '0': 'Je negeert alle notificaties in deze topic.' watching_pm: title: "In de gaten houden" + description: "Je krijgt een notificatie voor elke nieuwe reactie op dit bericht, en het aantal nieuwe reacties wordt weergegeven." watching: title: "In de gaten houden" + description: "Je krijgt een notificatie voor elke nieuwe reactie op dit bericht, en het aantal nieuwe reacties wordt weergegeven." tracking_pm: title: "Volgen" + description: "Het aantal nieuwe reacties op dit bericht wordt weergegeven. Je krijgt een notificatie als iemand je @name noemt of reageert." tracking: title: "Volgen" + description: "Het aantal nieuwe reacties op dit bericht wordt weergegeven. Je krijgt een notificatie als iemand je @name noemt of reageert." regular: title: "Normaal" + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." regular_pm: title: "Normaal" + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." muted_pm: title: "Negeren" description: "Je zal geen enkele notificatie ontvangen over dit bericht.," @@ -978,6 +1014,7 @@ nl: automatically_add_to_groups_optional: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (optioneel, alleen voor beheerders)" automatically_add_to_groups_required: "Deze uitnodiging geeft ook toegang tot de volgende groepen: (Verplicht, alleen voor beheerders)" invite_private: + title: 'Uitnodigen voor Bericht' email_or_username: "E-mail of gebruikersnaam van genodigde" email_or_username_placeholder: "e-mailadres of gebruikersnaam" action: "Uitnodigen" @@ -993,6 +1030,8 @@ nl: sso_enabled: "Voer de gebruikersnaam in van de persoon die je uit wil nodigen voor dit topic." to_topic_blank: "Voer de gebruikersnaam of het email-adres in van de persoon die je uit wil nodigen voor dit topic." to_topic_email: "Je hebt een email-adres ingevuld. We zullen een uitnodiging e-mailen waarmee je vriend direct kan antwoorden op dit topic." + to_topic_username: "Je hebt een gebruikersnaam ingevuld. We sturen een notificatie met een link om uit te nodigen voor dit topic." + to_username: "Vul de gebruikersnaam in van de persoon die je wilt uitnodigen. We sturen een notificatie met een link om uit te nodigen voor dit topic" email_placeholder: 'naam@voorbeeld.nl' success_email: "We hebben een uitnodiging gemaild naar {{emailOrUsername}}. We stellen je op de hoogte als op de uitnodiging is ingegaan. Controleer de uitnodigingen tab op je gebruikerspagina om een overzicht te hebben van je uitnodigingen." success_username: "We hebben die gebruiker uitgenodigd om deel te nemen in dit topic." @@ -1056,8 +1095,24 @@ nl: one: "(bericht ingetrokken door de schrijver), wordt automatisch verwijderd over %{count} uur, tenzij gemarkeerd." other: "(berichten ingetrokken door de schrijver), worden automatisch verwijderd over %{count} uur, tenzij gemarkeerd." expand_collapse: "in-/uitvouwen" + gap: + one: "bekijk 1 verborgen reactie" + other: "bekijk {{count}} verborgen reacties" more_links: "{{count}} meer..." unread: "Bericht is ongelezen" + has_replies: + one: "1 Reactie" + other: "{{count}} Reacties" + has_likes: + one: "1 Like" + other: "{{count}} Likes" + has_likes_title: + one: "iemand vind dit bericht leuk" + other: "{{count}} mensen vinden dit bericht leuk" + has_likes_title_you: + zero: "Je vind dit bericht leuk" + one: "Jij en 1 ander persoon vinden dit leuk" + other: "Jij en {{count}} anderen vinden dit leuk" errors: create: "Sorry, er is iets misgegaan bij het plaatsen van je bericht. Probeer het nog eens." edit: "Sorry, er is iets misgegaan bij het bewerken van je bericht. Probeer het nog eens." @@ -1106,6 +1161,9 @@ nl: unhide: "Toon" actions: flag: 'Markeer' + defer_flags: + one: "Markering negeren" + other: "Markeringen negeren" it_too: off_topic: "Markeer het ook" spam: "Markeer het ook" @@ -1208,6 +1266,7 @@ nl: last: "Laatste revisie" hide: "Verberg revisie" show: "Toon revisie" + comparing_previous_to_current_out_of_total: "{{previous}} {{current}} / {{total}}" displays: inline: title: "Toon de het gerenderde bericht met wijzigingen als één geheel" @@ -1221,15 +1280,19 @@ nl: category: can: 'kan...' none: '(geen categorie)' + all: 'Alle categorieën' choose: 'Selecteer een categorie…' edit: 'bewerk' edit_long: "Wijzig" view: 'Bekijk topics in categorie' general: 'Algemeen' settings: 'Instellingen' + topic_template: "Template voor Topic" delete: 'Verwijder categorie' create: 'Nieuwe categorie' save: 'Bewaar categorie' + slug: 'Gestandaardiseerde Naam Categorie' + slug_placeholder: '(Optioneel) woorden-met-koppelteken-verbinden voor url' creation_error: Er ging bij het maken van de categorie iets mis. save_error: Er ging iets mis bij het opslaan van de categorie. name: "Naam categorie" @@ -1268,10 +1331,13 @@ nl: notifications: watching: title: "In de gaten houden" + description: "Je ziet automatisch alle nieuwe topics in deze categorieën. Je ontvangt notificaties bij nieuwe berichten en topics, het aantal nieuwe reacties wordt voor deze topics weergegeven." tracking: title: "Volgen" + description: "Je volgt automatisch alle topics in deze categorieën. Het aantal nieuwe reacties wordt voor deze topics weergegeven." regular: title: "Regulier" + description: "Je krijgt een notificatie als iemand je @naam noemt of reageert op een bericht van jou." muted: title: "Genegeerd" description: "Je zal geen notificaties krijgen over nieuwe topics en berichten in deze categoriën en ze verschijnen niet op je ongelezen overzicht." @@ -1305,6 +1371,8 @@ nl: notify_action: "Bericht" topic_map: title: "Topicsamenvatting" + participants_title: "Frequente schrijvers" + links_title: "Populaire links" links_shown: "laat alle {{totalLinks}} links zien..." clicks: one: "1 click" @@ -1324,7 +1392,7 @@ nl: help: "Deze topic is globaal vastgepind en zal bovenaan alle topiclijsten getoond worden" pinned: title: "Vastgepind" - help: "Deze topic is vastgepind voor je en zal bovenaan de categorie getoond worden" + help: "Dit topic is vastgepind voor je en zal bovenaan de categorie getoond worden" archived: help: "Deze topic is gearchiveerd en kan niet meer gewijzigd worden" invisible: @@ -1366,6 +1434,10 @@ nl: with_topics: "%{filter} topics" with_category: "%{filter} %{category} topics" latest: + title: + zero: "Laatste" + one: "Laatste (1)" + other: "Laatste ({{count}})" help: "topics met recente reacties" hot: title: "Populair" @@ -1425,7 +1497,11 @@ nl: daily: title: "Dagelijks" all_time: "Sinds het begin" + this_year: "Jaar" + this_month: "Maand" + this_week: "Week" today: "Vandaag" + other_periods: "bekijk eerste" browser_update: 'Helaas is je browser te oud om te kunnen werken met deze site. Upgrade a.u.b. je browser.' permission_types: full: "Maak topic / Reageer / Bekijk" @@ -1459,6 +1535,7 @@ nl: suspended: 'Geschorst:' private_messages_short: "PB's" private_messages_title: "Berichten" + mobile_title: "Mobiel" space_free: "{{size}} beschikbaar" uploads: "uploads" backups: "backups" @@ -1590,7 +1667,12 @@ nl: name: "Naam" none_installed: "Je hebt geen plugins geinstalleerd." version: "Versie" + enabled: "Ingeschakeld?" + is_enabled: "J" + not_enabled: "N" + cant_disable: "-" change_settings: "Wijzig instellingen" + change_settings_short: "Instellingen" howto: "Hoe kan ik plugins installeren" backups: title: "Backups" @@ -1656,6 +1738,8 @@ nl: screened_email: "Exporteer volledige gescreende email lijst in CSV formaat." screened_ip: "Exporteer volledige gescreende IP lijst in CSV formaat." screened_url: "Exporteerd volledige gescreende URL lijst in CSV formaat." + export_json: + button_text: "Exporteer" invite: button_text: "Verstuur uitnodigingen" button_title: "Verstuur uitnodigingen" @@ -1683,6 +1767,8 @@ nl: save: "Opslaan" new: "Nieuw" new_style: "Nieuwe stijl" + import: "Importeer" + import_title: "Selecteer een bestand of plak tekst." delete: "Verwijder" delete_confirm: "Verwijder deze aanpassing?" about: "Pas CSS stylesheets en HTML headers aan op de site. Voeg een aanpassing toe om te beginnen." @@ -1708,7 +1794,7 @@ nl: description: 'Meeste teksten, iconen en randen.' secondary: name: 'secundaire' - description: 'De achtergrondkleur, tekst en knoppen.' + description: 'De achtergrond- en tekstkleur van sommige knoppen.' tertiary: name: 'tertiaire' description: 'Links, knoppen, notificaties en accentkleur.' @@ -1820,6 +1906,7 @@ nl: delete_post: "verwijder bericht" impersonate: "Log in als gebruiker" anonymize_user: "maak gebruiker anoniem" + roll_up: "groepeer verbannen IP-adressen" screened_emails: title: "Gescreende e-mails" description: "Nieuwe accounts met een van deze mailadressen worden geblokkeerd of een andere actie wordt ondernomen." @@ -1841,18 +1928,22 @@ nl: actions: block: "Blokkeer" do_nothing: "Sta toe" + allow_admin: "Toestaan Beheerder" form: label: "Nieuw:" ip_address: "IP-adres" add: "Voeg toe" filter: "Zoek" roll_up: + text: "Groepeer verbannen IP adressen" title: "Creëer nieuwe subnet ban entries als er tenminste 'min_ban_entries_for_roll_up' entries zijn." logster: title: "Fout Logs" impersonate: title: "Log in als gebruiker" help: "Gebruik dit hulpmiddel om in te loggen als een gebruiker voor debug-doeleinden. Je moet uitloggen als je klaar bent." + not_found: "Die gebruiker is niet gevonden" + invalid: "Sorry, maar als deze gebruiker mag je niet inloggen." users: title: 'Leden' create: 'Voeg beheerder toe' @@ -2063,6 +2154,7 @@ nl: no_results: "Geen resultaten." clear_filter: "Wis" add_url: "voeg URL toe" + add_host: "host toevoegen" categories: all_results: 'Alle' required: 'Vereist' @@ -2121,6 +2213,8 @@ nl: image: Afbeelding icon_help: "Gebruik ofwel een Font Awesome klasse of een URL naar een afbeelding" query: Badge Query (SQL) + target_posts: Geassocieerde berichten opvragen + auto_revoke: Intrekkingsquery dagelijks uitvoeren show_posts: Toon bericht verlenend badge op badge pagina trigger: Trekker trigger_type: @@ -2131,6 +2225,8 @@ nl: user_change: "Wanneer een gebruiker is gewijzigd of gecreeerd" preview: link_text: "Voorbeeld toegekende badges" + plan_text: "Voorbeeld met uitvoeringsplan" + modal_title: "Proefverwerking Badge Query" sql_error_header: "Er ging iets fout met de query." error_help: "Bekijk de volgende links voor hulp met badge queries." bad_count_warning: @@ -2153,6 +2249,21 @@ nl: name: "Naam" image: "Afbeelding" delete_confirm: "Weet je zeker dat je de :%{name}: emoji wilt verwijderen?" + permalink: + title: "Permalink" + url: "URL" + topic_id: "Topic ID" + topic_title: "Topic" + post_id: "Bericht ID" + post_title: "Bericht" + category_id: "Categorie ID" + category_title: "Categorie" + external_url: "Externe URL" + delete_confirm: Weet je zeker dat je deze permalink wil verwijderen? + form: + label: "Nieuw:" + add: "Voeg toe" + filter: "Zoeken (URL of Externe URL)" lightbox: download: "download" search_help: @@ -2167,6 +2278,7 @@ nl: unread: 'g, u Ongelezen' categories: 'g, c Categoriën' top: 'g, t Top' + bookmarks: 'g, b Favorieten' navigation: title: 'Navigatie' jump: '# Ga naar bericht #' @@ -2232,7 +2344,7 @@ nl: name: Schrijven badge: editor: - name: Auteur + name: Redacteur description: Eerste berichtwijziging basic_user: name: Basis @@ -2262,7 +2374,7 @@ nl: name: Goed bericht description: 25 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend. great_post: - name: Fantastisch bericht + name: Fantastisch Bericht description: 50 likes op een post ontvangen. Deze badge kan meerdere keren worden toegekend. nice_topic: name: Leuk Topic @@ -2293,8 +2405,10 @@ nl: description: Heeft een gebruiker uitgenodigd campaigner: name: Campaigner + description: Heeft 3 leden (trust level 1) uitgenodigd champion: name: Kampioen + description: Heeft 5 leden (trust level 2) uitgenodigd first_share: name: Eerste deel actie description: Een bericht gedeeld diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index d7fc8323cd..0bff55a8b5 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -512,7 +512,7 @@ pl_PL: every_two_weeks: "co dwa tygodnie" email_direct: "Wysyłaj e-mail gdy ktoś mnie cytuje, odpowiada na mój wpis, wywołuje moją @nazwę lub zaprasza mnie do tematu." email_private_messages: "Wyślij e-mail, gdy ktoś napisze mi prywatną wiadomość" - email_always: "Wysyłaj powiadomienia email nawet gdy przejawiam aktywność na forum" + email_always: "Wysyłaj powiadomienia email nawet, gdy przejawiam aktywność w serwisie" other_settings: "Inne" categories_settings: "Kategorie" new_topic_duration: @@ -546,8 +546,10 @@ pl_PL: none: "Jeszcze nikt nie został przez ciebie zaproszony." truncated: "Pokaż pierwsze {{count}} zaproszeń." redeemed: "Cofnięte zaproszenia" + redeemed_tab: "Przyjęte" redeemed_at: "Przyjęte" pending: "Oczekujące zaproszenia" + pending_tab: "Oczekujący" topics_entered: "Obejrzane tematy" posts_read_count: "Przeczytane wpisy" expired: "To zaproszenie wygasło." @@ -676,6 +678,7 @@ pl_PL: email_placeholder: "adres email lub nazwa użytkownika" caps_lock_warning: "Caps Lock jest włączony" error: "Nieznany błąd" + rate_limit: "Poczekaj, zanim ponowisz próbę logowania." blank_username_or_password: "Podaj swój email lub nazwę użytkownika i hasło" reset_password: 'Resetuj hasło' logging_in: "Uwierzytelnianie…" @@ -815,10 +818,10 @@ pl_PL: from_the_web: "Z Internetu" remote_tip: "link do obrazu" remote_tip_with_attachments: "odnośnik do obrazu lub pliku ({{authorized_extensions}})" - local_tip: "kliknij, aby wybrać do 10 grafik z Twojego urządzenia" - local_tip_with_attachments: "kliknij, aby wybrać do 10 grafik lub plików z Twojego urządzenia ({{authorized_extensions}})" + local_tip: "wybierz obrazy ze swojego urządzenia" + local_tip_with_attachments: "wybierz obrazy lub pliki ze swojego urządzenia ({{authorized_extensions}})" 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ć)" + hint_for_supported_browsers: "aby wgrać obrazy przeciągnij lub wklej je do edytora" uploading: "Wgrywanie" select_file: "Wybierz plik" image_link: "odnośnik do którego Twój obraz będzie kierował" @@ -2328,6 +2331,21 @@ pl_PL: name: "Nazwa" image: "Grafika" delete_confirm: "Jesteś pewny(-a), że chcesz usunąć emoji :%{name}: ?" + permalink: + title: "Permalinki" + url: "URL" + topic_id: "ID tematu" + topic_title: "Temat" + post_id: "ID wpisu" + post_title: "Wpis" + category_id: "ID kategorii" + category_title: "Kategoria" + external_url: "Zewnętrzny URL" + delete_confirm: Czy na pewno chcesz usunąć ten permalink? + form: + label: "Nowy:" + add: "Dodaj" + filter: "Wyszukaj (URL or zewnętrzny URL)" lightbox: download: "pobierz" search_help: diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 4068c8867b..7c25a3c880 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -482,7 +482,7 @@ pt: every_two_weeks: "a cada duas semanas" email_direct: "Enviar-me um email quando alguém me citar, responder às minhas mensagens, mencionar o meu @nomedeutilizador, ou convidar-me para um tópico" email_private_messages: "Enviar-me um email quando alguém me envia uma mensagem" - email_always: "Não suprimir notificações de email quando estou ativo no sítio" + email_always: "Enviar-me notificações de email mesmo quando estou ativo no sítio" other_settings: "Outros" categories_settings: "Categorias" new_topic_duration: @@ -512,8 +512,10 @@ pt: none: "Ainda não convidou ninguém." truncated: "A mostrar os primeiros {{count}} convites." redeemed: "Convites Resgatados" + redeemed_tab: "Resgatado" redeemed_at: "Resgatado" pending: "Convites Pendentes" + pending_tab: "Pendente" topics_entered: "Tópicos Visualizados" posts_read_count: "Mensagens Lidas" expired: "Este convite expirou." @@ -641,6 +643,7 @@ pt: email_placeholder: "email ou nome de utilizador" caps_lock_warning: "Caps Lock está ligado" error: "Erro desconhecido" + rate_limit: "Por favor espere antes de tentar iniciar sessão novamente." blank_username_or_password: "Por favor insira o seu email ou nome de utilizador, e palavra-passe." reset_password: 'Repor Palavra-passe' logging_in: "A iniciar sessão..." @@ -780,10 +783,10 @@ pt: from_the_web: "Da internet" remote_tip: "hiperligação para imagem" remote_tip_with_attachments: "hiperligação para imagem ou ficheiro ({{authorized_extensions}})" - local_tip: "clique para selecionar até 10 imagens do seu dispositivo" - local_tip_with_attachments: "clique para selecionar até 10 imagens ou ficheiros do seu dispositivo ({{authorized_extensions}})" + local_tip: "selecionar imagens do seu dispositivo" + local_tip_with_attachments: "selecionar imagens ou ficheiros do seu dispositivo ({{authorized_extensions}})" 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)" + hint_for_supported_browsers: "pode também arrastar e largar 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" @@ -2246,6 +2249,21 @@ pt: name: "Nome" image: "Imagem" delete_confirm: "Tem a certeza que deseja eliminar o emoji :%{name}:?" + permalink: + title: "Hiperligações Permanentes" + url: "URL" + topic_id: "ID do Tópico" + topic_title: "Tópico" + post_id: "ID da Mensagem" + post_title: "Mensagem" + category_id: "ID da Categoria" + category_title: "Categoria" + external_url: "URL Externo" + delete_confirm: Tem a certeza que deseja eliminar esta hiperligação permanente? + form: + label: "Novo:" + add: "Adicionar" + filter: "Pesquisar (URL ou URL Externo)" lightbox: download: "descarregar" search_help: diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index a9f7db72e1..b0176d3965 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -482,7 +482,6 @@ pt_BR: every_two_weeks: "a cada duas semanas" email_direct: "Me envie um email quando alguém me citar, responder minhas mensagens, mencionar meu @usuário, ou me convidar para um tópico" email_private_messages: "Me envie um email quando alguém me enviar mensagem particular" - email_always: "Não suprimir notificações de email quando eu estiver ativo no site" other_settings: "Outros" categories_settings: "Categorias" new_topic_duration: @@ -780,10 +779,7 @@ pt_BR: from_the_web: "Da internet" remote_tip: "link da imagem" remote_tip_with_attachments: "link da imagem ou arquivo ({{authorized_extensions}})" - local_tip: "clique para selecionar até 10 imagens no seu dispositivo." - local_tip_with_attachments: "clique para selecionar até 10 imagens ou arquivos no seu dispositivo ({{authorized_extensions}})" hint: "(Você também pode arrastar e soltar para o editor para carregá-las)" - hint_for_supported_browsers: "(você também pode arrastar e soltar ou colar imagens no editor para carregá-las)" uploading: "Enviando" select_file: "Selecionar Arquivo" image_link: "link da sua imagem" @@ -1368,7 +1364,7 @@ pt_BR: notify_action: "Mensagem" topic_map: title: "Resumo do Tópico" - participants_title: "Postador Frequente" + participants_title: "Principais Participantes" links_title: "Links Populares" links_shown: "exibir todos os {{totalLinks}} links..." clicks: diff --git a/config/locales/client.ro.yml b/config/locales/client.ro.yml index abd5699a96..8cd8354fc5 100644 --- a/config/locales/client.ro.yml +++ b/config/locales/client.ro.yml @@ -483,7 +483,6 @@ ro: every_two_weeks: "la fiecare două săptămâni" email_direct: "Trimite un email când cineva mă citează, îmi răspunde la un post, menţionează @username meu, sau mă invită la o discuţie." email_private_messages: "Trimite-mi un mesaj când cineva îmi răspunde." - email_always: "Primești notificări și email-rezumat chiar dacă ești activ pe forum." other_settings: "Altele" categories_settings: "Categorii" new_topic_duration: @@ -787,7 +786,6 @@ ro: remote_tip: "adresă către imagine http://example.com/image.jpg" remote_tip_with_attachments: "adresă către imagine sau fișier http://example.com/file.ext (extensii permise: {{authorized_extensions}})." hint: "(puteți să trageți și să aruncați în editor pentru a le încărca)" - hint_for_supported_browsers: "(puteți să trageți și să aruncați, sau să le lipiți în editor pentru a le încărca)" uploading: "Încarcă" image_link: "Adresa din imagine va duce la" search: diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 725dec4683..bcfc6ac880 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -9,8 +9,8 @@ ru: js: number: format: - separator: "." - delimiter: "," + separator: "," + delimiter: " " human: storage_units: format: '%n %u' @@ -25,8 +25,8 @@ ru: mb: МБ tb: ТБ short: - thousands: "{{number}} т." - millions: "{{number}} мил." + thousands: "{{number}} тыс." + millions: "{{number}} млн" dates: time: "HH:mm" long_no_year: "D MMM HH:mm" @@ -139,13 +139,13 @@ ru: many: "%{count} лет спустя" other: "%{count} лет спустя" share: - topic: 'поделиться ссылкой на тему' - post: 'ссылка на сообщение #%{postNumber}' - close: 'закрыть' - twitter: 'поделиться ссылкой через Twitter' - facebook: 'поделиться ссылкой через Facebook' - google+: 'поделиться ссылкой через Google+' - email: 'поделиться ссылкой по почте' + topic: 'Поделиться ссылкой на эту тему' + post: 'Ссылка на сообщение №%{postNumber}' + close: 'Закрыть' + twitter: 'Поделиться ссылкой через Twitter' + facebook: 'Поделиться ссылкой через Facebook' + google+: 'Поделиться ссылкой через Google+' + email: 'Поделиться ссылкой по электронной почте' topic_admin_menu: "действия администратора над темой" emails_are_disabled: "Все исходящие письма были глобально отключены администратором. Уведомления любого вида не будут отправляться на почту." edit: 'отредактировать название и раздел темы' @@ -203,7 +203,7 @@ ru: stat: all_time: "За все время" last_7_days: "Последние 7 дней" - last_30_days: "30 дней" + last_30_days: "Последние 30 дней" like_count: "Симпатии" topic_count: "Темы" post_count: "Сообщения" @@ -541,7 +541,6 @@ ru: every_two_weeks: "каждые 2 недели" email_direct: "Присылать почтовое уведомление, когда кто-то цитирует меня, отвечает на мой пост, упоминает мой @псевдоним или приглашает меня в тему" email_private_messages: "Присылать почтовое уведомление, когда кто-то оставляет мне сообщение" - email_always: "Отправлять оповещения по e-mail даже когда я нахожусь на сайте." other_settings: "Прочее" categories_settings: "Разделы" new_topic_duration: @@ -579,8 +578,10 @@ ru: none: "Пока вы еще никого не пригласили." truncated: "Отображаются первые {{count}} приглашений." redeemed: "Принятые приглашения" + redeemed_tab: "Принято" redeemed_at: "Принято" pending: "Еще не принятые приглашения" + pending_tab: "Ожидает одобрения" topics_entered: "Просмотрено тем" posts_read_count: "Прочитано сообщений" expired: "Это истёкшее приглашение." @@ -709,6 +710,7 @@ ru: email_placeholder: "E-mail или псевдоним" caps_lock_warning: "Caps Lock включен" error: "Непредвиденная ошибка" + rate_limit: "Пожалуйста, сделайте перерыв перед очередной попыткой войти." blank_username_or_password: "Введите ваш e-mail (или псевдоним) и пароль." reset_password: 'Сброс пароля' logging_in: "Проверка..." @@ -848,10 +850,7 @@ 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: "ссылка, на которую будет указывать ваше изображение" @@ -1198,8 +1197,20 @@ ru: few: "{{count}} Ответа" many: "{{count}} Ответов" other: "{{count}} Ответов" + has_likes: + one: "{{count}} симпатия" + few: "{{count}} симпатии" + many: "{{count}} симпатий" + other: "{{count}} симпатий" + has_likes_title: + one: "Это сообщение понравилось {{count}} человеку" + few: "Это сообщение понравилось {{count}} людям" + many: "Это сообщение понравилось {{count}} людям" + other: "Это сообщение понравилось {{count}} людям" has_likes_title_you: - zero: "вы отметили это сообщение" + zero: "Вам понравилось это сообщение" + one: "Вам еще 1 человеку понравилось это сообщение" + other: "Вам и еще {{count}} людям понравилось это сообщение" errors: create: "К сожалению, не удалось создать сообщение из-за ошибки. Попробуйте еще раз." edit: "К сожалению, не удалось изменить сообщение. Попробуйте еще раз." @@ -1224,7 +1235,7 @@ ru: controls: reply: "начать составление ответа на сообщение" like: "мне нравится" - has_liked: "вам понравилось это сообщение" + has_liked: "Вам понравилось это сообщение" undo_like: "больше не нравится" edit: "Изменить сообщение" edit_anonymous: "Войдите, чтобы отредактировать это сообщение." @@ -1280,7 +1291,7 @@ ru: notify_user: "{{icons}} отправил(и) сообщение" notify_user_with_url: "{{icons}} отправил(и) сообщение" bookmark: "{{icons}} добавили в закладки" - like: "{{icons}} выразили симпатию" + like: "Выразили симпатию: {{icons}}" vote: "{{icons}} проголосовали за" by_you: off_topic: "Помечена вами как оффтопик" @@ -1465,7 +1476,7 @@ ru: title: "Без уведомлений" description: "Не уведомлять меня о новых темах в этих разделах и не показывать новые темы на странице «Непрочитанные»." flagging: - title: 'Спасибо за вашу помощь!' + title: 'Спасибо за вашу помощь в поддержании порядка!' private_reminder: 'жалобы анонимны и видны только персоналу' action: 'Пожаловаться' take_action: "Принять меры" @@ -1486,8 +1497,8 @@ ru: custom_placeholder_notify_moderators: "Сообщите нам, чем конкретно вы обеспокоены и предоставьте соответствующие ссылки, если это возможно." custom_message: at_least: "введите как минимум {{n}} символов" - more: "ещё {{n}} символов..." - left: "осталось {{n}} символов" + more: "Нужно ещё {{n}} cимволов..." + left: "Осталось {{n}} символов" flagging_topic: title: "Спасибо за вашу помощь!" action: "Пометить тему" @@ -1641,22 +1652,22 @@ ru: title: 'Discourse Admin' moderator: 'Модератор' dashboard: - title: "Панель" + title: "Админка" last_updated: "Последнее обновление статистики:" version: "Версия" - up_to_date: "Вы используете самую свежую версию!" + up_to_date: "Обновлений нет" critical_available: "Доступно критическое обновление." updates_available: "Доступны обновления." please_upgrade: "Пожалуйста, обновитесь!" no_check_performed: "Проверка обновлений не производится. Убедитесь, что запущен процесс sidekiq." stale_data: "Проверка обновлений не в последнее время не производилась. Убедитесь, что запущен процесс sidekiq." - version_check_pending: "Похоже, вы недавно обновились. Замечательно!" - installed_version: "Установленная" - latest_version: "Текущая" - problems_found: "Мы обнаружили некоторые проблемы в вашей установке Discourse:" + version_check_pending: "Вы недавно обновились. Замечательно!" + installed_version: "У вас" + latest_version: "Последняя" + problems_found: "Обнаружены некоторые проблемы в вашей установке:" last_checked: "Последняя проверка" refresh_problems: "Обновить" - no_problems: "Проблемы не обнаружены." + no_problems: "Проблем не обнаружено." moderators: 'Модераторы:' admins: 'Администраторы:' blocked: 'Заблокированы:' @@ -1664,14 +1675,14 @@ ru: private_messages_short: "Сообщ." private_messages_title: "Сообщений" mobile_title: "Мобильный" - space_free: "{{size}} свободно" - uploads: "загрузки" - backups: "резервные копии" + space_free: "свободно {{size}}" + uploads: "Загрузки" + backups: "Резервные копии" traffic_short: "Трафик" - traffic: "Трафик" + traffic: "Трафик (веб-запросы)" page_views: "Запросы API" page_views_short: "Запросы API" - show_traffic_report: "Раширенный отчет" + show_traffic_report: "Раширенный отчет по трафику" reports: today: "Сегодня" yesterday: "Вчера" @@ -1682,7 +1693,7 @@ ru: 30_days_ago: "30 дней назад" all: "Всего" view_table: "Таблица" - view_chart: "Гистограмма" + view_chart: "Диаграмма" refresh_report: "Обновить отчет" start_date: "Дата от" end_date: "Дата до" @@ -2044,6 +2055,7 @@ ru: delete_post: "удаление сообщения" impersonate: "выдать себя за" anonymize_user: "анонимизировать пользователя" + roll_up: "Сгруппировать IP адреса в подсети" screened_emails: title: "Почтовые адреса" description: "Когда кто-то создает новую учетную запись, проверяется данный почтовый адрес и регистрация блокируется или производятся другие дополнительные действия." @@ -2057,23 +2069,23 @@ ru: domain: "Домен" screened_ips: title: "IP адреса" - description: 'IP адреса за которыми вести наблюдение. Используйте "Разрешить" для добавления IP адреса в белый список.' - delete_confirm: "Вы уверены, что хотите удалить правило для %{ip_address}?" - roll_up_confirm: "Вы уверены, что хотите сконвертировать часто встречающиеся IP в подсети?" - rolled_up_some_subnets: "Заблокированные IP сконвертированы в подсети: %{subnets}." - rolled_up_no_subnet: "Нечего конвертировать" + description: 'Список правил для IP адресов. Чтобы добавить IP адрес в белый список, используйте правило "Разрешить".' + delete_confirm: "Удалить правило для IP адреса %{ip_address}?" + roll_up_confirm: "Сгруппировать отдельные экранированные IP адреса в подсети?" + rolled_up_some_subnets: "Заблокированные IP адреса сгруппированы в следующие подсети: %{subnets}." + rolled_up_no_subnet: "Ничего не найдено для группирования" actions: block: "Заблокировать" do_nothing: "Разрешить" allow_admin: "Разрешить админов" form: - label: "Новые:" + label: "Новое правило:" ip_address: "IP адрес" add: "Добавить" filter: "Поиск" roll_up: - text: "Конвертация" - title: "Создает новую запись бана подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей." + text: "Группировка" + title: "Создание новой записи бана целой подсети если уже имеется хотя бы 'min_ban_entries_for_roll_up' записей отдельных IP адресов." logster: title: "Журнаш ошибок" impersonate: diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 1a0c7bac6f..cf564755ae 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -457,7 +457,6 @@ sq: every_two_weeks: "çdo 2 javë" email_direct: "Send me an email when someone quotes me, replies to my post, mentions my @username, or invites me to a topic" email_private_messages: "Send me an email when someone messages me" - email_always: "Do not suppress email notifications when I am active on the site" other_settings: "Tjetër" categories_settings: "Kategoritë" new_topic_duration: @@ -747,7 +746,6 @@ sq: remote_tip: "lidhje tek imazhi" remote_tip_with_attachments: "lidhje për tek imazhi ose skedari ({{authorized_extensions}})" 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: "Duke ngarkaur" image_link: "link your image will point to" search: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index 34a3b5f694..f6282f7c2c 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -474,7 +474,6 @@ sv: every_two_weeks: "varannan vecka" email_direct: "Sänd mig e-post när någon citerar mig, besvarar mitt inlägg, nämner mitt @användarnamn eller bjuder in mig till ett ämne." email_private_messages: "Sänd mig e-post när någon skickar mig ett meddelande" - email_always: "Ta emot notifieringar via mail även om jag är aktiv på forumet" other_settings: "Övrigt" categories_settings: "Kategorier" new_topic_duration: @@ -772,10 +771,7 @@ 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" @@ -1088,6 +1084,19 @@ sv: other: "visa {{count}} dolda svar" more_links: "{{count}} till..." unread: "Inlägget är oläst" + has_replies: + one: "{{count}} svar" + other: "{{count}} svar" + has_likes: + one: "{{count}} gillning" + other: "{{count}} gillningar" + has_likes_title: + one: "1 person gillade detta inlägg" + other: "{{count}} personer gillade detta inlägg" + has_likes_title_you: + zero: "Du gillade detta inlägg" + one: "du och 1 annan person gillade detta inlägg" + other: "du och {{count}} andra personer gillade detta inlägg" errors: create: "Tyvärr, det uppstod ett fel under skapandet av ditt inlägg. Var god försök igen." edit: "Tyvärr, det uppstod ett fel under ändringen av ditt inlägg. Var god försök igen." @@ -1261,6 +1270,7 @@ sv: view: 'Visa ämnen i kategori' general: 'Allmänt' settings: 'Inställningar' + topic_template: "Ämnesmall" delete: 'Radera Kategori' create: 'Ny Kategori' save: 'Spara kategori' @@ -1506,6 +1516,7 @@ sv: blocked: 'Blockerad:' suspended: 'Avstängd:' private_messages_title: "Meddelanden" + mobile_title: "Mobil" space_free: "{{size}} ledigt" uploads: "uppladningar" backups: "säkerhetskopior" diff --git a/config/locales/client.te.yml b/config/locales/client.te.yml index 33cc5cd532..f462a92029 100644 --- a/config/locales/client.te.yml +++ b/config/locales/client.te.yml @@ -406,7 +406,6 @@ te: every_three_days: "ప్రతి మూడు రోజులకీ" weekly: "ప్రతీవారం" every_two_weeks: "ప్రతి రెండు వారాలకీ" - email_always: "నేను ఈసైటుపై క్రియాశీలంగా ఉన్నా నాకు ఈమెయిల్ పంపుట ఆపవద్దు" other_settings: "ఇతర" categories_settings: "వర్గాలు" new_topic_duration: @@ -677,7 +676,6 @@ te: remote_tip: "బొమ్మకు లంకె" remote_tip_with_attachments: "బొమ్మకు లేదా దస్త్రానికి లంకె ({{authorized_extensions}})" hint: "(మీరు వాటిని ఎడిటరులోకి లాగి వదిలెయ్యటు ద్వారా కూడా ఎగుమతించవచ్చు)" - hint_for_supported_browsers: "(మీరు వాటిని ఎడిటరులోకి లాగి వదిలెయ్యటు ద్వారా కూడా ఎగుమతించవచ్చు)" uploading: "ఎగుమతవుతోంది" image_link: "మీ బొమ్మ చూపే లంకె" search: diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 52d5649f85..b466dffe4d 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -22,8 +22,8 @@ tr_TR: mb: MB tb: TB short: - thousands: "b" - millions: "M" + thousands: "{{number}}b" + millions: "{{number}}M" dates: time: "h:mm a" long_no_year: "D MMM h:mm a" @@ -142,7 +142,7 @@ tr_TR: all_time: "Tüm Zamanlar" last_7_days: "Son 7 gün" last_30_days: "Son 30 gün" - like_count: "Beğeniler" + like_count: "Beğeni" topic_count: "Konular" post_count: "Gönderiler" user_count: "Yeni Kullanıcılar" @@ -170,7 +170,7 @@ tr_TR: other: "{{count}} yeni konular." click_to_show: "Görüntülemek için tıklayın." preview: "önizleme" - cancel: "iptal" + cancel: "İptal" save: "Değişiklikleri Kaydet" saving: "Kaydediliyor..." saved: "Kaydedildi!" @@ -236,7 +236,7 @@ tr_TR: time_read: "Okuma Zamanı" topic_count: "Konular" topic_count_long: "Oluşturulan Konular" - post_count: "Cevaplar" + post_count: "Cevap" post_count_long: "Gönderilen Cevaplar" no_results: "Sonuç bulunamadı." days_visited: "Ziyaretler" @@ -264,7 +264,7 @@ tr_TR: '3': "İşaretlenenler" '4': "Konular" '5': "Cevaplar" - '6': "Cevaplar" + '6': "Yanıtlar" '7': "Bahsedenler" '9': "Alıntılar" '10': "Yıldızlılar" @@ -452,7 +452,7 @@ tr_TR: every_two_weeks: "her iki haftada bir" email_direct: "Birisi gönderime cevap verdiğinde, benden alıntı yaptığında, @username şeklinde bahsettiğinde ya da beni bir konuya davet ettiğinde bana bir email at" email_private_messages: "Biri bana mesaj yazdığında bana bir email at" - email_always: "Sayfada etkin olduğum anlarda da e-posta bildirimleri yollamaya devam et" + email_always: "Sitede aktif olduğum sıralarda bile bana e-posta bildirimleri gönder" other_settings: "Diğer" categories_settings: "Kategoriler" new_topic_duration: @@ -478,8 +478,10 @@ tr_TR: none: "Henüz buraya kimseyi davet etmediniz." truncated: "İlk {{count}} davetler gösteriliyor." redeemed: "Kabul Edilen Davetler" + redeemed_tab: "Kabul Edildi" redeemed_at: "Kabul Edildi" pending: "Bekleyen Davetler" + pending_tab: "Bekleyen" topics_entered: "Görüntülenmiş Konular" posts_read_count: "Okunmuş Yazılar" expired: "Bu davetin süresi doldu." @@ -606,6 +608,7 @@ tr_TR: email_placeholder: "e-posta veya kullanıcı adı" caps_lock_warning: "Caps Lock açık" error: "Bilinmeyen hata" + rate_limit: "Tekrar giriş yapmayı denemeden önce lütfen bekleyin." blank_username_or_password: "Lütfen e-posta adresinizi ya da kullanıcı adınızı, ve parolanızı girin." reset_password: 'Parola Sıfırlama' logging_in: "Oturum açılıyor..." @@ -745,10 +748,10 @@ tr_TR: from_the_web: "Webden" remote_tip: "resme bağlantı ver" remote_tip_with_attachments: "resme ya da dosyaya ({{authorized_extensions}}) bağlantı ver" - local_tip: "Cihazınızdan 10 görsele kadar seçim yapmak için tıklayın" - local_tip_with_attachments: "Cihazınızdan 10 görsel ya da dosyaya kadar seçim yapmak için tıklayın ({{authorized_extensions}})" + local_tip: "cihazınızdan resimler seçin" + local_tip_with_attachments: "cihazınızdan resim veya dosyalar seçin ({{authorized_extensions}})" 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)" + 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ı" @@ -1297,7 +1300,7 @@ tr_TR: notify_action: "Mesaj" topic_map: title: "Konu Özeti" - participants_title: "Yoğun konular" + participants_title: "Sıkça Yazanlar" links_title: "Popüler bağlantılar" links_shown: "tüm {{totalLinks}} bağlantıları göster..." clicks: @@ -1584,7 +1587,7 @@ tr_TR: name: "İsim" none_installed: "Yüklenmiş herhangi bir eklentiniz yok." version: "Versiyon" - enabled: "Aktif mi?" + enabled: "Etkinleştirildi mi?" is_enabled: "E" not_enabled: "H" cant_disable: "-" @@ -2159,6 +2162,21 @@ tr_TR: name: "İsim" image: "Görsel" delete_confirm: ":%{name}: emojisini silmek istediğinize emin misiniz?" + permalink: + title: "Kalıcı Bağlantılar" + url: "Bağlantı" + topic_id: "Konu ID" + topic_title: "Konu" + post_id: "Gönderi ID" + post_title: "Gönderi" + category_id: "Kategori ID" + category_title: "Kategori" + external_url: "Harici Bağlantı" + delete_confirm: Bu kalıcı bağlantıyı silmek istediğinize emin misiniz? + form: + label: "Yeni:" + add: "Ekle" + filter: "Ara (Bağlantı veya Harici Bağlantı)" lightbox: download: "indir" search_help: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 2d5404b789..73b993eaa9 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" @@ -446,7 +452,7 @@ zh_CN: every_two_weeks: "每两周" email_direct: "当有人引用我、回复我的帖子，@提及你或邀请你至主题时发送一封邮件给我" email_private_messages: "当有人给发消息给我时发送一封邮件给我" - email_always: "即使在论坛中活跃时也接收电子邮件提醒" + email_always: "即使我在论坛中活跃时也发送电子邮件提醒给我" other_settings: "其它" categories_settings: "分类" new_topic_duration: @@ -472,8 +478,10 @@ zh_CN: none: "你还没有邀请过任何人。" truncated: "只显示前 {{count}} 个邀请。" redeemed: "确认邀请" + redeemed_tab: "已确认" redeemed_at: "已确认" pending: "待验证邀请" + pending_tab: "等待中" topics_entered: "已查看的主题" posts_read_count: "已读的帖子" expired: "该邀请已过期。" @@ -600,6 +608,7 @@ zh_CN: email_placeholder: "电子邮箱地址或用户名" caps_lock_warning: "大小写锁定开启" error: "未知错误" + rate_limit: "请等待一会再尝试登录。" blank_username_or_password: "请输入你的邮件地址或用户名，以及密码。" reset_password: '重置密码' logging_in: "登录中..." @@ -739,10 +748,10 @@ zh_CN: from_the_web: "来自网络" remote_tip: "图片链接" remote_tip_with_attachments: "图片或文件链接（{{authorized_extensions}}）" - local_tip: "点击，从你的设备中选择10个图片文件" - local_tip_with_attachments: "点击以从你的设备中选择 10 张图片或文件（{{authorized_extensions}}）" + local_tip: "从你的设备中选择图片" + local_tip_with_attachments: "从你的设备中选择图片或文件（{{authorized_extensions}}）" hint: "（你也可以通过拖放至编辑器的方式来上传）" - hint_for_supported_browsers: "（你也可以通过拖放或粘帖图片至编辑器的方式来上传）" + hint_for_supported_browsers: "你也可以通过拖放或粘帖图片至编辑器的方式来上传" uploading: "上传中" select_file: "选择文件" image_link: "链接你的图片到" @@ -798,7 +807,7 @@ zh_CN: posted: "没有更多已发布主题可看了。" read: "没有更多已阅主题可看了。" new: "没有更多新主题可看了。" - unread: "没有更多未阅主题可看了。" + unread: "没有更多未读主题了。" category: "没有更多{{category}}分类的主题了。" top: "没有更多最佳主题了。" bookmarks: "没有更多书签主题了。" @@ -1042,6 +1051,16 @@ zh_CN: other: "查看 {{count}} 个隐藏回复" more_links: "{{count}} 更多..." unread: "主题是未读的" + has_replies: + other: "{{count}} 回复" + has_likes: + other: "{{count}} 赞" + has_likes_title: + other: "{{count}} 人赞了该贴" + has_likes_title_you: + zero: "你赞了该贴" + one: "你和其他 1 人赞了该贴" + other: "你和其他 {{count}} 人赞了该贴" errors: create: "抱歉，在创建你的帖子时发生了错误。请重试。" edit: "抱歉，在编辑你的帖子时发生了错误。请重试。" @@ -1190,12 +1209,14 @@ zh_CN: category: can: '能够… ' none: '（未分类）' + all: '所有分类' choose: '选择分类…' edit: '编辑' edit_long: "编辑" view: '浏览分类下的主题' - general: '通常' + general: '常规' settings: '设置' + topic_template: "主题模板" delete: '删除分类' create: '新分类' save: '保存分类' @@ -1223,7 +1244,7 @@ zh_CN: images: "图片" auto_close_label: "该时间段后自动关闭主题：" auto_close_units: "小时" - email_in: "自定义外来电子邮件地址:" + email_in: "自定义进站电子邮件地址：" email_in_allow_strangers: "接受无账号的匿名用户的邮件" email_in_disabled: "站点设置中已经禁用通过邮件发表新主题。欲启用通过邮件发表新主题，" email_in_disabled_click: '启用“邮件发表”设置。' @@ -1439,6 +1460,7 @@ zh_CN: suspended: '禁止登录' private_messages_short: "消息" private_messages_title: "消息" + mobile_title: "移动" space_free: "{{size}} 空闲" uploads: "上传" backups: "备份" @@ -1565,7 +1587,12 @@ zh_CN: name: "名字" none_installed: "你没有安装任何插件。" version: "版本" + enabled: "启用？" + is_enabled: "是" + not_enabled: "否" + cant_disable: "-" change_settings: "更改设置" + change_settings_short: "设置" howto: "如何安装插件？" backups: title: "备份" @@ -2135,6 +2162,21 @@ zh_CN: name: "姓名" image: "图片" delete_confirm: "你确定要删除 :%{name}: emoji 么？" + permalink: + title: "永久链接" + url: "URL" + topic_id: "主题 ID" + topic_title: "主题" + post_id: "帖子 ID" + post_title: "帖子" + category_id: "分类 ID" + category_title: "分类" + external_url: "外部 URL" + delete_confirm: 你确定要删除该永久链接？ + form: + label: "新：" + add: "添加" + filter: "搜索（URL 或外部 URL）" lightbox: download: "下载" search_help: diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index b89f27cd5f..a8863d509d 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -429,7 +429,6 @@ zh_TW: every_two_weeks: "每兩星期" email_direct: "當有人引用、回覆我的發文，或以 @用戶名稱 提到我時，請以電子郵件通知我。" email_private_messages: "當有人寄給我私人訊息時，以電子郵件通知我。" - email_always: "不要因為我在網站上活動而不寄信通知。" other_settings: "其它" categories_settings: "分類" new_topic_duration: @@ -710,7 +709,6 @@ zh_TW: remote_tip: "圖片連結" remote_tip_with_attachments: "圖片或文件連結 ({{authorized_extensions}})" hint: "(你也可以將檔案拖放至編輯器直接上傳)" - hint_for_supported_browsers: "( 你也可以將圖片拖放或貼上至編輯器內直接上傳 )" uploading: "正在上傳" image_link: "連結你的圖片將指向" search: @@ -1477,7 +1475,9 @@ zh_TW: name: "名稱" none_installed: "尚未安裝任何外掛" version: "版本" + enabled: "啟用?" change_settings: "更改設定" + change_settings_short: "設定" howto: "如何安裝外掛?" backups: title: "備份" @@ -1570,6 +1570,7 @@ zh_TW: save: "儲存" new: "新增" new_style: "新增樣式" + import: "匯入" delete: "刪除" delete_confirm: "刪除此樣式？" about: "修改網站的 CSS 和 HTML headers。請新增一個自定樣式來開始使用。" diff --git a/config/locales/server.ar.yml b/config/locales/server.ar.yml index 420c2b9227..1e0c2571e1 100644 --- a/config/locales/server.ar.yml +++ b/config/locales/server.ar.yml @@ -225,6 +225,7 @@ ar: no_info_other: "
%{name} لم يدخلوا أي شيء في مجال المعلومات عني لملفهم بعد
" vip_category_name: "استراحة" vip_category_description: "الفئة مخصصة للأعضاء ذوي مستوى الثقة 3 أو أعلى." + meta_category_name: "موقع التغذية الإرتجاعية" meta_category_description: "نقاش حول هذا الموقع, كيفية تنظيمه والعمل عليه أكثر وكيف يمكننا تحسينه." staff_category_name: "الإدارة" staff_category_description: "فئة مخصصة للنقاش في مواضيع الإدارة. المواضيع مرئية فقط للأدارة وللمشرفين." @@ -294,6 +295,27 @@ ar: few: "< ثواني قليلة" many: "< ثواني كثيرة" other: "< %{count} ثوان" + x_seconds: + zero: "1ث" + one: "1ث" + two: "ث {count}%" + few: "ث {count}%" + many: "ث {count}%" + other: "ث {count}%" + less_than_x_minutes: + 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} د" distance_in_words_verbose: half_a_minute: "الأن" less_than_x_seconds: @@ -360,6 +382,7 @@ ar: many: "منذ %{count} سنوات مضت" other: "منذ %{count} سنوات مضت" password_reset: + no_token: "نأسف، رابط تغيير كلمة المرور قديم جدا. أختر \"نسيت كلمة المرور\" للحصول على رابط جديد." choose_new: "يرجى اختيار كلمة مرور جديدة" choose: "يرجى أختيار كلمة مرور" update: 'تحديث كلمة المرور' @@ -367,8 +390,10 @@ ar: title: 'إعادة تعين كلمة المرور' success: "تم تغير كلمة المرور بنجاح ويمكنك تسجيل الدخول الأن " success_unapproved: "تم تغير كلمة المرور بنجاح." + continue: "الاستمرار لـ %{site_name}" change_email: confirmed: "تم تحديث بريدك اﻹلكتروني" + please_continue: "الاستمرار لـ %{site_name}" error: "حدث خطأ عند تغير بريدك الإلكتروني. ربما يكون هذا البريد الإلكتروني قد أستوخدم من قبل ؟" activation: action: "تم تفعيل حسابك" @@ -424,15 +449,17 @@ ar: error: "خطأ في إلغاء الإشتراك" resubscribe: action: "إعادة الاشتراك." + title: "إعادة الاشتراك." + description: "لقد تم إعادة إشتراكك." reports: visits: - title: "عضو زائر" + title: "زيارات العضو" xaxis: "يوم" yaxis: "عدد الزيارات" signups: - title: "مستخدمين جدد" + title: "الأعضاء جدد" xaxis: "يوم" - yaxis: "عدد المستخدمين الجدد" + yaxis: "عدد الأعضاء الجدد" topics: title: "المواضيع" xaxis: "اليوم" @@ -452,10 +479,13 @@ ar: bookmarks: title: "المفضلة" xaxis: "يوم" + yaxis: "عدد العلامات المرجعية الجديدة." starred: title: "متألق" xaxis: "يوم" + yaxis: "عدد المواضيع المتألقة الجديدة" users_by_trust_level: + title: "الأعضاء في مستوى الثقة" xaxis: "مستوى الثقة" yaxis: "عدد اﻷعضاء" emails: @@ -523,6 +553,8 @@ ar: topics_with_no_response: xaxis: "اليوم" yaxis: "مجموع" + mobile_visits: + title: "زيارات العضو" content_types: education_new_topic: title: "مستخدم جديد للتعليم: موضوعات الأولى" diff --git a/config/locales/server.bs_BA.yml b/config/locales/server.bs_BA.yml index 75f1641964..d8279ca9fc 100644 --- a/config/locales/server.bs_BA.yml +++ b/config/locales/server.bs_BA.yml @@ -516,7 +516,7 @@ bs_BA: summary_posts_required: "Minimum posts in a topic before 'Summarize This Topic' is enabled" summary_likes_required: "Minimum likes in a topic before 'Summarize This Topic' is enabled" summary_percent_filter: "When a user clicks 'Summarize This Topic', show the top % of posts" - enable_private_messages: "Allow trust level 1 users to create private messages and reply to private messages" + enable_private_messages: "Allow trust level 1 users to create personal messages and reply to personal messages" enable_long_polling: "Message bus used for notification can use long polling" long_polling_interval: "Interval before a new long poll is issued in milliseconds " polling_interval: "How often should logged in user clients poll in milliseconds" diff --git a/config/locales/server.cs.yml b/config/locales/server.cs.yml index 8a12477847..dce0142c42 100644 --- a/config/locales/server.cs.yml +++ b/config/locales/server.cs.yml @@ -875,7 +875,6 @@ cs: signup_after_approval: subject_template: "Byli jste schváleni na %{site_name}!" signup: - subject_template: "[%{site_name}] Aktivujte svůj nový účet" text_body_template: | Vítejte na %{site_name}! @@ -901,8 +900,6 @@ cs: unauthorized: "Bohužel, soubor, který se snažíte nahrát, není povolený (povolené přípony: %{authorized_extensions})." pasted_image_filename: "Vložený obrázek" images: - fetch_failure: "Bohužel, nastala chybí při získávání obrázku." - unknown_image_type: "Bohužel, soubor, který se snažíte nahrát, zřejmě není obrázek." size_not_found: "Bohužel se nepodařilo zjistit velikost obrázku. Není soubor s obrázkem poškozený?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." diff --git a/config/locales/server.da.yml b/config/locales/server.da.yml index a777d7886b..3dce1c610d 100644 --- a/config/locales/server.da.yml +++ b/config/locales/server.da.yml @@ -511,6 +511,10 @@ da: page_view_total_reqs: title: "Total" xaxis: "Dag" + page_view_logged_in_mobile_reqs: + xaxis: "Dag" + page_view_anon_mobile_reqs: + xaxis: "Dag" http_background_reqs: title: "Baggrund" xaxis: "Dag" @@ -531,6 +535,8 @@ da: title: "Emner uden svar" xaxis: "Dag" yaxis: "Total" + mobile_visits: + xaxis: "Dag" dashboard: rails_env_warning: "Din server kører i %{env}-tilstand." ruby_version_warning: "Du kører en version af Ruby 2.0.0 som har kendte problemer. Opgradér til patch-level 247 eller senere." @@ -813,7 +819,6 @@ da: signup_after_approval: subject_template: "Du er blevet godkendt på %{site_name}!" signup: - subject_template: "[%{site_name}] Aktivér din nye konto" text_body_template: | Velkommen til %{site_name}! @@ -833,8 +838,6 @@ da: unauthorized: "Beklager, filen, som du forsøger at uploade er ikke autoriseret (autoriserede filendelser: %{authorized_extensions})." pasted_image_filename: "Indsat billede" images: - fetch_failure: "Beklager, der opstod en fejl ved hentning af det eksterne billede." - unknown_image_type: "Beklager, men filen, som du forsøgte at uploade, ser ikke ud til at være et billede." size_not_found: "Beklager, men vi kunne ikke fastslå billedets størrelse. Måske er dit billede ødelagt?" flag_reason: sockpuppet: "En ny bruger oprettede et emne, og en anden ny bruger med den samme IP-adresse svarede på det. Se indstillingen af flag_sockpuppets." diff --git a/config/locales/server.de.yml b/config/locales/server.de.yml index ee8b11b618..6fa6aa84ac 100644 --- a/config/locales/server.de.yml +++ b/config/locales/server.de.yml @@ -115,7 +115,7 @@ de: user_is_suspended: "Gesperrte Benutzer dürfen keine Beiträge schreiben." topic_not_found: "Etwas ist schief gelaufen. Wurde das Thema eventuell geschlossen oder gelöscht, während du es angeschaut hast?" just_posted_that: "ist einer einer vor Kurzem von dir geschriebenen Nachricht zu ähnlich" - has_already_been_used: "wurde schon benutzt" + has_already_been_used: "wird bereits verwendet" invalid_characters: "enthält ungültige Zeichen" is_invalid: "ist ungültig; bitte ein wenig anschaulicher" next_page: "nächste Seite →" @@ -367,6 +367,7 @@ de: one: "vor fast einem Jahr" other: "vor fast %{count} Jahren" password_reset: + no_token: "Entschuldige, aber der Link zum Zurücksetzen des Passworts ist zu alt. Wähle 'Ich habe mein Passwort vergessen' um einen neuen Link zu erhalten." choose_new: "Bitte wähle ein neues Passwort" choose: "Bitte wähle ein Passwort" update: 'Passwort aktualisieren' @@ -448,6 +449,7 @@ de: regular: title: "Normales Thema" banner: + title: "Thema des Ankündigungsbanners" message: make: "Dieses Thema ist jetzt ein Banner. Es wird auf jeder Seite ganz oben angezeigt, bis es vom Benutzer ausgeblendet wird." remove: "Dieses Thema ist jetzt kein Banner mehr. Es wird nicht mehr auf jeder Seite ganz oben angezeigt." @@ -555,6 +557,13 @@ de: title: "Gesamt" xaxis: "Tag" yaxis: "Gesamte API-Anfragen" + page_view_logged_in_mobile_reqs: + title: "API-Anfragen von angemeldeten Nutzern" + xaxis: "Tag" + yaxis: "Mobile API-Anfrangen von angemeldeten Nutzern" + page_view_anon_mobile_reqs: + title: "Anonyme API-Anfrangen" + xaxis: "Tag" http_background_reqs: title: "Hintergrund" xaxis: "Tag" @@ -579,6 +588,16 @@ de: title: "Gesamt" xaxis: "Tag" yaxis: "Gesamte Anfragen" + time_to_first_response: + title: "Zeit bis zur ersten Reaktion" + xaxis: "Tag" + topics_with_no_response: + title: "Themen ohne Reaktionen" + xaxis: "Tag" + yaxis: "Gesamt" + mobile_visits: + xaxis: "Tag" + yaxis: "Anzahl der Besuche" dashboard: rails_env_warning: "Dein Server läuft im %{env}-Modus." ruby_version_warning: "Du verwendest eine Version von Ruby 2.0.0, die für Probleme bekannt ist. Aktualisiere auf Patchlevel 247 oder höher." @@ -646,6 +665,7 @@ de: max_topic_title_length: "Maximale zulässige Titellänge von Themen in Zeichen." min_private_message_title_length: "Minimale zulässige Titellänge von Nachrichten in Zeichen." min_search_term_length: "Minimale zulässige Länge der Suche in Zeichen." + allow_uncategorized_topics: "Erlaube Themen ohne Kategorie zu erstellen. ACHTUNG: " uncategorized_description: "Beschreibung der Kategorie für unkategorisierte Themen. Leer lassen, wenn keine Beschreibung erwünscht ist." allow_duplicate_topic_titles: "Erlaube Themen mit identischen und doppelten Titeln." unique_posts_mins: "Minuten, nach denen ein Nutzer denselben Inhalt noch einmal posten kann." @@ -1064,6 +1084,7 @@ de: omniauth_error_unknown: "Während des Anmeldens ist etwas schief gelaufen, bitte versuche es noch einmal." new_registrations_disabled: "Leider können derzeit keine neuen Konten registriert werden." password_too_long: "Passwörter sind beschränkt auf 200 Zeichen." + reserved_username: "Der Benutzername ist nicht erlaubt." missing_user_field: "Sie haben nicht alle Benutzerfelder ausgefüllt" close_window: "Authentifizierung abgeschlossen. Schließe das Fenster um fortzufahren." user: @@ -1078,6 +1099,8 @@ de: email: not_allowed: "ist für diesen Mailprovider nicht erlaubt. Bitte verwende eine andere Mailadresse." blocked: "ist nicht erlaubt." + ip_address: + blocked: "Von Deiner IP Adresse aus ist es nicht erlaub sich zu registrieren." invite_mailer: subject_template: "%{invitee_name} hat dich zum Thema '%{topic_title}' auf %{site_domain_name} eingeladen" text_body_template: | @@ -1097,17 +1120,15 @@ de: invite_forum_mailer: subject_template: "%{invitee_name} hat dich eingeladen %{site_domain_name} beizutreten" text_body_template: | - %{invitee_name} hat dich eingeladen zu: + %{invitee_name} lädt Dich zum Thema "%{topic_title}" auf %{site_name} ein. - > **%{site_title}** - > - > %{site_description} + Wenn Dich das interessiert, dann klicke bitte auf den folgenden Link, um die Diskussion zu besuchen: - Falls du interessiert bis, klicke auf den nachfolgenden Link: + [%{site_name}][1] - %{invite_link} + Du wurdest von einem vertrauenswürdigen Nutzer eingeladen, so dass Du direkt und ohne vorherige Anmeldung antworten kannst. - Die Einladung ist von einem vertrautem Benutzer, du musst dich daher nicht einloggen. + [1]: %{invite_link} invite_password_instructions: subject_template: "Legen Sie ein Passwort für Ihr %{site_name}-Konto fest" test_mailer: @@ -1492,7 +1513,6 @@ de: (Wenn du als neuer Benutzer unter vier Augen mit einem unserer [Mitarbeiter](%{base_url}/about) reden möchtest, antworte einfach auf diese Nachricht.) signup: - subject_template: "[%{site_name}] Aktiviere deinen neues Konto" text_body_template: | Willkommen bei %{site_name}! @@ -1524,8 +1544,6 @@ de: too_large: "Entschuldigung, die Datei die du hochladen möchtest ist zu groß (maximale Dateigröße ist %{max_size_kb}KB)." images: too_large: "Entschuldigung, das Bild das du hochladen möchtest ist zu groß (maximale Dateigröße ist %{max_size_kb}KB). Bitte verkleinere es und versuche es erneut." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Entschuldigung, aber die Datei die du hochladen möchtest scheint kein Bild zu sein." size_not_found: "Entschuldige, aber wir konnten die Grösse des Bildes nicht feststellen. Vielleicht ist das Bild defekt?" flag_reason: sockpuppet: "Ein neuer Benutzer hat ein Thema erstellt und ein anderer neuer Benutzer mit der selben IP Adresse hat darauf geantwortet. Beachte die flag_sockpuppets Einstellung." diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 4b01b8b3e8..9a76fd0bb9 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -842,6 +842,7 @@ en: flag_sockpuppets: "If a new user replies to a topic from the same IP address as the new user who started the topic, flag both of their posts as potential spam." traditional_markdown_linebreaks: "Use traditional linebreaks in Markdown, which require two trailing spaces for a linebreak." + allow_html_tables: "Allow tables to be entered in Markdown using HTML tags, TABLE, THEAD, TD, TR, TH are whiteliseted (requires full rebake on all old posts containing tables)" post_undo_action_window_mins: "Number of minutes users are allowed to undo recent actions on a post (like, flag, etc)." must_approve_users: "Staff must approve all new user accounts before they are allowed to access the site. WARNING: enabling this for a live site will revoke access for existing non-staff users!" ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -2187,7 +2188,7 @@ en: ## [Powered by You](#power) - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). + This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). @@ -2304,7 +2305,7 @@ en: ## [14. Disclaimer of Warranties](#14) - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index f1bbbfd962..f2e3c0ed80 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -744,6 +744,7 @@ es: notify_mods_when_user_blocked: "Si un usuario es bloqueado automáticamente, enviar un mensaje a todos los moderadores." flag_sockpuppets: "Si un nuevo usuario responde a un tema desde la misma dirección de IP que el nuevo usuario que inició el tema, reportar los posts de los dos como spam en potencia." traditional_markdown_linebreaks: "Utiliza saltos de línea tradicionales en Markdown, que requieren dos espacios al final para un salto de línea." + allow_html_tables: "Permitir en Markdown la inserción de tablas usando etiquetas HTML como TABLE, THEAD, TD, TR o TH (requiere un rebake completo para todos los posts antiguos que contengan tablas)" post_undo_action_window_mins: "Número de minutos durante los cuales los usuarios pueden deshacer sus acciones recientes en un post (me gusta, reportes, etc)." must_approve_users: "Los miembros administración deben aprobar todas las nuevas cuentas antes de que se les permita el acceso al sitio. AVISO: ¡habilitar esta opción en un sitio activo revocará el acceso a los usuarios que no sean moderadores o admin!" ga_tracking_code: "Código de Google Analytics, ej: UA-12345678-9; visita http://google.com/analytics" @@ -1063,6 +1064,7 @@ es: other: "He movido %{count} posts al tema: %{topic_link}" change_owner: post_revision_text: "Se ha transferido la propiedad de %{old_user} a %{new_user}" + deleted_user: "un usuario eliminado" emoji: errors: name_already_exists: "Lo sentimos, el nombre '%{name}' ya está en uso por otro emoji." @@ -1116,6 +1118,7 @@ es: omniauth_error_unknown: "Algo ha salido mal procesando tu inicio de sesión, por favor, vuelve a intentarlo." new_registrations_disabled: "El registro de nuevas cuentas no está permitido en este momento." password_too_long: "Las contraseñas están limitadas a 200 caracteres" + email_too_long: "El email que has proporcionado es demasiado largo. Las direcciones de correo no deben tener más de 254 caracteres y los nombres de dominio no más de 253." reserved_username: "Ese nombre de usuario no está permitido." missing_user_field: "No has completado todos los campos de usuario" close_window: "Autenticación completa. Cierra esta ventana para continuar." @@ -1284,6 +1287,13 @@ es: Sin embargo, si el post fuera ocultado por la comunidad una segunda vez, permanecerá oculto hasta que sea revisado por un moderador – y en ese caso puede que se tomen medidas, incluyendo la posible suspesión de tu cuenta. Para más información, por favor consulta nuestras [directrices](%{base_url}/guidelines). + usage_tips: + text_body_template: "Aquí tienes unos breves consejos para empezar:\n\n## Lectura\n\nPara leer más, **¡tan solo tienes que hacer scroll!** \n\nTan pronto como se publiquen nuevas respuestas o temas, aparecerán automáticamente – sin necesidad de actualizar la página.\n\n## Navegación\n\n- Para la búsqueda, tu perfil de usuario, o el menú ☰;, usa los **botones con iconos de la esquina superior derecha**. \n\n- Entrar a un tema desde su título te llevará a la **última respuesta sin leer** del hilo. Para ir al primer o al último post, haz clic en el contador de respuestas o en la fecha de última respuesta.\n\n \n\n- Mientras lees un tema, selecciona la barra de progreso en la esquina inferior derecha para ver los controles de navegación. Podrás ir al inicio del hilo seleccionando su\ + \ título. Teclea ? para ver una lista de rápidos atajos de teclado.\n\n \n\n## Participando\n\n- Para responder al **tema en general**, utiliza al final del hilo. \n\n- Para responder a **una persona en específico**, utiliza en su post. \n\n- Para responder **creando un nuevo tema**, utiliza a la derecha del post. Tanto el tema original como el nuevo serán enlazados entre sí automáticamente. \n\nPara escribir una cita, selecciona el texto que quieres citar, después haz clic en el botón citar. ¡Puedes repetir para realizar\ + \ múltiples citas! \n\n\n\nPara notificar a alguien en tu respuesta, menciónale. Empieza a escribir `@` para elegir su nombre de usuario. \n\n \n\nPara usar [Emojis](http://www.emoji.codes/), teclea `:` para elegir por nombre, o usa los tradicionales smileys `;)` \n\n \n\n## Acciones\n\nHay algunos botones de acción al final de cada post: \n\n \n\nPara hacerle saber a alguien que has disfrutado o que aprecias su post, utiliza el botón de **Me gusta**. ¡Compartir es amor! \n\nSi ves algún problema en la publicación de\ + \ alguien, escríbele un privado, o házselo saber [a nuestros moderadores](%{base_url}/about), con el botón **reporte**. También puedes **compartir** un enlace a un post, o guardarlo en **marcadores** para tenerlo de referencia en tu página de perfil. \n\n## Notificaciones\n\nCuando alguien te responde, cita tu post, o bien menciona tu `@usuario`, inmediatamente aparecerá un número en la esquina superior derecha de la página. Usa ese botón para acceder a tus **notificaciones**. \n\n \n\nNo te preocupes si te pierdes alguna respuesta – te enviaremos un email con las notificaciones que lleguen cuando estés fuera.\n\n## Tus preferencias\n\n- Todos los temas creados hace menos de **dos días** se consideran nuevos. \n\n- Aquellos temas en los que hayas **participado activamente** (porque lo hayas creado,\ + \ o respondido o leído durante un período razonable) serán seguidos por tu usuario automáticamente. Verás los indicadores azules de temas nuevos o número de respuestas no leídas al lado de estos temas: \n\n \n\nPuedes cambiar tus notificaciones para cualquier tema mediante el control de notificaciones al final del tema. \n\n \n\nTambién puedes establecer el estado de notificación de una categoría entera, si quieres vigilar cualquier nuevo tema en una categoría específica. Para cambiar cualquiera de estas opciones, puedes ver [tus preferencias](%{base_url}/my/preferences). \n\n## Confianza \n\nAl participar aquí, con el tiempo te ganarás la confianza de la comunidad, te convertirás en usuario de\ + \ pleno derecho y te serán retiradas las limitaciones de nuevo usuario. Llegado a un punto de un alto [nivel de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), obtendrás además nuevas habilidades para ayudarnos a gestionar la comunidad juntos.\n" welcome_user: subject_template: "¡Bienvenido a %{site_name}!" text_body_template: | @@ -1656,7 +1666,7 @@ es: (Si necesitas comunicarte por privado con [algún miembro del staff](%{base_url}/about) como nuevo usuario, puedes responder a este mensaje.) signup: - subject_template: "[%{site_name}] Activa tu nueva cuenta" + subject_template: "[%{site_name}] Confirma tu nueva cuenta" text_body_template: | ¡Bienvenido a %{site_name}! @@ -1688,8 +1698,6 @@ es: too_large: "Lo sentimos, el archivo que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB)." images: too_large: "Lo sentimos, la imagen que estás intentando subir es demasiado grande (el tamaño máximo es %{max_size_kb}%KB). Por favor, modifica sus dimensiones y prueba otra vez." - fetch_failure: "Lo sentimos, hubo un error al recuperar la imagen." - unknown_image_type: "Lo sentimos, pero el archivo que estás intentado subir no parece ser una imagen." size_not_found: "Lo sentimos, pero no hemos podido determinar el tamaño de la imagen. ¿Quizás el archivo está corrupto?" flag_reason: sockpuppet: "Un nuevo usuario ha creado un tema, y otro nuevo usuario con la misma dirección IP le ha respondido. Mira la opción flag_sockpuppets del sitio." @@ -1726,6 +1734,30 @@ es: title: "Términos de Servicio" privacy_topic: title: "Políticas de Privacidad" + static: + search_help: | +

Consejos

+

+

    +
  • Se prioriza que la búsqueda coincida con el título, por lo que en caso de duda, busca por títulos
    • +
  • Buscar palabras diferentes, no muy comunes, siempre dará mejores resultados
    • +
  • Cuando sea posible, centra tu búsqueda en una categoría, un tema o un usuario en concreto
    • +
+

+

Opciones

+

+ + + + + + + +
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
+

+

+ arcoiris category:parques status:open order:latest buscará temas que contengan la palabra "arcoiris" en la categoría "parques" que no estén cerrados o archivados, ordenados por la fecha de la última publicación. +

badges: long_descriptions: autobiographer: | @@ -1743,6 +1775,37 @@ es: Este distintivo se otorga por leer un tema largo. Leer es fundamental. Leer al detalle ayuda a seguir la conversación y hace que las respuestas sean mejores y más completas. editor: | Este distintivo se otorga por editar tu post. No dudes en editar tus posts en cualquier momento para mejorarlos, corregir pequeños errores o añadir algo que olvidaste. + first_flag: "Este distintivo se concede por reportar un post. Reportar es crítico para la salud de tu comunidad. Si detectas que alguna publicación requiere de la atención de un moderador por favor \nno dudes en reportarlo. También puedes usar el diálogo de reporte para enviar mensajes a otros usuarios.\n\n" + nice_share: | + Este distintivo se concede por compartir un enlace a un post que ha recibido 25 visitantes nuevos. ¡Buen trabajo! Compartir enlaces a debates interesantes con amigos es una manera excelente de hacer crecer nuestra comunidad. + welcome: | + Este distintivo se concede cuando recibes tu primer Me gusta en un post. ¡Enhorabuena, has publicado algo que la comunidad considera guay, útil o interesante! + anniversary: | + Este distintivo se concede cuando cumples un año como miembro que ha publicado al menos un post. ¡Gracias por pasarte por aquí y contribuir a nuestra comunidad! + good_share: | + Este distintivo se concede por compartir un enlace a un post que ha recibido 300 visitantes nuevos. ¡Genial! Has descubierto un debate interesante para mucha gente que no conocía el sitio y nos has ayudado a crecer. + great_share: | + Este distintivo se concede por compartir un enlace a un post que ha recibido 1000 visitantes nuevos. ¡Bravo! Has promovido un debate interesante para una inmensa audiencia que no conocía el sitio y nos has ayudado a crecer muchísimo. + nice_post: | + Este distintivo se concede al publicar una respuesta con 10 Me gusta. ¡Buen trabajo! + nice_topic: | + Este distintivo se concede al crear un tema con 10 Me gusta. ¡Buen trabajo! + good_post: | + Este distintivo se concede al publicar una respuesta con 25 Me gusta. ¡Genial! + good_topic: | + Este distintivo se concede al crear un tema con 25 Me gusta. ¡Genial! + great_post: | + Este distintivo se concede al publicar una respuesta con 50 Me gusta. ¡Excelente! + great_topic: | + Este distintivo se concede al crear un tema con 50 Me gusta. ¡Excelente! + basic: | + Este distintivo se concede cuando alcanzas el nivel de confianza 1. Gracias por pasar por aquí un momento y leer unos cuantos temas para ver de qué va esta comunidad. Las restricciones de nuevo usuario se eliminan y podrás usar las funcionalidades esenciales del sitio como enviar mensajes a otras personas, reportar posts, editar posts wiki y publicar imágenes o varios enlaces. + member: | + Este distintivo se concede cuando alcanzas el nivel de confianza 2. Gracias por tu constante participación en la comunidad. Ahora puedes enviar invitaciones a otras personas desde tu perfil o temas individuales, enviar mensajes a grupos y dar más Me gusta por día. + regular: | + Este distintivo se concede cuando alcanzas el nivel de confianza 3. Gracias por tomar parte activa de nuestra comunidad por tanto tiempo, ser uno de los más ávidos lectores y contribuir tanto a su crecimiento y calidad. Ahora puedes recategorizar o renombrar temas, acceder al área vip, reportar spam de forma más contundente y dar muchos más Me gusta por día. + leader: | + Este distintivo se concede cuando alcanzas el nivel de confianza 4. Eres un líder de la comunidad elegido por los administradores, constituyes un ejemplo positivo para los demás mediante tus hechos y palabras. Ahora puedes editar todos los posts, dar muchísimos Me gusta por día y realizar acciones de moderador como destacar temas, cerrarlos, archivarlos, hacerlos invisibles, dividirlos o integrarlos. admin_login: success: "Email enviado" error: "¡Error!" diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml index b9655ee2ba..208323dfff 100644 --- a/config/locales/server.fa_IR.yml +++ b/config/locales/server.fa_IR.yml @@ -426,6 +426,7 @@ fa_IR: regular: title: "موضوع عادی" banner: + title: "اعلان موضوع" message: make: "این موضوع در حال حاضر بنر است. این در بالای در تمام صفحه ها نمایش داده می شود تا زمانی که توسط کاربر رد بشود. " remove: "این موضوع دیگر در بنر نیست. دیگر در بالای در صفحه ها به نمایش در نمی آید. " @@ -533,6 +534,12 @@ fa_IR: title: "کل" xaxis: "روز" yaxis: "تمام درخواست API" + page_view_logged_in_mobile_reqs: + title: "وارد شده در درخواست های API" + xaxis: "روز" + page_view_anon_mobile_reqs: + title: "درخواست های ناشناس API" + xaxis: "روز" http_background_reqs: title: "پس زمینه" xaxis: "روز" @@ -565,6 +572,10 @@ fa_IR: title: "عناوین بدون پاسخ" xaxis: "روز" yaxis: "مجموع" + mobile_visits: + title: "بازدید کاربران" + xaxis: "روز" + yaxis: "تعداد بازدید ها" dashboard: rails_env_warning: "سرور شما در حال اجراست در %{env} حالت " ruby_version_warning: "شما نسخه Ruby 2.0.0 را اجرا کرده اید که به مشکل دارا بودن شناخته شده است. به روز کنید به بخش 247 یا بعدتر" @@ -1012,6 +1023,7 @@ fa_IR: other: "من {count}% تا از نوشته‌ها را به این موضوع انتقال دادم: {topic_link}%" change_owner: post_revision_text: "حق مالکیت از کاربر {old_user}% به کاربر {new_user}% منتقل شد" + deleted_user: "یک کاربر حذف شده" emoji: errors: name_already_exists: "متأسفیم، در حال حاضر نام '{name}%' توسط ایموجی دیگری استفاده می‌شود." @@ -1059,6 +1071,7 @@ fa_IR: omniauth_error_unknown: "یک چیزی برای پروسه وارد شدن شما به سیستم با مشکل مواجه شد٬‌ لطفا دوباره تلاش کنید." new_registrations_disabled: "ثبت حساب‌ کاربری جدید اکنون امکان‌پذیر نیست." password_too_long: "رمزهای عبور به 200 کاراکتر محدود شده‌اند." + reserved_username: "این نام کاربری مجاز نیست." missing_user_field: "شما تمام فیلد های کاربری را تکمیل نکرده اید" close_window: "احراز هویت تمام شد. پنجره را ببندید برای ادامه." user: @@ -1409,7 +1422,7 @@ fa_IR: subject_template: "شما تایید شدید %{site_name}! " text_body_template: "خوش آمدید به %{site_name}!\n\nیکی از مدیران حساب کاربری شما را تایید کرد در %{site_name}.\n\nبر روی پیوند پیش رو کلیک کنید تا حساب کاربری شما تایید شود: \n%{base_url}/users/activate-account/%{email_token}\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n\n%{new_user_tips}\n\n\nما به [رفتار انجمن متمدن] معتقدیم (%{base_url}/guidelines) برای همیشه. \n\nاز بودنتان در اینجا لذت ببرید! \n\n( اگر شما نیاز به ارتباط با مدیران را دارید[staff members](%{base_url}/about) به عنوان یک کاربر جدید٬ لطفا به این پیام پاسخ دهید.)\n" signup: - subject_template: "[%{site_name}] حساب کاربری جدیدتان را فعال کنید" + subject_template: "[%{site_name}] حساب کاربری جدید را تایید کنید" text_body_template: "خوش آمدید به %{site_name}!\n\n\nبرای فعال نمودن حساب کاربریتان بر روی پیوند پیش رو کلیک کنید: \n\n%{base_url}/users/activate-account/%{email_token}\n\n\nاگر پیوند بالا قابل کلیک کردن نیست٬ پیوند را کپی کنید و در مرور گر وب انتقال دهید. \n" page_not_found: title: "صفحه ای که درخواست کردید وجود ندارد یا خصوصی است. " @@ -1433,8 +1446,6 @@ fa_IR: too_large: "متأسفم، پرونده‌ای که می‌خواهید بارگذاری کنید بسیار بزرگ است! ( حداکثر حجم پرونده باید {max_size_kb}% کیلوبایت باشد. )" images: too_large: "با عرض پوزش٬ عکسی را که تلاش برای بارگزاری آن دارید بسیار بزرگ است ( حداکثر اندازه %{max_size_kb}KB ) لطفا آن را تغییر اندازه دهید و دوباره امتحان کنید. " - fetch_failure: "متأسفیم، در هنگام کشیدن عکس خطایی رخ داده است." - unknown_image_type: "متأسفم، اما به نظر می‌رسد پرونده‌ای که می‌خواهید بارگذاری کنید، از نوع «تصویر» نیست." size_not_found: "با عرض پوزش٬ ولی ما نتوانستیم اندازه عکس را مشخص کنیم. شاید عکس شما خراب است. " flag_reason: sockpuppet: "یک کاربر جدید یک جستار جدید ساخته٬ و کاربر جدید دیگری با همان آدرس IP پاسخ داده. نگاه کن به گزارش٬ sockpuppets تنظیمات سایت " @@ -1467,241 +1478,8 @@ fa_IR: نوشته اول این جستار را ویرایش کن برای عوض کردن محتویا ت%{page_name} صفحه. guidelines_topic: title: "پرسش و پاسخ / دستورالعمل" - body: | - - - ## [This is a Civilized Place for Public Discussion](#civilized) - - Please treat this discussion forum with the same respect you would a public park. We, too, are a shared community resource — a place to share skills, knowledge and interests through ongoing conversation. - - These are not hard and fast rules, merely aids to the human judgment of our community. Use these guidelines to keep this a clean, well-lighted place for civilized public discourse. - - - - ## [Improve the Discussion](#improve) - - Help us make this a great place for discussion by always working to improve the discussion in some way, however small. If you are not sure your post adds to the conversation, think over what you want to say and try again later. - - The topics discussed here matter to us, and we want you to act as if they matter to you, too. Be respectful of the topics and the people discussing them, even if you disagree with some of what is being said. - - One way to improve the discussion is by discovering ones that are already happening. Please spend some time browsing the topics here before replying or starting your own, and you’ll have a better chance of meeting others who share your interests. - - - - ## [Be Agreeable, Even When You Disagree](#agreeable) - - You may wish to respond to something by disagreeing with it. That’s fine. But, remember to _criticize ideas, not people_. Please avoid: - - * Name-calling. - * Ad hominem attacks. - * Responding to a post’s tone instead of its actual content. - * Knee-jerk contradiction. - - Instead, provide reasoned counter-arguments that improve the conversation. - - - - ## [Your Participation Counts](#participate) - - The conversations we have here set the tone for everyone. Help us influence the future of this community by choosing to engage in discussions that make this forum an interesting place to be — and avoiding those that do not. - - Discourse provides tools that enable the community to collectively identify the best (and worst) contributions: favorites, bookmarks, likes, flags, replies, edits, and so forth. Use these tools to improve your own experience, and everyone else’s, too. - - Let’s try to leave our park better than we found it. - - - - ## [If You See a Problem, Flag It](#flag-problems) - - Moderators have special authority; they are responsible for this forum. But so are you. With your help, moderators can be community facilitators, not just janitors or police. - - When you see bad behavior, don’t reply. It encourages the bad behavior by acknowledging it, consumes your energy, and wastes everyone’s time. _Just flag it_. If enough flags accrue, action will be taken, either automatically or by moderator intervention. - - In order to maintain our community, moderators reserve the right to remove any content and any user account for any reason at any time. Moderators do not preview new posts in any way; the moderators and site operators take no responsibility for any content posted by the community. - - - - ## [Always Be Civil](#be-civil) - - Nothing sabotages a healthy conversation like rudeness: - - * Be civil. Don’t post anything that a reasonable person would consider offensive, abusive, or hate speech. - * Keep it clean. Don’t post anything obscene or sexually explicit. - * Respect each other. Don’t harass or grief anyone, impersonate people, or expose their private information. - * Respect our forum. Don’t post spam or otherwise vandalize the forum. - - These are not concrete terms with precise definitions — avoid even the _appearance_ of any of these things. If you’re unsure, ask yourself how you would feel if your post was featured on the front page of the New York Times. - - This is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends. - - - - ## [Keep It Tidy](#keep-tidy) - - Make the effort to put things in the right place, so that we can spend more time discussing and less cleaning up. So: - - * Don’t start a topic in the wrong category. - * Don’t cross-post the same thing in multiple topics. - * Don’t post no-content replies. - * Don’t divert a topic by changing it midstream. - * Don’t sign your posts — every post has your profile information attached to it. - - Rather than posting “+1” or “Agreed”, use the Like button. Rather than taking an existing topic in a radically different direction, use Reply as a Linked Topic. - - - - ## [Post Only Your Own Stuff](#stealing) - - You may not post anything digital that belongs to someone else without permission. You may not post descriptions of, links to, or methods for stealing someone’s intellectual property (software, video, audio, images), or for breaking any other law. - - - - ## [Powered by You](#power) - - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). - - - - ## [Terms of Service](#tos) - - Yes, legalese is boring, but we must protect ourselves – and by extension, you and your data – against unfriendly folks. We have a [Terms of Service](/tos) describing your (and our) behavior and rights related to content, privacy, and laws. To use this service, you must agree to abide by our [TOS](/tos). tos_topic: title: "شرایط استفاده از خدمات" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "سیاست حفظ حریم خصوصی" body: | diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml index 240c5b9591..6b6b28f537 100644 --- a/config/locales/server.fi.yml +++ b/config/locales/server.fi.yml @@ -469,6 +469,7 @@ fi: regular: title: "Tavallinen ketju" banner: + title: "Banneriketju" message: make: "Tämä ketju on nyt banneri. Se näytetään jokaisen sivun ylälaidassa, kunnes käyttäjä kuittaa sen nähdyksi." remove: "Tämä ketju ei ole enää banneri. Sitä ei näytetä enää jokaisen sivun ylälaidassa." @@ -576,6 +577,14 @@ fi: title: "Yhteensä" xaxis: "Päivä" yaxis: "API-pyynnöt yhteensä" + page_view_logged_in_mobile_reqs: + title: "Kirjautuneiden API-pyynnöt" + xaxis: "Päivä" + yaxis: "Mobiiliin kirjautuneiden API-pyynnöt" + page_view_anon_mobile_reqs: + title: "Anonyymit API-pyynnöt" + xaxis: "Päivä" + yaxis: "Mobiilit anonyymit API-pyynnöt" http_background_reqs: title: "Taustajärjestelmä" xaxis: "Päivä" @@ -608,6 +617,10 @@ fi: title: "Ketjut, joihin ei ole vastattu" xaxis: "Päivä" yaxis: "Yhteensä" + mobile_visits: + title: "Vierailut" + xaxis: "Päivä" + yaxis: "Vierailujen määrä" dashboard: rails_env_warning: "Palvelintasi ajetaan %{env} moodissa." ruby_version_warning: "Käytät Rubyn versiota 2.0.0 jonka kanssa on tunnettuja ongelmia. Päivitä patch level 247 tai uudempaan." @@ -740,6 +753,7 @@ fi: notify_mods_when_user_blocked: "Jos käyttäjä estetään automaattisesti, lähetä viesti kaikille valvojille." flag_sockpuppets: "Jos uusi käyttäjä vastaa toisen uuden käyttäjän luomaan ketjun samasta IP osoitteesta, liputa molemmat viestit mahdolliseksi roskapostiksi." traditional_markdown_linebreaks: "Käytä perinteisiä rivinvaihtoja Markdownissa, joka vaatii kaksi perättäistä välilyöntiä rivin vaihtoon." + allow_html_tables: "Salli taulukoiden syöttäminen Markdowniin käyttäen HTML tageja, TABLE, THEAD, TD, TR, TH on whitelistattu (edellyttää kaikkien vanhojen viestien, jotka sisältävät taulukoita, uudelleen rakentamisen)" post_undo_action_window_mins: "Kuinka monta minuuttia käyttäjällä on aikaa perua viestiin kohdistuva toimi (tykkäys, liputus, etc)." must_approve_users: "Henkilökunnan täytyy hyväksyä kaikki uudet tilit, ennen uusien käyttäjien päästämistä sivustolle. VAROITUS: tämän asetuksen valitseminen poistaa pääsyn kaikilta jo olemassa olevilta henkilökuntaan kuulumattomilta käyttäjiltä." ga_tracking_code: "Google analytics (ga.js) seurantakoodi, esim.: UA-12345678-9; katso http://google.com/analytics" @@ -784,6 +798,7 @@ fi: login_required: "Vaadi kirjautumista sivuston lukemiseen, epää anonyymi pääsy." min_username_length: "Käyttäjänimen vähimmäispituus merkeissä. VAROITUS: OLEMASSA OLEVAT KÄYTTÄJÄT JOIDEN KÄYTTÄJÄTUNNUS ON LYHYEMPI KUIN TÄMÄ EIVÄT VOI ENÄÄ KIRJAUTUA SISÄÄN MUUTOKSEN JÄLKEEN." max_username_length: "Käyttäjänimen enimmäispituus merkeissä. VAROITUS: KÄYTTÄJÄT JOIDEN KÄYTTÄJÄTUNNUS ON PIDEMPI KUIN TÄMÄ EIVÄT VOI ENÄÄ KIRJAUTUA SISÄÄN MUUTOKSEN JÄLKEEN." + reserved_usernames: "Käyttäjänimet, joiden rekisteröintiä ei sallita." min_password_length: "Salasanan vähimmäispituus." block_common_passwords: "Älä salli salasanoja, jotka ovat 10 000 yleisimmän salasanan joukossa." enable_sso: "Ota käyttöön single sign on ulkopuolisen sivuston kautta (VAROITUS: ULKOPUOLISEN SIVUSTON TÄYTYY VALIDOIDA SÄHKÖPOSTIOSOITTEET!)" @@ -1058,6 +1073,7 @@ fi: other: "Siirsin %{count} viestiä ketjuun: %{topic_link}" change_owner: post_revision_text: "Omistus vaihdettu käyttäjältä %{old_user} käyttäjälle %{new_user}" + deleted_user: "poistettu käyttäjä" emoji: errors: name_already_exists: "Pahoittelut, nimi '%{name}' on jo käytössä toisella emojilla." @@ -1111,6 +1127,8 @@ fi: omniauth_error_unknown: "Jotain meni pieleen kirjautumisesti käsittelyssä, ole hyvä ja yritä uudelleen." new_registrations_disabled: "Uusien tilien luonti ei ole tällä hetkellä sallittu." password_too_long: "Salasanan enimmäispituus on 200 merkkiä." + email_too_long: "Antamasi sähköpostiosoite on liian pitkä. Mailbox nimi ei saa olla yli 254 merkkiä pitkä, eikä domain nimi yli 253 merkkiä pitkä." + reserved_username: "Käyttäjänimi ei ole sallittu." missing_user_field: "Et ole täyttänyt kaikkia kenttiä" close_window: "Kirjautuminen onnistui. Sulje tämä ikkuna jatkaaksesi." user: @@ -1291,6 +1309,91 @@ fi: Kuitenkin, jos viesti piilotetaan toisen kerran, se pysyy piilotettuna, kunnes henkilökunta selvittää tilanteen – jonka jälkeen voi seurata muita seuraamuksia, mukaan lukien tilisi hyllyttäminen. Saadaksesi lisätietoja, lue [yhteisön säännöt](%{base_url}/guidelines). + usage_tips: + text_body_template: | + Tässä muutama nopea ohje, joiden avulla pääset alkuun: + + ## Lukeminen + + Lukeaksesi lisää, **jatka vain sivun vierittämistä alaspäin!** + + Kun uusia vastauksia tai ketjuja luodaan, ne ilmestyvät näkyviin automaattisesti - ei tarvitse ladata sivua uudelleen. + + ## Navigointi + + - Käyttääksesi hakua, päästäksesi käyttäjäsivullesi tai avataksesi ☰ valikon, käytä **oikeassa yläkulmassa olevia painikkeita**. + + - Ketjun otsikkoa klikkaamalla pääset aina **uusimpaan lukemattomaan viestiin** ketjussa. Hypätäksesi ketjun alkuun tai loppuun, klikkaa sen sijaan uusinta toimintaa tai viestien lukumäärää. + + + + - Kun olet lukemassa viestiketjua, valitse edistymispalkki oikealla alhaalla tuodaksesi esiin täydet navigaatiopainikkeet. Paina ? tuodaksesi esiin listan näppäimistöoikoteistä. + + + + ## Vastaaminen + + - Vastataksesi **ketjuun yleisesti**, käytä ketjun lopussa. + + - Vastataksesi **tiettylle henkilölle**, käytä heidän viestissään. + + - Vastataksesi **uudessa ketjussa**, käytä viestin oikealla puolella. Sekä vanha, että uusi ketju yhdistetään toisiinsa automaattisesti. + + Lainataksesi toista käyttäjää, valitse teksti jota haluat lainata ja klikkaa mitä hyvänsä Vastaa-painiketta. Toista lisätäksesi useampia lainauksia. + + + + Jos haluat, että toinen käyttäjä saa ilmoituksen viestistäsi, mainitse hänen nimensä. Aloita kirjoittamaan `@` ja voit valita käyttäjänimen listasta. + + + + Käyttääksesi [tavallisia Emojia](http://www.emoji.codes/), kirjoita vain `:` lisätäksesi nimellä tai käytä perinteisiä hymiöitä `:)` + + + + Luodaksesi lyhennelmän linkistä, liitä se omalle rivilleen: + + + + ## Toiminnot + + Jokaisen viestin alalaidassa on joukko painikkeita: + + + + Osoittaaksesi kirjoittajalle, että olet pitänyt hänen viestistään, käytä **tykkää** painiketta. Laita hyvä kiertämään! + + Jos huomaat jonkun viestissä ongelman, saata asia yksityisesti kirjoittajan tai [palstan henkilökunnan](%{base_url}/about) tietoon **liputa** painikkeella. Voit myös **jakaa** linkin viestiin tai **lisätä sen kirjanmerkkeihin** käyttäjäsivullesi myöhempää tarkastelua varten. + + ## Ilmoitukset + + Kun joku vastaa viestiisi, lainaa viestiäsi tai mainitsee `@käyttäjänimesi`, ilmestyy sivun oikeaan yläkulmaan numero. Sieltä pääset tarkastelemaan **ilmoituksiasi**. + + + + Eikä tarvitse murehtia siitä, että et huomaisi uusi vastauksia. Saat sähköposti-ilmoituksen uusista ilmoituksista jos et ole paikalla, kun ne saapuvat. + + ## Omat asetukset + + - Oletuksena kaikki alle kaksi päivää vanhat keskustelut ovat uusia. + + - Kaikkia keskusteluita **joissa olet ollut mukana** (luomalla, vastaamalla tai lukemalla pitkään) seurataan automaattisesti. + + Näet siniset uusien ja lukemattomien lukumäärän ilmaisimet näiden ketjujen yhteydessä. + + + + Voit vaihtaa minkä tahansa viestiketjun ilmoitusasetuksia ketjun alalaidassa olevalla painikkeella. + + + + Voit myös asettaa ilmoitusasetuksen aluekohtaisesti, jos haluat seurata jokaista ketjua tietyllä alueella. + + Voit muuttaa näitä asetuksia [käyttäjäasetuksissasi](%{base_url}/my/preferences). + + ## Yhteisön luottamus + + Sitä mukaa, kun osallistut palstan keskusteluihin, keräät yhteisön luottamusta ja uuden käyttäjän rajoitukset poistuvat automaattisesti. Korkeammilla [luottamustasoilla](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) saat vielä enemmän valtuuksia, joiden avulla voit auttaa yhteisön ylläpitämisessä. welcome_user: subject_template: "Tervetuloa sivustolle %{site_name}!" text_body_template: | @@ -1675,7 +1778,7 @@ fi: (Jos haluat keskustella [henkilökunnan jäsenten](%{base_url}/about) kanssa, vastaa vain tähän viestiin) signup: - subject_template: "[%{site_name}] Vahvista uusi tilisi" + subject_template: "[%{site_name}] Vahvista uusi käyttäjätilisi" text_body_template: | Tervetuloa sivustolle %{site_name}! @@ -1707,8 +1810,6 @@ fi: too_large: "Pahoittelut, tiedosto jonka latausta yritit on liian suuri ( suurin tiedostokoko on %{max_size_kb}KB)." images: too_large: "Pahoittelut, kuva jonka yritit ladata on liian suuri (suurin sallittu kuvakoko on %{max_size_kb}KB), pienennä kuvaa ja yritä uudestaan." - fetch_failure: "Pahoittelut, kuvan hakemisessa tapahtui virhe." - unknown_image_type: "Pahoittelut, mutta tiedosto jota yrität ladata ei vaikuta olevan kuva." size_not_found: "Pahoittelut, mutta emme pystyneet selvittämään kuvan kokoa. Ehkä kuvatiedosto on vahingoittunut?" flag_reason: sockpuppet: "Uusi käyttäjä loi ketjun ja toinen uusi käyttäjä samasta IP osoitteesta vastasi siihen. Katso asetus flag_sockpuppets." diff --git a/config/locales/server.fr.yml b/config/locales/server.fr.yml index 9c6cfa43dc..c2eac0aaa5 100644 --- a/config/locales/server.fr.yml +++ b/config/locales/server.fr.yml @@ -748,6 +748,7 @@ fr: notify_mods_when_user_blocked: "Si un utilisateur est bloqué automatiquement, envoyer un message à tous les modérateurs." flag_sockpuppets: "Si un nouvel utilisateur répond à un sujet avec la même adresse I¨P que le nouvel utilisateur qui a commencé le sujet, alors leurs messages seront automatiquement marqués comme spam." traditional_markdown_linebreaks: "Utiliser le retour à la ligne traditionnel dans Markdown, qui nécessite deux espaces pour un saut de ligne." + allow_html_tables: "Autoriser la saisie des tableaux dans le Markdown en utilisant les tags HTML : TABLE, THEAD, TD, TR, TH sont autorisés (nécessite un rebake de tous les anciens messages contenant des tableaux)" post_undo_action_window_mins: "Nombre de minutes pendant lesquelles un utilisateur peut annuler une action sur un message (j'aime, signaler, etc.)" must_approve_users: "Les responsables doivent approuver les nouveaux utilisateurs afin qu'ils puissent accéder au site. ATTENTION : activer cette option sur un site en production suspendra l'accès des utilisateurs existants qui ne sont pas des responsables !" ga_tracking_code: "Google Analytics (ga.js) code de suivi, par exemple: UA-12345678-9; voir http://google.com/analytics" @@ -977,6 +978,7 @@ fr: 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." + permalink_normalizations: "Appliquer l'expression régulière suivante avant de faire correspondre les permaliens, par exemple /(\\/topic.*)\\?.*/\\1 supprimera les query strings des routes des sujets. Le format est regex+string, utilisez \\1 etc. pour accéder aux captures" 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." @@ -1067,6 +1069,7 @@ fr: other: "J'ai déplacé %{count} messages dans le sujet : %{topic_link}" change_owner: post_revision_text: "Auteur du message modifié de %{old_user} vers %{new_user}" + deleted_user: "un utilisateur supprimé" emoji: errors: name_already_exists: "Désolé, le nom '%{name}' est déjà utilisé par un autre emoji." @@ -1120,6 +1123,7 @@ fr: omniauth_error_unknown: "Quelque chose s'est mal passé lors de votre connexion, merci de réessayer." new_registrations_disabled: "La création de nouveau compte n'est pas autorisé pour le moment." password_too_long: "Les mots de passe sont limités à 200 caractères." + email_too_long: "L'email renseigné est trop long. Les noms de boîte ne doivent pas dépasser 254 caractères, et les noms de domaines ne doivent pas dépasser 253 caractères." reserved_username: "Ce pseudo n'est pas autorisé." missing_user_field: "Vous n'avez pas renseigné l'ensemble des champs utilisateur" close_window: "Identification terminée. Fermez cette fenêtre pour continuer." @@ -1624,7 +1628,7 @@ fr: (Si, en tant que nouvel utilisateur, vous avez besoin de communiquer avec un [responsable](%{base_url}/about), répondez simplement à ce message.) signup: - subject_template: "[%{site_name}] Activer votre nouveau compte" + subject_template: "[%{site_name}] Confirmer votre nouveau compte" text_body_template: | Bienvenue sur %{site_name} ! @@ -1656,8 +1660,6 @@ fr: too_large: "Désolé, le fichier que vous essayez d'envoyer est trop gros (la taillle maximale est %{max_size_kb}Ko)." images: too_large: "Désolé, l'image que vous essayez d'envoyer est trop grande (taille maximum de %{max_size_kb}Ko), merci de le redimensionner et de réessayer." - fetch_failure: "Désolé, il y a eu une erreur lors de la récupération de l'image." - unknown_image_type: "Désolé, mais le fichier que vous avez essayé d'envoyer ne semble pas être une image." size_not_found: "Désolé, mais nous n'avons pas pu déterminer la taille de votre image. Peut-être est-elle corrompue ?" flag_reason: sockpuppet: "Un nouvel utilisateur a créé un sujet et un autre nouvel utilisateur avec la même adresse IP a répondu. Voir le paramétrage flag_sockpuppets." @@ -1690,288 +1692,18 @@ fr: Modifier le premier message de ce sujet pour changer le contenu de la page %{page_name}. guidelines_topic: title: "FAQ/Règlement" - body: |+ - - - ## [Ceci est un endroit civilisé, merci de le respecter](#civilized) - - Merci de traiter ce forum de discussion avec le même respect que vous pourriez avoir dans un parc public. Nous, aussi, sommes une ressource partagée par la communauté — un endroit pour partager des compétences, savoirs et intérêts au travers de conversations. - - Il ne s'agit pas de règles absolues, uniquement des aides au bon sens de notre communauté. Suivez ces instructions pour garder cet endroit propre et bien éclairé pour un débat public civilisé. - - - - ## [Améliorez la discussion](#improve) - - Aidez nous à faire de cette endroit un endroit idéal pour la discussion en améliorant constamment le débat d'une certaine façon, même minime. Si vous n'êtes pas sûr que votre message soit utile à la discussion ou pourrait nuire à son utilité, pensez à ce que vous voulez dire et essayer de nouveau plus tard. - - Les sujets abordés ici sont importants pour nous, et nous voulons que vous agissiez comme s'ils comptaient également pour vous. Soyez respectueux des sujets et des autres utilisateurs, même si vous êtes en désaccord avec une partie de ce qui est dit. - - Une façon d'améliorer la discussion est de découvrir celles qui sont déjà en cours. Essayez de passez un peu de temps à parcourir les sujets avant de répondre ou démarrer votre propre discussion. De fait, vous aurez de plus grandes chances de rencontrer d'autres personnes qui partagent vos intérêts. - - - - ## [Soyez agréable, même si vous n'êtes pas d'accord](#agreeable) - - La critique peut-être constructive. Vous pouvez répondre à une personne en étant en désaccord avec elle. C'est très bien. Mais n'oubliez pas de *critiquer les idées, pas les gens*. À évitez: - - * Injures. - * Attaques ad hominem. - * Répondre à la tonalité d'un poste plutôt qu'à son contenu réel. - * Contradiction réflexe. - - Au lieu de cela, fournir des contre-arguments motivés qui améliorent la conversation. - - - - ## [Votre participation compte](#participate) - - Les conversations que nous avons ici donnent le ton pour tout le monde. Aidez-nous à influencer l'avenir de cette communauté en choisissant de vous engager dans des discussions qui font de ce forum un lieu intéressant, et en évitant celles qui n'en ont pas. - - Discourse fournit des outils qui permettent à la communauté d'identifier collectivement le meilleur (et le pire) des contributions: favoris, signets, des *J'aime*, des signalements, des réponses, des vérifications, et ainsi de suite. Utilisez ces outils pour améliorer votre propre expérience, et celle de tous les autres aussi. - - Essayons de laisser notre parc mieux que nous l'avons trouvé. - - - - ## [Si vous voyez un problème, signaler le](#flag-problems) - - Les modérateurs ont une rôle spécial; ils sont responsables de ce forum. Mais vous aussi. Avec votre aide, les modérateurs peuvent être des facilitateurs de la vie de la communauté, et pas seulement des concierges ou des policiers. - - Quand vous voyez un mauvais comportement, ne répondez pas. Votre reconnaissance encourage le mauvais comportement, il consomme votre énergie et fait perdre du temps à chacun. *Signalez le*. Si suffisamment de signalements s'accumulent, des mesures seront prises, automatiquement ou par l'intervention d'un modérateur. - - Afin de maintenir notre communauté, les modérateurs se réservent le droit de supprimer tout contenu et n'importe quel compte d'utilisateur pour une raison quelconque, et ce à n'importe quel moment. Les modérateurs ne disposent pas d'un aperçu des nouveaux messages avant leur publication, les modérateurs et opérateurs du site n'assument aucune responsabilité pour tout contenu affiché par la communauté. - - - - ## [Soyez toujours civilisé](#be-civil) - - Rien ne sabote une conversation saine mieux que la grossièreté : - - * Soyez civilisé. Ne postez pas ce qu'une personne raisonnable jugerait offensif, ni de discours violent ou haineux. - * Gardez-le forum propre. Ne publiez rien d'obscène ou sexuellement explicite. - * Se respecter mutuellement est primordial. Ne pas harceler ou chagriner quelqu'un, ni usurper l'identité de quelqu'un ou exposer des informations privées le concernant. - * Respecter notre forum. Ne postez pas de spam ou tout autre forme de vandalisme. - - Il ne s'agit pas ici de choses concrètes avec des définitions précises - évitez *même d'avoir l'air* d'agir de la sorte. Si vous avec un doute, demandez-vous comment vous vous sentiriez si votre post était publié sur la première page du Monde. - - Il s'agit d'un forum public, et les moteurs de recherche indexent ces discussions. Utilisez un langage, des liens et des images sans danger pour votre famille et vos amis. - - - - ## [Gardez cet endroit propre](#keep-tidy) - - Faites l'effort de mettre les choses au bon endroit, afin que nous puissions passer plus de temps à discuter et moins à ranger. Ainsi : - - * Ne commencez pas un sujet dans la mauvaise catégorie. - * Ne postez pas le même contenu dans plusieurs discussions. - * Ne postez pas de message sans contenu. - * Ne pas détourner un sujet en le changeant en cours de route. - * Ne signez pas vos messages — chaque post dispose d'informations sur le profil qui s'y rattachent. - - Plutôt que de poster "+1", "lol", "mdr" ou "d'accord", utilisez le bouton 'J'aime'. Plutôt que de faire prendre à une discussion existante une direction radicalement différente, utilisez "Répondre en créant un sujet lié". - - - - ## [Postez seulement vos propres trucs](#stealing) - - Vous ne pouvez pas poster n'importe quel contenu numérique s'il appartient à quelqu'un d'autre sans son autorisation. Vous ne pouvez pas poster des descriptions, des liens ou des méthodes pour voler la propriété intellectuelle de quelqu'un (logiciels, vidéo, audio, images), ou pour transgresser toute autre loi. - - - - ## [Powered by You](#power) - - Ce site est géré par votre [équipe de responsables](/about) ainsi que *vous*, la communauté. Si vous avez d'autres questions sur comment les choses devraient fonctionner ici, créez un nouveau sujet dans [la catégorie meta](/c/meta) et discutons-en! S'il y un problème critique ou urgent qui ne peut pas être résolu par un sujet meta ou un signalement, contactez nous [ici](/about). - - - - ## [Lisez les conditions générales d'utilisation](#tos) - - Oui, le jargon juridique est ennuyeux, mais nous devons nous protéger – et par extension, vous et vos données – contre des gens hostiles. Nous avons des [Conditions générales d'utilisation](/tos) décrivant votre (et notre) comportement, et les droits liés au contenu, la confidentialité et les lois. Pour utiliser ce service, vous devez accepter de respecter nos [CGU](/tos). - tos_topic: title: "Conditions générales d'utilisation" - body: | - Les termes et conditions suivants régissent toute utilisation du site %{company_domain} et de son contenu, les produits et services disponibles sur ou via le site, y compris, mais sans s'y limiter, le logiciel du forum %{company_domain}, les forums du support %{company_domain} et le service d'hébergement %{company_domain} («Hébergement»), (qui constitue le site). Le site est détenu et exploité par %{company_full_name} ("%{company_name}"). Le site est offert sous réserve de votre acceptation sans modification de l'ensemble des termes et conditions du présent Contrat et toutes les autres règles de fonctionnement, les politiques (y compris, sans limitation, la [Politique de Confidentialité](/privacy) et les [Règles de la Communauté](/faq) de %{company_domain}) et des procédures qui peuvent être publiées de temps à autre sur ce site par %{company_name} (communément nommé, le « Contrat »). - - S'il vous plaît lisez attentivement cet accord avant d'accéder ou d'utiliser le Site. En accédant ou en utilisant n'importe quelle partie du site, vous acceptez d'être lié par les termes et conditions de cet accord. Si vous n'acceptez pas tous les termes et conditions de cet accord, alors vous ne pouvez pas accéder au site Web ou utiliser ses services. Si ces conditions sont considérées comme une offre de %{company_name}, l'acceptation est expressément limitée à ces termes. Le site Web est disponible uniquement aux personnes qui ont au moins 13 ans. - - - - ## [1. Votre compte %{company_domain}](#1) - - Si vous créez un compte sur le site, vous êtes responsable du maintien de la sécurité de votre compte et vous êtes entièrement responsable de toutes les activités qui se produisent sous votre compte. Vous devez informer immédiatement %{company_name} de toute utilisation non autorisée de votre compte ou de toute autre atteinte à la sûreté. %{company_name} notre site ne sera pas responsable des actes ou omissions de votre part, y compris des dommages de toute nature engagés à la suite de tels actes ou omissions. - - - - ## [2. Responsabilité des contributeurs](#2) - - Si vous soumettez du contenu sur le Site, des liens sur le Site, ou que vous rendez (ou permettez à un tiers de rendre) du contenu disponible grâce aux moyens du Site ("Contenu"), Vous êtes entièrement responsable dudit contenu, et de tout dommage résultant de ce Contenu. C'est indifféremment le cas, que le Contenu en question soit de type texte, image, audio ou logiciel. En rendant ce Contenu disponible, vous déclarez et garantissez que : - - * le téléchargement, la copie et l'utilisation du contenu ne porte pas atteinte aux droits de propriété, y compris, mais sans s'y limiter les droits d'auteur, brevets, marques de commerce ou les secrets commerciaux, d'un tiers; - * si votre employeur a des droits de propriété intellectuelle sur ce que vous créez, vous devez soit (i) avoir reçu la permission de votre employeur pour poster ou rendre disponible le contenu, y compris mais non limité à tout logiciel, ou (ii) avoir obtenu de votre employeur une renonciation à tous les droits ou au contenu; - * vous vous êtes entièrement conformée aux licences tierces relatives au contenu, et que vous avez fait toutes les choses nécessaires pour vous conformer aux termes des conditions d'utilisateurs finaux; - * le contenu ne contient pas ou ni installe des virus, vers, logiciels malveillants, chevaux de Troie ou tout autre contenu nuisible ou destructeur; - * le contenu n'est pas du spam, n'est pas généré aléatoirement ou par une machine, et ne contient pas de contenu commercial contraire à l'éthique ou non désirés conçu pour générer du trafic vers des sites tiers ou de stimuler les classements des moteurs de recherche de sites de tiers, ou des actes à caractères illégaux (par exemple comme le phishing) ou induire en erreur les destinataires quant à la source du matériel (comme l'usurpation d'identité); - * le contenu n'est pas pornographique, ne contient pas de menaces ou n'incite pas à la violence, et ne viole pas la vie privée ou les droits d'un tiers; - * votre contenu n'est pas publié via des messages électroniques indésirables tels que les liens de spam sur les groupes de discussion, listes de courriel, des blogs et des sites Web, et les méthodes de promotion similaires non sollicitées; - * votre contenu n'est pas nommé d'une manière qui induit en erreur vos lecteurs en pensant que vous êtes une autre personne ou de la société, et - * vous avez, dans le cas de contenu qui inclut du code informatique, classé avec précision et/ou décrit le type, la nature, les usages et les effets de ce code, si %{company_name} vous le demande ou si la justice le demande. - - - - ## [3. Licence du contenu utilisateur](#3) - - Les contributions utilisateurs sont soumises à la licence [Creative Commons Attribution - Pas d’Utilisation Commerciale - Partage dans les Mêmes Conditions 3.0 France](http://creativecommons.org/licenses/by-nc-sa/3.0/fr/). Sans limiter la portée de ces déclarations ou garanties, %{company_name} a le droit (néanmoins pas l'obligation) de, (i) refuser ou retirer tout contenu à la seule discrétion de %{company_name}, qui selon l'opinion raisonnable de %{company_name}, ne respecte pas la politique de %{company_name} ou est peut être considéré comme dangereux ou répréhensible, (ii) ou mettre fin ou empêcher l'accès au site web à n'importe quelle personne ou entité pour n'importe quel raison, et ce à la seule discrétion de %{company_name}. %{company_name} n'a pas obligation de rembourser les montants précédemment payés. - - - - ## [4. Paiement et Renouvellement](#4) - - ### Conditions générales - - Des services ou mises à jour payantes en option peuvent être disponibles sur le site Web. Lors de l'utilisation d'un service payant en option ou de mise à niveau, vous acceptez de payer à %{company_name} les frais de souscription mensuels ou annuels indiqués. Les paiements seront facturés sur une base pré-payé le jour où vous commencer à utiliser le service ou la mise à niveau et couvrira l'utilisation de ce service ou de mise à niveau pour une période mensuelle ou annuelle de souscription comme indiqué. Ces frais ne sont pas remboursables. - - ### Renouvellement automatique - - Sauf si vous informez %{company_name} avant la fin de la période de souscription applicable que vous souhaitez annuler un service ou une mise à niveau, votre abonnement sera renouvelé automatiquement et vous nous autorisez à recueillir les frais d'abonnement annuel ou mensuel, alors en vigueur (ainsi que toutes les taxes) en utilisant n'importe quel carte de crédit ou autre moyen de paiement que nous avons conservé pour vous. Les abonnements peuvent être annulés à tout moment. - - - - ## [5. Services](#5) - - ### Hébergement, Support - - Des services d'hébergement et de support optionnels peuvent être fournis par %{company_name} selon les termes et conditions pour chacun de ces services. En vous inscrivant à un compte de services d'hébergement / de support, vous vous engagez à respecter les termes et conditions. - - - - ## [6. Responsabilité des visiteurs du site](#6) - - %{company_name} n'a pas révisé et ne peut examiner, tout le contenu, y compris les logiciels, posté sur le site Web , et ne peut donc pas être tenu responsable du contenu, de l'utilisation ou des effets de ce contenu. En opérant le site %{company_name}, ne représente pas ou n'implique pas qu'il approuve le contenu diffusé, ou qu'il croit que ce contenu est précis, utile ou non nuisible. Vous êtes responsable de prendre les précautions nécessaires pour que vous et vos systèmes informatiques soit protégés contre les virus, vers, chevaux de Troie et d'autres contenus nuisibles ou destructeurs . Le Site peut contenir du contenu qui est offensant, indécent , ou autrement répréhensible , ainsi que du contenu contenant des inexactitudes techniques, erreurs typographiques et d'autres erreurs. Le Site peut également contenir du matériel qui viole la vie privée ou aux droits de publicité, ou porte atteinte à la propriété intellectuelle et autres droits de propriété de tiers, ou le téléchargement, la copie ou l'utilisation sont soumis à des termes et conditions supplémentaires, déclaré ou non déclaré. %{company_name} décline toute responsabilité pour tout dommage résultant de l'utilisation par les visiteurs du site Web, ou de tout téléchargement par les visiteurs du contenu posté ici. - - - - ## [7. Contenu publié sur d'autres sites](#7) - - Nous n'avons pas examiné, et ne pouvons pas examiner, tout le contenu, y compris les logiciels, mises à disposition par des sites et des pages Web vers lesquels %{company_domain} pointe et qui pointe vers %{company_domain}, %{company_name} n'a pas le contrôle sur ces sites Web et ces sites Web "non-%{company_domain}", et ne sommes pas responsable de leur contenu ou de leur utilisation. En vous connectant à un site "non-%{company_domain}" ou page web, %{company_name} ne représentent pas ou n'implique pas qu'il approuve tel site ou tel page Web. Vous êtes responsable de prendre les précautions nécessaires pour que vous et vos systèmes informatiques soit protégé contre les virus, vers, chevaux de Troie et d'autres contenus nuisibles ou destructeurs. %{company_name} décline toute responsabilité pour tout dommage résultant de votre utilisation de site "non-%{company_domain}" et autres pages web. - - - - ## [8. Violation du droit d'auteur et de la politique DADVSI](#8) - - %{company_name} demande aux autres de respecter ses droits de propriété intellectuelle, il respecte les droits de propriété intellectuelle d'autrui. Si vous croyez que le contenu situé sur ou lié par %{company_domain} viole vos droits d'auteur, et si ce site réside en France, vous êtes encouragés à le signaler à %{company_name}, conformément au '[Droit d'auteur et aux droits voisins dans la société de l'information](http://www.legifrance.gouv.fr/affichTexte.do?cidTexte=JORFTEXT000000266350&dateTexte=&categorieLien=id)' (« DADVSI »). %{company_name} répondra à toutes les notifications, y compris si nécessaire ou approprié par enlèvement du contenu contrefait ou de désactiver tous les liens vers les documents de contrefaçon. %{company_name} mettra fin à l'accès d'un visiteur et l'utilisation du site Web si, dans des circonstances appropriées, le visiteur est déterminé à être un récidiviste violation des droits d'auteur ou autres droits de propriété intellectuelle de %{company_name} ou autres. Dans le cas d'une telle résiliation, %{company_name} n'aura aucune obligation de fournir un remboursement des sommes déjà versées à %{company_name}. - - - - ## [9. Propriété Intellectuelle](#9) - - Le présent accord ne transfère pas de %{company_name} à vous aucune propriété intellectuelle de %{company_name} ou d'un tiers, et tout droit, titre et intérêt dans et pour ces biens restera (entre les parties) uniquement %{company_name}. %{company_name}, %{company_domain}, le logo %{company_domain}, et toutes les autres marques commerciales, marques de services, graphismes et logos utilisés dans le cadre de %{company_domain}, ou le site Web sont des marques commerciales ou des marques déposées de %{company_name} ou des concédants de %{company_name}. D'autres marques commerciales, marques de services, graphismes et logos utilisés dans le cadre du site Web peuvent être des marques de commerce de tierces parties. Votre utilisation du Site ne vous accorde aucun droit ou licence pour reproduire ou utiliser tout ou partie des marques de %{company_name} ou celles des tiers. - - - - ## [10. Publicités](#10) - - %{company_name} se réserve le droit d'afficher des publicités sur votre contenu, sauf si vous avez acheté une mise à niveau sans publicité ou un compte des services. - - - - ## [11. Attribution](#11) - - %{company_name} se réserve le droit d'afficher les liens d'attribution tels que «Propulsé par %{company_domain},' auteur du thème, et la police attribution dans votre contenu en pied de page ou en barre d'outils. Le crédits de pied de page et de la barre d'outils %{company_domain} ne peuvent pas être retirés quelques soient les mises à niveau achetées. - - - - ## [12. Changements](#12) - - %{company_name} se réserve le droit, à sa seule discrétion, de modifier ou de remplacer une partie de cet accord. Il est de votre responsabilité de vérifier périodiquement la présente convention pour les modifications. Votre utilisation continue ou l'accès au site Web après l'affichage de toute modification au présent accord constitue une acceptation implicite de ces changements. %{company_name} peut également, à l'avenir, offrir de nouveaux services et / ou fonctionnalités sur le site Web (y compris, la sortie de nouveaux outils et de ressources). Ces nouvelles fonctionnalités et / ou services sont soumis aux termes et conditions du présent Contrat. - - - - ## [13. Résiliation](#13) - - %{company_name} peut résilier votre accès à tout ou partie du Site à tout moment, avec ou sans motif, avec ou sans préavis, avec effet immédiat. Si vous souhaitez résilier le présent Contrat ou votre compte %{company_domain} (si vous en avez un), vous pouvez tout simplement cesser d'utiliser le Site. Toutes les dispositions du présent Accord qui, par leur nature, doivent survivre à la résiliation survivront à la résiliation, y compris, sans limitation, les dispositions de propriété, exclusions de garantie, indemnité et limitations de responsabilité. - - - - ## [14. Exclusion de garanties](#14) - - Le Site est fourni "tel quel". %{company_name} et ses fournisseurs et concédants de licence déclinent toute garantie de toute nature, expresse ou implicite, y compris, sans limitation, les garanties de qualité marchande, d'adéquation à un usage particulier et de non-contrefaçon. Ni %{company_name} ni ses fournisseurs et concédants de licence, ne donnent aucune garantie que le site sera exempt d'erreurs ou que le service y sera continue ou ininterrompue. Si vous êtes en train de lire ceci, voici un peu de [lecture](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html) (en anglais). Vous comprenez que vous téléchargez à partir de, ou autrement obtenir contenus ou services par le biais, le site Internet à vos propres risques et périls. - - - - ## [15. Limitation de responsabilité](#15) - - En aucun cas %{company_name}, ses fournisseurs ou ses concédants ne seront responsables à l'égard de tout objet de la présente entente en vertu de tout contrat, négligence, responsabilité stricte ou autre théorie juridique ou équitable pour: (i) des dommages spéciaux, indirects ou consécutifs; (ii) le coût des achats de produits ou de services de substitution, (iii) pour l'interruption de l'utilisation ou de la perte ou la corruption des données; ou (iv) pour des montants qui dépassent les frais payés par vous à %{company_name} en vertu du présent accord au cours de la période de douze (12) mois précédents la cause du litige. %{company_name} n'assume aucune responsabilité pour toute panne ou retard en raison de questions qui échappent à leur contrôle raisonnable. Ce qui précède ne se substitue pas à ce qu'interdit la loi en vigueur. - - - - ## [16. Représentation générale et garantie](#16) - - Vous déclarez et garantissez que (i) votre utilisation du site web sera en stricte conformité avec la [Politique de Confidentialité](/privacy) et les [Règles de la communauté](/guidelines) de %{company_name}, avec le présent accord et avec tous lois et règlements applicables (y compris, sans s'y limiter, les lois ou réglementations locales dans votre pays, état, ville, ou une autre zone gouvernementale, en ce qui concerne la conduite en ligne et le contenu acceptable et notamment toutes les lois applicables concernant la transmission de données techniques exportées du pays dans lequel ce site réside ou le pays dans lequel vous résidez) et (ii) votre utilisation du site ne sera pas de contrefaire ou détourner les droits de propriété intellectuelle d'un tiers. - - - - ## [17. Dédommagement](#17) - - Vous acceptez d'indemniser et de dégager de toute responsabilité %{company_name}, ses sous-traitants, et ses concédants de licence, et leurs administrateurs, dirigeants, employés et agents contre toute réclamation et de tous les frais, y compris les frais d'avocat, découlant de votre utilisation du site Web, y compris mais non limité à la violation du présent Contrat. - - - - ## [18. Divers](#18) - - Le présent document a pour objet de définir les modalités et conditions dans lesquelles d’une part, %{company_name}, ci-après dénommé l’EDITEUR, met à la disposition de ses utilisateurs le site, et les services disponibles sur le site et d’autre part, la manière par laquelle l’utilisateur accède au site et utilise ses services. - - Toute connexion au site est subordonnée au respect des présentes conditions. - - Pour l’utilisateur, le simple accès au site de l’EDITEUR à l’adresse URL suivante %{company_domain} implique l’acceptation de l’ensemble des conditions décrites ci-après. - - ### Liens hypertextes - - Le site %{company_domain} peut contenir des liens hypertextes vers d’autres sites présents sur le réseau Internet. Les liens vers ces autres ressources vous font quitter le site %{company_domain}. - - Il est possible de créer un lien vers la page de présentation de ce site sans autorisation expresse de l’EDITEUR. Aucune autorisation ou demande d’information préalable ne peut être exigée par l’éditeur à l’égard d’un site qui souhaite établir un lien vers le site de l’éditeur. Il convient toutefois d’afficher ce site dans une nouvelle fenêtre du navigateur. Cependant, l’EDITEUR se réserve le droit de demander la suppression d’un lien qu’il estime non conforme à l’objet du site %{company_domain}. - - ### Responsabilité de l’éditeur - - Les informations et/ou documents figurant sur ce site et/ou accessibles par ce site proviennent de sources considérées comme étant fiables. - - Toutefois, ces informations et/ou documents sont susceptibles de contenir des inexactitudes techniques et des erreurs typographiques. - - L’EDITEUR se réserve le droit de les corriger, dès que ces erreurs sont portées à sa connaissance. - - Il est fortement recommandé de vérifier l’exactitude et la pertinence des informations et/ou documents mis à disposition sur ce site. - - Les informations et/ou documents disponibles sur ce site sont susceptibles d’être modifiés à tout moment, et peuvent avoir fait l’objet de mises à jour. En particulier, ils peuvent avoir fait l’objet d’une mise à jour entre le moment de leur téléchargement et celui où l’utilisateur en prend connaissance. - - L’utilisation des informations et/ou documents disponibles sur ce site se fait sous l’entière et seule responsabilité de l’utilisateur, qui assume la totalité des conséquences pouvant en découler, sans que l’EDITEUR puisse être recherché à ce titre, et sans recours contre ce dernier. - - L’EDITEUR ne pourra en aucun cas être tenu responsable de tout dommage de quelque nature qu’il soit résultant de l’interprétation ou de l’utilisation des informations et/ou documents disponibles sur ce site. - - ### Accès au site - - L’éditeur s’efforce de permettre l’accès au site 24 heures sur 24, 7 jours sur 7, sauf en cas de force majeure ou d’un événement hors du contrôle de l’EDITEUR, et sous réserve des éventuelles pannes et interventions de maintenance nécessaires au bon fonctionnement du site et des services. - - Par conséquent, l’EDITEUR ne peut garantir une disponibilité du site et/ou des services, une fiabilité des transmissions et des performances en terme de temps de réponse ou de qualité. Il n’est prévu aucune assistance technique vis à vis de l’utilisateur que ce soit par des moyens électronique ou téléphonique. - - La responsabilité de l’éditeur ne saurait être engagée en cas d’impossibilité d’accès à ce site et/ou d’utilisation des services. - - Par ailleurs, l’EDITEUR peut être amené à interrompre le site ou une partie des services, à tout moment sans préavis, le tout sans droit à indemnités. L’utilisateur reconnaît et accepte que l’EDITEUR ne soit pas responsable des interruptions, et des conséquences qui peuvent en découler pour l’utilisateur ou tout tiers. - - ### Droit applicable - - Tant le présent site que les modalités et conditions de son utilisation sont régis par le droit français, quel que soit le lieu d’utilisation. En cas de contestation éventuelle, et après l’échec de toute tentative de recherche d’une solution amiable, les tribunaux français seront seuls compétents pour connaître de ce litige. - - Ce document est soumis à la licence creative commons CC-BY-SA. Il a été mise à jour le 27 juillet 2014. - - A l'origine adapté des [Conditions d'utilisation de WordPress](http://fr.wordpress.com/tos/). privacy_topic: title: "Protection des données" - body: "\n\n## [Quelles sont les informations que nous recueillons ?](#collect)\n\nNous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici.\n\nLorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel.\n\nUne fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent l'adresse IP de chaque demande à notre serveur.\n\n\n\n## [Comment utilisons-nous vos informations ?](#use)\n\nToute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes :\n\n* Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels.\n* Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les\ - \ informations et les commentaires que nous recevons de votre part.\n* Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support.\n* Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions.\n\n\n\n## [Comment protégeons-nous vos informations ?](#protect)\n\nNous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels.\n\n\n\n## [Quelle est votre politique de conservation des données ?](#data-retention)\n\nNous ferons un effort de bonne foi pour :\n* Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours.\n* Conserver les adresses IP associées à des utilisateurs enregistrés et leurs messages pas plus de 5 ans.\n\n\n\n## [Utilisons-nous des cookies\ - \ ?](#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" + body: "\n\n## [Quelles sont les informations que nous recueillons ?](#collect)\n\nNous recueillons des informations lorsque vous vous inscrivez sur notre site et nous recueillons des données lorsque vous participez au forum en lisant, en écrivant et en évaluant le contenu partagé ici.\n\nLorsque vous vous inscrivez sur notre site, vous pouvez être invité à entrer votre nom et votre adresse de courriel. Vous pouvez, toutefois, visitez notre site sans vous inscrire. Votre adresse de courriel sera vérifiée par un courriel contenant un lien unique. Si ce lien est visité, nous savons que vous êtres propriétaire de l'adresse de courriel.\n\nUne fois enregistré et lorsque vous postez, nous enregistrons l'adresse IP de provenance du poste. Nous pouvons également conserver les journaux des serveurs qui comprennent\ + \ l'adresse IP de chaque demande à notre serveur.\n\n\n\n## [Comment utilisons-nous vos informations ?](#use)\n\nToute l'information que nous recueillons auprès de vous peuvent être utilisés dans l'une des façons suivantes :\n\n* Pour personnaliser votre expérience - vos informations nous aide à mieux répondre à vos besoins individuels.\n* Pour améliorer notre site - nous nous efforçons continuellement d'améliorer nos fonctionnalités basés sur les informations et les commentaires que nous recevons de votre part.\n* Pour améliorer le service client — vos informations nous aide à répondre plus efficacement à vos demandes de service et de support.\n* Pour envoyer des courriels périodiques - L'adresse de courriel que vous fournissez peut être utilisée pour vous envoyer des informations, des notifications que vous\ + \ avez demandé tels que des modifications apportées à thèmes, des réponses mentionnant votre nom d'utilisateur, des réponses a des demandes de renseignements et / ou d'autres demandes ou questions.\n\n\n\n## [Comment protégeons-nous vos informations ?](#protect)\n\nNous mettons en œuvre une variété de mesures de sécurité pour maintenir la sécurité de vos informations personnelles lorsque vous saisissez, soumettez, ou d'accédez à vos renseignements personnels.\n\n\n\n## [Quelle est votre politique de conservation des données ?](#data-retention)\n\nNous ferons un effort de bonne foi pour :\n* Conserver les logs du serveur contenant l'adresse IP de toutes les requêtes vers ce serveur sans dépasser les 90 jours.\n* Conserver les adresses IP associées à des utilisateurs enregistrés\ + \ et leurs messages pas plus de 5 ans.\n\n\n\n## [Utilisons-nous des cookies ?](#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" badges: long_descriptions: autobiographer: | diff --git a/config/locales/server.he.yml b/config/locales/server.he.yml index 4055933131..671667c873 100644 --- a/config/locales/server.he.yml +++ b/config/locales/server.he.yml @@ -133,11 +133,15 @@ he: 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: "מנהלים ראשיים" @@ -152,6 +156,7 @@ he: until_posts: one: "הודעה אחת" other: "%{count} הודעות" + new-topic: "ברוכים באים ל%{site_name} — **תודה שהתחלת שיחה חדשה! **\n-הכותרת נשמעת מעניינת כשאת/ה קורא/ת אותה בקול רם? האם היא תקציר טוב?\n-מי יתעניין בזה? איזה סוג של תגובות את/ה רוצה?\n-השתמש/י במילים נפוצות בכותרת שלך כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושא שלך עם נושאים קשורים בחר קטגוריה.\n-לעוד טיפים, [ראה את כללי התנהלות בקהילה] (/guidelines). \nהפנל הזה יופיע רק עבור %{education_posts_text}. הראשונים.\n" new-reply: | ברוכים באים ל %{site_name} — ** תודה על תרומתך! ** @@ -165,7 +170,7 @@ he: avatar: | ### מה לגבי תמונה חדשה לחשבון שלך? - פרסמת מגוון של נושאים ותגובות, אבל האוואטר שלך אינו ייחודי כמו -- הוא זהה לאוואטר ברירת המחדל שיש לכל המשתמשים. + פרסמת מגוון של נושאים ותגובות, אבל האוואטר שלך אינו ייחודי כמוך -- הוא זהה לאוואטר ברירת המחדל שיש לכל המשתמשים. האם שקלת **[לבקר בעמוד הפרופיל שלך](%{profile_path})** ולהעלות תמונה אישית שמייצגת אותך? @@ -226,6 +231,7 @@ he: no_info_other: "
%{name} עדיין לא הזין דבר בשדה אודות של הפרופיל שלהם
" vip_category_name: "לאונג' (סלון הכבוד)" vip_category_description: "קטגוריה אקסקלוסיבית למשתמשים עם רמת אמון 3 או יותר." + meta_category_name: "פידבק לאתר" meta_category_description: "דיון אודות אתר זה, הארגון שמאחוריו, איך הוא פועל ואיך נוכל לשפר אותו." staff_category_name: "צוות" staff_category_description: "קטגוריה פרטית לדיוני הצוות. נושאים נראים רק למנהלים ומנהלים ראשיים." @@ -260,6 +266,7 @@ he: uncategorized_parent: "נטול קטגוריה לא יכול להיות עם קטגוריית אם" self_parent: "קטגוריית אם לא יכולה להיות הקטגוריה עצמה" depth: "לא ניתן להניח תת-קטגוריה תחת תת-קטגוריה אחרת" + email_in_already_exist: "דוא\"ל '%{email_in}' כבר בשימוש עבור קטגוריה '%{category_name}' ." cannot_delete: uncategorized: "לא ניתן למחוק תוכן ללא קטגוריה" has_subcategories: "לא ניתן למחוק קטגוריה זו משום שיש בה תת-קטגוריות." @@ -363,6 +370,7 @@ he: one: "לפני כמעט שנה" other: "לפני כמעט %{count} שנים" password_reset: + no_token: "מצטערים, הקישור הזה לשינוי סיסמא ישן מדי. בחר ב \"שכחתי את הסיסמא שלי\" כדי לקבל קישור חדש. " choose_new: "אנא בחר סיסמה חדשה" choose: "אנא בחר סיסמה" update: 'עדכן סיסמה' @@ -382,6 +390,7 @@ he: continue_button: "המשך ל-%{site_name}" welcome_to: "ברוכים הבאים ל-%{site_name}!" approval_required: "מנהל צריך לאשר את החשבון שלך ידנית לפני שתוכל להיכנס לפורום הזה. יישלח אליך דואר אלקטרוני כשהחשבון שלך יאושר!" + missing_session: "אנחנו לא יכולים לזהות אם החשבון שלך נוצר, בבקשה בדוק שאפשרת עוגיות (cookies)." post_action_types: off_topic: title: 'אוף-טופיק' @@ -437,11 +446,13 @@ he: email_title: 'הנושא "%{title}" דורש תשומת לב של מנהל' email_body: "%{link}\n\n%{message}" flagging: + you_must_edit: '

פרסום שלך סומן על ידי הקהילה. בבקשה בדקו את ההודעות.

' user_must_edit: '

פרסום זה סומן על ידי הקהילה וכרגע מוסתר באופן זמני.

' archetypes: regular: title: "נושא רגיל" banner: + title: "נושא הבאנר" message: make: "נושא זה הוא כעת באנר. הוא יופיע בראש כל עמוד עד שישוחרר על ידי המשתמשים." remove: "נושא זה כבר אינו באנר. הוא לא יופיע יותר בראש כל עמוד." @@ -549,6 +560,14 @@ he: title: "סה\"כ" xaxis: "יום" yaxis: "סך כל בקשות ה-API" + page_view_logged_in_mobile_reqs: + title: "בקשות API עם חיבור" + xaxis: "יום" + yaxis: "בקשות API להתחברות עם מובייל " + page_view_anon_mobile_reqs: + title: "בקשות API אנונימיות" + xaxis: "יום" + yaxis: "בקשות API להתחברות עם מובייל אנונימות" http_background_reqs: title: "רקע" xaxis: "יום" @@ -573,6 +592,18 @@ he: title: "סה\"כ" xaxis: "יום" yaxis: "סה\"כ הבקשות" + time_to_first_response: + title: "זמן לתגובה הראשונה" + xaxis: "יום" + yaxis: "זמן ממוצע (שעות)" + topics_with_no_response: + title: "נושאים ללא תגובות" + xaxis: "יום" + yaxis: "סה\"כ" + mobile_visits: + title: "ביקורי משתמשים" + xaxis: "יום" + yaxis: "מספר ביקורים" dashboard: rails_env_warning: "השרת שלך רץ במצב %{env}." ruby_version_warning: "You are running a version of Ruby 2.0.0 that is known to have problems. Upgrade to patch level 247 or later." @@ -640,6 +671,7 @@ he: max_topic_title_length: "מספר התווים המקסימלי המותר לכותרת נושא" min_private_message_title_length: "אורך הכותרת המנימילי המותר להודעה בתווים" min_search_term_length: "מספר התווים המינמלי התקין כאורך מונח לחיפוש" + allow_uncategorized_topics: "הרשה לפתוח נושאים ללא קטגוריה.\nאזהרה: אם יש נושאים ללא קטגוריה, יש לסדר אותם לפני שמבטלים את האופציה. " uncategorized_description: "תיאור הקבוצה \"ללא קטגוריה\". השאירו ריק אם אין צורך בתיאור." allow_duplicate_topic_titles: "אשר/י נושאים עם כותרות זהות או משוכפלות." unique_posts_mins: "How many minutes before a user can make a post with the same content again" @@ -662,6 +694,7 @@ he: 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: "הצגת רשימת תת-הקבוצות במקום רשימת הנושאים בעת הכניסה לקטגוריה." fixed_category_positions: "אם אפשרות זו מסומנת, תוכלו לארגן את הקטגוריות כך שיופיעו בסדר קבוע. אם האופציות אינן מסומנות, הקטגוריות יסודרו על פי סדר הפעילות שהתבצעה בהן." + fixed_category_positions_on_create: "אם האפשרות תסומן, סדר הקטגוריות יוגדר בתפריט יצירת נושא (דורש fixed_category_positions)." add_rel_nofollow_to_user_content: "הוספת התווית rel nofollow לכ תוכן ששודר על ידי המשתמש/ת, פרט לקישורים פנימיים (כולל דומיין הורה parent domains). אם תשנו אפשרות זו, עליכם \"לאפות מחדש\" את כל הפרסומים עם: \"rake posts:rebake\"" post_excerpt_maxlength: "אורך מקסימלי של פרסום קטע / סיכום." post_onebox_maxlength: "מספר תוים מקסימאלי מותר כאורך פרסום Discourse אחד בקופסא (oneboxed Discourse post)." @@ -694,12 +727,17 @@ he: cooldown_minutes_after_hiding_posts: "מספר הדקות שמשתמש/ת חייבים לחכות לפני שהם יכולים לערוך פרסום מוסתר דרך סימון קהילתי" max_topics_in_first_day: "The maximum number of topics a user is allowed to create in their first day on the site" max_replies_in_first_day: "The maximum number of replies a user is allowed to create in their first day on the site" + tl2_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl2 (משתמש) באמצעות הכפלה במספר זה. " + tl3_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl3 (רגיל) באמצעות הכפלה במספר זה. " + tl4_additional_likes_per_day_multiplier: "להגדיל את כמות הלייקים האפשרית ביום עבור tl4 (מנהיג) באמצעות הכפלה במספר זה. " num_flags_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי num_users_to_block_new_user משתשמים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל." num_users_to_block_new_user: "אם פרסומים של משתמש/ת חדשים מסומנים כספאם על ידי num_flags_to_block_new_user משתמשים שונים, הסתירו את כל הפרסומים שלהם ומנעו מהם פרסום עתידי. 0 כדי לנטרל." notify_mods_when_user_blocked: "If a user is automatically blocked, send a message to all moderators." flag_sockpuppets: "אם משתמש/ת חדשים מגיבים לנושא מכתובת IP זהה לזו של מי שהחל את הנושא, סמנו את הפרסומים של שניהם כספאם פוטנציאלי." traditional_markdown_linebreaks: "שימוש בשבירת שורות מסורתית בסימון, מה שדורש שני רווחים עוקבים למעבר שורה." + allow_html_tables: "אפשר להזין טבלאות ב-Markdown על ידי שימוש HTML tags, TABLE, THEAD, TD, TR, TH אפשריים (דורש הגדרה מחדש על כל הפרסומים הישנים שכוללים טבלאות). " post_undo_action_window_mins: "מספר הדקות בהן מתאפשר למשתמשים לבטל פעולות אחרות בפרסום (לייק, סימון, וכו')." + must_approve_users: "על הצוות לאשר את כל המשתמשים החדשים לפני שהם מקבלים גישה לאתר. אזהרה: בחירה זו עבור אתר קיים תשלול גישה ממשתמשים קיימים שאינם מנהלים." ga_tracking_code: "Google analytics (ga.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" ga_domain_name: "Google analytics (ga.js) domain name, eg: mysite.com; see http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics (analytics.js) tracking code code, eg: UA-12345678-9; see http://google.com/analytics" @@ -740,6 +778,7 @@ he: login_required: "דרשו הזדהות לקריאת תוכן באתר זה, אל תאפשרו גישה אנונימית." min_username_length: "מספר התווים המינימלי לאורך שם המשתמש/ת המינימלי. אזהרה: משתמשים קיימים עם שמות הקצרים מערך זה לא יוכלו להתחבר לאתר." max_username_length: "מספר תווים מקסימלי המותר לשם משתמש/ת. אזהרה: משתמשים קיימים עם שמות הארוכים מערך זה לא יוכלו להתחבר לאתר." + reserved_usernames: "שמות משתמש שלא ניתן להירשם איתם." min_password_length: "Minimum password length." block_common_passwords: "אל תאפשרו סיסמאות מתוך 10,000 הסיסמאות הנפוצות ביותר." enable_sso_provider: "הטמיעו את פרוטוקול הספק Discourse SSO בנקודת הקצה /session/sso_provider, דורש כיוון של sso_secret" @@ -780,6 +819,7 @@ he: max_topics_per_day: "מספר מקסימלי של נושאים שמשתמש/ת יכולים ליצור ביום." max_private_messages_per_day: "מספר מקסימלי של הודעות שמשתמש/ת יכולים ליצור ביום." max_invites_per_day: "מספר מקסימלי של הזמנות שיכולים משתמש/ת לשלוח ביום." + max_topic_invitations_per_day: "מספר מירבי של הזמנות לנושא שמשתמש יכול לשלוח ביום. " suggested_topics: "מספר הנושאים המוצעים שיופיעו בתחתית הנושא המוצג." limit_suggested_to_category: "הצגת רק נושאים מהקטגוריה הנוכחית ברשימת הנושאים המומלצים." clean_up_uploads: "הסירו העלאות יתומות וללא הפניה כדי למנוע אירוח בלתי חוקי של חומר. אזהרה: אתם עלולי לרצות לגבות את תיקיית ה-/uploads שלכם לפנו שתאפשרו הגדרה זו." @@ -792,6 +832,7 @@ he: s3_access_key_id: "מפתח הגישה (access key id) של Amazon S3 שישמש להעלאת התמונות." s3_secret_access_key: "מפתח הגישה הסודי (secret access key) של Amazon S3 שישמש להעלאת תמונות." s3_region: "שם האזור (region name) של Amazon S3 שישמש להעלאת תמונות." + avatar_sizes: "רשימה של גדלי אווטרים שנוצרת אוטומטית. " enable_flash_video_onebox: "אפשרו הטמעת קישורי swf ו-flv (פלאש של אדובי) בפרסומים. אזהרה: עלול להביא לבעיות בטיחות באתר." default_invitee_trust_level: "ברירת מחדל של דרגת אמון (0-4) של משתמשים מוזמנים." tl1_requires_topics_entered: "כמה נושאים משתמש חדש צריך להתחיל למערכת עד שישודרג לרמת אמון 1." @@ -843,6 +884,7 @@ he: topic_views_heat_low: "לאחר כמות זו של צפיות,שדה הצפיות יהיה קצת יותר בהיר." topic_views_heat_medium: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בינוני." topic_views_heat_high: "לאחר כמות צפיות זו, שדה הצפיות יודגש באופן בולט." + cold_age_days_low: "לאחר מספר זה של ימי שיחה, תאריך הפעילות האחרונה מאופר." history_hours_low: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת קלות." history_hours_medium: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן בינוני." history_hours_high: "פרסום שנערך תוך כדי מספר שעות זה יופיע עם אינידקציית עריכה מודגשת באופן חזק." @@ -958,6 +1000,9 @@ he: edited: "%{display_username} ערך הודעה שלך ב %{link}" posted: "%{display_username} פרסם ב %{link}" moved_post: "%{display_username} העביר את ההודעה שלך ל %{link}" + private_message: "%{display_username} שלח/ה לך הודעה: %{link}" + invited_to_private_message: "%{display_username} הזמין אותך להודעה: %{link}" + invited_to_topic: "%{display_username} הזמין אותך לנושא: %{link}" invitee_accepted: "%{display_username} קיבל את הזמנתך" linked: "%{display_username} קישר אליך ב %{link}" granted_badge: "הרווחת %{link}" @@ -988,6 +1033,7 @@ he: other: "העברתי %{count} הודעות לנושא קיים: %{topic_link}" change_owner: post_revision_text: "בעלות הועברה מהמשתמש %{old_user} אל %{new_user}" + deleted_user: "משתמש שנמחק" emoji: errors: name_already_exists: "מצטערים, השם '%{name}' כבר תפוס על ידי emoji אחר." @@ -1028,15 +1074,21 @@ he: incorrect_username_email_or_password: "שם משתמש, דואר אלקטרוני או סיסמה לא נכונים" wait_approval: "תודה על שנרשמת. אנחנו ניידע אותך כשהחשבון שלך יאושר." active: "החשבון שלך הופעל ומוכן לשימוש." - activate_email: "

כמעט סיימנו! שלחנו מייל אקטיביזציה אל %{email}. אנאעקבו אחר ההנחיות במייל כדי להפעיל את חשבונך.

אם המייל לא יגיע, בדקו את תיקיית הספאם שלכם, או נסו להתחבר פעם נוספת כדי לשלוח מייל אקטיביזציה נוסף.

" + activate_email: "

כמעט סיימנו! שלחנו מייל אקטיביזציה אל %{email}. אנא עקבו אחר ההנחיות במייל כדי להפעיל את חשבונך.

אם המייל לא יגיע, בדקו את תיקיית הספאם שלכם, או נסו להתחבר פעם נוספת כדי לשלוח מייל אקטיביזציה נוסף.

" not_activated: "אינך יכול להתחבר עדיין. שלחנו לך הודעת דואר אלקטרוני לאישור. בבקשה עקוב אחר ההוראות בהודעה כדי להפעיל את חשבונך." + not_allowed_from_ip_address: "אינך יכול/ה להתחבר כ-%{username} מכתובת IP זו. " + admin_not_allowed_from_ip_address: "אינך יכול/ה להתחבר כמנהל מערכת מכתובת IP זו." suspended: "אינך יכול להתחבר עד %{date}." + suspended_with_reason: "חשבון הושעה עד %{date}: %{reason}" errors: "%{errors}" not_available: "לא זמין. נסה %{suggestion}?" something_already_taken: "משהו השתבש, אולי שם המשתמש או כתובת הדאור האלקטרוני כבר בשימוש. נסה את קישור שכחתי סיסמה." + omniauth_error: "סליחה, הייתה שגיאה בוידוא חשבונך. אולי לא אישרת את הוידוא? " omniauth_error_unknown: "משהו השתבש במהלך עיבוד ההתחברות שלך, אנא נסה שנית." new_registrations_disabled: "הוספת חשבונות חדשים אינה מותרת בעת זו." password_too_long: "סיסמאות מוגבלות ל-200 תווים." + email_too_long: "המייל שהזנת ארוך מדי. שמות מייל צריכים להכיל לכל היותר 254 תוים, ושמות דומיין צריכים להכיל לכל היותר 253 תוים." + reserved_username: "שם משתמש זה אסור. " missing_user_field: "לא מילאת את כל שדות המשתמש/ת" close_window: "האימות הושלם. סגרו חלון זה כדי להמשיך." user: @@ -1051,6 +1103,8 @@ he: email: not_allowed: "לא מורשה מכתובת הדואר האלקטרוני הזו. בבקשה השתמש בכתובת אחרת." blocked: "לא מורשה." + ip_address: + blocked: "הרשמות חדשות אסורות מכתובת ה-IP שלך. " invite_mailer: subject_template: "הוזמנת על ידי %{invitee_name} ל '%{topic_title}' ב%{site_domain_name}" text_body_template: | @@ -1311,6 +1365,7 @@ he: %{respond_instructions} digest: why: "סיכום קצר של %{site_link} מאז ביקורך האחרון ב-%{last_seen_at}" + subject_template: "[%{site_name}] תקציר" new_activity: "New activity on your topics and posts:" top_topics: "Recent posts the community enjoyed:" other_new_topics: "Other New Topics:" @@ -1338,6 +1393,9 @@ he: Click the following link to choose a password: %{base_url}/users/password-reset/%{email_token} + admin_login: + subject_template: "[%{site_name}] התחברות" + text_body_template: "מישהו ביקש להתחבר לחשבונך ב [%{site_name}](%{base_url}).\nאם לא ביקשת זאת, תוכל להתעלם מהמייל הזה. \nלחץ על הקישור הבא להתחבר:\n%{base_url}/users/admin-login/%{email_token}\n" account_created: subject_template: "[%{site_name}] החשבון החדש שלך" text_body_template: | @@ -1354,7 +1412,6 @@ he: signup_after_approval: subject_template: "You've been approved on %{site_name}!" signup: - subject_template: "[%{site_name}] Confirm your new account" text_body_template: | Welcome to %{site_name}! @@ -1383,8 +1440,6 @@ he: pasted_image_filename: "Pasted image" store_failure: "Failed to store upload #%{upload_id} for user #%{user_id}." images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -1418,15 +1473,6 @@ he: title: "שאלות נפוצות / כללים מנחים" tos_topic: title: "תנאי השימוש" - body: "הכללים והתנאים הבאים חלים על כל שימוש באתר %{company_domain} וכל התוכן, השירותים והמוצרים הזמנים בו או דרכו, כולל, ולא רק, תוכנת הפורום %{company_domain, פורום התמיכה של %{company_domain ושירותי האירוח של %{company_domain (\"אירוח\") (להלן, \"האתר\"). האתר הוא בבעלות ומופעל על ידי %{company_full_name} (\"%{company_name}\").. האתר נתון להסכמתך ללא שינוי של כל הכללים והתנאים הכלולים כאן וכל כלל ומדיניות (כולל, וללא מגבלה, [מדיניות הפרטיות] (/privacy)של %{company_domain} ו[כללי ההתנהגות הקהילתיים] (/faq)ונהלים אשר אשויים להתפרסם מעת לעת באתר זה על ידי %{company_name} (להלן, \"ההסכם\").\n\nאנא קראו הסכם זה בזהירות לפני גישה או שימוש באתר. בגישה או שימוש בכל חלק של האתר, הנכם מסכימים להיות מחוייבים לכללים והתנאים שבהסכם זה. אם אינכם מסכימים לכל הכללים והתנאים של הסכם זה, אז אינכם רשאים לגשת לאתר או להשתמש באיזהשהו שירות. אם הכללים והתנאים האלה נחשבים הצעה מטעם %{company_name}, קבלתה מוגבלת לכללים אלה. האתר זמין רק ליחידים בני 13 ומעלה.\n\n\n\n## [1. חשבון %{company_domain} שלך](#1)\n \nאם את/ה יוצרים חשבון באתר, את/ה אחראים לתחזר את האבטחה של החשבון שלך ואתם נושאים באחריות המלאה לכל הפעילויות שיתבצעו תחת החשבון. אתם חייבים ליידע באופן מיידי את %{company_name} על כל שימוש לא מאושר שנעשה בחשבונך או כל פרצה אחרת. %{company_name} לא יהיו אחראיים לפעולה כל שהיא או למחדל שלך, כולל כל סוג של נזק שיגרם כתוצאה מפעיולות כאלה או מחדלים.\n\n\n\n## [2. אחריות התורמים](#2)\n\nאם אתם מפרסמים חומר לאתר, מפרסמים קישורים באתר, או הופכים (או מאפשר לכל צד שלישי אחר להפוך) חומר לזמין\ - \ באמצעות האתר (כל סוג של חומר, \"תוכן\"), אתם אחראיים באופן מלא לתוכן ולכל סוג של פגיעה כתוצאה ממנו. זה יהיה המקרה בלי קשר להאם התוכן המדובר מכיל טקסט, גרפיקה, קובץ אודיו או תוכנת מחשב. על ידי הפיכת התוכן לזמין אתם מצהירים ומסכימים ש:\n\n* ההורדה, העתה והשימוש בתוכן לא פוגעים בזכויות קניין, כולל אבל לא רק זכויות היוצרים, פטנט, סימן רשום או זכויות סודיות מסחרית של צד שלישי כל שהוא;\n\n* אם למעסיק שלכם יש זכויות על קניין רוחני שיצרתם עליכם לפעול באחת הדרכים: (1) לקבל רשות מהמעסיק לפרסם או להפוך את התוכן לזמין, כולל אבל לא רק לכל תוכנה, או (2) להבטיח קבלה של כתב ויתור על כל הזכויות על או במסגרת התוכן;\n\n* אתם פועלים בהתאמה מלאה עם כל רשיונות צד שלישי בנוגע לתוכן ועומדים בהצלחה בכל הכללים והתנאים הנדרשים כדי להעבירו למשתמשי קצה;\n\n* התוכן אינו כולל או מתקין וירסום, תוכלעות, רוגלות, סוסים טרויאנים או תוכן פוגעני או הרסני אחר כלשהו;\n\nהתוכן אינו ספאם, אינו מופק על ידי מכונה או מופק בצורה רנדומאלית, ואינו כולל תוכן לא אתי או לרצוי שנועד למשוך תנועת גולשים לאתרי צד שלישי או להשפר את דירוגם של אתרים כאלה בתוצאות מנועי חיפוש, או כל פעולה בלתי חוקית אחרת (כגון phishing) או מטעה את המקבלים אותו בנוגע למקור החומר (למשל זיוף);\n\n* התוכן אינו פורונוגרפי, אינו כולל איומים או מעודד אלימות ואינו מפר את זכויות פרטיות וציבוריות של צד שלישי כלשהו;\n\n* התוכן שלכם אינו מפורסם באמצעות מסרים אלקטרוניים לא רצויים דוגמאת קישורי (links) ספאם בקבוצות דיון, קבוצות דיוור, בלוגים ואתרים ואמצעי קידום לא מוזמנים אחרים;\n\n* התוכן שלכם אינו נקרא או מתאר בצורה שמטעה אתת הקוראים למחשבה שאתם אדם אחר או חברה אחרת; ו\n\n* במקרה שהתוכן\ - \ שלך כולל קוד מחשב, תיארתם בצורה מתאימה את הסוג ו/או הקטגוריה שלו, אופיו, שימושיו והשפעתו על החומרים – הן אם התבקשתם לעשות כן על ידי %{company_name} וגם אם לא.\n \n\n \n## [3. רישיון תוכן משתמש ](#3)\n\nתרומותיהם של משתמשים הנן תחת רישיון [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). ללא מגבלה כלשהי על הצהרות או התחייבויות אלה, שמורה ל%{company_name} הזכות (אך לא החובה) על פי שיקול דעת בלבדי (1) לסרב או להסיר כל תוכן אשר על פי הדעה הסבירה של %{company_name} מפר את מדיניות %{company_name} או פוגע או מעורר התנגדות, או (2) להשמיד או למנוע גישה ושימוש באתר מכל פרט או יישות מכל סיבה שהיא על פי שקול הדעת הבלבדי של %{company_name}. ל %{company_name}לא תהיה שום התחייבות לספק החזר מכל סכום שהוא ששולם בעבר.\n\n\n\n## [4. תשלומים והחזרים](#4)\n\n### כללים כלליים. \n\nשירותים אופציונאליים בתשלום או שדרוגים עשוים להיות זמינים באתר. בשימוש בשירות אופציונאלי בתשלום או שדרוג אתם מסכימים לשלם ל%{company_name} את עלות המנוי החודשי או השנתי המצויינים. התשלומים יחוייבו על בסיס יומי על בסיס היום בו התחלתם לעשות שימוש בשירות או בשדרוג ויכסו את השימוש בשירות או בשדרוג כתקופת מנוי חודשי או שנתי כפי שיצויין. סכומים אלה אינם ניתנתים להחזרה.\n\n### חידוש אוטומטי\n\nאלא אם כן תודיעו ל%{company_name} לפני סוף תקופת המנוי המיושם שהנכם מעוניינים לבטל את השירות או השדרוג, המנוי שלכם יחודש באופן אוטומטי והנכם מסמיכים אותנו לגבות את סכום המנוי החודש או השנתי הרלוונטי אז (כמו גם את המסים הנלווים) באמצעות\ - \ כל כרטיס אשראי או אמצעי תשלום אחר שמופיע ברשומותינו כקשור אליכם. מנויים ניתנים לביטול בכל עת.\n\n\n\n## [6. אחריות המבקרים באתר]\n\nל%{company_name} לא בדק/ה, ולא מסוגל/ת לבדוק, את כל התוכן, כולל תוכנת המחשב, המפורסמם באתר ולא יכול/ה להיות אחראיים לתוכן, לשימוש או לתוצאות של שימוש בתכנים אלה. בהפעלת האתר %{company_name} אינה מצהירה או מרמזת שהיא מאשרת את התוכן המפורסם, או מאמינ/ה כי חומר זה נכון, שמוש או בלתי-מזיק. אתם אחראיים לנקיטת האמצעים הנדרשים להגן על עצמכם ומערכות המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים ותוכן פוגעני או הרסני אחר. אתר זה עלול להכיל תוכן פוגעני, לא ישר או מעורר התנגדות, כמו גם תוכן הכולל אי דיוקים טכניים, טעויות טיפוגרפיות ושגיאות אחרות. האתר עלול להכיל חומר שמפר זכויות פרטיות או פומביות או מפר קניין רוחני וזכויות יוצרים אחרות של צדדים שלישיים, שהאפשרות להורדה, העתקה או שימוש בהם מותנה בכללים או תנאים נוספים, מוצהרים ובלתי מוצהרים. %{company_name} מתנער/ת מכל אחריות לכל פגיעה כתוצאה מהשימוש שעושים המבקרים באתר, או מהורדה של תוכן שפורסם על ידי מבקרים.\n\n\n\n## [7. תוכן שפורסם באתרים אחרים](#7)\nלא בדקנו, ואיננו מסוגלים לבדוק, את כל התוכן כולל תוכנות מחשב, שנהיה זמין דרך האתרים והדפים אליהם מקשרים הקישורים מ-%{company_name}. ל%{company_name} אין שום שליטה על האתרים ועמודים שאינם של %{company_name} ואינו/ה\ - \ אחראי/ת לתכניהם או לשימוש בהם. בקישור לאתר או עמוד שאינו של %{company_name} אינה מצהירה או רמוזת לכך שהיא תומכת באתר או בעמוד. אתם אחראיים לנקטית האמצעים הנדרשים כדי להגן על עצמכם או מערכת המחשב שלכם מוירוסים, תולעים, סוסים טרוייאנים וכל תוכן פוגעני או הרסני אחר. %{company_name} מסיר/ה מעצמם כל אחריות לכל נזק שיגרם משימוש שתעשו באתרים ועמודים שאינם של %{company_name}.\n\n\n\n## [8. הפרת זכויות יוצרים ומדיניות ](#8)\n\nכפי ש%{company_name} מבקש/ת ומצפה מאחרים לכבד את כויות הקניינו/ה הרוחני, היא/הוא גם מכבד/ת את הקניין הרוחני של אחרים. אם אתם מאמינים שחומר הממוקם או מקושר אל %{company_name} מפר את זכויות היוצרים שלכם ואם אתר זה יושב בארה\"ב אנו מעודדים אתכם ליידע את %{company_name}, בהתאם למדיניות[Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") של %{company_name}. %{company_name} יגיבו לכל פניה שכזו, כולל הסרה של החומר המפר או ניטרול כל הקישורים לחומר המפר, כנדרש או כראוי. %{company_name} תמנע גישה ושימוש של מבקר/ת באתר אם, תחת נסיבות מתאימות, המבקר/ת נחושים להמשיך בהפרה של זכויות יוצרים או זכויות קניין אחרות של %{company_name} או של אחרים. במקרה של מחיקה שכזו, ל%{company_name} לא תהיה המחוייבות לספק החזר של סכום כלשהו ששולם ל%{company_name} בעבר.\n\n\n\n## [9. קניין רוחני](#9)\n\nהסכם זה אינו מעביר מ%{company_name} אליך או לצד שלישי זכות קניינית כלשהי וכל זכות, כותרת ועניין בנוגע לקניין כזה ישארו (בין הצדדים) רק עם %{company_name}.\n%{company_name}, %{company_domain} הלוגו של %{company_domain} וכל סימן רשום\ - \ אחר, סימוני שירות, גרפיקה וסמלילים המשמשים בתקשורת עם %{company_domain} אם עם האתר הם סימנים מסחריים או סימנים רשומים של %{company_name} או מחזיקי רישיונות מטעם %{company_name}. סימנים מסחריים אחרים, סימני שירותים, גרפיקות וסממלילים המשתמשים בתקשורת עם האתר עשויים להיות סימנים מסחריים של צד ג'. השימוש שלך באתר אינו מבטיח לך שום זכות או רישיון להפיץ או לעשות כל שימוש אחר בסימנים מסחריים של %{company_name}או של צד שלישי.\n\n\n\n## [10. פרסומות](#10)\n\n%{company_name} שומר/ת לעצמם את הזכות להציג פרסומות על התוכן שלך אלא אם כן רכשת שדרוג או שירות להסרת פרסומות. \n\n\n\n## [11. ייחוס](#11)\n\n%{company_name} שומר/ת לעצמו/ה את הזכות להציג קישורים עם ייחוס, כמו למשל 'מופעל באמצעות %{company_domain}', מחבר/ת נושא, וייחוס פונטים בכותרות העליונות והתחתונות של התוכן שלך. קרדיט בתחתית העמוס וסרגיל הכלים של %{company_domain} לא יוסר אלא אם כן נרכשו שדרוגים.\n\n\n\n## [12. שינויים](#12)\n\n%{company_domain} שומר/ת לעצמם את הזכות, על פי החלטה בלבדית, לשנות או להחליף כל חלק מהסכם זה. זוהי אחריותך לבדוק את ההסכם מידי תקופה ולבדוק אם נערכו בו שינויים. המשך השימוש והגישה באתר לאחר פרסום כל שינוי בסכם זה מהווה הסכמה לקבלת שינויים אלו. %{company_domain} עשוי/ה גם להציע בעתיד שירותים ו/או תכונות דרך האתר (כולל שחרור כלים ומשאבים חדשים). מאפיינים חדשים כאלו יהיו נתונים לכללים ולהגדרות שבהסכם זה.\n\n\n\n## [13. הפסקת ההסכם](#13)\n\n%{company_domain} עשוי/ה להפסיק את הגישה שלך לכל או לחלק מהאתר בכל זמן, עם או ללא סיבה, עם או ללא ידוע, באופן אפקטיבי\ - \ ומיידי. אם אתם מעוניינים להפסיק הסכם זה או את החשבון ב%{company_domain} (אם יש לכם אחד כזה), אתם יכולים פשוט להפסיק להשתמש באתר. כל ההוראות של הסכם זה שבאופיין תקפות ,לאחר ביטול ימשיכו להתקיים לאחר הביטול, כולל, וללא מגבלה, הוראות הבעלות, הצהרות הסרת האחריות, שיפוי ומגבלות האחריות.\n\n\n\n## [14. הסרת אחריות](#14)\n\nהאתר מוגש כפי שהוא. %{company_name} והספקים שלו/ה ומחזיקי הרישון מטעמם מסירים בזאת מעצמם אחריות מכל סוג, מפורש או משתמע, כולל וללא מגבלות, אחריות לגבי מסחר, התאמה למטרה מסוימת ואי הפרה. %{company_name} ו/או ספקיו/ה ו/או בעלי רשיונות מטעמה אינם מתחייבים שהאתר הינו נטול תקלות או שחלקים שהוכנסו בו יהיו המשכיים וללא הפרעות. אם אתם ממש קוראים את זה, היה [ממתק](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). אתם מבינים שאם אתם מורידים, צורכים תוכן או שירות בדרך אחרת מהאתר אתם עושים זאת על פי שיקול דעתכם ועל אחריותכם בלבד.\n\n\n\n## [15. הגבלת האחריות](#15)\nבשום מקרה לא יהיה/תהיה %{company_name} או ספקיו/ה או מחזיקים ברשיון מטעמם אחראיים בנוגע לכל נושא הקשור להסכם זה תחת שום חוזה, רשלנות, אחריות ישירה או כל תיאוריה משפטית אחרת עבור: (1) כל נזק מיוחד, מקרי או תוצאתי; (2) עלות הרכש עבור מוצרים שירותים חלופיים; (3) עבור הפרעה בשימוש או אובד או פגיעה בנתונים; או (4) כל סכום שעולה על התעריפים ששולמו על ידך ל%{company_name} במסגרת הסכם זה במהלך שנים-עשר (12) החודשים שקדמו לסיבת העניין. %{company_name} לא ישא/תישא באחריות בנוגע לשום כישלון או ההשהיה בשל עניינים שמעבר לשליטתם בהסתכלות הגיונית. כל האמור לעיל לא יחול\ - \ על איסורים על פי החוק התקף.\n\n\n\n## [16. הצהרה כללית ואחריות](#16)\n\nהנכם מצהירים ולוקחים אחריות על כך ש(1) השימוש שלכם באתר יהיה בהתאם ל[מדיניות הפרטיות](/privacy) של %{company_name}, [כללי ההתנהגות הקהילתיים](/guidelines), הסכם זה וכל החוקים והתקנות התקפים (כולל וללא מגבלה כל חוק מקומי או תקנה בארצך, במדינה, בעיר או באזור ממשלתי אחר, ביחס להתנהלות וקבלת תוכן מקוון, וכולל כל החוקים התקפים ביחס להעברת מידע טכני המיוצא מתוך המדינה בה שוכן אתר זה או המדינה בה אתם נמצאים), וש(2) השימוש שלך באתר לא יפגע או ימעל בזכויות הקניין הרוחני של כל צד שלישי.\n\n\n\n## [17. שיפוי](#17)\n\nאתם מסכימים לשפות ולמנוע פגיעה ב%{company_name}, קבלנים ומחזיקים ברשיונות מטעמו והדירקטורים, פקידים, מועסקים וסוכנים מטעמם כנגד כל טענה ונזק, כולל תביעות בנושאי תעריפים, העולות כתוצאה משימוש שלך באתר, כולל, אך ללא מגבלה, הפרה של הסכם זה מצדכם.\n\n\n\n## [18. שונות](#18)\n\nהסכם זה מהווה את ההסכם השלם בין %{company_name} וביניכם בנוגע לנושאים הנדונים, וניתן לשנותם רק על ידי הסכם כתוב החתום על ידי מנהל/ת מוסמכים מטעם %{company_name}, או על ידי פרסום מטעם %{company_name} של גרסא מתוקנת. פרט למידה בה הדין החל, אם ישנו כזה, פוסק אחרת, הסכם זה, כל גישה או שימוש באתר יהיה על פי החוקים של מדינת קליפורניה, ארה\"ב, למעט התנגשויות עם תיקונים בחוק, והמקום הראוי לכל מחלוקת הנובעת מעניינים אלו יבוררו בבתי המשפט המדינתי והפדראלי הממוקמים במחוז סן-פרנסיסקו, קליפורניה. מלבד טעות לסעד או שוויוניות או טענות ביחס לזכויות קניין רוחני (אשר עשויות לעלות בכל בית משפט מוסמך ללא הפקדת ערבות),\ - \ כל מחלוקת שעולה תחת הסכם זה תבורר בסופו של דבר בהתאם לכללי בוררות מקיפים של הבוררות השיפוטית ושירות הגישור (Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”)), על ידי שלושה בוררים שימונו לכללים אלה. הבוררות תתקיים בסן-פרנסיסקו, קליפורניה, בשפה האנגלית והחלטת הבוררות תמומש בכל בית מספר. הצד המוביל בכל פעולה או הליך לאכיפת הסכם זה יהיה זכאי להוצאות ושכר טרחת עורכי הדין. אם חלק כלשהו של הסכם זה אינו תקף או אינו בר-אכיפה, חלק זה יפורש בדרך שתשקף את הכוונה המקונית של הצדדים והחלקים האחרים יישארו בתוקף מלא. כתב ויתור של מי מהצדדים על כלל או תנאי של חוזה זה או הפרה אחד מסעיפים, לא תבטל או תוותר תנאי או כלל זה, או על כל הפרה בעקבותיו. אתם רשאים להעביר את זכויותיכם בהסכם זה לכל צד שמסכים ומקבל עליו את המגבלות, התנאים והכללים; %{company_name} רשאים להעביר את זכויותיהם תחת הסכם זה ללא תנאי. הסכם זה יהיה מחייב ופעיל כלפי הצדדים, יורשיהם ומורשי חתימה מטעמם. \n\nמסמך זה מופץ תחת רישוי CC-BY-SA. הוא עודכן לאחרונה ב-31.3.2013. הגרסא המקורית אומצה מ[תנאי השימוש והשירות של וורדפרס](http://en.wordpress.com/tos/).\n" privacy_topic: title: "מדיניות פרטיות" body: | @@ -1514,3 +1560,13 @@ he: א0 נחליט לשנות את מדיניות הפרטיות שלנו, נפרסם שינויים אלו בעמוד זה. מסמך זה מפורסם תחת רשיון CC-BY-SA. הוא עודכן לאחרונה ב-31 למאי, 2013. + admin_login: + success: "דוא\"ל נשלח" + error: "שגיאה!" + email_input: "מייל של המנהל" + 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.id.yml b/config/locales/server.id.yml index 0cf8b47b30..19c8c01db5 100644 --- a/config/locales/server.id.yml +++ b/config/locales/server.id.yml @@ -136,8 +136,6 @@ id: posted_by: "Dipost oleh %{username} pada %{post_date}" upload: images: - fetch_failure: "Maaf, terjadi kesalahan saat memuat gambar." - unknown_image_type: "Maaf, berkas yang Anda unggah bukan gambar" size_not_found: "Maaf, kami tidak dapat mendeteksi ukuran dari gambar. Apa berkas gambar yang Anda unggah rusak?" email_log: no_user: "Tidak dapat menemukan pengguna dengan id %{user_id}" diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml index f47fa66753..f3c667f2d1 100644 --- a/config/locales/server.it.yml +++ b/config/locales/server.it.yml @@ -426,6 +426,7 @@ it: regular: title: "Argomento Normale" banner: + title: "Argomento Annuncio" message: make: "Questo argomento è ora uno striscione. Apparirà in cima ad ogni pagina finché non viene chiuso dall'utente." remove: "Questo argomento non è più uno striscione. Non apparirà più in cima ad ogni pagina." @@ -533,6 +534,10 @@ it: title: "Totali" xaxis: "Giorno" yaxis: "Richieste API Totali" + page_view_logged_in_mobile_reqs: + xaxis: "Giorno" + page_view_anon_mobile_reqs: + xaxis: "Giorno" http_background_reqs: title: "Background" xaxis: "Giorno" @@ -565,6 +570,10 @@ it: title: "Argomenti senza risposta" xaxis: "Giorno" yaxis: "Totali" + mobile_visits: + title: "Visite Utente" + xaxis: "Giorno" + yaxis: "Numero di visite" 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." @@ -1243,7 +1252,6 @@ it: subject_template: "Sei stato ammesso su %{site_name}!" text_body_template: "Benvenuto su %{site_name}! \n\nUn membro dello staff ha approvato il tuo account su %{site_name}. \n\nClicca sul seguente collegamento per confermare e attivare il tuo nuovo account:\n%{base_url}/users/activate-account/%{email_token} \n\nSe il collegamento qui sopra non è cliccabile, prova a copiarlo e incollarlo nella barra degli indirizzi del tuo browser. \n\n%{new_user_tips}\n\nNoi crediamo fermamente in un [comportamento comunitario civile](%{base_url}/guidelines) sempre.\n\nBuona permanenza!\n\n(Se hai bisogno di comunicare privatamente con i [membri dello staff](%{base_url}/about) come nuovo utente, rispondi semplicemente a questo messaggio privato.)\n" signup: - subject_template: "[%{site_name}] Attiva il tuo nuovo account" text_body_template: | Benvenuto su %{site_name}! @@ -1275,8 +1283,6 @@ it: too_large: "Spiacenti, ma il file che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB)." images: too_large: "Spiacenti, ma l'immagine che stai cercando di caricare è troppo grande (la dimensione massima è %{max_size_kb}KB), per favore ridimensionala e riprova." - fetch_failure: "Spiacenti, si è verificato un errore nel recupero dell'immagine." - unknown_image_type: "Spiacenti, ma il file che hai provato a caricare non sembra un'immagine." size_not_found: "Spiacenti, ma non riusciamo a determinare la dimensione dell'immagine. E' forse danneggiata?" flag_reason: sockpuppet: "Un nuovo utente ha creato un argomento, e un altro nuovo utente ha risposto con lo stesso indirizzo IP. Controlla le impostazioni di flag_sockpuppets." @@ -1309,26 +1315,17 @@ it: Modifica il primo messaggio in questo argomento per cambiare il contenuto della pagina %{page_name}. guidelines_topic: title: "FAQ/Linee Guida" - body: "\n\n## [Questo è un luogo civile per discussioni pubbliche](#civilized)\n\nFrequenta questo forum di discussione con lo stesso rispetto che avresti in un parco pubblico. Anche questo è un bene pubblico — un luogo dove condividere competenze, conoscenza e interessi tramite la discussione.\n\nQueste non sono leggi ferree, ma solo un sostegno al giudizio della nostra comunità. Usa queste linee guida per mantenere questo un luogo sereno e piacevole di discorso pubblico civile. \n\n\n\n## [Migliora la discussione](#improve)\n\nAiutaci a migliorare questo luogo cercando sempre di migliorare in qualche modo, anche piccolo, la discussione. Se non sei sicuro che il tuo messaggio possa migliorare la conversazione, ripensa a quel che vuoi dire e riprovaci più tardi. \n\nAbbiamo a cuore gli argomenti che si discutono qui, e vorremmo che stessero a cuore anche a te. Rispetta le discussioni e le persone che vi partecipano, anche quando sei in disaccordo con ciò che viene detto.\n\nUn modo per migliorare la conversazione è scoprire discussioni già in corso. Ti preghiamo di passare qualche tempo a leggere gli altri argomenti prima di rispondere o di iniziare un nuovo argomento, sarà più facile incontrare altre persone coi tuoi stessi interessi. \n\n\n\n## [Sii cortese, anche quando non sei d'accordo](#agreeable)\n\nTalvolta vorresti rispondere a qualcosa con cui non sei d'accordo: fai pure. Ricorda però di _criticare le idee, non le persone_. Per favore evita:\n\n* Insulti.\n* Attacchi personali.\n* Risposte al tono invece che al contenuto di un messaggio.\n* Contraddire per partito preso.\n\nPorta invece delle obiezioni ragionate che migliorino la conversazione.\n\n\n\n## [La tua partecipazione è importante](#participate)\n\nIl clima di questo forum dipende dal tono delle conversazioni. Aiutaci a costruire il futuro di questa comunità partecipando alle conversazioni più costruttive e interessanti — ed evita quelle che non lo sono.\n\nDiscourse ha degli strumenti che\ - \ aiutano la comunità a identificare i migliori (e i peggiori) contributi: preferiti, segnalibri, mi piace, segnalazioni, risposte, modifiche eccetera. Usa questi strumenti per migliorare la tua esperienza e quella di tutti.\n\nCerchiamo di lasciare il parco meglio di come l'abbiamo trovato.\n\n\n\n## [Se vedi un problema, segnalalo](#flag-problems)\n\nI moderatori hanno una speciale autorità e sono responsabili di questo forum. Proprio come te: col tuo aiuto i moderatori possono diventare dei facilitatori della comunità, non semplici guardiani o poliziotti.\n\nSe vedi dei comportamenti scorretti, non rispondere. Incoraggerebbe il comportamento negativo dandogli riconoscimento, esaurirebbe le tue energie e sprecherebbe il tempo di tutti. _Segnalalo e basta_. Se arrivano abbastanza segnalazioni verranno presi provvedimenti, automatici o con l'intervento del moderatore.\n\nPer mantenere la comunità i moderatori si riservano il diritto di rimuovere qualsiasi contenuto e qualsiasi account utente per qualsiasi ragione, in qualsiasi momento. I moderatori non controllano anticipatamente i nuovi messaggi in alcun modo; i moderatori ed i gestori di questo sito non si assumono alcuna responsabilità per i contenuti pubblicati dagli utenti.\n\n\n\n## [Sii sempre civile](#be-civil)\n\nNulla rovina una conversazione come la maleducazione: \n\n - Sii civile. Non pubblicare nulla che una persona possa ragionevolmente considerare offensivo, ingiurioso, discriminatorio, odioso.\n - Sii adulto. Non pubblicare cose oscene o sessualmente esplicite.\n - Rispetto reciproco. Non molestare o minacciare nessuno, non impersonare altre persone, non pubblicare informazioni personali altrui.\n - Rispetta questo forum. Non pubblicare spam e vandalismo\n\nQuesti non sono regolamenti precisi con definizioni esatte — evita addirittura di dare l'_apparenza_ di qualcuno di questi comportamenti di queste cose. Se non sei sicuro, prova a chiederti come ti sentiresti se il tuo messaggio comparisse sulla prima pagina del Corriere della Sera. \n\nQuesto è un\ - \ forum pubblico e viene indicizzato dai motori di ricerca. Fai che il linguaggio, i link e le immagini siano adatti ad amici e familiari.\n\nThis is a public forum, and search engines index these discussions. Keep the language, links, and images safe for family and friends.\n\n\n\n## [Tieni in ordine](#keep-tidy)\n\nSforzati di mettere ogni cosa al posto giusto, così che passiamo più tempo a conversare e meno a riordinare. Quindi per favore:\n\n - Non iniziare un argomento nella categoria sbagliata\n - Non ripubblicare la stessa cosa su più categorie.\n - Non pubblicare risposte vuote.\n - Non deviare un argomento cambiandolo a metà strada.\n - Non firmare i tuoi messaggi — ogni messaggio contiene le informazioni complete sul tuo profilo.\n\nInvece di rispondere “+1” or “D'accordo”, usa il pulsante Mi Piace. Invece di deviare un argomento esistente in una direzione completamente diversa, usa rispondi come argomento collegato.\n\n\n\n## [Pubblica solo cose tue](#stealing)\n\nNon puoi pubblicare alcun materiale digitale che appartenga a qualcun altro senza il suo permesso. Non puoi pubblicare descrizioni, link, metodi che consentano di violare la proprietà intellettuale altrui (software, audio, video, immagini) o di infrangere la legge.\n\n\n\n## [fatto da Te](#power)\n\nQuesto sito è gestito dal tuo [simpatico staff locale](/about) e da *te*, dalla comunità. Se hai altre domande sul funzionamento apri un nuovo argomento nella [ categoria meta](/c/meta) e parliamone! Se c'è un problema urgente e importante che non si può affrontare in un argomento meta o con una segnalazione,contattaci tramite la [pagina staff](/about).\n\n\n\n## [Termini del Servizio](#tos)\n\nIl linguaggio legale è noioso, ma dobbiamo tuterale noi stessi – e per estensione te ed i tuoi dati – contro persone poco amichevoli. Abbiamo dei [Termini di Servizio](/tos) che descrivono il tuo (e nostro) comportamento e i diritti sui contenuti, la privacy e le leggi. Per usare questo servizio devi acconsentire\ - \ ai nostri [TDS](/tos).\n" tos_topic: title: "Termini del Servizio" - body: "I seguenti termini e condizioni regolano l’uso del sito web %{company_domain} e di tutti i contenuti, i servizi e i prodotti disponibili direttamente sul sito web e mediante di esso, compresi, ma non limitatamente a, il Software Forum di %{company_domain}, il Forum di Supporto di %{company_domain} e il Servizio Hosting (\"Hosting\") di %{company_domain} (collettivamente chiamati nel seguito il Sito). Il Sito è di proprietà ed è gestito da %{company_full_name} (\"%{company_name}\"). L’uso del Sito è soggetto all’accettazione incondizionata di tutti i termini e le condizioni previsti nel presente documento e di tutte le altre regole operative, le politiche (incluse, senza limitazione, la [Politica sulla Privacy](/privacy) di %{company_domain} e le [Linee guida della comunità](/faq)) e le procedure che possono essere pubblicate di volta in volta su questo Sito da %{company_name} (nel seguito, il “Contratto”).\n\nLeggi il presente Contratto prima di accedere o utilizzare il Sito. L’accesso o l’utilizzo di qualsiasi parte del Sito implica l’accettazione dei termini e delle condizioni del presente contratto. In caso di mancata accettazione di tutti i termini e le condizioni del presente contratto, l’accesso al Sito o l’uso di qualsiasi servizio potrebbe non essere consentito. Se questi termini e condizioni sono considerati un’offerta di %{company_name}, l’accettazione è espressamente limitata ai presenti termini. Il Sito è disponibile solo per gli utenti con almeno 13 anni di età.\n\n\n\n## [1. Il tuo Account su %{company_domain}](#1)\n\nSe crei un account sul Sito, è tua responsabilità mantenere la sicurezza dell’account e sei interamente responsabile di tutte le attività eseguite con l’account. L’utente è tenuto a notificare immediatamente a %{company_name} usi non autorizzati dell’account o altre violazioni della sicurezza. %{company_name} non sarà responsabile per qualsiasi atto od omissione da parte tua, inclusi eventuali danni di qualsiasi tipo derivanti da tali atti o omissioni.\n\n \n\n## [2. Responsabilità dei Collaboratori](#2)\n\nSe\ - \ pubblichi materiale o inserisci collegamenti sul Sito o rendi disponibile in altro modo (o consenti a terzi di rendere disponibile) materiale mediante il Sito (qualsiasi materiale di questo tipo, nel seguito chiamato il “Contenuto”), sei interamente responsabile del Contenuto e di qualsiasi danno risultante da tale Contenuto. Ciò è valido indipendentemente dalla circostanza in cui il Contenuto in questione sia costituito da testo, grafica, file audio o software informatico. Rendendo disponibile il Contenuto, l’utente dichiara e garantisce che:\n\n* il download, la copia e l’uso del Contenuto non viola i diritti di proprietà, inclusi ma non limitatamente a, il copyright, i brevetti, i diritti di marchi di fabbrica o di segreti commerciali di terze parti;\n* se il tuo datore di lavoro è titolare dei diritti sulla proprietà intellettuale creata da te, allora delle due l’una, o (i) hai ottenuto il permesso dal datore di lavoro di pubblicare o rendere disponibile il Contenuto, incluso ma non limitatamente a, qualsiasi software oppure (ii) che hai ottenuto dal datore di lavoro una rinuncia relativamente a tutti i diritti sul Contenuto o in riferimento ad esso;\n* sei pienamente in regola con le licenze di terze parti in relazione al Contenuto e che sono state adottate tutte le azioni necessarie per trasferire con esito positivo qualsiasi condizione richiesta agli utenti finali;\n* il Contenuto non contiene né installa alcun virus, worm, malware, cavalli di Troia o altri contenuti dannosi o distruttivi;\n* il Contenuto non costituisce spam, non è generato da macchina o in modo casuale e non contiene contenuto commerciale indesiderato o immorale finalizzato a indirizzare il traffico verso siti di terze parti o a migliorare il posizionamento nei motori di ricerca di siti di terze parti o per altri atti illeciti (ad esempio, il phishing) o per indurre in errore i destinatari in relazione all’origine del materiale (ad esempio, lo spoofing);\n* il Contenuto non ha carattere pornografico, non contiene minacce e non incita alla violenza e non viola i diritti di privacy o pubblicitari di terze\ - \ parti;\n* il Contenuto non viene pubblicizzato tramite messaggi elettronici indesiderati, come collegamenti spam verso a newsgroup, elenchi email, altri blog e siti web e analoghi metodi promozionali non richiesti;\n* il Contenuto non è presentato in modo da indurre gli utenti a errori di identità con altri utenti o aziende; e\n* nel caso di Contenuto contenente codice informatico, hai classificato e/o descritto in modo accurato il tipo, la natura, gli usi e gli effetti dei materiali, se richiesto da %{company_name} o in altro modo.\n\n\n\n## [3. Licenza sui contenuti utente](#3)\n\nI contributi degli utenti sono resi disponibili ai sensi di una [Licenza Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Senza alcuna limitazione di tali dichiarazioni o garanzie, %{company_name} ha il diritto (sebbene non l’obbligo), a discrezione di %{company_name} (i), di rifiutare o rimuovere qualsiasi contenuto che, nella ragionevole opinione di %{company_name}, viola qualsiasi politica di %{company_name} o è in altro modo dannoso o sgradevole, o (ii) di cessare o negare l’accesso e l’utilizzo del Sito a qualsiasi singolo utente o entità per qualsiasi motivo, a sola discrezione di %{company_name}. %{company_name} non ha alcun obbligo di rimborsare eventuali somme pagate in precedenza.\n\n\n\n## [4. Pagamento e rinnovo](#4)\n\n### Termini Generali\n\nPotrebbero essere disponibili sul Sito servizi opzionali o aggiornamenti a pagamento. Quando si utilizza un servizio opzionale o aggiornamento a pagamento, acconsenti a pagare a %{company_name} le commissioni per l’abbonamento mensile o annuale indicate per tale servizio. Le somme verranno addebitate con pagamento anticipato il giorno dell’abbonamento al servizio o aggiornamento e riguarderanno l’uso di tale servizio o aggiornamento per un periodo di abbonamento mensile o annuale, come indicato. Le commissioni non sono rimborsabili.\n\n### Rinnovo Automatico\n\nA meno che non invii una notifica a %{company_name} prima della\ - \ scadenza del periodo di abbonamento applicabile da annullare, l’abbonamento si rinnoverà automaticamente e tu ci autorizzi a riscuotere le commissioni dell’abbonamento annuale o mensile applicabili in quel momento per tale abbonamento (così come eventuali tasse) utilizzando qualsiasi carta di credito o altro meccanismo di pagamento registrato. Gli abbonamenti possono essere annullati in qualsiasi momento.\n\n\n\n## [5. Servizi](#5)\n\n### Servizi di Hosting e di supporto \n\nPossono essere forniti da %{company_name} servizi opzionali di Hosting e di supporto, ai sensi dei termini e delle condizioni specifici per ogni servizio. Con la sottoscrizione a un account di servizi di hosting o supporto, accetti di rispettare i termini e le condizioni previsti.\n\n\n## [6. Responsabilità dei visitatori del Sito](#6)\n\n%{company_name} non ha rivisto e non può rivedere tutto il materiale, compreso il software informatico, pubblicato sul Sito e pertanto non può essere considerata responsabile per il contenuto, l’uso o gli effetti di tale materiale. Gestendo il Sito, %{company_name} non dichiara né implica che approva il materiale pubblicato o che ritiene che tale materiale sia accurato, utile o non nocivo. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. Il Sito potrebbe includere contenuto offensivo, indecente, o altrimenti discutibile, così come contenuto contenente imprecisioni tecniche, errori tipografici e altri errori. Il Sito potrebbe inoltre contenere materiale che viola i diritti pubblicitari o di privacy, o violare la proprietà intellettuale e altri diritti proprietari di terzi, o il cui download, la copia o l’utilizzo siano soggetti a ulteriori termini e condizioni, dichiarati o non dichiarati. %{company_name} declina ogni responsabilità per qualsiasi danno derivante dall’uso da parte di visitatori del Sito, o da qualsiasi download eseguito da tali visitatori del contenuto pubblicato.\n\n\n\n## [7. Contenuto\ - \ pubblicato su altri siti Web](#7)\n\nNon abbiamo rivisto e non possiamo rivedere tutto il materiale, compreso il software informatico, reso disponibile mediante i siti e le pagine Web che contengono link a e dal sito %{company_domain}. %{company_name} non esercita alcun controllo su tali siti e pagine Web non %{company_domain} e non è responsabile del loro contenuto o utilizzo. Con il collegamento a un sito o a una pagina Web non %{company_domain}, %{company_name} non dichiara né ammette implicitamente che approva tale sito o pagina Web. L’utente deve adottare le precauzioni necessarie per proteggere se stesso e i sistemi informatici da virus, worm, cavalli di Troia e altri contenuti dannosi o distruttivi. %{company_name} declina ogni responsabilità per eventuali danni risultanti dall’uso di siti e pagine Web non %{company_domain}.\n\n\n\n## [8. Violazione del copyright e della politica DMCA](#8)\n\n%{company_name} chiede agli altri di rispettare i propri diritti di proprietà intellettuale e a sua volta rispetta i diritti di proprietà intellettuale di terzi. Se l’utente ritiene che il materiale presente o a cui accede mediante link dal sito %{company_domain} violi il proprio copyright, è invitato a inviare una notifica a %{company_name} in conformità alla politica [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (“DMCA”) di %{company_name}. %{company_name} risponderà a tutte le notifiche includendo, in base alle misure necessarie o appropriate, la rimozione del materiale che genera la violazione o la disabilitazione di tutti i link al materiale in presunta violazione. %{company_name} non consentirà più l’accesso e l’utilizzo del Sito al visitatore se, in circostanze appropriate, il visitatore si comporta come trasgressore recidivo del copyright o di altri diritti di proprietà intellettuale di %{company_name} o di terzi. In caso di rescissione, %{company_name} non avrà alcun obbligo di rimborsare eventuali somme pagate in precedenza ad %{company_name}.\n\n\n\n## [9. Proprietà intellettuale](#9)\n\ - \nIl presente Contratto non trasferisce da %{company_name} all’utente qualsiasi proprietà intellettuale di %{company_name} o di terzi e tutti i diritti, la titolarità e l’interesse nel e su tale proprietà rimarranno (fra le parti) esclusivamente di %{company_name}. %{company_name}, %{company_domain}, il logo %{company_domain} e tutti gli altri marchi commerciali, marchi di servizio, grafica e logo utilizzati in connessione a %{company_domain} o il Sito sono marchi commerciali o marchi commerciali registrati di %{company_name} o dei licenziatari di %{company_name}. Altri marchi, marchi di servizio, grafica e logo utilizzati in connessione con il Sito possono essere marchi di terzi. L’utilizzo del Sito non implica per l’utente alcun diritto o licenza di riprodurre o utilizzare in altro modo qualsiasi marchio commerciale di %{company_name} o di terzi.\n\n\n\n## [10. Annunci pubblicitari](#10)\n\n%{company_name} si riserva il diritto di visualizzare annunci pubblicitari sul tuo contenuto, a meno che tu non abbia acquistato un Upgrade o un account di servizi senza pubblicità.\n\n\n\n## [11. Attribuzione](#11)\n\n%{company_name} si riserva il diritto di visualizzare link di attribuzione come “Powered by %{company_domain}”, autore del tema e attribuzione dei caratteri nel piè di pagina o la barra degli strumenti del tuo contenuto. I crediti a piè di pagina e la barra degli strumenti %{company_domain} non possono essere alterati o rimossi indipendentemente dagli upgrade acquistati.\n\n\n\n## [12. Modifiche](#12)\n\n%{company_name} si riserva il diritto, a sua unica discrezione, di modificare o rimpiazzare qualunque parte di questo Contratto. E’ tua responsabilità controllare questo Contratto periodicamente per prendere atto dei cambiamenti. L’uso continuato di %{company_domain} implica l’accettazione di tali cambiamenti. %{company_name} può, in futuro, offrire nuovi servizi e/o funzionalità attraverso il Sito (incluso il rilascio di nuovi strumenti e risorse). Tali nuovi servizi e/o funzionalità saranno soggetti ai termini e condizioni\ - \ di questo Contratto.\n\n\n\n## [13. Rescissione del contratto](#13)\n\n%{company_name} può interrompere l’accesso a tutto o a parte del Sito in qualsiasi momento, con o senza causa, con o senza preavviso, con efficacia immediata. Se desideri rescindere dal presente Contratto o dall’account %{company_domain} (se disponibile), puoi semplicemente interrompere l’utilizzo del Sito. Tutte le disposizioni del presente Contratto che, per loro natura, devono permanere dopo la rescissione permarranno, incluse, senza limitazione, le disposizioni di proprietà, le esclusioni di garanzia, le indennità e le limitazioni di responsabilità.\n\n\n\n## [14. Esclusione di garanzie](#14)\n\nIl Sito è fornito “così com’è”. Con la presente, %{company_name}, i suoi fornitori e licenziatari declinano tutte le garanzie di qualsiasi tipo, espresse o implicite, incluse, senza limitazione, le garanzie di commerciabilità, idoneità per un particolare scopo e non violazione. Né %{company_name} né i suoi fornitori e licenziatari concedono alcuna garanzia che il Sito sia privo di errori o che l’accesso ad essi sarà continuo o ininterrotto. Se stai leggendo queste informazioni, ecco un [chiarimento] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Tu comprendi che scaricare o ottenere in altro modo i contenuti o i servizi mediante il Sito, a tua discrezione e a tuo rischio.\n\n\n\n## [15. Limitazione di responsabilità](#15)\n\nIn nessun caso %{company_name}, o suoi fornitori o licenziatari, saranno responsabili per qualsiasi aspetto oggetto del presente contratto ai sensi di qualsiasi accordo, negligenza, responsabilità oggettiva o altra dottrina legale o equitativa: (i) per qualsiasi danno speciale, incidentale o consequenziale; (ii) per il costo di approvvigionamento dei prodotti o dei servizi sostitutivi; (iii) per l’interruzione dell’utilizzo oppure la perdita o il danneggiamento di dati; o (iv) per gli importi che superano le commissioni versate ad %{company_name} ai sensi del presente contratto nel corso\ - \ del periodo di dodici (12) mesi precedenti alla causa dell’azione. %{company_name} non sarà responsabile per qualsiasi errore o ritardo dovuto a cause al di fuori del proprio ragionevole controllo. Quanto precede non si applica nella misura vietata dalla legge applicabile.\n\n\n\n## [16. Garanzia e dichiarazione generale](#16)\n\nTu dichiari e garantisci che (i) l’utilizzo del Sito avverrà in stretta conformità alla [Politica sulla Privacy] (/privacy) di %{company_name}, alle [Linee Guida](/guidelines), al presente Contratto e a tutti i regolamenti e le leggi (inclusi senza limitazioni le leggi o i regolamenti locali in vigore nel paese, nello stato, nella città o in altra area governativa di appartenenza, per quanto riguarda la condotta online e il contenuto accettabile, e comprese tutte le leggi applicabili in materia di trasmissione di dati tecnici esportati dal paese di residenza del Sito o del tuo) e (ii) l’uso del Sito non viola o non si appropria indebitamente dei diritti di proprietà intellettuale di terze parti.\n\n\n\n## [17. Indennizzo](#17)\n\nTu accetti di indennizzare e manlevare %{company_name}, i suoi contraenti e i suoi licenziatari, e i rispettivi direttori, funzionari, dipendenti e agenti da e contro tutte le richieste di risarcimento e le spese, inclusi gli onorari, derivanti dall’uso del Sito, inclusa ma non limitatamente alla violazione dell’utente del presente Contratto.\n\n\n\n## [18. Varie](#18)\n\nIl presente Contratto costituisce l’intero contratto tra te e %{company_name} riguardo l’argomento oggetto del contratto, e può essere modificato solo da un emendamento scritto e firmato da un dirigente autorizzato di %{company_name}, o mediante l’invio da parte di %{company_name} di una versione riveduta. Salvo diversa disposizione nel presente Contratto nei limiti consentiti dalla legge applicabile, se disponibile, qualsiasi accesso a o utilizzo del sito sarà disciplinato dalle leggi dello stato italiano, con esclusione delle disposizioni in materia di conflitto di leggi, il foro competente per qualsiasi\ - \ controversia derivante dal presente contratto o collegata allo stesso è il tribunale di Roma. Fatta eccezione per le richieste di risarcimento ingiuntivo o per via equitativa o richieste di risarcimento relative ai diritti di proprietà intellettuale (che possono essere avanzate in qualsiasi tribunale competente senza prestare garanzie), qualsiasi controversia derivante dal presente contratto sarà risolta in conformità alle leggi italiane (Italia). La parte vincente in qualsiasi azione o procedimento per l’applicazione del presente Contratto avrà diritto di ottenere il rimborso delle spese e degli onorari legali. Nel caso in cui una parte del presente Contratto venga ritenuta non valida o non applicabile, tale parte verrà interpretata in modo da riflettere le intenzioni originali delle parti e le altre disposizioni rimarranno attive ed efficaci. Il mancato esercizio da parte di qualsiasi parte di qualsiasi termine o condizione del presente Contratto o qualsiasi violazione dello stesso, in qualsiasi unica istanza, non implicherà la rinuncia a tale termine o condizione oppure a successive violazioni. Tu puoi assegnare diritti ai sensi del presente Contratto a qualsiasi parte che acconsenta e accetti di essere vincolata dai suoi termini e condizioni; %{company_name} può assegnare i suoi diritti ai sensi del presente Contratto senza condizioni. Il presente Contratto sarà vincolante e avrà effetto a beneficio delle parti, dei subentranti e degli assegnatari autorizzati.\n\nQuesto documento è CC-BY-SA. Ultimo aggiornamento 31 maggio 2013.\n\nAdattamento dal contratto originale [Termini di Servizio WordPress](http://en.wordpress.com/tos/). \n" privacy_topic: title: "Politica della Privacy" - body: "\n\n## [Quali informazioni memorizziamo?](#collect)\nQuando ti registri sul nostro sito memorizziamo alcune informazioni e raccogliamo dati quando partecipi al forum leggendo, scrivendo e valutando il contenuto qui condiviso.\n\nQuando ti registri sul sito, ti potrebbe venir chiesto di inserire il tuo nome e il tuo indirizzo email. Puoi comunque visitare il sito senza registrarti. Il tuo indirizzo email sarà verificato attraverso l’invio di una email che contiene un collegamento univoco. Se il collegamento viene visitato, sapremo che sei tu ad avere il controllo di quell'indirizzo email.\n\nUna volta registrato, quando invii del contenuto noi registriamo l’indirizzo IP da cui il tuo messaggio ha avuto origine. Potremmo anche mantenere dei log sul server che contengono gli indirizzi IP di ogni richiesta effettuata verso il nostro server.\n\n\n\n## [A che ci servono le tue informazioni?](#use)\n\nQualunque tua informazione che memorizziamo può essere usata in uno dei modi seguenti:\n\n * Per personalizzare l’esperienza — tali informazioni ci servono a rispondere meglio alle esigenze individuali.\n * Per migliorare il nostro sito — ci sforziamo continuamente di migliorare il nostro sito usando le informazioni e i ritorni ricevuti.\n * Per inviare email periodiche — l’indirizzo email che fornisci può essere usato per inviarti informazioni, notifiche da te richieste circa modifiche agli argomenti o in risposta al tuo nome utente, rispondere a domande e/o altre richieste o domande.\n\n\n\n## [Come proteggiamo le tue informazioni?](#protect)\n\nImplementiamo diverse misure di sicurezza per salvaguardare le tue informazioni personali, ogni volta che le inserisci, le modifichi o vi accedi.\n\n\n\n## [Qual è la vostra politica di conservazione dei dati?](#data-retention)\n\nCi impegniamo a:\n\n * Conservare i log contenenti gli indirizzi IP di tutte le richieste giunte sui nostri server per non più di 90 giorni.\n * Conservare gli indirizzi IP associati agli utenti registrati\ - \ ed ai loro messaggi per non più di 5 anni.\n\n\n\n## [Usate i cookie?](#cookies)\n\nSì. I cookie sono dei piccoli file che un sito copia sul tuo disco fisso attraverso il browser web (se lo permetti). Tali cookie permettono al sito di riconoscere il browser e di associarlo con il tuo account registrato, se presente. \n\nUsiamo i cookie per comprendere e memorizzare le tue preferenze per le visite future e per raccogliere dati aggregati circa il traffico sul sito e le interazioni, in modo da offrire successivamente una migliore esperienza di navigazione e migliori strumenti. Potremmo accordarci con fornitori di servizio terzi che per aiutarci a comprendere meglio i visitatori del nostro sito. Tali fornitori di servizi non hanno il permesso di usare le informazioni raccolte per nostro conto, tranne quando lo scopo è aiutarci a portare avanti e migliorare la nostra attività.\n\n \n\n## [Rivelate informazioni a terze parti?](#disclose)\n\nNon vendiamo, scambiamo né trasferiamo a terze parti le informazioni che ti identificano personalmente. Ciò ad esclusione di quelle parti che ci aiutano gestire il sito, a portare avanti le attività o i servizi, fintanto che tali parti acconsentano a mantenere le informazioni confidenziali. Potremmo inoltre rilasciare le informazioni quando pensiamo che il rilascio sia appropriato per il rispetto della legge, per far rispettare le regole del sito, o per proteggere i nostri o gli altrui diritti, la proprietà o la sicurezza. Tuttavia, informazioni dei visitatori che non personalmente identificanti potrebbero essere fornite ad altri soggetti per fini di marketing, pubblicità, o per altri usi.\n\n\n\n## [Collegamenti con terze parti](#third-party)\n\nA volte, a nostra discrezione, potremmo includere sul nostro sito offerte di prodotti o servizi di terze parti. I siti delle terze parti hanno politiche sulla privacy separate ed indipendenti dalle nostre. Pertanto non ci assumiamo alcuna responsabilità per il contenuto e le attività di tali siti collegati. Tuttavia, cercheremo\ - \ di proteggere l'integrità del nostro sito pertanto accettiamo eventuali riscontri negativi sui siti terzi.\n\n\n\n\n## [Rispetto della legge sulla protezione della privacy online dei minori - Children's Online Privacy Protection Act Compliance - COPPA](#coppa)\n\nIl nostro sito, nonché i prodotti ed i servizi ad esso collegati, sono tutti diretti a persone maggiorenni. Se non si è maggiorenni secondo le leggi del proprio Paese, per il rispetto della COPPA ([Legge sulla protezione della privacy online dei minori]( http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act)), non usare questo sito.\n\n\n\n## [Politica sulla privacy online](#online)\n\nLa presente politica sulla privacy online si applica soltanto alle informazioni raccolte attraverso il nostro sito e non alle informazioni fuori linea.\n\n\n\n## [Consenso](#consent)\n\nUsando il nostro sito, accetti senza riserve la presente politica sulla privacy.\n\n\n\n## [Cambiamenti alla politica sulla privacy](#changes)\n\nQualora decidessimo di cambiare la nostra politica sulla privacy, invieremo tali modifiche su questa pagina.\n\nQuesto documento è CC-BY-SA (http://it.wikipedia.org/wiki/Licenze_Creative_Commons). \nAggiornato il 31 maggio 2013.\n" + body: "\n\n## [Quali informazioni memorizziamo?](#collect)\nQuando ti registri sul nostro sito memorizziamo alcune informazioni e raccogliamo dati quando partecipi al forum leggendo, scrivendo e valutando il contenuto qui condiviso.\n\nQuando ti registri sul sito, ti potrebbe venir chiesto di inserire il tuo nome e il tuo indirizzo email. Puoi comunque visitare il sito senza registrarti. Il tuo indirizzo email sarà verificato attraverso l’invio di una email che contiene un collegamento univoco. Se il collegamento viene visitato, sapremo che sei tu ad avere il controllo di quell'indirizzo email.\n\nUna volta registrato, quando invii del contenuto noi registriamo l’indirizzo IP da cui il tuo messaggio ha avuto origine. Potremmo anche mantenere dei log sul server che contengono gli indirizzi IP di ogni richiesta effettuata verso il nostro server.\n\n\n\n## [A che\ + \ ci servono le tue informazioni?](#use)\n\nQualunque tua informazione che memorizziamo può essere usata in uno dei modi seguenti:\n\n * Per personalizzare l’esperienza — tali informazioni ci servono a rispondere meglio alle esigenze individuali.\n * Per migliorare il nostro sito — ci sforziamo continuamente di migliorare il nostro sito usando le informazioni e i ritorni ricevuti.\n * Per inviare email periodiche — l’indirizzo email che fornisci può essere usato per inviarti informazioni, notifiche da te richieste circa modifiche agli argomenti o in risposta al tuo nome utente, rispondere a domande e/o altre richieste o domande.\n\n\n\n## [Come proteggiamo le tue informazioni?](#protect)\n\nImplementiamo diverse misure di sicurezza per salvaguardare le tue informazioni personali, ogni volta che le inserisci, le modifichi o vi accedi.\n\n\n\n## [Qual è la vostra politica di conservazione dei dati?](#data-retention)\n\nCi impegniamo a:\n\n * Conservare i log contenenti gli indirizzi IP di tutte le richieste giunte sui nostri server per non più di 90 giorni.\n * Conservare gli indirizzi IP associati agli utenti registrati ed ai loro messaggi per non più di 5 anni.\n\n\n\n## [Usate i cookie?](#cookies)\n\nSì. I cookie sono dei piccoli file che un sito copia sul tuo disco fisso attraverso il browser web (se lo permetti). Tali cookie permettono al sito di riconoscere il browser e di associarlo con il tuo account registrato, se presente. \n\nUsiamo i cookie per comprendere e memorizzare le tue preferenze per le visite future e per raccogliere dati aggregati circa il traffico sul sito e le interazioni, in modo da offrire successivamente una migliore esperienza di navigazione e migliori strumenti. Potremmo accordarci\ + \ con fornitori di servizio terzi che per aiutarci a comprendere meglio i visitatori del nostro sito. Tali fornitori di servizi non hanno il permesso di usare le informazioni raccolte per nostro conto, tranne quando lo scopo è aiutarci a portare avanti e migliorare la nostra attività.\n\n \n\n## [Rivelate informazioni a terze parti?](#disclose)\n\nNon vendiamo, scambiamo né trasferiamo a terze parti le informazioni che ti identificano personalmente. Ciò ad esclusione di quelle parti che ci aiutano gestire il sito, a portare avanti le attività o i servizi, fintanto che tali parti acconsentano a mantenere le informazioni confidenziali. Potremmo inoltre rilasciare le informazioni quando pensiamo che il rilascio sia appropriato per il rispetto della legge, per far rispettare le regole del sito, o per proteggere i nostri o gli altrui diritti, la proprietà o la sicurezza. Tuttavia,\ + \ informazioni dei visitatori che non personalmente identificanti potrebbero essere fornite ad altri soggetti per fini di marketing, pubblicità, o per altri usi.\n\n\n\n## [Collegamenti con terze parti](#third-party)\n\nA volte, a nostra discrezione, potremmo includere sul nostro sito offerte di prodotti o servizi di terze parti. I siti delle terze parti hanno politiche sulla privacy separate ed indipendenti dalle nostre. Pertanto non ci assumiamo alcuna responsabilità per il contenuto e le attività di tali siti collegati. Tuttavia, cercheremo di proteggere l'integrità del nostro sito pertanto accettiamo eventuali riscontri negativi sui siti terzi.\n\n\n\n\n## [Rispetto della legge sulla protezione della privacy online dei minori - Children's Online Privacy Protection Act Compliance - COPPA](#coppa)\n\nIl nostro sito, nonché i prodotti ed i servizi ad\ + \ esso collegati, sono tutti diretti a persone maggiorenni. Se non si è maggiorenni secondo le leggi del proprio Paese, per il rispetto della COPPA ([Legge sulla protezione della privacy online dei minori]( http://en.wikipedia.org/wiki/Children's_Online_Privacy_Protection_Act)), non usare questo sito.\n\n\n\n## [Politica sulla privacy online](#online)\n\nLa presente politica sulla privacy online si applica soltanto alle informazioni raccolte attraverso il nostro sito e non alle informazioni fuori linea.\n\n\n\n## [Consenso](#consent)\n\nUsando il nostro sito, accetti senza riserve la presente politica sulla privacy.\n\n\n\n## [Cambiamenti alla politica sulla privacy](#changes)\n\nQualora decidessimo di cambiare la nostra politica sulla privacy, invieremo tali modifiche su questa pagina.\n\nQuesto documento è CC-BY-SA (http://it.wikipedia.org/wiki/Licenze_Creative_Commons).\ + \ \nAggiornato il 31 maggio 2013.\n" admin_login: success: "email Inviata" error: "Errore!" diff --git a/config/locales/server.ja.yml b/config/locales/server.ja.yml index fb1d8175bd..0f353a0145 100644 --- a/config/locales/server.ja.yml +++ b/config/locales/server.ja.yml @@ -44,7 +44,7 @@ ja: not_a_number: は数値で入力してください not_an_integer: は整数で入力してください odd: は奇数にしてください - record_invalid: 'バリデーションに失敗しました。 %{errors}' + record_invalid: 'バリデーションに失敗しました： %{errors}' restrict_dependent_destroy: one: "%{record}が存在しているので削除できません" many: "%{record}が存在しているので削除できません。" @@ -121,13 +121,13 @@ ja: author_wrote: "%{author} の投稿:" num_posts: "ポスト:" num_participants: "参加者:" - read_full_topic: "Read full topic" + read_full_topic: "完全なトピックを読む" private_message_abbrev: "メッセージ" rss_description: latest: "最新トピック" hot: "ホットトピック" posts: "最近の投稿" - too_late_to_edit: "この投稿の編集・削除期間が過ぎまして、編集・削除が出来ません。" + too_late_to_edit: "この投稿の編集・削除期間が過ぎました。編集・削除が出来ません。" excerpt_image: "画像" queue: delete_reason: "ポスト承認待ちで削除" @@ -148,6 +148,14 @@ ja: education: until_posts: other: "%{count} 投稿" + new-topic: | + %{site_name} へようこそ！— ** 新たなトピックの作成ありがとうございます！** + + - タイトルはトピックの内容を正しく説明していますか？他の人にとって興味深いタイトルになっていますか？ + + - このトピックは何をカバーするものですか？このトピックに興味を示しそうなのは誰でしょう？なぜこのトピックは重要なのでしょうか？コミュニティよりどのような回答を期待していますか？ + + - トピックに適切な検索用ワードを含めると、他の人がトピックを *発見* しやすくなります。詳細は [コミュニティガイドライン](/guidelines) を参照してください。このパネルは最初から %{education_posts_text} 回目までの投稿のときにだけ表示されます。 new-reply: "%{site_name} へようこそ — **コミュニティへの貢献ありがとうございます!** \n- あなたの回答は議論に何らかの形で貢献していますか?\n - コミュニティメンバー同士のやりとりは礼儀正しく、マナーを保ちましょう。\n - 建設的な批判は歓迎します。ただし批判は「人」に対してではなく「アイデア」に対して行いましょう。 \n詳細は[コミュニティガイドライン](/guidelines)を参照してください。このパネルは最初の %{education_posts_text} のみに表示されます。\n" avatar: | ### アカウント用の画像を用意してみては? @@ -236,10 +244,10 @@ ja: email_in_already_exist: "受信メールアドレス '%{email_in}' は '%{category_name}' カテゴリですでに使用されています。" cannot_delete: uncategorized: "未分類カテゴリは削除出来ません" - has_subcategories: "サブカテゴリを持っているため、カテゴリを削除できません" + has_subcategories: "サブカテゴリを持っているため、このカテゴリを削除できません。" topic_exists: - other: "%{count}個のトピックを持っているため、カテゴリを削除できません。一番古いトピックは%{topic_link}です" - topic_exists_no_oldest: "%{count}個のトピックを持っているため、カテゴリを削除できません" + other: "%{count}個のトピックを持っているため、このカテゴリを削除できません。一番古いトピックは%{topic_link}です。" + topic_exists_no_oldest: "%{count}個のトピックを持っているため、このカテゴリを削除できません。" trust_levels: newuser: title: "新規ユーザ" @@ -263,7 +271,7 @@ ja: other: "%{count} 秒" datetime: distance_in_words: - half_a_minute: "< 1m" + half_a_minute: "< 1分" less_than_x_seconds: other: "< %{count} 秒" x_seconds: @@ -325,7 +333,7 @@ ja: please_continue: "%{site_name}へ" error: "メールアドレスの更新に失敗しました。アドレスが既に使用されているかもしれません。" activation: - action: "アカウントを有効する" + action: "アカウントを有効にする" already_done: "申し訳ありませんが、このアカウント認証リンクは無効です。既にアカウントがアクティブになっていませんか?" please_continue: "あなたのアカウントは確認されました。ホームにリダイレクトされます" continue_button: "%{site_name} へ" @@ -350,6 +358,7 @@ ja: notify_user: title: 'メッセージ @{{username}}' description: 'この投稿やトピックを書いた人に、直接メッセージを送る。（フラグを付けません）' + long_form: 'メッセージが送られたユーザ' email_title: '「%{title}」にの投稿' email_body: "%{link}\n\n%{message}" notify_moderators: @@ -392,6 +401,7 @@ ja: regular: title: "通常のトピック" banner: + title: "バナートピック" message: make: "このトピックはバナートピックに設定されています。ユーザが解除しない限り、ページ毎の一番上に表示されます" remove: "このトピックはバナーではなくなりました。トップページには表示されなくなります" @@ -399,7 +409,7 @@ ja: title: '購読解除' description: "購読解除されました。メールの送信をストップしました。" oops: "誤って購読解除した場合は、下をクリックしてください。" - error: "購読エラー" + error: "購読解除エラー" preferences_link: "あなたの 設定画面からの確認メールでも解除することができます" different_user_description: "確認メールを送ったユーザとは別のユーザでログインしています。ログアウトしてから試してください" not_found_description: "申し訳ありませんが購読解除に失敗しました。メール内のリンクの有効期限が切れているのかもしれません。" @@ -499,6 +509,14 @@ ja: title: "全体" xaxis: "日" yaxis: "Total API Requests" + page_view_logged_in_mobile_reqs: + title: "ログインAPIリクエスト" + xaxis: "日" + yaxis: "モバイルログインAPIリクエスト" + page_view_anon_mobile_reqs: + title: "匿名APIリクエスト" + xaxis: "日" + yaxis: "モバイル匿名APIリクエスト" http_background_reqs: title: "背景" xaxis: "日" @@ -523,6 +541,18 @@ ja: title: "全体" xaxis: "日" yaxis: "全リクエスト" + time_to_first_response: + title: "最初の返答までの時間" + xaxis: "日" + yaxis: "平均時間(時間)" + topics_with_no_response: + title: "返答のないトピック" + xaxis: "日" + yaxis: "合計" + mobile_visits: + title: "訪問ユーザ" + xaxis: "日" + yaxis: "訪問者数" dashboard: rails_env_warning: "サーバは %{env} モードで起動中です。" ruby_version_warning: "現在起動中の Ruby 2.0.0 にはいくつか問題があります。パッチレベル p247 以降にアップグレードしてください。" @@ -544,6 +574,7 @@ ja: title_nag: "サイトの名前が正しくありません。サイトの設定で更新してください" site_description_missing: "検索結果に表示される説明文を入力してください。サイトの設定で更新してください" consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。Gmail で送信可能なメール数には制限があります。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。" + site_contact_username_warning: "重要な自動メッセージを送信するフレンドリースタッフユーザーアカウントの名前を入力してください。サイト設定 のsite_contact_username を更新してください。" notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\nサイトの設定で更新してください" content_types: education_new_reply: @@ -557,8 +588,10 @@ ja: description: "新規ユーザのための重要な情報とガイダンス" welcome_user: title: "ウェルカムメッセージ: 新規ユーザ" + description: "サインアップ時にすべての新規ユーザに自動送信されるメッセージ。" welcome_invite: title: "ウェルカムメッセージ: 招待ユーザ" + description: "他のユーザからの招待を受け入れたときにすべての新しい招待ユーザに自動送信されるメッセージ" login_required_welcome_message: title: "ウェルカムメッセージ: 要ログイン" description: "'login required' 設定有効時に、ユーザに対してログインを促すメッセージの内容。" @@ -585,7 +618,9 @@ ja: max_post_length: "投稿を許可する最大の文字数" min_topic_title_length: "トピックタイトルとして許可する最小の文字数" max_topic_title_length: "トピックタイトルとして許可する最大の文字数" + min_private_message_title_length: "プライベートメッセージのタイトルとして許容する最小の文字数" min_search_term_length: "検索ワードとして有効にする最小の文字数" + allow_uncategorized_topics: "カテゴリなしのトピック作成を許可するか。警告：未分類のトピックがある場合は、これをオフにする前に、再分類する必要があります。" uncategorized_description: "未分類カテゴリについての説明。存在しない場合は空白のままにします" allow_duplicate_topic_titles: "トピックタイトルの重複を許可" unique_posts_mins: "同じ内容のポストを再投稿可能にする時間 (分)" @@ -608,6 +643,7 @@ ja: category_featured_topics: "/categories ページに表示されるカテゴリ毎のトピック数" show_subcategory_list: "カテゴリを表示する際にトピック一覧の代わりにサブカテゴリ一覧を表示" fixed_category_positions: "チェックすると、カテゴリの表示順をコントロールできます。チェックしない場合、アクティビティ順に表示されます" + fixed_category_positions_on_create: "チェックすると、トピック作成ダイアログ上でカテゴリの順序が維持されます(fixed category positions が必要)。" add_rel_nofollow_to_user_content: " 内部リンク(親ドメインを含む)を除き、投稿されたすべてのユーザコンテンツに rel nofollow を追加する。この設定を反映するには \"rake posts:rebake\" を実行して baked markdown をすべて更新する必要があります" post_excerpt_maxlength: "投稿の引用/サマリの最大文字数" post_onebox_maxlength: "Discourse OneBoxポストの最大文字数" @@ -627,6 +663,7 @@ ja: summary_likes_required: "'トピックサマリー'が有効になるために必要な最小「いいね!」数" summary_percent_filter: "ユーザが'トピックサマリー'をクリックしたとき, 上位何パーセントのポストを表示するか" summary_max_results: "'トピックサマリー'として返却される最大ポスト数" + enable_private_messages: "トラストレベル1のユーザーにプライベートメッセージの作成と返信を許可する" enable_long_polling: "通知用のメッセージバスによるロングポーリングの利用を許可する" long_polling_base_url: "ロングポーリングのベースURL(CDNが動的コンテンツを配信している場合、これをoriginに指定してください) eg: http://origin.site.com" long_polling_interval: "ユーザに送信するデータが存在しないとき、サーバが待機する時間(ログインユーザーのみ)" @@ -639,12 +676,17 @@ ja: cooldown_minutes_after_hiding_posts: "フラグにより非表示状態になったポストをユーザが編集可能になるまでの時間 (分)" max_topics_in_first_day: "サイト利用初日にユーザが作成することのできるトピックの最大数" max_replies_in_first_day: "サイト利用日にユーザが作成することのできる回答の最大数" + tl2_additional_likes_per_day_multiplier: "この数字を掛けると TL2 (メンバー) の1日あたりの「いいね！」の上限を増やします" + tl3_additional_likes_per_day_multiplier: "この数字を掛けると TL3 (レギュラー) の1日あたりの「いいね！」の上限を増やします" + tl4_additional_likes_per_day_multiplier: "この数字を掛けると TL4 (リーダー) の1日あたりの「いいね！」の上限を増やします" num_flags_to_block_new_user: "新規ユーザのポストに対して、何人のユーザによりここで指定した数のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" num_users_to_block_new_user: "新規ユーザのポストに対して、ここで指定した数のユーザにより何個のスパムフラグが立てられたら、全てのポストを非表示状態にした上でこのユーザからのポストを拒否するか。0 で無効化" notify_mods_when_user_blocked: "ユーザが自動的にブロックされた際に、すべてのモデレータにメッセージを送信する。" flag_sockpuppets: "トピックを作成したユーザーと同じIPアドレスで、新規ユーザーがトピックに回答した場合、両者を潜在的なスパムとしてフラグを立てるか" traditional_markdown_linebreaks: "Markdown の従来形式のラインブレーク (行の終わりにダブルスペース) を使う" + allow_html_tables: "Markdown でHTMLタグでのテーブルの入力を許可する、TABLE、THEAD、TD、TR、THタグがホワイトリストに登録されています(テーブルを含むすべての古い投稿の完全な再ベークが必要)" post_undo_action_window_mins: "ポストに対するアクション (「いいね!」、フラグ等) 取り消しを許可する時間 (秒)" + must_approve_users: "スタッフはサイトへのアクセスが許可される前のすべての新規ユーザを承認する必要があります。警告：公開中のサイトでこれを有効にすると、既存の非スタッフユーザのアクセスを取り消すことになります！" ga_tracking_code: "Google analytics のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics" ga_domain_name: "Google analytics のドメイン名。例: mysite.com; 参考 http://google.com/analytics" ga_universal_tracking_code: "Google Universal Analytics(analytics.js) のトラッキングコード。例: UA-12345678-9; 参考 http://google.com/analytics" @@ -658,10 +700,12 @@ ja: post_menu_hidden_items: "展開記号がクリックされない限り、ポストのメニュー項目を隠します" share_links: "シェアダイアログに表示する項目、表示順を指定" track_external_right_clicks: "右クリックされた外部リンクをトラックする (例: 新しいタブで開く)。URL のリライトを要するためデフォルトでは無効化されています" + send_welcome_message: "全ての新規ユーザにクイックスタートガイド付きのウェルカムメッセージを送信する。" suppress_reply_directly_below: "ポストに回答が１つしかない場合、ポストの回答数を表示しない" suppress_reply_directly_above: "ポストに回答が１つしかない場合、ポストのin-reply-toを表示しない" suppress_reply_when_quoting: "ポストが引用返信だった場合、ポストのin-reply-toを表示しない" max_reply_history: "回答のin-reply-toを展開する最大数" + experimental_reply_expansion: "回答を展開するときに、その間にある回答を非表示にする(実験)" topics_per_period_in_top_summary: "デフォルトのトピックサマリに表示されるトップトピックの数" topics_per_period_in_top_page: "'もっと見る'を展開したときに表示するトップトピックの数" redirect_users_to_top_page: "新規ユーザーと長く不在のユーザーをトップページに自動的にリダイレクトさせる" @@ -682,16 +726,20 @@ ja: login_required: "サイトのコンテンツを閲覧するには認証を必須にして、匿名アクセスを拒否する" min_username_length: "ユーザ名の最小の文字数。　警告: !!これより短いユーザ名を持つ既存のユーザはログインできなくなります!!" max_username_length: "ユーザ名の最大の文字数。 警告: !!これより長いユーザ名を持つ既存のユーザはログインできなくなります!!" + reserved_usernames: "サインアップが許可されていないユーザ名。" min_password_length: "パスワードの最小の長さ" block_common_passwords: "最もよく使われている10,000個のパスワードはパスワードとして許可しない" enable_sso_provider: "Discourse SSO provider プロトコルを /session/sso_provider エンドポイントに実装し、sso_secretの設定が必須です" sso_url: "シングルサインオンエンドポイントのURL" sso_secret: "SSO認証情報の暗号化に利用する秘密の文字列。10文字以上である必要があります" sso_overrides_avatar: "SSOペイロードから取得した外部サイトのプロフィール画像でローカルのプロフィール画像を上書きする。有効にする場合、プロフィール画像のアップデートを無効にする事を強く薦めます" + sso_not_approved_url: "このURLに承認されていないSSOアカウントをリダイレクト" enable_local_logins: "ローカルのユーザ名、パスワードでのログインを有効にする (注意: 招待を使用するには有効にする必要があります)" allow_new_registrations: "新規ユーザー登録を許可。誰でもユーザーを作れるのを防ぐには、チェックを外してください。" enable_yahoo_logins: "Yahoo 認証を有効にする" + enable_google_oauth2_logins: "グーグル Oauth2 認証を有効にします。これはグーグルが現在サポートしている認証方式です。key と secret が必要です。" google_oauth2_client_id: "あなたのGoogleアプリケーションのクライアントID" + google_oauth2_client_secret: "あなたの Google アプリケーションのクライアント Secret。" enable_twitter_logins: "Twitter 認証を有効にする (twitter_consumer_key と twitter_consumer_secret の設定が必要)" twitter_consumer_key: "Twitter 認証用の consumer key。http://dev.twitter.com で入手可能" twitter_consumer_secret: "Twitter 認証用の consumer secret。http://dev.twitter.com で入手可能" @@ -917,6 +965,7 @@ ja: other: "%{count} 件のポストを既存のトピックに移動しました: %{topic_link}" change_owner: post_revision_text: "%{old_user} から %{new_user}にownershipを移動させました" + deleted_user: "削除されたユーザ" emoji: errors: name_already_exists: "申し訳ありません。'%{name}'は既に別の絵文字で使われています" @@ -1289,7 +1338,6 @@ ja: signup_after_approval: subject_template: "%{site_name} への参加承認完了!" signup: - subject_template: "[%{site_name}] 新たなアカウントのアクティベーション" text_body_template: | Welcome to %{site_name}! @@ -1321,22 +1369,25 @@ ja: too_large: "申し訳ありませんが、ファイルが大きすぎてアップロードできません (最大サイズは %{max_size_kb}KB です)" images: too_large: "申し訳ありませんが、画像が大きすぎてアップロードできません (最大サイズは %{max_size_kb}KB です)。リサイズして再アップロードしてください" - fetch_failure: "申し訳ありませんが、画像取得中にエラーが発生しました。" - unknown_image_type: "申し訳ありませんが、アップロードしようとしたファイルは画像ではないようです。" size_not_found: "申し訳ありませんが、画像のサイズを判定できませんでした。画像が壊れているかもしれません。" flag_reason: sockpuppet: "新規ユーザがトピックを作成し、同じ IP アドレスより別の新規ユーザが回答を投稿しました。サイトの flag_sockpuppets 設定を確認してください。" spam_hosts: "この新規ユーザは同一ドメインへのリンクを含むポストを複数作成しようとしました。サイトの newuser_spam_host_threshold 設定を確認してください" email_log: no_user: "id %{user_id}のユーザーは見つかりませんでした" + anonymous_user: "ユーザーは匿名です" + suspended_not_pm: "ユーザーはサスペンド状態です、プライベートメッセージはありません" seen_recently: "最近訪れたユーザ" post_not_found: "id %{post_id}のポストは見つかりません" notification_already_read: "メールが既読になったという通知です" topic_nil: "post.topic is nil" post_deleted: "投稿は投稿者によって削除されました" + user_suspended: "ユーザーはサスペンド状態です" already_read: "ユーザーはポストを既に読んだ" message_blank: "メッセージが空" message_to_blank: "メッセージの宛先(to)が空" + text_part_body_blank: "テキストの本文が空です" + body_blank: "本文が空です" color_schemes: base_theme_name: "ベース" about: "About" @@ -1356,8 +1407,12 @@ ja: privacy_topic: title: "プライバシーポリシー" admin_login: + success: "メールを送信しました" error: "エラー！" email_input: "アドミンメール" 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.ko.yml b/config/locales/server.ko.yml index 7551ee7a51..d35bc78bbd 100644 --- a/config/locales/server.ko.yml +++ b/config/locales/server.ko.yml @@ -420,6 +420,7 @@ ko: regular: title: "자주보는 토픽" banner: + title: "배너 토픽" message: make: "이 토픽은 배너에 올라왔습니다. 사용자가 내리기 전까지 모든 페이지의 상단에 표시됩니다." remove: "이 토픽은 배너에서 내려왔습니다. 더 이상 모든 페이지의 상단에 표시되지 않습니다." @@ -1594,7 +1595,6 @@ ko: (새 사용자로서 할말이 있으시면 이글에 답변함으로써 [스태프](%{base_url}/about)들에게 이야기해주세요.) signup: - subject_template: "[%{site_name}] 새로운 계정을 활성화하세요" text_body_template: | %{site_name}에 오신것을 환영합니다! @@ -1626,8 +1626,6 @@ ko: too_large: "죄송합니다, 업로드하려는 파일이 너무 큽니다. (최대 크기 %{max_size_kb}KB)." images: too_large: "죄송합니다, 업로드하려는 이미지가 너무 큽니다. (최대 크기 %{max_size_kb}KB). 크기를 줄여서 다시 시도해보세요." - fetch_failure: "죄송합니다. 이미지 업로드에 오류가 있습니다." - unknown_image_type: "죄송합니다. 당신은 이미지로 보이지 않는 파일을 업로드 하려고 하였습니다." size_not_found: "죄송합니다. 이미지 사이즈가 잘못 되었습니다. 혹시 깨진 이미지가 아닌가요?" flag_reason: sockpuppet: "새로운 사용자가 토픽을 만들었습니다. 그리고 같은 IP를 사용하는 새 사용자가 답글을 달았습니다. 사이트 설정의 flag_sockpuppets를 확인하세요." @@ -1661,12 +1659,6 @@ ko: guidelines_topic: title: "FAQ/가이드" - body: "\n\n## [공개 토의를 하는 문화시민의 공간](#civilized)\n\n이 포럼을 공원으로 생각해 주시기 바랍니다. 여기도 공원과 마찬가지로 다 같이 쓰는 공공장소로, 대화를 통해 스킬과 지식과 같은 의견을 공유하는 곳입니다.\n\n우리 커뮤니티 규칙은 옳고 그름 판단이 어려운 그런 딱딱한 규칙이 아닙니다. 본 가이드라인을 통해 여기를 깨끗한 공간 문화시민의 계몽된 공간으로 만들어 보세요. \n\n\n\n## [더 좋은 토의를 위해](#improve)\n\n이곳을 토의하기 좋은 공간으로 만드는 것을 도와주시려면, 꾸준히 작게라도 더 좋은 토의를 만드는 데 힘써 주세요. 내 게시글이 어떤 대화에 올라가는 게 괜찮은지 확실하지 않으면, 뭘 말하고 싶은 지 다시 한번 생각하고 다시 한 번 올릴까 생각해 봅니다.\n\n여기서 토의되는 토픽들은 모두 중요하고, 모두가 그렇게 생각하고 행동해 주셨으면 좋겠습니다. 반대 의견이더라도 그 토픽과 토픽 작성자는 존중해 주셔야 합니다.\n\n더 좋은 토의를 만드는 방법 중 하나는 지금까지\ - \ 오고갔던 토의가 뭔지 발견하는 것에 있습니다. 시간 좀 내서 답글을 올리거나 토픽을 새로 올리기 전에 관련 토픽들을 훑어본다면 같은 의견을 가진 사람들을 만날 확률이 높아집니다.\n\n\n\n## [지금은 반대하지만 동의할 수도 있다는 마인드](#agreeable)\n\n어떤 사람의 의견에 반대의견으로 응할 수 있습니다. 괜챃습니다. 다만, _의견에 반대해야지, 사람을 반대하면 안됩니다_. 다음 행동은 제발 피해주세요:\n\n* 이름 거론하기. 저격하기.\n* 인신공격. 의견이 아닌 사람을 공격하는 일.\n* 실제 내용이 아닌 게시물의 말투를 거론하는 일.\n* 생각 없이 반박하기.\n\n더 좋은 토의를 위해서는 이런 것 대신에 상대방이 이해할만한 이유가 있는 반대 의견을 내놓아 주세요.\n\n\n\n## [당신의 참여가 보입니다](#participate)\n\n여기서 오고가는 대화로 모두가 느끼는 이곳의 분위기가 만들어집니다. 재미있는 공간으로 만들도록 다들 참여해서 이 커뮤니티의 좋은 미래를 만들도록 도와주세요.\ - \ — 그리고 하지 말라는 것은 지켜주세요.\n\nDiscourse를 사용하는 이 커뮤니티는 최고(최악)의 기여를 수집하고 확인하는 도구를 제공하고 있습니다. 즐겨찾기, 북마크, 좋아요, 신고, 답글, 수정, 등등을 통계를 내고 있습니다. 이 도구를 이용해서 더 좋은 경험을 하고 다른 사람들도 할 수 있도록 도와주세요.\n\n내가 찾은 이 공원을 처음 봤을 때보다 좋게 만들어야지요.\n\n\n\n## [문제가 있다면 신고하세요](#flag-problems)\n\n모더레이터는 특별 권한을 준 만큼 이 포럼에 책임이 있습니다. 하지만 여러분도 그렇습니다. 여러분의 도움이 있어야 모더레이터를 청소부나 경찰이 아닌 진정한 관계자가 될 수 있습니다.\n\n나쁜 행동을 목격했을 때엔 답글을 주지 마세요. 이게 또 먹이가 되고 또 다른 나쁜행동을 부추기고 모두가 시간 낭비하게 됩니다. _그냥 신고하세요_. 적당히 신고가 쌓이면 자동으로든지 아니면 모더레이터가하든지 어떻게든 제재가 가해집니다.\n\n우리 커뮤니티가 유지되려면, 모더레이터가 어떤 내용이든 어떤 계정이든\ - \ 간에 어떤 사유든 아무 때나 지울 수 있는 권한을 줘야합니다. 모더레이터는 새 글을 검열하는 사람이 아닙니다. 모더레이터나 사이트 운영자는 어떠한 콘텐트에도 책임을 지지 않습니다.\n\n\n\n## [문화시민이 됩시다](#be-civil)\n\n그 어떤 것도 건강한 소통을 막을 수 없다:\n\n* 문화시민이 되세요. 일반 사람들이 공격적이거나, 모욕적, 비난적이다고 느낄만한 글은 올리지 마세요.\n* 깨끗하게 이용하세요. 성적으로 노골적이거나 자극적인 글을 올리지 마세요.\n* 서로를 존중해주세요. 흉내내거나 사적인 일을 폭로하거나 해서 다른 사람을 괴롭히거나 억울하게 만들지 마세요.\n* 이 포럼도 존중해주세요. 포럼을 반달하거나 스팸을 넣지 마세요.\n\n이 가이드라인은 정확하게 명시해 놓은 규칙이 아닙니다. 그래서 이런 _비슷한_ 형태의 것도 있다면 그것도 삼가해주세요. 그래도 잘 모르겠다면, 내가 올린 글이 뉴욕타임즈에 헤드라인으로 올라간다면 과연 욕 먹지 않을까 생각해보세요.\n\n여기는 공공포럼이며 검색엔진을 통해 모두에게 보여집니다. 가족들과 친구들이 봐도\ - \ 되도록 말 조심, 링크 조심, 이미지 조심해 주세요.\n\n\n\n## [깔끔하게 사용하기](#keep-tidy)\n\n모든게 제자리에 있도록 노력해 주세요 그래야 정리하는데 신경 안 쓰고 더 많은 대화를 할 수 있어요. 그러니까:\n\n* 잘못된 카테고리에 게시하지 마세요.\n* 여러 토픽에 똑같은 글을 올리지 마세요.\n* 내용 없는 답글을 올리면 안돼요.\n* 선동해서 토픽 주제를 바꾸지 마세요.\n* 게시글에 따로 서명 하지 마세요. 게시글에 개인 프로필정보가 자동으로 들어갑니다.\n\n“+1”이나 “공감” 같은 답글 말고 좋아요 버튼을 눌러주세요. 내용이 많이 다른 토픽을 바로 올리지 마시고 토픽 링크하기 답글로 올려주세요.\n\n\n\n## [자기 것만 올립시다](#stealing)\n\n보통 저작권자의 허가 없이 저작물 올리는 것은 안됩니다. 지적 재산(소프트웨어, 동영상, 음성파일, 이미지)을 도용할 수 있는 설명, 링크, 방법은 올리지 않습니다. 불법적인 것은 일단 안됩니다.\n\n\n\n## [모두 다 같이 운영합니다](#power)\n\n이 포럼은 [착하고 친절한 스태프](/about)들, 그리고 당신과 함께 운영합니다. 이 외에 무엇을 어떻게 해야 하는 지에 대해 질문이 있으면, [메타 카테고리](/c/meta)에 새 토픽을 올려서 같이 토의해봅시다! 메타 토픽이나 신고로 안되는 긴급 또는 중요한 문제가 있으면 [스태프 페이지](/about)로 바로 연락해주세요.\n\n\n\n## [서비스 이용 약관](#tos)\n\nㅋ 법적인 문서는 지루하죠. 그래도 우리는 우리 스스로 – 여러분도 여러분이 올린 자료도 – 악당으로부터 보호해야 합니다. [서비스 이용 약관](/tos)에서 사생활, 법, 콘텐트와 관련된 우리(모두)의 의무와 권리에 대해서 설명해 놓았습니다. 서비스를 사용하려면, [약관](/tos)에 동의해야 합니다.\n" tos_topic: title: "서비스 이용약관" privacy_topic: diff --git a/config/locales/server.nb_NO.yml b/config/locales/server.nb_NO.yml index c431fb3c3e..bae0e73105 100644 --- a/config/locales/server.nb_NO.yml +++ b/config/locales/server.nb_NO.yml @@ -641,6 +641,7 @@ nb_NO: site_settings: censored_words: "Ord som automatisk vil bli erstattet med ■■■■" delete_old_hidden_posts: "Auto-slett skjulte innlegg som er skjult i mer enn 30 dager." + default_locale: "Standard språk for denne instansen av Discourse (ISO 639-1 Kode)" allow_user_locale: "Tillta at brukere velger eget språk" min_post_length: "Minimum tillatt lengde for innlegg i tegn" min_first_post_length: "Minimum tillatt lengde på for teksten i første innlegg" @@ -783,7 +784,6 @@ nb_NO: read_more: "Les Mer" more_topics_category: "Flere nye emner:" signup: - subject_template: "[%{site_name}] Aktiver din nye konto" text_body_template: | Velkommen til %{site_name}! diff --git a/config/locales/server.nl.yml b/config/locales/server.nl.yml index d73c4f96c9..d4ba22529c 100644 --- a/config/locales/server.nl.yml +++ b/config/locales/server.nl.yml @@ -133,6 +133,7 @@ nl: rss_description: latest: "Nieuwste topics" hot: "Hot topics" + posts: "Nieuwste berichten" too_late_to_edit: "Dat bericht is lang geleden geschreven. Het kan niet meer gewijzigd of verwijderd worden." excerpt_image: "afbeelding" queue: @@ -246,6 +247,7 @@ nl: no_info_other: "
%{name} heeft nog niks in zijn of haar Over Mij-profielveld ingevuld
" vip_category_name: "Lounge" vip_category_description: "Een categorie exclusief voor leden met trust level 3 en hoger." + meta_category_name: "Over Deze Site" meta_category_description: "Discussies over deze site, de organisatie, hoe het werkt en hoe het verbeterd kan worden." staff_category_name: "Staf" staff_category_description: "Privécategorie voor stafgesprekken. Topics zijn alleen zichtbaar voor admins en moderatoren." @@ -385,6 +387,7 @@ nl: one: "bijna 1 jaar geleden" other: "bijna %{count} jaren geleden" password_reset: + no_token: "Sorry, de link om je paswoord te veranderen is verlopen. Klik op 'Ik ben mijn paswoord vergeten' om een nieuwe link te krijgen." choose_new: "Kies een nieuw wachtwoord" choose: "Kies een wachtwoord" update: 'Wijzig wachtwoord' @@ -464,8 +467,9 @@ nl: user_must_edit: '

Je bericht heeft het maximaal aantal moderatie-meldingen gekregen en is daarom tijdelijk onzichtbaar.

' archetypes: regular: - title: "Standaard topic" + title: "Standaard Topic" banner: + title: "Banner Topic" message: make: "Dit topic is nu een banner. Het zal bovenaan elke pagina verschijnen totdat het is weggeklikt door de gebruiker." remove: "Dit topic is geen banner meer. Het zal niet meer bovenaan elke pagina verschijnen." @@ -564,15 +568,23 @@ nl: page_view_logged_in_reqs: title: "Ingelogd" xaxis: "Dag" - yaxis: "Ingelogde API Aanvragen" + yaxis: "API Aanvragen Ingelogd" page_view_crawler_reqs: title: "Web Crawlers" xaxis: "Dag" - yaxis: "Web Crawler API Aanvragen" + yaxis: "API Aanvragen Web Crawler" page_view_total_reqs: title: "Totaal" xaxis: "Dag" yaxis: "Totaal API Aanvragen" + page_view_logged_in_mobile_reqs: + title: "API Aanvragen Ingelogd" + xaxis: "Dag" + yaxis: "API Aanvragen Mobiel Ingelogd" + page_view_anon_mobile_reqs: + title: "Anonieme API Aanvragen" + xaxis: "Dag" + yaxis: "Anonieme AIP Aanvragen Mobiel" http_background_reqs: title: "Achtergrond" xaxis: "Dag" @@ -597,6 +609,18 @@ nl: title: "Totaal" xaxis: "Dag" yaxis: "Totaal aanvragen" + time_to_first_response: + title: "Tijd tot eerste reactie" + xaxis: "Dag" + yaxis: "Gemiddelde tijd (uur)" + topics_with_no_response: + title: "Topics zonder reactie" + xaxis: "Dag" + yaxis: "Totaal" + mobile_visits: + title: "Gebruiker bezoeken" + xaxis: "Dag" + yaxis: "Aantal bezoeken" dashboard: rails_env_warning: "Je server draait in %{env} modus." ruby_version_warning: "Je gebruikt een versie van Ruby 2.0.0 met problemen. Upgrade naar patch level 247 of later." @@ -664,6 +688,7 @@ nl: max_topic_title_length: "Maximum lengte van een topictitel" min_private_message_title_length: "Minimale toegestane titel lengte in tekens voor berichten" min_search_term_length: "Minimum lengte van een zoekterm in tekens" + allow_uncategorized_topics: "Topics zonder categorie toestaan. WAARSCHUWING: Alle topics moet weer aan een categorie zijn toegekend voor dit wordt uitgezet." uncategorized_description: "De omschrijving voor de ongecategoriseerde categorie. Laat blanco voor geen omschrijving." allow_duplicate_topic_titles: "Sta topics met dezelfde titels toe" unique_posts_mins: "Hoeveel minuten iemand moet wachten voordat deze een bericht met dezelfde inhoud mag plaatsen" @@ -686,7 +711,9 @@ nl: category_featured_topics: "Aantal topics dat wordt weergegeven in de categorielijst. An het wijzigen van dit getal kan het tot 15 minuten duren voordat de lijst is bijgewerkt." show_subcategory_list: "Laat subcategorielijst zien in plaats van de topiclijst bij het openen van een categorie." fixed_category_positions: "Indien aangevinkt kun je categorieën in een vaste volgorde arrangeren. Indien uitgevinkt zullen de categorieeen gesorteerd worden op activiteit." + fixed_category_positions_on_create: "Indien aangevinkt wordt de categorie volgorde aangehouden in het menu voor nieuwe topics (vaste-categorie-posities vereist)." add_rel_nofollow_to_user_content: "Voeg 'rel nofollow' toe aan alle ingediende gebruikers-content, behalve voor interne links (inclusief parent domeinen). Als je dit verandert moet je ook alle berichten rebaken met: \"rake posts:rebake\"" + exclude_rel_nofollow_domains: "Een lijst van domeinen waar ´nofollow´ niet aan de links moet worden toegevoegd. (voorbeelddomein.com staat automatisch sub.voorbeelddomein toe). Voeg minimaal het 'top-level' domein van deze site toe om web crawlers alle content te laten vinden. Als delen van deze site zich op andere domeinen bevinden, voeg deze eveneens toe." post_excerpt_maxlength: "Maximale lengte van een uittreksel / samenvatting van een bericht." post_onebox_maxlength: "Maximale lengte van een 'oneboxed Discourse' bericht in tekens." onebox_domains_whitelist: "Een lijst met domeinen waarvoor oneboxing is toegestaan; deze domeinen moeten OpenGraph of oEmbed ondersteunen. Dit kun je testen op http://iframely.com/debug" @@ -700,9 +727,16 @@ nl: email_custom_headers: "Een lijst van custom email headers, gescheiden door een pipe (|)" email_subject: "Wijzigbaar onderwerp formaat voor standaard emails. Bekijk https://meta.discourse.org/t/customize-subject-format-for-standard-emails/20801 voor meer informatie" use_https: "Gebruik http of https voor de volledige url van de site (Discourse.base_url)? GEBRUIK DIT NIET ALS HTTPS NOG NIET OPGEZET IS!" + summary_score_threshold: "De minimum score voor een bericht om opgenomen te worden in 'Samenvatting Topic' " + summary_posts_required: "Minimum aantal berichten in een topic voor weergave ´Samenvatting Topic´" + summary_likes_required: "Minimum aantal Likes in een topic voor weergave ´Samenvatting Topic´" + summary_percent_filter: "Als iemand op 'Samenvatting Topic' klikt, laat dan de top % van de berichten zien" + summary_max_results: "Maximaal aantal berichten in weergave ´Samenvatting Topic´" enable_private_messages: "Sta toe dat trust level 1 gebruikers berichten kunnen maken en kunnen antwoorden op berichten" enable_long_polling: "De 'message bus' die gebruikt wordt voor notificaties kan 'long polling' gebruiken." + long_polling_base_url: "Basis URL voor ´long polling´ (indien via een CDN dynamische content wordt toegepast, kies hier dan 'origin pull´) b.v. http://originele.website.com" long_polling_interval: "De hoeveelheid tijd die de server zou moeten wachten voordat het clients beantwoord als er geen data te verzenden is (alleen voor ingelogde gebruikers)" + polling_interval: "Als ´long polling´ niet wordt toegepast, hoe vaak moet een ingelogde client een 'poll' uitvoeren in milliseconden" anon_polling_interval: "Hoe vaak een anonieme client een 'poll' moet uitvoeren in milliseconden" background_polling_interval: "Hoe vaak zouden de clients moeten pollen in milliseconden (als het venster in de achtergrond staat)" auto_track_topics_after: "Hoeveel milliseconden het moet duren voordat een topic automatisch bijgehouden wordt (0 voor altijd, -1 voor nooit)" @@ -719,6 +753,7 @@ nl: notify_mods_when_user_blocked: "Als een gebruiker automatisch geblokkeerd is, stuur dan een bericht naar alle moderatoren." flag_sockpuppets: "Als een nieuwe gebruiker antwoord op een topic vanaf hetzelfde ip-adres als de nieuwe gebruiker die het topic opende, markeer dan beide berichten als potentiële spam." traditional_markdown_linebreaks: "Gebruik traditionele regeleinden in Markdown, welke 2 spaties aan het einde van een regel nodig heeft voor een regeleinde." + allow_html_tables: "Witte lijst toestaan voor tabellen die zijn ingevoerd met Markdown HTML tags, TABLE, THEAD, TD, TR, TH (vereist opnieuw opbouwen van alle oude berichten met tabellen)" post_undo_action_window_mins: "Het aantal minuten waarin gebruikers hun recente acties op een bericht nog terug kunnen draaien (liken, markeren, etc)." must_approve_users: "Stafleden moeten alle nieuwe gebruikersaccounts goedkeuren voordat ze de site mogen bezoeken. OPGELET: als dit wordt aangezet voor een actieve site wordt alle toegang voor bestaande niet stafleden ingetrokken." ga_tracking_code: "Google analytics (ga.js) trackingcode, bijv. UA-12345678-9; zie: http://google.com/analytics" @@ -728,6 +763,7 @@ nl: enable_escaped_fragments: "Val terug naar Google's Ajax-Crawling API als er geen webcrawler is gedetecteerd. Bekijk https://support.google.com/webmasters/answer/174992?hl=en voor meer info." enable_noscript_support: "Ondersteun <noscript> tag" allow_moderators_to_create_categories: "Moderators mogen nieuwe categorieën maken" + cors_origins: "Toegestane domeinen voor ´cross-origin requests´ (CORS). Elk domein moet http:// of https:// bevatten. De DISCOURSE_ENABLE_CORS omgevingsvariabele moet staan ingesteld op ´WAAR´ om CORS te kunnen gebruiken." top_menu: "Bepaal de volgorde en selectie van items in het hoofdmenu. Bijvoorbeeld latest|new|unread|categories|top|read|posted|bookmarks" post_menu: "De volgorde en selectie van items in het berichtmenu. Bijvoorbeeld like|edit|flag|delete|share|bookmark|reply" post_menu_hidden_items: "De menu-items die standaard verborgen moeten worden in het post menu totdat er op de uitbreidings-ellips is geklikt." @@ -741,14 +777,40 @@ nl: max_reply_history: "Maximaal aantal uit te klappen antwoorden als een 'in antwoord op' uitgeklapt wordt." experimental_reply_expansion: "Verberg tussenliggende antwoorden als een antwoord uitgeklapt wordt (experimenteel)" topics_per_period_in_top_summary: "Aantal topics in het top-topics overzicht" + topics_per_period_in_top_page: "Aantal topics in het uitgeklapte ´Meer...´ top-topics overzicht" redirect_users_to_top_page: "Stuur nieuwe en lang-niet-geziene gebruikers door naar de top-pagina" + show_email_on_profile: "Laat e-mail van gebruikers zien in hun profiel (alleen zichtbaar voor henzelf en staf)" + email_token_valid_hours: "Wachtwoord vergeten / activeer account tokens zijn (n) uur geldig." + email_token_grace_period_hours: "Wachtwoord vergeten / activeer account tokens zijn nog geldig gedurende een respijtperiode van (n) uur na het benutten." enable_badges: "Activeer het badgesysteem" allow_index_in_robots_txt: "Specificeer in robots.txt dat de site geïndexeerd mag worden door zoekmachines." + email_domains_blacklist: "Een lijst van e-maildomeinen gescheiden door een vertikaal streepje (pipe), die niet worden toegestaan. Voorbeeld: mailingen.com|trashmail.net" + email_domains_whitelist: "Een lijst van e-maildomeinen gescheiden door een vertikaal streepje (pipe), die zijn voorgeschreven om te worden toegelaten. WAARSCHUWING: Gebruikers met andere e-maildomeinen dan opgenomen in de lijst worden NIET toegelaten." + forgot_password_strict: "Gebruikers niet informeren dat een account bestaat tijdens het gebruik van het wachtwoord vergeten menu. " + log_out_strict: "Sluit bij het uitloggen ALLE sessies voor de gebruiker op alle apparaten." + version_checks: "Ping de Discourse-Hub voor updates en laat meldingen van nieuwe versies zien op het dashboard van de beheerder." + new_version_emails: "Stuur een email naar het contact_email adres wanneer een nieuwe versie van Discourse beschikbaar is." port: "DEVELOPER ONLY! WARNING! Mocht je een specifieke poort willen toewijzen aan de URL. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing." force_hostname: "DEVELOPER ONLY! WARNING! Mocht je een specifieke hostname willen toewijzen. Handig in ontwikkelaars-modus. Laat leeg voor geen toewijzing." invite_expiry_days: "Hoe lang uitnodigingscodes geldig blijven (in dagen)." + invite_passthrough_hours: "Hoe lang een gebruiker een eerder verkregen uitnodigingssleutel kan gebruiken om in te loggen, in uren gespecificeerd" + invite_only: "Openbare registratie is uitgeschakeld, alle nieuwe gebruikers moeten expliciet worden uitgenodigd door andere leden of personeel." + login_required: "Authenticatie vereist om inhoud te lezen op deze site, verbied anonieme toegang." + min_username_length: "Minimale lengte gebruikersnaam in karakters. WAARSCHUWING: BESTAANDE GEBRUIKERS MET GEBRUIKERSNAMEN KORTER DAN DIT ZULLEN GEEN TOEGANG MEER HEBBEN TOT DE SITE." + max_username_length: "Maximale lengte gebruikersnaam in karakters. WAARSCHUWING: BESTAANDE GEBRUIKERS MET GEBRUIKERSNAMEN LANGER DAN DIT ZULLEN GEEN TOEGANG MEER HEBBEN TOT DE SITE." + reserved_usernames: "Gebruikersnamen waarvoor registratie niet is toegestaan." min_password_length: "Minimum lengte wachtwoord." + block_common_passwords: "Accepteer geen wachtwoorden die voorkomen in de 10.000 meest voorkomende wachtwoorden." + enable_sso: "Schakel single sign on in via een externe site (WAARSCHUWING: E-MAILADRESSEN VAN GEBRUIKERS '* MOETEN * DOOR DE EXTERNE SITE WORDEN GEVALIDEERD)" + enable_sso_provider: "Pas Discourse SSO provider protocol toe op het /session/sso_provider eindpunt, vereist dat sso_secret is ingesteld" sso_url: "URL van single sign on eindpunt" + sso_secret: "Geheime tekenreeks voor het cryptografisch valideren van SSO informatie, zorg er voor dat het 10 tekens of langer is" + sso_overrides_email: "Overschrijft bij elke aanmelding lokaal opgegeven mailadres door mailadres uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door normalisatie van lokale mailadressen)" + sso_overrides_username: "Overschrijft bij elke aanmelding lokaal opgegeven gebruikersnaam door gebruikersnaam uit SSO payload van externe site, en voorkomt lokaal wijzigen. (WAARSCHUWING: er kunnen discrepanties ontstaan door verschillen in gebruikersnaam lengte/vereisten)" + sso_overrides_name: "Overschrijft bij elke aanmelding lokaal opgegeven volledige naam door volledige naam uit SSO payload van externe site, en voorkomt lokaal wijzigen" + sso_overrides_avatar: "Overschrijft gebruikers avatar door avatar uit SSO payload van externe site, uitschakelen van allow_uploaded_avatars is sterk aanbevolen." + sso_not_approved_url: "Stuur niet geaccepteerde SSO accounts door naar deze URL" + allow_new_registrations: "Nieuwe gebruikers registreren toestaan. Uitschakelen om te voorkomen dat iedereen een nieuw account kan maken." enable_yahoo_logins: "Zet inloggen met Yahoo! aan" google_oauth2_client_id: "Client ID van je Google applicatie." google_oauth2_client_secret: "Client secret van je Google applicatie." @@ -862,8 +924,12 @@ nl: incorrect_username_email_or_password: "Incorrecte gebruikersnaam, e-mailadres of wachtwoord" wait_approval: "Bedankt voor je inschrijving. We zullen je laten weten als je account is goedgekeurd." active: "Je account is actief en klaar voor gebruik!" + activate_email: "

Je bent er bijna! We hebben een activatiemail verstuurd naar %{email}. Volg de instructies in de mail om je account te activeren.

Als de mail niet aankomt, check je spam folder, of probeer opnieuw aan te melden om een nieuwe activatiemail te versturen.

" not_activated: "Je kan nog niet inloggen. We hebben je een activatiemail gestuurd. Volg de instructies in de mail om je account te activeren." + not_allowed_from_ip_address: "Je kan niet inloggen als %{username} vanaf dat IP-adres." + admin_not_allowed_from_ip_address: "Je kan niet inloggen als admin vanaf dat IP-adres." suspended: "Je kan tot %{date} niet inloggen." + suspended_with_reason: "Account geschorst tot %{date}: %{reason}" errors: "%{errors}" not_available: "Niet beschikbaar. Probeer %{suggestion}?" something_already_taken: "Er ging iets mis, misschien zijn de gebruikersnaam en/of e-mailadres al in gebruik? Gebruik dan de 'wachtwoord vergeten' link" @@ -1084,7 +1150,6 @@ nl: signup_after_approval: subject_template: "Je inschrijving op %{site_name} is geaccepteerd!" signup: - subject_template: "[%{site_name}] Activeer je nieuwe account" text_body_template: | Welkom op %{site_name}! @@ -1116,8 +1181,6 @@ nl: too_large: "Sorry, het bestand dat je wil uploaden is te groot (maximum grootte is %{max_size_kb}%KB)." images: too_large: "De afbeelding die je wil uploaden is te groot (maximum grootte is %{max_size_kb}%KB). Verklein de afbeelding en probeer het opnieuw." - fetch_failure: "Er ging iets mis bij het opvragen van de afbeelding." - unknown_image_type: "Het bestand dat je wil uploaden is geen afbeelding." size_not_found: "Het is niet gelukt de afmetingen van de afbeelding te bepalen. Misschien is het bestand corrupt?" flag_reason: sockpuppet: "Een nieuwe gebruiker maakte een nieuwe topic en een andere gebruiker reageerde - vanaf hetzelfde IP-adres. Zie de flag_sockpuppets instelling." diff --git a/config/locales/server.pl_PL.yml b/config/locales/server.pl_PL.yml index f302c2fb56..6d5aaf4a2f 100644 --- a/config/locales/server.pl_PL.yml +++ b/config/locales/server.pl_PL.yml @@ -583,6 +583,10 @@ pl_PL: title: "Łącznie" xaxis: "Dzień" yaxis: "Razem żądań API" + page_view_logged_in_mobile_reqs: + xaxis: "Dzień" + page_view_anon_mobile_reqs: + xaxis: "Dzień" http_background_reqs: title: "Tło" xaxis: "Dzień" @@ -615,6 +619,10 @@ pl_PL: title: "Tematy bez odpowiedzi" xaxis: "Dzień" yaxis: "Łącznie" + mobile_visits: + title: "Wizyty użytkowników" + xaxis: "Dzień" + yaxis: "Liczba wizyt" 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. " @@ -738,6 +746,7 @@ pl_PL: track_external_right_clicks: "Śledź zewnętrzne linki kliknięte prawym klawiszem (np. otwierane w nowej zakładce). Domyślnie wyłączone, gdyż wymaga nadpisywania URLi." topics_per_period_in_top_summary: "Liczba tematów wyświetlanych w domyślnym podsumowaniu najbardziej popularnych wątków" topics_per_period_in_top_page: "Liczba tematów wyświetlanych w widoku 'Pokaż więcej' na ekranie popularnych wątków." + email_token_valid_hours: "Tokeny resetujące hasło / aktywujące konto są ważne przez (n) godzin." enable_badges: "Włącz system odznak" 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." @@ -772,7 +781,14 @@ pl_PL: max_invites_per_day: "Maksymalna liczba zaproszeń jakie użytkownik może wysłać jednego dnia." suggested_topics: "Liczba sugerowanych tematów widocznych na końcu aktualnego tematu." limit_suggested_to_category: "Sugeruj tematy jedynie z tej samej kategorii." + avatar_sizes: "Lista automatycznie wygenerowanych rozmiarów awatarów." default_invitee_trust_level: "Domyślny poziom zaufania (0-4) dla zaproszonych użytkowników." + tl1_requires_topics_entered: "Jak wiele tematów musi odwiedzić nowy użytkownik, przed promocją na 1-szy poziom zaufania." + tl1_requires_read_posts: "Jak wiele postów musi przeczytać nowy użytkownik, przed promocją na 1-szy poziom zaufania." + tl1_requires_time_spent_mins: "Jak wiele minut musi spędzić nowy użytkownik czytając posty, przed promocją 1-szy poziom zaufania." + tl2_requires_topics_entered: "Jak wiele tematów musi odwiedzić użytkownik, przed promocją na 2-gi poziom zaufania." + tl2_requires_read_posts: "Jak wiele postów musi przeczytać użytkownik, przed promocją na 2-gi poziom zaufania." + tl2_requires_time_spent_mins: "Jak wiele minut musi spędzić użytkownik czytając posty, przed promocją na 2-gi poziom zaufania." min_trust_to_create_topic: "The minimum trust level required to create a new topic." newuser_max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla nowych użytkowników)." max_mentions_per_post: "Maksymalna liczba powiadomień poprzez @nazwę w jednym wpisie (dla wszystkich)." @@ -1117,7 +1133,6 @@ pl_PL: signup_after_approval: subject_template: "Zostałeś zaakceptowany na forum %{site_name}!" signup: - subject_template: "[%{site_name}] Aktywuj Twoje nowe konto" text_body_template: | Witaj na %{site_name}! @@ -1140,8 +1155,6 @@ pl_PL: unauthorized: "Sorry, the file you are trying to upload is not authorized (authorized extensions: %{authorized_extensions})." pasted_image_filename: "Pasted image" images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." diff --git a/config/locales/server.pt.yml b/config/locales/server.pt.yml index b9986f4833..b129986f77 100644 --- a/config/locales/server.pt.yml +++ b/config/locales/server.pt.yml @@ -242,6 +242,7 @@ pt: no_info_other: "
%{name} ainda não colocou nada no campo Sobre Mim
" vip_category_name: "Salão" vip_category_description: "Uma categoria exclusiva para membros de Nível de Confiança 3 ou superior." + meta_category_name: "Comentários sobre o Sítio" meta_category_description: "Discussão sobre este sítio, a sua organização, como funciona, e como podemos melhorá-lo." staff_category_name: "Pessoal" staff_category_description: "Categoria privada para discussões do pessoal. Os tópicos estão apenas visíveis para administradores e moderadores." @@ -575,6 +576,7 @@ pt: page_view_logged_in_mobile_reqs: title: "Pedidos API de Início de Sessão" xaxis: "Dia" + yaxis: "Pedidos API Mobile de Início de Sessão" page_view_anon_mobile_reqs: title: "Pedidos API Anon" xaxis: "Dia" @@ -747,6 +749,7 @@ pt: notify_mods_when_user_blocked: "Se um utilizador for bloqueado de forma automática, enviar uma mensagem a todos os moderadores." flag_sockpuppets: "Se um novo utilizador responde a um tópico a partir do mesmo endereço IP do novo utilizador que iniciou o tópico, sinalizar ambas as mensagens como potencial spam." traditional_markdown_linebreaks: "Utilize tradicionais quebras de linha no Markdown, que requer dois espaços no final para uma quebra de linha." + allow_html_tables: "Permitir que sejam inseridas tabelas no Markdown utilizando tags HTML. TABLE, THEAD, TD,TR,TH fazem parte da lista branca (requer que todas as mensagens antigas que contém tabelas sejam refeitas)" post_undo_action_window_mins: "Número de minutos durante o qual os utilizadores têm permissão para desfazer ações numa mensagem (gostos, sinalizações, etc)." must_approve_users: "O pessoal deve aprovar todas as novas contas de utilizador antes destas terem permissão para aceder ao sítio. AVISO: ativar isto para um sítio ativo irá revogar o acesso aos utilizadores existentes que não fazem parte do pessoal!" ga_tracking_code: "Código de acompanhamento do Google Analytics (ga.js), ex: UA-12345678-9; ver http://google.com/analytics" @@ -798,7 +801,10 @@ pt: enable_sso_provider: "Implementar o protocolo do provedor SSO do Discourse no caminho /session/sso_provider, requer que sso_secret seja configurado" sso_url: "URL da inscrição única" sso_secret: "String secreta usada para autenticar criptograficamente informação SSO, garanta que tem 10 ou mais caracteres" - sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars" + sso_overrides_email: "Substitui o email local por um email de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido à normalização de emails locais) " + sso_overrides_username: "Substitui nomes de utilizadores locais por nomes de utilizadores de sítios externos a partir de um SSO em cada início de sessão, e previne mudanças locais. (AVISO: podem ocorrer discrepâncias devido a diferenças no comprimento/requisitos do nome de utilizador)" + sso_overrides_name: "Substitui o nome completo local por um nome completo de um sítio externo a partir de um SSO em cada início de sessão, e previne mudanças locais." + sso_overrides_avatar: "Substitui o avatar do utilizador com avatares externos a partir de um SSO. Se ativo, é altamente recomendada a desativação de allow_uploaded_avatars" sso_not_approved_url: "Redirecionar contas SSO não aprovadas para este URL" enable_local_logins: "Ativar contas com nome de utilizador e senha de forma local (Nota: isto tem que estar ativo para que os convites funcionem)" allow_new_registrations: "Permitir registo de novos utilizadores. Desmarcar isto para prevenir que alguém crie uma nova conta." @@ -973,6 +979,7 @@ pt: 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." + permalink_normalizations: "Utilize a seguinte expressão regular antes de combinar hiperligações permanentes, por exemplo: /(\\/topic.*)\\?.*/\\1 irá retirar sequências de consulta de rotas de tópicos. O formato é regex+sequência utilize \\1 etc. para aceder a capturas." 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." @@ -1063,6 +1070,7 @@ pt: other: "Eu movi %{count} mensagens para um tópico existente: %{topic_link}" change_owner: post_revision_text: "Direito de posse transferido de %{old_user} para %{new_user}" + deleted_user: "um utilizador eliminado" emoji: errors: name_already_exists: "Pedimos desculpa, o nome '%{name}' já está a ser usado por outro emoji." @@ -1116,6 +1124,7 @@ pt: omniauth_error_unknown: "Algo ocorreu ao processar o seu início de sessão, por favor tente novamente." new_registrations_disabled: "Neste momento não é permitido novo registo de contas." password_too_long: "As palavras-passe estão limitadas a 200 caracteres." + email_too_long: "O email fornecido é demasiado longo. Nomes de caixas de email não devem ter mais que 254 caracteres, e nomes de domínio não devem ter mais que 253 caracteres." reserved_username: "Esse nome de utilizador não é permitido." missing_user_field: "Não completou todos os campos de utilizador." close_window: "A autenticação está completa. Feche esta janela para continuar." @@ -1177,8 +1186,8 @@ pt: Se não se lembra da sua palavra-passe, ou ainda não tem uma, escolha "Esqueci a minha palavra-passe" quando iniciar sessão com o seu endereço de email. test_mailer: subject_template: "[%{site_name}] Teste de entrega de email" - text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve\ - \ o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n[7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" + text_body_template: "Este é um email de teste de\n\n[**%{base_url}**][0]\n\nA entrega do email é complicada. Aqui estão alguns pontos importantes a verificar primeiro:\n\n - *Certifique-se* que configurou o `email de notificação` de: endereço correto nas configurações do seu sítio. **O domínio especificado no endereço “de” nos emails que envia é o domínio que será validado**. \n\n- Conhecer como observar o código fonte dos emails no seu email cliente, de modo a que possa examinar cabeçalhos de email à procura de pistas importantes. No Gmail, é a opção “mostrar original” no menu drop down no canto superior direito de cada email.\n\n- **IMPORTANTE:** O seu ISP tem um registo de DNS inverso inserido para associar os nomes de domínio aos endereços IP de onde envia o seu email? [Teste o seu registo de PTR Inverso][2] aqui. Se o seu ISP não inserir o DNS inverso apropriado, é muito improvável que qualquer um dos seus emails seja entregue.\n\n- Estará o seu domínio [registo SPF][8] correto? [Teste o seu registo SPF][1] aqui. Note que TXT é o tipo de registo oficial para SPF. \n\n- Estará o seu domínio [registo DKIM][3] correto? Isto irá melhorar significativamente a entrega de emails. [Teste o seu registo DKIM][7] aqui.\n\n- Se correr o seu próprio servidor de email, certifique-se que os IPs do seu servidor de email não [estão em nenhuma lista negra de email] [4]. Verifique também que é enviado um nome de servidor qualificado que resolve o DNS na sua mensagem HELO. Se não for, isto irá fazer com que o seu email seja rejeitado por muitos serviços de email.\n\n(A maneira *fácil* é criar uma conta gratuita em [Mandrill][md] ou [Mailgun][mg] ou [Mailjet][mj], que tem vários planos de email gratuitos e será bom para pequenas comunidades. Irá precisar na mesma de configurar os registos SPF e o DKIM no seu DNS!) \n\nEsperamos que tenha recebido este teste de entrega de email sem problemas! \n\nBoa sorte, \n\nOs seus amigos em [Discourse](http://www.discourse.org)\n\n[0]: %{base_url}\n[1]: http://www.kitterman.com/spf/validate.html\n[2]: http://mxtoolbox.com/ReverseLookup.aspx\n[3]: http://www.dkim.org/\n[4]: http://whatismyipaddress.com/blacklist-check\n\ + [7]: http://dkimcore.org/tools/dkimrecordcheck.html\n[8]: http://www.openspf.org/SPF_Record_Syntax\n[md]: http://mandrill.com\n[mg]: http://www.mailgun.com/\n[mj]: https://www.mailjet.com/pricing\n" new_version_mailer: subject_template: "[%{site_name}] Nova versão Discourse, atualização disponível" text_body_template: "Uma nova versão de [Discourse](http://www.discourse.org) está disponível. \n\nA sua versão: %{installed_version}\nNova versão: **%{new_version}**\n\nPode desejar: \n\n- Ver o que há de novo em [GitHub changelog](https://github.com/discourse/discourse/commits/master).\n\n- Atualizar a partir do seu navegador em [%{base_url}/admin/upgrade](%{base_url}/admin/upgrade).\n\n- Visitar [meta.discourse.org](http://meta.discourse.org) para notícias, debates, e suporte para o Discourse.\n" @@ -1219,6 +1228,10 @@ pt: 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 chegando, 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\nPara utilizar [Emoji padrão](http://www.emoji.codes/), simplesmente digite `:` para encontrar por nome, ou os tradicionais risonhos `;)` \n\n\n\nPara gerar um sumário para uma hiperligação, cole-o numa linha por si só:\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\n\n Nã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\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 configurar\ + \ 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 aqui, 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: | @@ -1602,7 +1615,7 @@ pt: (Se precisar de comunicar com [membros do pessoal](%{base_url}/sobre) como um novo utilizador, apenas responda a esta mensagem.) signup: - subject_template: "[%{site_name}] Ativar a sua nova conta" + subject_template: "[%{site_name}] Confirme a sua nova conta" text_body_template: | BeM-vindo ao %{site_name}! @@ -1634,8 +1647,6 @@ pt: too_large: "Pedimos desculpa, o ficheiro que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB)." images: too_large: "Pedimos desculpa, a imagem que está a tentar carregar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor redimensione-a e tente novamente." - fetch_failure: "Pedimos desculpa, ocorreu um erro ao transferir a imagem." - unknown_image_type: "Pedimos desculpa, mas o ficheiro que tentou carregar não parece ser uma imagem." size_not_found: "Pedimos desculpa, mas não conseguimos determinar o tamanho da imagem. É possível que seu ficheiro de imagem esteja corrompido?" flag_reason: sockpuppet: "Um novo utilizador criou um tópico, no qual um outro novo utilizador com o mesmo IP respondeu. Veja as configurações de flag_sockpuppets" @@ -1668,26 +1679,20 @@ pt: Edite a primeira mensagem neste tópico para alterar os conteúdos da página %{page_name}. guidelines_topic: title: "FAQ/Diretrizes" - body: "\n\n## [Isto é um Local Civilizado para Discussão](#civilizado)\n\nPor favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações.\n\nEstas não são regras rígidas e rápidas, meramente para ajuda do julgamento humano da nossa comunidade. Utilize estas diretrizes para manter este local limpo e iluminado para discussões públicas civilizadas.\n\n\n\n## [Melhorar a discussão](#melhorar) \n\nAjude-nos a fazer deste um óptimo local para discussões ao trabalhar constantemente para melhorar de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde.\n\nOs tópicos discutidos aqui têm importância para nós, e queremos agir como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde do que está a ser dito.\n\nUma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você.\n\n\n\n## [Seja Agradável, Mesmo Que\ - \ Discorde](#agradável) \n\nPode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite:\n\n*Chamar Nomes. \n*Adicionar ataques pessoais. \n* Responder ao tom de uma mensagem e não ao seu conteúdo. \n*Contradições instintivas\n\nPelo contrário, forneça contra-argumentos que melhorem a conversação.\n\n\n\n## [A Sua Participação Conta](#participe)\n\nAs conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher comprometer-se nos debates que tornam este fórum um local interessante para se estar — e evite os que não o fazem.\n\nO Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, sinalizações, respostas, edições, e por aí adiante. Utilize estas ferramentas para melhorar a sua própria experiência e de todos os outros também.\n\nVamos tentar deixar o nosso parque melhor do que quando o encontrámos.\n\n\n\n## [Se vir um Problema, Sinalize-o](#sinalize-problemas)\n\nOs moderadores têm uma autoridade especial; estes são responsáveis por este fórum. Assim como você o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou polícias.\n\nQuando vir mau comportamento, não responda. O reconhecimento\ - \ encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas sinalize-o. Se houver sinalizações suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores.\n\nDe maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas mensagens em qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade.\n\n\n\n## [Seja sempre civilizado](#seja-civilizado)\n\nNada estraga mais uma conversação saudável do que insolências:\n\n *Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou de ódio. \n*Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito. \n*Respeite os outros. Não assedie ou magoe ninguém, não personifique pessoas, e não exponha as suas informações pessoais. \n*Respeite o fórum. Não publique spam ou qualquer outra coisa que vandalize o fórum.\n\nEstes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem certeza, pergunte-se a si próprio como se sentiria se a sua mensagem fosse capa no New York Times.\n\nEste é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, hiperligações\ - \ e imagens seguras para família e amigos.\n\n\n\n## [Mantenha-o Organizado](#manter-organizado)\n\nFaça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso:\n\n*Não comece um tópico na categoria errada. \n*Não cruze mensagens sobre o mesmo tema em múltiplos tópicos. \n*Não publique respostas sem conteúdo. \n*Não desvie um tópico ao mudar o seu centro de atenção. \n*Não assine as suas mensagens — qualquer mensagem tem a sua informação de perfil anexada à mesma.\n\nEm vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico.\n\n\n\n## [Publique Apenas As Suas Próprias Coisas](#roubo)\n\nNão pode publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, hiperligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei.\n\n\n\n## [Patrocinado Por Si](#poder)\n\nEste sítio é operado pelos seus [membros locais amigáveis](/sobre) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico em [categoria meta](/c/meta) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente\ - \ que pode ser tratado por um tópico meta ou por uma sinalização, contacte-nos através do [página do pessoal](/sobre).\n\n\n\n## [Termos de Serviço](#tds)\n\nSim, a legalidade é chata, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra companheiros inimigos. Temos os [Termos de Serviço](/tds) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço tem que concordar em cumprir os nossos [TDS](/tds).\n" + body: "\n\n## [Este é um Local Civilizado para Discussão Pública](#civilizado) \n\nPor favor trate este fórum de discussão com o mesmo respeito com que trataria um parque público. Nós somos também uma comunidade de partilha de recursos — um local para partilhar habilidades, conhecimento e interesses através de conversações. \n\nEstas não são regras rígidas e rápidas, meramente ajuda para o julgamento humano da nossa comunidade. Utilize estas diretrizes para manter este local limpo e iluminado para discussões públicas civilizadas. \n\n\n\n## [Melhorar a Discussão](#melhorar) \n\nAjude-nos a fazer deste um óptimo local para debates ao trabalhar constantemente para melhorar esses debates de alguma maneira, mesmo que pequena. Se não tem a certeza que a sua mensagem adiciona algo à conversação, pense novamente no que quer dizer e tente novamente mais tarde. \n\nOs tópicos discutidos aqui têm importância para nós, e queremos agir como se também fossem importantes para si. Seja respeitador dos tópicos e das pessoas que o debatem, mesmo que discorde do que está a ser dito. \n\nUma maneira de melhorar o debate é descobrindo os que já estão a ocorrer. Por favor perca algum tempo a pesquisar os tópicos existentes aqui antes de responder ou começar um novo, e terá melhores hipóteses de conhecer outros que partilhem os mesmos interesses que você. \n\n\n\n ## [Seja Agradável, Mesmo Que Discorde](#agradável) \n\nPode desejar responder a algo ao discordar do mesmo. Não há qualquer problema nisso. Mas lembre-se de _criticar ideias, não pessoas_. Por favor, evite: \n\n*Chamar Nomes. \n*Adicionar ataques pessoais. \n* Responder ao tom de uma mensagem e não ao seu conteúdo. \n*Contradições instintivas \n\nPelo contrário, forneça contra-argumentos que melhorem a conversação. \n\n\n\n## [A Sua Participação Conta](#participe) \n\nAs conversações que temos aqui definem o tom para toda a gente. Ajude-nos a influenciar o futuro desta comunidade ao escolher comprometer-se nos debates que tornam este fórum um local interessante\ + \ para se estar — e evite os que não o fazem. \n\nO Discourse fornece ferramentas que permitem que a comunidade identifique as melhores (e piores) contribuições: favoritos, marcadores, gostos, sinalizações, respostas, edições, e por aí em diante. Utilize estas ferramentas para melhorar a sua própria experiência e de todos os outros também.\n\nVamos tentar deixar o nosso parque melhor do que quando o encontrámos. \n\n\n\n ## [Se vir um Problema, Sinalize-o](#sinalize-problemas) \n\nOs moderadores têm uma autoridade especial; estes são responsáveis por este fórum. Assim como você o é. Com a sua ajuda, os moderadores podem ser facilitadores da comunidade, não apenas zeladores ou polícias. \n\nQuando vir mau comportamento, não responda. O reconhecimento encoraja o mau comportamento, consome a sua energia e gasta o tempo de todos. Apenas sinalize-o. Se houver sinalizações suficientes, ações irão ser tomadas, seja automaticamente ou por intervenção dos moderadores.\n\nDe maneira a manter a ordem da comunidade, os moderadores reservam-se ao direito de remover qualquer conteúdo e qualquer conta de utilizador por qualquer razão em qualquer altura. Os moderadores não prevêem novas mensagens em qualquer maneira; os moderadores e os operadores do sítio não têm qualquer responsabilidade por qualquer conteúdo publicado pela comunidade. \n\n\n\n## [Seja sempre civilizado](#seja-civilizado) \n\nNada estraga mais uma conversação saudável do que insolências: \n\n*Seja civilizado. Não publique nada que uma pessoa sensata consideraria ofensiva, abusiva ou de ódio. \n*Mantenha-o limpo. Não publique nada obsceno ou sexualmente explicito.\n*Respeite os outros. Não assedie ou magoe ninguém, não personifique pessoas, e não exponha as suas informações pessoais. \n*Respeite o fórum. Não publique spam ou qualquer outra coisa que vandalize o fórum. \n\nEstes não são termos concretos com definições precisas — evite até a _aparência_ de qualquer uma destas coisas. Se não tem certeza, pergunte-se a si próprio como se sentiria se a sua mensagem fosse capa do New York Times.\ + \ \n\nEste é um fórum público, e motores de pesquisa indexam estes debates. Mantenha a linguagem, hiperligações e imagens seguras para família e amigos. \n\n\n\n## [Mantenha-o Organizado](#manter-organizado) \n\nFaça o esforço para colocar as coisas no local certo, para que possamos passar mais tempo a debater e menos a limpar. Por isso: \n\n*Não comece um tópico na categoria errada. \n*Não cruze mensagens sobre o mesmo tema em múltiplos tópicos. \n*Não publique respostas sem conteúdo. \n*Não desvie um tópico ao mudar o seu centro de atenção. \n*Não assine as suas mensagens — qualquer mensagem tem a sua informação de perfil anexada à mesma. \n\nEm vez de publicar “+1” ou “Concordo”, utilize o botão Gosto. Em vez de levar um tópico existente para uma direção completamente diferente, utilize Responder como Novo Tópico. \n\n\n \n## [Publique Apenas As Suas Próprias Coisas](#roubo) \n\nNão pode publicar nada digital que pertença a qualquer outra pessoa, sem a sua permissão. Não pode publicar descrições de, hiperligações a, ou métodos para roubar propriedade intelectual de outras pessoas (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei. \n\n\n## [Patrocinado Por Si](#poder) \n\nEste sítio é operado pelos seus [membros locais amigáveis](/sobre) e por *si*, a comunidade. Se tem alguma questão adicional sobre como as coisas funcionam por aqui, abra um novo tópico em [site feedbackcategory](/c/site-feedback) e iremos debatê-lo. Se ocorrer algum assunto crítico ou urgente que pode ser tratado por um tópico meta ou por uma sinalização, contacte-nos através do [página do pessoal](/sobre). \n\n \n\n## [Termos de Serviço](#tds) \n\nSim, a legalidade é chata, mas temos que nos proteger – e por extensão, protegê-lo a si e aos seus dados – contra companheiros inimigos. Temos os [Termos de Serviço](/tds) que descrevem o seu (e o nosso) comportamento e direitos relativamente a conteúdo, privacidade e leis. Para usar este serviço tem que concordar em cumprir os nossos [TDS](/tds).\n" tos_topic: title: "Termos de Serviço" - body: "Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, %{company_domain} Software do Fórum, %{company_domain} Suporte do Fórum e serviço de alojamento %{company_domain} (\"Alojamento\"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} (\"%{company_name}\"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, %{company_domain}’s [Política de Privacidade](/privacy) e [Diretrizes da Comunidade](/faq)) e procedimentos que possam ser publicados de tempos em tempos neste Sítio por %{company_name} (coletivamente, the \"Acordo\").\n\nPor favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade.\n\n\n\n## [1. A Sua Conta %{company_domain} ](#1)\n\nSe criar uma conta\ - \ no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Terá que notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões.\n\n\n\n## [2.Responsabilidade dos Participantes](#2)\n\nSe publicar material no Sítio, publicar hiperligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceira parte o faça) material no Sítio (qualquer material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computadores. Ao tornar o Conteúdo disponível, está a representar e garantir que:\n\n* o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceira parte;\n* se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado\ - \ a qualquer software, ou (ii) ter garantido uma renúncia do seu empregado a todos os direitos no e para o Conteúdo;\n* está de acordo com licenças de qualquer terceira-parte relacionada com o Conteúdo, e fez todas as coisas necessárias para passar corretamente quaisquer termos requeridos aos utilizadores finais;\n* o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo destrutivo;\n* o Conteúdo não é spam, não é gerado por máquina, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing);\n* o Conteúdo não é pornográfico, nem contém ameaças ou incita violência, e não viola os direitos de privacidade ou publicidade de qualquer terceira parte;\n* o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas tais como hiperligações de spam ou grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados;\n* o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e \n* terá, no caso do Conteúdo incluir código de computador, categorizado e/ou descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido\ - \ pedido para fazê-lo por %{company_name} ou pelo contrário.\n\n\n\n## [3. Licença do Conteúdo do Utilizador](#3)\n\nAs contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou censurável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por alguma razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer uma compensação de quaisquer montantes previamente pagos.\n\n\n\n## [4. Pagamento e Renovação](#4)\n\n### Termos Gerais\n\nAtualizações ou serviços opcionais pagos podem estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como\ - \ indicado. Estas taxas não são reembolsáveis.\n\n### Renovação Automática\n\nA não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura.\n\n\n\n## [5. Serviços](#5)\n\n### Serviços de Alojamento, Suporte\n\nServiços opcionais de Alojamento e Suporte podem ser fornecidos por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições.\n\n\n\n## [6. Responsabilidade dos Visitantes do Sítio](#6)\n\n%{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. O Sítio pode ter conteúdo\ - \ ofensivo, indecente assim como também imprecisões técnicas, erros tipográficos entre outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiras partes, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não.\n\n%{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado.\n\n\n\n## [7. Conteúdo Publicado Noutros Sítios](#7)\n\nNão revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem hiperligações e que se hiperligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não--%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas\ - \ não-%{company_domain}.\n\n\n\n## [8. Violação de Direitos de Autor e Política DCMA](#8)\n\nAssim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com hiperligação para, por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}.\n%{company_name} irá responder por tais notícias, incluindo tal como requerido ou apropriado por remover o material ilícito ou desativando as hiperligações para o material ilícito.\n%{company_name} irá terminar o acesso a e o uso do Sítio se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator repetido dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer uma compensação de qualquer valor previamente pago a %{company_name}.\n\n\n\n## [9. Propriedade Intelectual](#9)\n\nEste Acordo não transfere totalmente de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiras partes, e todos os direitos, títulos\ - \ e interesse na e para a propriedade irá permanecer (entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados na hiperligação com o Sítio podem ser marcas de terceiras partes. O seu uso do Sítio não lhe concede direitos ou licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiras partes.\n\n\n\n## [10. Anúncios](#10)\n\n%{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços.\n\n\n\n## [11. Atribuição](#11)\n\n%{company_name} reserva-se ao direito de mostrar hiperligações de atribuição tais como ‘Patrocinado por %{company_domain},’ e atribuição de fontes ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas.\n\n\n\n## [12. Alterações](#12)\n\n%{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e\ - \ verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços devem ser sujeitos aos termos e condições deste Acordo.\n\n\n\n## [13. Terminação](#13)\n\n%{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade.\n\n\n\n## [14. Isenção de Garantias](#14)\n\nO Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem limitação, as garantias de comerciabilidade, adequadas a uma finalidade específica. Nem %{company_name} nem os seus fornecedores e licenciadores, fazem garantias de que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto.\ - \ Se está a ler isto, aqui está [uma ajuda] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição.\n\n\n\n## [15. Limitação da Responsabilidade](#15)\n\nEm nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, de incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade de qualquer falha ou atraso devido a matérias para além do seu razoável controlo. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável.\n\n\n\n## [16. Representações Gerais e Garantia](#16)\n\nRepresenta e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Diretrizes da Comunidade](/guidelines) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis\ - \ (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados de qualquer país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer terceira parte.\n\n\n\n## [17. Indemnização](#17)\n\nConcorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo.\n\n\n\n## [18. Diversos](#18)\n\nEste Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name}, de uma versão revista. Excepto o definido na lei, se houver, disposição em contrário, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo aos conflitos das disposições da lei, e a receita própria por qualquer disputa emergente de ou\ - \ relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. \n\nExceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de \"Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser forçada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos, em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado pelos seus termos e condições; %{company_name} pode assignar os seus direitos sob este Acordo sem condição.\ - \ O presente Acordo será vinculativo e reverterá em benefício das partes e dos seus sucessores.\n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013.\n\nOriginalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).\n" + body: "Os seguintes termos e condições governam todo o uso do sítio %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do sítio, incluindo mas não limitado a, %{company_domain} Software do Fórum, %{company_domain} Fóruns de Suporte e serviço de alojamento %{company_domain} (\"Alojamento\"), (em conjunto, o Sítio). O Sítio é propriedade e operado por %{company_full_name} (\"%{company_name}\"). O Sítio oferecido está sujeito à sua aprovação sem nenhuma modificação de todos os termos e condições contidos aqui e todas as outras regras de operação políticas (incluindo, sem limitação, %{company_domain}’s [Política de Privacidade](/privacy) e [Diretrizes da Comunidade](/faq)) e procedimentos que possam ser publicados de tempos em tempos neste Sítio por %{company_name} (coletivamente, the \"Acordo\"). \n\nPor favor leia este Acordo com cuidado antes de aceder ou usar o Sítio. Ao aceder ou usar qualquer parte do Sítio, concorda em estar limitado pelos termos e condições deste acordo. Se não concorda com todos os termos e condições deste acordo, então não deve aceder ao Sítio ou usar qualquer um dos serviços. Se estes termos e condições são considerados uma oferta de %{company_name}, a sua aceitação é expressamente limitada a estes termos. O Sítio está disponível apenas a indíviduos que têm pelo menos 13 anos de idade. \n\n \n\n## [1. A Sua Conta %{company_domain} ](#1) \n\nSe criar uma conta no Sítio, será responsável por manter a segurança da sua conta e será totalmente responsável por todas as atividades que ocorrerem sob a sua conta. Deve notificar imediatamente %{company_name} de qualquer uso não autorizado da sua conta ou qualquer outra falha de segurança. %{company_name} não será passível de quaisquer atos ou omissões da sua parte, incluindo danos de qualquer tipo que incorram como resultado de tais atos ou omissões. \n\n \n\n## [2.Responsabilidade dos Participantes](#2) \n\nSe publicar material no Sítio, publicar hiperligações no Sítio, ou de outra maneira disponibilizar (ou permitir que qualquer terceira parte o faça) material no Sítio (qualquer\ + \ material, “Conteúdo”), será inteiramente responsável pelo conteúdo de, e qualquer dano resultante de tal Conteúdo. Esse é o caso independentemente de o Conteúdo em questão constituir texto, gráficos, ficheiros áudio, ou programas de computadores. Ao tornar o Conteúdo disponível, está a representar e garantir que: \n\n* o descarregamento, cópia e uso do Conteúdo não irá infringir os direitos do proprietário, incluindo mas não limitado aos direitos de autor, patentes, marcas registadas ou direitos de segredos de troca, de qualquer terceira parte; \n* se o seu empregado tem direitos sob a propriedade intelectual que criou, terá que (i) ou ter recebido permissões do seu empregado para publicar ou tornar o Conteúdo disponível, incluindo mas não limitado a qualquer software, ou (ii) ter garantido uma renúncia do seu empregado a todos os direitos no e para o Conteúdo; \n* está de acordo com licenças de qualquer terceira-parte relacionada com o Conteúdo, e fez todas as coisas necessárias para passar corretamente quaisquer termos requeridos aos utilizadores finais; \n* o Conteúdo não contém ou instala quaisquer vírus, minhocas ou malware, cavalos de Tróia ou outro conteúdo destrutivo; \n* o Conteúdo não é spam, não é gerado por máquina, e não contém conteúdo indesejado sem ética ou comercial com intuito de conduzir o tráfico de sítios terceiros ou aumentar a posição de sítios terceiros em motores de pesquisa, ou ainda outros atos ilegais (tais como phishing) ou destinatários enganadores relativamente à origem do material (tais como spoofing); \n* o Conteúdo não é pornográfico, nem contém ameaças ou incita violência, e não viola os direitos de privacidade ou publicidade de qualquer terceira parte; \n* o conteúdo não está a ser anunciado através de quaisquer mensagens eletrónicas tais como hiperligações de spam ou grupos de notícias, listas de email, blogs e sítios, e similares métodos promocionais não solicitados; \n* o seu conteúdo não está nomeado de nenhuma maneira que leve os seus leitores a pensarem que é outra pessoa ou empresa; e \n* terá, no caso do Conteúdo incluir código de computador, categorizado e/ou\ + \ descrito o tipo, natureza, uso e efeito dos materiais, quer tenha sido pedido para fazê-lo por %{company_name} ou pelo contrário. \n\n \n\n## [3. Licença do Conteúdo do Utilizador](#3) \n\nAs contribuições dos utilizadores estão licenciadas sob a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem qualquer limitação de qualquer dessas representações ou garantias, %{company_name} tem o direito (embora não tenha a obrigação) de, em critério exclusivo de %{company_name} (i) recusar ou remover qualquer conteúdo que, na sensata opinião de %{company_name} viola qualquer política de %{company_name} ou é de alguma maneira prejudicial ou censurável, ou (ii) terminar ou negar acesso ao Sítio e ao uso do mesmo a qualquer indivíduo ou entidade por alguma razão, em critério exclusivo de %{company_name}. %{company_name} não terá obrigação de fornecer uma compensação de quaisquer montantes previamente pagos. \n\n \n\n## [4. Pagamento e Renovação](#4) \n\n### Termos Gerais \n\nAtualizações ou serviços opcionais pagos podem estar disponíveis no Sítio. Ao utilizar uma atualização ou serviço opcional pago, está a concordar em pagar a %{company_name} as taxas de subscrição mensais ou anuais indicadas. Os pagamentos serão cobrados numa base pré-paga no dia em que utilizar o serviço ou a atualização e irá cobrir o uso desse serviço ou atualização por um período de subscrição mensal ou anual tal como indicado. Estas taxas não são reembolsáveis. \n\n### Renovação Automática \n\nA não ser que notifique %{company_name} antes do final do período da subscrição que quer cancelar, a sua subscrição será automaticamente renovada e você autoriza-nos a colecionar as taxas anuais ou mensais (assim como outras taxas) usando qualquer cartão de crédito ou outro mecanismo de pagamento que tivermos no seu registo. As subscrições podem ser canceladas em qualquer altura. \n\n \n\n## [5. Serviços](#5) \n\n### Serviços de Alojamento, Suporte \n\nServiços opcionais de Alojamento e Suporte podem ser fornecidos\ + \ por %{company_name} sob os termos e condições para cada serviço. Ao inscrever-se numa conta com serviços de Alojamento ou Suporte, irá concordar e agir sob tais termos e condições. \n\n \n\n## [6. Responsabilidade dos Visitantes do Sítio](#6) \n\n%{company_name} não reviu, nem pode rever, todo o material, incluindo programas de computador, publicado no Sítio, e não pode portanto ser responsável pelo conteúdo do mesmo, pelo seu uso ou efeitos. Ao operar o Sítio, %{company_name} não representa ou implica que corrobora com o material publicado, ou que acredita que o material seja preciso, útil e não prejudicial. Será responsável por tomar as precauções necessárias para proteger-se a si próprio e o seu sistema computacional de vírus, minhocas, cavalos de Tróia e outros conteúdos destrutivos. O Sítio pode ter conteúdo ofensivo, indecente assim como também imprecisões técnicas, erros tipográficos entre outros erros. O Sítio pode também ter material que viola os direitos de privacidade e publicidade, ou que infringe a propriedade intelectual e outros direitos do proprietário, de terceiras partes, ou o descarregamento, cópia ou uso que é sujeito a termos e condições adicionais, estabelecidos ou não. %{company_name} está isenta de qualquer responsabilidade de qualquer dano resultante do uso por parte dos visitantes do Sítio, ou de qualquer descarregamento feito por esses visitantes do conteúdo lá publicado. \n\n \n\n## [7. Conteúdo Publicado Noutros Sítios](#7) \n\nNão revimos nem podemos rever todo o material, incluindo programas de computador, disponibilizado através de sítios e páginas em %{company_domain} no qual existem hiperligações e que se hiperligam a %{company_domain}. %{company_name} não tem qualquer controlo dos sítios e páginas não-%{company_domain}, e não é responsável pelo seu conteúdo ou o seu uso. Ao clicar num sítio ou página não--%{company_domain}, %{company_name} não representa ou implica que corrobora com tais sítios ou páginas. Você é responsável por tomar ações necessárias para proteger-se a si próprio ou o seu sistema computacional de vírus, minhocas,\ + \ cavalos de Tróia e outros conteúdos destrutivos. %{company_name} renuncia qualquer responsabilidade por qualquer dano resultante do uso de sítios e páginas não-%{company_domain}. \n\n \n\n## [8. Violação de Direitos de Autor e Política DCMA](#8) \n\nAssim como %{company_name} pede aos outros para respeitarem os direitos de propriedade intelectual, a mesma respeita os direitos de propriedade intelectual dos outros. Se acredita que material localizado em ou com hiperligação para, por %{company_domain} viola os seus direitos de autor, e se este sítio reside nos EUA, encorajamo-lo a notificar a %{company_name} em concordância com a Política (“DMCA”) [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) da %{company_name}. %{company_name} irá responder por tais notícias, incluindo tal como requerido ou apropriado por remover o material ilícito ou desativando as hiperligações para o material ilícito. %{company_name} irá terminar o acesso a e o uso do Sítio se, sob circunstâncias apropriadas, o visitante é determinado como sendo um infrator repetido dos direitos de autor e de outros direitos de propriedade intelectual de %{company_name} ou outros. No caso de tal terminação, %{company_name} não terá qualquer obrigação de fornecer uma compensação de qualquer valor previamente pago a %{company_name}. \n\n \n\n## [9. Propriedade Intelectual](#9) \n\nEste Acordo não transfere totalmente de %{company_name} para si qualquer propriedade intelectual de %{company_name} ou de terceiras partes, e todos os direitos, títulos e interesse na e para a propriedade irá permanecer (entre as partes) apenas com %{company_name}. %{company_name}, %{company_domain}, o logótipo %{company_domain} e todos as outras marcas, marcas de serviço, gráficos, logótipos usados na ligação com %{company_domain}, ou o Sítio é marca registada de %{company_name} ou licenciadores de %{company_name}. Outras marcas, marcas de serviço, gráficos e logótipos usados na hiperligação com o Sítio podem ser marcas de terceiras partes. O seu uso do Sítio não lhe concede direitos ou\ + \ licença para reproduzir ou de outra forma usar quaisquer marcas de %{company_name} ou de terceiras partes. \n\n \n\n## [10. Anúncios](#10) \n\n%{company_name} reserva-se ao direito de mostrar anúncios no seu conteúdo a não ser que tenha comprado a Atualização Ad-free ou uma conta de Serviços. \n\n \n\n## [11. Atribuição](#11) \n\n%{company_name} reserva-se ao direito de mostrar hiperligações de atribuição tais como ‘Patrocinado por %{company_domain},’ e atribuição de fontes ao conteúdo do rodapé ou da sua ferramenta. Os créditos do rodapé e a ferramenta de %{company_domain} não poderão ser removidas independentemente das atualizações compradas. \n\n \n\n## [12. Alterações](#12) \n\n%{company_name} reserva-se ao direito, por critério exclusivo, de modificar ou substituir qualquer parte deste Acordo. É sua responsabilidade verificar periodicamente o Acordo e verificar as suas alterações. O seu uso ou acesso contínuo ao Sítio seguido da publicação de qualquer alteração a este Acordo constitui aceitação a essas mudanças. %{company_name} pode também, no futuro, oferecer novos serviços e/ou funcionalidades através do Sítio (incluindo, o lançamento de novas ferramentas e recursos). Estas novas funcionalidades e/ou serviços devem ser sujeitos aos termos e condições deste Acordo. \n\n \n\n## [13. Terminação](#13) \n\n%{company_name} pode terminar o seu acesso a todas ou alguma parte do Sítio em qualquer altura, com ou sem motivo, com ou sem aviso, com efeitos imediatos. Se desejar terminar este Acordo ou a sua conta %{company_domain} (se tiver uma), pode simplesmente deixar de usar o Sítio. Todas as provisões para este Acordo que pela sua natureza deverão sobreviver à terminação, incluindo, sem limitações, provisões de propriedade, isenções de garantia, indemnizações e limitações de responsabilidade. \n\n \n\n## [14. Isenção de Garantias](#14) \n\nO Sítio é fornecido “tal como está”. %{company_name} e os seus fornecedores e licenciadores ficam aqui isentos de garantias de qualquer tipo, expressas ou implícitas, sem\ + \ limitação, as garantias de comerciabilidade, adequadas a uma finalidade específica. Nem %{company_name} nem os seus fornecedores e licenciadores, fazem garantias de que o Sítio está livre de erros ou que o acesso seja contínuo e ininterrupto. Se está a ler isto, aqui está [uma ajuda] (http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Compreende que descarregou de, ou de outra maneira obteve conteúdo ou serviços através do Sítio a seu próprio risco e descrição. \n\n \n\n## [15. Limitação da Responsabilidade](#15) \n\nEm nenhum evento %{company_name} ou os seus fornecedores ou licenciadores, serão responsáveis em respeito a qualquer assunto deste acordo sob qualquer contrato, negligência, estrita responsabilidade ou outras teorias legais para: (i) quaisquer danos especiais, de incidentes ou consequenciais; (ii) o custo de procura de produtos ou serviços substitutos; (iii) por interrupção do uso, perda ou corrupção dos dados; ou (iv) por quaisquer valores que excedem as taxas pagas por si a %{company_name} sob este acordo durante um período doze (12) meses anterior à causa da ação. %{company_name} não deverá ter qualquer responsabilidade de qualquer falha ou atraso devido a matérias para além do seu razoável controlo. O disposto neste artigo não se aplica nas medidas proibidas pela lei aplicável. \n\n \n\n## [16. Representações Gerais e Garantia](#16) \n\nRepresenta e garante que (i) o seu uso do Sítio irá estar em estrita concordância com a [Política de Privacidade](/privacy) e das [Diretrizes da Comunidade](/diretrizes) da %{company_name}, com este Acordo e com as leis e regulações aplicáveis (incluindo sem limitação de quaisquer leis ou regulações locais no seu país, estado, cidade ou outras áreas governamentais, relativamente à conduta online e ao conteúdo aceitável, e incluindo quaisquer leis aplicáveis relativamente à transmissão de dados técnicos exportados de qualquer país em que o sítio reside ou do país em que você reside) e (ii) o seu uso do Sítio não irá infringir os direitos de propriedade intelectual de qualquer\ + \ terceira parte. \n\n \n\n## [17. Indemnização](#17) \n\nConcorda em indemnizar e não prejudicar %{company_name}, os seus contratados, e os seus licenciadores, os seus respetivos diretores, empregados e agentes de e contra quaisquer reivindicações e despesas, incluindo taxas de advogados, decorrentes do seu uso do Sítio, incluindo mas não limitado à sua violação deste Acordo. \n\n \n\n## [18. Diversos](#18) \n\nEste Acordo constitui o acordo integral entre si e %{company_name} em relação ao assunto em questão, e poderá ser modificado apenas por uma emenda escrita assinada por um executivo autorizado da %{company_name}, ou pela publicação por parte da %{company_name}, de uma versão revista. Excepto o definido na lei, se houver, disposição em contrário, o presente Acordo, qualquer acesso ou uso do sítio será governado pelas leis do estado da Califórnia, E.U.A, excluindo aos conflitos das disposições da lei, e a receita própria por qualquer disputa emergente de ou relativa a qualquer do mesmo será o tribunal federal e estatal localizado em São Francisco, Califórnia. Exceto para os pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de uma caução), qualquer litígio decorrente do presente acordo será resolvido de acordo com as Regras de Arbitragem de \"Judicial Arbitration and Mediation Service, Inc.” (“JAMS”) por três árbitros apontados em concordância com tais Regras. A arbitragem deverá ter lugar em São Francisco, Califórnia, em língua Inglesa e a decisão arbitral pode ser forçada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Acordo terá direito a custos e honorários dos advogados. Se qualquer parte deste Acordo for considerada inválida ou inexequível, essa parte será interpretada de forma a refletir a intenção original das partes e as porções restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Acordo ou qualquer violação dos mesmos,\ + \ em qualquer instância, não vai renunciar a tal termo ou condição ou qualquer violação subsequente. Pode atribuir os seus direitos sob este acordo a qualquer parte que consente a, e concorda em ficar vinculado pelos seus termos e condições; %{company_name} pode assignar os seus direitos sob este Acordo sem condição. O presente Acordo será vinculativo e reverterá em benefício das partes, dos seus sucessores e signatários autorizados. \n\nEste documento é CC-BY-SA. Foi atualizado pela última vez em 31 de Maio de 2013. \n\nOriginalmente adaptado de [Termos de Serviço WordPress](http://en.wordpress.com/tos/).\n" privacy_topic: title: "Política de Privacidade" body: | @@ -1844,6 +1849,10 @@ pt: Este distintivo é concedido quando atinge o nível de confiança 1. Obrigado por ficar por cá durante algum tempo e por ler alguns tópicos para aprender do que se trata a nossa comunidade. As suas restrições de novo utilizador foram removidas, e foram-lhe atribuídas habilidades essenciais da comunidade, tais como mensagens pessoais, sinalização, edição da wiki, e a habilidade de publicar imagens e múltiplas hiperligações. member: | Este distintivo é concedido quando atinge o nível de confiança 2. Obrigado por participar durante um período de semanas para se juntar à nossa comunidade. Agora pode enviar convites pessoais da sua página de utilizador ou tópicos individuais, criar mensagens de grupo, e mais alguns gostos por dia! + regular: | + Este distintivo é concedido quando atingir o nível de confiança 3. Obrigado por ser uma parte regular da nossa comunidade por um período de meses, um dos leitores mais ativos e um contribuinte fiável no que torna a comunidade fantástica. Agora pode recategorizar e renomear tópicos, aceder à área do salão privado, sinalizações de spam mais poderosas, e muitos mais gostos por dia. + leader: | + Este distintivo é concedido quando atinge o nível de confiança 4. É um líder nesta comunidade, selecionado pelo pessoal, e define um exemplo positivo para a comunidade nos seus trabalhos e palavras. Tem a habilidade de editar todas as mensagens, realizar ações de moderador de tópicos tais como fixar, fechar, arquivar, dividir e unir, e toneladas de gostos por dia. admin_login: success: "Email Enviado" error: "Erro!" diff --git a/config/locales/server.pt_BR.yml b/config/locales/server.pt_BR.yml index 5e112663e0..e57e5acc1e 100644 --- a/config/locales/server.pt_BR.yml +++ b/config/locales/server.pt_BR.yml @@ -1220,6 +1220,14 @@ pt_BR: subject_template: one: "1 sinalização aguardando a ser controlada" other: "%{count} sinalizações aguardando a ser controladas" + queued_posts_reminder: + subject_template: + one: "[%{site_name}] 1 mensagem aguardando revisão" + other: "[%{site_name}] %{count} mensagens aguardando revisão" + text_body_template: | + Olá, + + Existem tópicos de usuários novos que aguardam serem revisados. [Eles podem ser aprovados ou rejeitados aqui](%{base_url}/queued-posts). flag_reasons: off_topic: "Sua postagem foi sinalizada como **off-topic**: a comunidade sente que não é uma boa adequação ao tópico, como atualmante definido de acordo com o título e o primeiro post." inappropriate: "Sua postagem foi sinalizada como **não apropriada**: a comunidade sente que ela é ofensiva, abusiva, ou uma violação das [nossas orientações da comunidade](/guidelines)." @@ -1231,6 +1239,7 @@ pt_BR: disagreed: "Obrigado por nos avisar. Nós estamos olhando nele." deferred: "Obrigado por nos avisar. Nós estamos olhando nele." deferred_and_deleted: "Obrigado por nos avisar. Nós removemos o post." + temporarily_closed_due_to_flags: "Este tópico foi temporariamente fechado devido a um grande número de sinalizações da comunidade." system_messages: post_hidden: subject_template: "%{site_name} Aviso: Postagem escondida devido a Sinalização pela Comunidade" @@ -1270,6 +1279,7 @@ pt_BR: [prefs]: %{user_preferences_url} backup_succeeded: subject_template: "Backup completado com sucesso" + text_body_template: "O backup foi bem sucedido. Visite a [admin > seção backup](%{base_url}/admin/backups) para baixar seu novo backup." backup_failed: subject_template: "O backup falhou" text_body_template: | @@ -1538,6 +1548,8 @@ pt_BR: set_password: subject_template: "[%{site_name}] Definir Senha" text_body_template: "Alguém solicitou para adicionar uma senha para a sua conta em [%{site_name}] (% {base_url}). Alternativamente, você pode fazer login usando qualquer serviço online suportado (Google, Facebook, etc) que está associado a este endereço de e-mail validado.\n \nSe você não fez esse pedido, você pode ignorar este e-mail. \n \nClique no link abaixo para escolher uma senha: \n%{base_url}/users/password-reset/%{email_token}\n" + admin_login: + subject_template: "[%{site_name}] Login" account_created: subject_template: "[%{site_name}] Sua nova Conta" text_body_template: | @@ -1571,7 +1583,6 @@ pt_BR: (Se precisar se comunicar com um [membro interno](%{base_url}/about) como um novo usuário, só responder a esta mensagem.) signup: - subject_template: "[%{site_name}] Ativar a sua nova conta" text_body_template: | Ben-vindo ao %{site_name}! @@ -1603,8 +1614,6 @@ pt_BR: too_large: "Desculpe, o arquivo que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB)." images: too_large: "Desculpe, a imagem que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor a redimensione e tente novamente." - fetch_failure: "Desculpe, houve um erro ao transferir a imagem." - unknown_image_type: "Desculpe, mas o arquivo que você tentou enviar não parece ser uma imagem." size_not_found: "Desculpe, mas não conseguimos determinar o tamanho da imagem. É possível que seu arquivo de imagem esteja corrompido?" flag_reason: sockpuppet: "Um novo usuário criou um tópico e outro novo usuário no mesmo endereço IP respondeu. Veja a configuração flag_sockpuppets." @@ -1636,27 +1645,74 @@ pt_BR: static_topic_first_reply: "Altere o primeiro post desse tópico para mudar seu conteúdo na página de %{page_name} \n" guidelines_topic: title: "Perguntas frequentes/Diretrizes" - body: "\n\n## [Este é um Lugar Civilizado para Discussão Pública](#civilized)\n\nPor gentileza trate este fórum de discussão com o mesmo respeito que você teria em um parque público. Nós, também, somos uma comunidade de recursos compartilhados — um local para compartilhar habilidades, conhecimento e interesses através da discussão em andamento.\n\nEstas não são regras duras e firmes, meramente suportes ao julgamento humano de nossa comunidade. Use estas diretrizes para manter um lugar claro, bem-iluminado de conversa pública civilizada.\n\n\n\n## [Melhore a Discussão](#improve)\n\nAjude-nos a fazer deste um grande lugar de discussão ao trabalhar sempre para melhorar a discussão de alguma forma, mesmo que pequena. Se você estiver incerto de que o seu post acrescenta à conversa, pense melhor no que você quer dizer e tente novamente depois.\n\nOs tópicos discutidos aqui importam para nós, e nós queremos que você aja como se eles importassem para você, também. Seja respeitoso com os tópicos e as pessoas que os discutem, ainda que você discorde com algo do que está sendo dito.\n\nUma forma de melhorar a discussão é por descobrir algumas que já estão acontecendo. Por favor passe algum tempo navegando nos tópicos aque antes de responder ou iniciar o seu próprio, e você terá uma chance de conhecer outros que compartilham dos seus interesses.\n\n\n\n## [Seja Agradável, Mesmo Quando Você Discorda](#agreeable)\n\nVocê pode querer responder à algo discordando. Tudo bem. Mas, lembre-se de _criticar idéias, não pessoas_. Por gentileza evite:\n\n* Xingamentos\n* Ataques ad hominem\n* Responder ao tom de um post ao invés do seu conteúdo efetivo.\n* Contradição impensada.\n\nAo invés disso, ministre contra-argumentos razoáveis que aprimorem a conversa.\n\n\n\n## [Sua Participação Conta](#participate)\n\nAs conversas que nós temos aqui colocam um ambiente para todos. Ajude-nos a influenciar o futuro desta comunidade escolhendo empenhar-se em discussões que façam deste fórum um lugar interessante para se estar — e evitando\ - \ aquelas que não façam.\n\nO Discourse fornece ferramentas que permitem a comunidade de identificar coletivamente as melhores (e piores) contribuições: favoritos, likes, sinalizações, respostas, edits, e assim em diante. Utilize estas ferramentas para aprimorar sua própria experiência, e também a de todos os outros.\n\nVamos tentar deixar nosso parque melhor do que nós o encontramos.\n\n\n\n## [Se Você Ver um Problema, Sinalize-o](#flag-problems)\n\nModeradores têm autoridade especial; eles são responsáveis por este fórum. Mas você também. Com a sua ajuda, moderadores podem ser facilitadores da comunidade, não zeladores ou polícia.\n\nQuando você vê um comportamento ruim, não responda. Isso encoraja o comportamento ruim por reconhecê-lo, consume a sua energia, e desperdiça o tempo de todos. _Apenas sinalize-o_. Se as sinalizações aumentam o suficiente, ação será tomada, seja automaticamente ou através de intervenção da moderação.\n\nDe modo a manter nossa comunidade, moderadores se reservam o direito de remover qualquer conteúdo e qualquer conta de usuário por qualquer motivo e quando quer que seja. Moderadores não prevêem novos posts de qualquer modo; os moderadores e operadores do site não têm qualquer responsabilidade por qualquer conteúdo postado pela comunidade.\n\n\n\n## [Sempre Seja Civilizado](#be-civil)\n\nNada sabota uma conversa saudável como a grosseria:\n\n* Seja civilizado. Não poste qualquer coisa que uma pessoa razoável consideraria ofensivo, abusivo, ou discurso de ódio.\n* Deixe-o limpo. Não poste qualquer coisa obscena ou sexualmente explícita.\n* Respeite aos demais. Não perturbe ou aflija, se passe por outras pessoas, ou exponha suas informações particulares.\n* Respeite nosso fórum. Não poste spam ou vandalize o fórum de algum outro modo.\n\nEstes não são termos concretos com definições precisas — evite mesmo a _aparência_ de qualquer destas coisas. Se você estiver incerto, pergunte-se como você se sentiria se sua postagem fosse veiculada na primeira página do New York Times.\n\nEste é um fórum público, e motores de busca indexam\ - \ estas discussões. Mantenha a linguagem, links, e imagens seguros para família e amigos.\n\n\n\n## [Mantenha-o Arrumado](#keep-tidy)\n\nFaça um esforço para colocar coisas no lugar certo, para que assim nós possamos passar mais tempo discutindo e menos limpando. Assim:\n\n* Não inicie um tópico na categoria incorreta.\n* Não faça postagens cruzadas da mesma coisa em múltiplos tópicos.\n* Não poste respostas sem conteúdo.\n* Não desvie um tópico mudando-no em meio à correnteza.\n* Não assine seus posts — cada postagem tem sua informação de perfil anexada à ela. \n\nAo invés de postar \"+1\" ou \"Concordo\", use o botão Like. Ao invés de levar um tópico existente numa direção radicalmente diferente, utilize Responder como um Tópico Linkado.\n\n\n\n## [Poste Apenas Suas Próprias Coisas](#stealing)\n\nVocê deve não postar o que quer que seja digital que pertence a outro sem permissão. Você deve não postar descrições de, links para, ou métodos para roubar a propriedade intelectual de outro (software, vídeo, áudio, imagens), ou para quebrar qualquer outra lei.\n\n\n\n## [Powered by Você](#power)\n\nEste site é operado pela suar [amigável staff local](/about) e *você*, a comunidade. Se você tiver quaisquer outras questões sobre como as coisas devem funcionar aqui, abra um novo tópico na [categoria meta](/c/meta) e vamos discutir! Se houver um assunto crítico ou urgente que não puder ser resolvido por um tópico meta ou sinalização, entre em contato conosco através da [página da staff](/about).\n\n\n\n## [Terms of Service](#tos)\n\nSim, juridiquês é chata, mas nós devemos nos proteger – e por extensão, você e seus dados – contra pessoas não-amigáveis. Nós temos um [Termos of Serviço](/tos) descrevendo a sua (e a nossa) conduta e direitos relacionados a conteúdo, privacidade e leis. Para usar este serviço, você deve concordar em permanecer por nossos [TOS](/tos).\n" tos_topic: title: "Termos de Serviço" - body: "Os seguintes termos e condições regem todo o uso do site %{company_domain} e todo o conteúdo, serviços e produtos disponíveis no ou através do site, incluindo, mas não limitado a, o Software do Fórum do %{company_domain}, o Fóruns de Suporte do %{company_domain} e o serviço de hospedagem (\"hosting\") do %{company_domain}, (em conjunto, o site). O site é propriedade e operada por %{company_full_name} (\"%{company_name}\"). O Site é oferecido sujeito à sua aceitação, sem modificação de todos os termos e condições contidos neste documento e todas as outras regras operacionais, políticas (incluindo, sem limitação, a [Política de Privacidade](/privacy) e [Regras da Comunidade ](/faq)) e procedimentos do %{company_domain} que possam ser publicadas de tempos em tempos neste site por %{company_name} (coletivamente, o \"Contrato\").\n\nPor favor, leia este Contrato cuidadosamente antes de acessar ou utilizar o site. Ao acessar ou utilizar qualquer parte do web site, você concorda em ficar vinculado aos termos e condições deste acordo. Se você não concordar com todos os termos e condições deste contrato, então você não pode acessar o site ou utilizar qualquer serviço. Se estes termos e condições são consideradas uma oferta por %{company_name}, a aceitação é expressamente limitada a estes termos. O site está disponível apenas para indivíduos que são pelo menos 13 anos de idade.\n\n\n\n## [1. Sua conta %{company_domain}](#1)\n\nSe você criar uma conta no site, você é responsável por manter a segurança da sua conta e você é totalmente responsável por todas as atividades que ocorrem sob a conta. Você deve notificar imediatamente %{company_name} de qualquer uso não autorizado de sua conta ou qualquer outra violação de segurança. %{company_name} não será responsável por quaisquer atos ou omissões por você, incluindo quaisquer danos de qualquer tipo incorridos como resultado de tais atos ou omissões.\n\n\n\n## [2. Responsabilidade de Contribuintes](#2)\n\nSe você postar o material no site, postar links no site, ou de outra forma (ou permitir que terceiros o fazem) material disponível por meio do\ - \ site (qualquer material, \"Conteúdo\"), Você é inteiramente responsável pelo conteúdo de, e qualquer dano resultante do que de conteúdo. Esse é o caso, independentemente de o conteúdo em questão constitui um texto, gráficos, um arquivo de áudio, ou software de computador. Ao deixar o conteúdo disponível, você declara e garante que: \n\n* O download, cópia e uso do Conteúdo não irá infringir os direitos de propriedade, incluindo, mas não se limitando aos direitos autorais, patentes, marcas ou direitos de segredo comercial, de qualquer terceiro; \n* Se o seu empregador tem direitos de propriedade intelectual que você cria, você tem (i) recebeu permissão do seu empregador para publicar ou tornar disponível o conteúdo, incluindo, mas não limitado a qualquer software, ou (ii) garantiu de seu empregador uma renúncia como de todos os direitos ou ao conteúdo; \n* Você tem cumprido plenamente todas as licenças de terceiros relativas ao conteúdo, e ter feito todas as coisas necessárias para passar com êxito para usuários finais através de quaisquer condições exigidas; \n* O conteúdo não contém ou instala qualquer vírus, worms, malware, cavalos de Tróia ou outros conteúdos prejudiciais ou destrutivas; \n* O conteúdo não é spam, não é por máquina ou gerado aleatoriamente, e não contém conteúdo comercial antiético ou indesejados projetados para direcionar o tráfego para sites de terceiros ou impulsionar motor de pesquisa rankings de sites de terceiros, ou para atos mais ilícitos (tais como phishing) ou iludir os destinatários quanto à fonte do material (como falsificação); \n* O conteúdo não é pornográfico, não contém ameaças ou incita a violência, e não viola a privacidade ou direitos de publicidade de terceiros; \n* O seu conteúdo não está sendo anunciado através de mensagens eletrônicas indesejadas como spam links em newsgroups, listas de e-mails, blogs e sites, e métodos promocionais não solicitados semelhantes; \n* O seu conteúdo não tem o nome de uma maneira que engana os seus leitores a pensar que você é outra pessoa ou empresa; e\n* você tem, no caso de Conteúdo que inclui código de computador, com categorizados\ - \ com precisão e/ou descrito o tipo, natureza, usos e efeitos dos materiais, se solicitado a fazê-lo por %{company_name} ou de outra forma.\n\n\n\n## [3. Conteúdo de Licença de Usuário](#3)\n\nContribuições do usuário são licenciada sob uma Licença [Creative Commons Atribuição-Uso Não-Comercial-Compartilhamento pela mesma licença 3.0 Unported](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Sem limitar qualquer dessas representações ou garantias, o %{company_name} tem o direito (mas não a obrigação) de, no exclusivo critério do %{company_name}(i) recusar ou remover qualquer conteúdo que, parecer razoável no %{company_name}, violando qualquer política do %{company_name} ou seja de alguma forma prejudicial ou censurável, ou (ii) rescindir ou negar o acesso e utilização do Site para qualquer indivíduo ou entidade, por qualquer motivo, em uma única discrição do %{company_name}. O %{company_name} não terá obrigação de fornecer um reembolso de quaisquer montantes já pagos.\n\n\n\n\n## [4. Pagamento e Renovação](#4)\n\n### Termos Gerais\n\nServiços opcionais pagos ou atualizações podem estar disponíveis no site. Ao utilizar um serviço opcional pago ou atualização, você concorda em pagar ao %{company_name} as taxas mensais ou anuais de assinatura indicados. Os pagamentos serão cobrados em uma base de pré-pago no dia que você começar a utilizar o serviço ou atualização e cobrirá o uso desse serviço ou atualizações para um período de subscrição mensal ou anual, conforme indicado. **Estas taxas não são reembolsáveis**.\n\n### Renovação automática\n\nA menos que você notifique o %{company_name} antes do final do período de subscrição aplicável que você deseja cancelar um serviço ou atualização, sua assinatura será renovada automaticamente e você nos autoriza a cobrar a taxa anual ou mensal de assinatura então aplicável (assim como qualquer impostos), utilizando qualquer cartão de crédito ou outro mecanismo de pagamento, há o registro para você. As inscrições podem ser cancelados a qualquer momento.\n\n\n\n## [5. Serviços](#5)\n\n### Hospedagem, Serviços de Suporte\n\ - \nServiços de Hospedagem e Suporte opcional pode ser fornecido pelo %{company_name} nos termos e condições para cada tipo de serviço. Ao inscrever-se para uma conta de serviços de hospedagem/Suporte, você concorda em cumprir com esses termos e condições.\n\n\n\n## [6. Responsabilidade dos Visitantes do Site](#6)\n\n%{company_name} não analisou e não pode rever, todo o material, incluindo programas informáticos, postado no site, e não pode, portanto, ser responsável pelo conteúdo, uso ou efeitos desse material. Ao trabalhar com o site, %{company_name} não representa nem implica que aprova o material postado lá, ou que acredita que tal material possa ser exato, útil ou não prejudicial. Você é responsável por tomar as precauções necessárias para proteger a si e seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivas. O site pode conter conteúdo que é ofensivo, indecente ou censurável, bem como o conteúdo que contenha imprecisões técnicas, erros tipográficos e outros erros. O site também podem conter material que viole a privacidade ou direitos de publicidade, ou infrinja a propriedade intelectual e outros direitos de propriedade, de terceiros, ou o download, cópia ou utilização que esteja sujeita aos termos e condições adicionais, declarada ou não declarada. O %{company_name} se exime de qualquer responsabilidade por qualquer dano resultante do uso pelos visitantes do site, ou de qualquer download por esses visitantes de conteúdo postado lá.\n\n\n\n## [7. Conteúdo Publicado em Outros Sites](#7)\n\nNós não revemos, e não podemos analizar, todo o material, incluindo software de computador, disponibilizado através dos sites e páginas da web para os links do %{company_domain}, e que apontam para %{company_domain}. O %{company_name} não tem qualquer controle sobre esses sistes não-%{company_domain} e páginas da web, e não é responsável por seu conteúdo ou a sua utilização. Ao conectar-se para um site não-%{company_domain} ou página da web, o %{company_name} não representa nem implica que aprova tal site ou página web. Você é responsável\ - \ por tomar as precauções necessárias para proteger a si e seus sistemas de computador contra vírus, worms, cavalos de Tróia e outros conteúdos prejudiciais ou destrutivas. O %{company_name} se isenta de qualquer responsabilidade por qualquer dano resultante do uso de sites não-%{company_domain} e páginas da web.\n\n\n\n## [8. Violação de Direitos Autorais e Política DMCA](#8)\n\nComo %{company_name} pede que os outros respeitem os seus direitos de propriedade intelectual, que respeite os direitos de propriedade intelectual de terceiros. Se você acredita que o material localizado em ou ligados por %{company_domain} viola seus direitos autorais, e se este site reside nos EUA, você é encorajado a notificar %{company_name} a política [Digital Millennium Copyright Act] (http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\"). %{company_name} irá responder a todos esses avisos, incluindo como necessário ou apropriado, removendo o material ilícito ou desabilitando todos os links para o material infrator. O %{company_name} encerrar o acesso do visitante e utilização do Website se, em circunstâncias apropriadas, o visitante está determinado a ser um infrator reincidente de direitos autorais ou outros direitos de propriedade intelectual do %{company_name} ou outros. No caso de rescisão, o %{company_name} não terá nenhuma obrigação de fornecer um reembolso de quaisquer montantes pagos anteriormente para %{company_name}.\n\n\n\n\n## [9. Propriedade Intelectual](#9)\n\nO presente Acordo não transfere do %{company_name} a você qualquer propriedade intelectual do %{company_name} ou de terceiros do partido, e todos os direitos, títulos e interesses relativos à propriedade permanecerá (entre as partes) apenas com %{company_name}. O %{company_name}, %{company_domain}, o logotipo %{company_domain}, e todas as outras marcas comerciais, marcas de serviço, gráficos e logotipos utilizados em conexão com %{company_domain}, ou no site são marcas comerciais ou marcas registradas de %{company_name} ou licenciadores do %{company_name}. Outras marcas comerciais, marcas de serviço, gráficos e logotipos\ - \ utilizados em conexão com o site podem ser marcas comerciais de terceiros. O seu uso do Site lhe concede nenhum direito ou licença para reproduzir ou utilizar qualquer %{company_name} ou marcas registradas de terceiros.\n\n\n\n## [10. Anúncios](#10)\n\nO %{company_name} reserva-se o direito de exibir anúncios em seu conteúdo, a menos que você tenha comprado uma atualização Ad-livre ou uma conta de Serviços.\n\n\n\n## [11. Atribuição](#11)\n\nO %{company_name} reserva-se o direito de exibir links de atribuição como ‘Powered by %{company_domain}’, autor do tema e atribuição de fonte no rodapé do conteúdo ou barra de ferramentas. Créditos no rodapé e na barra de ferramentas do %{company_domain} não podem ser removidos independentemente de upgrades comprados.\n\n\n\n## [12. Mudanças](#12)\n\nO %{company_name} reserva-se o direito de, a seu exclusivo critério, modificar ou substituir qualquer parte do presente Acordo. É sua responsabilidade verificar este Acordo periodicamente para mudanças. Seu uso continuado ou acesso ao site após a publicação de quaisquer alterações a este Acordo constitui aceitação dessas alterações. O %{company_name} também pode, no futuro, oferecer novos serviços e/ou recursos por meio do site (incluindo o lançamento de novas ferramentas e recursos). Esses novos recursos e/ou serviços estará sujeito aos termos e condições deste Contrato.\n\n\n\n## [13. Rescisão](#13)\n\nO %{company_name} poderá rescindir seu acesso a todo ou qualquer parte do Website, a qualquer momento, com ou sem justa causa, com ou sem aviso prévio, com efeito imediato. Se você deseja rescindir este Contrato ou sua conta no %{company_domain} (se você tiver um), você pode simplesmente deixar de usar o site. Todas as disposições do presente Acordo, que por sua natureza devem sobreviver a rescisão após a rescisão, incluindo, sem limitação, as disposições de propriedade, isenções de garantia, indenização e limitações de responsabilidade.\n\n\n\n## [14. Renúncia de Garantias](#14)\n\nO site é fornecido \"tal como está\". O %{company_name} e seus\ - \ fornecedores e licenciadores renunciam a todas as garantias de qualquer tipo, expressa ou implícita, incluindo, sem limitação, as garantias de comercialização, adequação a uma finalidade específica e não-violação. Nem o %{company_name} e nem os seus fornecedores e licenciadores, fazem qualquer garantia de que o site será livre de erros ou que cesso aos mesmos será contínuo ou ininterrupto. Se você está lendo esta, aqui está [um deleite](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Você entende que o seu download a partir, ou outra forma de obter conteúdos ou serviços por meio, o Site da Web é por sua própria conta e risco.\n\n\n\n## [15. Limitação de Responsabilidade](#15)\n\nEm nenhuma hipótese o %{company_name}, seus fornecedores ou licenciadores, serão responsáveis ​​em relação a qualquer matéria do presente acordo por força de contrato, negligência, responsabilidade estrita ou qualquer outra teoria legal ou equitativa para: (i) quaisquer danos especiais, incidentais ou danos consequentes; (ii) o custo de aquisição de produtos ou serviços substitutos; (iii) a interrupção do uso ou perda ou corrupção de dados; ou (iv) por quaisquer valores que excedam as taxas pagas por você para o %{company_name} nos termos deste contrato durante o período de 12 (doze) meses anteriores à causa de pedir. %{company_name} não terá nenhuma responsabilidade por qualquer falha ou atraso devido a questões alheias à sua vontade razoável. O disposto neste artigo não se aplicam à medida proibida pela lei aplicável.\n\n\n\n## [16. Representação Geral e Garantia](#16)\n\nVocê representa e garante que (i) o seu uso do site será em estrita conformidade com a [Política de Privacidade](/privacy) do %{company_name}, [Diretrizes da Comunidade](/guidelines), com este Acordo e com todas as leis aplicáveis e regulamentos (incluindo, sem limitação, quaisquer leis ou regulamentos locais em seu país, estado, cidade ou outra área governamental, em relação à conduta on-line e conteúdo aceitável, incluindo todas as leis aplicáveis ​​com relação à transmissão de dados técnicos\ - \ exportados do país em que este website reside ou do país onde você reside) e (ii) o uso do website não infrinja ou apropriação indevida de direitos de propriedade intelectual de terceiros.\n\n\n\n## [17. Indenização](#17)\n\nVocê concorda em indenizar e isentar o %{company_name}, seus contratados, e seus licenciadores, e seus respectivos conselheiros, diretores, funcionários e agentes de e contra todas e quaisquer reivindicações e despesas, incluindo honorários advocatícios, decorrentes de seu uso de do site, incluindo mas não limitado a sua violação deste Acordo.\n\n\n\n## [18. Diversos](#18)\n\nEste acordo constitui o acordo inteiro entre %{company_name} e você em relação à questão ora tratada, e só pode ser modificado por uma emenda por escrito assinado por um executivo autorizado do %{company_name}, ou pela postagem por %{company_name} de uma versão revisada. Exceto o definido em lei aplicável, se for o caso, disponha em contrário, o presente Acordo, qualquer acesso ou uso do Site serão regidos pelas leis do Estado da Califórnia, EUA, excluindo seus conflitos de provisões da lei, e o local adequado para quaisquer litígios decorrentes ou relacionados com qualquer do mesmo serão os tribunais estaduais e federais localizados no Condado de San Francisco, Califórnia. Exceto para pedidos de medida cautelar ou equitativa ou reclamações relativas aos direitos de propriedade intelectual (que podem ser introduzidos em qualquer tribunal competente, sem a prestação de caução), qualquer litígio decorrente do presente Acordo serão resolvidos de acordo com as Regras de Arbitragem abrangentes da Arbitragem Judicial e Serviço de Mediação, Inc. (\"JAMS\") por três árbitros nomeados em conformidade com tais regras. A arbitragem terá lugar em San Francisco, Califórnia, no idioma Inglês ea decisão arbitral pode ser executada em qualquer tribunal. A parte prevalecente em qualquer ação ou processo para executar este Contrato terá direito a custos e honorários advocatícios. Se qualquer parte deste Contrato for considerada inválida ou inexequível, essa parte será interpretada de modo a refletir a intenção\ - \ original das partes, e as parcelas restantes permanecerão em pleno vigor e efeito. A renúncia por qualquer das partes de qualquer termo ou condição deste Contrato ou qualquer violação da mesma, em qualquer instância, não vai renunciar tal termo ou condição ou qualquer violação subsequente. Você pode transferir seus direitos sob este Contrato a qualquer partido que consente em, e concorda em ficar vinculado por seus termos e condições; O %{company_name} pode ceder seus direitos sob este Contrato sem qualquer condição. Este acordo será vinculam e reverterá em benefício das partes, seus sucessores e cessionários autorizados.\n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013. \n\nOriginalmente adaptado do WordPress [Termos de serviço](http://en.wordpress.com/tos/).\n" privacy_topic: title: "Política de Privacidade" - body: "\n\n## [Quais as informações que recolhemos?](#coleta)\n\nColetamos informações de você quando você se cadastra em nosso site e coletamos dados quando você participar do fórum, lendo, escrevendo, e avaliar o conteúdo compartilhado aqui. \n\nAo se cadastrar em nosso site, você pode ser solicitado a digitar seu nome e e-mail. Você pode, entretanto, visite nosso site, sem registrar. O seu endereço de e-mail será verificado por um e-mail contendo um link único. Se o link é visitado, sabemos que você controla o endereço de e-mail. \n\nQuando registrado e fazendo postagens, registramos o endereço IP que originou o post. Também podemos manter os logs do servidor, que incluem o endereço IP de todos os pedidos para o nosso servidor.\n\n\n\n## [Em que usamos as suas informações?](#uso)\n\nQualquer uma das informações que coletamos de você pode ser usado em uma das seguintes formas: \n\n* Para personalizar a sua experiência — sua informação nos ajuda a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso site — nós nos esforçamos continuamente para melhorar as nossas ofertas de site com base nas informações e feedback que recebemos de você. \n* Para melhorar o serviço ao cliente — sua informação nos ajuda a responder mais eficazmente às suas solicitações de serviço ao cliente e as necessidades de apoio. \n* Para enviar periodicamente e-mails — O endereço de e-mail que você fornece pode ser usado para enviar-lhe informações, as notificações que você quando há mudanças tópicos que solicitou ou em resposta a seu nome de usuário, responder a perguntas, e/ou outras solicitações ou perguntas.\n\n\n\n## [Como vamos proteger a sua informação?](#protecao)\n\nImplementamos uma série de medidas de segurança para manter a segurança de suas informações pessoais quando você entra, envia ou acessa suas informações pessoais.\n\n\n\n## [Qual é a sua política de retenção de dados?](#retencao-dados)\n\nNós vamos fazer um esforço de boa fé para: \n\n* Manter registros do servidor contendo o endereço\ - \ IP de todos os pedidos para este servidor não mais que 90 dias. \n* Manter os endereços de IP associados a usuários registrados e suas mensagens não mais que 5 anos.\n\n\n\n## [Nós usamos cookies?](#cookies)\n\nSim. Cookies são pequenos arquivos que um site ou seu fornecedor de serviços transfere para o disco rígido do seu computador através de seu navegador Web (se você permitir). Estes cookies permitem que o site reconhecer o seu browser e, se você tiver uma conta registrada, associá-lo com a sua conta registrada. \n\nNós usamos cookies para compreender e guardar as suas preferências para futuras visitas e compilar dados agregados sobre o tráfego ea interação no site, para que possamos oferecer um site melhor e ferramentas no futuro. Poderemos contratar prestadores de serviços de terceiros para nos ajudar a compreender melhor os nossos visitantes do site. Esses prestadores de serviços não estão autorizados a utilizar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar o nosso negócio.\n\n\n\n## [Podemos divulgar qualquer informação a terceiros?](#divulgar)\n\nNós não vendemos, trocamos, ou de outra forma transferrimos a terceiros as suas informações pessoalmente identificáveis. Isso não inclui terceiros de confiança que nos auxiliam no funcionamento do nosso site, conduzindo nosso negócio, ou serviço que a você, desde que as partes concordam em manter esta informação confidencial. Podemos também divulgar as suas informações quando acreditamos que é apropriado para cumprir a lei, fazer cumprir as nossas políticas do site, ou proteger nosso ou de outros direitos, propriedade ou segurança. No entanto, informações turísticas não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para marketing, publicidade, ou outros usos.\n\n\n\n## [Links de terceiros](#terceiros)\n\nOcasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros no nosso site. Estes sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade ou obrigações\ - \ pelo conteúdo e atividades desses sites. No entanto, buscamos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.\n\n\n\n## [Privacidade Online Infantil Protection Act Compliance](#coppa)\n\nNosso site, produtos e serviços são todos dirigidos a pessoas que tem pelo menos 13 anos de idade ou mais. Se o servidor for nos EUA, e você está sob a idade de 13, de acordo com as exigências da COPPA ([Lei de Proteção de Privacidade Online de Crianças] (http://en.wikipedia.org/wiki/Children)), não use este site.\n\n\n\n## [Somente Política de Privacidade Online](#online)\n\nEsta política de privacidade online se aplica somente às informações recolhidas pelo nosso site e não a informações coletadas offline.\n\n\n\n## [Seu Consentimento](#consentimento)\n\nAo utilizar nosso site, você concorda com a nossa política de privacidade web site.\n\n\n\n## [Alterações à nossa Política de Privacidade](#mudancas)\n\nSe nós decidirmos mudar nossa política de privacidade, colocaremos essas alterações nesta página. \n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013.\n" + body: "\n\n## [Quais as informações que recolhemos?](#coleta)\n\nColetamos informações de você quando você se cadastra em nosso site e coletamos dados quando você participar do fórum, lendo, escrevendo, e avaliar o conteúdo compartilhado aqui. \n\nAo se cadastrar em nosso site, você pode ser solicitado a digitar seu nome e e-mail. Você pode, entretanto, visite nosso site, sem registrar. O seu endereço de e-mail será verificado por um e-mail contendo um link único. Se o link é visitado, sabemos que você controla o endereço de e-mail. \n\nQuando registrado e fazendo postagens, registramos o endereço IP que originou o post. Também podemos manter os logs do servidor, que incluem o endereço IP de todos os pedidos para o nosso servidor.\n\n\n\n## [Em que usamos as suas informações?](#uso)\n\nQualquer uma das informações que coletamos de você pode ser usado em uma das seguintes formas: \n\n* Para personalizar\ + \ a sua experiência — sua informação nos ajuda a responder melhor às suas necessidades individuais. \n* Para melhorar o nosso site — nós nos esforçamos continuamente para melhorar as nossas ofertas de site com base nas informações e feedback que recebemos de você. \n* Para melhorar o serviço ao cliente — sua informação nos ajuda a responder mais eficazmente às suas solicitações de serviço ao cliente e as necessidades de apoio. \n* Para enviar periodicamente e-mails — O endereço de e-mail que você fornece pode ser usado para enviar-lhe informações, as notificações que você quando há mudanças tópicos que solicitou ou em resposta a seu nome de usuário, responder a perguntas, e/ou outras solicitações ou perguntas.\n\n\n\n## [Como vamos proteger a sua informação?](#protecao)\n\nImplementamos uma série de medidas de segurança para manter a segurança de suas informações pessoais quando você\ + \ entra, envia ou acessa suas informações pessoais.\n\n\n\n## [Qual é a sua política de retenção de dados?](#retencao-dados)\n\nNós vamos fazer um esforço de boa fé para: \n\n* Manter registros do servidor contendo o endereço IP de todos os pedidos para este servidor não mais que 90 dias. \n* Manter os endereços de IP associados a usuários registrados e suas mensagens não mais que 5 anos.\n\n\n\n## [Nós usamos cookies?](#cookies)\n\nSim. Cookies são pequenos arquivos que um site ou seu fornecedor de serviços transfere para o disco rígido do seu computador através de seu navegador Web (se você permitir). Estes cookies permitem que o site reconhecer o seu browser e, se você tiver uma conta registrada, associá-lo com a sua conta registrada. \n\nNós usamos cookies para compreender e guardar as suas preferências para futuras visitas e compilar dados agregados sobre o tráfego ea interação\ + \ no site, para que possamos oferecer um site melhor e ferramentas no futuro. Poderemos contratar prestadores de serviços de terceiros para nos ajudar a compreender melhor os nossos visitantes do site. Esses prestadores de serviços não estão autorizados a utilizar as informações coletadas em nosso nome, exceto para nos ajudar a conduzir e melhorar o nosso negócio.\n\n\n\n## [Podemos divulgar qualquer informação a terceiros?](#divulgar)\n\nNós não vendemos, trocamos, ou de outra forma transferrimos a terceiros as suas informações pessoalmente identificáveis. Isso não inclui terceiros de confiança que nos auxiliam no funcionamento do nosso site, conduzindo nosso negócio, ou serviço que a você, desde que as partes concordam em manter esta informação confidencial. Podemos também divulgar as suas informações quando acreditamos que é apropriado para cumprir a lei, fazer cumprir as nossas políticas do site, ou proteger\ + \ nosso ou de outros direitos, propriedade ou segurança. No entanto, informações turísticas não pessoalmente identificáveis ​​podem ser fornecidas a terceiros para marketing, publicidade, ou outros usos.\n\n\n\n## [Links de terceiros](#terceiros)\n\nOcasionalmente, a nosso critério, podemos incluir ou oferecer produtos ou serviços de terceiros no nosso site. Estes sites de terceiros têm políticas de privacidade separadas e independentes. Portanto, não temos responsabilidade ou obrigações pelo conteúdo e atividades desses sites. No entanto, buscamos proteger a integridade do nosso site e agradecemos qualquer feedback sobre esses sites.\n\n\n\n## [Privacidade Online Infantil Protection Act Compliance](#coppa)\n\nNosso site, produtos e serviços são todos dirigidos a pessoas que tem pelo menos 13 anos de idade ou mais. Se o servidor for nos EUA, e você está sob a idade de 13, de acordo com\ + \ as exigências da COPPA ([Lei de Proteção de Privacidade Online de Crianças] (http://en.wikipedia.org/wiki/Children)), não use este site.\n\n\n\n## [Somente Política de Privacidade Online](#online)\n\nEsta política de privacidade online se aplica somente às informações recolhidas pelo nosso site e não a informações coletadas offline.\n\n\n\n## [Seu Consentimento](#consentimento)\n\nAo utilizar nosso site, você concorda com a nossa política de privacidade web site.\n\n\n\n## [Alterações à nossa Política de Privacidade](#mudancas)\n\nSe nós decidirmos mudar nossa política de privacidade, colocaremos essas alterações nesta página. \n\nEste documento é CC-BY-SA. Ele foi atualizado pela última 31 de maio de 2013.\n" + badges: + long_descriptions: + autobiographer: | + Este emblema é concedido por preencher seu perfil e selecionar uma foto de perfil. Deixar a comunidade conhecer mais sobre quem você é, e, quais são seus interesses, a torna melhor e mais conectada. + first_like: | + Este emblema é concedito na primeira vez que você curtir uma m,ensagem usando o botão :heart: . Curtir mensagens é uma ótima maneira de dizer aos membros da sua comunidade que suas mensagens foram interessantes, úteis, legais ou divertidas. Compatilhe o amor! + first_link: | + Este emblema é concedido na primeira vez que você põe um link para outro tópico numa mensagem. Linkar tópicos ajuda outros leitores a encontrar conversas interessantes relacionadas, monstrando ligações entre tópicos em ambas direções. + first_quote: | + Este emblema é concedido na primeira vez que você cita uma mensagem na sua resposta. Citar seções relevantes de mensagens anteriories na sua resposta ajuda a manter a discussão focada e no assunto original. + first_share: | + Este emblema é concedido na primeira vez que você compartilha um link para uma mensagem ou tópico usando o botão compartilhar. Compartilhar links é uma ótima maneira de mostrar discussões interessantes com o resto do mundo e assim, crescer sua comunidade. + read_guidelines: | + Este emblema é concedido por ler o guia da comunidade. Seguir e compartilhar estas simples regras ajuda a construir uma segura, divertida e sustentável comunidade. + reader: | + Este emblema é concedido por ler um tópico longo. Ler é fundamental. Ler atentamente ajuda a seguir a conversa e leva a melhores, e mais completas, respostas. + editor: | + Este emblema é concedido por editar sua mensagem. Não exite em editar sua mensagem a qualquer tempo para melhora-la , consertar pequenos enganos, ou adicionar qualquer coisa que você tenha esquecido. + first_flag: | + Este emblema é concedido por sinalizar uma mensagem. Sinalizar é critico para saúde da comunidade. Se você notar qualquer mensagem que necessita de atenção da moderação, por favor, não exite em sinalizar. Você pode também usar o diálogo de sinalização para enviar mensagem para outros usuários. + nice_share: | + Este emblema é concedido por compartilhar um link para uma mensagem que foi visitada por 25 visitantes externos. Bom trabalho! Compartilhar links para discussões interessantes é uma excelente forma de crescer sua comunidade. + welcome: | + Este emblema é concedido quando você recebe sua primeira curtida numa mensagem. Parabéns, você postou algo que sua comunidade achou interessante, legal ou divertido! + anniversary: | + Este emblema é concedido quanto você é membro por um ano com pelo menos uma mensagem nesse ano. Obrigado por fica por aqui e contribuir com nossa comunidade! + good_share: | + Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 300 visitantes externos. Bom Trabalho! Você mostrou uma discussão interessante para um monte de novas pessoas e nos ajudou a crescer. + great_share: | + Este emblema é concedido por compartilhar um link de uma mensagem que foi visitada por 100 visitantes externos. Nossa! Você promoveu uma discussão interessante para uma grande nova audiência para esta comunidade, e nos ajudou a crescer bastante. + nice_post: | + Este emblema é concedido por criar uma resposta que conseguiu 10 curtidas. Bom trabalho! + nice_topic: | + Este emblema é concedido por criar um tópico que conseguiu 10 curtidas. Bom trabalho! + good_post: | + Este emblema é concedido por criar uma resposta que conseguiu 25 curtidas. Bom trabalho! + good_topic: | + Este emblema é concedido por criar um tópico que conseguiu 25 curtidas. Bom trabalho! + great_post: | + Este emblema é concedido por criar um tópico que conseguiu 50 curtidas. Uau! + great_topic: | + Este emblema é concedido por criar uma resposta que conseguiu 50 curtidas. Uau! + basic: | + Este emblema é concedido quando você alcança o nível de confiança 1. Obrigado por permanecer por aqui e ler alguns tópicos para aprender sobre o que é nossa comunidade. Suas restrições de novo usuário foram suspensas, e você ganhou todas habilidades essenciais de comunidade, como mensagens pessoais, sinalizações, edições de wiki, e habilidade de postar imagens e múltiplos links. + member: | + Este emblema é concedido quando você alcança o nível de confiança 2. Obrigado por participar durante essas semanas da nossa comuniadde. Você pode agora enviar convites pessoais da sua página de usuário ou de tópocos individuais, criar mensagens de grupo, e algumas curtidas a mais por dia. + regular: |+ + Este emblema é concedido quando você alcança o nível de confiança 3. Obrigado por ser parte regular da nossa comunidade durante todos esses meses, um dos mais ativos leitores e colaborador confiável para o que faz essa comunidade grande. Você pode agora recategorizar e renomear tópicos, acessar a área privada do lounge, sinalizações mais fortes de spam, e muito mais curtidas por dia. + + leader: | + Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia. admin_login: success: "Email Enviado" error: "Erro!" email_input: "Email do Administrador" submit_button: "Enviar Email" + discourse_hub: + access_token_problem: "Diga para um administrador: Por favor atualize as configurações do site para incluir a correta discourse_org_access_key." + performance_report: + initial_post_raw: Este tópico inclui relatórios de performance diários de seu site. + initial_topic_title: Relatórios de performance do Site diff --git a/config/locales/server.ro.yml b/config/locales/server.ro.yml index 2d320356c2..3c3d30ec8f 100644 --- a/config/locales/server.ro.yml +++ b/config/locales/server.ro.yml @@ -1140,7 +1140,6 @@ ro: signup_after_approval: subject_template: "Ați fost aprobat pe site-ul %{site_name}!" signup: - subject_template: "[%{site_name}] Activați noul cont" text_body_template: | Bine ați venit la %{site_name}! @@ -1169,8 +1168,6 @@ ro: pasted_image_filename: "Lipire imagine" store_failure: "Încercare de încărcare eșuată #%{upload_id} pentru utilizatorul #%{user_id}." images: - fetch_failure: "Ne pare rău, s-a produs o eroare la încercarea de a recupera imaginea." - unknown_image_type: "Ne pare rău, dar fișierul pe care încercați să-l încărcați nu pare să fie o imagine." size_not_found: "Ne pare rău, nu am putut determina mărimea imaginii. Poate este coruptă?" flag_reason: sockpuppet: "Un utilizator nou a creat o discuție, iar un alt utilizator cu același IP a răspuns. Vedeți setarea flag_sockpuppets în site." @@ -1203,235 +1200,8 @@ ro: Editează prima postare în această discuție pentru a schimba conținutul paginii %{page_name}. guidelines_topic: title: "FAQ/Informații de ajutor" - body: | - - - ## [Acesta este un loc civilizat pentru discuții publice](#civilized) - - Vă rugăm tratați aceast forum de discuții ca și un parc public. Și noi, suntem o resursă împărțită a comunității; un loc unde se împart abilități, cunoștințe și interes prin conversații continue. - - Acestea nu sunt reguli grele ce nu pot fi urmate, sunt menite doar să ajute judecata umană a comunității noastre. Folosiți regulile pentru a-l menține că un loc curat, degajat menit pentru discursuri publice civilizate. - - - - ## [Pentru a îmbunătății discuția](#îmbunătățește) - - Ajutați-ne să facem aici un loc excelent pentru discuții ajutând mereu la îmbunătățirea discuțiilor în orice fel, cât de mic. Dacă nu sunteți sigur că postarea dvs se leagă la conversație, reformulați încă odată informația și încercați mai târziu. - - Discuțiile avute aici contează pentru noi, vrem să acționați ca și când ar conta și pentru voi. Fiți respectuoși față de discuții și de persoanele ce le întrețin, chiar dacă nu sunteți de acord cu ceea ce e discutat. - - Un mod de a inbunătății discuțiile ar fi acela de a descoperii pe cele deja existente. Vă rugăm petreceți ceva timp uitându-vă peste discuții înainte de a răspunde sau de a începe una proprie, așa veți avea șanse mai mari să cunoașteți persoane ce vă împărtășesc interesele. - - - - ## [Fiți de acord, Chiar și când nu sunteți de acord](#deacord) - - Poate aveți tendința să răspundeți la ceva prin afișarea dezacordului. E normal. Dar, Amintiți-vă să criticați idei nu persoane. Vă rugăm evitați: - - * Porecle. - * Atacul la persoană. - * Răspunsul la tonul unei postări în locul informației. - * Contrazicerea defectuoasă. - - Mai bine, Dați contra-argumente rezonabile ce pot îmbunătății conversația. - - - - ## [Participarea dvs. contează](#participare) - - Conversația pe care o avem aici da tonul tuturor. Ajutați la influențarea viitorului aceste comunități prin angajarea în discuții ce fac forumul un loc interesant de vizitat — și evitațile pe cele ce nu sunt interesante. - - Discourse oferă mijloace ce permit comunității să indentifice colectiv cele mai bune (și cele mai proaste) contribuții: favorite, semne de carte, aprecieri, marcaje, răspunsuri, editări, șamd. Folosiți aceste mijloace pentru a vă îmbunătății experienta dvs și a altora. - - Să încercăm să lăsăm parcul în condiții mai bune decât l-am găsit. - - - - ## [Dacă observați o problemă, marcați-o](#marcati-probleme) - - Moderatorii au o autoritate specială; Suntem responsabili de acest forum. dar și voi, de asemenea . cu ajutorul vostru, moderatorii pot fi facilitatorii comunității, nu doar oamenii de serviciu sau poliția. - - Când observați o purtare necorespunzătoare, nu răspunde-ți. Asta încurajează și mai mult, vă consuma energia, și irosește timpul tuturor. _Doar marcați-o_. Dacă suficiente marcaje se adună, se vor lua măsuri, ori automat, ori prin intervenția unui moderator. - - Pentru a menține comunitatea , moderatorii își rezerva dreptul de a scoate orice fel de conținut și orice cont de utilizator pentru orice motiv, oricând. Moderatorii nu previzualizează postările noi în niciun mod; Moderatorii și operatorii site-ului nu își asumă nicio responsabilitate pentru niciun conținut postat de comunitate. - - - - ## [Întotdeauna fiti-civilizati](#Fiti-civilizati) - - Nimic nu sabotează o conversație plăcută ca nepolitețea: - - * Fiți civilizați. Nu postați nimic ce o persoană rezonabilă ar putea considera ofensiv, abuziv, sau cuvinte de ură. - * Mențineți totul decent. Nu postați nimic obscen sau sexual explicit. - * Respectați-vă reciproc. Nu hartuiți sau supărați pe nimeni, nu vă dați drept altcineva și nu expuneți informațiile lor private. - * Respectați forumul nostru. Nu postați spam-uri și nu vandalizați în alte moduri forumul. - - Aceștia nu sunt termeni stricți definiți — evitați până și _aparenta_acestor lucruri. Dacă sunteți nesigur, întrebați-vă cum v-ați smtii dacă postarea dumneavoastră ar apărea pe prima pagină din New York Times. - - Acesta este un forum public, și motoarele de căutare arată aceste discuții. Păstrați limbajul, adresele și imaginile în limite normale pentru a fi vizualizate și de prieteni sau familie. - - - - ## [Mențineți ordonat](#mentineti-ordonat) - - Faceți efortul de a pune lucrurile în locul corespunzător, ca să putem acorda cât mai mult timp discuțiilor și nu curățeniei. Astfel: - - * Nu deschideți o discuție în categoria greșită. - * Nu postați același lucru în mai multe discuții. - * Nu postați răspunsuri fără conținut. - * Nu divagați discuția schimbându-i sensul. - * Nu semnați postările — fiecare postare are informația profilului dvs atașat. - - Decât să postați “+1” sau “De acord”, folosiți butonul pentru apreciere. Decât să duceți o discuție într-un alt sens ,folisti răspuns într-o nouă discuție. - - - - ## [Postați numai propriile informații](#furt) - - Nu puteți posta nimic digital ce aparține altcuiva fără permisune. Nu puteți posta descrieri despre un astfel de conținut, adrese către, sau alte metode de furt a proprietății intelectuale ce aparține altcuiva (software, video, audio, imagini), sau să încălcați legea în orice alt mod. - - - - ## [Termeni și condiții](#tsc) - - Da, limbajul legal este plictisitor, dar trebuie să ne protejăm – și prin extensie, utilizatorii și datele lor – împotriva celor rău intenționați. Avem [Termenii și condițiile](/tsc) ce descriu purtarea corespunzătoarea a voastră (și a noastră) și drepturile legate de conținut, intimitate și legi. Pentru a folosii acest serviciu, trebuie să fiți de acord [TSC](/tsc). tos_topic: title: "Acordul de servicii" - body: | - Următorii termeni și condiții ce guvernează folosirea site-ului %{company_domain} și tot ce conține acesta, Produsele și serviciile disponibile prin site-ul web, inclusiv, dar nu limitat la forumul % {company_domain} ,suportul de forum % {company_domain} și serviciul de găzduire % {company_domain}. Website-ul este deținut și operat de % {company_full_name} ("% {company_name}"). Site-ul Web este oferit sub rezerva acceptării dumneavoastră fără modificarea tutor termenilor și condițiilor conținute în acest document și toate celelalte regulile de operare, politicile (inclusiv, fără limitare, % {company_domain} ' [Politica de Confidențialitate] ( /confidențialitate) și [Liniile directoare comunitare] ( /faq)) și procedurile care pot fi publicate din când în când pe acest Site de % {company_name}. - - Vă rugăm citiți acest acord cu atenție înainte să începeți să folisiți website-ul. Accesând sau folosind orice parte a acestui site, sunteți de acord să vă supuneți termenilor și condițiilor cerute. Dacă nu sunteți de acord cu acestea, vă este interzis să folosiți acest website sau oricare dintre părțile lui. Acești termeni și condiții sunt considerați a fi o oferta din partea %{company_name}, acceptarea lor este express limitată în acești termeni. Acest website este dedicat celor ce au depășit vârsta de 13 ani. - - - - ## [1. Primul dvs. cont %{company_domain} (#1) - - Dacă creați un cont pe acest website, sunteți responsabil pentru securitatea acestuia precum și totate activitățile ce iau naștere din folosirea lui. Trebuie să notificați de îndată %{company_name} de orice pătrundere de securitate și folosință a contului dvs. %{company_name} nu va fi trasă la răspundere pentru niciun act de omisune din partea dvs, incluzând orice daună de orice fel rezultată în urma unui act de omisune. - - - - ## [2. Responsibilitatea Contribuitorilor](#2) - - Dacă postați materiale pe aces website, adrese, sau faceți disponibil dumneavoastră ( sau oricare altă parte terță), Veți fi responsabil deplin de aceste conținuturi și de orice rău rezultat din acestea. Acestea se aplică dacă contextul reprezintă text, elemente grafice, audio , sau software. Făcând contextul valabil, vă asumați răspunderea ca: - - * Descărcarea, copierea și utilizarea conținutului nu va încălca drepturile de proprietate, inclusiv, dar nu limitat la autor, patent, marcă comercială său secret comercial drepturi, a oricărei terțe părți; - * Dacă angajatorul dvs are drepturi de proprietate intelectuală să creeze, sau ați primit permisiunea din partea angajatorului dvs.pentru a posta sau a pune la dispoziție conținut, inclusiv, dar nu limitat la orice software, sau sunteți asigurat de la angajatorul dvs că sunt respectate toate drepturile conținutului; - * Sunteți de acord cu orice parte terță licențiată legată de conținut, și ați respectat toate lucrurile ce vă permit să treceți cu succes la utilizatorul final respectând termenii necesari; - * Conținutul nu conține și nu instalează viruși, worm-uri, malware, virus Troian sau orice alt content distructiv; - * Conținutul nu este spam, sau robot- sau generat aleatoriu și nu conține conținut comerical non etic sau nedorit menit să atragă atenția asupra unui alt site sau să mărească eficacitatea site-ului respectiv pe motoarele de căutare, sau alte acte nedemne (ca înșelătoriile) sau recipiente înșelătoare vis-a-vis de sursa materialului; - * Conținutul nu este pornografic, nu conține amenințări sau acte ce incita la violență, și nu încalca intimitatea sau drepturile publice unei terțe părți; - * Conținutul dvs. nu este obținerea de publicitate prin mesaje electronice nedorite, cum ar fi link-uri de tip spam pe grupuri de știri, liste de email, bloguri și site-uri, sau alte metode promoționale; - * Conținutul dvs. nu este numit într-un mod care induce în eroare cititorii dvs. de a crede că sunteți o altă persoană sau societate; și - * Aveți, în cazul de conținut ce include cod de computer, clasificate corect și / sau ce descrie tipul, natura, utilizările și efectele materiale, dacă se solicită acest lucru de către %{company_name} sau altcineva. - - - - ## [3.Conținutul utilizatorului de licență](#3) - - Contribuții ale utilizatorului sunt licențiate sub o [Licența de atribuții creative, comune, non-comerciale de tip distributiv 3.0](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_UȘ). Fără a limita oricare dintre aceste reprezentări sau garanții, %{company_name} are dreptul (dar nu și obligația), la discreția %{company_name} (i) să refuze sau să scoată orice conținut care, în opinia %{company_name}, încalcă orice politică a %{company_name} sau este în orice fel dăunătoare sau inacceptabilă, să rezilieze, sau refuze accesul la utilizarea site-ului de orice persoană sau entitate pentru orice motiv, la discreția %{company_name}. %{company_name} nu va avea nicio obligație să ofere răscumpărare de bani plătită anterior. - - - - - ## [4. Plata și reinoire](#4) - - ### Termeni generali - - Plățile opționale sau reactualizările sunt făcute valabile pe website. Când folosiți un serviciu opțional sau reactualizare contra-cost, sunteți de acord să plătiți ccompaniei %{company_name} suma anuală sau lunară indicată. Plată va fi luată printr-o metodă pre-pay din ziua în care începeți să utilizați serviciul său actualizarea și va asigura folosirea acesteia pe durata indicată. Aceste plăți nu sunt returnabile. - - ### Înnoire automată - - În cazul în care nu anunțați %{company_name} înainte de terminarea perioadei de abonare că doriți să opriți folosirea serviciului sau actualizării, abonamentul va fi reinoit automat și ne autorizează să colectăm suma aferentă (asemenea oricărei taxe) folosind orice mijloc de taxare despre care avem cunoștința din partea dvs. Abonamentul poate fi anulat oricând. - - - - ## [5. Servicii](#5) - - ### Găzduire, Servicii de suport - - Găzduirea opțională și serviciile de suport oferite de %{company_name} sub termenii și condițiile pentru asemenea servicii. Prin înscrierea la servicii de Găzduire/Suport sau cont de serviciu de Suport, sunteți de acord să vă supuneți termenilor și condițiilor. - - - - ## [6. Responsabilitățile utilizatorilor de pe site](#6) - - %{company_name} nu a vizionat, și nu poate viziona, toate materialele, incluzând programe, postări pe website, deci nu este responsabilă pentru aceste conținuturi, folosințe sau efecte. Folosind website-ul, %{company_name} nu reprezintă sau promovează materialul postat, nu e de părere că materialul este corect, folositor sau dăunător. Sunteți responsabil pentru a lua măsuri de precauție după cum este necesar pentru dvs. și sistemul pc în protejarea de viruși, viermi, cai troieni, și alte tipuri de conținut dăunător sau distructiv. Site-ul poate conține conținut care este ofensator, indecent, sau în caz contrar criticabil, precum și conținut care implică inexactități tehnice, greșeli ortografice, sau alte erori. Site-ul poate conține, de asemenea, materiale care încalcă drepturile de confidențialitate sau publicitate, sau încalcă proprietatea intelectuală și alte drepturi de proprietate intelectuală, ale unor terțe părți, sau de descărcarea, copierea sau utilizarea care este supusă termenilor și condițiilor suplimentare. % {Company_name} își declină orice responsabilitate pentru orice daună care rezultă din utilizarea de către vizitatori a Site-ului Web, sau de la orice descărcarea de către vizitatori a conținutului afișat. - - - - ## [7. Conținutul Postat pe alte Website-uri](#7) - - Nu am revizuit, și nu putem analiza, toate materialele, inclusiv programele de calculator, puse la dispoziție prin site-uri web și pagini web pentru care %{company_domain} afișează adrese, acele adrese către %{company_domain}. %{company_name} nu are control asupra celor ce %{company_domain} nu le dinte și nu este responsabilă pentru conținutul lor. Postând adresa către un non-%{company_domain} website, %{company_name} nu reprezintă sau promovează aceast website. Este necesar ca dumneavoastră să luați măsurile necesare împotriva atacurilor software de genul virușilor, viermilor, virușilor troian și restului de conținut distructiv. %{company_name} refuza orice responsabilitate în folosință dvs a oricăror non-%{company_domain} website-uri. - - - - ## [8. Încălcarea de Copyright și politica DMCA](#8) - - Cum % {company_name} cere altora să-și respecte drepturile de proprietate intelectuală, ea respectă drepturile de proprietate intelectuală ale altora. Dacă sunteți de părere că materialul postat pe %{company_domain} încalcă dreptul dvs de proprietate, iar acest website e pe teritoriul USA , sunteți încurajați să anunțați %{company_name} în conformitate cu actul %{company_name} [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) Politica ("DMCA"). %{company_name} va răspunde acestor notificări, inclusiv cum este necesar sau adecvat prin scoaterea materialului ilicit și dezactivarea toaturor link-urilor. %{company_name} va încheia accesul utilizatorului la website, dacă ,în repetate rânduri, utilizatorul e determinat să încalce aceste drepturi de copyright sau alte proprietăți intelectuale ale %{company_name}. În cazul unei asemenea excluderi, %{company_name} nu va avea obligația de a oferii remunerația financiară plătită precedent către %{company_name}. - - - - ## [9. Proprietatea intelectuală](#9) - - Acest acord nu este transferabil de la %{company_name} către orice altă %{company_name} sau părți terțe în ceea ce privește proprietatea intelecutala, cu taotae drepturile, titlurile și interesele acest tip de proprietate v-a rămâne sub proprietatea %{company_name}. %{company_name}, %{company_domain}, Logo-ul %{company_domain} și toate trademark-urile, logo-urile grafice folosite în legătură cu %{company_domain}, sau a Website-ului sunt trademark-uri sau mărci înregistrate %{company_name} sau a licenței %{company_name}. Celelalte mărci comerciale, mărci de servicii, grafică și siglele folosite în legătură cu site-ul pot fi mărci comerciale ale altor terțe părți. Folosirea Website-ului de către dvs nu dă dreptul reproducerii sau folosirii oricărei mărci înregistrate ale %{company_name} sau a altei terțe părți. - - - - ## [10. Reclamele](#10) - - %{company_name} își rezerva dreptul de a posta reclame cu conținutul dvs ,exceptând cazul în care ați cumpărat actualizare fara-anunțuri sau a unui cont de servicii. - - - - ## [11. contribuții](#11) - - %{company_name} își rezervă dreptul de a posta contribuții ca ‘prin intermediul %{company_domain},’ și atribute de font în subsol sau panoul de unelte. Informațiile din subsol și panoul de unelte %{company_domain} nu pot fi scoase indiferent de ce reactualizare beneficiați. - - - - ## [12. Schimbări](#12) - - %{company_name} își rezervă dreptul la propria discreție , să modifice oricare parte din acest acord. Este responsabilitatea dvs. să verificați acest acord periodic pentru schimbări.Accesarea website-ului după ce aceste modificări au fost făcute constituie acceptarea dvs. implicită a acestora. %{company_name} ar putea, pe viitor, să ofere noi servicii sau caracteristici (incluzând, lansarea unor noi unelte și resurse). și aceste servicii noi se vor supune aceluiași acord. - - - - ## [13. Termination](#13) - - %{company_name}poate termina accesul dvs. parțial sau total la website oricând, fără nicio cauză, fără nicio avertizare, efectiv imediat. Dacă doriți să anulați acest acord sau contul dvs. de pe %{company_domain}, puteți să vă oprii în a foslosii siteul.Toate dispozițiile prezentului acord care, prin natura lor, ar trebui să supraviețuiască reziliere vor supraviețui încetării, inclusiv, fără limitare, dispoziții de proprietate, condiții legale de garanție, indemnizație și limitările de răspundere. - - - - ## [14. Garanția de Disclaimer](#14) - - Site-ul este furnizat "ca atare". %{company_name}, furnizorii și deținătorii de licențe se exonerează de orice garanție, explicită sau implicită, incluzând, fără limitare, garanțiile de vandabilitate, adecvate pentru un anumit scop și non-încălcabile. Nici %{company_name} nici furnizorii și licențiatorii săi,nu fac orice garanție că site-ul va fi fără erori sau că acesta va fi procesat continuu sau neîntrerupt. Dacă chiar citiți asta, aici este [un tratat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). Înțelegeți că descarcați de la, sau altfel spups obțineți informații prin intermediul Website-ului pe proriile riscuri. - - - - ## [15. Limitare de răspundere](#15) - - În nici un caz %{company_name}, furnizori sau licențiatorii săi nu vor răspunde cu privire la orice subiect a acestui acord sub​orice contract, neglijență, răspundere strictă sau altă teorie juridică sau echitabil pentru: (i) orice speciale, accidentale sau daunele indirecte; (ii) costul de achiziție pentru produse sau servicii de substituție; (iii) pentru întrerupere de utilizare sau pierderea sau coruperea datelor; sau (iv) pentru orice sume care depășesc taxele plătite de tine către %{company_name} în temeiul prezentului acord pe parcursul perioadei de douăsprezece (12) luni înainte de cauză de acțiune. %{company_name} nu va avea nici o responsabilitate pentru orice eșec sau întârziere din cauza problemelor de dincolo de controlul lor rezonabil. Cele de mai sus nu se vor aplica în măsura în care este interzis de legislația în vigoare.. - - - - ## [16. Reprezentarea generală și garanție](#16) - - Declarați și garantați că (i) utilizarea de către dvs. a site-ului va fi în strictă conformitate cu %{company_name} [Politica de confidențialitate](/intimitate), [Regulile comune](/reguli-comune), cu prezentul acord și cu toate legile și reglementările aplicabile (inclusiv, dar fără a se limita la orice lege sau reglementare locale din țară, stat, oraș, sau alt domeniu guvernamental, în ceea ce privește comportamentul on-line și conținut acceptabil, inclusiv toate legile aplicabile privind transmiterea de date tehnice exportate din țara în care locuiește acest site sau țara în care locuiți) și (îi) utilizarea de către dvs. a site-ului nu va încălca sau deturna drepturile de proprietate intelectuală ale unei terțe părți. - - - - ## [17. Despăgubiri](#17) - - Sunteți de acord să despăgubiți %{company_name}, subcontractorii săi și licențiatorii săi, precum și directorii respectivi, ofițerii, angajații de agenții, împotriva oricăror și tuturor creanțelor și cheltuielilor, incluzând onorariile avocaților, ce rezultă din utilizarea de către dvs. a site-ului, inclusiv, dar fără a se limita la încălcarea de către dvs. a acestui acord. - - - - ## [18. Diverse](#18) - - Prezentul acord constituie întregul acord între %{company_name} și tu cu privire la obiectul acestuia, și ele pot fi modificate doar de către un amendament scris, semnat de un executiv autorizat de %{company_name}, sau prin detașarea cu %{company_name} de o versiune revizuită. Cu excepția legii măsură aplicabilă, dacă este cazul, nu prevede altfel, prezentul acord, orice acces la sau utilizare a site-ului vor fi guvernate de legile statului California, Statele Unite ale Americii, cu excepția conflictelor cu prevederile legii, iar locul potrivit pentru orice litigii care decurg din sau în legătură cu oricare dintre acestea va fi instanța de stat și federală situate în San Francisco, California. Cu excepția cererilor de ordonanță prezidențială sau echitabila sau revendicării legate de drepturile de proprietate intelectuală (care pot fi introduse în orice instanță competentă, fără detașarea unei obligațiuni), orice litigiu care rezultă în temeiul prezentului acord se soluționează în cele din urmă, în conformitate cu Regulile de arbitraj cuprinzătoare ale Arbitraj judiciară și serviciu de mediere, Inc ("blocajelor") de către trei arbitri numiți în conformitate cu aceste reguli. Arbitrajul va avea loc în San Francisco, California, în limba engleză, iar decizia arbitrală poate fi aplicată în orice tribunal.Partea care prevalează în orice acțiune sau procedură de aplicare a prezentului acord are dreptul la costurile și onorariile avocaților. Dacă orice parte a acestui acord este ținut invalid sau inaplicabilă, acea parte va fi interpretată pentru a reflecta intenția inițială a părților, iar porțiunile rămase vor rămâne în vigoare și cu efecte depline. O renunțare de către oricare dintre părți a oricărui termen sau condiție a prezentului acord sau orice încălcare a acestora, în orice caz, nu se va renunța la astfel de termen sau condiție sau orice încălcare ulterioară a acestora. Puteți atribui drepturile dumneavoastră în temeiul prezentului acord pentru orice partid care consimte la, și este de acord să fie legat de, termenii și condițiile sale; %{company_name} poate cesiona drepturile sale în temeiul prezentului acord, fără condiție. Prezentul acord va fi obligatorie și va intra în vigoare în beneficiul părților, succesorilor lor și împuterniciții permise. - - Acest document este CC-BY-SA. Acesta a fost actualizat ultima dată 31 mai 2013. - - Inițial, adaptat de la [Termenii serviciului WordPress](http://en.wordpress.com/tos/). privacy_topic: title: "Politica de confidențialitate" body: | diff --git a/config/locales/server.ru.yml b/config/locales/server.ru.yml index 650168a444..21e0c17430 100644 --- a/config/locales/server.ru.yml +++ b/config/locales/server.ru.yml @@ -266,7 +266,8 @@ ru: assets_topic_body: "Это постоянная тема, для хранения изображений и файлов, используемых в дизайне сайта, доступная только сотрудникам. Не удаляйте её! \n\n\nВаши действия:\n\n\n1. Ответьте в эту тему.\n2. Загрузите все изображения, которые вы хотите использовать для логотипов, значков и т.д. сюда. (Используйте значок на панели инструментов в редакторе сообщений, перетащите мышкой, или вставьте изображения из буфера.) \n3. Сохраните свое сообщение.\n4. Щелкните правой кнопкой мыши изображении в новом сообщении, чтобы получить путь к загруженным изображениям, или щелкните значок редактирования и получите путь к изображениям. Скопируйте пути к изображениям.\n5. Вставьте эти пути в [Настройки сайта] (/admin/site_settings/category/required) .\n\n\nЕсли Вам нужно активировать дополнительные типы файлов, отредактируйте `authorized_extensions` во вкладке [Файлы] (/admin/site_settings/category/files)." lounge_welcome: title: "Добро пожаловать в Фойе" - body: "\nПоздравляем! :confetti_ball:\n\nЕсли вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).\n\nУвас появились новые возможности …\n\n* Вы можете редактировать заголовок любого обсуждения\n* Вы можете менять категорию обсуждения\n* С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)\n* Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше \n* Вы можете скрывать нежелательные сообщения в один клик\n\nС полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.\n\nСпасибо Вам за то что являетесь важным членом нашего сообщества!\n\n(Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется до тех пор пока вы придерживаетесь этих правил.)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n" + body: "\nПоздравляем! :confetti_ball:\n\nЕсли вы видите данное сообщение, вы достигли уровня **regular** (уровень доверия 3).\n\nУвас появились новые возможности …\n\n* Вы можете редактировать заголовок любого обсуждения\n* Вы можете менять категорию обсуждения\n* С ваших ссылок снимается ограничения nofollow ([automatic nofollow](http://en.wikipedia.org/wiki/Nofollow) is removed)\n* Вы получили доступ к закрытым категориям, которые доступны только для уровня доверия 3 и выше \n* Вы можете скрывать нежелательные сообщения в один клик\n\nС полным списком привелегий вы можете ознакомиться тут [current list of fellow regulars](/badges/3/regular). Пожалуйста прочитайте это.\n\nСпасибо Вам за то что являетесь важным членом нашего сообщества!\n\n(Для получения более детальной информации об уронях доверия посмотрите тут [see this topic][trust]. Напоминаем что данный уровень доверия сохраняется\ + \ до тех пор пока вы придерживаетесь этих правил.)\n\n[trust]: https://meta.discourse.org/t/what-do-user-trust-levels-do/4924\n" category: topic_prefix: "Описание раздела %{category}" replace_paragraph: "[Замените данный текст кратким описанием нового раздела. Это описание будет отображаться в списке разделов, поэтому постарайтесь сделать его коротким (не более 200 символов).]" @@ -513,6 +514,7 @@ ru: regular: title: "Обычная тема" banner: + title: "Тема-объявление" message: make: "Эта тема теперь является объявлением и будет отображаться сверху на всех страницах, пока пользователи не скроют его, каждый сам для себя." remove: "Эта тема теперь не является объявлением и больше не будет отображаться вверху всех страниц." @@ -620,6 +622,14 @@ ru: title: "Всего" xaxis: "Дата" yaxis: "Всего API запросов" + page_view_logged_in_mobile_reqs: + title: "Авторизованные API запросы" + xaxis: "Дата" + yaxis: "Авторизованные мобильные API запросы" + page_view_anon_mobile_reqs: + title: "Анонимные API запросы" + xaxis: "Дата" + yaxis: "Анонимные мобильные API запросы" http_background_reqs: title: "Фоновые" xaxis: "Дата" @@ -652,6 +662,10 @@ ru: title: "Темы без ответов" xaxis: "Дата" yaxis: "Всего" + mobile_visits: + title: "Визиты форумчан" + xaxis: "Дата" + yaxis: "Количество визитов" dashboard: rails_env_warning: "Ваш сервер работает в режиме %{env}." ruby_version_warning: "Вы используете версию Ruby 2.0.0, у которой имеются известные проблемы. Обновите версию до patch-247 или более новую." @@ -825,6 +839,7 @@ ru: login_required: "Требовать авторизации для доступа к сайту, анонимный доступ запретить." min_username_length: "Минимально допустимая длина псевдонима. ВНИМАНИЕ: СУЩЕСТВУЮЩИЕ ПОЛЬЗОВАТЕЛИ С ПСЕВДОНИМОМ КОРОЧЕ ЭТОГО ЗНАЧЕНИЯ НЕ СМОГУТ ПОЛЬЗОВАТЬСЯ САЙТОМ." max_username_length: "Максимально допустимая длина псевдонима. ВНИМАНИЕ: СУЩЕСТВУЮЩИЕ ПОЛЬЗОВАТЕЛИ С ПСЕВДОНИМОМ ДЛИННЕЕ ЭТОГО ЗНАЧЕНИЯ НЕ СМОГУТ ПОЛЬЗОВАТЬСЯ САЙТОМ." + reserved_usernames: "Псевдонимы, запрещенные для регистрации" min_password_length: "Минимальная длина пароля" block_common_passwords: "Не позволять использовать пароли из списка 10 000 самых частоиспользуемых паролей." enable_sso_provider: "Реализация протокола SSO провайдера через /session/sso_provider , необходимо установить sso_secret" @@ -1001,12 +1016,14 @@ ru: sequential_replies_threshold: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах." enable_mobile_theme: "Мобильные устройства используют адаптированную тему с возможностью переключения в обычный вид. Отключите данную настройку если вы хотите использовать собственный стиль для мобильных устройств." dominating_topic_minimum_percent: "Количество сообщений, отправленных пользователем подряд в одной теме, прежде чем ему будет показано предупреждение о слишком частых ответах." + daily_performance_report: "Ежедневно анализировать логи сервера NGINX и отправлять сообщение с результатами анализа в тему, видимую только персоналу." suppress_uncategorized_badge: "Не показывать награду в списках тем для тех тем, которые вне разделов." global_notice: "Показать СРОЧНОЕ ВАЖНОЕ объявление на сайте всем пользователям и посетителям. Удалите содержание, чтобы отменить объявление. Разрешено использование HTML." disable_edit_notifications: "Отключить уведомления системы пользователя когда 'download_remote_images_to_local' активна." full_name_required: "Полное имя это обязательное поле для профиля пользователя." enable_names: "Отображать полное имя пользователя на его странице пользователя, карточке пользователя и в письмах. Выключите, чтобы спрятать полное имя отовсюду." display_name_on_posts: "Показывать полные имена пользователей в их сообщениях в дополнение к их @нику." + show_time_gap_days: "Если между двумя сообщениями в одной теме прошло столько дней, показывать этот промежуток текстом в теме между этими сообщениями." invites_per_page: "Приглашения по умолчанию отображаются на странице пользователя." short_progress_text_threshold: "После достижения указанного числа сообщений в теме, бар будет отображать только текущий номер сообщения. Если вы измените ширину бара, вы можете изменить это значение." default_code_lang: "Подсветка синтаксиса по умолчанию для блоков кода (lang-auto, ruby, python etc.)" @@ -1093,6 +1110,7 @@ ru: other: "%{count} сообщений перенесены в уже существующую тему: %{topic_link}" change_owner: post_revision_text: "Владелец сменен с %{old_user} на %{new_user}" + deleted_user: "Удаленный пользователь" emoji: errors: name_already_exists: "Название \"%{name}\" уже используется для другой иконки." @@ -1158,6 +1176,7 @@ ru: omniauth_error_unknown: "В процессе входа на сайт произошла ошибка. Пожалуйста, повторите попытку." new_registrations_disabled: "Новые регистрации сейчас ограничены." password_too_long: "Максимальная длина пароля - 200 символов." + reserved_username: "Такой псевдоним не разрешен." missing_user_field: "Вы не заполнили все поля пользователя" close_window: "Аутентификация выполнена. Закройте это окно для продолжения." user: @@ -1736,7 +1755,6 @@ ru: (Если вам требуется помощь [администрации](%{base_url}/about), вы можете задать свой вопрос, просто ответив на данное письмо.) signup: - subject_template: "[%{site_name}] Активируйте свою учетную запись" text_body_template: | Добро пожаловать на сайт %{site_name}! @@ -1768,8 +1786,6 @@ ru: too_large: "Файл, который вы пытаетесь загрузить, слишком большой (максимальный разрешенный размер %{max_size_kb}%kb)." images: too_large: "Изображение, которое вы пытаетесь загрузить, слишком большое (максимальный разрешенный размер %{max_size_kb}%kb), пожалуйста, уменьшите размер изображения и повторите попытку." - fetch_failure: "Извините, во время извлечения изображения произошла ошибка." - unknown_image_type: "Файл, который вы загружаете, не является изображением." size_not_found: "Извините, мы не можем определить размер изображения. Возможно, изображение повреждено?" flag_reason: sockpuppet: "Новый пользователь создал тему и другой новый пользователь с того же IP адреса ответил. Для получения подробностей см. настройку сайта flag_sockpuppets." @@ -1802,116 +1818,8 @@ ru: Отредактируйте первое сообщение этой темы чтобы изменить содержание страницы {page_name}. guidelines_topic: title: "Руководство и часто задаваемые вопросы" - body: | - - - ## [Это цивилизованное место для публичной дискуссии](#civilized) - - Пожалуйста, относитесь к этому форуму с таким же уважением, с которым вы отнеслись бы к общественому парку. Наше сообщество — это место для обмена навыками, знаниями и интересами через общение. - - Здесь нет строгого и краткого свода правил, только лишь общее руководство по управлению нашим сообществом. Используйте эти рекомендации для того, чтобы сохранить этот форум чистым и хорошо освещенным местом для цивилизованного публичного общения. - - - - ## [Улучшайте дискуссию](#improve) - - Помогите нам сделать этот форум замечательным местом для общения, улучшая дискуссию любым возможным способом, даже незначительным. Если вы не уверены, что ваше сообщение улучшит дискуссию, подумайте еще раз, что вы хотите сказать на самом деле, или попытайтесь написать чуть позже. - - Темы, обсуждаемые на этом форуме, имеют для нас значение, и мы хотим, чтобы они имели значение для вас. Уважайте темы и людей, которые их обсуждают, даже если вы не согласны с чем-либо, что было сказано. - - Вы сможете улучшить дискуссию, изучив темы, которые уже обсуждаются. Пожалуйста, потратьте немного своего времени, исследуя существующие темы перед тем, как ответить или начать новую. Так вы сможете увеличить шанс встреть людей, разделяющих ваши интересы. - - - - ## [Будьте цивилизованны, даже если вы не согласны](#agreeable) - - Возможно, вы захотите ответить, не соглашаясь с чем-то. Это нормально. Но помните, что _следует критиковать идеи, а не людей_. Пожалуйста, избегайте: - - * Ругательства. - * Перехода на личности. - * Реакции на тон сообщения вместо его содержания. - * Рефлекторной, необдуманной реакции. - - Вместо этого приведите обоснованный контраргумент, который улучшит дискуссию. - - - - ## [Ваше участие имеет решающее значение](#participate) - - Обсуждения, которые мы ведем на этом форуме, задают тон каждому участнику. Помогите нам повлиять на будущее этого сообщества, активно включаясь в обсуждения, которые делают форум интересным местом, и избегая бесполезных. - - Форум предоставляет инструменты, которые позволяют сообществу совместно определять лучшие (и худшие) вклады: избранное, закладки, лайки, жалобы, ответы, правки и т. д. Используйте эти инструменты, чтобы улучшить свои собственные впечатления и впечатления других участников. - - Давайте сделаем так, чтобы после нашего прихода парк стал лучше, чем он был до нас. - - - - ## [Если вы заметили проблему, сообщите о ней](#flag-problems) - - Модераторы имеют особые полномочия; они в ответе за форум. Но и вы тоже. С вашей помощью модераторы могут стать помощниками сообщества, а не только уборщиками или полицейскими. - - Если вы заметили неприемлемое поведение, не отвечайте. Это поощряет такое поведение, признавая его, расходует ваши силы и тратит время каждого. _Пожалуйтесь_. Если накопится достаточно жалоб, будут приняты необходимые меры, либо автоматически, либо с привлечением модератора. - - В целях поддержки нашего сообщества модераторы оставляют за собой право удалить любые материалы и любого пользователя в любой момент времени и без объяснения причин. Модераторы не занимаются премодерацией новых сообщений; модераторы и операторы сайта не несут ответственности за содержание материалов, размещенных пользователями форума. - - - - ## [Всегда будьте цивилизованны](#be-civil) - - Ничто не вредит здоровому общению так, как грубость: - - * Будьте цивилизованны. Не публикуйте ничего такого, что разумный человек счел бы обидным, оскорбительным или враждебным. - * Содержите форум в чистоте. Не публикуйте непристойные или сексуально откровенные материалы. - * Уважайте друг друга. Не утомляйте и не раздражайте других, не выдавайте себя за кого-то, кем вы не являетесь, и не публикуйте персональные данные людей. - * Уважайте наш форум. Не публикуйте спам и не допускайте вандализма в любой форме. - - У нас нет строгих правил с точными определениями — избегайте даже _косвенного сходства_ с недопустимыми вещами. Если вы не уверены, спросите себя, как бы вы себя почувствовали, если ваше сообщение увидели близкие вам люди. - - Это публичный форум, и поисковые машины индексируют его содержимое. Помните, что ваши высказывания, ссылки и изображения могут увидеть несовершеннолетние и ваши друзья. - - - - ## [Будьте аккуратны](#keep-tidy) - - Старайтесь размещать вещи в правильных местах, чтобы мы могли потратить больше времени на общение и меньше на уборку. Поэтому: - - * Не начинайте тему в неподходящей для нее категории. - * Не публикуйте свое сообщение сразу в нескольких местах. - * Не публикуйте бессодержательные сообщения. - * Не отклоняйтесь от темы в середине обсуждения. - * Не подписывайте свои сообщения — к каждому сообщению автоматически прикреплена ссылка на ваш профиль. - - Вместо сообщений "+1" или "Согласен" используйте кнопку "Мне нравится". Вместо разворота темы в совершенно другом направлении используйте функцию "Ответить в новой связанной теме". - - - - ## [Публикуйте только то, на что у вас есть права](#stealing) - - Не следует размещать материалы, принадлежащие другим лицам, без их разрешения. Не следует размещать описания, ссылки или способы кражи чьей-либо интеллектуальной собственности (программы, видео, аудио, изображения) или способы нарушения любого другого закона. - - - - ## [Вы управляете форумом](#power) - - Этот сайт управляется [дружественным коллективом](/about) и *вами*, сообществом. Если у вас есть вопросы, касающиеся принципов работы форума, откройте новую тему в [категории meta](/c/meta) и давайте обсудим их! В случае возникновения критической или срочной проблемы, которая не может быть решена с помощью meta темы или жалобы, свяжитесь с нами через [страницу коллектива](/about). - - - - ## [Условия предоставления услуг](#tos) - - Да, юридические документы скучны, но мы должны защитить себя – и в расширительном смысле вас и вашу информацию – против недоброжелателей. У нас есть раздел [Условия предоставления услуг](/tos), описывающий ваше (и наше) поведение и права относительно содержимого, приватности и закона. Чтобы пользоваться нашими услугами, вы должны согласиться следовать нашим [условиям предоставления услуг](/tos). tos_topic: title: "Пользовательское соглашение" - body: "Настоящие правила регулируют все виды использования сайта %{company_domain}  а также всего контента, предоставляемых услуг и продуктов, в том числе, но не ограничиваясь, %{company_domain} комплекса программного обеспечения, %{company_domain} хостинга (\"Хостинг\"), (совместно объединённых и далее упоминаемое как Веб-сайт). Веб-сайт является собственностью и управляется компанией %{company_full_name} (\"%{company_name}\"). Настоящее соглашение является публичной офертой и принимается пользователем без оговорок, и включает в себя все остальные правила, (в том числе, но неограчиваясь %{company_domain}’s [Политика конфиденциальности](/privacy) и [Правила сообщества](/faq)) а также правила, которые могут быть опубликованы время от времени на этом Веб-сайте %{company_name} (в дальнейшем \"Соглашение\"). \n\nПожалуйста, внимательно прочитайте данное Соглашение, прежде чем начать пользоваться Веб-сайтом. Переходя на данный веб-сайт или используя любую его часть, вы обязуетесь выполнять правила и условия данного соглашения. Если вы не согласны со всеми правилами и условиями данного соглашения, вам запрещается переходить на Веб-сайт или пользоваться какими-либо услугами. Если данные правила и условия рассматриваются как предложение %{company_name}, его принятие недвусмысленно ограничено данными условиями. Доступ к Веб-сайту могут получить только лица не моложе 13 лет.\n\n\n\n## [1.  Ваша учетная запись и сайт на Веб-сайте %{company_domain}](#1)\nПри создании аккаунта на Веб-сайте вы несете ответственность за безопасность своей учетной записи, а также несете полную ответственность за все действия, осуществляемые из данной учетной записи. Вы обязаны незамедлительно уведомить %{company_name} о любом несанкционированном использовании учетной записи, а также о любом другом нарушении безопасности. %{company_name} не несет обязательств за любые действия (или бездействие) с вашей стороны, включая ущерб любого рода, который повлекли за собой такие действия (или бездействие).\n\n\n\n## [2. Обязанности публикаторов](#2)\n\nЕсли вы публикуете сообщения на Веб-сайте, комментируете записи, публикуете материал или ссылки на Веб-сайте либо любым другим способом открываете (или разрешаете любой третьей стороне открывать) доступ к материалу при помощи Веб-сайта (к любому подобному материалу, «Содержимому»), то вы несете полную ответственность за данное содержимое и любой ущерб, вызванный данным Содержимым. Данное условие применяется независимо от того, является ли рассматриваемое Содержимое\ - \ текстом, изображением, аудиофайлом или компьютерным программным обеспечением. Предоставляя доступ к Содержимому, вы заявляете и гарантируете следующее:\n• загрузка, копирование и использование Содержимого не нарушает имущественные права любой третьей стороны, включая, помимо прочего, авторские права, патентные права, права на товарные знаки или на коммерческую тайну.\n• если ваш сотрудник обладает правом на созданную вами интеллектуальную собственность, вы либо (i) получили от данного сотрудника разрешение на публикацию или открытие доступа к Содержимому, включая, помимо прочего, любое программное обеспечение; либо (ii) получили от данного сотрудника добровольный отказ от всех прав на Содержимое;\n• вы полностью соблюли права лицензирования любой третьей стороны, связанные с Содержимым, и сделали все необходимое для передачи конечным пользователям информации обо всех обязательных условиях;\n• Содержимое не содержит и не устанавливает вирусы, программы-«черви», вредоносное или троянское ПО, а также любое другое вредоносное или разрушительное содержимое;\n• Содержимое не является спамом, не генерируется автоматически или случайным образом и не содержит неэтичного либо нежелательного коммерческого содержимого, используемого с целью привлечь трафик на сторонние сайты или повысить рейтинг сторонних сайтов в поисковых системах; а также не производит иных незаконных действий (например, фишинг), и не вводит получателей информации в заблуждение касательно источника материала (например, при злоумышленном искажении информации);\n• Содержимое не является порнографией, не содержит угроз, не поощряет насилие и не нарушает права третьих сторон на конфиденциальность или публичные высказывания;\n• ваш блог не рекламируется при помощи нежелательных электронных сообщений и спам-ссылок в новостных группах, рассылках по электронной почте, других блогах и веб-сайтах, а также с использованием иных нежелательных методов продвижения;\n• в своем блоге вы не выдаете себя за другое лицо или компанию;\n• и при наличии Содержимого, включающего компьютерный код, вы точно определили категорию и (или) описали тип, характер, использование и результаты использования данных материалов в соответствии с запросом компании %{company_name} или иным образом.\nПередавая компании Automattic Содержимое для добавления на свой Веб-сайт, вы предоставляете Automattic глобальную, безвозмездную и неисключительную лицензию на воспроизведение, изменение, адаптацию и публикацию Содержимого, осуществляемую исключительно в целях демонстрации, распространения\ - \ и продвижения вашего блога. Данная лицензия дает %{company_name} право на предоставление доступа к опубликованному содержимому третьим сторонам, выбранным %{company_name} с целью анализа и распространения (но не публикации) вашего содержимого посредством услуг данных третьих сторон.\nВы также предоставляете другим пользователям %{company_domain} право на публикацию вашего Содержимого на других сайтах %{company_domain} и на добавление в ваше Содержимое их собственного Содержимого (т. е. на перепост вашего Содержимого в других блогах) при условии, что они используют только часть вашей публикации и оставят ссылку на ваш сайт, указывающую, что вы являетесь автором исходной публикации (осуществляется автоматически с помощью функции перепоста на %{company_domain}).\nЕсли вы удалите Содержимое, %{company_name} предпримет все возможное для его удаления с Веб-сайта. В то же время вы признаете, что сохраненную в кэше копию или сторонние ссылки на Содержимое невозможно сразу же сделать недоступными.\nНа основании данных заявлений или гарантий %{company_name} обладает неограниченным правом (но не обязательством) без объяснения причин (i) отказать в публикации или удалить любое содержимое, которое %{company_name} обоснованно считает вредоносным, нарушающим какую-либо политику %{company_name} или неприемлемым по любой другой причине; или (ii) приостановить или запретить доступ к Веб-сайту и использование Веб-сайта любому физическому или юридическому лицу без объяснения причин. %{company_name} не обязуется возместить любые ранее выплаченные суммы.\n\n\n\n## [3. Лицензирование публикуемых материалов](#3)\nМатериалы публикуемые пользователем на Веб-сайте регулируются [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US).\nПередавая компании %{company_name} Содержимое для добавления на свой Веб-сайт, вы предоставляете %{company_name} глобальную, безвозмездную и неисключительную лицензию на воспроизведение, изменение, адаптацию и публикацию Содержимого, осуществляемую исключительно в целях демонстрации, распространения и продвижения вашего блога. Данная лицензия дает %{company_name} право на предоставление доступа к опубликованному содержимому третьим сторонам, выбранным %{company_name} с целью анализа и распространения (но не публикации) вашего содержимого посредством услуг данных третьих сторон.\nВы также предоставляете другим пользователям %{company_domain} право на публикацию вашего Содержимого на других сайтах %{company_domain}\ - \ и на добавление в ваше Содержимое их собственного Содержимого (т. е. на перепост вашего Содержимого в других блогах) при условии, что они используют только часть вашей публикации и оставят ссылку на ваш сайт, указывающую, что вы являетесь автором исходной публикации (осуществляется автоматически с помощью функции перепоста на %{company_domain}).\nЕсли вы удалите Содержимое, %{company_name} предпримет все возможное для его удаления с Веб-сайта. В то же время вы признаете, что сохраненную в кэше копию или сторонние ссылки на Содержимое невозможно сразу же сделать недоступными.\nНа основании данных заявлений или гарантий %{company_name} обладает неограниченным правом (но не обязательством) без объяснения причин (i) отказать в публикации или удалить любое содержимое, которое %{company_name} обоснованно считает вредоносным, нарушающим какую-либо политику %{company_name} или неприемлемым по любой другой причине; или (ii) приостановить или запретить доступ к Веб-сайту и использование Веб-сайта любому физическому или юридическому лицу без объяснения причин. %{company_name} не обязуется возместить любые ранее выплаченные суммы.\n\n\n\n## [4. Оплата и продление](#4)\n\n• Общие условия На Веб-сайте доступны дополнительные платные услуги, например дополнительное пространство для хранения или приобретение домена (любые подобные услуги, далее «Платная услуга»). Выбирая Платную услугу, вы соглашаетесь выплачивать %{company_name} ежемесячный или ежегодный взнос за подписку, сумма которого указана для данной услуги. Взносы взимаются на условиях предоплаты в день оформления подписки на Платную услугу и включают плату за использование данной услуги в течение месяца или года, в соответствии с указанными условиями оформления подписки. Стоимость Платных услуг не подлежит возмещению.\n• Автоматическое продление Если вы не сообщили компании %{company_name} о своем желании отменить подписку на Платную услугу до завершения применимого периода подписки, данная подписка будет продлена автоматически. При этом вы предоставляете %{company_name} право на сбор применимой на тот момент ежегодной или ежемесячной платы за подписку на данную Платную услугу (с учетом любых налогов) с помощью имеющихся у компании сведений о любой кредитной карточке или другом способе оплаты, связанном с вами. Платные услуги можно в любой момент отменить в разделе «Покупки» на консоли вашего сайта.\n\n\n\n## [5. Услуги](#5)\n\nУслуги хостинга и поддержки. %{company_name} предоставляет услуги поддержки по соответствующим правилам\ - \ и условиям. Регистрируя учетную запись, вы соглашаетесь соблюдать данные правила и условия.\n\n\n\n## [6. Ответственность посетителей Веб-сайта](#6)\n %{company_name} не проверяет и не может проверить все материалы, включая компьютерное программное обеспечение, размещенные на Веб-сайте, и, как следствие, не может нести ответственность за содержимое, использование или результаты использования данных материалов. Осуществляя руководство Веб-сайтом, %{company_name} не заявляет и не подразумевает одобрение в отношении размещенных на нем материалов, а также собственную уверенность в том, что данные материалы точны, полезны и безопасны. Вы несете ответственность за принятие необходимых мер по защите себя и своих компьютерных систем от вирусов, «червей», троянского ПО и другого вредоносного или разрушительного содержимого. Представленное на Веб-сайте содержимое может являться оскорбительным, нецензурным или спорным, а также содержать технические, типографические и иные ошибки. Также на Веб-сайте может быть представлено содержимое, нарушающее право конфиденциальности, право на публичное высказывание или право на интеллектуальную собственность и другие имущественные права третьих сторон; а также содержимое, на загрузку, копирование или использование которого распространяются дополнительные указанные или негласные правила или условия. %{company_name} отказывается от любой ответственности за любой ущерб, причиненный в результате использования Веб-сайта посетителями или загрузки ими любого размещенного на нем содержимого.\n\n\n\n## [7. Содержимое, опубликованное на других веб-сайтах](#7)\n\nМы не проверяем и не можем проверить все материалы, включая компьютерное программное обеспечение, доступное на веб-сайтах и веб-страницах, на которые ссылается %{company_domain} и которые ссылаются на %{company_domain}. %{company_name} никоим образом не контролирует веб-сайты и веб-страницы, не входящие в портал %{company_domain}s, и не несет ответственности за их содержимое или использование. Оставляя ссылки на веб-сайты или веб-страницы, не входящие в %{company_domain}, %{company_name} не заявляет и не подразумевает одобрение в отношении подобных веб-сайтов или веб-страниц. Вы несете ответственность за принятие необходимых мер по защите себя и своих компьютерных систем от вирусов, «червей», троянского ПО и другого вредоносного или разрушительного содержимого. %{company_name} отказывается от любой ответственности за любой ущерб, вызванный использованием веб-сайтов и веб-страниц, не входящих в\ - \ %{company_domain}.\n\n\n\n## [8. Нарушение авторских прав и закона об авторском праве в цифровую эпоху](#8)\n\nКомпания %{company_name} просит других уважать ее права на интеллектуальную собственность и уважает права других на интеллектуальную собственность. Если вы считаете, что материал, расположенный или ссылающийся на %{company_domain}, нарушает ваши авторские права, просим вас уведомить об этом компанию %{company_name} в соответствии с политикой Automattic в отношении закона об авторском праве в цифровую эпоху (DMCA). %{company_name} ответит на любые подобные уведомления, в том числе, если это будет необходимо или целесообразно, посредством удаления нарушающего законы и права материала или блокировки всех ссылок на такой материал. %{company_name} лишит посетителя доступа к Веб-сайту и возможности использования Веб-сайта в случае, если в соответствующих обстоятельствах будет выяснено, что данный посетитель неоднократно нарушал авторские права или другие права на интеллектуальную собственность компании %{company_name} или других лиц. В случае подобной блокировки посетителя компания %{company_name} не обязана возместить любые суммы, ранее выплаченные компании %{company_name}.\n\n\n\n## [9. Интеллектуальная собственность](#9)\n\nДанное соглашение не является актом передачи компанией %{company_name} вам любого права на интеллектуальную собственность, принадлежащего %{company_name} или третьей стороне. Все права владения, пользования и распоряжения, связанные с данной собственностью, остаются (в рамках отношений между сторонами) в единоличной собственности %{company_name}. %{company_name}, %{company_domain}, логотип %{company_domain} и все остальные товарные знаки, знаки облуживания, графические символы и логотипы, используемые в связи с WordPress.com или Веб-сайтом, являются товарными знаками или зарегистрированными товарными знаками %{company_name} или лицензиаров %{company_name}. Другие товарные знаки, знаки обслуживания, графические символы и логотипы, используемые в связи с Веб-сайтом, могут являться товарными знаками других сторонних лиц. Использование Веб-сайта не дает вам право или лицензию на воспроизведение или иное использование любых товарных знаков %{company_name} или третьей стороны.\n\n\n\n## [10. Реклама](#10)\n\n%{company_name} оставляет за собой право на показ рекламы на странице с вашими материалами, если вы не приобрели платную услугу для устранения рекламы или учетную запись, включающую VIP-услуги.\n\n\n\n## [11.\ - \ Установление авторства](#11)\n\n  %{company_name} оставляет за собой право на отображение ссылок для установления авторства, например «Блог на портале %{company_domain}», автора темы и данных о разработчике шрифта в «подвале» или на панели инструментов вашего блога. Информацию об авторах в «подвале» и на панели инструментов %{company_domain} запрещается изменять или удалять, вне зависимости от приобретенных платных услуг.\n\n\n\n## [12. Изменения](#12)\n\nМы постоянно обновляем наши услуги и, как следствие, иногда мы вынуждены менять юридические условия их предоставления. Если в условия предоставления услуг внесены существенные изменения, мы сообщим о них путем публикации в одном из наших блогов или по электронной почте (либо с помощью другого средства связи) прежде, чем они вступят в силу. В уведомлении будет указан приемлемый период времени, по завершении которого новые условия вступят в силу. Если вы не согласны с нашими изменениями, вы должны прекратить использование %{company_domain} до истечения периода времени, указанного в уведомлении. На дальнейшее использование %{company_domain} будут распространяться новые условия. Тем не менее, любые разногласия, возникшие до внесения изменений, решаются на условиях (включая обязательную арбитражную оговорку для физических лиц), действовавших на момент возникновения данных разногласий.\n\n\n\n## [13. Прекращение обслуживания](#13)\n\n%{company_name} может закрыть доступ ко всему Веб-сайту или любым его частям в любой момент при наличии повода или без такового, с уведомлением или без такового; закрытие доступа осуществляется мгновенно. Чтобы расторгнуть данное Соглашение или прекратить действие учетной записи %{company_domain} (при ее наличии), вы можете просто прекратить пользоваться Веб-сайтом. Все положения данного Соглашения, которые по своему характеру должны остаться в силе после его расторжения, остаются в силе после расторжения соглашения, включая, помимо прочего, положения о владении, отказы от гарантийных обязательств, гарантии от убытков и ограничения ответственности.\n\n\n\n## [14. Отказ от гарантийных обязательств](#14)\n\nДанный Веб-сайт предоставляется «как есть». Настоящим компания %{company_name}, ее поставщики и лицензиары отказываются от любых гарантий любого рода, явных или подразумеваемых, включая, помимо прочего, гарантии коммерческого качества, пригодности для конкретных целей и отсутствия нарушений. Ни компания %{company_name}, ни ее поставщики и лицензиары не дают гарантий любого\ - \ рода об отсутствии ошибок на Веб-сайте и о постоянном или непрерывном доступе к Веб-сайту. Если вы действительно читаете этот текст, то вы заслужили награду. Вы осознаете, что загружаете или иным образом получаете содержимое или услуги посредством Веб-сайта на собственное усмотрение и под свою ответственность.\n\n\n\n## [15. Ограничение ответственности](#15)\n\nНи при каких обстоятельствах компания %{company_name} или ее поставщики/лицензиары не несут ответственности ни за какой предмет данного соглашения в связи с любым контрактом, небрежностью, безусловным обязательством, а также любой другой законодательной базой или правом справедливости в отношении: (i) любого намеренного, случайного или результативного ущерба; (ii) стоимости приобретения альтернативных продуктов или услуг; (iii) прерыванием использования, утратой или повреждением данных; или (iv) любыми суммами, превышающими суммы взносов, которые вы выплачивали %{company_name} по данному соглашению в период продолжительностью двенадцать (12) месяцев до возникновения обстоятельств, послуживших причиной иска. %{company_name} не несет ответственности за любой сбой или задержку по причинам, которые объективно не может контролировать. Вышеуказанное не применяется в той степени, в которой это запрещено применимым законом.\n\n\n\n## [16. Общая декларация и гарантия](#16)\n\nВы заявляете и гарантируете, что (i) будете использовать Веб-сайт в строгом соответствии с политикой конфиденциальности %{company_name}, условиями данного Соглашения, а также всеми применимыми законами и нормативными требованиями (включая, помимо прочего, любые местные законы или нормативные требования в вашей стране, штате, городе или другой государственной единице, которые относятся к поведению в Интернете и приемлемому содержимому, включая все применимые законы в отношении передачи технических данных, экспортированных из США или страны, в которой вы находитесь); и (ii) использование вами Веб-сайта не приведет к нарушению или незаконному присвоению прав любой третьей стороны на интеллектуальную собственность.\n\n\n\n## [17. Возмещение убытков](#17)\n\nВы соглашаетесь оградить от ответственности и защитить от претензий компанию %{company_name}, ее подрядчиков и лицензиаров, а также их соответствующих директоров, руководителей, сотрудников и представителей, в случае любых возможных претензий и расходов, включая расходы на юридическую поддержку, проистекающие из использования вами Веб-сайта (в том числе вызванные нарушением вами\ - \ условий данного Соглашения).\n\n\n\n## [18. Прочее](#18)\n\nДанное Соглашение является полным соглашением между %{company_name} и вами в отношении предмета данного документа. Соглашение может быть изменено только посредством поправки, оформленной в письменном виде и подписанной уполномоченным лицом со стороны %{company_name}, либо посредством публикации %{company_name} измененной версии. Кроме случаев, когда обратное установлено действующим законодательством (при наличии такового) на данное Соглашение, любой доступ к Веб-сайту и любое использование Веб-сайта распространяются законы штата Калифорния, США, за исключением противоречий нормам права. Надлежащую подсудность при любых разногласиях, проистекающих или связанных с указанными нормами, будут обеспечивать суды штата и федеральные суды округа Сан-Франциско, Калифорния. За исключением исков в отношении судебного запрета или средств судебной защиты по праву справедливости, касающихся прав на интеллектуальную собственность (которые могут рассматриваться в любом компетентном суде без судебного залога), любые разногласия, связанные с данным Соглашением, окончательно урегулируются в соответствии с Комплексными правилами арбитражного разбирательства Службы судебного арбитража и медиации (Judicial Arbitration and Mediation Service, Inc. («JAMS») посредством деятельности трех арбитражных судей, назначенных в соответствии с данными правилами. Арбитражный суд должен проходить в Сан-Франциско (штат Калифорния) на английском языке. Решение арбитражного суда может быть приведено в исполнение в любом суде. Сторона, выигравшая дело в рамках любого правового действия и судебного разбирательства по выполнению условий данного Соглашения, имеет право на возмещение расходов (включая расходы на юридические услуги). Если любая часть данного Соглашения признана недействительной или не обладающей исковой силой, данная часть должна быть истолкована в соответствии с исходным намерением сторон. Остальные части имеют полную юридическую силу. Отказ любой стороны от исполнения любого правила или условия данного Соглашения, а также нарушение сопутствующих положений не отменяет силу соответствующих правил и условий и не снимает со сторон ответственности за дальнейшие нарушения. Вы можете передать права по данному Соглашению любой стороне, которая выражает на то согласие и обязуется исполнять его правила и условия; %{company_name} также может передавать свои права по данному Соглашению без условий. Данное соглашение является обязательным для соблюдения и действует в\ - \ интересах самих сторон, их преемников и разрешенных правопреемников.\n\nЭтот документ соответствует CC-BY-SA. Последние изменения внесены в 31 мая 2013.\n\nАдоптированный текст содержится [WordPress Условия оказания услуг](https://ru.wordpress.com/tos/).\n" privacy_topic: title: "Политика конфиденциальности" body: | @@ -2020,6 +1928,23 @@ ru:

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

+ badges: + long_descriptions: + autobiographer: | + Эта награда выдается за заполнение + своей страницы профиля и выбор картинки профиля. Возможность узнать больше о дуг друге позволяет форумчанам сплотиться в тесное сообщество. + nice_post: | + Эта награда выдается за сообщение, собравшее 10 симпатий. Отличная работа! + nice_topic: | + Эта награда выдается за тему, собравшую 10 симпатий. Отличная работа! + good_post: | + Эта награда выдается за сообщение, собравшее 25 симпатий. Превосходная работа! + good_topic: | + Эта награда выдается за тему, собравшую 25 симпатий. Превосходная работа! + great_post: | + Эта награда выдается за сообщение, собравшее 50 симпаний. Вау! + great_topic: | + Эта награда выдается за тему, собравшую 50 симпаний. Вау! admin_login: success: "письмо отправлено" error: "Ошибка!" diff --git a/config/locales/server.sq.yml b/config/locales/server.sq.yml index b75c47697a..d7bb714c8d 100644 --- a/config/locales/server.sq.yml +++ b/config/locales/server.sq.yml @@ -1489,7 +1489,6 @@ sq: signup_after_approval: subject_template: "You've been approved on %{site_name}!" signup: - subject_template: "[%{site_name}] Confirm your new account" text_body_template: | Welcome to %{site_name}! @@ -1521,8 +1520,6 @@ sq: too_large: "Sorry, the file you are trying to upload is too big (maximum size is %{max_size_kb}KB)." images: too_large: "Sorry, the image you are trying to upload is too big (maximum size is %{max_size_kb}KB), please resize it and try again." - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." @@ -1555,141 +1552,6 @@ sq: title: "FAQ/Guidelines" tos_topic: title: "Terms of Service" - body: | - The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). - - Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. - - - - ## [1. Your %{company_domain} Account](#1) - - If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. - - - - ## [2. Responsibility of Contributors](#2) - - If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: - - * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; - * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; - * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; - * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; - * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); - * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; - * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; - * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and - * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. - - - - ## [3. User Content License](#3) - - User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. - - - - - ## [4. Payment and Renewal](#4) - - ### General Terms - - Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. - - ### Automatic Renewal - - Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. - - - - ## [5. Services](#5) - - ### Hosting, Support Services - - Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. - - - - ## [6. Responsibility of Website Visitors](#6) - - %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. - - - - ## [7. Content Posted on Other Websites](#7) - - We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. - - - - ## [8. Copyright Infringement and DMCA Policy](#8) - - As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. - - - - ## [9. Intellectual Property](#9) - - This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. - - - - ## [10. Advertisements](#10) - - %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. - - - - ## [11. Attribution](#11) - - %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. - - - - ## [12. Changes](#12) - - %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. - - - - ## [13. Termination](#13) - - %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. - - - - ## [14. Disclaimer of Warranties](#14) - - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. - - - - ## [15. Limitation of Liability](#15) - - In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. - - - - ## [16. General Representation and Warranty](#16) - - You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. - - - - ## [17. Indemnification](#17) - - You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. - - - - ## [18. Miscellaneous](#18) - - This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. - - This document is CC-BY-SA. It was last updated May 31, 2013. - - Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "Privacy Policy" body: | diff --git a/config/locales/server.sv.yml b/config/locales/server.sv.yml index 1f50f49674..e7fb2f7886 100644 --- a/config/locales/server.sv.yml +++ b/config/locales/server.sv.yml @@ -1075,7 +1075,6 @@ sv: signup_after_approval: subject_template: "Du har blivit godkänd på %{site_name}!" signup: - subject_template: "[%{site_name}] Confirm 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." @@ -1098,7 +1097,6 @@ sv: 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}" diff --git a/config/locales/server.te.yml b/config/locales/server.te.yml index 83b5c5f44b..e47809568e 100644 --- a/config/locales/server.te.yml +++ b/config/locales/server.te.yml @@ -679,8 +679,6 @@ te: deleted: 'తొలగించారు' upload: images: - fetch_failure: "క్షమించండి, చిత్రం తెచ్చుటలో తప్పిదము ఉంది." - unknown_image_type: "క్షమించండి, మీరు ఎగుమతి చేయడానికి ప్రయత్నించిన ఫైల్ చిత్రం వలె కనిపించడం లేదు." size_not_found: "క్షమించండి, కానీ మేము చిత్రం యొక్క పరిమాణం నిర్ణయించలేదు. బహుశా మీ చిత్రం పాడై ఉండవచ్చు?" email_log: seen_recently: "వినియోగదారు కొత్తగా చూశారు" @@ -701,23 +699,6 @@ te: boolean_no: "లేదు" guidelines_topic: title: "తఅప్ర/మార్గదర్శకాలు" - body: "\n\n## [బహిరంగ చర్చకు ఇది ఒక నాగరిక స్థానం](#నాగరికత )\n\nదయచేసి ఈ చర్చావేదికను ఒక పబ్లిక్ పార్క్ తో సమానంగా పరిగణించండి.మనకి చాలా ఉపయుక్తమైన భాగస్వామ్య సమాజ పంపిణీ వనరు — కొనసాగుతున్న సంభాషణ ద్వారా నైపుణ్యాలు, జ్ఞానం మరియు ఆసక్తులు పంచుకోవడానికి ఒక చోటు.\n\nఇవి కఠినమైన మరియు ధృడమైన నియమాలు కావు, కేవలం మన సంఘంలో మానవతీర్పుకు\ - \ ఉపకరణాలు.\nనాగరిక ప్రజా సంభాషణ కోసం స్వచ్ఛమైన,మరింత ఆహ్లాదకరమైన స్థానంగా ఉంచడానికి ఈ మార్గదర్శకాలను ఉపయోగించండి.\n\n\n\n## [చర్చను మెరుగుపరచండి](#మెరుగుపరచు)\n\nదీనిని గొప్ప చర్చావేదిక గా తయారుచేయడానికి మీరు ఎల్లప్పుడూ చర్చను మెరుగుపరచడానికి ఏదో విధంగా, చిన్న సహాయమైనా చేయండి. మీరు మీ టపాకి సంభాషణని జత చేసింది లేనిది ఖచ్చితంగా తెలియకపోతే\ - \ , మీరు ఏమి చెప్పదలుచుకున్నారో ఆలోచించండి మరియు మరలా ప్రయత్నించండి.\n\nఇక్కడ చర్చించబడిన విషయాలు మనకు సంబంధించినవి, మరియు మీ విషయంగా భావించండి.విషయం గురించి చర్చించే వ్యక్తుల పట్ల , ఎవరైనా చెప్పినదాని పట్ల విభేధించినా మర్యాదతో వ్యవహరించండి.\n\nచర్చ మెరుగుదలకు ఇప్పటికే ఒక మార్గం కనుగొనడం జరిగింది.మీరు ఏ విషయానికైనా బదులివ్వడానికి లేదా కొత్తగా మొదలు పెట్టడానికి\ - \ ముందు బ్రౌజింగ్ కోసం కొంత సమయం వెచ్చించండి,మరియు మీ అభిరుచులను పంచుకోవడానికి ఒక మంచి సమావేశానికి అవకాశం కల్పిస్తాము.\n\n\n\n## [మీరు విభేధించినప్పటికీ ,సమ్మతంగా వ్యవహరించండి](#సమ్మతి)\n\nమీరు ఏ విషయంతోనైనా విభేధించాలి అనుకొంటే , అది బాగుంది కానీ , గుర్తుంచుకోండి_ఆలోచనలను విమర్శించండి, వ్యక్తులను కాదు_దయచేసి నివారించండి.\n\n*పేరు\ - \ పిలవండి.\n*మానవ దాడులు.\n*అసలు విషయం బదులుగా టపా యొక్క ధ్వనితో సమాధానం ఇస్తుంది.\n*స్వల్ప వైరుధ్యాలు.\n\nబదులుగా, సంభాషణను మెరుగుపర్చడానికి హేతుబధ్దమైన ప్రతివాదనకు అవకాశం కల్పించండి.\n\n\n\n## [మీరు పాల్గొన్న సంఖ్య](#పాల్గొను)\n\nఇక్కడ ఉన్న సంభాషణలన్నింటికీ మేము ఒక ధ్వని ఏర్పాటు చేశాము.ఈ చర్చాస్థలాన్ని మరింత ఆసక్తికరంగా తయారుచేయుటకు\ - \ ఈ వర్గం యొక్క భవిష్యత్‌ను ప్రభావితం చేసే చర్చల్లో పాల్గొని మాకు సహాయం చేయండి — మరియు చేయలేనివి వదిలేయండి.\n\nడిస్కోర్స్ మీకు సమిష్టిగా ఉత్తమ (మరియు చెత్త) రచనలు గుర్తించడానికి సాధ్యమయ్యే వర్గ ఉపకరణాలు అందిస్తుంది.ఇష్టాలు, బుక్‌మార్క్‌లు, జెండాలు, ప్రత్యుత్తరాలు, సవరణలు, మరియు మొదలగునవి.చాలా, మీరు మరియు ప్రతి ఒక్కరూ సొంత అనుభవాన్ని చాలా మెరుగుపరచడానికి\ - \ ఈ సాధనాలను ఉపయోగించండి.\n\nదీని కంటే ఒక మెరుగైన వేదిక దొరికితే , దీనిని వదలడానికి ప్రయత్నించండి.\n\n\n\n## [మీరు ఒక సమస్యని గుర్తించినట్లయితే, కేతనం చెయ్యండి](#సమస్య-కేతనం)\n\nపరిశీలకులు ప్రత్యేక అధికారం కలిగియున్నారు;ఈ చర్చాస్థలంనకు వారే భాధ్యులు.కానీ మీరు కూడా, మీ సహాయంతో పరిశీలకులు వర్గ దోహదకారులుగా ఉంటారు,కాపలాదారులు లేదా\ - \ రక్షకభటులుగా కాదు.\n\nమీరు చెడు ప్రవర్తన చూసినప్పుడు, సమాధానం ఇవ్వకండి. ఇది గుర్తించడం ద్వారా చెడు ప్రవర్తనను ప్రోత్సహిస్తున్నట్లే , మీ శక్తి ఖర్చవుతుంది, మరియు ప్రతి ఒక్కరి సమయం వృధా అవుతుంది. _కేవలం కేతనించండి_.తగినన్ని కేతనాలు వచ్చి ఉంటే ,స్వయంచాలకంగా గాని లేదా పరిశీలకుని జోక్యంతో గాని చర్య తీసుకోబడుతుంది. \n\nమన వర్గం నిర్వహించే క్రమంలో , పరిశీలకులు\ - \ ఏ సమయంలోనైనా మరియు ఏ కారణం చేతనైనా, ఏ విషయాన్నైనా, ఏ వినియోగదారుని ఖాతానైనా తొలగించే హక్కు కలిగియుంటారు.పరిశీలకులు కొత్త టపాలను ఏ విధంగానూ ముందుగా చూడరు; పరిశీలకులు మరియు సైట్ నిర్వాహకులు ఈ వర్గంలోని టపాల లోని విషయం పట్ల ఏ భాధ్యత తీసుకోరు.\n\n\n\n## [ఎల్లప్పుడూ మర్యాదగా వ్యవహరించు](#మర్యాద)\n\nఆరోగ్యకరమైన సంభాషణ చెడిపోయేలా,అమర్యాదగా\ - \ వ్యవహరించకండి.\n\n*మర్యాదతో మెలగండి.ఒక సహేతుకమైన వ్యక్తిని గురించి హానికర, అసంబద్ధ టపాలు లేదా ద్వేషపూరిత ప్రసంగాన్ని చేయవద్దు.\n*స్వఛ్చంగా ఉంచండి. ఎటువంటి అశ్లీలమైన లేదా ప్రత్యక్ష లైంగిక పరమైన టపాలు చేయవద్దు.\n*పరస్పరం గౌరవించుకోండి. వేధించడం లేదా భాధ కలిగించడం,వ్యక్తులను అనుకరించడం,వారి ఆంతరంగిక విషయాలు బహిర్గతపరచడం చేయకండి.\n*మన చర్చావేదికను గౌరవించండి.ఎటువంటి\ - \ స్పామ్ సందేశాలు లేదా హాని కలిగించే టపాలు చేయకండి.\n\nఇవి మిశ్రమ నిబంధనలు,ఖచ్చితమైన నిర్వచనాలు లేవు — ఈ పనుల యొక్క రూపాన్ని కూడా తొలగించండి.మీకు తెలియకుంటే, మీ టపా న్యూ యార్క్ టైమ్స్ ముందు పేజీలో ప్రత్యేక వ్యాసంగా వేయబడితే అని మీరు ఎలాంటి భావన పొందుతారో మిమ్మల్ని మీరే ప్రశ్నించుకోండి.\n\nఇది బహిరంగ చర్చావేదిక, మరియు సెర్చ్ ఇంజన్స్ ఈ చర్చలను సూచిస్తాయి.భాష,\ - \ లంకెలు మరియు చిత్రాలను కుటుంబం మరియు స్నేహితులు కొరకు సురక్షితంగా ఉంచండి.\n\n\n\n## [చక్కగా ఉంచండి](#చక్కగా ఉంచండి)\n\nసంగతులు సరైన స్థానంలో పెట్టడానికి కృషిచేయండి.ఎందుకంటే మేము ఎక్కువ సమయం చర్చలమీద మరియు తక్కువ శుభ్రత మీద పెట్టదలచుకొన్నాం.\n\n*ఒక తప్పు వర్గంలో విషయాన్ని మొదలుపెట్టకండి.\n*ఒకే విషయాన్ని బహుళవిషయాలకు వైరుధ్యమైన\ - \ టపాలు చేయవద్దు.\n *ప్రత్యుత్తరంగా విషయం లేని టపాలు చేయవద్దు.\n*విషయాన్ని మధ్యలో దారి మళ్ళించకండి.\n*మీ టపాలకు సంతకం చేయకండి — ప్రతి టపా మీ వ్యక్తిగత వివరాల సమాచారాన్ని కలిగిఉంటుంది.\n\nమీ టపాలు \"+1\" లేదా \"అంగీకారం\" కంటే ఎక్కువ అయితే , లైక్ బటన్ ని ఉపయోగించండి. అయితే మౌలికంగా విభిన్న దిశలో ఇప్పటికే తీసుకొని ఉన్నదాని కంటే ఎక్కువగా ఉంటే, అనుబంధ విషయాన్ని\ - \ సమాధానంగా ఉపయోగించండి.\n\n\n\n## [మీ సొంత విషయాన్ని మాత్రమే టపా చేయండి](#దొంగతనము)\n\nమీరు ఎవరికో చెందిన విషయాన్ని వారి అనుమతి లేకుండా టపా చేయకూడదు.మీరు, ఏ ఇతర చట్టాన్ని అతిక్రమించి వర్ణనలు, లింకులు, లేదా పద్ధతులు ఒకరి మేధో సంపత్తి నుండి దొంగిలించిన \n(సాఫ్ట్వేర్, వీడియో, ఆడియో, చిత్రాలు) టపా చెయ్యకూడదు.\n\n\n\ - \n## [మీరే ఆధారం](#శక్తి)\n\nఈ సైట్ మీ [స్నేహపూర్వక స్థానిక సిబ్బంది] ద్వారా నిర్వహించబడుతుంది. మీకు ఇంకా ఇక్కడ విషయాలు ఎలా పని చేస్తాయి అని ఏవైనా ప్రశ్నలు ఉంటే ,ఒక కొత్త విషయాన్ని తెరచి [మెటా వర్గం](/c/మెటా) చర్చించండి! ఒక మెటా అంశం లేదా కేతనం ఒక క్లిష్టమైన లేదా తక్షణ సమస్యగా ఉండి ఉంటే , మమ్మల్ని [సిబ్బంది పేజ్](/గురించి) ద్వారా సంప్రదించండి.\n\n\n\n## [సేవా నిబంధనలు](#నిబంధనలు)\n\nఅవును, చట్టం విసుగు ప్రక్రియ,– మరియు పొడగింపు ద్వారా, మీరు మరియు మీ సమాచారం – ప్రతికూలమైన చర్యలకు వ్యతిరేకంగా కానీ మనల్ని మనంరక్షించుకోవాలి.మనం [సేవా నిబంధనలు]ను విషయానికి సంబంధించిన మీ (మరియు మా) ప్రవర్తన మరియు హక్కులను వివరిస్తూ గోప్యతా మరియు చట్టాలు ఉన్నాయి.ఈ సేవలను ఉపయోగించుకోవడానికి, మనం కట్టుబడి\ - \ ఉండాలి.[నిబంధనలు](/నిబంధనలు).\n" tos_topic: title: "సేవా నిబంధనలు" privacy_topic: diff --git a/config/locales/server.tr_TR.yml b/config/locales/server.tr_TR.yml index 0f069b3e77..47c891872b 100644 --- a/config/locales/server.tr_TR.yml +++ b/config/locales/server.tr_TR.yml @@ -409,6 +409,7 @@ tr_TR: regular: title: "Standart Konu" banner: + title: "Manşet Konusu" message: make: "Bu konu artık bir manşettir. Kullanıcı tarafından yoksayılana kadar her sayfanın en üstünde belirecektir." remove: "Bu konu artık manşet değildir. Artık her sayfanın en üstünde yer belirmeyecektir." @@ -507,7 +508,7 @@ tr_TR: page_view_logged_in_reqs: title: "Oturum açıldı" xaxis: "Gün" - yaxis: "Oturum açanlardan API istekleri" + yaxis: "Giriş Yapmış Kişilerden API İstekleri" page_view_crawler_reqs: title: "Arama botları" xaxis: "Gün" @@ -516,6 +517,14 @@ tr_TR: title: "Toplam" xaxis: "Gün" yaxis: "Tüm API istekleri" + page_view_logged_in_mobile_reqs: + title: "Giriş Yapmış Kişilerden API İstekleri" + xaxis: "Gün" + yaxis: "Mobilden Giriş Yapmış Kişilerden API İstekleri" + page_view_anon_mobile_reqs: + title: "Anonim API İstekleri" + xaxis: "Gün" + yaxis: "Mobil Anonim API İstekleri" http_background_reqs: title: "Arkaplan" xaxis: "Gün" @@ -548,6 +557,10 @@ tr_TR: title: "Hiç yanıtlanmamış konular" xaxis: "Gün" yaxis: "Toplam" + mobile_visits: + title: "Kullanıcı Ziyaretleri" + xaxis: "Gün" + yaxis: "Ziyaret sayısı" 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." @@ -615,6 +628,7 @@ tr_TR: max_topic_title_length: "Konu başlığında izin verilen en fazla karakter sayısı" min_private_message_title_length: "Mesaj başlıkları için izin verilen en az karakter sayısı" min_search_term_length: "Arama için girilecek kelimede olması gereken en az karakter sayısı" + allow_uncategorized_topics: "Konuların kategori seçmeden oluşturulmasına izin ver. DİKKAT: Bu özelliği kapamadan önce kategorisiz tüm konuları kategorize etmeniz lazım." uncategorized_description: "Kategorisiz kategorisinin tanıtımı. Boş bırakabilirsiniz." allow_duplicate_topic_titles: "Aynı başlık ile birden çok konu açılmasına izin ver." unique_posts_mins: "Kullanıcının aynı içerikle yeni bir gönderi oluşturmadan önce geçmesi gereken dakika" @@ -637,6 +651,7 @@ tr_TR: category_featured_topics: "/categories sayfasında yer alan kategori başına düşen konu sayısı. Bu değeri değiştirirseniz, değişikliğin kategoriler sayfasına yansıması 15 dakika kadar sürebilir." show_subcategory_list: "Bir kategoriye girildiğinde konu listesi yerine alt kategori listesini göster." fixed_category_positions: "Seçerseniz, kategoriler için sabit bir sıralama belirleyebileceksiniz. Seçmezseniz, kategoriler aktivite sırasına göre listelenir. " + fixed_category_positions_on_create: "Seçerseniz, konu oluşturma ekranında da kategori sıralaması korunur (fixed_category_positions gerektirir)." add_rel_nofollow_to_user_content: "İç bağlantılar (ana alan adları dahil) hariç, gönderilen tüm kullanıcı içeriklerine rel nofollow ekle. Bu ayarı değiştirirseniz, tüm gönderileri \"rake post:rebake\" ile rebake etmeniz gerekir." exclude_rel_nofollow_domains: "nofollow eklenmeyecek sınırlandırılmış alan adları listesi. tld.com'a izin verirseniz otomatik olarak sub.tld.com'a da izin verilir." post_excerpt_maxlength: "Gönderi alıntısının / özetinin en fazla uzunluğu." @@ -678,6 +693,7 @@ tr_TR: notify_mods_when_user_blocked: "Eğer bir kullanıcı otomatik olarak engellendiyse, tüm moderatörlere mesaj yolla." flag_sockpuppets: "Eğer, yeni kullanıcı konuya, konuyu başlatan yeni kullanıcı ile aynı IP adresinden cevap yazarsa, her iki gönderiyi de potansiyel spam olarak işaretle. " traditional_markdown_linebreaks: "Markdown'da, satır sonundan önce yazının sağında iki tane boşluk gerektiren, geleneksel satır sonu metodunu kullan kullan." + allow_html_tables: "Tabloların HTML etiketleri kullanılarak Markdown'da girilebilmesine izin ver. TABLE, THEAD, TD, TR ve TH beyaz listeye alınmıştır. (Tüm tablo içeren eski gönderilerde full rebake yapılmasını gerektirir)" post_undo_action_window_mins: "Kullanıcıya tanınan, bir gönderide yapılan yeni aksiyonları (beğenme, bayraklama, vs) geri alabilme dakika süresi" must_approve_users: "Siteye erişimlerine izin verilmeden önce tüm yeni kullanıcı hesaplarının görevliler tarafından onaylanması gerekir. UYARI: yayındaki bir site için bunu etkinleştirmek görevli olmayan hesapların erişimini iptal edecek." ga_tracking_code: "Google analytics (ga.js) takip kodu, ör: UA-12345678-9; bakınız http://google.com/analytics" @@ -722,12 +738,16 @@ tr_TR: login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme." min_username_length: "Kullanıcı adında olması gereken en az karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA KISA BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. " max_username_length: "Kullanıcı adında olabilecek en fazla karakter sayısı. UYARI: HALİHAZIRDA BUNDAN DAHA UZUN BİR KULLANICI ADINA SAHİP OLAN KULLANICILAR SİTEYE GİRİŞ YAPAMAYACAKLAR. " + reserved_usernames: "Üyelik için izin verilmeyen kullanıcı adları." min_password_length: "En az parola uzunluğu." block_common_passwords: "En çok kullanılan 10,000 parola arasında yer alan parolalara izin verme." enable_sso: "Dış bir site aracılığı ile tek oturum açma sistemini etkinleştir. (UYARI: etkinleştirildiği takdirde, doğru yapılandırılmamışsa bazı kişilerin, SİZ DAHİL, oturum açmasını engelleyebilir! Ayrıca davetiye sistemini de devre dışı bırakır.)" enable_sso_provider: "/session/sso_provider son noktasında Discourse SSO sağlayıcı protokolünü uygula, sso_secret değerinin seçilmiş olmasını gerektirir" sso_url: "Bitiş noktasındaki tek oturum açma URL'i" sso_secret: "SSO bilgisinin kritopgrafik şekilde doğrulanması için kullanılan gizli string, 10 karakter veya daha uzun olduğundan emin olun" + sso_overrides_email: "SSO yararlı yükündeki dış sitedeki e-postayı, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel e-postanın üzerine yazar (DİKKAT: yerel e-postaların normalizasyon sürecinde uyuşmazlıklar doğabilir)" + sso_overrides_username: "SSO yararlı yükündeki dış sitedeki kullanıcı adını, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel kullanıcı adının üzerine yazar. (DİKKAT: kullanıcı adı uzunluklarıyla ilgili kurallardaki farklılıklardan ötürü uyuşmazlıklar doğabilir)" + sso_overrides_name: "SSO yararlı yükündeki dış sitedeki tam adı, her giriş yapıldığında, yerel değişiklikleri engellemek için yerel tam adın üzerine yazar." sso_overrides_avatar: "SSO yararlı yükündeki dış site avatarını kullanıcı avatarının üzerine yazar Eğer etkinleştirildiyse, allow_uploaded_avatars ayarının devre dışı bırakılması şiddetle önerilir" sso_not_approved_url: "Bu bağlantıya onaylanmamış SSO hesaplarını yönlendir." enable_local_logins: "Yerel kullanıcı adı ve parola bazlı hesap girişlerini etkinleştir. (Not: davetiyelerin çalışabilmesi için bu ayarın etkinleştirilmesi gerekli)" @@ -903,11 +923,13 @@ tr_TR: 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." + permalink_normalizations: "Kalıcı bağlantıları eşleştirmeden önce aşağıdaki regex'i uygula, mesela: /(\\/topic.*)\\?.*/\\1 konu yönlendirmelerindeki sorgu dizelerini kaldırır. Formatlama regex+string, yakalamalara erişmek \\1 vs." 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" full_name_required: "Kullanıcı profili için tam ad zorunlu bir alandır." enable_names: "Kullanıcıların tam adlarını profillerde, kullanıcı kartlarında ve e-postalarda göster. Tam adların hiç bir yerde görünmemesi için devre dışı bırak." display_name_on_posts: "Gönderilerde @kullanıcıadı'na ek olarak kullanıcının tam adını da göster." + show_time_gap_days: "İki gönderinin tarihleri arasında bu kadar gün farkı varsa, konuda zaman aralığına yer ver." invites_per_page: "Varsayılan olarak kullanıcı sayfasında gösterilen davetler." short_progress_text_threshold: "Bir konudaki gönderi sayısı bu sayının üzerine çıktığında, ilerleme çubuğunda sadece şu anki gönderi sayısını göster. İlerleme çubuğunun kalınlığını değiştirirseniz, bu değeri de değiştirmeniz gerekebilir." default_code_lang: "GitHub kod bloklarına (lang-auto, ruby, python vs.) uygulanacak, varsayılan programlama dili sözdizimi vurgulaması." @@ -990,6 +1012,7 @@ tr_TR: other: "%{count} gönderiyi var olan konulardan birine taşıdım: %{topic_link}" change_owner: post_revision_text: "Sahiplik %{old_user} hesabından %{new_user} hesabına aktarıldı" + deleted_user: "silinmiş kullanıcı" emoji: errors: name_already_exists: "Üzgünüz, '%{name}' ismi zaten bir başka emoji tarafından kullanılıyor." @@ -1037,6 +1060,8 @@ tr_TR: omniauth_error_unknown: "Girişiniz yapılırken bir şeyler ters gitti, lütfen tekrar deneyin." new_registrations_disabled: "Şu an yeni hesap oluşturulamıyor. " password_too_long: "Parolalar maksimum 200 karakter olabilir." + email_too_long: "Vermiş olduğun e-posta çok uzun. E-posta kutusu isimleri 254, alan adı isimleri ise 253 karakterden daha uzun olamaz." + reserved_username: "Bu kullanıcı adını kullanamazsın." missing_user_field: "Kullanıcı alanlarının tamamını doldurmadınız" close_window: "Doğrulama tamamlandı. Devam etmek için bu pencereyi kapatın." user: @@ -1135,6 +1160,10 @@ tr_TR: Ancak, eğer gönderiniz kullanıcılar tarafından ikinci kere gizlenirse, görevliler tarafından incelenene kadar gizli kalacaktır - ve hesabınızın askıya alınması dahil olmak üzere farklı önlemler alınabilir. Daha fazla bilgi için, lütfen [topluluk yönergelerine bakın](%{base_url}/guidelines). + usage_tips: + text_body_template: "Hemen başlayabilmeniz için bir kaç pratik tavsiye: \n\n## Okuma\n\nDaha fazla okumak için, **sayfayı aşağı kaydırmanız yeterli!** \n\nYeni cevaplar ve konular oluşturuldukça, otomatik olarak görünecekler. \n\n## Gezinme\n\n- Arama, kullanıcı sayfanız veya menü için **sağ üstteki ☰ ikonlu butona** tıklayın. \n\n- Herhangi bir konu başlığı sizi bir sonraki okunmamış gönderiye götürür. En üst veya en alta gitmek için gönderi sayısına veya son cevap tarihini tıklayın.\n\n \n\n- Bir konuyu okurken, tüm navigasyonla ilgili kontroller için sağ alttaki yeşil ilerleme barını seçin. Hızlıca en yukarıya gitmek için konu başlığına tıklayın. Klavye kısayollarını görüntülemek için ? tuşuna basın. \n\n \n\n## Cevaplama \n\n- **Genel olarak konuya** cevap vermek için, sayfanın en altındaki Cevapla butonunu kullanın. \n\n- **Belirli bir kişiye** cevap vermek için, o gönderinin altında bulunan Cevapla butonunu kullanın. \n\n- **Yeni bir konu\" oluşturarak cevaplamak için, gönderinin sağında çıkan ikonuna tıklayın. Eski ve yeni konular birbirleriyle otomatik olarak ilişkilendirilecek.\n\nAlıntı yapmak için, alıntı yapmak istediğiniz metni seçin ve sonrasında herhangi bir Cevapla butonuna tıklayın. Çoklu alıntılar için adımları tekrarlayın! \n\n \n\nBirine cevabınızla ilgili bildiri gitmesini istiyorsanız, o kişinin isminden bahsedin. Kullanıcı adı seçimine başlamak için `@` yazın. \n\n \n\n[Standart Emoji](http://www.emoji.codes/)\ + \ için, `:` yazın ya da gülücük `;)` atın \n\nBir bağlantı için özet oluşturmak istiyorsanız, bağlantıyı kopyalayıp tek başına bir satıra yapıştırın:\n\n\n\n## Aksiyonlar\n\nHer gönderinin altında aksiyon butonları vardır. \n\nBirine gönderisini beğendiğinizi belirtmek istiyorsanız, **beğen** butonunu kullanın. Sevginizi paylaşın!\n\nBirinin gönderisiyle ilgili bir sorun görüyorsanız, özelden bu kişileri veya [görevlileri](%{base_url}/about) uyarmak için **bayrakla** butonunu kullanın. **Paylaş** butonu aracılığıyla gönderiye bir bağlantı paylaşabilir, veya **işaretle** butonu ile gönderiyi işaretleyip sonrasında kullanıcı sayfanızdan kolayca ulaşabilirsiniz. \n\n## Bildiriler \n\nBiri gönderinize cevap verir, gönderinizi alıntılar ya da `@kullanıcıadı` nızdan bahsederse, sayfanızın en sağ üstünde bir sayı hemen beliriverir. Bu sayıya tıklayarak **bildiriler**inize ulaşabilirsiniz. \n\n\n\nBir cevabı kaçıracaksınız diye kaygılanmayın – çevrimiçi olmadığınız zaman gelen bildiriler size e-postalanır.\n\n## Seçenekleriniz\n\nÜzerinden henüz **iki gün geçmemiş** tüm konular yeni sayılır. \n\n**Aktif olarak katıldığınız** (oluşturduğunuz, cevapladığınız, veya uzun bir süre okuduğunuz) tüm sohbetler otomatik olarak takip edilir. \n\nBu konuların yanında, yeni ve okunmamışlar gönderilerin sayılarını gösteren mavi işaretler göreceksiniz: \n\n \n\nHerhangi bir konunun bildiri ayarını o konunun altında bulunan bildiri kontrolü aracılığıyla değiştirebilirsiniz. \n\n \n\nBildiri ayarlarını kategori\ + \ bazında da değiştirebilirsiniz, eğer belirli bir kategorideki her yeni konuyu gözlemek istiyorsanız. Bu ayarların herhangi birini değiştirmek için, [kullanıcı ayarlarınıza](%{base_url}/my/preferences) göz atın. \n\n## Topluluğun Güveni\n\nBurada sohbetlere katıldıkça, topluluğun güvenini kazanırsınız, onun tam bir parçası haline gelirsiniz ve yeni kullanıcılar için konulan limitler kalkar. Yeterli yükseklikteki [güvenlik seviyelerinde](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) ise topluluğumuzu birlikte yönetmemize yardımcı olabilmenizi sağlayacak yetkiler kazanırsınız.\n" welcome_user: subject_template: "%{site_name} sitesine hoşgeldiniz!" text_body_template: "%{site_name} sitesine katıldığınız için teşekkür ederiz, hoşgeldiniz!\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" @@ -1461,7 +1490,7 @@ tr_TR: subject_template: "%{site_name} sitesinde hesabınız onaylandı!" text_body_template: "%{site_name} sitesine hoşgeldiniz! \n\n%{site_name} sitesindeki hesabınız bir görevli tarafından onaylandı.\n\nAşağıdaki linke tıklayın ve yeni hesabınızı aktive edin: %{base_url}/users/activate-account/%{email_token} \n\nEğer link tıklanabilir değilse, linki kopyalayıp tarayıcınızın adres çubuğuna yapıştırmayı deneyebilirsiniz. \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" signup: - subject_template: "[%{site_name}] Yeni hesabınızı etkinleştirin" + subject_template: "[%{site_name}] Yeni hesabınızı onaylayın" text_body_template: | %{site_name} sitesine hoşgeldiniz! @@ -1493,8 +1522,6 @@ tr_TR: too_large: "Üzgünüz, yüklemeye çalıştığınız dosya çok büyük (en fazla %{max_size_kb}KB olabilir)." images: too_large: "Üzgünüz, yüklemeye çalıştığınız resim çok büyük (en fazla %{max_size_kb}KB olabilir), lütfen küçültüp tekrar deneyin." - fetch_failure: "Üzgünüz, resim çekilirken hata oluştu." - unknown_image_type: "Üzgünüz ama yüklemeye çalıştığınız dosya resim dosyası değil. " size_not_found: "Üzgünüz, resminizin büyüklüğünü tespit edemedik. Dosya bozuk olabilir mi?" flag_reason: sockpuppet: "Yeni bir kullanıcı bir konu oluşturdu ve aynı IP adresinden başka bir yeni kullanıcı cevap yazdı. Site ayarları sayfasında flag_sockpuppets değerine göz atın." @@ -1618,7 +1645,7 @@ tr_TR: ## [Powered by You](#power) - This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [meta category](/c/meta) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). + This site is operated by your [friendly local staff](/about) and *you*, the community. If you have any further questions about how things should work here, open a new topic in the [site feedback category](/c/site-feedback) and let's discuss! If there's a critical or urgent issue that can't be handled by a meta topic or flag, contact us via the [staff page](/about). @@ -1733,7 +1760,7 @@ tr_TR: ## [14. Disclaimer of Warranties](#14) - The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. @@ -1846,6 +1873,8 @@ tr_TR: If we decide to change our privacy policy, we will post those changes on this page. This document is CC-BY-SA. It was last updated May 31, 2013. + static: + search_help: "

Öneriler

\n

\n

    \n
  • Başlık eşleşmelerine öncelik verilir, emin olmadığınız zaman, başlık için arama yapın
    • \n
  • Her zaman tekil, nadir kelimeler en iyi sonuçları verir
    • \n
  • Mümkünse, aramanızı belirli bir kategori, kullanıcı, veya konuya daraltın
    • \n
\n

\n

Seçenekler

\n

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

\n

\n gökkuşağı category:parks status:open order:latest \"parklar\" kategorisinde, kapalı veya arşivlenmiş olmayan konular arasında \"gökkuşağı\" kelimesi içerenleri arar ve sonuçları gönderi tarihi sırasına göre gösterir.

\n" admin_login: success: "E-posta Gönderildi" error: "Hata!" diff --git a/config/locales/server.uk.yml b/config/locales/server.uk.yml index 9067e458b6..881a6386f8 100644 --- a/config/locales/server.uk.yml +++ b/config/locales/server.uk.yml @@ -569,7 +569,6 @@ uk: signup_after_approval: subject_template: "Вас було схвалено на сайті %{site_name}!" signup: - subject_template: "[%{site_name}] Активуйте свій новий обліковий запис" text_body_template: | Вітаємо у %{site_name}! @@ -594,8 +593,6 @@ uk: pasted_image_filename: "Вставлене зображення" store_failure: "Не вдалося зберегти завантаження #%{upload_id} для користувача #%{user_id}." images: - fetch_failure: "Sorry, there has been an error while fetching the image." - unknown_image_type: "Sorry, but the file you tried to upload doesn't appear to be an image." size_not_found: "Sorry, but we couldn't determine the size of the image. Maybe your image is corrupted?" flag_reason: sockpuppet: "A new user created a topic, and another new user at the same IP address replied. See the flag_sockpuppets site setting." diff --git a/config/locales/server.zh_CN.yml b/config/locales/server.zh_CN.yml index 8b8e3a624b..24e9447d93 100644 --- a/config/locales/server.zh_CN.yml +++ b/config/locales/server.zh_CN.yml @@ -435,6 +435,7 @@ zh_CN: regular: title: "常规主题" banner: + title: "横幅主题" message: make: "本主题现在是横幅主题。它将出现在每页的顶部，除非用户将其隐藏。" remove: "本主题已经不再是横幅主题。它将不在每个页面的顶部显示。" @@ -542,6 +543,14 @@ zh_CN: title: "总量" xaxis: "天" yaxis: "总 API 请求" + page_view_logged_in_mobile_reqs: + title: "已登录的 API 请求" + xaxis: "天" + yaxis: "移动端已登录 API 请求" + page_view_anon_mobile_reqs: + title: "匿名 API 请求" + xaxis: "天" + yaxis: "移动端匿名 API 请求" http_background_reqs: title: "后台" xaxis: "天" @@ -574,6 +583,10 @@ zh_CN: title: "没有回复的帖子" xaxis: "天" yaxis: "总量" + mobile_visits: + title: "用户访问" + xaxis: "天" + yaxis: "访问次数" dashboard: rails_env_warning: "你的服务器运行在 %{env} 模式。" ruby_version_warning: "你正在使用 Ruby 2.0.0，这个版本有较多的问题。请升级至 p247 或更新版。" @@ -706,6 +719,7 @@ zh_CN: notify_mods_when_user_blocked: "如果一个用户被自动封禁了，发送一个消息给所有管理员。" flag_sockpuppets: "如果一个新用户开始了一个主题，并且同时另一个新用户以同一个 IP 在该主题回复，他们所有的帖子都将被自动标记为垃圾。" traditional_markdown_linebreaks: "在 Markdown 中使用传统换行符，即用两个尾随空格来换行" + allow_html_tables: "允许 Markdown 中输入表格的 HTML 表情，TABLE、THEAD、TD、TR、TD 等（需要重制包含表格标签的旧帖子）" post_undo_action_window_mins: "允许用户在帖子上进行撤销操作（赞、标记等）所需等待的间隔分钟数" must_approve_users: "新用户在被允许访问站点前需要由职员批准。警告：在运行的站点中启用将解除所有非职员用户的访问权限！" ga_tracking_code: "Google 分析追踪代码（ga.js），例如：UA-12345678-9。参考 http://google.com/analytics" @@ -750,6 +764,7 @@ zh_CN: login_required: "需要验证才能继续在该站阅读，不允许匿名访问。" min_username_length: "最小用户名长度。警告：所有现用户名小于此限制长度的用户都将无法访问站点。" max_username_length: "最大用户名长度。警告：所有现用户名大于此限制长度的用户都将无法访问站点。" + reserved_usernames: "注册时不可使用的用户名。" min_password_length: "最小密码长度。" block_common_passwords: "不允许使用 10,000 个最常用的密码。" enable_sso: "启用通过外部站点单点登录（警告：用户的邮件地址必须被外部站点验证！）" @@ -934,6 +949,7 @@ zh_CN: dominating_topic_minimum_percent: "用户在主题中的帖子占到多少百分比时使得用户主导话题。" daily_performance_report: "每日分析 NGINX 日志并且发布详情主题到职员才能看到的主题" suppress_uncategorized_badge: "不要为主题列表中的未分类主题显示徽章。" + permalink_normalizations: "在匹配永久链接之前应用如下正则表达式，例如：/(\\/topic.*)\\?.*/\\1 将去掉所有主题路径的参数字符串。格式为使用正则表达式，以及在字符串使用 \\1 等等来访问捕获内容" global_notice: "为所有访客显示“紧急的”全局横幅，留空隐藏它（可以使用 HTML）" disable_edit_notifications: "当 'download_remote_images_to_local' 启用时禁用系统编辑提醒。" full_name_required: "全名是用户个人信息的必填项。" @@ -1022,6 +1038,7 @@ zh_CN: other: "我已经移动了 %{count} 个帖子到了一个已存在的主题：%{topic_link}" change_owner: post_revision_text: "所有权从 %{old_user} 转移至 %{new_user}" + deleted_user: "已经删除的用户" emoji: errors: name_already_exists: "抱歉，名字 '%{name}' 已经被另一个 emoji 使用。" @@ -1069,6 +1086,8 @@ zh_CN: omniauth_error_unknown: "在处理你的登录过程中发生了错误，请重试。" new_registrations_disabled: "现在不允许注册新账户。" password_too_long: "密码不能超过 200 个字符。" + email_too_long: "你输入的邮件太长了。邮箱名不得超过 254 字符，域名必须不超过 253 字符。" + reserved_username: "该用户名不可被使用。" missing_user_field: "你还没有填写完所有用户字段" close_window: "验证已经完成。关闭窗口以继续。" user: @@ -1245,6 +1264,91 @@ zh_CN: 然而，如果帖子再次被社群标记并隐藏，它将被隐藏并等待版主处理——并且可能导致进一步的措施，包括禁止你的用户帐号的可能。 想了解更多，请查看我们的[社群指引](%{base_url}/guidelines)。 + usage_tips: + text_body_template: | + 这是一条包含了一些可以让你快速开始的技巧提示的消息： + + ## 阅读 + + 要阅读更多，**只需要继续向下滚动页面！** + + 当有新的回复或者新主题时，他们将自动地出现 —— 没有必要刷新页面。 + + ## 导航 + + - 要搜索，用你的用户页面，或者使用☰菜单，这个**右上角的图标**。 + + - 点击主题标题将引导你至该主题**下一个未读**的帖子。要跳至主题顶部或底部，分别点击回复数量或者最后一次回复时间。 + + + + - 当在阅读主题时，点击右下角的进度条打开导航控制。点击帖子标题可回到顶部。按键盘上的 ? 键获取快速键盘快捷键列表。 + + + + ## 回复 + + - 要回复**整个主题**，使用页面最底下的 。 + + - 要回复**特定的人**，使用他们帖子的 。 + + - 要用**一个新主题**回复，使用帖子右边的 。老的和新的主题将自动被链接至一起。 + + 要插入引用，选择想要引用的文字，然后点击任何回复按钮。重复以上操作创建多个引用！ + + + + 要提醒某人你的回复，提到他们的用户名。键入 `@` 开始选择一个用户名。 + + + + 要使用[标准绘文字（Emoji）](http://www.emoji.codes/)，先键入 `:` 用名字匹配，或使用传统表情符 `;)` + + + + 要生成链接概要，直接将链接粘贴至单独的一行： + + + + ## 操作 + + 每一个帖子底部有几个操作按钮： + + + + 要让别人知道你喜欢并且感谢他们的帖子，使用**赞**按钮。分享爱！ + + 如果你觉得某人的帖子有问题，使用**标记**按钮私下让他或者[我们的职员](%{base_url}/about)知道。你也可以**分享**至该帖子的链接，或者标记**书签**以供以后在你的用户页查看。 + + ## 通知 + + 当有人回复你、引用你的帖子或者提到`@你`的时候，一个数字将会立即出现在页面右上角。使用它查看**通知**。 + + + + 不用担心错过他人的回复 —— 当你不在时，你将会收到邮件提醒。 + + ## 你的设置 + + - 所有小于**两天**的主题算新主题。 + + - 任何你**积极参与**的主题（通过创建、回复或者阅读很长时间）将被自动追踪。 + + 你将会在主题名字附近见到蓝色的新主题提示和未读帖子数字指示： + + + + 你可以通过主题下方的通知控制改变通知状态。 + + + + 你也可以为每个分类设置通知状态，比如你可以要监控一个主题的每一个新主题。 + + 要修改任何设置，见[你的用户设置](%{base_url}/my/preferences)。 + + ## 社群信任 + + 因为你的积极参与，你将渐渐获得社群信任，成为一个真正的公民，针对新用户的限制将被移除。当达到了一个足够的[信任等级](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924)，你将会得到适当的能力一起帮助管理社群。 welcome_user: subject_template: "欢迎来到 %{site_name}！" text_body_template: | @@ -1608,7 +1712,7 @@ zh_CN: （如果你在新用户级别需要和[职员](%{base_url/about)沟通的话，直接回复这个消息。） signup: - subject_template: "[%{site_name}] 激活你的新帐号" + subject_template: "[%{site_name}] 确认你的新账户" text_body_template: | 欢迎来到 %{site_name}！ @@ -1640,8 +1744,6 @@ zh_CN: too_large: "抱歉，你试图上传的文件太大了（最大限制为%{max_size_kb}%KB）。" images: too_large: "抱歉，你试图上传的图片太大了（最大限制为%{max_size_kb}%KB），请裁剪它并重试。" - fetch_failure: "抱歉，获取图片时发生错误。" - unknown_image_type: "抱歉，你上传的文件似乎不是一张图片。" size_not_found: "抱歉，我们无法获取图片大小，请检查你的图片是否已损坏。" flag_reason: sockpuppet: "新用户创建了主题，而另外一个新用户以同一个 IP 在该主题回复。查看站点设置的 flag_sockpuppets。" @@ -1674,17 +1776,145 @@ zh_CN: 编辑本主题的第一帖以改变 %{page_name} 页面的内容。 guidelines_topic: title: "FAQ/指引" - body: "\n\n## [文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是硬性规定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的公开论坛。\n\n\n\n## [改善讨论](#improve)\n\n帮助我们做一些帮助改善讨论的事，这样能帮助我们让这个地方变成一个参与讨论的好地方。\n\n这里被讨论的主题对我们很重要，并且如果他们对你也很重要，请和我们一样严肃对待他们。即使你不同意别人的话，但是也要尊重正在讨论这些主题的人们。\n\n改进讨论的一个方式是探索已经发生过的事。请在回复或者开始你自己的主题前花一些时间浏览，这样你更有机会遇见和你有共同爱好的人。\n\n\n\n## [尊重，当你不同意时](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回应帖子的语气而不是它的真正内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。\n\n\n\n## [你的参与有价值](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与那些让论坛变成一个有意思的地方，来帮助我们改善社群的未来 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复、编辑或者其他。使用这些工具改善你自己的体验，和其他人的体验。\n\n让我们留下一个比发现它之前更好的社群。\n\n\n\n## [如果你看见了一个问题，标记它](#flag-problems)\n\n版主有特别的权力；他们对论坛负责。但是你也是。通过你的帮助，版主能促进社群的发展，而不是守卫或者警察。\n\n当你见到不合适的行为，不要回应它。这种承认变相鼓励了这种不合适的行为，浪费了你的经历，并且浪费了每一个人的时间。_是要标记它。_如果收到了足够的标记，会有相应的处理，无论是自动地或版主的介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和其他用户的权力。版主不能预览任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。\n\n\n\n## [永远文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为会冒犯、滥用或招致怨恨的言论。\n* 保持干净。不要发表任何淫秽或性暗示的东西。\n* 尊重其他人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款没有准确的定义 — 避免任何_可能_的这些事。如果你不确定，问问自己这些是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意语言、链接和家庭和朋友的图片的安全。\n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类开始一个新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字信息。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何不符合其他法律的事。\n\n\n\n## [有你参与](#power) \n\n这个站点由[一群友善的职员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站务](/c/meta)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[职员页面](/about)联系我们。\n\n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（或者我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" + body: "\n\n## [这是一个文明讨论的地方](#civilized)\n\n在论坛上请表现得像在公共公园一样得体。我们一群人共享着一个公共社群资源 — 一个通过不断进行讨论以分享我们技能、知识和兴趣的地方。\n\n这些都不是死规矩或者是草率决定，只是一些帮助社群的人们来判断的规定。试用这些指引来保持干净和充满灵感的文明的公开论坛。 \n\n\n\n## [改善讨论](#improve)\n\n帮助我们让这个地方变成一个讨论的好地方。你可以总是一致的做一些帮助改善讨论的事，即使是小事也行。如果你不确定你的帖子有益于讨论，认真想一想你要说什么再发布。\n\n这里讨论的主题对我们很重要，并且我们希望你也觉得这些内容对你很重要。尊重这些讨论的主题，以及讨论他们的人们，特别是当你不同意他们所说的时候。\n\n改善讨论的一种方法是找一找已经发生过的事。请在发帖或创建你自己的主题前，花一些时间浏览这些主题，这样你更有机会遇见和你有共同爱好的人。 \n\n\n\n## [即使你不同意他人时，尊重他人](#agreeable)\n\n你可能想表达你的不同意。这没问题。但是，记住_批评观点，而不是人_。请避免：\n\n* 指名道姓。\n* 人生攻击。\n* 回复帖子无关于帖子的内容。\n* 下意识的反驳。\n\n相反，提供合理的观点改善讨论。 \n\n\n\n## [你的参与有意义](#participate)\n\n我们在这儿的讨论为大家树立了榜样。通过选择参与有意义的讨论，帮助我们将论坛变成一个有意思的地方 — 并且避免那些没有帮助的行为。\n\nDiscourse 提供了让社群共同鉴别最棒（或最差）的贡献的工具：收藏、书签、赞、标记、回复和编辑等等。使用这些工具不仅能改善你自己的体验，也能改善其他人的体验。\n\n让我们创造一个更美好的社群。\n\n\n\n## [如果你发现问题了，标记它](#flag-problems)\n版主有特别的权力；他们对论坛负责。但是你也是。有了你的帮助，版主能成为社群监察者，而不仅是守卫或者警察。\n\n当你见到不合适的行为，不要回复。这种承认变相鼓励了这种不合适的行为，浪费了你的精力，并且浪费了每一个人的时间。_只要标记它。_如果收到了足够的标记，将会有相应的处理，这个处理可能是自动地，也可能由版主介入。\n\n为了维护我们的社群，版主保留了任何情况下删除任何内容和任何用户的权力。版主没有预先审核任何新帖子；版主和站点维护人员对社群里发表的任何言论均不负责任。 \n\n\n\n## [永远保持文明](#be-civil)\n\n粗鲁这样的行为会破坏健康的讨论：\n\n* 文明。不要发表任何理智的人会认为冒犯的、过分的或招致怨恨的言论。\n* 拒绝色情。不要发表任何淫秽或性暗示的东西。\n* 尊重每一个人。不要骚扰或者让别人难过，检视别人，或暴露他们的个人信息。\n* 尊重我们的论坛。不要发表广告或者其他垃圾信息。\n\n这些条款不是法律条文，并且没有准确的定义 — 避免任何做关于他们的_可能擦边_的事。如果你不确定，问问自己的帖子是否能出现在纽约时报的头版头条上。\n\n这是一个公共论坛，并且搜索引擎会索引这些讨论。注意发表的语言、链接和图片，不要在其中包含你的家庭和朋友。 \n\n\n\n## [保持整洁](#keep-tidy)\n\n花一点时间让东西出现在正确的位置，这样我们能花更多的时间在讨论上而非清理格式。所以：\n\n* 不要在错误的分类发表新主题。\n* 不要在多个主题中回复同样的内容。\n* 不要发布没有内容的回复。\n* 不要在中途改变主题。\n* 不要在你的帖子中签名 — 每一贴都附有你的个人信息。\n\n比起发表“+1”或者“同意”，使用赞按钮。比起将帖子带向一个决然不同的方向，使用“回复为关联主题”。\n\n\n\n## [只发表你自己的东西](#stealing)\n\n你不能在没有他人授权的情况下发表任何属于他人的数字资产。你可能不能发表关于窃据他人知识产权（软件、视频、音频和图像）的任何简介、链接或方法，或其他任何违反法律的内容。 \n\n\n\n## [有你参与](#power)\n\n这个站点由[一群友善的职员](/about)、你和社群一起运营。如果你对这里的事情仍有疑问，在[站点反馈](/c/site-feedback)分类新建一个主题并且开始讨论！如果遇到了重要或紧急的事情，并且不能用站务分类的主题或标记解决，通过[职员页面](/about)联系我们。\n\ + \n\n\n## [使用条款](#tos)\n\n是的，法律很无聊，但是我们必须保护我们自己 – 引申开来，你和你的数据 – 用于针对不友好的家伙们。我们有一个[使用条款](/tos)描述你的（以及我们）关于内容、隐私和法律的行为和权力。要使用我们的服务，你必须同意遵守[使用条款](/tos)。\n" tos_topic: title: "服务条款" - body: "下面的条款及条件适用于 %{company_domain} 网站的所有内容、服务和产品，其方式通过网站，其中包括，但不限于 %{company_domain} 论坛软件、%{company_domain} 支持论坛和在 %{company_domain} 托管服务（“托管”）（一起称为，网站）。该网站属于 %{company_full_name}（“%{company_name}”）并由其运营。该网站要求你必须接受所有本文中所包含的条款和条件以及其他所有的规则、政策（包括修改，但不限于 %{company_domain} 的[隐私政策](/privacy)、[社群准则](/FAQ)和程序（统称“协议”），并可能不时由 %{company_name} 发布。\n\n访问或使用本网站之前，请仔细阅读本协议。访问或使用网站的任何部分，即代表你同意成为受本协议的条款和条件。如果你不同意所有的条款和本协议的条件，那么你可能无法访问网站或使用任何服务。若这些条款和条件被认为是与 %{company_name} 的合同，则你必须接受这些条款。本网站只提供给 13 岁以上个人。\n\n \n\n## [1. 你的 %{company_domain} 帐号]（#1） \n\n如果你在网站上创建一个帐户，你有责任维护你的帐号安全，你对帐户下发生的所有活动完全负责。你必须立即通知 %{company_name} 关于你的帐户的任何未经授权或任何其他违反安全的使用。%{company_name} 不会对你的任何行或不作为，包括因该等作为或不作为而导致的任何种类的任何损失承担任何责任。 \n\n \n\n## [2. 提供者的责任]（#2） \n\n如果你张贴的材料有关于别的网站的链接，或以其他方式（或允许任何第三方进行）张贴别的网站的材料（不论何等材料，“内容”），你需对此完全负责，包括使用因该内容所造成的任何损害。不管所讨论的内容是文字、图形、音频文件或计算机软件。你声明和保证： \n\n* 下载、复制和使用内容不会侵犯专有权利，包括但不限于著作权，专利，商标或商业秘密权利的任何第三方；\n* 如果你的雇主对你的创造拥有知识产权，你必须以(i)获准从你的雇主发布或提供的内容，包括但不限于任何软件，或(ii)由你的雇主放弃拥有内容的所有权利；\n* 你已完全遵守有关该内容的第三方条约，并同意了所有面向最终用户所需的任何条款；\n* 内容不包含或安装任何病毒、蠕虫、恶意软件、特洛伊木马或其他有害或破坏性的内容；\n* 内容不是垃圾，不是机器的或随机生成的，并且不包含设计来吸引流量到第三方网站或助推第三方网站的搜索引擎排名，或者进一步非法行为不道德或不想要的广告内容（诸如网络钓鱼）或误导接受者为对材料的来源（如欺骗）；\n* 内容不色情，不包含威胁或煽动暴力，并没有侵犯任何第三方的隐私或公开权；\n* 你的内容不是不受欢迎的电子讯息，如新闻组垃圾链接、邮件列表、博客和网站，以及类似的不请自来的宣传方式宣传；\n* 你的内容不是在误导读者，以你是另外一个人或公司的方式；和 \n* 你应在内容中包含计算机代码，准确地分类和/或所描述的类型、性质、用途和材料的影响，是否请求 %{company_name} 或以其他方式这样做的情况下。 \n\n \n\n## [3.用户内容授权]（#3） \n\n用户贡献使用 [知识共享 署名-非商业性使用-相同方式共享3.0 Unported之许可](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.zh_CN)授权。在不限制任何该等陈述或保证的情况下，%{company_name} 有权利（但没有义务）在 %{company_name} 的全权酌情决定下(i)根据 %{company_name} 的合理意见，任何违反 %{company_name} 政策或以任何方式伤害或使他人反感的情况能拒绝或删除任何内容；或(ii)以任何理由终止或拒绝任何个人和组织访问和使用本网站。%{company_name} 有唯一裁量权。%{company_name} 没有义务退还先前支付的任何款项。 \n\n\n \n\n## [4. Payment and Renewal](#4)\n\n### General Terms\n\nOptional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated.\ - \ Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable.\n\n### Automatic Renewal\n\nUnless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time.\n\n\n\n## [5. Services](#5)\n\n### Hosting, Support Services\n\nOptional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions.\n\n\n\n## [6. Responsibility of Website Visitors](#6)\n\n%{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions,\ - \ stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted.\n\n\n\n## [7. Content Posted on Other Websites](#7)\n\nWe have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages.\n\n\n\n## [8. Copyright Infringement and DMCA Policy](#8)\n\nAs %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) (\"DMCA\") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination,\ - \ %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}.\n\n\n\n## [9. Intellectual Property](#9)\n\nThis Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks.\n\n\n\n## [10. Advertisements](#10)\n\n%{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account.\n\n\n\n## [11. Attribution](#11)\n\n%{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased.\n\n\n\n## [12. Changes](#12)\n\n%{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions\ - \ of this Agreement.\n\n\n\n## [13. Termination](#13)\n\n%{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.\n\n\n\n## [14. Disclaimer of Warranties](#14)\n\nThe Website is provided \"as is\". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that cess thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk.\n\n\n\n## [15. Limitation of Liability](#15)\n\nIn no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond\ - \ their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law.\n\n\n\n## [16. General Representation and Warranty](#16)\n\nYou represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party.\n\n\n\n## [17. Indemnification](#17)\n\nYou agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement.\n\n\n\n## [18. Miscellaneous](#18)\n\nThis Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual\ - \ property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns.\n\n这份文件以 CC-BY-SA 授权下发布。最后更新时间为2013年5月31日。 \n\n本来改编自[WordPress的服务条款](http://en.wordpress.com/tos/)。\n" + body: | + The following terms and conditions govern all use of the %{company_domain} website and all content, services and products available at or through the website, including, but not limited to, %{company_domain} Forum Software, %{company_domain} Support Forums and the %{company_domain} Hosting service ("Hosting"), (taken together, the Website). The Website is owned and operated by %{company_full_name} ("%{company_name}"). The Website is offered subject to your acceptance without modification of all of the terms and conditions contained herein and all other operating rules, policies (including, without limitation, %{company_domain}’s [Privacy Policy](/privacy) and [Community Guidelines](/faq)) and procedures that may be published from time to time on this Site by %{company_name} (collectively, the "Agreement"). + + Please read this Agreement carefully before accessing or using the Website. By accessing or using any part of the web site, you agree to become bound by the terms and conditions of this agreement. If you do not agree to all the terms and conditions of this agreement, then you may not access the Website or use any services. If these terms and conditions are considered an offer by %{company_name}, acceptance is expressly limited to these terms. The Website is available only to individuals who are at least 13 years old. + + + + ## [1. Your %{company_domain} Account](#1) + + If you create an account on the Website, you are responsible for maintaining the security of your account and you are fully responsible for all activities that occur under the account. You must immediately notify %{company_name} of any unauthorized uses of your account or any other breaches of security. %{company_name} will not be liable for any acts or omissions by you, including any damages of any kind incurred as a result of such acts or omissions. + + + + ## [2. Responsibility of Contributors](#2) + + If you post material to the Website, post links on the Website, or otherwise make (or allow any third party to make) material available by means of the Website (any such material, "Content"), You are entirely responsible for the content of, and any harm resulting from, that Content. That is the case regardless of whether the Content in question constitutes text, graphics, an audio file, or computer software. By making Content available, you represent and warrant that: + + * the downloading, copying and use of the Content will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark or trade secret rights, of any third party; + * if your employer has rights to intellectual property you create, you have either (i) received permission from your employer to post or make available the Content, including but not limited to any software, or (ii) secured from your employer a waiver as to all rights in or to the Content; + * you have fully complied with any third-party licenses relating to the Content, and have done all things necessary to successfully pass through to end users any required terms; + * the Content does not contain or install any viruses, worms, malware, Trojan horses or other harmful or destructive content; + * the Content is not spam, is not machine- or randomly-generated, and does not contain unethical or unwanted commercial content designed to drive traffic to third party sites or boost the search engine rankings of third party sites, or to further unlawful acts (such as phishing) or mislead recipients as to the source of the material (such as spoofing); + * the Content is not pornographic, does not contain threats or incite violence, and does not violate the privacy or publicity rights of any third party; + * your content is not getting advertised via unwanted electronic messages such as spam links on newsgroups, email lists, blogs and web sites, and similar unsolicited promotional methods; + * your content is not named in a manner that misleads your readers into thinking that you are another person or company; and + * you have, in the case of Content that includes computer code, accurately categorized and/or described the type, nature, uses and effects of the materials, whether requested to do so by %{company_name} or otherwise. + + + + ## [3. User Content License](#3) + + User contributions are licensed under a [Creative Commons Attribution-NonCommercial-ShareAlike 3.0 Unported License](http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_US). Without limiting any of those representations or warranties, %{company_name} has the right (though not the obligation) to, in %{company_name}’s sole discretion (i) refuse or remove any content that, in %{company_name}’s reasonable opinion, violates any %{company_name} policy or is in any way harmful or objectionable, or (ii) terminate or deny access to and use of the Website to any individual or entity for any reason, in %{company_name}’s sole discretion. %{company_name} will have no obligation to provide a refund of any amounts previously paid. + + + + + ## [4. Payment and Renewal](#4) + + ### General Terms + + Optional paid services or upgrades may be available on the Website. When utilizing an optional paid service or upgrade, you agree to pay %{company_name} the monthly or annual subscription fees indicated. Payments will be charged on a pre-pay basis on the day you begin utilizing the service or upgrade and will cover the use of that service or upgrade for a monthly or annual subscription period as indicated. These fees are not refundable. + + ### Automatic Renewal + + Unless you notify %{company_name} before the end of the applicable subscription period that you want to cancel a service or upgrade, your subscription will automatically renew and you authorize us to collect the then-applicable annual or monthly subscription fee (as well as any taxes) using any credit card or other payment mechanism we have on record for you. Subscriptions can be canceled at any time. + + + + ## [5. Services](#5) + + ### Hosting, Support Services + + Optional Hosting and Support services may be provided by %{company_name} under the terms and conditions for each such service. By signing up for a Hosting/Support or Support services account, you agree to abide by such terms and conditions. + + + + ## [6. Responsibility of Website Visitors](#6) + + %{company_name} has not reviewed, and cannot review, all of the material, including computer software, posted to the Website, and cannot therefore be responsible for that material’s content, use or effects. By operating the Website, %{company_name} does not represent or imply that it endorses the material there posted, or that it believes such material to be accurate, useful or non-harmful. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. The Website may contain content that is offensive, indecent, or otherwise objectionable, as well as content containing technical inaccuracies, typographical mistakes, and other errors. The Website may also contain material that violates the privacy or publicity rights, or infringes the intellectual property and other proprietary rights, of third parties, or the downloading, copying or use of which is subject to additional terms and conditions, stated or unstated. %{company_name} disclaims any responsibility for any harm resulting from the use by visitors of the Website, or from any downloading by those visitors of content there posted. + + + + ## [7. Content Posted on Other Websites](#7) + + We have not reviewed, and cannot review, all of the material, including computer software, made available through the websites and webpages to which %{company_domain} links, and that link to %{company_domain}. %{company_name} does not have any control over those non-%{company_domain} websites and webpages, and is not responsible for their contents or their use. By linking to a non-%{company_domain} website or webpage, %{company_name} does not represent or imply that it endorses such website or webpage. You are responsible for taking precautions as necessary to protect yourself and your computer systems from viruses, worms, Trojan horses, and other harmful or destructive content. %{company_name} disclaims any responsibility for any harm resulting from your use of non-%{company_domain} websites and webpages. + + + + ## [8. Copyright Infringement and DMCA Policy](#8) + + As %{company_name} asks others to respect its intellectual property rights, it respects the intellectual property rights of others. If you believe that material located on or linked to by %{company_domain} violates your copyright, and if this website resides in the USA, you are encouraged to notify %{company_name} in accordance with %{company_name}’s [Digital Millennium Copyright Act](http://en.wikipedia.org/wiki/Digital_Millennium_Copyright_Act) ("DMCA") Policy. %{company_name} will respond to all such notices, including as required or appropriate by removing the infringing material or disabling all links to the infringing material. %{company_name} will terminate a visitor’s access to and use of the Website if, under appropriate circumstances, the visitor is determined to be a repeat infringer of the copyrights or other intellectual property rights of %{company_name} or others. In the case of such termination, %{company_name} will have no obligation to provide a refund of any amounts previously paid to %{company_name}. + + + + ## [9. Intellectual Property](#9) + + This Agreement does not transfer from %{company_name} to you any %{company_name} or third party intellectual property, and all right, title and interest in and to such property will remain (as between the parties) solely with %{company_name}. %{company_name}, %{company_domain}, the %{company_domain} logo, and all other trademarks, service marks, graphics and logos used in connection with %{company_domain}, or the Website are trademarks or registered trademarks of %{company_name} or %{company_name}’s licensors. Other trademarks, service marks, graphics and logos used in connection with the Website may be the trademarks of other third parties. Your use of the Website grants you no right or license to reproduce or otherwise use any %{company_name} or third-party trademarks. + + + + ## [10. Advertisements](#10) + + %{company_name} reserves the right to display advertisements on your content unless you have purchased an Ad-free Upgrade or a Services account. + + + + ## [11. Attribution](#11) + + %{company_name} reserves the right to display attribution links such as ‘Powered by %{company_domain},’ theme author, and font attribution in your content footer or toolbar. Footer credits and the %{company_domain} toolbar may not be removed regardless of upgrades purchased. + + + + ## [12. Changes](#12) + + %{company_name} reserves the right, at its sole discretion, to modify or replace any part of this Agreement. It is your responsibility to check this Agreement periodically for changes. Your continued use of or access to the Website following the posting of any changes to this Agreement constitutes acceptance of those changes. %{company_name} may also, in the future, offer new services and/or features through the Website (including, the release of new tools and resources). Such new features and/or services shall be subject to the terms and conditions of this Agreement. + + + + ## [13. Termination](#13) + + %{company_name} may terminate your access to all or any part of the Website at any time, with or without cause, with or without notice, effective immediately. If you wish to terminate this Agreement or your %{company_domain} account (if you have one), you may simply discontinue using the Website. All provisions of this Agreement which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability. + + + + ## [14. Disclaimer of Warranties](#14) + + The Website is provided "as is". %{company_name} and its suppliers and licensors hereby disclaim all warranties of any kind, express or implied, including, without limitation, the warranties of merchantability, fitness for a particular purpose and non-infringement. Neither %{company_name} nor its suppliers and licensors, makes any warranty that the Website will be error free or that access thereto will be continuous or uninterrupted. If you’re actually reading this, here’s [a treat](http://www.newyorker.com/online/blogs/shouts/2012/12/the-hundred-best-lists-of-all-time.html). You understand that you download from, or otherwise obtain content or services through, the Website at your own discretion and risk. + + + + ## [15. Limitation of Liability](#15) + + In no event will %{company_name}, or its suppliers or licensors, be liable with respect to any subject matter of this agreement under any contract, negligence, strict liability or other legal or equitable theory for: (i) any special, incidental or consequential damages; (ii) the cost of procurement for substitute products or services; (iii) for interruption of use or loss or corruption of data; or (iv) for any amounts that exceed the fees paid by you to %{company_name} under this agreement during the twelve (12) month period prior to the cause of action. %{company_name} shall have no liability for any failure or delay due to matters beyond their reasonable control. The foregoing shall not apply to the extent prohibited by applicable law. + + + + ## [16. General Representation and Warranty](#16) + + You represent and warrant that (i) your use of the Website will be in strict accordance with the %{company_name} [Privacy Policy](/privacy), [Community Guidelines](/guidelines), with this Agreement and with all applicable laws and regulations (including without limitation any local laws or regulations in your country, state, city, or other governmental area, regarding online conduct and acceptable content, and including all applicable laws regarding the transmission of technical data exported from the country in which this website resides or the country in which you reside) and (ii) your use of the Website will not infringe or misappropriate the intellectual property rights of any third party. + + + + ## [17. Indemnification](#17) + + You agree to indemnify and hold harmless %{company_name}, its contractors, and its licensors, and their respective directors, officers, employees and agents from and against any and all claims and expenses, including attorneys’ fees, arising out of your use of the Website, including but not limited to your violation of this Agreement. + + + + ## [18. Miscellaneous](#18) + + This Agreement constitutes the entire agreement between %{company_name} and you concerning the subject matter hereof, and they may only be modified by a written amendment signed by an authorized executive of %{company_name}, or by the posting by %{company_name} of a revised version. Except to the extent applicable law, if any, provides otherwise, this Agreement, any access to or use of the Website will be governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions, and the proper venue for any disputes arising out of or relating to any of the same will be the state and federal courts located in San Francisco County, California. Except for claims for injunctive or equitable relief or claims regarding intellectual property rights (which may be brought in any competent court without the posting of a bond), any dispute arising under this Agreement shall be finally settled in accordance with the Comprehensive Arbitration Rules of the Judicial Arbitration and Mediation Service, Inc. (“JAMS”) by three arbitrators appointed in accordance with such Rules. The arbitration shall take place in San Francisco, California, in the English language and the arbitral decision may be enforced in any court. The prevailing party in any action or proceeding to enforce this Agreement shall be entitled to costs and attorneys’ fees. If any part of this Agreement is held invalid or unenforceable, that part will be construed to reflect the parties’ original intent, and the remaining portions will remain in full force and effect. A waiver by either party of any term or condition of this Agreement or any breach thereof, in any one instance, will not waive such term or condition or any subsequent breach thereof. You may assign your rights under this Agreement to any party that consents to, and agrees to be bound by, its terms and conditions; %{company_name} may assign its rights under this Agreement without condition. This Agreement will be binding upon and will inure to the benefit of the parties, their successors and permitted assigns. + + This document is CC-BY-SA. It was last updated May 31, 2013. + + Originally adapted from the [WordPress Terms of Service](http://en.wordpress.com/tos/). privacy_topic: title: "隐私政策" body: | @@ -1793,6 +2023,59 @@ zh_CN:

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

+ badges: + long_descriptions: + autobiographer: | + 该徽章授予给填写了用户页面并选择了用户头像的成员。让社群更多地了解你是谁以及你感兴趣的内容能帮助创造一个更好的更团结的社群。 + first_like: | + 该徽章授予给第一次使用 :heart: 按钮赞了帖子的成员。给帖子点赞是一个极好的让社群成员知道他们的帖子有意思、有用、酷炫或者好玩的方法。分享爱！ + first_link: |+ + 该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。 + + first_quote: | + 该徽章授予给第一次在回复中包含了到另一个主题的链接。链接主题在两个主题的右侧显示连接，可以帮助阅读者迅速地找到相关讨论。 + first_share: | + 该徽章授予给第一次用分享按钮分享了回复或者主题的链接的成员。分享链接是一个极好的方式向外部世界展示有趣的讨论的方法，并且能推动社群增长。 + read_guidelines: |+ + 该徽章授予给阅读了社群指引的成员。遵守和分享简单的指引能帮助打造一个安全、有趣和可持续的社群。 + + reader: | + 该徽章授予给阅读了一个较长的主题的成员。阅读是最基础的。详细阅读帮助你更好地了解讨论并帮助你编写更好的、更完整的回复。 + editor: | + 该徽章授予给编辑自己帖子的成员。任何时候都不要犹豫编辑你的帖子以改善他们、改正小错误或者增加你忘记的内容。 + first_flag: | + 该徽章授予给标记过帖子的用户。标记对社群的健康很重要。如果你注意到了任何需要版主注意的帖子，请不要犹豫，直接标记 它。你可能也使用了标记对话框向用户发送了消息。 + nice_share: | + 该徽章授予给分享帖子的链接至超过 25 个外部访客的成员。干得好！分享有趣的讨论给朋友是一个帮助社群成长的极好方式。 + welcome: | + 该徽章授予给帖子收到了第一个赞的成员。恭喜，有社群成员发现你发表的内容有意思、酷炫或者有用！ + anniversary: | + 该徽章授予给在社群超过一年并且这一年中至少发布了一个帖子的成员。谢谢你的关注和对我们社群的贡献！ + good_share: | + 该徽章授予给分享帖子的链接至超过 300 个外部访客的成员。做得真棒！你已经把一个有意思的讨论分享给了许多新人，并且帮助了社群成长。 + great_share: | + 该徽章授予给分享帖子的链接至超过 100 个外部访客的成员。哇！你已经把一个有趣的主题分享给了许多新读者，并且帮助了社群成长。 + nice_post: |+ + 该徽章授予给创建了得到 10 个赞的回复的成员。干得好！ + + nice_topic: | + 该徽章授予给创建了得到 10 个赞的主题的成员。干得好！ + good_post: | + 该徽章授予给创建了得到 25 个赞的回复的成员。干得好！ + good_topic: | + 该徽章授予给创建了得到 25 个赞的主题的成员。干得好！ + great_post: | + 该徽章授予给创建了得到 50 个赞的帖子的成员。哇！ + great_topic: | + 该徽章授予给创建了得到 50 个赞的回复的成员。哇！ + basic: | + 该徽章授予给用户等级达到 1 的成员。感谢你在社群里花了一些时间并且阅读了一些帖子，了解了我们的社群。你的新用户限制已经被取消，并且你已经被授予了所有基本的社群权限，必须个人消息、标记、维基编辑和发布图片和多个链接的能力。 + member: | + 该徽章授予给用户等级达到 2 的成员。感谢你在社群的这几周时间。你现在已经可以在你的用户页或者主题中发送私人邀请、创建群组消息，以及每天可以赞更多次了。 + regular: | + 该徽章授予给用户等级达到 3 的成员。感谢你在社群的这几月的活跃参与，并且是我们最活跃的读者质疑，也是社群中的可靠贡献者。你现在可以重新分类和重命名主题、访问隐藏的贵宾分类、使用更多强大的防骚扰标记功能，以及每天可以赞更多次了。 + leader: | + 该徽章授予给用户等级达到 4 的成员。你是由职员选择的社群领袖，鉴于你在社群的话语和贡献，你为社群树立了一个正面的例子。你有权限编辑所有的帖子，使用主题管理操作，例如置顶、关闭、不在列表中显示、存档、分割和合并，并且可以每天点赞非常多次。 admin_login: success: "邮件已发送" error: "错误！" diff --git a/config/locales/server.zh_TW.yml b/config/locales/server.zh_TW.yml index eb2d244375..2c72846ebd 100644 --- a/config/locales/server.zh_TW.yml +++ b/config/locales/server.zh_TW.yml @@ -1057,7 +1057,6 @@ zh_TW: signup_after_approval: subject_template: "你已受到 %{site_name} 的認可！" signup: - subject_template: "[%{site_name}] 啟用你的新帳號" text_body_template: | 歡迎來到 %{site_name}！ @@ -1081,8 +1080,6 @@ zh_TW: pasted_image_filename: "貼上的圖片" store_failure: "用戶 #%{user_id} 上傳 #%{upload_id} 儲存失敗" images: - fetch_failure: "抱歉，獲取圖片時發生錯誤。" - unknown_image_type: "抱歉，你上傳的檔似乎不是一張圖片。" size_not_found: "抱歉，我們無法獲取圖片大小，請檢查你的圖片是否已損壞。" flag_reason: spam_hosts: "此新用戶嘗試發表多篇含有指向相同網域之連結的文章。請見網站設定中的 newuser_spam_host_threshold。" diff --git a/config/routes.rb b/config/routes.rb index e3964d642a..98fc839623 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -405,6 +405,7 @@ Discourse::Application.routes.draw do get "top" => "list#top" get "search/query" => "search#query" + get "search" => "search#show" # Topics resource get "t/:id" => "topics#show" diff --git a/config/site_settings.yml b/config/site_settings.yml index eb5755b1d9..0329f89bd1 100644 --- a/config/site_settings.yml +++ b/config/site_settings.yml @@ -266,7 +266,7 @@ users: max: 60 reserved_usernames: type: list - default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum" + default: "admin|moderator|administrator|mod|sys|system|community|info|you|name|username|user|nickname|discourse|discourseorg|discourseforum|support" min_password_length: client: true default: 8 @@ -386,6 +386,9 @@ posting: traditional_markdown_linebreaks: client: true default: false + allow_html_tables: + client: true + default: false suppress_reply_directly_below: client: true default: true @@ -625,6 +628,7 @@ trust: tl3_promotion_min_duration: default: 14 min: 0 + max: 20000 tl3_requires_likes_given: default: 30 min: 0 diff --git a/db/fixtures/009_users.rb b/db/fixtures/009_users.rb index 6532a8613a..7effb73775 100644 --- a/db/fixtures/009_users.rb +++ b/db/fixtures/009_users.rb @@ -22,4 +22,30 @@ User.seed do |u| u.trust_level = TrustLevel[4] end -Group.user_trust_level_change!(-1 ,TrustLevel[4]) +Group.user_trust_level_change!(-1, TrustLevel[4]) + +# User for the smoke tests +if ENV["SMOKE"] == "1" + smoke_user = User.seed do |u| + u.id = 0 + u.name = "smoke_user" + u.username = "smoke_user" + u.username_lower = "smoke_user" + u.email = "smoke_user@discourse.org" + u.password = "P4ssw0rd" + u.email_direct = false + u.email_digests = false + u.email_private_messages = false + u.active = true + u.approved = true + u.approved_at = Time.now + u.trust_level = TrustLevel[3] + end.first + + EmailToken.seed do |et| + et.id = 1 + et.user_id = smoke_user.id + et.email = smoke_user.email + et.confirmed = true + end +end diff --git a/db/migrate/20150724165259_add_index_to_post_custom_fields.rb b/db/migrate/20150724165259_add_index_to_post_custom_fields.rb new file mode 100644 index 0000000000..230b3d499f --- /dev/null +++ b/db/migrate/20150724165259_add_index_to_post_custom_fields.rb @@ -0,0 +1,14 @@ +class AddIndexToPostCustomFields < ActiveRecord::Migration + def up + execute < true) rescue Errno::ENOENT # don't care if the file isn't there end diff --git a/lib/freedom_patches/translate_accelerator.rb b/lib/freedom_patches/translate_accelerator.rb index 95f9f9d0b1..7b3fc986a6 100644 --- a/lib/freedom_patches/translate_accelerator.rb +++ b/lib/freedom_patches/translate_accelerator.rb @@ -59,6 +59,11 @@ module I18n end end + def ensure_loaded!(locale) + @loaded_locales ||= [] + load_locale locale unless @loaded_locales.include?(locale) + end + def translate(key, *args) load_locale(config.locale) unless @loaded_locales.include?(config.locale) return translate_no_cache(key, *args) if args.length > 0 diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb index 2211015300..22f7ebb835 100644 --- a/lib/js_locale_helper.rb +++ b/lib/js_locale_helper.rb @@ -1,30 +1,94 @@ module JsLocaleHelper - def self.output_locale(locale, translations = nil) - current_locale = I18n.locale - I18n.locale = locale.to_sym + def self.load_translations(locale) + @loaded_translations ||= HashWithIndifferentAccess.new + @loaded_translations[locale] ||= begin + locale_str = locale.to_s + # load default translations + translations = YAML::load(File.open("#{Rails.root}/config/locales/client.#{locale_str}.yml")) + # load plugins translations + plugin_translations = {} + Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file| + plugin_translations.deep_merge! YAML::load(File.open(file)) + end + + # merge translations (plugin translations overwrite default translations) + translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['js'] + + # We used to split the admin versus the client side, but it's much simpler to just + # include both for now due to the small size of the admin section. + # + # For now, let's leave it split out in the translation file in case we want to split + # it again later, so we'll merge the JSON ourselves. + admin_contents = translations[locale_str].delete('admin_js') + translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present? + translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js'] + + translations + end + end + + # purpose-built recursive algorithm ahoy! + def self.deep_delete_matches(deleting_from, *checking_hashes) + checking_hashes.compact! + + new_hash = deleting_from.dup + deleting_from.each do |key, value| + if value.is_a? Hash + # Recurse + new_at_key = deep_delete_matches(deleting_from[key], *(checking_hashes.map {|h| h[key]})) + if new_at_key.empty? + new_hash.delete key + else + new_hash[key] = new_at_key + end + else + if checking_hashes.any? {|h| h.include? key} + new_hash.delete key + end + end + end + new_hash + end + + def self.load_translations_merged(*locales) + @loaded_merges ||= {} + @loaded_merges[locales.join('-')] ||= begin + all_translations = {} + merged_translations = {} + loaded_locales = [] + + locales.map(&:to_s).each do |locale| + all_translations[locale] = JsLocaleHelper.load_translations locale + merged_translations[locale] = deep_delete_matches(all_translations[locale][locale], *loaded_locales.map { |l| merged_translations[l] }) + loaded_locales << locale + end + merged_translations + end + end + + def self.output_locale(locale) + locale_sym = locale.to_sym locale_str = locale.to_s - # load default translations - translations ||= YAML::load(File.open("#{Rails.root}/config/locales/client.#{locale_str}.yml")) - # load plugins translations - plugin_translations = {} - Dir["#{Rails.root}/plugins/*/config/locales/client.#{locale_str}.yml"].each do |file| - plugin_translations.deep_merge! YAML::load(File.open(file)) + current_locale = I18n.locale + I18n.locale = locale_sym + + site_locale = SiteSetting.default_locale.to_sym + + if Rails.env.development? + translations = load_translations(locale_sym) + else + if locale_sym == :en + translations = load_translations(locale_sym) + elsif locale_sym == site_locale || site_locale == :en + translations = load_translations_merged(locale_sym, :en) + else + translations = load_translations_merged(locale_sym, site_locale, :en) + end end - # merge translations (plugin translations overwrite default translations) - translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['js'] - - # We used to split the admin versus the client side, but it's much simpler to just - # include both for now due to the small size of the admin section. - # - # For now, let's leave it split out in the translation file in case we want to split - # it again later, so we'll merge the JSON ourselves. - admin_contents = translations[locale_str].delete('admin_js') - translations[locale_str]['js'].deep_merge!(admin_contents) if admin_contents.present? - translations[locale_str]['js'].deep_merge!(plugin_translations[locale_str]['admin_js']) if translations[locale_str] && plugin_translations[locale_str] && plugin_translations[locale_str]['admin_js'] message_formats = strip_out_message_formats!(translations[locale_str]['js']) result = generate_message_format(message_formats, locale_str) diff --git a/lib/permalink_constraint.rb b/lib/permalink_constraint.rb index 0abf395e28..8fc9520290 100644 --- a/lib/permalink_constraint.rb +++ b/lib/permalink_constraint.rb @@ -1,7 +1,7 @@ class PermalinkConstraint def matches?(request) - Permalink.where(url: request.fullpath[1..-1]).exists? + Permalink.where(url: Permalink.normalize_url(request.fullpath)).exists? end end diff --git a/lib/post_creator.rb b/lib/post_creator.rb index 8629d1e873..1f17538618 100644 --- a/lib/post_creator.rb +++ b/lib/post_creator.rb @@ -31,6 +31,7 @@ class PostCreator # :raw_email - Imported from an email # via_email - Mark this post as arriving via email # raw_email - Full text of arriving email (to store) + # action_code - Describes a small_action post (optional) # # When replying to a topic: # topic_id - topic we're replying to @@ -255,7 +256,7 @@ class PostCreator end def setup_post - @opts[:raw] = TextCleaner.normalize_whitespaces(@opts[:raw]).gsub(/\s+\z/, "") + @opts[:raw] = TextCleaner.normalize_whitespaces(@opts[:raw] || '').gsub(/\s+\z/, "") post = Post.new(raw: @opts[:raw], topic_id: @topic.try(:id), @@ -263,7 +264,7 @@ class PostCreator reply_to_post_number: @opts[:reply_to_post_number]) # Attributes we pass through to the post instance if present - [:post_type, :no_bump, :cooking_options, :image_sizes, :acting_user, :invalidate_oneboxes, :cook_method, :via_email, :raw_email].each do |a| + [:post_type, :no_bump, :cooking_options, :image_sizes, :acting_user, :invalidate_oneboxes, :cook_method, :via_email, :raw_email, :action_code].each do |a| post.send("#{a}=", @opts[a]) if @opts[a].present? end diff --git a/lib/post_jobs_enqueuer.rb b/lib/post_jobs_enqueuer.rb index 3d17c8c66c..d4e1354aaa 100644 --- a/lib/post_jobs_enqueuer.rb +++ b/lib/post_jobs_enqueuer.rb @@ -56,6 +56,9 @@ class PostJobsEnqueuer end def skip_after_create? - @opts[:import_mode] || @topic.private_message? || @post.post_type == Post.types[:moderator_action] + @opts[:import_mode] || + @topic.private_message? || + @post.post_type == Post.types[:moderator_action] || + @post.post_type == Post.types[:small_action] end end diff --git a/lib/sass/discourse_sass_importer.rb b/lib/sass/discourse_sass_importer.rb index b9ad83da3e..a7558c9747 100644 --- a/lib/sass/discourse_sass_importer.rb +++ b/lib/sass/discourse_sass_importer.rb @@ -44,13 +44,17 @@ class DiscourseSassImporter < Sass::Importers::Filesystem end end + def apply_cdn(url) + "#{GlobalSetting.cdn_url}#{url}" + end + def find(name, options) if name == "category_backgrounds" contents = "" Category.where('background_url IS NOT NULL').each do |c| if c.background_url.present? - contents << "body.category-#{c.full_slug} { background-image: url(#{c.background_url}) }\n" + contents << "body.category-#{c.full_slug} { background-image: url(#{apply_cdn(c.background_url)}) }\n" end end return Sass::Engine.new(contents, options.merge( @@ -64,9 +68,9 @@ class DiscourseSassImporter < Sass::Importers::Filesystem if name == "theme_variables" contents = "" if color_scheme = ColorScheme.enabled - ColorScheme.base_colors.each do |name, base_hex| - override = color_scheme.colors_by_name[name] - contents << "$#{name}: ##{override ? override.hex : base_hex} !default;\n" + ColorScheme.base_colors.each do |n, base_hex| + override = color_scheme.colors_by_name[n] + contents << "$#{n}: ##{override ? override.hex : base_hex} !default;\n" end else special_imports[name].each do |css_file| @@ -144,7 +148,7 @@ class DiscourseSassImporter < Sass::Importers::Filesystem end def engine_from_path(name, dir, options) - full_filename, syntax = Sass::Util.destructure(find_real_file(dir, name, options)) + full_filename, _ = Sass::Util.destructure(find_real_file(dir, name, options)) return unless full_filename && File.readable?(full_filename) depend_on(full_filename) diff --git a/lib/search.rb b/lib/search.rb index 5eb8a722b3..0a07dcf9f7 100644 --- a/lib/search.rb +++ b/lib/search.rb @@ -99,6 +99,7 @@ class Search @guardian = @opts[:guardian] || Guardian.new @search_context = @opts[:search_context] @include_blurbs = @opts[:include_blurbs] || false + @blurb_length = @opts[:blurb_length] @limit = Search.per_facet term = process_advanced_search!(term) @@ -116,7 +117,7 @@ class Search @limit = Search.per_filter end - @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs) + @results = GroupedSearchResults.new(@opts[:type_filter], term, @search_context, @include_blurbs, @blurb_length) end def self.execute(term, opts=nil) diff --git a/lib/search/grouped_search_results.rb b/lib/search/grouped_search_results.rb index c3f661313d..387696c300 100644 --- a/lib/search/grouped_search_results.rb +++ b/lib/search/grouped_search_results.rb @@ -14,18 +14,19 @@ class Search :more_posts, :more_categories, :more_users, :term, :search_context, :include_blurbs - def initialize(type_filter, term, search_context, include_blurbs) + def initialize(type_filter, term, search_context, include_blurbs, blurb_length) @type_filter = type_filter @term = term @search_context = search_context @include_blurbs = include_blurbs + @blurb_length = blurb_length || 200 @posts = [] @categories = [] @users = [] end def blurb(post) - GroupedSearchResults.blurb_for(post.cooked, @term) + GroupedSearchResults.blurb_for(post.cooked, @term, @blurb_length) end def add(object) @@ -39,15 +40,15 @@ class Search end - def self.blurb_for(cooked, term=nil) + def self.blurb_for(cooked, term=nil, blurb_length=200) cooked = SearchObserver::HtmlScrubber.scrub(cooked).squish blurb = nil if term terms = term.split(/\s+/) - blurb = TextHelper.excerpt(cooked, terms.first, radius: 100) + blurb = TextHelper.excerpt(cooked, terms.first, radius: blurb_length / 2, seperator: " ") end - blurb = TextHelper.truncate(cooked, length: 200) if blurb.blank? + blurb = TextHelper.truncate(cooked, length: blurb_length, seperator: " ") if blurb.blank? Sanitize.clean(blurb) end end diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake index c5542307e1..bf90c98be0 100644 --- a/lib/tasks/assets.rake +++ b/lib/tasks/assets.rake @@ -24,6 +24,9 @@ task 'assets:precompile:before' do require 'sprockets' require 'digest/sha1' + # Needed for proper source maps with a CDN + load "#{Rails.root}/lib/global_path.rb" + include GlobalPath if $node_uglify # monkey patch asset pipeline not to gzip, compress: false is broken @@ -94,9 +97,9 @@ def compress_node(from,to) to_path = "#{assets_path}/#{to}" source_map_root = (d=File.dirname(from)) == "." ? "/assets" : "/assets/#{d}" + source_map_url = cdn_path "/assets/#{to}.map" - cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '/assets/#{to}.map'" - + cmd = "uglifyjs '#{assets_path}/#{from}' -p relative -c -m -o '#{to_path}' --source-map-root '#{source_map_root}' --source-map '#{assets_path}/#{to}.map' --source-map-url '#{source_map_url}'" STDERR.puts cmd `#{cmd} 2>&1` @@ -114,7 +117,7 @@ def compress_ruby(from,to) .compile_with_map(data) dest = "#{assets_path}/#{to}" - File.write(dest, uglified << "\n//# sourceMappingURL=/assets/#{to}.map") + File.write(dest, uglified << "\n//# sourceMappingURL=#{cdn_path "/assets/#{to}.map"}") File.write(dest + ".map", map) end diff --git a/lib/tasks/smoke_test.rake b/lib/tasks/smoke_test.rake index 91ac3ffe78..890eb128ad 100644 --- a/lib/tasks/smoke_test.rake +++ b/lib/tasks/smoke_test.rake @@ -1,6 +1,5 @@ desc "run phantomjs based smoke tests on current build" task "smoke:test" do - phantom_path = File.expand_path('~/phantomjs/bin/phantomjs') phantom_path = nil unless File.exists?(phantom_path) phantom_path = phantom_path || 'phantomjs' diff --git a/lib/topic_query.rb b/lib/topic_query.rb index 958fb6da7d..9ffa5d8b59 100644 --- a/lib/topic_query.rb +++ b/lib/topic_query.rb @@ -71,53 +71,6 @@ class TopicQuery create_list(:latest, {}, latest_results) end - def list_search - - 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(:search, {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 create_list(:read, unordered: true) do |topics| topics.order('COALESCE(tu.last_visited_at, topics.bumped_at) DESC') diff --git a/lib/topic_view.rb b/lib/topic_view.rb index c4e23aef6b..54483efd5d 100644 --- a/lib/topic_view.rb +++ b/lib/topic_view.rb @@ -131,6 +131,14 @@ class TopicView @topic.relative_url end + def page_title + title = @topic.title + if @topic.category_id != SiteSetting.uncategorized_category_id && @topic.category_id && @topic.category + title += " - #{topic.category.name}" + end + title + end + def title @topic.title end @@ -371,7 +379,7 @@ class TopicView end if @best.present? - @filtered_posts = @filtered_posts.where('posts.post_type <> ?', Post.types[:moderator_action]) + @filtered_posts = @filtered_posts.where('posts.post_type = ?', Post.types[:regular]) @contains_gaps = true end diff --git a/lib/url_helper.rb b/lib/url_helper.rb index 7db387f1d2..24f6192ac7 100644 --- a/lib/url_helper.rb +++ b/lib/url_helper.rb @@ -18,7 +18,7 @@ class UrlHelper end def self.schemaless(url) - url.sub(/^https?:/, "") + url.sub(/^http:/, "") end end diff --git a/lib/version.rb b/lib/version.rb index 5fc644b4b6..c4ede9fe1c 100644 --- a/lib/version.rb +++ b/lib/version.rb @@ -5,7 +5,7 @@ module Discourse MAJOR = 1 MINOR = 4 TINY = 0 - PRE = 'beta6' + PRE = 'beta7' STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end diff --git a/plugins/poll/config/locales/client.cs.yml b/plugins/poll/config/locales/client.cs.yml index 6fc39b211b..d6a32ba183 100644 --- a/plugins/poll/config/locales/client.cs.yml +++ b/plugins/poll/config/locales/client.cs.yml @@ -9,14 +9,17 @@ cs: js: poll: voters: - zero: "hlasů" one: "hlasující" - other: "hlasů" + few: "hlasujících" + other: "hlasující" total_votes: - zero: "hlasů" - one: "hlas" + one: "hlas celkem" + few: "hlasy celkem" other: "hlasů celkem" average_rating: "Průměrné hodnocení: %{average}." + multiple: + help: + at_least_min_options: "Musíte zvolit alespoň %{count} možností." cast-votes: title: "Hlasujte" label: "Hlasovat!" diff --git a/plugins/poll/config/locales/client.da.yml b/plugins/poll/config/locales/client.da.yml index f545a871bb..7f31c2d0f9 100644 --- a/plugins/poll/config/locales/client.da.yml +++ b/plugins/poll/config/locales/client.da.yml @@ -9,11 +9,9 @@ da: js: poll: voters: - zero: "vælgere" one: "vælger" other: "vælgere" total_votes: - zero: "afgivne stemmer" one: "afgiven stemme" other: "afgivne stemmer" average_rating: "Gennemsnitlig rating: %{average}." diff --git a/plugins/poll/config/locales/client.de.yml b/plugins/poll/config/locales/client.de.yml index 336b4b845c..7833ece385 100644 --- a/plugins/poll/config/locales/client.de.yml +++ b/plugins/poll/config/locales/client.de.yml @@ -9,11 +9,9 @@ de: js: poll: voters: - zero: "Teilnehmer" one: "Teilnehmer" other: "Teilnehmer" total_votes: - zero: "abgegebene Stimmen" one: "abgegebene Stimme" other: "abgegebene Stimmen" average_rating: "Durchschnittliche Bewertung: %{average}" diff --git a/plugins/poll/config/locales/client.es.yml b/plugins/poll/config/locales/client.es.yml index 28bb00188c..828b06f07c 100644 --- a/plugins/poll/config/locales/client.es.yml +++ b/plugins/poll/config/locales/client.es.yml @@ -9,13 +9,11 @@ es: js: poll: voters: - zero: "votantes" one: "votante" other: "votantes" total_votes: - zero: "total votos" - one: "total voto" - other: "total votos" + one: "voto total" + other: "votos totales" average_rating: "Puntuación media: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.fa_IR.yml b/plugins/poll/config/locales/client.fa_IR.yml index 1d1a470e8b..e3f743f115 100644 --- a/plugins/poll/config/locales/client.fa_IR.yml +++ b/plugins/poll/config/locales/client.fa_IR.yml @@ -9,12 +9,8 @@ fa_IR: js: poll: voters: - zero: "رأی دهندگان" - one: "رأی دهنده" other: "رأی دهندگان" total_votes: - zero: "مجموع آرا" - one: "مجموع آرا" other: "مجموع آرا" average_rating: "میانگین امتیاز: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.fr.yml b/plugins/poll/config/locales/client.fr.yml index 3bcc10b39c..5e3e045cdd 100644 --- a/plugins/poll/config/locales/client.fr.yml +++ b/plugins/poll/config/locales/client.fr.yml @@ -9,13 +9,11 @@ fr: js: poll: voters: - zero: "votant" one: "votant" other: "votants" total_votes: - zero: "vote total" - one: "vote total" - other: "votes totaux" + one: "vote au total" + other: "votes au total" average_rating: "Notation moyenne : %{average}" multiple: help: diff --git a/plugins/poll/config/locales/client.he.yml b/plugins/poll/config/locales/client.he.yml index f30b67a847..8c84678581 100644 --- a/plugins/poll/config/locales/client.he.yml +++ b/plugins/poll/config/locales/client.he.yml @@ -9,17 +9,17 @@ he: js: poll: voters: - zero: "מצביעים" - one: "מצביע/ה" + one: "מצביע" other: "מצביעים" total_votes: - zero: "סך הכל הצבעות" - one: "הצבעה אחת סך הכל" - other: "סך הכל הצבעות" + 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: "שליחת הצבעות" diff --git a/plugins/poll/config/locales/client.id.yml b/plugins/poll/config/locales/client.id.yml index 06a9ef8b13..e9225cd298 100644 --- a/plugins/poll/config/locales/client.id.yml +++ b/plugins/poll/config/locales/client.id.yml @@ -8,14 +8,6 @@ id: js: poll: - voters: - zero: "pemilih" - one: "pemilih" - other: "pemilih" - total_votes: - zero: "jumlah pemilih" - one: "jumlah pemilih" - other: "jumlah pemilih" average_rating: "Rata-rata rating: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.it.yml b/plugins/poll/config/locales/client.it.yml index c2b15d5bc8..e5ab646bd3 100644 --- a/plugins/poll/config/locales/client.it.yml +++ b/plugins/poll/config/locales/client.it.yml @@ -9,12 +9,10 @@ it: js: poll: voters: - zero: "votanti" one: "votante" other: "votanti" total_votes: - zero: "voti totali" - one: "voto in totale" + one: "voto totale" other: "voti totali" average_rating: "Voto medio: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.ko.yml b/plugins/poll/config/locales/client.ko.yml index d58ff1fabe..ad715c3ee4 100644 --- a/plugins/poll/config/locales/client.ko.yml +++ b/plugins/poll/config/locales/client.ko.yml @@ -9,12 +9,8 @@ ko: js: poll: voters: - zero: "투표자" - one: "투표자" other: "투표자" total_votes: - zero: "전체 투표" - one: "전체 투표" other: "전체 투표" average_rating: "평균: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.nb_NO.yml b/plugins/poll/config/locales/client.nb_NO.yml index b4c26c6f34..0039a0d65b 100644 --- a/plugins/poll/config/locales/client.nb_NO.yml +++ b/plugins/poll/config/locales/client.nb_NO.yml @@ -9,13 +9,11 @@ nb_NO: js: poll: voters: - zero: "stemmer" - one: "har stemt" - other: "har stemt" + one: "stemmegiver" + other: "stemmegivere" total_votes: - zero: "stemmer totalt" - one: "stemmer totalt" - other: "stemmer totalt" + one: "antall stemmer" + other: "antall stemmer" average_rating: "Gjennomsnitt: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.nl.yml b/plugins/poll/config/locales/client.nl.yml index c12df6b29b..de778280c0 100644 --- a/plugins/poll/config/locales/client.nl.yml +++ b/plugins/poll/config/locales/client.nl.yml @@ -9,17 +9,17 @@ nl: js: poll: voters: - zero: "kiezers" - one: "kiezer" - other: "kiezers" + one: "keer gestemd" + other: "keer gestemd" total_votes: - zero: "totaal aantal stemmen" - one: "totaal aantal stemmen" - other: "totaal aantal stemmen" + one: "stem" + other: "stemmen" average_rating: "Gemiddeld cijfer: %{average}." multiple: help: + at_least_min_options: "Kies tenminste %{count} opties." up_to_max_options: "Je kunt maximaal %{count} opties kiezen." + x_options: "Kies %{count} opties." between_min_and_max_options: "Je kan tussen %{min} en %{max} opties kiezen." cast-votes: title: "Geef je stem" diff --git a/plugins/poll/config/locales/client.pl_PL.yml b/plugins/poll/config/locales/client.pl_PL.yml index c85bd13061..b344003fdd 100644 --- a/plugins/poll/config/locales/client.pl_PL.yml +++ b/plugins/poll/config/locales/client.pl_PL.yml @@ -9,12 +9,12 @@ pl_PL: js: poll: voters: - zero: "głosujących" one: "głosujący" + few: "głosujących" other: "głosujących" total_votes: - zero: "oddanych głosów" - one: "oddany głos" + one: "oddanych głosów" + few: "oddanych głosów" other: "oddanych głosów" average_rating: "Średnia ocena: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.pt.yml b/plugins/poll/config/locales/client.pt.yml index 9be6f952df..9d7df2719f 100644 --- a/plugins/poll/config/locales/client.pt.yml +++ b/plugins/poll/config/locales/client.pt.yml @@ -9,12 +9,10 @@ pt: js: poll: voters: - zero: "eleitores" one: "eleitor" other: "eleitores" total_votes: - zero: "total de votos" - one: "total de votos" + one: "total da votação" other: "total de votos" average_rating: "Classificação média: %{average}." multiple: diff --git a/plugins/poll/config/locales/client.ro.yml b/plugins/poll/config/locales/client.ro.yml index 89bd123ba9..e1e2ff3241 100644 --- a/plugins/poll/config/locales/client.ro.yml +++ b/plugins/poll/config/locales/client.ro.yml @@ -8,14 +8,6 @@ ro: js: poll: - voters: - zero: "alegători" - one: "alegător" - other: "alegători" - total_votes: - zero: "numar total de voturi" - one: "vot total" - other: "numar total de voturi" average_rating: "Media: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.ru.yml b/plugins/poll/config/locales/client.ru.yml index 73da454f00..8f73a0a443 100644 --- a/plugins/poll/config/locales/client.ru.yml +++ b/plugins/poll/config/locales/client.ru.yml @@ -8,14 +8,6 @@ ru: js: poll: - voters: - zero: "голосов" - one: "голос" - other: "голосов" - total_votes: - zero: "всего голосов" - one: "всего проголосовало" - other: "всего голосов" average_rating: "Примерный рейтинг: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.tr_TR.yml b/plugins/poll/config/locales/client.tr_TR.yml index dab693d3e3..2e6792746d 100644 --- a/plugins/poll/config/locales/client.tr_TR.yml +++ b/plugins/poll/config/locales/client.tr_TR.yml @@ -9,13 +9,9 @@ tr_TR: js: poll: voters: - zero: "oylayan" - one: "oylayan" - other: "oylayanlar" + other: "oylayan" total_votes: - zero: "toplam oylama" - one: "toplam oy" - other: "tüm oylar" + other: "toplam oy" average_rating: "Ortalama oran: %{average}." multiple: help: diff --git a/plugins/poll/config/locales/client.uk.yml b/plugins/poll/config/locales/client.uk.yml index f654b80e8c..3acfff74e8 100644 --- a/plugins/poll/config/locales/client.uk.yml +++ b/plugins/poll/config/locales/client.uk.yml @@ -5,12 +5,4 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -uk: - js: - poll: - voters: - zero: "проголосувало" - one: "проголосував" - other: "проголосувало" - total_votes: - zero: "кількість голосів" +uk: {} diff --git a/plugins/poll/config/locales/client.zh_CN.yml b/plugins/poll/config/locales/client.zh_CN.yml index c34b128a23..cd3958a6a3 100644 --- a/plugins/poll/config/locales/client.zh_CN.yml +++ b/plugins/poll/config/locales/client.zh_CN.yml @@ -9,13 +9,9 @@ zh_CN: js: poll: voters: - zero: "投票者" - one: "投票者" other: "投票者" total_votes: - zero: "总投票数" - one: "总投票数" - other: "总投票数" + other: "总票数" average_rating: "平均排名：%{average}。" multiple: help: diff --git a/plugins/poll/config/locales/client.zh_TW.yml b/plugins/poll/config/locales/client.zh_TW.yml index 7ac3cb7b0c..92c18de9ae 100644 --- a/plugins/poll/config/locales/client.zh_TW.yml +++ b/plugins/poll/config/locales/client.zh_TW.yml @@ -5,14 +5,4 @@ # To work with us on translations, join this project: # https://www.transifex.com/projects/p/discourse-org/ -zh_TW: - js: - poll: - voters: - zero: "投票者" - one: "投票者" - other: "投票者" - total_votes: - zero: "所有的投票者" - one: "所有的投票者" - other: "所有的投票者" +zh_TW: {} diff --git a/plugins/poll/config/locales/server.he.yml b/plugins/poll/config/locales/server.he.yml index 06720e0a3e..9711891cc5 100644 --- a/plugins/poll/config/locales/server.he.yml +++ b/plugins/poll/config/locales/server.he.yml @@ -7,4 +7,27 @@ he: site_settings: + poll_enabled: "אפשר למשתמשים ליצור סקרים?" poll_maximum_options: "מספר אפשרויות מירבי המותר בסקר" + poll: + multiple_polls_without_name: "יש מספר סקרים ללא שם. השתמש במאפיין 'name' לזהות באופן יחודי את הסקרים שלך. " + multiple_polls_with_same_name: "יש מספר סקרים עם אותו שם %{name}. השתמש במאפיין 'name' לזהות באופן יחודי את הסקרים שלך. " + default_poll_must_have_at_least_2_options: "לסקר צריך להיות לפחות שתי אפשרויות." + named_poll_must_have_at_least_2_options: "לסקר בשם %{name} צריך שיהיה לפחות שתי אפשרויות." + 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: "עליך לבחור לפחות אפשרות אחת תקינה. " + 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.nl.yml b/plugins/poll/config/locales/server.nl.yml index ba7488529e..232d915004 100644 --- a/plugins/poll/config/locales/server.nl.yml +++ b/plugins/poll/config/locales/server.nl.yml @@ -18,13 +18,16 @@ nl: named_poll_must_have_less_options: "De poll genaamd %{name} moet minder dan %{max} opties hebben." default_poll_must_have_different_options: "Polls moeten verschillende opties hebben." named_poll_must_have_different_options: "De poll genaamd %{name} moet verschillende opties hebben." - requires_at_least_1_valid_option: "Je moet minimaal 1 geldige optie kiezen." + default_poll_with_multiple_choices_has_invalid_parameters: "De poll met meerdere keuzes heeft ongeldige parameters." + named_poll_with_multiple_choices_has_invalid_parameters: "De poll met de naam %{name} met meerdere keuzes heeft ongeldige parameters." + requires_at_least_1_valid_option: "Kies ten minste 1 geldige optie." cannot_change_polls_after_5_minutes: "Je kunt polls niet toevoegen, verwijderen of hernoemen na de eerste 5 minuten." op_cannot_edit_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. Neem a.u.b. contact op met een moderator als u een poll optie moet wijzigen." staff_cannot_add_or_remove_options_after_5_minutes: "Je kunt geen poll opties meer toevoegen of verwijderen na de eerste 5 minuten. In plaats daarvan kun je dit topic sluiten en een nieuwe maken." - no_polls_associated_with_this_post: "Er zijn geen polls geassocieerd met deze post." - no_poll_with_this_name: "Er is geen poll genaamd %{name} geassocieerd met deze post." + no_polls_associated_with_this_post: "Er bestaan geen polls voor dit bericht." + no_poll_with_this_name: "Er bestaat geen poll met de naam %{name} voor dit bericht." + post_is_deleted: "Dit kan niet bij een verwijderd bericht." topic_must_be_open_to_vote: "Het topic moet geopend zijn om te kunnen stemmen." poll_must_be_open_to_vote: "De poll moet geopend zijn om te kunnen stemmen." topic_must_be_open_to_toggle_status: "Het topic moet geopend zijn om de status te kunnen veranderen." - only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke poster kan een poll status veranderen." + only_staff_or_op_can_toggle_status: "Alleen een staflid of de oorspronkelijke plaatser van een bericht kan de status van een poll veranderen." diff --git a/plugins/poll/config/settings.yml b/plugins/poll/config/settings.yml index bdeb59954c..f75945a5d6 100644 --- a/plugins/poll/config/settings.yml +++ b/plugins/poll/config/settings.yml @@ -3,3 +3,4 @@ plugins: default: true poll_maximum_options: default: 20 + client: true diff --git a/public/403.bs_BA.html b/public/403.bs_BA.html index c7fab9ec04..7cc8339617 100644 --- a/public/403.bs_BA.html +++ b/public/403.bs_BA.html @@ -1,6 +1,6 @@ -You can't do that (403) +Ne možete to učiniti (403)