{{i18n 'admin.user.blocked'}}
{{blocked}}
diff --git a/app/assets/javascripts/admin/templates/users-list-show.hbs b/app/assets/javascripts/admin/templates/users-list-show.hbs
index 750685509a..2c962574f9 100644
--- a/app/assets/javascripts/admin/templates/users-list-show.hbs
+++ b/app/assets/javascripts/admin/templates/users-list-show.hbs
@@ -1,7 +1,7 @@
{{#if hasSelection}}
-{{#loading-spinner condition=refreshing}}
+{{#conditional-loading-spinner condition=refreshing}}
{{#if model}}
-
-
+
+
{{/if}}
@@ -19,7 +19,7 @@
{{/unless}}
| {{i18n 'about.topic_count'}} | -{{number stats.topic_count}} | -{{number stats.topics_7_days}} | -{{number stats.topics_30_days}} | +{{number model.stats.topic_count}} | +{{number model.stats.topics_7_days}} | +{{number model.stats.topics_30_days}} |
| {{i18n 'about.post_count'}} | -{{number stats.post_count}} | -{{number stats.posts_7_days}} | -{{number stats.posts_30_days}} | +{{number model.stats.post_count}} | +{{number model.stats.posts_7_days}} | +{{number model.stats.posts_30_days}} |
| {{i18n 'about.user_count'}} | -{{number stats.user_count}} | -{{number stats.users_7_days}} | -{{number stats.users_30_days}} | +{{number model.stats.user_count}} | +{{number model.stats.users_7_days}} | +{{number model.stats.users_30_days}} |
| {{i18n 'about.active_user_count'}} | — | -{{number stats.active_users_7_days}} | -{{number stats.active_users_30_days}} | +{{number model.stats.active_users_7_days}} | +{{number model.stats.active_users_30_days}} | |
| {{i18n 'about.like_count'}} | -{{number stats.like_count}} | -{{number stats.likes_7_days}} | -{{number stats.likes_30_days}} | +{{number model.stats.like_count}} | +{{number model.stats.likes_7_days}} | +{{number model.stats.likes_30_days}} |
{{#link-to 'badges.index'}}{{i18n 'badges.title'}}{{/link-to}} - - {{displayName}} + {{fa-icon "angle-right"}} + {{model.displayName}}
| {{user-badge badge=this}} | -{{{displayDescriptionHtml}}} | -{{i18n 'badges.granted' count=grant_count}} | +{{user-badge badge=model}} | +{{{model.displayDescriptionHtml}}} | +{{i18n 'badges.granted' count=model.grant_count}} | {{i18n 'badges.allow_title'}} {{{view.allowTitle}}} {{i18n 'badges.multiple_grant'}} {{{view.multipleGrant}}} |
||||||||||||||
| + |
{{category-title-link category=c}}
diff --git a/app/assets/javascripts/discourse/templates/discovery/topics.hbs b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
index 494da1abba..9c573ee3d2 100644
--- a/app/assets/javascripts/discourse/templates/discovery/topics.hbs
+++ b/app/assets/javascripts/discourse/templates/discovery/topics.hbs
@@ -25,7 +25,7 @@
{{#if topicTrackingState.hasIncoming}}
- {{countI18n topic_count_ suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
+ {{count-i18n key="topic_count_" suffix=topicTrackingState.filter count=topicTrackingState.incomingCount}}
{{i18n 'click_to_show'}}
{{footerMessage}} - {{#if can_create_topic}}{{i18n 'topic.suggest_create_topic'}}{{/if}} + {{#if model.can_create_topic}}{{i18n 'topic.suggest_create_topic'}}{{/if}}{{else}} {{#if top}} diff --git a/app/assets/javascripts/discourse/templates/exception.hbs b/app/assets/javascripts/discourse/templates/exception.hbs index e52073f2f2..9416f2b436 100644 --- a/app/assets/javascripts/discourse/templates/exception.hbs +++ b/app/assets/javascripts/discourse/templates/exception.hbs @@ -16,7 +16,7 @@ {{#each buttonData in enabledButtons}} {{/each}} - {{loading-spinner condition=loading}} + {{conditional-loading-spinner condition=loading}} diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.raw.hbs b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs similarity index 99% rename from app/assets/javascripts/discourse/templates/list/topic_list_item.raw.hbs rename to app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs index 9ec92ec1df..92f0bd68e9 100644 --- a/app/assets/javascripts/discourse/templates/list/topic_list_item.raw.hbs +++ b/app/assets/javascripts/discourse/templates/list/topic-list-item.raw.hbs @@ -3,6 +3,7 @@ |
{{/if}}
+
{{raw "topic-status" topic=topic}}
{{topic-link topic}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
index 9d07aba9cf..2dfeb9ad4a 100644
--- a/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
+++ b/app/assets/javascripts/discourse/templates/mobile/components/basic-topic-list.hbs
@@ -1,4 +1,4 @@
-{{#loading-spinner condition=loading}}
+{{#conditional-loading-spinner condition=loading}}
{{#if topics}}
- {{notification-item notification=n scope=n.scope}}
+ {{notification-item notification=n}}
{{format-date n.created_at leaveAgo="true"}}
{{/each}}
-{{#loading-spinner condition=loading}}
- {{#unless canLoadMore}}
+{{#conditional-loading-spinner condition=loading}}
+ {{#unless model.canLoadMore}}
{{#if showDismissButton}}
{{/if}}
{{/unless}}
-{{/loading-spinner}}
+{{/conditional-loading-spinner}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.hbs b/app/assets/javascripts/discourse/templates/user/preferences.hbs
index 0133f6537b..faf517db81 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.hbs
+++ b/app/assets/javascripts/discourse/templates/user/preferences.hbs
@@ -50,9 +50,9 @@
{{#if canCheckEmails}}
- {{#if email}}
+ {{#if model.email}}
- {{email}}
+ {{model.email}}
{{#if can_edit_email}}
{{#link-to "preferences.email" class="btn btn-small pad-left no-text"}}{{fa-icon "pencil"}}{{/link-to}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/stream.hbs b/app/assets/javascripts/discourse/templates/user/stream.hbs
index ed66367d51..8955e5cdc1 100644
--- a/app/assets/javascripts/discourse/templates/user/stream.hbs
+++ b/app/assets/javascripts/discourse/templates/user/stream.hbs
@@ -3,6 +3,7 @@
{{avatar item imageSize="large" extraClasses="actor" ignoreTitle="true"}}
{{format-date item.created_at}}
+ {{topic-status topic=item disableActions=true}}
{{unbound item.title}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.hbs b/app/assets/javascripts/discourse/templates/user/user.hbs
index 973faae83e..806490a617 100644
--- a/app/assets/javascripts/discourse/templates/user/user.hbs
+++ b/app/assets/javascripts/discourse/templates/user/user.hbs
@@ -5,30 +5,30 @@
- {{#if number_of_flags_given}}
-
@@ -37,7 +37,7 @@
{{bound-avatar model "huge"}}
{{number_of_flags_given}} {{i18n 'user.staff_counters.flags_given'}}
+ {{#if model.number_of_flags_given}}
+ {{model.number_of_flags_given}} {{i18n 'user.staff_counters.flags_given'}}
{{/if}}
- {{#if number_of_flagged_posts}}
+ {{#if model.number_of_flagged_posts}}
- {{#link-to 'user.flaggedPosts' this}}
- {{number_of_flagged_posts}} {{i18n 'user.staff_counters.flagged_posts'}}
+ {{#link-to 'user.flaggedPosts' model}}
+ {{model.number_of_flagged_posts}} {{i18n 'user.staff_counters.flagged_posts'}}
{{/link-to}}
{{/if}}
- {{#if number_of_deleted_posts}}
+ {{#if model.number_of_deleted_posts}}
- {{#link-to 'user.deletedPosts' this}}
- {{number_of_deleted_posts}} {{i18n 'user.staff_counters.deleted_posts'}}
+ {{#link-to 'user.deletedPosts' model}}
+ {{model.number_of_deleted_posts}} {{i18n 'user.staff_counters.deleted_posts'}}
{{/link-to}}
{{/if}}
- {{#if number_of_suspensions}}
- {{number_of_suspensions}} {{i18n 'user.staff_counters.suspensions'}}
+ {{#if model.number_of_suspensions}}
+ {{model.number_of_suspensions}} {{i18n 'user.staff_counters.suspensions'}}
{{/if}}
- {{#if number_of_warnings}}
- {{number_of_warnings}} {{i18n 'user.staff_counters.warnings_received'}}
+ {{#if model.number_of_warnings}}
+ {{model.number_of_warnings}} {{i18n 'user.staff_counters.warnings_received'}}
{{/if}}
- {{username}} {{user-status model currentUser=currentUser}}-{{name}}- {{#if title}} -{{title}}+{{model.username}} {{user-status model currentUser=currentUser}}+{{model.name}}+ {{#if model.title}} +{{model.title}}{{/if}}- {{#if location}}{{fa-icon "map-marker"}}{{location}}{{/if}} + {{#if model.location}}{{fa-icon "map-marker"}}{{model.location}}{{/if}} {{#if websiteName}} {{fa-icon "globe"}} {{#if linkWebsite}} - {{websiteName}} + {{websiteName}} {{else}} - {{websiteName}} + {{websiteName}} {{/if}} {{/if}}
- {{#if isSuspended}}
+ {{#if model.isSuspended}}
{{#if publicUserFields}}
@@ -111,33 +111,33 @@
{{fa-icon "ban"}}
{{i18n 'user.suspended_notice' date=suspendedTillDate}}
{{/if}}
- {{{bio_cooked}}}
+ {{{model.bio_cooked}}}
{{i18n 'user.suspended_reason'}} {{suspend_reason}}
{{i18n "directory.total_rows" count=model.totalRows}}
@@ -25,30 +25,32 @@
{{/if}}
- {{#each item in model itemController="directory-item"}}
- {{user-small user=item.model.user}} |
- {{number item.model.likes_received}} |
- {{number item.model.likes_given}} |
- {{number item.model.topic_count}} |
- {{number item.model.post_count}} |
- {{number item.model.topics_entered}} |
- {{number item.model.posts_read}} |
- {{number item.model.days_visited}} |
- {{#if showTimeRead}}
- {{unbound item.model.time_read}} |
- {{/if}}
+ {{#each ic in model itemController="directory-item"}}
+ {{user-small user=it.user}} |
+ {{number it.likes_received}} |
+ {{number it.likes_given}} |
+ {{number it.topic_count}} |
+ {{number it.post_count}} |
+ {{number it.topics_entered}} |
+ {{number it.posts_read}} |
+ {{number it.days_visited}} |
+ {{#if showTimeRead}}
+ {{unbound it.time_read}} |
+ {{/if}}
+ {{/with}}
|
{{i18n "directory.no_results"}}
{{/if}} - {{/loading-spinner}} + {{/conditional-loading-spinner}}
+
+ ```
+
+ By default `Ember.ListView` provides support for `height`,
+ `rowHeight`, `width`, `elementWidth`, `scrollTop` parameters.
+
+ Note, that `height` and `rowHeight` are required parameters.
+
+ ```handlebars
+ {{#ember-list items=this height=500 rowHeight=50}}
+ {{name}}
+ {{/ember-list}}
+ ```
+
+ If you would like to have multiple columns in your view layout, you can
+ set `width` and `elementWidth` parameters respectively.
+
+ ```handlebars
+ {{#ember-list items=this height=500 rowHeight=50 width=500 elementWidth=80}}
+ {{name}}
+ {{/ember-list}}
+ ```
+
+ ### Extending `Ember.ListView`
+
+ Example:
+
+ ```handlebars
+ {{view 'list-view' content=content}}
+
+
+ ```
+
+ ```javascript
+ App.ListView = Ember.ListView.extend({
+ height: 500,
+ width: 500,
+ elementWidth: 80,
+ rowHeight: 20,
+ itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
+ });
+ ```
+
+ @extends Ember.ContainerView
+ @class ListView
+ @namespace Ember
+*/
+export default Ember.ContainerView.extend(ListViewMixin, {
+ css: {
+ position: 'relative',
+ overflow: 'auto',
+ '-webkit-overflow-scrolling': 'touch',
+ 'overflow-scrolling': 'touch'
+ },
+
+ applyTransform: ListViewHelper.applyTransform,
+
+ _scrollTo: function(scrollTop) {
+ var element = this.element;
+
+ if (element) { element.scrollTop = scrollTop; }
+ },
+
+ didInsertElement: function() {
+ var that = this;
+
+ this._updateScrollableHeight();
+
+ this._scroll = function(e) { that.scroll(e); };
+
+ Ember.$(this.element).on('scroll', this._scroll);
+ },
+
+ willDestroyElement: function() {
+ Ember.$(this.element).off('scroll', this._scroll);
+ },
+
+ scroll: function(e) {
+ this.scrollTo(e.target.scrollTop);
+ },
+
+ scrollTo: function(y) {
+ this._scrollTo(y);
+ this._scrollContentTo(y);
+ },
+
+ totalHeightDidChange: Ember.observer(function () {
+ Ember.run.scheduleOnce('afterRender', this, this._updateScrollableHeight);
+ }, 'totalHeight'),
+
+ _updateScrollableHeight: function () {
+ var height, state;
+
+ // Support old and new Ember versions
+ state = this._state || this.state;
+
+ if (state === 'inDOM') {
+ // if the list is currently displaying the emptyView, remove the height
+ if (this._isChildEmptyView()) {
+ height = '';
+ } else {
+ height = get(this, 'totalHeight');
+ }
+
+ this.$('.ember-list-container').css({
+ height: height
+ });
+ }
+ }
+});
diff --git a/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6 b/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6
new file mode 100644
index 0000000000..e2ca3a0f4c
--- /dev/null
+++ b/app/assets/javascripts/ember-addons/reusable-list-item-view.js.es6
@@ -0,0 +1,38 @@
+import Ember from 'ember';
+import ListItemViewMixin from './list-item-view-mixin';
+
+var get = Ember.get, set = Ember.set;
+
+export default Ember.View.extend(ListItemViewMixin, {
+ prepareForReuse: Ember.K,
+
+ init: function () {
+ this._super();
+ var context = Ember.ObjectProxy.create();
+ this.set('context', context);
+ this._proxyContext = context;
+ },
+
+ isVisible: Ember.computed('context.content', function () {
+ return !!this.get('context.content');
+ }),
+
+ updateContext: function (newContext) {
+ var context = get(this._proxyContext, 'content');
+
+ // Support old and new Ember versions
+ var state = this._state || this.state;
+
+ if (context !== newContext) {
+ if (state === 'inDOM') {
+ this.prepareForReuse(newContext);
+ }
+
+ set(this._proxyContext, 'content', newContext);
+
+ if (newContext && newContext.isController) {
+ set(this, 'controller', newContext);
+ }
+ }
+ }
+});
diff --git a/app/assets/javascripts/ember_include.js.erb b/app/assets/javascripts/ember_include.js.erb
index f124141c39..029ce40795 100644
--- a/app/assets/javascripts/ember_include.js.erb
+++ b/app/assets/javascripts/ember_include.js.erb
@@ -1,7 +1,8 @@
<%
if Rails.env.development? || Rails.env.test?
- require_asset ("development/ember.js")
+ require_asset ("ember-template-compiler.js")
+ require_asset ("ember.custom.debug.js")
else
- require_asset ("production/ember.js")
+ require_asset ("ember.prod.js")
end
%>
diff --git a/app/assets/javascripts/jquery_include.js.erb b/app/assets/javascripts/jquery_include.js.erb
index 6f509136a6..0423ecabc1 100644
--- a/app/assets/javascripts/jquery_include.js.erb
+++ b/app/assets/javascripts/jquery_include.js.erb
@@ -1,7 +1,7 @@
<%
if Rails.env.development? || Rails.env.test?
- require_asset ("development/jquery-2.1.1.js")
+ require_asset ("jquery.debug.js")
else
- require_asset ("production/jquery-2.1.1.min.js")
+ require_asset ("jquery.prod.js")
end
%>
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 6d856ec381..cf5bbda7b1 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -42,7 +42,8 @@
//= require ./discourse/views/container
//= require ./discourse/views/modal-body
//= require ./discourse/views/flag
-//= require ./discourse/views/combo-box
+//= require ./discourse/views/cloaked
+//= require ./discourse/components/combo-box
//= require ./discourse/views/button
//= require ./discourse/components/dropdown-button
//= require ./discourse/components/notifications-button
@@ -67,6 +68,7 @@
//= require ./discourse/lib/emoji/emoji
//= require ./discourse/lib/sharing
//= require discourse/lib/desktop-notifications
+//= require ./discourse/router
//= require_tree ./discourse/dialects
//= require_tree ./discourse/controllers
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
index 6ba3cb51e8..72d94e54d4 100644
--- a/app/assets/javascripts/main_include_admin.js
+++ b/app/assets/javascripts/main_include_admin.js
@@ -1,4 +1,4 @@
-//= require list-view
+//= require_tree ./ember-addons
//= require admin/models/user-field
//= require admin/models/site-setting
//= require admin/controllers/admin-email-skipped
diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js
index 12667f3545..a76153ed7f 100644
--- a/app/assets/javascripts/vendor.js
+++ b/app/assets/javascripts/vendor.js
@@ -36,7 +36,6 @@
//= require rsvp.js
//= require show-html.js
//= require lock-on.js
-//= require ember-cloaking
//= require break_string
//= require buffered-proxy
//= require jquery.autoellipsis-1.0.10.min.js
diff --git a/app/assets/stylesheets/common/base/_topic-list.scss b/app/assets/stylesheets/common/base/_topic-list.scss
index 227e13a353..c01351a734 100644
--- a/app/assets/stylesheets/common/base/_topic-list.scss
+++ b/app/assets/stylesheets/common/base/_topic-list.scss
@@ -16,20 +16,19 @@
.topic-list {
width: 100%;
- border-collapse: separate;
- border-spacing: 0;
- border-top: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+ border-collapse: collapse;
background: rgba($secondary, .8);
> tbody > tr {
-
- &.archived a {
- opacity: 0.6;
- }
&.has-excerpt .star {
vertical-align: top;
margin-top: 2px;
}
+ border-bottom: 1px solid dark-light-diff($primary, $secondary, 90%, -75%);
+ }
+
+ > tbody > tr:first-of-type {
+ border-top: 3px solid dark-light-diff($primary, $secondary, 90%, -75%);
}
th,
diff --git a/app/assets/stylesheets/common/base/rtl.scss b/app/assets/stylesheets/common/base/rtl.scss
index 9a6dfeb7ed..804af0bc4b 100644
--- a/app/assets/stylesheets/common/base/rtl.scss
+++ b/app/assets/stylesheets/common/base/rtl.scss
@@ -31,3 +31,10 @@
border-left-color: transparent !important;
border-right-color: $secondary !important;
}
+.rtl code {
+ direction: ltr !important;
+ text-aligh: left !important;
+}
+.rtl .pull-left {
+ float:right !important;
+}
diff --git a/app/assets/stylesheets/desktop/topic-list.scss b/app/assets/stylesheets/desktop/topic-list.scss
index 930fe7cdc4..3f53b0d2cc 100644
--- a/app/assets/stylesheets/desktop/topic-list.scss
+++ b/app/assets/stylesheets/desktop/topic-list.scss
@@ -55,12 +55,6 @@
}
> tbody > tr {
- &:nth-child(odd) {
- background-color: darken($secondary, 3%);
- }
- &:nth-child(even) {
- background-color: $secondary;
- }
&.highlighted {
background-color: dark-light-diff($tertiary, $secondary, 90%, -41%);
}
@@ -184,6 +178,7 @@
position: relative;
}
> tbody > tr {
+ border-bottom: none;
&:nth-child(odd) {
background-color: darken($secondary, 3%);
}
diff --git a/app/assets/stylesheets/desktop/topic-post.scss b/app/assets/stylesheets/desktop/topic-post.scss
index 901bdb96e3..01c75c452c 100644
--- a/app/assets/stylesheets/desktop/topic-post.scss
+++ b/app/assets/stylesheets/desktop/topic-post.scss
@@ -462,16 +462,6 @@ a.star {
#suggested-topics {
clear: left;
padding: 20px 0 15px 0;
- .topic-list {
- > tbody > tr {
- &:nth-child(odd) {
- background-color: darken($secondary, 3%);
- }
- &:nth-child(even) {
- background-color: $secondary;
- }
- }
- }
table {
table-layout: fixed;
margin-top: 10px;
diff --git a/app/assets/stylesheets/desktop/topic.scss b/app/assets/stylesheets/desktop/topic.scss
index 06ac6b7f91..7707ec9056 100644
--- a/app/assets/stylesheets/desktop/topic.scss
+++ b/app/assets/stylesheets/desktop/topic.scss
@@ -113,7 +113,6 @@ a:hover.reply-new {
width: 0;
bottom: 0;
z-index: 500;
- outline: 1px solid transparent;
&.docked {
position: absolute;
bottom: -70px;
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 1ce508b649..144308885b 100644
--- a/app/assets/stylesheets/desktop/user.scss
+++ b/app/assets/stylesheets/desktop/user.scss
@@ -582,14 +582,6 @@
}
.paginated-topics-list {
- .topic-list > tbody > tr:nth-child(odd) {
- background-color: darken($secondary, 3%);
- }
-
- .topic-list > tbody > tr:nth-child(even) {
- background-color: $secondary;
- }
-
.user-content {
width: 100%;
margin-top: 0;
diff --git a/app/assets/stylesheets/mobile.scss b/app/assets/stylesheets/mobile.scss
index 58636be4cf..91bf389d17 100644
--- a/app/assets/stylesheets/mobile.scss
+++ b/app/assets/stylesheets/mobile.scss
@@ -17,6 +17,7 @@
@import "mobile/upload";
@import "mobile/user";
@import "mobile/history";
+@import "mobile/directory";
/* These files doesn't actually exist, they are injected by DiscourseSassImporter. */
diff --git a/app/assets/stylesheets/mobile/directory.scss b/app/assets/stylesheets/mobile/directory.scss
new file mode 100644
index 0000000000..0442df9d3c
--- /dev/null
+++ b/app/assets/stylesheets/mobile/directory.scss
@@ -0,0 +1,49 @@
+.directory {
+ .period-chooser button {
+ margin: 0;
+ }
+ .period-chooser {
+ li {
+ text-align: left;
+ }
+ }
+}
+
+.user-controls {
+ padding: 1em;
+}
+
+.total-rows {
+ padding: 0.25em 0.5em;
+}
+
+.user {
+ border-top: 1px solid dark-light-diff($primary, $secondary, 80%, -20%);
+ padding: 1em;
+
+
+ &.me {
+ background-color: dark-light-diff($highlight, $secondary, 70%, -80%);
+
+ .username a, .name, .title, .number, .time-read, .user-stat .label {
+ color: scale-color($highlight, $lightness: -50%);
+ }
+ }
+ .user-stat {
+ margin-left: 55px;
+ font-size: 13px;
+
+ .value {
+ font-weight: bold;
+ }
+ .label {
+ margin-left: 0.2em;
+ color: dark-light-diff($primary, $secondary, 50%, -50%);
+ }
+
+ i.fa-heart {
+ color: $love;
+ }
+ }
+ margin-bottom: 1em;
+}
diff --git a/app/assets/stylesheets/mobile/topic-list.scss b/app/assets/stylesheets/mobile/topic-list.scss
index c37eabeea6..15920f147f 100644
--- a/app/assets/stylesheets/mobile/topic-list.scss
+++ b/app/assets/stylesheets/mobile/topic-list.scss
@@ -30,16 +30,10 @@
.topic-list {
> tbody > tr {
- &:nth-child(even) {
- background-color: darken($secondary, 3%);
- }
- &:nth-child(odd) {
- background-color: $secondary;
- }
&.highlighted {
background-color: scale-color($tertiary, $lightness: 85%);
}
- }
+ }
th,
td {
diff --git a/app/assets/stylesheets/mobile/topic.scss b/app/assets/stylesheets/mobile/topic.scss
index 313bcfcd7c..856218de87 100644
--- a/app/assets/stylesheets/mobile/topic.scss
+++ b/app/assets/stylesheets/mobile/topic.scss
@@ -58,7 +58,6 @@
bottom: 0;
z-index: 500;
margin-right: 145px;
- outline: 1px solid transparent;
}
#topic-progress-expanded {
diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss
index b723606ffe..f73c9acafd 100644
--- a/app/assets/stylesheets/mobile/user.scss
+++ b/app/assets/stylesheets/mobile/user.scss
@@ -579,18 +579,10 @@
.paginated-topics-list {
margin-top: 20px;
- .topic-list > tbody > tr:nth-child(odd) {
- background-color: darken($secondary, 3%);
- }
-
- .topic-list > tbody > tr:nth-child(even) {
- background-color: $secondary;
- }
-
- .user-content {
- width: 100%;
- margin-top: 0;
- }
+ .user-content {
+ width: 100%;
+ margin-top: 0;
+ }
}
.user-archive {
diff --git a/app/controllers/admin/api_controller.rb b/app/controllers/admin/api_controller.rb
index 57d9bce4e9..9fd25eecfb 100644
--- a/app/controllers/admin/api_controller.rb
+++ b/app/controllers/admin/api_controller.rb
@@ -6,7 +6,7 @@ class Admin::ApiController < Admin::AdminController
def regenerate_key
api_key = ApiKey.find_by(id: params[:id])
- raise Discourse::NotFound.new if api_key.blank?
+ raise Discourse::NotFound if api_key.blank?
api_key.regenerate!(current_user)
render_serialized(api_key, ApiKeySerializer)
@@ -14,7 +14,7 @@ class Admin::ApiController < Admin::AdminController
def revoke_key
api_key = ApiKey.find_by(id: params[:id])
- raise Discourse::NotFound.new if api_key.blank?
+ raise Discourse::NotFound if api_key.blank?
api_key.destroy
render nothing: true
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index fe6408ccd8..cd9b7c8541 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -5,7 +5,7 @@ class Admin::ReportsController < Admin::AdminController
def show
report_type = params[:type]
- raise Discourse::NotFound.new unless report_type =~ /^[a-z0-9\_]+$/
+ raise Discourse::NotFound unless report_type =~ /^[a-z0-9\_]+$/
start_date = 1.month.ago
start_date = Time.parse(params[:start_date]) if params[:start_date].present?
@@ -14,7 +14,7 @@ class Admin::ReportsController < Admin::AdminController
end_date = Time.parse(params[:end_date]) if params[:end_date].present?
report = Report.find(report_type, {start_date: start_date, end_date: end_date})
- raise Discourse::NotFound.new if report.blank?
+ raise Discourse::NotFound if report.blank?
render_json_dump(report: report)
end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index c1194709f5..977d1e28d7 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -38,7 +38,7 @@ class Admin::UsersController < Admin::AdminController
def show
@user = User.find_by(username_lower: params[:id])
- raise Discourse::NotFound.new unless @user
+ raise Discourse::NotFound unless @user
render_serialized(@user, AdminDetailedUserSerializer, root: false)
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c9bdbbd8e..6775cdf539 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -261,7 +261,7 @@ class ApplicationController < ActionController::Base
elsif params[:external_id]
SingleSignOnRecord.find_by(external_id: params[:external_id]).try(:user)
end
- raise Discourse::NotFound.new if user.blank?
+ raise Discourse::NotFound if user.blank?
guardian.ensure_can_see!(user)
user
diff --git a/app/controllers/embed_controller.rb b/app/controllers/embed_controller.rb
index 4eaaa4c378..033d47a18a 100644
--- a/app/controllers/embed_controller.rb
+++ b/app/controllers/embed_controller.rb
@@ -21,7 +21,7 @@ class EmbedController < ApplicationController
@second_post_url = "#{@topic_view.topic.url}/2" if @topic_view
@posts_left = 0
if @topic_view && @topic_view.posts.size == SiteSetting.embed_post_limit
- @posts_left = @topic_view.topic.posts_count - SiteSetting.embed_post_limit
+ @posts_left = @topic_view.topic.posts_count - SiteSetting.embed_post_limit - 1
end
else
Jobs.enqueue(:retrieve_topic, user_id: current_user.try(:id), embed_url: embed_url)
diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index 2cc4669084..e6e30a54c1 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -225,11 +225,11 @@ class ListController < ApplicationController
parent_category_id = nil
if parent_slug_or_id.present?
parent_category_id = Category.query_parent_category(parent_slug_or_id)
- raise Discourse::NotFound.new if parent_category_id.blank?
+ raise Discourse::NotFound if parent_category_id.blank?
end
@category = Category.query_category(slug_or_id, parent_category_id)
- raise Discourse::NotFound.new if !@category
+ raise Discourse::NotFound if !@category
@description_meta = @category.description
guardian.ensure_can_see!(@category)
diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb
index 7325fc8fac..6a42a5bc67 100644
--- a/app/controllers/notifications_controller.rb
+++ b/app/controllers/notifications_controller.rb
@@ -1,56 +1,51 @@
+require_dependency 'notification_serializer'
+
class NotificationsController < ApplicationController
before_filter :ensure_logged_in
- def recent
- notifications = Notification.recent_report(current_user, 10)
+ def index
+ user = current_user
+ if params[:recent].present?
+ notifications = Notification.recent_report(current_user, 10)
- if notifications.present?
- # ordering can be off due to PMs
- max_id = notifications.map(&:id).max
- current_user.saw_notification_id(max_id) unless params.has_key?(:silent)
+ if notifications.present?
+ # ordering can be off due to PMs
+ max_id = notifications.map(&:id).max
+ current_user.saw_notification_id(max_id) unless params.has_key?(:silent)
+ end
+ current_user.reload
+ current_user.publish_notifications_state
+
+ render_serialized(notifications, NotificationSerializer, root: :notifications)
+ else
+ offset = params[:offset].to_i
+ user = User.find_by_username(params[:username].to_s) if params[:username]
+
+ guardian.ensure_can_see_notifications!(user)
+
+ notifications = Notification.where(user_id: user.id)
+ .visible
+ .includes(:topic)
+ .order(created_at: :desc)
+
+ total_rows = notifications.dup.count
+ notifications = notifications.offset(offset).limit(60)
+ render_json_dump(notifications: serialize_data(notifications, NotificationSerializer),
+ total_rows_notifications: total_rows,
+ load_more_notifications: notifications_path(username: user.username, offset: offset + 60))
end
- current_user.reload
- current_user.publish_notifications_state
- render_serialized(notifications, NotificationSerializer)
end
- def history
- params.permit(:before, :user)
- params[:before] ||= 1.day.from_now
-
- user = current_user
- user = User.find_by_username(params[:user].to_s) if params[:user]
-
- unless guardian.can_see_notifications?(user)
- return render json: {errors: [I18n.t('js.errors.reasons.forbidden')]}, status: 403
- end
-
- notifications = Notification.where(user_id: user.id)
- .visible
- .includes(:topic)
- .limit(60)
- .where('created_at < ?', params[:before])
- .order(created_at: :desc)
-
- render_serialized(notifications, NotificationSerializer)
- end
-
- def reset_new
- params.permit(:user)
-
- user = current_user
- if params[:user]
- user = User.find_by_username(params[:user].to_s)
- end
-
- Notification.where(user_id: user.id).includes(:topic).where(read: false).update_all(read: true)
+ def mark_read
+ Notification.where(user_id: current_user.id).includes(:topic).where(read: false).update_all(read: true)
current_user.saw_notification_id(Notification.recent_report(current_user, 1).max)
current_user.reload
current_user.publish_notifications_state
- render nothing: true
+ render json: success_json
end
+
end
diff --git a/app/controllers/user_badges_controller.rb b/app/controllers/user_badges_controller.rb
index 8ab55b2e26..397ce503fb 100644
--- a/app/controllers/user_badges_controller.rb
+++ b/app/controllers/user_badges_controller.rb
@@ -85,7 +85,7 @@ class UserBadgesController < ApplicationController
else
badge = Badge.find_by(name: params[:badge_name], enabled: true)
end
- raise Discourse::NotFound.new if badge.blank?
+ raise Discourse::NotFound if badge.blank?
badge
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3858dd11ca..dc168a565d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -157,7 +157,7 @@ class UsersController < ApplicationController
redirect_to path("/users/#{current_user.username}/#{params[:path]}")
return
end
- raise Discourse::NotFound.new
+ raise Discourse::NotFound
end
def invited
@@ -436,7 +436,7 @@ class UsersController < ApplicationController
end
def account_created
- @message = session['user_created_message']
+ @message = session['user_created_message'] || I18n.t('activation.missing_session')
expires_now
render layout: 'no_ember'
end
diff --git a/app/jobs/scheduled/create_missing_avatars.rb b/app/jobs/scheduled/create_missing_avatars.rb
index 42a2b01dc8..8526b41155 100644
--- a/app/jobs/scheduled/create_missing_avatars.rb
+++ b/app/jobs/scheduled/create_missing_avatars.rb
@@ -1,13 +1,15 @@
module Jobs
class CreateMissingAvatars < Jobs::Scheduled
every 1.hour
+
def execute(args)
- # backfill in batches 5000 an hour
- UserAvatar.where(last_gravatar_download_attempt: nil).includes(:user)
- .order("users.last_posted_at desc")
- .limit(5000).each do |u|
+ # backfill in batches of 5000 an hour
+ UserAvatar.includes(:user)
+ .where(last_gravatar_download_attempt: nil)
+ .order("users.last_posted_at DESC")
+ .limit(5000)
+ .each do |u|
u.user.refresh_avatar
- u.user.save
end
end
end
diff --git a/app/mailers/user_notifications.rb b/app/mailers/user_notifications.rb
index af2e01ad99..7ae1b8810a 100644
--- a/app/mailers/user_notifications.rb
+++ b/app/mailers/user_notifications.rb
@@ -142,7 +142,7 @@ class UserNotifications < ActionMailer::Base
title: post.topic.title,
post: post,
username: post.user.username,
- from_alias: (SiteSetting.enable_names && SiteSetting.display_name_on_posts && !post.user.name.empty?) ? post.user.name : post.user.username,
+ from_alias: (SiteSetting.enable_names && SiteSetting.display_name_on_posts && post.user.name.present?) ? post.user.name : post.user.username,
allow_reply_by_email: true,
use_site_subject: true,
add_re_to_subject: true,
diff --git a/app/models/directory_item.rb b/app/models/directory_item.rb
index 666749126f..30f2da1b4b 100644
--- a/app/models/directory_item.rb
+++ b/app/models/directory_item.rb
@@ -49,7 +49,7 @@ class DirectoryItem < ActiveRecord::Base
SUM(CASE WHEN ua.action_type = :reply_type THEN 1 ELSE 0 END)
FROM users AS u
LEFT OUTER JOIN user_actions AS ua ON ua.user_id = u.id
- LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id
+ LEFT OUTER JOIN topics AS t ON ua.target_topic_id = t.id AND t.archetype = 'regular'
LEFT OUTER JOIN posts AS p ON ua.target_post_id = p.id
LEFT OUTER JOIN categories AS c ON t.category_id = c.id
WHERE u.active
@@ -57,7 +57,6 @@ class DirectoryItem < ActiveRecord::Base
AND COALESCE(ua.created_at, :since) >= :since
AND t.deleted_at IS NULL
AND COALESCE(t.visible, true)
- AND COALESCE(t.archetype, 'regular') = 'regular'
AND p.deleted_at IS NULL
AND (NOT (COALESCE(p.hidden, false)))
AND COALESCE(p.post_type, :regular_post_type) != :moderator_action
diff --git a/app/models/discourse_single_sign_on.rb b/app/models/discourse_single_sign_on.rb
index 4db846f93b..db2387923a 100644
--- a/app/models/discourse_single_sign_on.rb
+++ b/app/models/discourse_single_sign_on.rb
@@ -120,7 +120,7 @@ class DiscourseSingleSignOn < SingleSignOn
end
if SiteSetting.sso_overrides_name && user.name != name
- user.name = name || User.suggest_name(username || email)
+ user.name = name || User.suggest_name(username.blank? ? email : username)
end
if SiteSetting.sso_overrides_avatar && avatar_url.present? && (
diff --git a/app/models/incoming_link.rb b/app/models/incoming_link.rb
index 9064b0d0d0..fd3e9e8e8d 100644
--- a/app/models/incoming_link.rb
+++ b/app/models/incoming_link.rb
@@ -14,7 +14,9 @@ class IncomingLink < ActiveRecord::Base
user_id, host, referer = nil
current_user = opts[:current_user]
- if username = opts[:username]
+ username = opts[:username]
+ username = nil unless String === username
+ if username
u = User.select(:id).find_by(username_lower: username.downcase)
user_id = u.id if u
end
diff --git a/app/models/optimized_image.rb b/app/models/optimized_image.rb
index b556229957..cbfb901ab2 100644
--- a/app/models/optimized_image.rb
+++ b/app/models/optimized_image.rb
@@ -6,72 +6,74 @@ class OptimizedImage < ActiveRecord::Base
def self.create_for(upload, width, height, opts={})
return unless width > 0 && height > 0
- # do we already have that thumbnail?
- thumbnail = find_by(upload_id: upload.id, width: width, height: height)
+ DistributedMutex.synchronize("optimized_image_#{upload.id}_#{width}_#{height}") do
+ # do we already have that thumbnail?
+ thumbnail = find_by(upload_id: upload.id, width: width, height: height)
- # make sure the previous thumbnail has not failed
- if thumbnail && thumbnail.url.blank?
- thumbnail.destroy
- thumbnail = nil
- end
-
- # return the previous thumbnail if any
- return thumbnail unless thumbnail.nil?
-
- # create the thumbnail otherwise
- external_copy = Discourse.store.download(upload) if Discourse.store.external?
- original_path = if Discourse.store.external?
- external_copy.try(:path)
- else
- Discourse.store.path_for(upload)
- end
-
- if original_path.blank?
- Rails.logger.error("Could not find file in the store located at url: #{upload.url}")
- else
- # create a temp file with the same extension as the original
- extension = File.extname(original_path)
- temp_file = Tempfile.new(["discourse-thumbnail", extension])
- temp_path = temp_file.path
-
- if extension =~ /\.svg$/i
- FileUtils.cp(original_path, temp_path)
- resized = true
- else
- resized = resize(original_path, temp_path, width, height, opts)
+ # make sure the previous thumbnail has not failed
+ if thumbnail && thumbnail.url.blank?
+ thumbnail.destroy
+ thumbnail = nil
end
- if resized
- thumbnail = OptimizedImage.create!(
- upload_id: upload.id,
- sha1: Digest::SHA1.file(temp_path).hexdigest,
- extension: extension,
- width: width,
- height: height,
- url: "",
- )
- # store the optimized image and update its url
- url = Discourse.store.store_optimized_image(temp_file, thumbnail)
- if url.present?
- thumbnail.url = url
- thumbnail.save
+ # return the previous thumbnail if any
+ return thumbnail unless thumbnail.nil?
+
+ # create the thumbnail otherwise
+ external_copy = Discourse.store.download(upload) if Discourse.store.external?
+ original_path = if Discourse.store.external?
+ external_copy.try(:path)
+ else
+ Discourse.store.path_for(upload)
+ end
+
+ if original_path.blank?
+ Rails.logger.error("Could not find file in the store located at url: #{upload.url}")
+ else
+ # create a temp file with the same extension as the original
+ extension = File.extname(original_path)
+ temp_file = Tempfile.new(["discourse-thumbnail", extension])
+ temp_path = temp_file.path
+
+ if extension =~ /\.svg$/i
+ FileUtils.cp(original_path, temp_path)
+ resized = true
else
- Rails.logger.error("Failed to store avatar #{size} for #{upload.url} from #{source}")
+ resized = resize(original_path, temp_path, width, height, opts)
end
- else
- Rails.logger.error("Failed to create optimized image #{width}x#{height} for #{upload.url}")
+
+ if resized
+ thumbnail = OptimizedImage.create!(
+ upload_id: upload.id,
+ sha1: Digest::SHA1.file(temp_path).hexdigest,
+ extension: extension,
+ width: width,
+ height: height,
+ url: "",
+ )
+ # store the optimized image and update its url
+ url = Discourse.store.store_optimized_image(temp_file, thumbnail)
+ if url.present?
+ thumbnail.url = url
+ thumbnail.save
+ else
+ Rails.logger.error("Failed to store avatar #{size} for #{upload.url} from #{source}")
+ end
+ else
+ Rails.logger.error("Failed to create optimized image #{width}x#{height} for #{upload.url}")
+ end
+
+ # close && remove temp file
+ temp_file.close!
end
- # close && remove temp file
- temp_file.close!
- end
+ # make sure we remove the cached copy from external stores
+ if Discourse.store.external?
+ external_copy.try(:close!) rescue nil
+ end
- # make sure we remove the cached copy from external stores
- if Discourse.store.external?
- external_copy.try(:close!) rescue nil
+ thumbnail
end
-
- thumbnail
end
def destroy
diff --git a/app/models/upload.rb b/app/models/upload.rb
index f9507aca8e..d604dd0b85 100644
--- a/app/models/upload.rb
+++ b/app/models/upload.rb
@@ -52,43 +52,45 @@ class Upload < ActiveRecord::Base
def self.create_for(user_id, file, filename, filesize, options = {})
sha1 = Digest::SHA1.file(file).hexdigest
- # do we already have that upload?
- upload = find_by(sha1: sha1)
+ DistributedMutex.synchronize("upload_#{sha1}") do
+ # do we already have that upload?
+ upload = find_by(sha1: sha1)
- # make sure the previous upload has not failed
- if upload && upload.url.blank?
- upload.destroy
- upload = nil
+ # make sure the previous upload has not failed
+ if upload && upload.url.blank?
+ upload.destroy
+ upload = nil
+ end
+
+ # return the previous upload if any
+ return upload unless upload.nil?
+
+ # create the upload otherwise
+ upload = Upload.new
+ upload.user_id = user_id
+ upload.original_filename = filename
+ upload.filesize = filesize
+ upload.sha1 = sha1
+ upload.url = ""
+ upload.origin = options[:origin][0...1000] if options[:origin]
+
+ # deal with width & height for images
+ upload = resize_image(filename, file, upload) if FileHelper.is_image?(filename)
+
+ return upload unless upload.save
+
+ # store the file and update its url
+ url = Discourse.store.store_upload(file, upload, options[:content_type])
+ if url.present?
+ upload.url = url
+ upload.save
+ else
+ upload.errors.add(:url, I18n.t("upload.store_failure", { upload_id: upload.id, user_id: user_id }))
+ end
+
+ # return the uploaded file
+ upload
end
-
- # return the previous upload if any
- return upload unless upload.nil?
-
- # create the upload otherwise
- upload = Upload.new
- upload.user_id = user_id
- upload.original_filename = filename
- upload.filesize = filesize
- upload.sha1 = sha1
- upload.url = ""
- upload.origin = options[:origin][0...1000] if options[:origin]
-
- # deal with width & height for images
- upload = resize_image(filename, file, upload) if FileHelper.is_image?(filename)
-
- return upload unless upload.save
-
- # store the file and update its url
- url = Discourse.store.store_upload(file, upload, options[:content_type])
- if url.present?
- upload.url = url
- upload.save
- else
- upload.errors.add(:url, I18n.t("upload.store_failure", { upload_id: upload.id, user_id: user_id }))
- end
-
- # return the uploaded file
- upload
end
def self.resize_image(filename, file, upload)
diff --git a/app/models/user_action.rb b/app/models/user_action.rb
index 0e979991c0..0d4c661d10 100644
--- a/app/models/user_action.rb
+++ b/app/models/user_action.rb
@@ -142,6 +142,7 @@ SQL
SELECT
a.id,
t.title, a.action_type, a.created_at, t.id topic_id,
+ t.closed AS topic_closed, t.archived AS topic_archived,
a.user_id AS target_user_id, au.name AS target_name, au.username AS target_username,
coalesce(p.post_number, 1) post_number, p.id as post_id,
p.reply_to_post_number,
diff --git a/app/models/user_avatar.rb b/app/models/user_avatar.rb
index 73431a9610..0a14ec745c 100644
--- a/app/models/user_avatar.rb
+++ b/app/models/user_avatar.rb
@@ -10,27 +10,31 @@ class UserAvatar < ActiveRecord::Base
end
def update_gravatar!
- # special logic for our system user, we do not want the discourse email there
- email_hash = user.id == -1 ? User.email_hash("info@discourse.org") : user.email_hash
+ DistributedMutex.synchronize("update_gravatar_#{user.id}") do
+ begin
+ # special logic for our system user
+ email_hash = user.id == Discourse::SYSTEM_USER_ID ? User.email_hash("info@discourse.org") : user.email_hash
- self.last_gravatar_download_attempt = Time.new
- gravatar_url = "http://www.gravatar.com/avatar/#{email_hash}.png?s=500&d=404"
- tempfile = FileHelper.download(gravatar_url, SiteSetting.max_image_size_kb.kilobytes, "gravatar")
+ self.last_gravatar_download_attempt = Time.new
- upload = Upload.create_for(user.id, tempfile, 'gravatar.png', tempfile.size, { origin: gravatar_url })
+ gravatar_url = "http://www.gravatar.com/avatar/#{email_hash}.png?s=500&d=404"
+ tempfile = FileHelper.download(gravatar_url, SiteSetting.max_image_size_kb.kilobytes, "gravatar")
+ upload = Upload.create_for(user.id, tempfile, 'gravatar.png', tempfile.size, { origin: gravatar_url })
- if gravatar_upload_id != upload.id
- gravatar_upload.try(:destroy!)
- self.gravatar_upload = upload
- save!
+ if gravatar_upload_id != upload.id
+ gravatar_upload.try(:destroy!)
+ self.gravatar_upload = upload
+ save!
+ end
+ rescue OpenURI::HTTPError
+ save!
+ rescue SocketError
+ # skip saving, we are not connected to the net
+ Rails.logger.warn "Failed to download gravatar, socket error - user id #{user.id}"
+ ensure
+ tempfile.try(:close!)
+ end
end
- rescue OpenURI::HTTPError
- save!
- rescue SocketError
- # skip saving, we are not connected to the net
- Rails.logger.warn "Failed to download gravatar, socket error - user id #{user.id}"
- ensure
- tempfile.close! if tempfile && tempfile.respond_to?(:close!)
end
end
diff --git a/app/serializers/notification_serializer.rb b/app/serializers/notification_serializer.rb
index 50d0b1ef7b..28d92f19c5 100644
--- a/app/serializers/notification_serializer.rb
+++ b/app/serializers/notification_serializer.rb
@@ -1,6 +1,7 @@
class NotificationSerializer < ApplicationSerializer
- attributes :notification_type,
+ attributes :id,
+ :notification_type,
:read,
:created_at,
:post_number,
diff --git a/app/serializers/user_action_serializer.rb b/app/serializers/user_action_serializer.rb
index 503aabe626..ccf02e031c 100644
--- a/app/serializers/user_action_serializer.rb
+++ b/app/serializers/user_action_serializer.rb
@@ -26,6 +26,8 @@ class UserActionSerializer < ApplicationSerializer
:edit_reason,
:category_id,
:uploaded_avatar_id,
+ :closed,
+ :archived,
:acting_uploaded_avatar_id
def excerpt
@@ -77,4 +79,12 @@ class UserActionSerializer < ApplicationSerializer
object.action_type == UserAction::EDIT
end
+ def closed
+ object.topic_closed
+ end
+
+ def archived
+ object.topic_archived
+ end
+
end
diff --git a/app/services/anonymous_shadow_creator.rb b/app/services/anonymous_shadow_creator.rb
index 3441455d8c..f2abd9e1b1 100644
--- a/app/services/anonymous_shadow_creator.rb
+++ b/app/services/anonymous_shadow_creator.rb
@@ -33,7 +33,7 @@ class AnonymousShadowCreator
User.transaction do
shadow = User.create!(
password: SecureRandom.hex,
- email: "#{SecureRandom.hex}@#{SecureRandom.hex}.com",
+ email: "#{SecureRandom.hex}@anon.#{Discourse.current_hostname}",
name: "",
username: UserNameSuggester.suggest(I18n.t(:anonymous).downcase),
active: true,
diff --git a/app/views/common/_discourse_javascript.html.erb b/app/views/common/_discourse_javascript.html.erb
index 7beae7ecb8..a075563052 100644
--- a/app/views/common/_discourse_javascript.html.erb
+++ b/app/views/common/_discourse_javascript.html.erb
@@ -36,8 +36,6 @@
PreloadStore.get("customEmoji").forEach(function(emoji) {
Discourse.Dialect.registerEmoji(emoji.name, emoji.url);
});
- Discourse.Router = Ember.Router.extend({ location: 'discourse-location' });
- Discourse.Route.mapRoutes();
Discourse.start();
Discourse.set('assetVersion','<%= Discourse.assets_digest %>');
Discourse.Session.currentProp("disableCustomCSS", <%= loading_admin? %>);
diff --git a/app/views/list/list.rss.erb b/app/views/list/list.rss.erb
index 63684a5e82..deb5e80f02 100644
--- a/app/views/list/list.rss.erb
+++ b/app/views/list/list.rss.erb
@@ -11,7 +11,7 @@
+
+
+ Stefan Penner
+
+
+ Alex Navasardyan
+
+
+ Ray Cohen
+
+ {{username}} hat {{description}} verschoben
" linked: "{{username}} {{description}}
" granted_badge: "Abzeichen '{{description}}' erhalten
" + popup: + mentioned: '{{username}} hat dich in "{{topic}}" - {{site_title}} erwähnt' + quoted: '{{username}} hat dich in "{{topic}}" - {{site_title}} zitiert' + replied: '{{username}} hat dir in "{{topic}}" - {{site_title}} geantwortet' + posted: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag verfasst' + private_message: '{{username}} hat dir in "{{topic}}" - {{site_title}} eine Nachricht geschickt' + linked: '{{username}} hat in "{{topic}}" - {{site_title}} einen Beitrag von dir verlinkt' upload_selector: title: "Ein Bild hinzufügen" title_with_attachments: "Ein Bild oder eine Datei hinzufügen" @@ -2181,7 +2190,7 @@ de: add: "Neues Emoji hinzufügen" name: "Name" image: "Bild" - delete_confirm: "Möchtest du wirklich das %{name}: Emoji löschen?" + delete_confirm: "Möchtest du wirklich das :%{name}: Emoji löschen?" lightbox: download: "herunterladen" search_help: diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index b961a02554..3290747e35 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -333,6 +333,7 @@ es: dismiss_notifications: "Marcador todos como leídos" dismiss_notifications_tooltip: "Marcar todas las notificaciones no leídas como leídas" disable_jump_reply: "No dirigirme a mi post cuando responda" + dynamic_favicon: "Mostrar contador de temas nuevos/actualizados en el favicon" edit_history_public: "Dejar que otros usuarios puedan ver las revisiones de mis posts" external_links_in_new_tab: "Abrir todos los enlaces externos en una nueva pestaña" enable_quoting: "Activar respuesta citando el texto resaltado" @@ -493,7 +494,7 @@ es: pending: "Invitaciones Pendientes" topics_entered: "Temas Vistos" posts_read_count: "Posts leídos" - expired: "Esta invitación ha vencido." + expired: "Esta invitación ha caducado." rescind: "Remover" rescinded: "Invitación eliminada" reinvite: "Reenviar Invitación" @@ -503,7 +504,7 @@ es: account_age_days: "Antigüedad de la cuenta en días" create: "Enviar una Invitación" bulk_invite: - none: "No has invitado a nadie todavía. Puede enviar invitaciones individuales o invitar a un grupo de personas a la vez subiendo un archivo para invitaciones en masa." + none: "No has invitado a nadie todavía. Puedes enviar invitaciones individuales o invitar a un grupo de personas a la vez subiendo un archivo para invitaciones en masa." text: "Archivo de Invitación en Masa" uploading: "Subiendo..." success: "Archivo subido correctamente, se te notificará con un mensaje cuando se complete el proceso." @@ -557,6 +558,7 @@ es: read_only_mode: enabled: "Modo solo-lectura activado. Puedes continuar navegando por el sitio pero las interacciones podrían no funcionar." login_disabled: "Iniciar sesión está desactivado mientras el foro esté en modo solo lectura." + too_few_topics_notice: "Crea al menos 5 temas y %{posts} posts públicos para considerar iniciada la discusión. Los nuevos usuarios no podrán ganar niveles de confianza a menos que haya contenido para que lean. Este mensaje sólo les aparecerá a los miembros del staff." learn_more: "saber más..." year: 'año' year_desc: 'temas creados en los últimos 365 días' @@ -741,6 +743,13 @@ es: moved_post: "{{username}} movió {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "Se te ha concedido '{{description}}'
" + popup: + mentioned: '{{username}} te mencionó en "{{topic}}" - {{site_title}}' + quoted: '{{username}} te citó en "{{topic}}" - {{site_title}}' + replied: '{{username}} te respondió en "{{topic}}" - {{site_title}}' + posted: '{{username}} publicó en "{{topic}}" - {{site_title}}' + private_message: '{{username}} te envió un mensaje privado en "{{topic}}" - {{site_title}}' + linked: '{{username}} enlazó tu publicación desde "{{topic}}" - {{site_title}}' upload_selector: title: "Añadir imagen" title_with_attachments: "Añadir una imagen o archivo" @@ -998,7 +1007,7 @@ es: email_placeholder: 'nombre@ejemplo.com' success_email: "Hemos enviado un email con tu invitación a {{emailOrUsername}}. Te notificaremos cuando se acepte. Puedes revisar la pestaña invitaciones en tu perfil de usuario para consultar el estado de tus invitaciones." success_username: "Hemos invitado a ese usuario a participar en este tema." - error: "Lo sentimos, no pudimos invitar a esa persona. Tal vez ya han sido invitados? (La tasa de invitaciones son limitadas)" + error: "Lo sentimos, no pudimos invitar a esa persona. Tal vez ya haya sido invitada. (La tasa de invitaciones es limitada)" login_reply: 'Inicia Sesión para Responder' filters: n_posts: @@ -2289,34 +2298,34 @@ es: name: Buen post description: Recibió 10 "me gusta" en un post. Este distintivo puede ser concedido varias veces good_post: - name: Muy buen post + name: Gran post description: Recibió 25 "me gusta" en un post. Este distintivo puede ser concedido varias veces great_post: - name: Gran Post + name: Excelente post description: Recibió 50 "me gusta" en un post. Este distintivo puede ser concedido varias veces nice_topic: - name: Lindo Tema + name: Buen tema description: Recibió 10 "me gusta" en un tema. Este distintivo puede ser concedido varias veces good_topic: - name: Buen Tema + name: Gran tema description: Recibió 25 "me gusta" en un tema. Este distintivo puede ser concedido varias veces great_topic: - name: Gran Tema + name: Excelente tema description: Recibió 50 "me gusta" en un tema. Este distintivo puede ser concedido varias veces nice_share: - name: Linda Contribución + name: Buena contribución description: Compartió un post con 25 visitantes únicos good_share: - name: Buena Contribución + name: Gran contribución description: Compartió un post con 300 visitantes únicos great_share: - name: Gran Contribución + name: Excelente contribución description: Compartió un post con 1000 visitantes únicos first_like: name: Primer "me gusta" description: Le dio a "me gusta" a un post first_flag: - name: Primer Reporte + name: Primer reporte description: Reportó un post first_share: name: Primer Compartido diff --git a/config/locales/client.fa_IR.yml b/config/locales/client.fa_IR.yml index 889b5ba07b..ca7f28344f 100644 --- a/config/locales/client.fa_IR.yml +++ b/config/locales/client.fa_IR.yml @@ -307,6 +307,7 @@ fa_IR: dismiss_notifications: "علامت گذاری همه به عنوان خوانده شده" dismiss_notifications_tooltip: "علامت گذاری همه اطلاعیه های خوانده نشده به عنوان خوانده شده" disable_jump_reply: "بعد از پاسخ من به پست من پرش نکن" + dynamic_favicon: "Show new / updated topic count on browser icon" edit_history_public: "اجازه بده کاربران دیگر اصلاحات نوشته مرا ببینند" external_links_in_new_tab: "همهٔ پیوندهای برونرو را در یک تب جدید باز کن" enable_quoting: "فعال کردن نقل قول گرفتن از متن انتخاب شده" @@ -527,6 +528,7 @@ fa_IR: read_only_mode: enabled: "حالت فقط خواندن را فعال است. می توانید به جستجو در وب سایت ادامه دهید ولی ممکن است تعاملات کار نکند." login_disabled: "ورود به سیستم غیر فعال شده همزمان با اینکه سایت در حال فقط خواندنی است." + too_few_topics_notice: "Create at least 5 public topics and %{posts} public replies to get discussion started. New users cannot earn trust levels unless there's content for them to read. This message appears only to staff." learn_more: "بیشتر بدانید..." year: 'سال' year_desc: 'موضوعاتی که در 365 روز گذشته باز شدهاند' @@ -710,6 +712,13 @@ fa_IR: moved_post: "{{username}} moved {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "Earned '{{description}}'
" + popup: + mentioned: '{{username}} mentioned you in "{{topic}}" - {{site_title}}' + quoted: '{{username}} quoted you in "{{topic}}" - {{site_title}}' + replied: '{{username}} replied to you in "{{topic}}" - {{site_title}}' + posted: '{{username}} posted in "{{topic}}" - {{site_title}}' + private_message: '{{username}} sent you a private message in "{{topic}}" - {{site_title}}' + linked: '{{username}} linked to your post from "{{topic}}" - {{site_title}}' upload_selector: title: "افزودن یک عکس" title_with_attachments: "افزودن یک تصویر یا پرونده" diff --git a/config/locales/client.fi.yml b/config/locales/client.fi.yml index ab340185d6..9ac15a7aec 100644 --- a/config/locales/client.fi.yml +++ b/config/locales/client.fi.yml @@ -333,6 +333,7 @@ fi: dismiss_notifications: "Merkitse kaikki luetuiksi" dismiss_notifications_tooltip: "Merkitse kaikki lukemattomat ilmoitukset luetuiksi" disable_jump_reply: "Älä siirry uuteen viestiini lähetettyäni sen" + dynamic_favicon: "Näytä uusien / päivittyneiden ketjujen määrä selaimen ikonissa" edit_history_public: "Anna muiden nähdä viestieni revisiot" external_links_in_new_tab: "Avaa sivuston ulkopuoliset linkit uudessa välilehdessä" enable_quoting: "Ota käyttöön viestin lainaaminen tekstiä valitsemalla" @@ -557,6 +558,7 @@ fi: read_only_mode: enabled: "Olet Vain luku -tilassa. Voit jatkaa selaamista, muttet välttämättä pysty vaikuttamaan sisältöön." login_disabled: "Kirjautuminen ei ole käytössä sivuston ollessa vain luku -tilassa." + too_few_topics_notice: "Luo vähintään 5 julkista ketjua ja %{posts} julkista vastausta saadaksesi keskustelun käyntiin. Uudet käyttäjät eivät voi saavuttaa korkeampia luottamustasoja, jos heillä ei ole tarpeeksi luettavaa sisältöä. Tämä viesti näytetään vain henkilökunnalle." learn_more: "opi lisää..." year: 'vuosi' year_desc: 'viimeisen 365 päivän aikana luodut ketjut' @@ -741,6 +743,13 @@ fi: moved_post: "{{username}} siirsi {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "Ansaitsit '{{description}}'
" + popup: + mentioned: '{{username}} mainitsi sinut ketjussa "{{topic}}" - {{site_title}}' + quoted: '{{username}} lainasi sinua ketjussa "{{topic}}" - {{site_title}}' + replied: '{{username}} vastasi sinulle ketjussa "{{topic}}" - {{site_title}}' + posted: '{{username}} vastasi ketjuun "{{topic}}" - {{site_title}}' + private_message: '{{username}} lähetti sinulle yksityisviestin ketjussa "{{topic}}" - {{site_title}}' + linked: '{{username}} linkitti viestiisi aiheesta "{{topic}}" - {{site_title}}' upload_selector: title: "Lisää kuva" title_with_attachments: "Lisää kuva tai tidosto" @@ -1949,7 +1958,7 @@ fi: show_public_profile: "Näytä julkinen profiili" impersonate: 'Esiinny käyttäjänä' ip_lookup: "IP haku" - log_out: "Kirjaudu ulos" + log_out: "Kirjaa ulos" logged_out: "Käyttäjä on kirjautunut ulos kaikilla laitteilla" revoke_admin: 'Peru ylläpitäjän oikeudet' grant_admin: 'Myönnä ylläpitäjän oikeudet' @@ -1981,7 +1990,7 @@ fi: anonymize_failed: "Käyttäjätilin anonymisointi ei onnistunut." delete: "Poista käyttäjä" delete_forbidden_because_staff: "Ylläpitäjiä ja valvojia ei voi poistaa." - delete_posts_forbidden_because_staff: "Ylläpitäjien ja moderaattoreiden kaikkia viestejä ei voi poistaa." + delete_posts_forbidden_because_staff: "Ylläpitäjien ja valvojien kaikkia viestejä ei voi poistaa." delete_forbidden: one: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivä ei voi poistaa)" other: "Käyttäjiä ei voi poistaa jos heillä on kirjoitettuja viestejä. Poista ensin viestit ennen käyttäjätilin poistamista. (Vanhempia viestejä, kuin %{count} päivää ei voi poistaa)" @@ -2010,7 +2019,7 @@ fi: block_explanation: "Estetty käyttäjä ei voi luoda viestejä tai ketjuja." trust_level_change_failed: "Käyttäjän luottamustason vaihtamisessa tapahtui virhe." grant_admin_failed: "Ylläpitäjän oikeuksian antaminen ei onnistunut." - grant_moderation_failed: "Moderaattorin oikeuksien antaminen ei onnistunut." + grant_moderation_failed: "Valvojan oikeuksien myöntäminen ei onnistunut." suspend_modal_title: "Hyllytä käyttäjä" trust_level_2_users: "Käyttäjät luottamustasolla 2" trust_level_3_requirements: "Luottamustaso 3 vaatimukset" diff --git a/config/locales/client.he.yml b/config/locales/client.he.yml index 78870c0101..36a5ef3e28 100644 --- a/config/locales/client.he.yml +++ b/config/locales/client.he.yml @@ -107,6 +107,9 @@ he: show_more: "הראה עוד" show_help: "עזרה" links: "קישורים" + links_lowercase: + one: "קישור" + other: "קישורים" faq: "שאלות נפוצות" guidelines: "כללי התנהלות" privacy_policy: "מדיניות פרטיות" @@ -193,6 +196,28 @@ he: title: search: "חפש נושא לפי שם, כתובת או מזהה:" placeholder: "הקלד את כותרת הנושא כאן" + queue: + topic: "נושא:" + approve: 'לאשר' + reject: 'לדחות' + delete_user: 'מחק משתמש' + title: "זקוק לאישור" + none: "לא נותרו הודעות לבדיקה" + edit: "ערוך" + cancel: "ביטול" + view_pending: "הצג הודעות ממתינות" + has_pending_posts: + one: " בנושא זה ישנה הודעה אחת הממתינה לאישור" + many: "בנושא זה ישנם {{count}} הודעות הממתינות לאישור" + confirm: "שמור שינויים" + delete_prompt: "אתה בטוח שאתה רוצה למחוק את המשתמש %{username}? פעולה זו תמחק את כל ההודעות , תחסום את הדואר האלקטרוני וכתובת ה-IP של המשתמש." + approval: + title: "ההודעה זקוקה לאישור" + description: "קיבלנו את הודעתך אך נדרש אישור של מנחה לפני שההודעה תוצג, אנא המתן בסבלנות." + pending_posts: + one: "יש לך הודעה אחת ממתינה לאישור" + other: "יש לך {{count}} הודעות ממתינות." + ok: "אשר" user_action: user_posted_topic: "{{user}} פרסם את הנושא" you_posted_topic: "את/ה פרסמת את הנושא" @@ -254,6 +279,7 @@ he: '11': "עריכות" '12': "פריטים שנשלחו" '13': "דואר נכנס" + '14': "ממתין" categories: all: "כל הקטגוריות" all_subcategories: "הכל" @@ -307,6 +333,7 @@ he: dismiss_notifications: "סימון הכל כנקרא" dismiss_notifications_tooltip: "סימון כל ההתראות שלא נקראו כהתראות שנקראו" disable_jump_reply: "אל תקפצו לפרסומים שלי לאחר שאני משיב/ה" + dynamic_favicon: "הצג את מספר נושאים חדשים/מעודכנים על האייקון של הדפדפן" edit_history_public: "אפשרו למשתמשים אחרים לראות את תיקוני הפרסומים שלי" external_links_in_new_tab: "פתח את כל הקישורים החיצוניים בעמוד חדש" enable_quoting: "אפשרו תגובת ציטוט לטקסט מסומן" @@ -449,6 +476,7 @@ he: auto_track_topics: "מעקב אוטומטי נושאים אליהם נכנסתי" auto_track_options: never: "אף פעם" + immediately: "מיידי" after_n_seconds: one: "אחרי שנייה אחת" other: "אחרי {{count}} שניות" @@ -528,7 +556,9 @@ he: logout: "נותקת מהמערכת" refresh: "רענן" read_only_mode: + enabled: "מופעל מצב קריאה בלבד. אפשר להמשיך לגלוש באתר, אך חלק מהפעולות עלולות לא לעבוד." login_disabled: "התחברות אינה מתאפשרת כשהאתר במצב קריאה בלבד." + too_few_topics_notice: "צור לפחות 5 נושאים ציבוריים ו-%{posts} תגובות ציבוריות להתחיל את הדיון. משתמשים חדשים לא יכולים להשיג דרגות אמון אלא אם יש להם תוכן לקרוא. הודעה זו מופיעה רק לצוות." learn_more: "למד עוד..." year: 'שנה' year_desc: 'נושאים שפורסמו ב-365 הימים האחרונים' @@ -541,6 +571,10 @@ he: mute: השתק unmute: בטל השתקה last_post: הודעה אחרונה + last_reply_lowercase: תגובה אחרונה + replies_lowercase: + one: תגובה + other: תגובות summary: enabled_description: "אתם צופים בסיכום נושא זה: הפרסומים המעניינים ביותר כפי שסומנו על ידי הקהילה." description: "ישנן {{count}} תגובות" @@ -634,6 +668,7 @@ he: title_too_long: "על הכותרת להיות באורך {{max}} לכל היותר." post_missing: "ההודעה אינה יכולה להיות ריקה." post_length: "על ההודעה להיות באורך {{min}} תווים לפחות." + try_like: 'האם ניסית את כפתור ה-' category_missing: "עליך לבחור קטגוריה." save_edit: "שמירת עריכה" reply_original: "תגובה לנושא המקורי" @@ -707,6 +742,13 @@ he: moved_post: "{{username}} הזיז/ה {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "הרוויח/ה '{{description}}'
" + popup: + mentioned: '{{username}} הזכיר אוך ב"{{topic}}" - {{site_title}}' + quoted: '{{username}} ציטט אותך ב"{{topic}}" - {{site_title}}' + replied: '{{username}} הגיב לך ב"{{topic}}" - {{site_title}}' + posted: '{{username}} הגיב ב"{{topic}}" - {{site_title}}' + private_message: '{{username}} שלח לך הודעה פרטית ב"{{topic}}" - {{site_title}}' + linked: '{{username}} קישר להודעה שלך מ"{{topic}}" - {{site_title}}' upload_selector: title: "הוספת תמונה" title_with_attachments: "הוספת תמונה או קובץ" @@ -942,12 +984,21 @@ he: email_or_username: "כתובת דואר אלקטרוני או שם משתמש של המוזמן" email_or_username_placeholder: "כתובת דואר אלקטרוני או שם משתמש" action: "הזמנה" + success: "הזמנו את המשתמש להשתתף בשיחה." error: "סליחה, הייתה שגיאה בהזמנת משתמש זה." group_name: "שם הקבוצה" invite_reply: title: 'הזמנה' + username_placeholder: "שם משתמש" + action: 'שלח הזמנה' + help: 'הזמן אנשים אחרים לנושא זה דרך דואר אלקטרוני או התראות' to_forum: "נשלח מייל קצר המאפשר לחברך להצטרף באופן מיידי באמצעות לחיצה על קישור, ללא צורך בהתחברות למערכת הפורומים." + sso_enabled: "הכנס את שם המשתמש של האדם שברצונך להזמין לנושא זה." + to_topic_blank: "הכנס את שם המשתמש או כתובת דואר האלקטרוני של האדם שברצונך להזמין לנושא זה." + to_topic_username: "הכנסת את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." + to_username: "הכנס את שם המשתמש של האדם שברצונך להזמין. אנו נשלח התראה למשתמש זה עם קישור המזמין אותו לנושא זה." email_placeholder: 'name@example.com' + success_username: "הזמנו את המשתמש להשתתף בנושא." login_reply: 'התחברו כדי להשיב' filters: n_posts: @@ -991,8 +1042,10 @@ he: one: בחרת הודעה אחת. other: בחרת {{count}} הודעות. post: + reply: "השב ל {{link}} {{replyAvatar}} {{username}}" reply_topic: "תגובה ל {{link}}" quote_reply: "תגובה עם ציטוט" + edit: "עורך את {{link}} {{replyAvatar}} {{username}}" edit_reason: "סיבה: " post_number: "הודעה {{number}}" last_edited_on: "הודעה נערכה לאחרונה ב" @@ -1086,6 +1139,7 @@ he: inappropriate: "{{icons}} סומן בלתי ראוי" notify_moderators: "{{icons}} הודיעו למנהלים" notify_moderators_with_url: "{{icons}} הודיעו למנהלים" + notify_user: "{{icons}} שלח הודעה" bookmark: "{{icons}} סימנו כמועדף" like: "{{icons}} נתנו לייק" vote: "{{icons}} הצביעו עבור זה" @@ -1133,6 +1187,9 @@ he: notify_moderators: one: "אדם אחד דגלל את זה לניהול" other: "{{count}} אנשים סמנו את זה לניהול" + notify_user: + one: "אדם אחד שלח הודעה למשתמש זה" + other: "{{count}} שלחו הודעה למשתמש זה" bookmark: one: "אדם אחד סימן הודעה זו כמועדפת" other: "{{count}} אנשים סימנו הודעה זו כמועדפת" @@ -1357,6 +1414,16 @@ he: top: title: "מובילים" help: "הנושאים הפעילים ביותר בשנה, חודש, שבוע או יום האחרונים" + all: + title: "תמיד" + yearly: + title: "שנתי" + monthly: + title: "חודשי" + weekly: + title: "שבועי" + daily: + title: "יומי" this_year: "השנה" this_month: "החודש" this_week: "השבוע" @@ -1530,15 +1597,18 @@ he: read_only: enable: title: "אפשר מצב קריאה בלבד" + label: "אפשר מצב \"קריאה בלבד\"" confirm: "אתה בטוח שברצונך לאפשר את מצב קריאה בלבד??" disable: title: "בטל מצב קריאה בלבד" + label: "בטל מצב \"קריאה בלבד\"" logs: none: "עדיין אין לוגים..." columns: filename: "שם קובץ" size: "גודל" upload: + label: "העלה" uploading: "מעלה..." success: "'{{filename}}' הועלה בהצלחה." error: "הייתה שגיאה במהלך העלאת '{{filename}}': {{message}}" @@ -1546,19 +1616,23 @@ he: is_running: "פעולה רצה כרגע..." failed: "ה{{operation}} נכשלה. אנא בדוק את הלוגים." cancel: + label: "ביטול" title: "בטל את הפעולה הנוכחית" confirm: "אתה בטוח שברצונך לבטל את הפעולה הנוכחית?" backup: + label: "גבה" title: "צור גיבוי" confirm: "האם תרצו להתחיל גיבוי חדש?" without_uploads: "כן (ללא הכללת קבצים)" download: + label: "הורד" title: "הורד את הגיבוי" destroy: title: "הסר את הגיבוי" confirm: "אתה בטוח שברצונך להשמיד את הגיבוי הזה?" restore: is_disabled: "שחזור אינו מאופשר לפי הגדרות האתר." + label: "שחזר" title: "שחזר את הגיבוי" confirm: "אתה בטוח שברצונך לשחזר את הגיבוי הזה?" rollback: diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 3858975407..dd4c18d008 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -742,6 +742,8 @@ it: moved_post: "{{username}} ha spostato {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "Guadagnato '{{description}}'
" + popup: + mentioned: '{{username}} ti ha menzionato in "{{topic}}" - {{site_title}}' upload_selector: title: "Aggiungi un'immagine" title_with_attachments: "Aggiungi un'immagine o un file" @@ -1335,12 +1337,21 @@ it: Questo argomento ha {count, plural, one {1 risposta} other {# risposte}} {ratio, select, low {con un alto rapporto "mi piace" / messaggi} med {con un altissimo rapporto "mi piace" / messaggi} high {con un estremamente alto rapporto "mi piace" / messaggi} other {}} original_post: "Messaggio Originale" views: "Visualizzazioni" + views_lowercase: + one: "vista" + other: "viste" replies: "Risposte" views_long: "questo argomento è stato visualizzato {{number}} volte" activity: "Attività" likes: "Mi piace" + likes_lowercase: + one: "mi piace" + other: "mi piace" likes_long: "ci sono {{number}} \"Mi piace\" in questo argomento" users: "Utenti" + users_lowercase: + one: "utente" + other: "utenti" category_title: "Categoria" history: "Storia" changed_by: "da {{author}}" @@ -1401,6 +1412,17 @@ it: top: title: "Di Punta" help: "gli argomenti più attivi nell'ultimo anno, mese, settimana o giorno" + all: + title: "Tutti" + yearly: + title: "Annuale" + monthly: + title: "Mensile" + weekly: + title: "Settimanale" + daily: + title: "Giornaliero" + all_time: "Tutti" this_year: "Quest'anno" this_month: "Questo mese" this_week: "Questa settimana" @@ -1624,6 +1646,7 @@ it: confirm: "Sicuro di voler ripristinare una precedente versione funzionante del database?" export_csv: user_archive_confirm: "Sei sicuro di voler scaricare i tuoi messaggi?" + success: "Esportazione iniziata, verrai avvertito con un messaggio al termine del processo." failed: "Esportazione fallita. Controlla i log." rate_limit_error: "I messaggi possono essere scaricati una volta al giorno, prova ancora domani." button_text: "Esporta" diff --git a/config/locales/client.ja.yml b/config/locales/client.ja.yml index 521aa3c527..bd85b52b8a 100644 --- a/config/locales/client.ja.yml +++ b/config/locales/client.ja.yml @@ -191,7 +191,7 @@ ja: confirm: "変更を保存" approval: title: "この投稿は承認が必要" - description: "投稿された新規のポストは受付されましたがモデレイターによる承認が必要です。もう少々お待ち下さい。" + description: "投稿された新規のポストは受付されましたがモデレーターによる承認が必要です。もう少々お待ち下さい。" ok: "実行" user_action: user_posted_topic: "{{user}} が トピック を作成" @@ -834,10 +834,10 @@ ja: notifications: reasons: '3_6': 'このカテゴリを参加中のため通知されます' - '3_5': 'このトピックを参加中のため通知されます' - '3_2': 'このトピックを参加中のため通知されます。' + '3_5': 'このトピックに参加中のため通知されます' + '3_2': 'このトピックに参加中のため通知されます。' '3_1': 'このトピックを作成したため通知されます。' - '3': 'このトピックを参加中のため通知されます。' + '3': 'このトピックに参加中のため通知されます。' '2_8': 'このカテゴリをトラック中のため通知されます。' '2_4': 'このトピックに回答したため通知されます。' '2_2': 'このトピックをトラック中のため通知されます。' @@ -849,11 +849,13 @@ ja: '0': 'このトピックに関して一切通知を受けません。' watching_pm: title: "参加中" + description: "このメッセージに対して新しい投稿があった場合、登録されたメールアドレスと、コミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" watching: title: "参加中" description: "このトピックに対して新しい投稿があった場合、登録されたメールアドレスと、NVコミュニティ内の通知ボックスに通知が届き、トピック一覧に新しい投稿数がつきます。" tracking_pm: title: "トラック中" + description: "未読件数と新しい投稿がメッセージの横に表示されます。他ユーザから@ユーザ名でタグ付けされた場合、またはあなたの投稿に回答がついた場合に通知されます。" tracking: title: "トラック中" description: "未読件数と新しい投稿がプライベートメッセージされます。他ユーザーからタグ付けをされた場合、またはあなたの投稿に回答が付いた場合に通知されます" @@ -864,6 +866,7 @@ ja: title: "通常" muted_pm: title: "ミュートされました" + description: "このメッセージについての通知を受け取りません。" muted: title: "ミュート" description: "このトピックについての通知を受け取りません。また、未読タブにも通知されません。" @@ -873,6 +876,7 @@ ja: open: "トピックを開く" close: "トピックを終了する" multi_select: "投稿の選択。。。" + auto_close: "自動終了する。。。" pin: "トピックをピンで留める。。。" unpin: "トピックのピンを取り除く。。。" unarchive: "トピックのアーカイブ解除" @@ -1029,8 +1033,8 @@ ja: yes_value: "はい、回答も一緒に削除する" no_value: "いいえ、ポストのみ削除する" admin: "ポスト管理" - wiki: "ウィキーポストにする" - unwiki: "ウィキーポストから外す" + wiki: "wikiポストにする" + unwiki: "wikiポストから外す" convert_to_moderator: "スタッフ色を追加" revert_to_regular: "スタッフ色を削除" rebake: "HTML再建築" @@ -1237,7 +1241,7 @@ ja: help: "このトピックはピン留めされていません。 既定の順番に表示されます。" pinned_globally: title: "全サイト的にピン留めされました" - help: "このトピックは全サイト的にピン留めされました；全てのリストのトップに表示されます。" + help: "このトピックは全サイト的にピン留めされました。全てのリストのトップに表示されます。" pinned: title: "ピン留め" help: "このトピックはピン留めされています。常にカテゴリのトップに表示されます" @@ -1374,6 +1378,7 @@ ja: admins: '管理者:' blocked: 'ブロック中:' suspended: '停止中:' + private_messages_short: "メッセージ" private_messages_title: "メッセージ" space_free: "{{size}} free" uploads: "アップロード" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index 278d9881c1..45a7e71c86 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -185,8 +185,14 @@ ko: edit: "편집" cancel: "취소" view_pending: "대기중인 포스트" + has_pending_posts: + one: "이 토픽은 1개의 승인 대기중인 게시글이 있습니다." + many: "이 토픽은 {{count}}개의 승인 대기중인 게시글이 있습니다." confirm: "변경사항 저장" approval: + title: "게시글 승인 필요" + pending_posts: + other: "{{count}}개 미결 게시글이 있습니다." ok: "OK" user_action: user_posted_topic: "{{user}}가 게시한 토픽" @@ -420,6 +426,7 @@ ko: every_three_days: "매 3일마다" weekly: "매주" every_two_weeks: "격주" + email_direct: "누군가 나를 인용했을 때, 내 글에 답글을 달았을때, 내 이름을 언급했을때 혹은 토픽에 나를 초대했을 떄 이메일 보내기" email_always: "싸이트에 방문 중 일 때 이메일 알림을 보내지 마세요." other_settings: "추가 사항" categories_settings: "카테고리" @@ -580,6 +587,7 @@ ko: requires_invite: "죄송합니다. 초대를 받은 사람만 이용하실 수 있습니다." not_activated: "당신은 아직 로그인 할 수 없습니다. 계정을 만들었을때 {{sentTo}} 주소로 인증 이메일을 보냈습니다. 계정을 활성화하려면 해당 이메일의 지침을 따르십시오." not_allowed_from_ip_address: "이 IP 주소에서 로그인 할 수 없습니다." + admin_not_allowed_from_ip_address: "You can't log in as admin from that IP address." resend_activation_email: "다시 인증 이메일을 보내려면 여기를 클릭하세요." sent_activation_email_again: " {{currentEmail}} 주소로 인증 이메일을 보냈습니다. 이메일이 도착하기까지 몇 분 정도 걸릴 수 있습니다. 또한 스팸 메일을 확인하십시오." google: @@ -675,9 +683,11 @@ ko: units: "(# 시간)" examples: '시간에 해당하는 숫자를 입력하세요. (24)' notifications: + title: "@name 언급, 게시글과 토픽에 대한 답글, 개인 메시지 등에 대한 알림" none: "현재 알림을 불러올 수 없습니다." more: "이전 알림을 볼 수 있습니다." total_flagged: "관심 표시된 총 게시글" + mentioned: "{{username}} {{description}}
" quoted: "{{username}} {{description}}
" replied: "{{username}} {{description}}
" posted: "{{username}} {{description}}
" @@ -689,6 +699,11 @@ ko: moved_post: "{{username}} moved {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "'{{description}}' 뱃지를 받았습니다.
" + popup: + mentioned: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 언급했습니다' + quoted: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신을 인용했습니다' + replied: '"{{topic}}" - {{site_title}}에서 {{username}} 님이 당신에게 답글을 달았습니다' + posted: '"{{topic}}" - {{site_title}}에서 {{username}}님이 글을 게시하였습니다' upload_selector: title: "이미지 추가하기" title_with_attachments: "이미지 또는 파일 추가하기" @@ -711,6 +726,7 @@ ko: user: "@{{username}}의 글 검색" category: "\"{{category}}\" 카테고리 검색" topic: "이 토픽을 검색" + private_messages: "메시지 검색" site_map: "다른 토픽이나 카테고리로 이동" go_back: '돌아가기' not_logged_in_user: 'user page with summary of current activity and preferences' @@ -730,6 +746,7 @@ ko: close_topics: "토픽 닫기" archive_topics: "토픽 보관하기" notification_level: "알림 설정 변경" + choose_new_category: "토픽의 새로운 카테고리를 선택" selected: other: "{{count}}개의 토픽이 선택되었습니다." none: @@ -742,6 +759,7 @@ ko: bookmarks: "아직 북마크한 토픽이 없습니다." category: "{{category}}에 토픽이 없습니다." top: "Top 토픽이 없습니다." + search: "검색 결과가 없습니다." educate: new: '새로운 토픽은 여기에서 볼 수 있습니다.
기본 설정으로 2일 이내에 생성된 토픽은 새로운 것으로 간주되며 new 표시가 나타납니다.
환경설정에서 설정을 변경 할 수 있습니다.
' unread: '읽지 않은 토픽은 여기에서 볼 수 있습니다.
기본 설정으로 다음과 같은 경우 토픽은 읽지 않은 것으로 간주되며 읽지 않은 개수 1 가 표시됩니다.
- 토픽을 만든 경우
- 토픽에 리플을 단 경우
- 토픽을 4분 이상 읽은 경우
또는 각 토픽 아래에 있는 알림 설정에서 해당 토픽을 추적하거나 지켜보도록 설정한 경우
환경설정에서 설정을 변경 할 수 있습니다.
' @@ -755,6 +773,7 @@ ko: category: "더 이상 {{category}}에 토픽이 없습니다" top: "더 이상 인기 토픽이 없습니다." bookmarks: "더이상 북마크한 토픽이 없습니다." + search: "더이상 검색 결과가 없습니다." topic: filter_to: "이 토픽에서 {{username}}님의 {{post_count}}건의 게시물만 보기" create: '새 토픽 만들기' @@ -904,6 +923,7 @@ ko: automatically_add_to_groups_optional: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (선택, 관리자만 가능)" automatically_add_to_groups_required: "이 초대는 다음 그룹에 대한 접근 권한을 포함합니다: (필수, 관리자만 가능)" invite_private: + title: '초대 메시지' email_or_username: "초대하려는 이메일 또는 아이디" email_or_username_placeholder: "이메일 또는 아이디" action: "초대" @@ -1384,6 +1404,7 @@ ko: agree_title: "이 신고가 올바르고 타당한지 확인하세요." agree_flag_modal_title: "동의 및 ..." agree_flag_hide_post: "동의 (포스트 숨기기 + 개인 메시지 보내기)" + agree_flag_hide_post_title: "Hide this post and automatically send the user a message urging them to edit it" agree_flag_restore_post: "동의하기(게시글 복원)" agree_flag_restore_post_title: "게시글을 복원하기" agree_flag: "신고에 동의함" @@ -1450,9 +1471,12 @@ ko: name: "이름" add: "추가" add_members: "사용자 추가하기" + custom: "Custom" automatic: "자동화" automatic_membership_email_domains: "이 목록의 있는 항목과 사용자들이 등록한 이메일 도메인이 일치할때 이 그룹에 포함" automatic_membership_retroactive: "이미 등록된 사용자에게 같은 이메일 도메인 규칙 적용하기" + default_title: "Default title for all users in this group" + primary_group: "Automatically set as primary group" api: generate_master: "마스터 API 키 생성" none: "지금 활성화된 API 키가 없습니다." @@ -1529,6 +1553,7 @@ ko: confirm: "정말로 이전 작업 상태로 데이터베이스를 롤백하시겠습니까?" export_csv: user_archive_confirm: "정말로 당신의 포스트를 다운로드 하시겠습니까?" + success: "Export initiated, you will be notified via message when the process is complete." failed: "내보내기가 실패했습니다. 로그를 확인해주세요" rate_limit_error: "글은 하루에 한번 다운로드 받을 수 있습니다. 내일 다시 시도해주십시요." button_text: "내보니기" @@ -1701,6 +1726,7 @@ ko: delete_topic: "토픽 삭제" delete_post: "게시글 삭제" impersonate: "대역" + anonymize_user: "anonymize user" screened_emails: title: "블락된 이메일들" description: "누군가가 새로운 계정을 만들면 아래 이메일 주소는 체크되고 등록은 블락됩니다, 또는 다른 조치가 취해집니다." @@ -1718,6 +1744,7 @@ ko: delete_confirm: "%{ip_address}를 규칙에 의해 삭제할까요?" roll_up_confirm: "화면에 표시되는 IP 주소를 subnet으로 바꾸시겠습니까?" rolled_up_some_subnets: "다음의 subnet들의 IP 주소들을 차단하였습니다: %{subnets}." + rolled_up_no_subnet: "There was nothing to roll up." actions: block: "블락" do_nothing: "허용" @@ -1727,6 +1754,9 @@ ko: ip_address: "IP 주소" add: "추가" filter: "검색" + roll_up: + text: "Roll up" + title: "Creates new subnet ban entries if there are at least 'min_ban_entries_for_roll_up' entries." logster: title: "에러 로그" impersonate: @@ -1747,6 +1777,7 @@ ko: staff: '스태프' suspended: '접근 금지 사용자' blocked: '블락된 사용자' + suspect: 'Suspect' approved: "승인?" approved_selected: other: "승인한 사용자 ({{count}}명)" @@ -1766,6 +1797,7 @@ ko: moderators: '운영자' blocked: '블락된 사용자들' suspended: '접근 금지된 사용자들' + suspect: 'Suspect Users' reject_successful: other: "성공적으로 ${count}명의 사용자를 거절하였습니다." reject_failures: @@ -1824,8 +1856,13 @@ ko: approve_success: "인증 이메일이 발송되었습니다." approve_bulk_success: "성공! 모든 선택된 사용자는 인증되었고 통보되었습니다." time_read: "읽은 시간" + anonymize: "익명 사용자" + anonymize_confirm: "Are you SURE you want to anonymize this account? This will change the username and email, and reset all profile information." + anonymize_yes: "Yes, anonymize this account" + anonymize_failed: "There was a problem anonymizing the account." delete: "사용자 삭제" delete_forbidden_because_staff: "관리자 및 운영자 계정은 삭제할 수 없습니다." + delete_posts_forbidden_because_staff: "Can't delete all posts of admins and moderators." delete_forbidden: other: "사용자가 작성한 글이 있으면 사용자를 삭제 할 수 없습니다. 사용자를 삭제 하기 전에 사용자가 작성한 글을 모두 삭제해야 합니다. (%{count}일 이전에 작성한 글은 삭제할 수 없습니다.)" cant_delete_all_posts: @@ -1850,6 +1887,8 @@ ko: suspended_explanation: "접근 금지된 유저는 로그인 할 수 없습니다." block_explanation: "블락 사용자는 게시글을 작성하거나 토픽을 작성할 수 없습니다." trust_level_change_failed: "신뢰도 변경에 문제가 있습니다." + grant_admin_failed: "There was a problem granting admin privileges." + grant_moderation_failed: "There was a problem granting moderation privileges." suspend_modal_title: "Suspend User" trust_level_2_users: "신뢰도 2 사용자들" trust_level_3_requirements: "사용자 신뢰도 3 이상이 필요" @@ -1963,11 +2002,13 @@ ko: modal_title: 뱃지 그룹으로 나누기 granted_by: 배지 부여자 granted_at: 배지 수여일 + reason_help: ( 토픽이나 게시글 링크) save: 저장 delete: 삭제 delete_confirm: 정말로 이 뱃지를 삭제하시겠습니까? revoke: 회수 reason: 원인 + expand: 확장 … revoke_confirm: 정말로 이 뱃지를 회수하시겠습니까? edit_badges: 뱃지 수정 grant_badge: 뱃지 부여 @@ -2015,6 +2056,7 @@ ko: with_time: %{username} at %{time} emoji: title: "Emoji" + help: "모든 사용자가 사용가능한 새로운 이미지를 추가. (프로 팁: 여러개의 파일을 드래그 & 드롭으로 한번에)" add: "새로운 Emoji 추가" name: "이름" image: "이미지" @@ -2053,6 +2095,7 @@ ko: dismiss_topics: 'x, t 토픽 무시하기' actions: title: 'Actions' + bookmark_topic: 'f 토글 북마크 토픽' pin_unpin_topic: 'shift+p 핀고정/핀해제' share_topic: 'shift+s 토픽 공유' share_post: 's 게시글 공유' @@ -2071,6 +2114,8 @@ ko: mark_watching: 'm, w 토픽 알람 : 주시하기' badges: title: 뱃지 + allow_title: "can be used as a title" + multiple_grant: "can be awarded multiple times" badge_count: other: "뱃지 %{count}개" more_badges: @@ -2114,6 +2159,7 @@ ko: description: 사용자의 프로필 정보를 작성함 anniversary: name: 기념일 + description: Active member for a year, posted at least once nice_post: name: 괜찮은 글 description: 작성한 글이 좋아요를 10개 받았습니다. 이 뱃지는 중복 수여 가능합니다. diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index d784343011..a25fc0d560 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -91,7 +91,7 @@ nb_NO: google+: 'del denne lenken på Google+' email: 'del denne lenken i en e-post' topic_admin_menu: "admin-handlinger for emne" - emails_are_disabled: "All outgunned email har blitt deaktivert globalt av en administrator. Ingen email varslinger vil bli sent. " + emails_are_disabled: "All utgående e-post har blitt deaktivert globalt av en administrator. Ingen e-postvarslinger vil bli sendt." edit: 'rediger tittelen og kategorien til dette emnet' not_implemented: "Den funksjonen har ikke blitt implementert ennå, beklager!" no_value: "Nei" @@ -389,11 +389,11 @@ nb_NO: email: title: "E-post" instructions: "Blir aldri vist offentlig" - ok: "Vi sender deg en email for å bekrefte" - invalid: "Vennligst gi en gyldig email-addresse" - authenticated: "Din email har blitt autentisert av {{provider}}" + ok: "Vi sender deg en e-post for å bekrefte" + invalid: "Vennligst oppgi en gyldig e-postadresse" + authenticated: "Din e-post har blitt autentisert av {{provider}}" frequency: - zero: "Vi sender deg straks en email hvis du ikke har lest tingen vi sendte deg en email om." + zero: "Vi sender deg straks en e-post hvis du ikke har lest saken vi sendte deg en e-post om." one: "Du får bare e-post hvis du ikke er blitt sett det siste minuttet." other: "Du får bare e-post hvis du ikke har blitt sett de siste {{count}} minuttene." name: @@ -407,14 +407,14 @@ nb_NO: instructions: "Unikt, kort og uten mellomrom." short_instructions: "Folk kan nevne deg som @{{username}}." available: "Ditt brukernavn er tilgjengelig." - global_match: "Email stemmer med det registrerte brukernavnet" + global_match: "E-post stemmer med det registrerte brukernavnet" global_mismatch: "Allerede registrert. Prøv {{suggestion}}?" not_available: "Ikke tilgjengelig. Prøv {{suggestion}}?" too_short: "Ditt brukernavn er for kort." too_long: "Ditt brukernavn er for langt." checking: "Sjekker brukernavnets tilgjengelighet..." - enter_email: 'Brukernavn funnet; oppgi samsvarende email' - prefilled: "Email stemmer med dette registrerte brukernavnet" + enter_email: 'Brukernavn funnet; oppgi samsvarende e-post' + prefilled: "E-post stemmer med dette registrerte brukernavnet" locale: title: "Språk for grensesnitt" instructions: "Språk for grensesnitt. Endringen vil tre i kraft når du oppdaterer siden." @@ -437,8 +437,8 @@ nb_NO: every_three_days: "hver tredje dag" weekly: "ukentlig" every_two_weeks: "annenhver uke" - email_direct: "Motta en email når noen siterer deg, svarer på dine innlegg, nevner mitt brukernavn eller inviterer meg til et emne" - email_private_messages: "Motta en email når noen sender deg en melding" + 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." other_settings: "Annet" categories_settings: "Kategorier" @@ -572,7 +572,7 @@ nb_NO: created: 'Opprettet' created_lowercase: 'opprettet' trust_level: 'Tillitsnivå' - search_hint: 'brukernavn, email eller IP adresse' + search_hint: 'brukernavn, e-post eller IP-adresse' create_account: title: "Opprett ny konto" failed: "Noe gikk galt, kanskje denne e-postadressen allerede er registrert. Prøv lenke for glemt passord" @@ -582,7 +582,7 @@ nb_NO: invite: "Skriv inn ditt brukernavn eller din e-postadresse, så sender vi deg en e-post for å nullstille ditt passord." reset: "Nullstill passord" complete_username: "Hvis en konto med brukernavn %{username} finnes vil du motta en e-post om kort tid med instruksjoner om hvordan du kan nullstille passordet." - complete_email: "Hvis en konto med e-postadressen %{email} eksisterer i systemet vil du om kort tid motta en epost med instruksjoner om hvordan du kan nullstille passordet." + complete_email: "Hvis en konto med e-postadressen %{email} eksisterer i systemet vil du om kort tid motta en e-post med instruksjoner om hvordan du kan nullstille passordet." complete_username_found: "Vi fant en konto med brukernavn %{username}. Du mottar om litt en e-post med instruksjoner for hovrdan du nullstiller passordet." complete_email_found: "Vi fant en konto med e-postadressen %{email}. Du mottar om litt en e-post med instruksjoner for hvordan du nullstiller passordet." complete_username_not_found: "Ingen konto har med brukernavnet %{username} er registrert" @@ -715,6 +715,13 @@ nb_NO: moved_post: "{{username}} moved {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "Ble tildelt '{{description}}'
" + popup: + mentioned: '{{username}} nevnte deg i "{{topic}}" - {{site_title}}' + quoted: '{{username}} siterte deg i "{{topic}}" - {{site_title}}' + replied: '{{username}} svarte deg i "{{topic}}" - {{site_title}}' + posted: '{{username}} skrev i "{{topic}}" - {{site_title}}' + private_message: '{{username}} sendte deg en privat melding: "{{topic}}" - {{site_title}}' + linked: '{{username}} lenket til ditt innlegg i "{{topic}}" - {{site_title}}' upload_selector: title: "Legg til Bilde" title_with_attachments: "Legg til et bilde eller en fil" @@ -949,7 +956,7 @@ nb_NO: invite_reply: title: 'Inviter' to_forum: "Vi sender en kortfattet e-post som gjør det mulig for en venn å umiddelbart registreres ved å klikke på en lenke. Ingen innlogging er nødvendig." - email_placeholder: 'email' + email_placeholder: 'navn@example.com' login_reply: 'Logg Inn for å svare' filters: n_posts: @@ -1309,7 +1316,7 @@ nb_NO: history: "Historie" changed_by: "av {{author}}" raw_email: - title: "Rå Email" + title: "Rå e-post" not_available: "Ikke tilgjengelig!" categories_list: "Kategoriliste" filters: @@ -1675,7 +1682,7 @@ nb_NO: sent_test: "sendt!" delivery_method: "Leveringsmetode" preview_digest: "Forhåndsvis Oppsummering" - preview_digest_desc: "Forhåndsvis innholdet i den ukentlige sammendrags emailen sendt til innaktive melemer." + preview_digest_desc: "Forhåndsvis innholdet i det ukentlige e-postsammendraget sendt til inaktive medlemmer." refresh: "Refresh" format: "Format" html: "html" @@ -1741,7 +1748,7 @@ nb_NO: impersonate: "overta brukerkonto" anonymize_user: "anonymiser bruker" screened_emails: - title: "Kontrollerte Emails" + title: "Kontrollerte e-poster" description: "Når noen forsøker å lage en ny konto, vil de følgende e-postadressene bli sjekket, og registreringen vil bli blokkert, eller en annen handling vil bli utført." email: "E-postadresse" actions: @@ -1781,7 +1788,7 @@ nb_NO: not_found: "Beklager, det brukernavner eksisterer ikke i systemet vårt." id_not_found: "Beklager, denne brukerID eksisterer ikke i vårt system." active: "Aktiv" - show_emails: "Vis email" + show_emails: "Vis e-poster" nav: new: "Ny" active: "Aktiv" diff --git a/config/locales/client.pl_PL.yml b/config/locales/client.pl_PL.yml index 2b7259a72b..cd1165f031 100644 --- a/config/locales/client.pl_PL.yml +++ b/config/locales/client.pl_PL.yml @@ -1427,11 +1427,11 @@ pl_PL: posts_lowercase: "wpisy" posts_long: "jest {{number}} wpisów w tym temacie" original_post: "Oryginalny wpis" - views: "Wyświetlenia" + views: "Odsłony" views_lowercase: - one: "wyświetlenie" - few: "wyświetlenia" - other: "wyświetleń" + one: "odsłona" + few: "odsłony" + other: "odsłon" replies: "Odpowiedzi" views_long: "ten temat był oglądany {number}} razy" activity: "Aktywność" diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index fea206e6e7..bd4a03541c 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -728,6 +728,7 @@ ru: title_placeholder: "Название: суть обсуждения коротким предложением" edit_reason_placeholder: "почему вы хотите изменить?" show_edit_reason: "(добавить причину редактирования)" + reply_placeholder: "Для форматирования текста используйте Markdown и BBCode. Перетяните или вставьте изображение, чтобы загрузить его на сервер." view_new_post: "Посмотреть созданное вами сообщение." saving: "Сохранение..." saved: "Сохранено!" diff --git a/config/locales/client.sq.yml b/config/locales/client.sq.yml index 5e98e979b4..0005beb267 100644 --- a/config/locales/client.sq.yml +++ b/config/locales/client.sq.yml @@ -418,13 +418,13 @@ sq: other: "We'll only email you if we haven't seen you in the last {{count}} minutes." name: title: "Emri" - instructions: "Your full name (optional)" + instructions: "Emri i Plotë (fakultativ)" instructions_required: "Emri i plotë" too_short: "Emri juaj është shumë i shkurtër" - ok: "Your name looks good" + ok: "Emri duket në rregull" username: title: "Pseudonimi" - instructions: "Unique, no spaces, short" + instructions: "Unik, pa hapësira, i shkurtër" short_instructions: "People can mention you as @{{username}}" available: "Emri është i disponueshëm" global_match: "Email matches the registered username" @@ -475,13 +475,13 @@ sq: auto_track_topics: "Automatically track topics I enter" auto_track_options: never: "asnjëherë" - immediately: "immediately" + immediately: "menjëherë" after_n_seconds: one: "pas 1 sekonde" other: "pas {{count}} sekonda" after_n_minutes: - one: "after 1 minute" - other: "after {{count}} minutes" + one: "pas 1 minute" + other: "pas {{count}} minutash" invited: search: "shkruaj për të kërkuar ftesat..." title: "Ftesa" @@ -512,7 +512,7 @@ sq: title: "Fjalëkalimi" too_short: "Fjalëkalimi është shumë i shkurër." common: "Ky fjalëkalim është shumë i përdorur." - same_as_username: "Your password is the same as your username." + same_as_username: "Fjalëkalimi është i njëjtë me pseudonimin." same_as_email: "Your password is the same as your email." ok: "Fjalëkalimi është i pranueshëm." instructions: "Të paktën %{count} karaktere." @@ -582,7 +582,7 @@ sq: deleted_filter: enabled_description: "This topic contains deleted posts, which have been hidden. " disabled_description: "Deleted posts in the topic are shown." - enable: "Hide Deleted Posts" + enable: "Fsheh Postimet e Eliminuara" disable: "Show Deleted Posts" private_message_info: title: "Mesazh" diff --git a/config/locales/client.tr_TR.yml b/config/locales/client.tr_TR.yml index 00c7a66778..47c6c8a835 100644 --- a/config/locales/client.tr_TR.yml +++ b/config/locales/client.tr_TR.yml @@ -533,7 +533,7 @@ tr_TR: last_post: Son gönderi last_reply_lowercase: son cevap replies_lowercase: - other: cevaplar + other: cevap summary: enabled_description: "Bu konunun özetini görüntülemektesiniz: topluluğun en çok ilgisini çeken gönderiler" description: "{{count}} sayıdacevap var." @@ -1283,7 +1283,7 @@ tr_TR: views: "Görüntüleme" views_lowercase: other: "görüntüleme" - replies: "Cevaplar" + replies: "Cevap" views_long: "bu konu {{number}} defa görüntülendi" activity: "Aktivite" likes: "Beğeni" @@ -1292,7 +1292,7 @@ tr_TR: likes_long: "bu konuda {{number}} beğeni var" users: "Kullanıcı" users_lowercase: - other: "kullanıcılar" + other: "kullanıcı" category_title: "Kategori" history: "Geçmiş" changed_by: "Yazan {{author}}" @@ -1368,7 +1368,7 @@ tr_TR: this_month: "Bu ay" this_week: "Bu hafta" today: "Bugün" - other_periods: "daha fazla popüler konuya bakın" + other_periods: "daha fazla konuya bak" browser_update: 'Malesef, tarayıcınız bu site için çok eski. Lütfen tarayıcınızı güncelleyin.' permission_types: full: "Oluştur / Cevapla / Bak" diff --git a/config/locales/client.uk.yml b/config/locales/client.uk.yml index 906b512e19..3dca5c8179 100644 --- a/config/locales/client.uk.yml +++ b/config/locales/client.uk.yml @@ -21,6 +21,7 @@ uk: mb: МБ tb: ТБ dates: + time: "HH:mm" tiny: half_a_minute: "< 1 хв" date_year: "MMM 'YY" @@ -141,6 +142,9 @@ uk: title: search: "Шукати тему за назвою, url або id:" placeholder: "введіть назву теми" + queue: + topic: "Тема:" + delete_user: 'Видалити користувача' user_action: user_posted_topic: "{{user}} написав(ла) тему" you_posted_topic: "Ви написали тему" @@ -1321,6 +1325,8 @@ uk: post_revision: "Коли користувач редагує або створює допис" trust_level_change: "Коли користувач змінює рівень довіри" user_change: "Коли користувач змінений або створений" + preview: + sample: "Зразок:" lightbox: download: "звантажити" keyboard_shortcuts_help: diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 1084c23d00..5110d4e742 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -308,6 +308,7 @@ zh_CN: dismiss_notifications: "标记所有为已读" dismiss_notifications_tooltip: "标记所有未读通知为已读" disable_jump_reply: "不要在回复后跳转到我的新帖子" + dynamic_favicon: "在浏览器图标上显示新/更新的主题数量" edit_history_public: "让其他用户查看我的帖子的以前版本" external_links_in_new_tab: "始终在新的标签页打开外部链接" enable_quoting: "在高亮选择文字时启用引用回复" @@ -528,6 +529,7 @@ zh_CN: read_only_mode: enabled: "只读模式已启用。你可以继续浏览这个站点但是无法进行交互操作。" login_disabled: "只读模式下不允许登录。" + too_few_topics_notice: "创建至少 5 个公共主题和 %{posts} 公开的回复活跃论坛。新用户无法在无内容可读的情况下提高用户等级。这个消息只显示给职员。" learn_more: "了解更多..." year: '年' year_desc: '365 天以前创建的主题' @@ -711,6 +713,13 @@ zh_CN: moved_post: "{{username}} 移动了 {{description}}
" linked: "{{username}} {{description}}
" granted_badge: "获得“{{description}}”
" + popup: + mentioned: '{{username}}在“{{topic}}”提到了你 - {{site_title}}' + quoted: '{{username}}在“{{topic}}”引用了你的帖子 - {{site_title}}' + replied: '{{username}}在“{{topic}}”回复了你 - {{site_title}}' + posted: '{{username}}在“{{topic}}”中发布了帖子 - {{site_title}}' + private_message: '{{username}}在“{{topic}}”中给你发送了一个消息 - {{site_title}}' + linked: '{{username}}在“{{topic}}”中链接了你的帖子 - {{site_title}}' upload_selector: title: "插入图片" title_with_attachments: "上传图片或文件" @@ -768,7 +777,7 @@ zh_CN: top: "没有最佳主题。" search: "没有搜索结果。" educate: - new: '你讲发表新的主题。
默认情况下，近两天创建的主题是近期主题，并会显示一个 新 的标识。
你可以在你的 设置中改变这一行为。
' + new: '近期的主题将在这里显示。
默认情况下，近两天创建的主题是近期主题，并会显示一个 新 的标识。
你可以在你的 设置中改变这一行为。
' unread: '这里是你的未读主题。
默认情况下，下述主题将被认为是未读的，并会显示未读数目： 1 如果你：
- 创建了该主题
- 回复了该主题
- 阅读该主题超过 4 分钟
或者你在主题底部的通知控制中选择了追踪或监视。
你可以改变你的用户设置.
' bottom: latest: "没有更多主题可看了。" diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index 659d8201ae..266051ca66 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -475,7 +475,7 @@ en: continue_button: "Continue to %{site_name}" welcome_to: "Welcome to %{site_name}!" approval_required: "A moderator must manually approve your new account before you can access this forum. You'll get an email when your account is approved!" - + missing_session: "We can not detect if your account was created, please ensure you have cookies enabled." post_action_types: off_topic: title: 'Off-Topic' diff --git a/config/locales/server.es.yml b/config/locales/server.es.yml index ca2bdb7ed8..ab55fd9058 100644 --- a/config/locales/server.es.yml +++ b/config/locales/server.es.yml @@ -377,6 +377,7 @@ es: one: "hace casi 1 año" other: "hace casi %{count} años" password_reset: + no_token: "Lo sentimos, el enlace de cambio de contraseña es demasiado antiguo. Inicia sesión de nuevo y selecciona 'Olvidé mi contraseña' para obtener un nuevo enlace." choose_new: "Por favor elige un nuevo password" choose: "Por favor, elige una contraseña" update: 'Actualizar contraseña' @@ -396,6 +397,7 @@ es: continue_button: "Continuar a %{site_name}" welcome_to: "Bienvenido a %{site_name}!" approval_required: "Un moderador debe aprobar manualmente tu nueva cuenta antes de que puedas acceder a este foro. ¡Recibirás un email cuando tu cuenta sea aprobada!" + missing_session: "No hemos podido detectar si tu cuenta fue creada. Por favor, asegúrate de tener activadas las cookies en tu navegador." post_action_types: off_topic: title: 'Off-Topic' @@ -722,6 +724,7 @@ es: 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." 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" ga_domain_name: "El nombre de dominio especificado en Google Analytics (ga.js). Ejemplo: misitio.com; ver en http://google.com/analytics" ga_universal_tracking_code: "Código de seguimiento de Google Universal Analytics (analytics.js), ejemplo: UA-12345678-9; visita http://google.com/analytics" @@ -970,6 +973,7 @@ es: show_create_topics_notice: "Si el sitio tiene menos de 5 temas abiertos al público, mostrar un aviso pidiendo a los administradores crear más temas." vacuum_db_days: "Correr VACUUM FULL ANALYZE para reclamar espacio en la base de datos después de las migraciones. (Poner en 0 para inhabilitar)" prevent_anons_from_downloading_files: "Impedir que los usuarios anónimos descarguen archivos. ADVERTENCIA: Esto impedirá que funcione cualquier recurso del sitio publicado como adjunto." + slug_generation_method: "Elegir un método de generación de slug. 'encoded' generará cadenas con código porciento. 'none' hara que no se genere slug." enable_emoji: "Habilitar emoji" emoji_set: "¿De qué tipo os gustan los emoji?" enforce_square_emoji: "Forzar una relación de aspecto cuadrada para todos los emojis." @@ -1122,6 +1126,13 @@ es: text_body_template: "%{invitee_name} te ha invitado a unirte a\n\n > **%{site_title}**\n\n > %{site_description}\n\n Si te interesa, haz clic en el siguiente enlace: \n\n %{invite_link}\n\nEsta invitación procede de un usuario de confianza, por lo que no necesitarás autenticarte.\n" invite_password_instructions: subject_template: "Asigna una contraseña para tu cuenta en %{site_name}" + text_body_template: | + Gracias por aceptar tu invitación a %{site_name} -- ¡te damos la bienvenida! + + Haz clic en el siguiente enlace para elegir una contraseña: + %{base_url}/users/password-reset/%{email_token} + + Si no recuerdas tu contraseña, o no tienes todavía, elige "Olvidé mi contraseña" cuando inicies sesión con tu dirección de email. test_mailer: subject_template: "[%{site_name}] Prueba de envío de email" text_body_template: | @@ -1220,6 +1231,20 @@ es: system_messages: post_hidden: subject_template: "Post oculto al haber sido reportado por la comunidad" + text_body_template: | + Hola, + + Este es un mensaje automático de %{site_name} para informarte que tu post se ha ocultado. + + %{base_url}%{url} + + %{flag_reason} + + Varios miembros de la comunidad reportaron este post antes de que fuera ocultado, por lo que por favor, considera cómo podrías revisarlo y reflejar su feedback. **Puedes editar tu post antes de %{edit_delay} minutos, y se mostrará de nuevo automáticamente.** + + 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: | Este mensaje privado tiene algunos trucos rápidos para que puedas comenzar. ## Sigue deslizando No hay botones de página siguiente o números de página – para leer más, **¡simplemente sigue deslizando hacia abajo!** Mientras llegan nuevos temas, estos aparecerán automáticamente. ## ¿Dónde estoy? - Para buscar, tu página de usuario o el menú, usa los botones **icon ☰ en la parte superior derecha**. - Cualquier título de tema te llevará al siguiente mensaje no leído. Usa la hora de última actividad y la cuenta de mensaje para ir al principio o al final. - Mientras estás leyendo un tema, salta al inicio ↑ seleccionando el título del tema. Selecciona la barra de progreso verde en la parte inferior derecha para los controles completos de navegación o usa las teclas home "Inicio" y end; "Fin";.
## ¿Cómo respondo? - Para responder al mensaje general, usa el botón de Respuesta 
al final de la página. - Para responder a un mensaje en particular, usa el botón Respuesta 
en ese mensaje. - Para llevar la conversación en una dirección distinta, pero manteniendo un enlace, usa 
Responde como Tema enlazado a la derecha del mensaje. - Para citar a alguien en tu respuesta, selecciona el texto que quieras citar y presiona cualquier de los botones de Respuesta. 
Para dar un toque a alguien en tu respuesta, menciona su nombre. Escribe `@` y un cuadro de autocompletado aparecerá. 
Para [Emoji comunes](http://www.emoji.codes/), simplemente comienza escribiendo `:` o los tradicionales smileys `:)` :smile: ## ¿Qué más puedo hacer? Hay botones de acción al final de cada mensaje. 
Para hacer saber a cualquiera que te agradó su mensaje, usa el botón **me gusta**. Si tienes algún problema con un mensaje, házselo saber privadamente al autor o bien a nuestro equipo usando el botón **reportar**. También puedes **compartir** el enlace a un mensaje o añadirlo a **favoritos** para referencia futura en tu página de usuario. ## ¿Quién me está hablando? Cuando alguien responde a tu mensaje, cita tu mensaje o menciona tu `@nombre_de_usuario`, un número aparecerá de forma inmediata en la parte superior derecha de la página. Úsalo para acceder a tus **notificaciones**. 
No te preocupes si te pierdes una respuesta – se te enviará un correo electrónico con las respuestas directas (y mensajes privados) si no estas conectado cuando te lleguen. ## ¿Cuándo son nuevas las conversaciones? Por defecto todas las conversaciones con menos de dos días de antigüedad son consideradas nuevas, y cualquier conversación en la que hayas participado (respondido, creado o leído por un periodo extenso de tiempo) serán automáticamente monitorizadas. Verás indicadores azules y de números al lado de estos temas: 
Puedes cambiar el estado individual de notificación de cada tema a través del control al final del tema (también puede ajustarse por categoría). Para cambiar la forma en que monitorizas los temas, o definir una nueva, echa un vistazo a tus [preferencias de usuario](%{base_url}/my/preferences). ## ¿Por qué no puedo hacer ciertas cosas? Los nuevos usuarios están de alguna forma limitados por razones de seguridad. Conforme vayas participando, irá ganando la confianza de la comunidad, te convertirás en un ciudadano de pleno derecho y estas limitaciones se te quitarán automáticamente. Con un [nivel de confianza](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924) suficientemente alto, incluso ganarás acceso a más habilidades para ayudarnos a administrar nuestra comunidad juntos.
diff --git a/config/locales/server.fa_IR.yml b/config/locales/server.fa_IR.yml
index 4aacbe1000..3594493ee4 100644
--- a/config/locales/server.fa_IR.yml
+++ b/config/locales/server.fa_IR.yml
@@ -343,6 +343,7 @@ fa_IR:
almost_x_years:
other: "حداقل %{count} سال قبل"
password_reset:
+ no_token: "Sorry, that password change link is too old. Log in again and select 'I forgot my password' to get a new link."
choose_new: "لطفا یک رمز عبور جدید وارد کنید"
choose: "لطفا یک رمز عبور وارد کنید"
update: 'بهروز کردن گذرواژه'
@@ -362,6 +363,7 @@ fa_IR:
continue_button: "برو به %{site_name}"
welcome_to: "به %{site_name} خوش آمدید!"
approval_required: "مدیر باید حساب کاربری را بصورت دستی تایید کند برای دسترسی به این انجمن. شما ایمیلی مبنی به تایید حساب کاربریتان دریافت می کنید. "
+ missing_session: "We can not detect if your account was created, please ensure you have cookies enabled."
post_action_types:
off_topic:
title: 'جستار های قدیمی'
@@ -689,6 +691,7 @@ fa_IR:
flag_sockpuppets: "اگر کاربری به جستاری با ای پی برابر با کاربری که نوشته را شروع کرده ٬ آنها را به عنوان هرزنامه پرچم گزاری کن."
traditional_markdown_linebreaks: "از linebreaks سنتی استفاده کن در مدلهای نشانه گزاری٬ چرا که نیاز به دو فضای انتهایی دارد برای linebreak."
post_undo_action_window_mins: "تعداد دقایقی که کاربران اجازه دارند اقدامی را که در نوشته انجام داده اند باز گردانند. (پسند٬ پرچم گزاری٬ چیزهای دیگر)."
+ 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) کد پیگری کد٬ eg: UA-12345678-9;این را ببین http://google.com/analytics"
ga_domain_name: "Google analytics (ga.js) اسم دامنه٬ eg: mysite.com; این را ببین http://google.com/analytics"
ga_universal_tracking_code: "Google Universal Analytics (analytics.js) کد پیگری کد٬ UA-12345678-9; این را ببین http://google.com/analytics"
@@ -937,6 +940,7 @@ fa_IR:
show_create_topics_notice: "اگر سایت کمتر از 5 جستار عمومی دارد٬ اطلاع بده به مدیران تا جستارهای بیشتری بسازند."
vacuum_db_days: " VACUUM FULL ANALYZE را اجرا کن برای پس گرفتن فضای DB بعد از مهاجرت کردن ( 0 برای غیر فعال کردن)"
prevent_anons_from_downloading_files: "جلوگیری از دانلود کردن فایل پیوست توسط افراد ناشناس. اخطار: این جلوگیری می کنه از هر سایت دارای بدون عکسی. "
+ slug_generation_method: "Choose a slug generation method. 'encoded' will generate percent encoding string. 'none' will disable slug at all."
enable_emoji: "فعالسازی ایموجی"
emoji_set: "میخواهید ایموجی شما چطور باشد؟"
enforce_square_emoji: "تحمیل نسبت ابعاد مربع به تمام شکلک ها emojis . "
@@ -1066,6 +1070,13 @@ fa_IR:
text_body_template: "%{invitee_name} شما را دعوت کرده تا عضو شوید \n\n> **%{site_title}**\n>> %{site_description}\n\nاگر علاقه مند هستید بر روی پیوند پیش رو کلیک کنید: \n\n%{invite_link}\n\nاین دعوتنامه از طرف یک کاربر قابل اعتماد است٬ پس شما نیازی به ورود ندارید. \n"
invite_password_instructions:
subject_template: "تنظیم رمز عبور برای حساب کاربری {site_name}%"
+ text_body_template: |
+ Thanks for accepting your invitation to %{site_name} -- welcome!
+
+ Click this link to choose a password now:
+ %{base_url}/users/password-reset/%{email_token}
+
+ If you don't remember your password, or don't have one yet, choose "I forgot my password" when logging in with your email address.
test_mailer:
subject_template: "[%{site_name}] ایمیل تست دهش"
text_body_template: |
@@ -1134,6 +1145,20 @@ fa_IR:
system_messages:
post_hidden:
subject_template: "پست مخفی شده بدلیل پرچم گزاری انجمن "
+ text_body_template: |
+ Hello,
+
+ This is an automated message from %{site_name} to inform you that your post was hidden.
+
+ %{base_url}%{url}
+
+ %{flag_reason}
+
+ Multiple community members flagged this post before it was hidden, so please consider how you might revise your post to reflect their feedback. **You can edit your post after %{edit_delay} minutes, and it will be automatically unhidden.**
+
+ However, if the post is hidden by the community a second time, it will remain hidden until handled by staff – and there may be further action, including the possible suspension of your account.
+
+ For additional guidance, please refer to our [community guidelines](%{base_url}/guidelines).
usage_tips:
text_body_template: "چند راهنمای کوتاه برای شروع کار: \n\n##همنیطور اسکرول کنید\n\nشماره صفحه یا کلیدی در صفحه وجود ندارد - برای خواندن بیشتر ٬ ** فقط همنیطور اسکرول کنید**! \n\nنوشته های جدید وقتی می آیند٬ بطور خودکار نمایش داده می شوند.\n\n## من کجا هستم ؟! \n\n- برای جستجو٬ صفحه کاربریت٬ یا منو از ** آیکون ☰ دکمه های بالا سمت راست استفاده کن**.\n\n-عنوان هر جستاری شما را به نوشته خوانده نشده ی بعدی می برد. از زمان آخرین فعالیتت و شمارنده نوشته ها برای وارد شدن به بالا یا پایین استفاده کن. \n\n-همزمان با خواندن جستار٬ بپرید به بالا یا uarr ; با انتخاب عنوان جستار. بار سبز رنگ در پایین سمت راست را انتخاب کنید برای کنترل تمام جابجایی ها. یا از خانه و پایانکلید استفاده کنید.\n\n![](\"/images/welcome/progress-bar.png\")
\n\n## چگونه پاسخ دهم ؟ \n\n- - برای پاسخ با تمام جستار ها از کلید پاسخ استفاده کن ![](\"/images/welcome/reply-topic.png\")
در پایین ترین قسمت صفحه. \n\n- برای پاسخ به یک نوشته خاص از کلید پاسخ استفاده کن ![](\"/images/welcome/reply-post.png\")
در همان نوشته.\n\n- برای بردن گفتگو در مسیری متفاوت ولی مرتبط بهم از این استفاده کنید٬ ![](\"/images/welcome/reply-as-linked-topic.png\")
پاسخ به عنوان جستار مرتبط در بالا سمت راست نوشته.\n\nبرای اشاره کردن به شخصی در پاسخ٬ متنی را که علاقه دارید انتخاب کنید و بعد کلید پاسخ را فشار دهید.\n\n![](\"/images/welcome/quote-reply.png\")
\n\nبرای پینگ شخصی در پاسخ از اسم آنها نام بربید. `@` را تایپ کنید و autocompleter (کامل کننده خودکار) بالا می آید.\n\n![](\"/images/welcome/username-completion.png\")
\n\nبرای [ Emoji استاندارد]٬ (http://www.emoji.codes/)٬ فقط تایپ کنید `:` یا از خنده های سنتی استفاده کنید `:)`\n\n## چه کارهای دیگری می توانم انجام دهم ؟ \n\nدکمه های فعالیت در پایین هر نوشته است. \n\n![](\"/images/welcome/like-link-flag-bookmark.png\")
\n\nبرای اطلاع دادن به دیگران از اینکه شما نوشته آنها لذت بردید از کلید **like** استفاده کنید.\
\ اگر در نوشته مشکلی را میبینید٬ بطور شخصی به آنها یا مدیران اطلاع دهید با کلید پرچم گزاری **flag**.\n\nهمچنین شما می توانید پیوند را در نوشته به **اشتراک** بگذارید٬ یا **نشانه گزاری** کنید برای مرجع بعد در صفحه کاربریتان. \n\n##چه کسی می تواند با من حرف بزند ؟ \n\nوقتی کسی به شما پاسخ داد در نوشته٬ نوشته شما را جایی ذکر کرد٬ یا کسی اسمی از شما برد `@username`, شماره ای به سرعت در بالای صفحه سمت راست نمایان می شود. استفاده کن برای دسترسی به **آگاه سازی ها**.\n\n![](\"/images/welcome/notification-panel.png\")
\n\nنگران نباش اگر پاسخ دادن را فراموش کردی - اگر آنلاین نیستی پاسخ ها در ایمیل یا (و پیام ها ) برایت می آید وقتی آن ها می رسند. \n\n##گفتگو ها چه وقت جدید هستند ؟ \n\nبطور معمول تمام گفتگوهایی با عمر کمتر از دو روز جدید محسوب می شوند٬ و هر گفتگویی که شما در آن شرکت دارید (پاسخ دادن٬ ساختن٬ یا خواندن برای مدت طولانی) بطور خودکار دنبال می شوند.\n\nشما یک آبی جدید و شاخص تعداد را در مقابل آنها می بینید: \n\n![](\"/images/welcome/topics-new-unread.png\")
\n\nشما می توانید تعداد آگهی سازها را در هر جستار تغییر دهید از طریق کنترل در پاییت جستار ( این می تواند در دسته تنظیم شود). برای تغییر دنبال کردن جستارها یا معنی جدید) نگاه کن به [تنظیمات کاربر](%{base_url}/my/preferences\n\n## چرا یک سری کارها خاص را نمی توانم انجام دهم ؟ \n\nکاربران جدید به تا حدودی محدودند به دلایل امنیتی. با بودنت در اینجا٬ تو اعتماد انجمن را بدست میاری و بعد شهروند اینجا می شی و اون محدودیت ها به مرور زمان بر داشته می شوند. در اندزه کافی [سطح اعتماد] ](https://meta.discourse.org/t/what-do-user-trust-levels-do/4924), شما اعتماد انجمن را بدست می آورید و قادر خواهید بود به ما کمک کنید تا با هم انجمن را مدیریت کنیم.\n"
diff --git a/config/locales/server.fi.yml b/config/locales/server.fi.yml
index cbcec30f1e..c1d00061ca 100644
--- a/config/locales/server.fi.yml
+++ b/config/locales/server.fi.yml
@@ -386,6 +386,7 @@ fi:
one: "lähes vuosi sitten"
other: "lähes %{count} vuotta sitten"
password_reset:
+ no_token: "Pahoittelut, tämä linkki salasanan vaihtamiseksi on liian vanha. Kirjaudu sisään uudestaan ja valitse 'Unohdin salasanani' saadaksesi uuden linkin"
choose_new: "Valitse uusi salasana"
choose: "Valitse salasana"
update: 'Päivitä salasana'
@@ -731,6 +732,7 @@ fi:
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."
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"
ga_domain_name: "Google analytics (ga.js) verkkotunnus, esim.: osoite.fi; katso http://google.com/analytics"
ga_universal_tracking_code: "Google Universal analytics (analytics.js) seurantakoodi, esim.: UA-12345678-9; katso http://google.com/analytics"
@@ -979,6 +981,7 @@ fi:
show_create_topics_notice: "Jos palstalla on vähemmän kuin 5 julkista ketjua, huomauta ylläpitäjiä ketjujen luonnista."
vacuum_db_days: "Aja VACUUM FULL ANALYZE vapauttaaksesi tilaa tietokantaan migraatioiden jälkeen (aseta 0 ottaaksesi pois käytöstä)"
prevent_anons_from_downloading_files: "Estä kirjautumattomia käyttäjiä lataamasta liitetiedostoja. VAROITUS: tämä estää viestin liitettyjen muiden tiedostojen, kuin kuvien käyttämisen sivustolla."
+ slug_generation_method: "Valitse polkulyhenteen luomisen metodi. 'encoded' käyttää prosenttikoodausta, 'none' poistaa polkulyhenteet käytöstä."
enable_emoji: "Ota emoji käyttöön"
emoji_set: "Minkälaisa emojia haluaisit käyttää?"
enforce_square_emoji: "Pakota neliö kuvasuhteeksi kaikille emojille."
@@ -1142,6 +1145,12 @@ fi:
Tämän kutsun lähetti luotettu käyttäjä, joten sinun ei tarvitse kirjautua sisään.
invite_password_instructions:
subject_template: "Aseta salasana %{site_name} -tunnuksellesi"
+ text_body_template: |
+ Kiitos kun hyväksyit kutsun sivustolle %{site_name} -- tervetuloa!
+
+ Klikkaa tätä linkkiä valitaksesi uuden salasanan nyt: %{base_url}/users/password-reset/%{email_token}
+
+ Jos et muista salasanaasi, tai et ole vielä asettanut sellaista, valitse "Unohdin salasanani" kirjautuessasi siään sähköpostiosoitteellasi.
test_mailer:
subject_template: "[%{site_name}] Sähköpostin toimitettavuustesti"
text_body_template: |
@@ -1243,6 +1252,20 @@ fi:
system_messages:
post_hidden:
subject_template: "Viesti on piilotettu liputuksen johdosta"
+ text_body_template: |
+ Hei,
+
+ Tämä automaattinen viesti on lähetetty sivustolta %{site_name} kertoaksemme sinulle, että kirjoittamasi viesti on piilotettu.
+
+ %{base_url}%{url}
+
+ %{flag_reason}
+
+ Usea sivuston jäsen on liputtanut tämän viestien ennen sen piilottamista, joten harkitse miten voisit muokata viestiäsi heidän antamansa palautteen pohjalta. **Voit muokata viestiäsi kun %{edit_delay} minuuttia on kulunut, jolloin viesti tulee taas näkyviin.**
+
+ 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 pikaohje, joiden avulla pääset alkuun.
diff --git a/config/locales/server.it.yml b/config/locales/server.it.yml
index 229bc9c622..3cdaf5449b 100644
--- a/config/locales/server.it.yml
+++ b/config/locales/server.it.yml
@@ -1396,8 +1396,43 @@ it:
search_help: "Suggerimenti
\n\n
- \n
- La ricerca nei titoli è prioritaria, perciò, in caso di dubbi, cerca per titolo \n
- I risultati migliori si ottengono sempre con parole uniche e non comuni \n
- Quando possibile, circoscrivi l'ambito della ricerca a una categoria, a un utente o a un argomento in particolare \n
Opzioni
\n\n
order:views | order:latest | |||
status:open | status:closed | status:archived | status:noreplies | status:singleuser |
category:foo | user:foo | |||
in:likes | in:posted | in:watching | in:tracking | in:private |
in:bookmarks | ||||
\narcobaleni category:parchi status:open order:latest ricercherà gli argomenti contenenti la parola \"arcobaleni\" nella categoria \"parchi\" che non siano chiusi o archiviati, ordinati secondo la data dell'ultimo messaggio.
| {{{avatarImg}}} {{username}} | -
|---|
| {{{quote}}} | -