FIX: Improve removing advanced filters

Prior:
Entering `test after:5` and then removing the 5 via the search text field would result in the UI not updating

After:
UI updates after half a second

Removing it from the UI, removes it from the search field immediately.

Change the regex to detect filter words. This now matches what happens in search.rb, which gives a lot more flexibility (such as iterating over multiple `in:` terms)

Return [] when searchTerm is empty

Move .trim() to this.set('searchTerm', searchTerm) so it doesn't run twice (which was very obvious when watching the search term field)

More refactoring to make this a bit less complex

Update code based on review comments

FEATURE: Add common `in:` options

Gemfile.lock

@@ -62,16 +62,16 @@ GEM
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
     builder (3.2.2)
-    bullet (5.0.0)
+    bullet (5.4.2)
       activesupport (>= 3.0.0)
-      uniform_notifier (~> 1.9.0)
+      uniform_notifier (~> 1.10.0)
-    byebug (8.2.1)
+    byebug (9.0.6)
     certified (1.0.0)
-    coderay (1.1.0)
+    coderay (1.1.1)
     concurrent-ruby (1.0.2)
     connection_pool (2.2.0)
     crass (1.0.2)
-    daemons (1.2.3)
+    daemons (1.2.4)
     debug_inspector (0.0.2)
     diff-lcs (1.2.5)
     discourse-qunit-rails (0.0.9)
@@ -96,7 +96,7 @@ GEM
     ember-source (1.12.2)
     erubis (2.7.0)
     eventmachine (1.2.0.1)
-    excon (0.45.4)
+    excon (0.53.0)
     execjs (2.7.0)
     exifr (1.2.4)
     fabrication (2.9.8)
@@ -164,7 +164,7 @@ GEM
     mini_portile2 (2.1.0)
     mini_racer (0.1.3)
       libv8 (~> 5.0)
-    minitest (5.9.0)
+    minitest (5.9.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     mock_redis (0.15.4)
@@ -175,9 +175,8 @@ GEM
     multipart-post (2.0.0)
     mustache (1.0.3)
     netrc (0.11.0)
-    nokogiri (1.6.8)
+    nokogiri (1.6.8.1)
       mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
     nokogumbo (1.4.7)
       nokogiri
     oauth (0.4.7)
@@ -226,9 +225,8 @@ GEM
       redis
       ruby-openid
     pg (0.18.4)
-    pkg-config (1.1.7)
     progress (3.1.1)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -236,7 +234,7 @@ GEM
       pry (>= 0.9.10, < 0.11.0)
     pry-rails (0.3.4)
       pry (>= 0.9.10)
-    puma (3.2.0)
+    puma (3.6.0)
     r2 (0.2.6)
     rack (1.6.4)
     rack-mini-profiler (0.10.1)
@@ -376,19 +374,19 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    stackprof (0.2.9)
+    stackprof (0.2.10)
-    thin (1.6.4)
+    thin (1.7.0)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
-      rack (~> 1.0)
+      rack (>= 1, < 3)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.2)
+    tilt (2.0.5)
-    timecop (0.8.0)
+    timecop (0.8.1)
     trollop (2.1.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (3.0.0)
+    uglifier (3.0.2)
       execjs (>= 0.3.0, < 3)
     unf (0.1.4)
       unf_ext
@@ -396,7 +394,7 @@ GEM
     unicorn (5.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.9.0)
+    uniform_notifier (1.10.0)
 
 PLATFORMS
   ruby
@@ -503,4 +501,4 @@ DEPENDENCIES
   unicorn
 
 BUNDLED WITH
-   1.12.5
+   1.13.4

app/assets/javascripts/discourse/components/search-advanced-options.js.es6

@@ -1,35 +1,40 @@
 import { observes } from 'ember-addons/ember-computed-decorators';
 
-const REGEXP_FILTER_PREFIXES   = /\s?(user:|@|category:|#|group:|badge:|tags?:|in:|status:|posts_count:|(before|after):)/ig;
+const REGEXP_BLOCKS            = /(([^" \t\n\x0B\f\r]+)?(("[^"]+")?))/g;
 
-const REGEXP_USERNAME_PREFIX   = /\s?(user:|@)/ig;
+const REGEXP_USERNAME_PREFIX   = /(user:|@)/ig;
-const REGEXP_CATEGORY_PREFIX   = /\s?(category:|#)/ig;
+const REGEXP_CATEGORY_PREFIX   = /(category:|#)/ig;
-const REGEXP_GROUP_PREFIX      = /\s?group:/ig;
+const REGEXP_GROUP_PREFIX      = /group:/ig;
-const REGEXP_BADGE_PREFIX      = /\s?badge:/ig;
+const REGEXP_BADGE_PREFIX      = /badge:/ig;
-const REGEXP_TAGS_PREFIX       = /\s?tags?:/ig;
+const REGEXP_TAGS_PREFIX       = /tags?:/ig;
-const REGEXP_IN_PREFIX         = /\s?in:/ig;
+const REGEXP_IN_PREFIX         = /in:/ig;
-const REGEXP_STATUS_PREFIX     = /\s?status:/ig;
+const REGEXP_STATUS_PREFIX     = /status:/ig;
-const REGEXP_POST_COUNT_PREFIX = /\s?posts_count:/ig;
+const REGEXP_POST_COUNT_PREFIX = /posts_count:/ig;
-const REGEXP_POST_TIME_PREFIX  = /\s?(before|after):/ig;
+const REGEXP_POST_TIME_PREFIX  = /(before|after):/ig;
 
-const REGEXP_CATEGORY_SLUG  = /\s?(\#[a-zA-Z0-9\-:]+)/ig;
+const REGEXP_IN_MATCH                 = /in:(posted|watching|tracking|bookmarks|first|pinned|unpinned)/ig;
-const REGEXP_CATEGORY_ID    = /\s?(category:[0-9]+)/ig;
+const REGEXP_SPECIAL_IN_LIKES_MATCH   = /in:likes/ig;
-const REGEXP_POST_TIME_WHEN = /(before|after)/ig;
+const REGEXP_SPECIAL_IN_PRIVATE_MATCH = /in:private/ig;
+const REGEXP_SPECIAL_IN_WIKI_MATCH    = /in:wiki/ig;
+
+const REGEXP_CATEGORY_SLUG            = /(\#[a-zA-Z0-9\-:]+)/ig;
+const REGEXP_CATEGORY_ID              = /(category:[0-9]+)/ig;
+const REGEXP_POST_TIME_WHEN           = /(before|after)/ig;
 
 export default Em.Component.extend({
   classNames: ['search-advanced-options'],
 
   inOptions: [
-    {name: I18n.t('search.advanced.filters.likes'),     value: "likes"},
+    //{name: I18n.t('search.advanced.filters.likes'),     value: "likes"},
     {name: I18n.t('search.advanced.filters.posted'),    value: "posted"},
     {name: I18n.t('search.advanced.filters.watching'),  value: "watching"},
     {name: I18n.t('search.advanced.filters.tracking'),  value: "tracking"},
-    {name: I18n.t('search.advanced.filters.private'),   value: "private"},
+    //{name: I18n.t('search.advanced.filters.private'),   value: "private"},
     {name: I18n.t('search.advanced.filters.bookmarks'), value: "bookmarks"},
     {name: I18n.t('search.advanced.filters.first'),     value: "first"},
     {name: I18n.t('search.advanced.filters.pinned'),    value: "pinned"},
     {name: I18n.t('search.advanced.filters.unpinned'),  value: "unpinned"},
-    {name: I18n.t('search.advanced.filters.wiki'),      value: "wiki"}
+    //{name: I18n.t('search.advanced.filters.wiki'),      value: "wiki"}
   ],
   statusOptions: [
     {name: I18n.t('search.advanced.statuses.open'),        value: "open"},
@@ -63,6 +68,13 @@ export default Em.Component.extend({
         badge: [],
         tags: [],
         in: '',
+        special: {
+          in: {
+            likes: false,
+            private: false,
+            wiki: false
+          }
+        },
         status: '',
         posts_count: '',
         time: {
@@ -74,107 +86,204 @@ export default Em.Component.extend({
   },
 
   _update() {
-    let searchTerm = this.get('searchTerm');
+    if (!this.get('searchTerm')) {
-
-    if (!searchTerm) {
       this._init();
       return;
     }
 
-    this.findUsername(searchTerm);
+    this.findSearchTerms();
-    this.findCategory(searchTerm);
+    this.setSearchedTermValue('searchedTerms.username', REGEXP_USERNAME_PREFIX);
-    this.findGroup(searchTerm);
+    this.setSearchedTermValueForCategory();
-    this.findBadge(searchTerm);
+    this.setSearchedTermValueForGroup();
-    this.findTags(searchTerm);
+    this.setSearchedTermValueForBadge();
-    this.findIn(searchTerm);
+    this.setSearchedTermValueForTags();
-    this.findStatus(searchTerm);
+    this.setSearchedTermValue('searchedTerms.in', REGEXP_IN_PREFIX, REGEXP_IN_MATCH);
-    this.findPostsCount(searchTerm);
+    this.setSearchedTermSpecialInValue('searchedTerms.special.in.likes', REGEXP_SPECIAL_IN_LIKES_MATCH);
-    this.findPostTime(searchTerm);
+    this.setSearchedTermSpecialInValue('searchedTerms.special.in.private', REGEXP_SPECIAL_IN_PRIVATE_MATCH);
+    this.setSearchedTermSpecialInValue('searchedTerms.special.in.wiki', REGEXP_SPECIAL_IN_WIKI_MATCH);
+    this.setSearchedTermValue('searchedTerms.status', REGEXP_STATUS_PREFIX);
+    this.setSearchedTermValueForPostTime();
+    this.setSearchedTermValue('searchedTerms.posts_count', REGEXP_POST_COUNT_PREFIX);
   },
 
-  findSearchTerm(EXPRESSION, searchTerm) {
+  findSearchTerms() {
+    const searchTerm = this.get('searchTerm');
     if (!searchTerm)
-      return "";
+      return [];
 
-    const expressionPosition = searchTerm.search(EXPRESSION);
+    let result = [];
-    if (expressionPosition === -1)
+    const blocks = searchTerm.match(REGEXP_BLOCKS);
-      return "";
+    _.each(blocks, function(block) {
+      if (block.length === 0) return;
 
-    const remainingPhrases = searchTerm.substring(expressionPosition + 2);
+      result.push(block);
-    let nextExpressionPosition = remainingPhrases.search(REGEXP_FILTER_PREFIXES);
+    });
-    if (nextExpressionPosition === -1)
-      nextExpressionPosition = remainingPhrases.length;
 
-    return searchTerm.substring(expressionPosition, nextExpressionPosition + expressionPosition + 2).trim().split(' ')[0];
+    this.set('searchTermBlocks', result);
   },
 
-  findUsername(searchTerm) {
+  filterBlocks(regexPrefix) {
-    const match = this.findSearchTerm(REGEXP_USERNAME_PREFIX, searchTerm);
+    let result = [];
+    _.each(this.get('searchTermBlocks'), function(block) {
+      if (block.search(regexPrefix) !== -1)
+        result.push(block);
+    });
+
+    return result;
+  },
+
+  setSearchedTermValue(key, replaceRegEx, matchRegEx = null) {
+    matchRegEx = matchRegEx || replaceRegEx;
+    const match = this.filterBlocks(matchRegEx);
 
     if (match.length !== 0) {
-      let userInput = match.replace(REGEXP_USERNAME_PREFIX, '');
+      const userInput = match[0].replace(replaceRegEx, '');
-
+      if (this.get(key) !== userInput) {
-      if (userInput.length !== 0 && this.get('searchedTerms.username') !== userInput) {
+        this.set(key, userInput);
-        this.set('searchedTerms.username', userInput);
       }
-    } else {
+    } else if(this.get(key) !== null) {
-      this.set('searchedTerms.username', null);
+      this.set(key, null);
     }
   },
 
-  @observes('searchedTerms.username')
+  setSearchedTermSpecialInValue(key, replaceRegEx, matchRegEx = null) {
-  updateUsername() {
+    matchRegEx = matchRegEx || replaceRegEx;
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(matchRegEx);
-    const match = this.findSearchTerm(REGEXP_USERNAME_PREFIX, searchTerm);
-    const userFilter = this.get('searchedTerms.username');
 
-    if (userFilter && userFilter.length !== 0) {
+    if (match.length !== 0) {
-      if (match.length !== 0) {
+      if (this.get(key) !== true) {
-        searchTerm = searchTerm.replace(match, `@${userFilter}`);
+        this.set(key, true);
-      } else {
-        searchTerm += ` @${userFilter}`;
       }
-    } else if (match.length !== 0) {
+    } else if(this.get(key) !== false) {
-      searchTerm = searchTerm.replace(match, '');
+      this.set(key, false);
     }
-
-    this.set('searchTerm', searchTerm);
   },
 
-  findCategory(searchTerm) {
+  setSearchedTermValueForCategory() {
-    const match = this.findSearchTerm(REGEXP_CATEGORY_PREFIX, searchTerm);
+    const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
     if (match.length !== 0) {
-      let existingInput = _.isArray(this.get('searchedTerms.category')) ? this.get('searchedTerms.category')[0] : this.get('searchedTerms.category');
+      const existingInput = this.get('searchedTerms.category');
-      const subcategories = match.replace(REGEXP_CATEGORY_PREFIX, '').split(':');
+      const subcategories = match[0].replace(REGEXP_CATEGORY_PREFIX, '').split(':');
       if (subcategories.length > 1) {
-        let userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]);
+        const userInput = Discourse.Category.findBySlug(subcategories[1], subcategories[0]);
         if ((!existingInput && userInput)
           || (existingInput && userInput && existingInput.id !== userInput.id))
           this.set('searchedTerms.category', userInput.id);
       } else
-        if (isNaN(subcategories)) {
+      if (isNaN(subcategories)) {
-          let userInput = Discourse.Category.findSingleBySlug(subcategories[0]);
+        const userInput = Discourse.Category.findSingleBySlug(subcategories[0]);
-          if ((!existingInput && userInput)
+        if ((!existingInput && userInput)
-            || (existingInput && userInput && existingInput.id !== userInput.id))
+          || (existingInput && userInput && existingInput.id !== userInput.id))
-            this.set('searchedTerms.category', userInput.id);
+          this.set('searchedTerms.category', userInput.id);
-        } else {
+      } else {
-          let userInput = Discourse.Category.findById(subcategories[0]);
+        const userInput = Discourse.Category.findById(subcategories[0]);
-          if ((!existingInput && userInput)
+        if ((!existingInput && userInput)
-            || (existingInput && userInput && existingInput.id !== userInput.id))
+          || (existingInput && userInput && existingInput.id !== userInput.id))
-            this.set('searchedTerms.category', userInput.id);
+          this.set('searchedTerms.category', userInput.id);
-        }
+      }
     } else
       this.set('searchedTerms.category', null);
   },
 
-  @observes('searchedTerms.category')
+  setSearchedTermValueForGroup() {
-  updateCategory() {
+    const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
-    let searchTerm = this.get('searchTerm');
+    const group = this.get('searchedTerms.group');
-    const categoryFilter = Discourse.Category.findById(this.get('searchedTerms.category'));
 
-    const match = this.findSearchTerm(REGEXP_CATEGORY_PREFIX, searchTerm);
+    if (match.length !== 0) {
-    const slugCategoryMatches = match.match(REGEXP_CATEGORY_SLUG);
+      const existingInput = _.isArray(group) ? group[0] : group;
-    const idCategoryMatches = match.match(REGEXP_CATEGORY_ID);
+      const userInput = match[0].replace(REGEXP_GROUP_PREFIX, '');
+
+      if (existingInput !== userInput) {
+        this.set('searchedTerms.group', (userInput.length !== 0) ? [userInput] : []);
+      }
+    } else if (group.length !== 0) {
+      this.set('searchedTerms.group', []);
+    }
+  },
+
+  setSearchedTermValueForBadge() {
+    const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
+    const badge = this.get('searchedTerms.badge');
+
+    if (match.length !== 0) {
+      const existingInput = _.isArray(badge) ? badge[0] : badge;
+      const userInput = match[0].replace(REGEXP_BADGE_PREFIX, '');
+
+      if (existingInput !== userInput) {
+        this.set('searchedTerms.badge', (userInput.length !== 0) ? [userInput] : []);
+      }
+    } else if (badge.length !== 0) {
+      this.set('searchedTerms.badge', []);
+    }
+  },
+
+  setSearchedTermValueForTags() {
+    if (!this.siteSettings.tagging_enabled) return;
+
+    const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
+    const tags = this.get('searchedTerms.tags');
+
+    if (match.length !== 0) {
+      const existingInput = _.isArray(tags) ? tags.join(',') : tags;
+      const userInput = match[0].replace(REGEXP_TAGS_PREFIX, '');
+
+      if (existingInput !== userInput) {
+        this.set('searchedTerms.tags', (userInput.length !== 0) ? userInput.split(',') : []);
+      }
+    } else if (tags.length !== 0) {
+      this.set('searchedTerms.tags', []);
+    }
+  },
+
+  setSearchedTermValueForPostTime() {
+    const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
+
+    if (match.length !== 0) {
+      const existingInputWhen = this.get('searchedTerms.time.when');
+      const userInputWhen = match[0].match(REGEXP_POST_TIME_WHEN)[0];
+      const existingInputDays = this.get('searchedTerms.time.days');
+      const userInputDays = match[0].replace(REGEXP_POST_TIME_PREFIX, '');
+
+      if (existingInputWhen !== userInputWhen) {
+        this.set('searchedTerms.time.when', userInputWhen);
+      }
+
+      if (existingInputDays !== userInputDays) {
+        this.set('searchedTerms.time.days', userInputDays);
+      }
+    } else {
+      this.set('searchedTerms.time.days', '');
+    }
+  },
+
+  @observes('searchedTerms.username')
+  updateSearchTermForUsername() {
+    const match = this.filterBlocks(REGEXP_USERNAME_PREFIX);
+    const userFilter = this.get('searchedTerms.username');
+    let searchTerm = this.get('searchTerm');
+
+    if (userFilter && userFilter.length !== 0) {
+      if (match.length !== 0) {
+        searchTerm = searchTerm.replace(match[0], `@${userFilter}`);
+      } else {
+        searchTerm += ` @${userFilter}`;
+      }
+
+      this.set('searchTerm', searchTerm.trim());
+    } else if (match.length !== 0) {
+      searchTerm = searchTerm.replace(match[0], '');
+      this.set('searchTerm', searchTerm.trim());
+    }
+  },
+
+  @observes('searchedTerms.category')
+  updateSearchTermForCategory() {
+    const match = this.filterBlocks(REGEXP_CATEGORY_PREFIX);
+    const categoryFilter = Discourse.Category.findById(this.get('searchedTerms.category'));
+    let searchTerm = this.get('searchTerm');
+
+    const slugCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_SLUG) : null;
+    const idCategoryMatches = (match.length !== 0) ? match[0].match(REGEXP_CATEGORY_ID) : null;
     if (categoryFilter && categoryFilter.length !== 0) {
       const id = categoryFilter.id;
       const slug = categoryFilter.slug;
@@ -186,6 +295,8 @@ export default Em.Component.extend({
           searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
         else
           searchTerm += ` #${parentSlug}:${slug}`;
+
+        this.set('searchTerm', searchTerm.trim());
       } else if (categoryFilter) {
         if (slugCategoryMatches)
           searchTerm = searchTerm.replace(slugCategoryMatches[0], `#${slug}`);
@@ -193,264 +304,211 @@ export default Em.Component.extend({
           searchTerm = searchTerm.replace(idCategoryMatches[0], `category:${id}`);
         else
           searchTerm += ` #${slug}`;
+
+        this.set('searchTerm', searchTerm.trim());
       }
     } else {
       if (slugCategoryMatches)
         searchTerm = searchTerm.replace(slugCategoryMatches[0], '');
       if (idCategoryMatches)
         searchTerm = searchTerm.replace(idCategoryMatches[0], '');
-    }
 
-    this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
-  },
-
-  findGroup(searchTerm) {
-    const match = this.findSearchTerm(REGEXP_GROUP_PREFIX, searchTerm);
-    const group = this.get('searchedTerms.group');
-
-    if (match.length !== 0) {
-      let existingInput = _.isArray(group) ? group[0] : group;
-      let userInput = match.replace(REGEXP_GROUP_PREFIX, '');
-
-      if (userInput.length !== 0 && existingInput !== userInput) {
-        this.set('searchedTerms.group', [userInput]);
-      }
-    } else if (group.length !== 0) {
-      this.set('searchedTerms.group', []);
     }
   },
 
   @observes('searchedTerms.group')
-  updateGroup() {
+  updateSearchTermForGroup() {
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(REGEXP_GROUP_PREFIX);
-    const match = this.findSearchTerm(REGEXP_GROUP_PREFIX, searchTerm);
     const groupFilter = this.get('searchedTerms.group');
+    let searchTerm = this.get('searchTerm');
 
     if (groupFilter && groupFilter.length !== 0) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, ` group:${groupFilter}`);
+        searchTerm = searchTerm.replace(match[0], ` group:${groupFilter}`);
       } else {
         searchTerm += ` group:${groupFilter}`;
       }
 
       this.set('searchTerm', searchTerm);
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
+      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
-    }
-  },
-
-  findBadge(searchTerm) {
-    const match = this.findSearchTerm(REGEXP_BADGE_PREFIX, searchTerm);
-    const badge = this.get('searchedTerms.badge');
-
-    if (match.length !== 0) {
-      let existingInput = _.isArray(badge) ? badge[0] : badge;
-      let userInput = match.replace(REGEXP_BADGE_PREFIX, '');
-
-      if (userInput.length !== 0 && existingInput !== userInput) {
-        this.set('searchedTerms.badge', [match.replace(REGEXP_BADGE_PREFIX, '')]);
-      }
-    } else if (badge.length !== 0) {
-      this.set('searchedTerms.badge', []);
     }
   },
 
   @observes('searchedTerms.badge')
-  updateBadge() {
+  updateSearchTermForBadge() {
     let searchTerm = this.get('searchTerm');
 
-    const match = this.findSearchTerm(REGEXP_BADGE_PREFIX, searchTerm);
+    const match = this.filterBlocks(REGEXP_BADGE_PREFIX);
     const badgeFilter = this.get('searchedTerms.badge');
 
     if (badgeFilter && badgeFilter.length !== 0) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, ` badge:${badgeFilter}`);
+        searchTerm = searchTerm.replace(match[0], ` badge:${badgeFilter}`);
       } else {
         searchTerm += ` badge:${badgeFilter}`;
       }
 
       this.set('searchTerm', searchTerm);
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
+      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
-    }
-  },
-
-  findTags(searchTerm) {
-    if (!this.siteSettings.tagging_enabled) return;
-
-    const match = this.findSearchTerm(REGEXP_TAGS_PREFIX, searchTerm);
-    const tags = this.get('searchedTerms.tags');
-
-    if (match.length !== 0) {
-      let existingInput = _.isArray(tags) ? tags.join(',') : tags;
-      let userInput = match.replace(REGEXP_TAGS_PREFIX, '');
-
-      if (userInput.length !== 0 && existingInput !== userInput) {
-        this.set('searchedTerms.tags', userInput.split(','));
-      }
-    } else if (tags.length !== 0) {
-      this.set('searchedTerms.tags', []);
     }
   },
 
   @observes('searchedTerms.tags')
-  updateTags() {
+  updateSearchTermForTags() {
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(REGEXP_TAGS_PREFIX);
-    const match = this.findSearchTerm(REGEXP_TAGS_PREFIX, searchTerm);
     const tagFilter = this.get('searchedTerms.tags');
+    let searchTerm = this.get('searchTerm');
 
     if (tagFilter && tagFilter.length !== 0) {
       const tags = tagFilter.join(',');
 
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, `tags:${tags}`);
+        searchTerm = searchTerm.replace(match[0], `tags:${tags}`);
       } else {
         searchTerm += ` tags:${tags}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
+      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     }
   },
 
-  findIn(searchTerm) {
-    const match = this.findSearchTerm(REGEXP_IN_PREFIX, searchTerm);
-    if (match.length !== 0) {
-      let existingInput = this.get('searchedTerms.in');
-      let userInput = match.replace(REGEXP_IN_PREFIX, '');
-      if (userInput.length !== 0 && existingInput !== userInput)
-        this.set('searchedTerms.in', userInput);
-    } else
-      this.set('searchedTerms.in', '');
-  },
-
   @observes('searchedTerms.in')
-  updateIn() {
+  updateSearchTermForIn() {
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(REGEXP_IN_MATCH);
-    const match = this.findSearchTerm(REGEXP_IN_PREFIX, searchTerm);
     const inFilter = this.get('searchedTerms.in');
+    let searchTerm = this.get('searchTerm');
 
     if (inFilter) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, `in:${inFilter}`);
+        searchTerm = searchTerm.replace(match[0], `in:${inFilter}`);
       } else {
         searchTerm += ` in:${inFilter}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     } else if (match.length !== 0) {
       searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     }
   },
 
-  findStatus(searchTerm) {
+  @observes('searchedTerms.special.in.likes')
-    const match = this.findSearchTerm(REGEXP_STATUS_PREFIX, searchTerm);
+  updateSearchTermForSpecialInLikes() {
-    if (match.length !== 0) {
+    const match = this.filterBlocks(REGEXP_SPECIAL_IN_LIKES_MATCH);
-      let existingInput = this.get('searchedTerms.status');
+    const inFilter = this.get('searchedTerms.special.in.likes');
-      let userInput = match.replace(REGEXP_STATUS_PREFIX, '');
+    let searchTerm = this.get('searchTerm');
-      if (userInput.length !== 0 && existingInput !== userInput)
+
-        this.set('searchedTerms.status', userInput);
+    if (inFilter) {
-    } else
+      if (match.length === 0) {
-      this.set('searchedTerms.status', '');
+        searchTerm += ` in:likes`;
+        this.set('searchTerm', searchTerm.trim());
+      }
+    } else if (match.length !== 0) {
+      searchTerm = searchTerm.replace(match, '');
+      this.set('searchTerm', searchTerm.trim());
+    }
+  },
+
+  @observes('searchedTerms.special.in.private')
+  updateSearchTermForSpecialInPrivate() {
+    const match = this.filterBlocks(REGEXP_SPECIAL_IN_PRIVATE_MATCH);
+    const inFilter = this.get('searchedTerms.special.in.private');
+    let searchTerm = this.get('searchTerm');
+
+    if (inFilter) {
+      if (match.length === 0) {
+        searchTerm += ` in:private`;
+        this.set('searchTerm', searchTerm.trim());
+      }
+    } else if (match.length !== 0) {
+      searchTerm = searchTerm.replace(match, '');
+      this.set('searchTerm', searchTerm.trim());
+    }
+  },
+
+  @observes('searchedTerms.special.in.wiki')
+  updateSearchTermForSpecialInWiki() {
+    const match = this.filterBlocks(REGEXP_SPECIAL_IN_WIKI_MATCH);
+    const inFilter = this.get('searchedTerms.special.in.wiki');
+    let searchTerm = this.get('searchTerm');
+
+    if (inFilter) {
+      if (match.length === 0) {
+        searchTerm += ` in:wiki`;
+        this.set('searchTerm', searchTerm.trim());
+      }
+    } else if (match.length !== 0) {
+      searchTerm = searchTerm.replace(match, '');
+      this.set('searchTerm', searchTerm.trim());
+    }
   },
 
   @observes('searchedTerms.status')
-  updateStatus() {
+  updateSearchTermForStatus() {
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(REGEXP_STATUS_PREFIX);
-    const match = this.findSearchTerm(REGEXP_STATUS_PREFIX, searchTerm);
     const statusFilter = this.get('searchedTerms.status');
+    let searchTerm = this.get('searchTerm');
 
     if (statusFilter) {
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, `status:${statusFilter}`);
+        searchTerm = searchTerm.replace(match[0], `status:${statusFilter}`);
       } else {
         searchTerm += ` status:${statusFilter}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
+      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
-    }
-  },
-
-  findPostsCount(searchTerm) {
-    const match = this.findSearchTerm(REGEXP_POST_COUNT_PREFIX, searchTerm);
-    if (match.length !== 0) {
-      let existingInput = this.get('searchedTerms.posts_count');
-      let userInput = match.replace(REGEXP_POST_COUNT_PREFIX, '');
-      if (userInput.length !== 0 && existingInput !== userInput)
-        this.set('searchedTerms.posts_count', userInput);
-    } else
-      this.set('searchedTerms.posts_count', '');
-  },
-
-  @observes('searchedTerms.posts_count')
-  updatePostsCount() {
-    let searchTerm = this.get('searchTerm');
-    const match = this.findSearchTerm(REGEXP_POST_COUNT_PREFIX, searchTerm);
-    const postsCountFilter = this.get('searchedTerms.posts_count');
-
-    if (postsCountFilter) {
-      if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, `posts_count:${postsCountFilter}`);
-      } else {
-        searchTerm += ` posts_count:${postsCountFilter}`;
-      }
-
-      this.set('searchTerm', searchTerm);
-    } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
-      this.set('searchTerm', searchTerm);
-    }
-  },
-
-  findPostTime(searchTerm) {
-    const match = this.findSearchTerm(REGEXP_POST_TIME_WHEN, searchTerm);
-
-    if (match.length !== 0) {
-      let existingInputWhen = this.get('searchedTerms.time.when');
-      let userInputWhen = match.match(REGEXP_POST_TIME_WHEN)[0];
-      let existingInputDays = this.get('searchedTerms.time.days');
-      let userInputDays = match.replace(REGEXP_POST_TIME_PREFIX, '');
-
-      if (userInputWhen.length !== 0 && existingInputWhen !== userInputWhen) {
-        this.set('searchedTerms.time.when', userInputWhen);
-      }
-
-      if (userInputDays.length !== 0 &&
-          existingInputDays !== userInputDays &&
-          userInputDays !== match) {
-        this.set('searchedTerms.time.days', userInputDays);
-      }
-    } else {
-      this.set('searchedTerms.time.days', '');
     }
   },
 
   @observes('searchedTerms.time.when', 'searchedTerms.time.days')
-  updatePostTime() {
+  updateSearchTermForPostTime() {
-    let searchTerm = this.get('searchTerm');
+    const match = this.filterBlocks(REGEXP_POST_TIME_PREFIX);
-    const match = this.findSearchTerm(REGEXP_POST_TIME_PREFIX, searchTerm);
     const timeDaysFilter = this.get('searchedTerms.time.days');
+    let searchTerm = this.get('searchTerm');
 
     if (timeDaysFilter) {
       const when = this.get('searchedTerms.time.when');
       if (match.length !== 0) {
-        searchTerm = searchTerm.replace(match, `${when}:${timeDaysFilter}`);
+        searchTerm = searchTerm.replace(match[0], `${when}:${timeDaysFilter}`);
       } else {
         searchTerm += ` ${when}:${timeDaysFilter}`;
       }
 
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
     } else if (match.length !== 0) {
-      searchTerm = searchTerm.replace(match, '');
+      searchTerm = searchTerm.replace(match[0], '');
-      this.set('searchTerm', searchTerm);
+      this.set('searchTerm', searchTerm.trim());
+    }
+  },
+
+  @observes('searchedTerms.posts_count')
+  updateSearchTermForPostsCount() {
+    const match = this.filterBlocks(REGEXP_POST_COUNT_PREFIX);
+    const postsCountFilter = this.get('searchedTerms.posts_count');
+    let searchTerm = this.get('searchTerm');
+
+    if (postsCountFilter) {
+      if (match.length !== 0) {
+        searchTerm = searchTerm.replace(match[0], `posts_count:${postsCountFilter}`);
+      } else {
+        searchTerm += ` posts_count:${postsCountFilter}`;
+      }
+
+      this.set('searchTerm', searchTerm.trim());
+    } else if (match.length !== 0) {
+      searchTerm = searchTerm.replace(match[0], '');
+      this.set('searchTerm', searchTerm.trim());
     }
   },
 

app/assets/javascripts/discourse/components/tag-chooser.js.es6

@@ -56,6 +56,7 @@ export default Ember.TextField.extend({
       placeholder: this.get('placeholder') === "" ? "" : I18n.t(this.get('placeholderKey') || 'tagging.choose_for_topic'),
       maximumInputLength: this.siteSettings.max_tag_length,
       maximumSelectionSize: limit,
+      width: this.get('width') || 'resolve',
       initSelection(element, callback) {
         const data = [];
 

app/assets/javascripts/discourse/helpers/user-avatar.js.es6

@@ -11,8 +11,8 @@ function renderAvatar(user, options) {
 
     if (!username || !avatarTemplate) { return ''; }
 
-    let title;
+    let title = options.title;
-    if (!options.ignoreTitle) {
+    if (!title && !options.ignoreTitle) {
       // first try to get a title
       title = Em.get(user, 'title');
       // if there was no title provided

app/assets/javascripts/discourse/routes/app-route-map.js.es6

@@ -132,7 +132,7 @@ export default function() {
       this.route('showCategory' + filter.capitalize(), {path: '/c/:category/:tag_id/l/' + filter});
       this.route('showParentCategory' + filter.capitalize(), {path: '/c/:parent_category/:category/:tag_id/l/' + filter});
     });
-    this.route('show', {path: 'intersection/:tag_id/*additional_tags'});
+    this.route('intersection', {path: 'intersection/:tag_id/*additional_tags'});
   });
 
   this.resource('tagGroups', {path: '/tag_groups'}, function() {

app/assets/javascripts/discourse/templates/components/search-advanced-options.hbs

@@ -40,7 +40,7 @@
     <div class="control-group">
       <label class="control-label" for="search-with-tags">{{i18n "search.advanced.with_tags.label"}}</label>
       <div class="controls">
-        {{tag-chooser tags=searchedTerms.tags blacklist=searchedTerms.tags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true"}}
+        {{tag-chooser tags=searchedTerms.tags blacklist=searchedTerms.tags allowCreate=false placeholder="" everyTag="true" unlimitedTagCount="true" width="70%"}}
       </div>
     </div>
   </div>
@@ -50,6 +50,11 @@
   <div class="control-group pull-left">
     <label class="control-label" for="search-in-options">{{i18n "search.advanced.filters.label"}}</label>
     <div class="controls">
+      <section class='field'>
+        <label>{{input type="checkbox" class="in-likes" checked=searchedTerms.special.in.likes}} {{i18n "search.advanced.filters.likes"}}</label>
+        <label>{{input type="checkbox" class="in-private" checked=searchedTerms.special.in.private}} {{i18n "search.advanced.filters.private"}}</label>
+        <label>{{input type="checkbox" class="in-wiki" checked=searchedTerms.special.in.wiki}} {{i18n "search.advanced.filters.wiki"}}</label>
+      </section>
       {{combo-box id="in" valueAttribute="value" content=inOptions value=searchedTerms.in none="user.locale.any"}}
     </div>
   </div>
@@ -66,7 +71,7 @@
     <label class="control-label" for="search-post-date">{{i18n "search.advanced.post.time.label"}}</label>
     <div class="controls">
       {{combo-box id="postTime" valueAttribute="value" content=postTimeOptions value=searchedTerms.time.when}}
-      {{input type="text" value=searchedTerms.time.days class="input-small" id='search-post-date'}}
+      {{input type="date" value=searchedTerms.time.days class="input-small" id='search-post-date'}}
     </div>
   </div>
   <div class="control-group pull-left">

app/assets/javascripts/discourse/templates/user/preferences.hbs

@@ -336,7 +336,13 @@
           {{else}}
             {{d-button action="revokeApiKey" actionParam=key class="btn" label="user.revoke_access"}}
           {{/if}}
-          <p><span>{{i18n "user.api_permissions"}}</span> {{#if key.write}}{{i18n "user.api_read_write"}}{{else}}{{i18n "user.api_read"}}{{/if}}</p>
+          <p>
+            <ul>
+              {{#each key.scopes as |scope|}}
+              <li>{{scope}}</li>
+              {{/each}}
+            </ul>
+          </p>
           <p><span>{{i18n "user.api_approved"}}</span> {{bound-date key.created_at}}</p>
         </div>
         {{/each}}

app/assets/stylesheets/common/base/search.scss

@@ -114,6 +114,10 @@
     .control-group.pull-left {
       width: 50%;
     }
+
+    input[type="checkbox"] {
+      height: auto;
+    }
   }
 }
 

app/assets/stylesheets/mobile/search.scss

@@ -13,7 +13,12 @@
       }
 
       .controls {
-        input,select {
+        label {
+          display: block;
+          margin-bottom: 5px;
+        }
+
+        input:not([type="checkbox"]),select {
           width: 75%;
         }
       }

app/controllers/user_api_keys_controller.rb

@@ -6,7 +6,7 @@ class UserApiKeysController < ApplicationController
   skip_before_filter :check_xhr, :preload_json
   before_filter :ensure_logged_in, only: [:create, :revoke, :undo_revoke]
 
-  AUTH_API_VERSION ||= 1
+  AUTH_API_VERSION ||= 2
 
   def new
 
@@ -34,14 +34,14 @@ class UserApiKeysController < ApplicationController
       return
     end
 
-    @access_description = params[:access].include?("w") ? t("user_api_key.read_write") : t("user_api_key.read")
     @application_name = params[:application_name]
     @public_key = params[:public_key]
     @nonce = params[:nonce]
-    @access = params[:access]
     @client_id = params[:client_id]
     @auth_redirect = params[:auth_redirect]
     @push_url = params[:push_url]
+    @localized_scopes = params[:scopes].split(",").map{|s| I18n.t("user_api_key.scopes.#{s}")}
+    @scopes = params[:scopes]
 
   rescue Discourse::InvalidAccess
     @generic_error = true
@@ -60,10 +60,6 @@ class UserApiKeysController < ApplicationController
 
     raise Discourse::InvalidAccess unless meets_tl?
 
-    request_read = params[:access].include? 'r'
-    request_read ||= params[:access].include? 'p'
-    request_write = params[:access].include? 'w'
-
     validate_params
 
     # destroy any old keys we had
@@ -72,12 +68,10 @@ class UserApiKeysController < ApplicationController
     key = UserApiKey.create!(
       application_name: params[:application_name],
       client_id: params[:client_id],
-      read: request_read,
-      push: params[:push_url].present?,
       user_id: current_user.id,
-      write: request_write,
+      push_url: params[:push_url],
       key: SecureRandom.hex,
-      push_url: params[:push_url]
+      scopes: params[:scopes].split(",")
     )
 
     # we keep the payload short so it encrypts easily with public key
@@ -85,7 +79,8 @@ class UserApiKeysController < ApplicationController
     payload = {
       key: key.key,
       nonce: params[:nonce],
-      access: key.access
+      push: key.has_push?,
+      api: AUTH_API_VERSION
     }.to_json
 
     public_key = OpenSSL::PKey::RSA.new(params[:public_key])
@@ -100,7 +95,7 @@ class UserApiKeysController < ApplicationController
     if current_key = request.env['HTTP_USER_API_KEY']
       request_key = UserApiKey.find_by(key: current_key)
       revoke_key ||= request_key
-      if request_key && request_key.id != revoke_key.id && !request_key.write
+      if request_key && request_key.id != revoke_key.id && !request_key.scopes.include?("write")
         raise Discourse::InvalidAccess
       end
     end
@@ -127,7 +122,7 @@ class UserApiKeysController < ApplicationController
     [
      :public_key,
      :nonce,
-     :access,
+     :scopes,
      :client_id,
      :auth_redirect,
      :application_name
@@ -135,13 +130,9 @@ class UserApiKeysController < ApplicationController
   end
 
   def validate_params
-    request_read = params[:access].include? 'r'
+    requested_scopes = Set.new(params[:scopes].split(","))
-    request_read ||= params[:access].include? 'p'
-    request_write = params[:access].include? 'w'
 
-    raise Discourse::InvalidAccess unless request_read || request_push
+    raise Discourse::InvalidAccess unless UserApiKey.allowed_scopes.superset?(requested_scopes)
-    raise Discourse::InvalidAccess if request_read && !SiteSetting.allow_read_user_api_keys
-    raise Discourse::InvalidAccess if request_write && !SiteSetting.allow_write_user_api_keys
 
     # our pk has got to parse
     OpenSSL::PKey::RSA.new(params[:public_key])

app/models/user_api_key.rb

@@ -1,10 +1,63 @@
 class UserApiKey < ActiveRecord::Base
+
+  SCOPES = {
+    read: [:get],
+    write: [:get, :post, :patch],
+    message_bus: [[:post, 'message_bus']],
+    push: nil,
+    notifications: [[:post, 'message_bus'], [:get, 'notifications#index'], [:put, 'notifications#mark_read']],
+    session_info: [[:get, 'session#current'], [:get, 'users#topic_tracking_state']]
+  }
+
   belongs_to :user
 
-  def access
+  def self.allowed_scopes
-    has_push = push && push_url.present? && SiteSetting.allowed_user_api_push_urls.include?(push_url)
+    Set.new(SiteSetting.allow_user_api_key_scopes.split("|"))
-    "#{read ? "r" : ""}#{write ? "w" : ""}#{has_push ? "p" : ""}"
   end
+
+  def self.available_scopes
+    @available_scopes ||= Set.new(SCOPES.keys.map(&:to_s))
+  end
+
+  def self.allow_permission?(permission, env)
+    verb, action = permission
+    actual_verb = env["REQUEST_METHOD"] || ""
+
+    # safe in Ruby 2.3 which is only one supported
+    return false unless actual_verb.downcase == verb.to_s
+    return true unless action
+
+    # not a rails route, special handling
+    return true if action == "message_bus" && env["PATH_INFO"] =~ /^\/message-bus\/.*\/poll/
+
+    params  = env['action_dispatch.request.path_parameters']
+
+    return false unless params
+
+    actual_action = "#{params[:controller]}##{params[:action]}"
+    actual_action == action
+  end
+
+  def self.allow_scope?(name, env)
+    if allowed = SCOPES[name.to_sym]
+      good = allowed.any? do |permission|
+        allow_permission?(permission, env)
+      end
+
+      good || allow_permission?([:post, 'user_api_keys#revoke'], env)
+    end
+  end
+
+  def has_push?
+    (scopes.include?("push") || scopes.include?("notifications")) && push_url.present? && SiteSetting.allowed_user_api_push_urls.include?(push_url)
+  end
+
+  def allow?(env)
+    scopes.any? do |name|
+      UserApiKey.allow_scope?(name, env)
+    end
+  end
+
 end
 
 # == Schema Information

app/serializers/user_serializer.rb

@@ -148,8 +148,7 @@ class UserSerializer < BasicUserSerializer
       {
         id: k.id,
         application_name: k.application_name,
-        read: k.read,
+        scopes: k.scopes.map{|s| I18n.t("user_api_key.scopes.#{s}")},
-        write: k.write,
         created_at: k.created_at
       }
     end

app/services/post_alerter.rb

@@ -396,9 +396,9 @@ class PostAlerter
   end
 
   def push_notification(user, payload)
-    if SiteSetting.allow_push_user_api_keys && SiteSetting.allowed_user_api_push_urls.present?
+    if SiteSetting.allow_user_api_key_scopes.split("|").include?("push") && SiteSetting.allowed_user_api_push_urls.present?
       clients = user.user_api_keys
-          .where('push AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL',
+          .where("('push' = ANY(scopes) OR 'notifications' = ANY(scopes)) AND push_url IS NOT NULL AND position(push_url in ?) > 0 AND revoked_at IS NULL",
                   SiteSetting.allowed_user_api_push_urls)
           .pluck(:client_id, :push_url)
 

app/views/user_api_keys/new.html.erb

@@ -1,5 +1,5 @@
 <h1><%= t "user_api_key.title" %></h1>
-<div>
+<div class='authorize-api-key'>
 <% if @no_trust_level %>
   <h3>
   <%= t("user_api_key.no_trust_level") %>
@@ -10,7 +10,14 @@
   </h3>
 <% else %>
 <p>
-  <%= t("user_api_key.description", application_name: @application_name, access: @access_description) %>
+  <%= t("user_api_key.description", application_name: @application_name) %>
+</p>
+<p>
+  <ul class='scopes'>
+    <%- @localized_scopes.each do |scope| %>
+      <li><%= scope %></li>
+    <%- end %>
+  </ul>
 </p>
 <%= form_tag(user_api_key_path) do %>
   <%= hidden_field_tag 'application_name', @application_name %>
@@ -20,6 +27,7 @@
   <%= hidden_field_tag 'auth_redirect', @auth_redirect %>
   <%= hidden_field_tag 'push_url', @push_url %>
   <%= hidden_field_tag 'public_key', @public_key%>
+  <%= hidden_field_tag 'scopes', @scopes%>
   <%= submit_tag t('user_api_key.authorize'), class: 'btn btn-danger', id: 'submit' %>
 <% end %>
 <script>

config/locales/client.en.yml

@@ -570,10 +570,7 @@ en:
       apps: "Apps"
       revoke_access: "Revoke Access"
       undo_revoke_access: "Undo Revoke Access"
-      api_permissions: "Permissions:"
       api_approved: "Approved:"
-      api_read: "read"
-      api_read_write: "read and write"
 
       staff_counters:
         flags_given: "helpful flags"

config/locales/client.fi.yml

@@ -2179,9 +2179,13 @@ fi:
         add_owners: Lisää omistajia
         incoming_email: "Saapuvan sähköpostin osoite"
         incoming_email_placeholder: "aseta sähköpostiosoite"
+        flair_url: "Avatarpinssikuva"
+        flair_bg_color: "Avatarpinssin taustaväri"
         flair_bg_color_placeholder: "(Valinnainen) värin Hex-arvo"
+        flair_color: "Avatarpinssin väri"
         flair_color_placeholder: "(Valinnainen) värin Hex-arvo"
         flair_preview: "Esikatselu"
+        flair_note: "Huom: Pinssi määräytyy käyttäjän ensisijaisen ryhmän mukaan."
       api:
         generate_master: "Luo rajapinnan pääavain"
         none: "Aktiivisia API avaimia ei ole määritelty."

config/locales/client.fr.yml

@@ -944,7 +944,7 @@ fr:
         post_length: "Le message doit avoir au moins {{min}} caractères"
         try_like: 'Avez-vous essayé le bouton <i class="fa fa-heart"></i> ?'
         category_missing: "Vous devez choisir une catégorie"
-      save_edit: "Sauvegarder la modification"
+      save_edit: "Sauvegarder"
       reply_original: "Répondre sur le sujet d'origine"
       reply_here: "Répondre ici"
       reply: "Répondre"

config/locales/client.he.yml

@@ -178,7 +178,7 @@ he:
     privacy_policy: "מדיניות פרטיות"
     privacy: "פרטיות"
     terms_of_service: "תנאי השירות"
-    mobile_view: "תצוגת סלולרי"
+    mobile_view: "תצוגת נייד"
     desktop_view: "תצוגת מחשב"
     you: "אתם"
     or: "או"
@@ -259,7 +259,7 @@ he:
     switch_from_anon: "צאו ממצב אנונימי"
     banner:
       close: "בטלו באנר זה."
-      edit: "עירכו באנר זה"
+      edit: "עירכו באנר זה >>"
     choose_topic:
       none_found: "לא נמצאו נושאים."
       title:
@@ -278,7 +278,7 @@ he:
       has_pending_posts:
         one: " בנושא זה ישנו פוסט אחד הממתין לאישור"
         other: "בנושא זה ישנם <b>{{count}}</b> פוסטים הממתינים לאישור"
-      confirm: "שמור שינויים"
+      confirm: "שמירת שינויים"
       delete_prompt: "האם אתם בטוחים שאתם מעוניינים למחוק את <b>%{username}</b>? זה ימחוק את כל הפוסטים שלהם ויחסום את המייל וכתובת ה IP שלהם."
       approval:
         title: "הפוסט זקוק לאישור"
@@ -470,8 +470,8 @@ he:
         label: "מצב רשימת תפוצה"
         enabled: "אפשר מצב רשימת תפוצה"
         instructions: |
-          הגדרה זו מוחקת את סיכום הפעילות.<br />
+          הגדרה זו באה במקום ההגדרות של ״סיכום פעילות״.<br />
-          נושאים מושתקים וקטוגריות לא יכללו בדוא"ל הללו.
+          נושאים וקטגוריות שהושתקו לא יכללו במיילים אלו.
         daily: "שלח עדכונים יומיים"
         individual: "שליחת מייל עבור כל פוסט חדש"
         many_per_day: "שלחו לי מייל עבור כל פוסט חדש (בערך {{dailyEmailEstimate}} ביום)"
@@ -635,7 +635,7 @@ he:
       email_in_reply_to: "הכללת ציטוטים מתגובות לפרסומים שנשלחו בדוא\"ל"
       email_direct: "שלחו לי דוא\"ל כשמישהם מצטטים אותי, מגיבים לפוסט שלי, מזכירים את @שם-המשתמש/ת שלי, או מזמינים אותי לנושא"
       email_private_messages: "שלחו לי דוא\"ל כשמישהם שולחים לי הודעות"
-      email_always: "שלח לי התאות מייל גם כשאני פעיל/ה באתר. "
+      email_always: "שלח לי התראות מייל גם כשאני פעיל/ה באתר. "
       other_settings: "אחר"
       categories_settings: "קטגוריות"
       new_topic_duration:
@@ -1207,7 +1207,7 @@ he:
       toggle_information: "הצגת פרטי נושא"
       read_more_in_category: "רוצים לקרוא עוד? עיינו בנושאים אחרים ב {{catLink}} או {{latestLink}}."
       read_more: "רוצה לקרוא עוד? {{catLink}} or {{latestLink}}."
-      read_more_MF: "There { UNREAD, plural, =0 {} one { is <a href='/unread'>1 unread</a> } other { are <a href='/unread'># unread</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{and } false {is } other{}} <a href='/new'>1 new</a> topic} other { {BOTH, select, true{and } false {are } other{}} <a href='/new'># new</a> topics} } remaining, or {CATEGORY, select, true {browse other topics in {catLink}} false {{latestLink}} other {}}"
+      read_more_MF: "יש { UNREAD, plural, =0 {} one { <a href='/unread'>1 שלא נקרא</a> } other { <a href='/unread'># שלא נקראו</a> } } { NEW, plural, =0 {} one { {BOTH, select, true{ו} false {} other{}} נושא חדש <a href='/new'>אחד</a>} other { {BOTH, select, true{ו} false {} other{}} <a href='/new'>#</a> נושאים חדשים} } נותרים, or {CATEGORY, select, true {עיין בנושאים אחרים ב {catLink}} false {{latestLink}} other {}}"
       browse_all_categories: עיינו בכל הקטגוריות
       view_latest_topics: הצגת נושאים אחרונים
       suggest_create_topic: למה לא ליצור נושא חדש?
@@ -1969,7 +1969,7 @@ he:
       selector_no_tags: "ללא תגיות"
       changed: "תגיות ששונו:"
       tags: "תגיות"
-      choose_for_topic: "בחרו תגים אופציונציים לנושא זה"
+      choose_for_topic: "בחרו תגים אופציונליים לנושא זה"
       delete_tag: "מחק תגית"
       delete_confirm: "האם אתם בטוחים שאתם מעוניינים למחוק את התגית הזו?"
       rename_tag: "שנו תגית"
@@ -2041,7 +2041,7 @@ he:
       custom_message_template_forum: "הי, כדאי לכם להצטרף לפורום הזה!"
       custom_message_template_topic: "הי, חשבתי שנושא זה יעניין אתכם!"
   admin_js:
-    type_to_filter: "הקלד לסינון..."
+    type_to_filter: "הקלידו לסינון..."
     admin:
       title: 'ניהול Discourse'
       moderator: 'מנהל'
@@ -2563,9 +2563,9 @@ he:
             create_category: "יצירת קטגוריה"
             block_user: "חסום משתמש"
             unblock_user: "בטל חסימת משתמש"
-            grant_admin: "הענק ניהול"
+            grant_admin: "הענקת ניהול"
             revoke_admin: "שללו אדמיניסטרציה"
-            grant_moderation: "העניקו הנחיה"
+            grant_moderation: "הענקת הנחיה"
             revoke_moderation: "שללו הנחיה"
             backup_operation: "פעולת גיבוי"
             deleted_tag: "תגית נמחקה"
@@ -2635,8 +2635,8 @@ he:
           active: 'הפעל משתמשים'
           new: 'משתמשים חדשים'
           pending: 'משתמשים שממתינים לבדיקה'
-          newuser: 'משתמשים ברמת אמון 0 (משתמש חדש)'
+          newuser: 'משתמשים ברמת אמון 0 (משתמשים חדשים)'
-          basic: 'משתמשים ברמת אמון 1 (משתמש בסיסי)'
+          basic: 'משתמשים ברמת אמון 1 (משתמשים בסיסיים)'
           member: 'משתמשים ברמת אמון 2 (חברים)'
           regular: 'משתמשים ברמת אמון 3 (רגילים)'
           leader: 'משתמשים ברמת אמון 4 (מובילים)'
@@ -2684,9 +2684,9 @@ he:
         log_out: "התנתקות"
         logged_out: "המשתמש/ת התנתקו בכל המכשירים"
         revoke_admin: 'שלול ניהול ראשי'
-        grant_admin: 'הענק ניהול ראשי'
+        grant_admin: 'הענקת ניהול'
         revoke_moderation: 'שללו הנחיה'
-        grant_moderation: 'העניקו הנחיה'
+        grant_moderation: 'הענקת הנחיה'
         unblock: 'ביטול חסימה'
         block: 'חסום'
         reputation: מוניטין
@@ -2711,7 +2711,7 @@ he:
         anonymize_confirm: "האם אתם ב-ט-ו-ח-י-ם שאתם רוצים להפוך חשבון זה לאנונימי? פעולה זו תשנה את שם המשתמש וכתובת הדוא\"ל ותאתחל את כל המידע בפרופיל."
         anonymize_yes: "כן, הפיכת חשבון זה לאנונימי"
         anonymize_failed: "התרחשה בעיה בהפיכת חשבון זה לאנונימי."
-        delete: "מחק משתמש"
+        delete: "מחק משתמש/ת"
         delete_forbidden_because_staff: "לא ניתן למחוק מנהלים ומנחים."
         delete_posts_forbidden_because_staff: "לא ניתן למחוק את כל הפרסומים של מנהלי מערכת ומפקחים."
         delete_forbidden:
@@ -2911,7 +2911,7 @@ he:
         query: שאילתת עיטור (SQL)
         target_posts: פרסומי מטרות שאילתה
         auto_revoke: הפעלת שאילתת ביטול יומית
-        show_posts: הצגת הפוסט על הענקת העיטורים בעמוד העיטורים
+        show_posts: הצגת הפוסט שגרם להענקת העיטור, בעמוד העיטורים
         trigger: הפעלה
         trigger_type:
           none: "רענון יומי"

config/locales/client.it.yml

@@ -465,9 +465,12 @@ it:
       suspended_reason: "Motivo: "
       github_profile: "Github"
       mailing_list_mode:
+        individual: "Invia una email per ogni nuovo messaggio"
+        many_per_day: "Inviamo una email per ogni nuovo messaggio (circa {{dailyEmailEstimate}} al giorno)"
         few_per_day: "Inviami una email per ogni nuovo messaggio (circa 2 al giorno)"
       tag_settings: "Etichette"
       watched_tags: "Osservate"
+      watched_tags_instructions: "Osserverai automaticamente tutti gli argomenti con queste etichette. Verrai notificato di tutti i  nuovi messaggi e argomenti, e accanto all'argomento apparirà anche un conteggio dei nuovi messaggi."
       tracked_tags: "Seguite"
       tracked_tags_instructions: "Seguirai automaticamente tutti gli argomenti con queste etichette. Accanto all'argomento apparirà il conteggio dei nuovi messaggi."
       muted_tags: "Silenziati"
@@ -1039,6 +1042,7 @@ it:
     not_logged_in_user: 'pagina utente con riassunto delle attività correnti e delle impostazioni'
     current_user: 'vai alla pagina utente'
     topics:
+      new_messages_marker: "ultima visita"
       bulk:
         unlist_topics: "Deselezione Topics"
         reset_read: "Reimposta Lettura"
@@ -1311,6 +1315,10 @@ it:
         instructions:
           one: "Per favore scegli l'argomento dove spostare il messaggio."
           other: "Per favore scegli l'argomento di destinazione dove spostare i <b>{{count}}</b> messaggi."
+      merge_posts:
+        title: "Unisci Messaggi Selezionati"
+        action: "unisci messaggi selezionati"
+        error: "Si è verificato un errore nell'unire i messaggi selezionati."
       change_owner:
         title: "Cambia Proprietario dei Messaggi"
         action: "cambia proprietà"
@@ -1503,6 +1511,10 @@ it:
         confirm:
           one: "Sei sicuro di voler cancellare questo messaggio?"
           other: "Sei sicuro di voler cancellare tutti questi messaggi?"
+      merge:
+        confirm:
+          one: "Sicuro di voler unire questi messaggi?"
+          other: "Sicuro di voler unire questi {{count}} messaggi?"
       revisions:
         controls:
           first: "Prima revisione"
@@ -2784,3 +2796,21 @@ it:
           label: "Nuovo:"
           add: "Aggiungi"
           filter: "Cerca (URL o URL Esterna)"
+  wizard_js:
+    wizard:
+      done: "Fatto"
+      back: "Indietro"
+      next: "Avanti"
+      step: "%{current} di %{total}"
+      upload: "Carica"
+      uploading: "Caricamento..."
+      quit: "Forse Dopo"
+      staff_count:
+        one: "La tua comunità ha 1 membro dello staff."
+        other: "La tua comunità ha %{count} membri dello staff."
+      invites:
+        add_user: "aggiungi"
+        roles:
+          admin: "Amministratore"
+          moderator: "Moderatore"
+          regular: "Utente Normale"

config/locales/client.ro.yml

@@ -49,19 +49,19 @@ ro:
           other: "< %{count} s"
         x_seconds:
           one: "1s"
-          few: "%{count}s"
+          few: "%{count} s"
           other: "%{count} s"
         x_minutes:
           one: "1m"
-          few: "%{count}m"
+          few: "%{count} m"
           other: "%{count} m"
         about_x_hours:
           one: "1h"
-          few: "%{count}h"
+          few: "%{count} h"
           other: "%{count} h"
         x_days:
           one: "1z"
-          few: "%{count}z"
+          few: "%{count} z"
           other: "%{count} z"
         about_x_years:
           one: "1a"
@@ -73,7 +73,7 @@ ro:
           other: "> %{count} a"
         almost_x_years:
           one: "1a"
-          few: "%{count}a"
+          few: "%{count} a"
           other: "%{count} de a"
         date_month: "DD MMMM"
         date_year: "MMM 'YY"
@@ -184,7 +184,7 @@ ro:
     age: "Vârsta"
     joined: "Înregistrat"
     admin_title: "Admin"
-    flags_title: "Semnalare"
+    flags_title: "Marcaje"
     show_more: "Mai mult"
     show_help: "Opțiuni"
     links: "Adrese web"
@@ -572,7 +572,7 @@ ro:
         confirm: "Dacă îți schimbi numele de utilizator, toate citările anterioare ale posturilor tale și toate mențiunile @numelui se vor pierde. Ești absolut sigur că vrei asta?"
         taken: "Acest nume de utilizator este deja folosit."
         error: "A apărut o eroare la schimbarea numelui de utilizator."
-        invalid: "Acest nume de utilizator este nevalid. Trebuie să includă doar cifre și litere."
+        invalid: "Acest nume de utilizator este invalid. Trebuie să includă doar cifre și litere."
       change_email:
         title: "Schimbă email"
         taken: "Această adresă există deja în baza de date."
@@ -839,11 +839,11 @@ ro:
     all_time: 'total'
     all_time_desc: 'total subiecte create'
     year: 'an'
-    year_desc: 'subiecte create în ultimile 365 de zile'
+    year_desc: 'subiecte create în ultimele 365 de zile'
     month: 'lună'
-    month_desc: 'subiecte create în ultimile 30 de zile'
+    month_desc: 'subiecte create în ultimele 30 de zile'
     week: 'săptămană'
-    week_desc: 'subiecte create în ultimile 7 zile'
+    week_desc: 'subiecte create în ultimele 7 zile'
     day: 'zi'
     first_post: Prima postare
     mute: Blochează
@@ -899,7 +899,7 @@ ro:
       complete_username_not_found: "Nici un cont nu se potriveşte cu utilizatorul <b>%{username}</b>"
       complete_email_not_found: "Nici un cont nu se potrivește cu adresa  <b>%{email}</b>"
     login:
-      title: "Autentificare"
+      title: "Autentificare cu"
       username: "Utilizator"
       password: "Parolă"
       email_placeholder: "email sau nume de utilizator"
@@ -923,25 +923,25 @@ ro:
       preferences: "Trebuie să fii autentificat pentru a schimba preferințele."
       forgot: "Nu îmi amintesc detaliile contului meu."
       google:
-        title: "cu Google"
+        title: "Google"
         message: "Autentificare cu Google (Verifică browserul să nu blocheze ferestrele pop-up)"
       google_oauth2:
-        title: "cu Google"
+        title: "Google"
         message: "Autentificare cu Google (Verifică browserul să nu blocheze ferestrele pop-up)"
       twitter:
-        title: "cu Twitter"
+        title: "Twitter"
         message: "Autentificare cu Twitter (Verifică browserul să nu blocheze ferestrele pop-up)"
       instagram:
-        title: "cu Instagram"
+        title: "Instagram"
         message: "Autentificare cu Instagram (Verifică browserul să nu blocheze ferestrele pop-up)"
       facebook:
-        title: "cu Facebook"
+        title: "Facebook"
         message: "Autentificare cu Facebook (Verifică browserul să nu blocheze ferestrele pop-up)"
       yahoo:
-        title: "cu Yahoo"
+        title: "Yahoo"
         message: "Autentificare cu Yahoo (Verifică browserul să nu blocheze ferestrele pop-up)"
       github:
-        title: "cu GitHub"
+        title: "GitHub"
         message: "Autentificare cu GitHub (Verifică browserul să nu blocheze ferestrele pop-up)"
     emoji_set:
       apple_international: "Apple/International"
@@ -1450,15 +1450,15 @@ ro:
         action: "comasează postările selectate"
         error: "A apărut o eroare la comasarea postărilor selectate."
       change_owner:
-        title: "Schimbă proprietarul postărilor"
+        title: "Schimbă autorul postărilor"
-        action: "Schimbă proprietarul"
+        action: "Schimbă autorul"
-        error: "A apărut o eroare la schimbarea proprietarului postărilor."
+        error: "A apărut o eroare la schimbarea autorului postărilor."
-        label: "Noul proprietar al postărilor"
+        label: "Noul autor al postărilor"
-        placeholder: "numele de utilizator al proprietarului"
+        placeholder: "numele de utilizator al autorului"
         instructions:
-          one: "Alege noul proprietar pentru mesajul postat de <b>{{old_user}}</b>."
+          one: "Alege noul autor pentru mesajul postat de <b>{{old_user}}</b>."
-          few: "Alege noul proprietar pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>."
+          few: "Alege noul autor pentru cele {{count}} mesaje postate de <b>{{old_user}}</b>."
-          other: "Alege noul proprietar pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>."
+          other: "Alege noul autor pentru cele {{count}} de mesaje postate de <b>{{old_user}}</b>."
         instructions_warn: "NB: nicio notificare ce privește această postare nu va fi transferabilă retroactiv către noul utilizator.<br>Avertisment: Acum, nicio informație ce depinde de postare nu va fi transferată noului utilizator. Folosește cu atenție."
       change_timestamp:
         title: "Schimbă data publicării"
@@ -1492,7 +1492,7 @@ ro:
       show_full: "Arată postarea în întregime"
       show_hidden: 'Arată conținut ascuns.'
       deleted_by_author:
-        one: "(post retras de autor, va fi şters automat în %{count} ore, cu excepţia cazului în care mesajul este marcat)"
+        one: "(post retras de autor, va fi şters automat într-o oră, cu excepţia cazului în care mesajul este marcat)"
         few: "(postări retrase de autor, vor fi şterse automat în %{count} ore, cu excepţia cazului în care mesajele sunt marcate)"
         other: "(postări retrase de autor, vor fi şterse automat în %{count} de ore, cu excepţia cazului în care mesajele sunt marcate)"
       expand_collapse: "extinde/restrânge"
@@ -1548,7 +1548,7 @@ ro:
         undo_like: "anulează aprecierea"
         edit: "editează această postare"
         edit_anonymous: "Ne pare rău, dar trebuie să fii autentificat pentru a edita această postare."
-        flag: "marchează această postare ca să-ți atragă atenția sau trimite o notificare privată despre ea"
+        flag: "marchează această postare ca mesaj privat sau trimite o notificare privată despre ea către un admin/moderator"
         delete: "șterge această postare"
         undelete: "restaurează această postare"
         share: "distribuie un link către această postare"
@@ -1560,11 +1560,11 @@ ro:
             other: "Vrei să ștergi cele {{count}} de răspunsuri directe la acest mesaj?"
           yes_value: "Da, șterge și răspunsurile"
           no_value: "Nu, doar postarea"
-        admin: "acțiuni administrative pentru postări"
+        admin: "acțiuni administrative pentru postare"
         wiki: "Fă postarea Wiki"
         unwiki: "Nu mai fă Wiki din postare"
-        convert_to_moderator: "Adaugă culoare pentru staff"
+        convert_to_moderator: "Adaugă culoare pentru membrii echipei"
-        revert_to_regular: "Șterge culoarea pentru staff"
+        revert_to_regular: "Șterge culoarea pentru membrii echipei"
         rebake: "Reconstruieşte HTML"
         unhide: "Arată"
         change_owner: "Schimbă proprietarul"
@@ -2173,7 +2173,7 @@ ro:
         mobile_title: "Mobil"
         space_free: "{{size}} liber"
         uploads: "încărcări"
-        backups: "copii de siguranță"
+        backups: "back-up"
         traffic_short: "Trafic"
         traffic: "Cereri web"
         page_views: "Cereri API"
@@ -2224,7 +2224,7 @@ ro:
         disagree_flag_unhide_post: "Nu sunt de acord (arată postarea)"
         disagree_flag_unhide_post_title: "Elimină orice marcaj de avertizare din postare și fă din nou vizibilă postarea"
         disagree_flag: "Nu sunt de acord"
-        disagree_flag_title: "Refuză marcaj ca fiind nevalid sau incorect"
+        disagree_flag_title: "Refuză marcaj ca fiind invalid sau incorect"
         clear_topic_flags: "Terminat"
         clear_topic_flags_title: "Subiectul a fost analizat iar problema rezolvată. Fă click pe Terminat pentru a înlătura marcajele."
         more: "(mai multe răspunsuri...)"
@@ -2408,7 +2408,7 @@ ro:
         menu:
           backups: "Backup-uri"
           logs: "Rapoarte"
-        none: "Nici o copie de siguranță disponibilă."
+        none: "Niciun backup disponibil."
         read_only:
           enable:
             title: "Activează modul exclusiv-citire"
@@ -2445,7 +2445,7 @@ ro:
             title: "Descarcă backup-ul"
           destroy:
             title: "Șterge backup-ul"
-            confirm: "Ești sigur că vrei să ștergi această copie de siguranță?"
+            confirm: "Ești sigur că vrei să ștergi acest backup?"
           restore:
             is_disabled: "Restabilirea este dezactivată din setările site-ului."
             label: "Restabilire"
@@ -2458,7 +2458,7 @@ ro:
       export_csv:
         user_archive_confirm: "Ești sigur că vrei să îți descarci mesajele?"
         success: "Exportul a fost inițiat. Vei primi un mesaj de notificare când procesul se va termina."
-        failed: "Exportul a eşuat. Verifică jurnalul."
+        failed: "Exportul a eşuat. Verifică raportul de erori."
         rate_limit_error: "Postările pot fi descărcate doar o singură dată pe zi. Te rugăm încearcă mâine."
         button_text: "Exportă"
         button_title:
@@ -2633,10 +2633,10 @@ ro:
           block: "blochează"
           do_nothing: "nu acționa"
         staff_actions:
-          title: "Acțiunile membrilor din staff"
+          title: "Acțiunile membrilor echipei"
           instructions: "Clic pe numele utilizatorului şi acţiuni pentru a filtra lista. Clic pe poza profilului pentru a vizita pagina utilizatorului."
           clear_filters: "Arată tot"
-          staff_user: "Utilizatorul din staff"
+          staff_user: "Utilizator-membru al echipei"
           target_user: "Utilizator țintă"
           subject: "Subiect"
           when: "Când"
@@ -2711,7 +2711,7 @@ ro:
             text: "Consolidează"
             title: "Crează noi înregistrari cu subrețele blocate dacă există cel puțin 'min_ban_entries_for_roll_up' înregistrări."
         logster:
-          title: "Jurnal de erori"
+          title: "Raport de erori"
       impersonate:
         title: "Joacă rolul utilizatorului"
         help: "Folosește această unealtă pentru a imita un cont de utilizator pentru depanare. Va trebui să te deconectezi după ce termini."
@@ -2726,14 +2726,14 @@ ro:
         active: "Activi"
         show_emails: "Arată email"
         nav:
-          new: "Nou"
+          new: "Noi"
-          active: "Active"
+          active: "Activi"
           pending: "În așteptare"
-          staff: 'Personalul'
+          staff: 'Membrii echipei'
-          suspended: 'Suspendate'
+          suspended: 'Suspendați'
-          blocked: 'Blocate'
+          blocked: 'Blocați'
           suspect: 'Suspecți'
-        approved: "Aprobate?"
+        approved: "Aprobați?"
         approved_selected:
           one: "aprobă utilizatorul"
           few: "aprobă utilizatorii ({{count}})"
@@ -2982,7 +2982,7 @@ ro:
           legal: "Legal"
           user_api: 'API Utilizator'
           uncategorized: 'Altele'
-          backups: "Copii de siguranță"
+          backups: "Back-up"
           login: "Autentificare"
           plugins: "Plugin-uri"
           user_preferences: "Preferințe"

config/locales/client.ru.yml

@@ -479,7 +479,7 @@ ru:
       edit: "Настройки"
       download_archive: "Скачать архив сообщений"
       new_private_message: "Новое сообщение"
-      private_message: "Сообщение"
+      private_message: "Личное сообщение"
       private_messages: "Личные сообщения"
       activity_stream: "Активность"
       preferences: "Настройки"
@@ -965,7 +965,7 @@ ru:
       reply: "Ответить"
       cancel: "Отмена"
       create_topic: "Создать тему"
-      create_pm: "Личное сообщение"
+      create_pm: "Отправить личное сообщение"
       title: "Или нажмите Ctrl+Enter"
       users_placeholder: "Добавить пользователя"
       title_placeholder: "Название: суть темы коротким предложением"
@@ -1155,7 +1155,7 @@ ru:
         change_notification_state: "Ваше текущее состояние уведомлений"
       create: 'Создать Тему'
       create_long: 'Создать новую тему'
-      private_message: 'Написать сообщение'
+      private_message: 'Новое личное соощение'
       archive_message:
         help: 'Переместить сообщение в архив'
         title: 'Архив'

config/locales/client.tr_TR.yml

@@ -26,7 +26,7 @@ tr_TR:
         millions: "{{number}}M"
     dates:
       time: "h:mm a"
-      timeline_date: "AAA YYYY"
+      timeline_date: "MMM YYYY"
       long_no_year: "D MMM h:mm a"
       long_no_year_no_time: "D MMM"
       full_no_year_no_time: "MMMM Do"
@@ -94,7 +94,7 @@ tr_TR:
     action_codes:
       public_topic: "bu konuyu %{when} herkese açık yaptı"
       private_topic: "bu konuyu %{when} özel yaptı"
-      split_topic: "%{when} bu konuyu ayırdı "
+      split_topic: "bu konuyu şu zamanda ayır: %{when}"
       invited_user: "%{when} %{who} davet edildi"
       invited_group: "%{who} %{when} davet edildi"
       removed_user: "%{when} %{who} silindi"
@@ -118,6 +118,7 @@ tr_TR:
         enabled: '%{when} listelendi'
         disabled: '%{when} listelenmedi'
     topic_admin_menu: "konuyla alakalı yönetici eylemleri"
+    wizard_required: "Forumunuzu yapılandırma zamanı geldi! <a href='%{url}' data-auto-route='true'>Kur Sihirbazını çalıştırın</a>!"
     emails_are_disabled: "Tüm giden e-postalar yönetici tarafından evrensel olarak devre dışı bırakıldı. Herhangi bir e-posta bildirimi gönderilmeyecek."
     bootstrap_mode_enabled: "Yeni sitenizi kolayca çalıştırmak için bootstrap modundasınız. Tüm yeni kullanıcılar güven seviyesi 1den başlar ve e-posta uyarıcıları açıksa günlük mail alırlar. Bu özellik kullanıcı sayısı %{min_users} rakamına ulaştığında otomatik kapatılacaktır."
     bootstrap_mode_disabled: "Bootstrap modu önümüzdeki 24 saat içinde edilgen olacaktır."
@@ -357,7 +358,7 @@ tr_TR:
       all_subcategories: "hepsi"
       no_subcategory: "hiçbiri"
       category: "Kategori"
-      category_list: "Kategori ekranı listesi"
+      category_list: "Kategori listesini göster"
       reorder:
         title: "Kategorileri Yeniden Sırala"
         title_long: "Kategori listesini yeniden yapılandır"
@@ -483,7 +484,7 @@ tr_TR:
       api_read: "okuma"
       api_read_write: "okuma ve yazma"
       staff_counters:
-        flags_given: "yardımcı bildirimler"
+        flags_given: "yardımcı bayraklar"
         flagged_posts: "bildirilen gönderiler"
         deleted_posts: "silinen gönderiler"
         suspensions: "uzaklaştırmalar"
@@ -611,10 +612,10 @@ tr_TR:
         label: "Seçili durumdaki konular yeni sayılsın"
         not_viewed: "Onları henüz görüntülemedim"
         last_here: "son ziyaretimden beri oluşturulanlar"
-        after_1_day: "son 1 gün içinde oluşturuldu"
+        after_1_day: "son 1 gün içinde oluşturulanlar"
-        after_2_days: "son 2 gün içinde oluşturuldu"
+        after_2_days: "son 2 gün içinde oluşturulanlar"
-        after_1_week: "son 1 hafta içinde oluşturuldu"
+        after_1_week: "son 1 hafta içinde oluşturulanlar"
-        after_2_weeks: "son 2 hafta içinde oluşturuldu"
+        after_2_weeks: "son 2 hafta içinde oluşturulanlar"
       auto_track_topics: "Girdiğim konuları otomatik olarak takip et"
       auto_track_options:
         never: "asla"
@@ -693,7 +694,7 @@ tr_TR:
         more_replies: "Diğer Cevapları"
         top_topics: "Başlıca Konuları"
         no_topics: "Henüz konu bulunmuyor."
-        more_topics: "Diğer Konuları"
+        more_topics: "Diğer Konular"
         top_badges: "Başlıca Rozetleri"
         no_badges: "Henüz rozet bulunmuyor."
         more_badges: "Diğer Rozetleri"
@@ -987,7 +988,7 @@ tr_TR:
       invited_to_topic: "<i title='konuya davet edildi' class='fa fa-hand-o-right'></i><p><span>{{username}}</span> {{description}}</p>"
       invitee_accepted: "<i title='davetiyeni kabul etti' class='fa fa-user'></i><p><span>{{username}}</span> davetini kabul etti!</p>"
       moved_post: "<i title='gönderiyi taşıdı' class='fa fa-sign-out'></i><p><span>{{username}}</span> taşıdı {{description}}</p>"
-      linked: "<i title='linked post' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
+      linked: "<i title='bağlanmış gönderi' class='fa fa-link'></i><p><span>{{username}}</span> {{description}}</p>"
       granted_badge: "<i title='badge granted' class='fa fa-certificate'></i><p><strong>{{description}}</strong> rozeti kazandınız!</p>"
       watching_first_post: "<i title='yeni konu' class='fa fa-dot-circle-o'></i><p><span>Yeni Konu</span> {{description}}</p>"
       group_message_summary:
@@ -1079,7 +1080,7 @@ tr_TR:
           other: "<b>{{count}}</b> konu seçtiniz."
         change_tags: "Etiketleri Değiştir"
         choose_new_tags: "Konular için yeni etiketler seçin:"
-        changed_tags: "O konuların etiketleri değiştirildi."
+        changed_tags: "Bu konuların etiketleri değiştirildi."
       none:
         unread: "Okunmamış konunuz yok."
         new: "Yeni konunuz yok."
@@ -1598,12 +1599,13 @@ tr_TR:
           title: "Susturuldu"
           description: "Bu kategorilerdeki yeni konular hakkında herhangi bir bildiri almayacaksınız ve en son gönderilerde gözükmeyecekler. "
     flagging:
-      title: 'Topluluğumuzun medeni kalmasına desteğiniz için teşekkürler!'
+      title: 'Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!'
       action: 'Gönderiyi Bildir'
       take_action: "Harekete Geç"
       notify_action: 'Mesaj'
       official_warning: 'Resmi uyarı'
       delete_spammer: "Spamcıyı Sil"
+      delete_confirm_MF: "Bu kullanıcının {POSTS, plural, one {<b>1</b> gönderisini} other {<b>#</b> gönderisini}} ve {TOPICS, plural, one {<b>1</b> konusunu} other {<b>#</b> konusunu}} silmek üzeresiniz, ayrıca kullanıcının hesabı kaldırılacak, giriş yaptığı  <b>{ip_address}</b> IP adresinden giriş yapması engellenecek ve <b>{email}</b> e-posta adresi kalıcı yasaklı listesine eklenecek. Bu kullanıcının gerçekten bir spamcı olduğuna emin misiniz?"
       yes_delete_spammer: "Evet, spamcıyı sil"
       ip_address_missing: "(uygulanamaz)"
       hidden_email_address: "(gizli)"
@@ -1625,7 +1627,7 @@ tr_TR:
         left:
           other: "{{count}} kaldı"
     flagging_topic:
-      title: "Topluluğumuzun medeni kalmasına desteğiniz için teşekkürler!"
+      title: "Topluluğumuzun düzenli kalmasına desteğiniz için teşekkürler!"
       action: "Konuyu Bildir"
       notify_action: "Mesaj"
     topic_map:
@@ -1668,7 +1670,7 @@ tr_TR:
       low {ve yüksek beğeni/gönderi oranı}
       med {ve çok yüksek beğeni/gönderi oranı}
       high {ve aşırı yüksek beğeni/gönderi oranı}
-      other {}}var
+      other {}} var
     original_post: "Özgün Gönderi"
     views: "Gösterim"
     views_lowercase:
@@ -1822,10 +1824,10 @@ tr_TR:
     badges:
       earned_n_times:
         other: "Bu rozet %{count} defa kazanılmış"
-      granted_on: "%{date} Tarihinde Verildi"
+      granted_on: "%{date} tarihinde verildi"
       others_count: "Bu rozete sahip diğer kişiler (%{count})"
       title: Rozetler
-      allow_title: "başlık girin"
+      allow_title: "uygun başlık"
       multiple_grant: "birden fazla ödüllendirilmiş"
       badge_count:
         other: "%{count} Rozet"
@@ -1913,13 +1915,13 @@ tr_TR:
           posted: "Henüz herhangi bir konuya gönderim yapmadınız."
           latest: "Yeni eklenen konu bulunmuyor."
           hot: "Hareketli konu bulunmuyor."
-          bookmarks: "Henüz imlenmiş eklenmiş bir konunuz bulunmuyor."
+          bookmarks: "Henüz imlenmiş bir konunuz bulunmuyor."
-          top: "Üst sırada bir konu bulunmuyor."
+          top: "Hareketli bir konu bulunmuyor."
           search: "Arama sonucu hiçbirşey bulunamadı."
         bottom:
           latest: "Daha fazla yeni eklenmiş konu bulunmuyor."
           hot: "Daha fazla hareketli konu bulunmuyor."
-          posted: "Daha fazla oluşturulmuş konu bulunmuyor."
+          posted: "Daha fazla gönderilmiş konu bulunmuyor."
           read: "Okunacak daha fazla konu bulunmuyor."
           new: "Daha fazla yeni konu bulunmuyor."
           unread: "Daha fazla okunmamış konu bulunmuyor."
@@ -2066,7 +2068,7 @@ tr_TR:
         custom: "Özel"
         bulk_complete: "Kullanıcılar gruba eklendi."
         bulk: "Topluca Gruba Ekle"
-        bulk_paste: "Kullanıcı adı ya da e-posta listesini yapıştırın, her satıra bir tane gelecek:"
+        bulk_paste: "Kullanıcı adı ya da e-posta listesini yapıştırın, her satıra bir tane gelecek şekilde:"
         bulk_select: "(bir grup seçin)"
         automatic: "Otomatik"
         automatic_membership_email_domains: "Bu listedeki bir e-posta alan adıyla kaydolan kullanıcılar otomatik olarak bu gruba eklenecekler:"
@@ -2077,9 +2079,14 @@ tr_TR:
         add_owners: Sahiplik ekle
         incoming_email: "Özel gelen e-posta adresi"
         incoming_email_placeholder: "e-posta adresi girin"
+        flair_url: "Avatar Kabiliyet Resmi"
+        flair_url_placeholder: "(Seçeneksel) Resim URL'i ya da Font Awesome sınıfı"
+        flair_bg_color: "Avatar Kabiliyet Arkaplan Rengi"
         flair_bg_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
+        flair_color: "Avatar Kabiliyet Resmi"
         flair_color_placeholder: "(İsteğe bağlı) Hex renk değeri"
         flair_preview: "Önizleme"
+        flair_note: "Not: Kabiliyet sadece bir kullanıcının birincil grubu için gösterecek."
       api:
         generate_master: "Ana API Anahtarı Üret"
         none: "Şu an etkin API anahtarı bulunmuyor."
@@ -2097,6 +2104,8 @@ tr_TR:
       web_hooks:
         title: "Web Kancaları"
         none: "Şu anda bir web kancası yok."
+        instruction: "Web kancaları, sitenizde belirli olaylar meydana geldiğinde dış servisleri haberdar etmek için kullanılır. Bir web kancası tetiklendiğinde, belirtilen URL'e bir POST isteği gönderilir."
+        detailed_instruction: "Seçilen olay olduğunda bir POST isteği verilen URL'e gönderilecek."
         new: "Yeni Web Kancası"
         create: "Oluştur"
         save: "Kaydet"
@@ -2104,15 +2113,25 @@ tr_TR:
         description: "Açıklama"
         controls: "Kontroller"
         go_back: "Listeye geri dön"
+        payload_url: "Veri yükü URL'i"
         payload_url_placeholder: "https://ornek.com/gonderial"
+        warn_local_payload_url: "Öyle görünüyor ki, web kancasını yerel bir URL'e ayarlamaya çalışıyorsunuz. Yerel bir adrese iletilen olay yan etki veya beklenmedik davranışlara neden olabilir. Devam edilsin mi?"
         secret_invalid: "Gizli alanında boş karakter olamaz."
         secret_too_short: "Gizi en azından 12 karakter olmalı."
         secret_placeholder: "İsteğe bağlı bir kelime, imza oluşturmak için kullanılacak"
+        event_type_missing: "En az bir olay tipi ayarlamalısınız."
         content_type: "İçerik Türü"
         secret: "Gizli"
+        event_chooser: "Bu web kancasını tetikleyecek olayların neler olmasını isterdiniz?"
         wildcard_event: "Bana her şeyi gönder."
         individual_event: "Belirli olayları seç"
+        verify_certificate: "Veri yükü URL'inin TLS sertifikasını kontrol edin."
         active: "Etkin"
+        active_notice: "Olduğu zaman olay detaylarını ileteceğiz."
+        categories_filter_instructions: "Alakalı web kancaları, eğer olay belirtilen kategoriler ile alakalıysa tetiklenecektir. Bütün kategoriler için web kancalarını tetiklemek için boş bırakın."
+        categories_filter: "Tetiklenmiş Kategoriler"
+        groups_filter_instructions: "Alakalı web kancaları, eğer olay belirtilen gruplar ile alakalıysa tetiklenecektir. Bütün gruplar için web kancalarını tetiklemek için boş bırakın."
+        groups_filter: "Tetiklenmiş Gruplar"
         delete_confirm: "Bu web kancasını sil?"
         topic_event:
           name: "Konu Olayı"
@@ -2130,17 +2149,21 @@ tr_TR:
           successful: "Başarılı"
         events:
           none: "İlgili bir olay yok."
+          redeliver: "Yeniden ilet"
           incoming:
             other: "Şu anda {{count}} yeni olay var."
           completed_in:
             other: "{{count}} saniyede tamamlandı."
           request: "İstek"
           response: "Yanıt"
+          redeliver_confirm: "Aynı veri yükünü tekrar iletmek istediğinize emin misiniz?"
           headers: "Başlıklar"
+          payload: "Veri yükü"
           body: "İçerik"
           go_list: "Listeye git"
           go_details: "Web kancasını düzenle"
           go_events: "Olaylara git"
+          ping: "Ping"
           status: "Durum Kodu"
           event_id: "Kimlik"
           timestamp: "Oluşturulma"
@@ -2152,7 +2175,7 @@ tr_TR:
         name: "İsim"
         none_installed: "Yüklenmiş herhangi bir eklentiniz yok."
         version: "Sürüm"
-        enabled: "Etkin mi?"
+        enabled: "Etkin?"
         is_enabled: "E"
         not_enabled: "H"
         change_settings: "Ayarları Değiştir"
@@ -2434,7 +2457,7 @@ tr_TR:
             backup_operation: "yedekleme operasyonu"
             deleted_tag: "silinmiş etiket"
             renamed_tag: "yeniden adlandırılmış etiket"
-            revoke_email: "e-posta kaldır"
+            revoke_email: "e-postayı kaldır"
         screened_emails:
           title: "Taranmış E-postalar"
           description: "Biri yeni bir hesap oluşturmaya çalıştığında, aşağıdaki e-posta adresleri kontrol edilecek ve kayıt önlenecek veya başka bir eylem gerçekleşecek."
@@ -2552,7 +2575,7 @@ tr_TR:
         reputation: İtibar
         permissions: İzinler
         activity: Etkinlik
-        like_count: Beğenileri / Beğendikleri
+        like_count: Verilen / Alınan Beğeniler
         last_100_days: 'son 100 günde'
         private_topics_count: Özel Konular
         posts_read_count: Okuduğu Gönderiler
@@ -2561,7 +2584,7 @@ tr_TR:
         flags_given_count: Yapılan Bildirimler
         flags_received_count: Alınan Bildirimler
         warnings_received_count: Uyarılar Alındı
-        flags_given_received_count: 'Alınan / Yapılan Bildirimler'
+        flags_given_received_count: 'Yapılan / Alınan Bildirimler'
         approve: 'Onayla'
         approved_by: "onaylayan"
         approve_success: "Kullanıcı onaylandı ve etkinleştirme bilgilerini içeren bir e-posta yollandı."
@@ -2677,7 +2700,7 @@ tr_TR:
           disabled: "profilde gösterilmiyor"
         show_on_user_card:
           title: "Kullanıcı profilinde gösterilsin mi?"
-          enabled: "kullanıcı profilinde göster"
+          enabled: "kullanıcı profilinde gösterildi"
           disabled: "kullanıcı kartında gösterilmiyor"
         field_types:
           text: 'Yazı Alanı'
@@ -2712,7 +2735,7 @@ tr_TR:
           files: 'Dosyalar'
           trust: 'Güven Seviyeleri'
           security: 'Güvenlik'
-          onebox: "Tek Kutu"
+          onebox: "Kutulama"
           seo: 'SEO'
           spam: 'İstenmeyen '
           rate_limits: 'Oran Sınırları'
@@ -2775,7 +2798,7 @@ tr_TR:
           post_revision: "Bir kullanıcı bir gönderiyi düzenlediğinde veya yeni bir gönderi oluşturduğunda"
           trust_level_change: "Bir kullanıcı güven seviyesini değiştirdiğinde"
           user_change: "Bir kullanıcı düzenlendiğinde veya oluşturduğunda"
-          post_processed: "Gönderi işlendikten sonra"
+          post_processed: "Bir gönderi işlendikten sonra"
         preview:
           link_text: "Verilen rozetleri önizle"
           plan_text: "Sorgu planıyla önizle"
@@ -2819,10 +2842,11 @@ tr_TR:
         embed_by_username: "Konu oluşturmak için kullanıcı adı"
         embed_post_limit: "Gömmek için en büyük gönderi sayısı"
         embed_username_key_from_feed: "Discourse kullanıcı adını beslemeden çekmek için anahtar"
+        embed_title_scrubber: "Gönderilerin başlığını temizlemek için kullanılan düzenli ifade"
         embed_truncate: "Gömülü gönderileri buda"
         embed_whitelist_selector: "Gömülüler içinde izin verilen elementler için CSS seçici"
         embed_blacklist_selector: "Gömülülerden kaldırılan elementler için CSS seçici"
-        embed_classname_whitelist: "CSS sınıf isimlerine izin verildi"
+        embed_classname_whitelist: "İzin verilen CSS sınıf isimleri"
         feed_polling_enabled: "Konuları RSS/ATOM aracılığıyla içe aktar"
         feed_polling_url: "İstila etmek için RSS/ATOM beslemesi URL'i"
         save: "Gömme Ayarlarını Kaydet"

config/locales/server.ar.yml

@@ -877,14 +877,7 @@ ar:
     s3_backup_config_warning: 'تم تهيئة الخادم لرفع نسخة احتياطية إلى s3، لكن واحدة على الأقل من الإعدادات التالية لم تضبط: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. أذهب إلى  <a href="/admin/site_settings">إعدادات الموقع</a> وتحديث الإعدادات. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">انظر "كيف ترفع الصور المرفوعة إلى S3؟" لتعلم المزيد</a>.'
     image_magick_warning: 'تم تهيئة الخادم لإنشاء صور مصغرة للصور الكبيرة، لكن ImageMagick لم يثبت. ثبته باستخدام مدير الحزم المفضل لك أو  <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">حمل أحدث نسخة</a>.'
     failing_emails_warning: 'يوجد %{num_failed_jobs} مهام بريد إلكتروني فشلت. تحقق من app.yml الخاص بك وتأكد من إعدادات خادم البريد أنها صحيحة. <a href="/sidekiq/retries" target="_blank">أنظر للمهام الفاشلة في Sidekiq</a>.'
-    default_logo_warning: "ضع الشعارات الرسومية لموقعك. حدث logo_url, logo_small_url, و favicon_url in <a href='/admin/site_settings'>إعدادات الموقع</a>."
-    contact_email_missing: "أدخل عنوان البريد الإلكتروني لجهة اتصال الموقع لتكون على وصول بالأمور العاجلة حول موقعك. حدثه في <a href='/admin/site_settings'>إعدادات الموقع</a>."
-    contact_email_invalid: "البريد الالكتروني للموقع معطل. حدّثه <a href='/admin/site_settings'>Site Settings</a>."
-    title_nag: "أدخل اسم موقعك. حدث العنوان في الاعدادات <a href='/admin/site_settings'>Site Settings</a>."
-    site_description_missing: "أدخل جملة وصفية واحدة لموقعك والتي ستظهر في نتائج البحث. حدّث وصف_الموقع في اعدادات الموقع <a href='/admin/site_settings'>Site Settings</a>."
     consumer_email_warning: "موقعك مهيئ لاستخدام Gmail (أو مستهلك خدمة بريد إلكتروني أخر) لإرسال بريد إلكتروني. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>حدود Gmail كمية رسائل البريد الإلكتروني التي يمكنك إرسالها</a>. فكر باستخدام مزود خدمة بريد إلكتروني مثل mandrill.com لضمان أهداف البريد الإلكتروني."
-    site_contact_username_warning: "أدخل اسم حسابات الأعضاء العاملين الودودين لإرسال رسالة مهمة آليا من تحديث site_contact_username في <a href='/admin/site_settings'>إعدادات الموقع</a>."
-    notification_email_warning: "رسائل التنبية البريدية لم تكن مرسلة من عنوان بريدي صالح على مجالك؛ توصيل البريد سيكون غير منتظم ولايمكن الاعتماد عليها. الرجاء وضع رسائل التنبية في عنوان بريدي صالح في إعدادات الموقع  <a href='/admin/site_settings'>Site Settings</a>."
     subfolder_ends_in_slash: "إعدادات المجلدات الداخلية خاطئ;ال DISCOURSE_RELATIVE_URL_ROOT يجب ان تنتهي ب سلاش."
     missing_mailgun_api_key: "هذا الموقع معد لارسال البريد الالكترونى عن طريق خدمة mailgun لكنكم لم تزودونا بمفتاح  API الخاص بكم لتعريف رسائلكم للخدمة."
   site_settings:

config/locales/server.bs_BA.yml

@@ -360,14 +360,7 @@ bs_BA:
     s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
-    default_logo_warning: "You haven't customized the logo images for your site. Update logo_url, logo_small_url, and favicon_url in the <a href='/admin/site_settings'>Site Settings</a>."
-    contact_email_missing: "You haven't provided a contact email for your site. Please update contact_email in the <a href='/admin/site_settings'>Site Settings</a>."
-    contact_email_invalid: "The site contact email is invalid. Please update contact_email in the <a href='/admin/site_settings'>Site Settings</a>."
-    title_nag: "The title Site Setting is still set to the default value. Please update it with your site's title in the <a href='/admin/site_settings'>Site Settings</a>."
-    site_description_missing: "The site_description setting is blank. Write a brief description of this forum in the <a href='/admin/site_settings'>Site Settings</a>."
     consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
-    site_contact_username_warning: "The site_contact_username setting is blank. Please update it in the <a href='/admin/site_settings'>Site Settings</a>. Set it to the username of an admin user who should be the sender of system messages."
-    notification_email_warning: "The notification_email setting is blank. Please update it in the <a href='/admin/site_settings'>Site Settings</a>."
   site_settings:
     censored_words: "Words that will be automatically replaced with &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."

config/locales/server.cs.yml

@@ -554,7 +554,6 @@ cs:
     github_config_warning: 'Server je nakonfigurován, aby povoloval registraci a přihlášení přes GitHub (enable_github_logins), ale nejsou nastaveny hodnoty "client id" a "secret". Navštivte <a href="/admin/site_settings">nastevení webu</a> a opravte nastavení. <a href="https://github.com/discourse/discourse/wiki/The-Discourse-Admin-Quick-Start-Guide" target="_blank">Pro více informací si přečtěte tento návod</a>.'
     s3_config_warning: 'Server je nakonfigurován, aby nahrával soubory na S3, ale chybí nastavení: s3_access_key_id, s3_secret_access_key nebo s3_upload_bucket. Navštivte <a href="/admin/site_settings">nastavení webu</a> a opravte nastavení. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Přečtěte si "How to set up image uploads to S3?" pro více informací</a>.'
     image_magick_warning: 'Server je nakonfigurován, aby vytvářel náhledy velkých obrázků, ale není nainstalován ImageMagick. Nainstalujte ImageMagick pomocí vašeho oblíbeného balíčkovače, nebo navštivte <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">web ImageMagick pro stažení aktuální verze</a>.'
-    contact_email_invalid: "Kontaktní email je neplatný. Prosím, aktualizujte položku contact_email v <a href='/admin/site_settings'>Nastavení webu</a>."
     consumer_email_warning: "Váš web je nastaven, aby používal Gmail (nebo jinou uživatelskou emailovou službu) k odesílání emailů. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limituje počet emailů, které můžete odeslat</a>. Zvažte použití jiného emailového poskytovatele, jako je třeba mandrill.com k zajištění doručitelnosti emailů."
   site_settings:
     default_locale: "Výchozí jazyk této Discourse instance (kód ve formátu ISO 639-1)"

config/locales/server.da.yml

@@ -726,14 +726,7 @@ da:
     s3_config_warning: 'Serveren er konfigureret til at uploade filer til s3, men mindst én af følgende indstillinger er ikke angivet: s3_access_key_id, s3_secret_access_key eller s3_upload_bucket. Gå til <a href="/admin/site_settings">indstillinger</a> og opdatér indstillingerne. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" for mere information</a>.'
     image_magick_warning: 'Serveren er konfigureret til at lave thumbnails af store billeder, men ImageMagick er ikke installeret. Installér ImageMagick med din foretrukne package manager eller <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download den seneste udgave</a>.'
     failing_emails_warning: 'Der er %{num_failed_jobs} email operationer der mislykkede. Tjek din app.yml for at sikre at din mail server indstillinger er korrekte. <a href="/sidekiq/retries" target="_blank">Se mislykkede operationer i Sidekiq</a>.'
-    default_logo_warning: "Du har ikke angivet en e-mail-adresse for dit site. Opdatér venligst contact_email under <a href='/admin/site_settings'>indstillinger</a>."
-    contact_email_missing: "Opdatér venligst med en site kontakt email under <a href='/admin/site_settings'>indstillinger</a>, således at du kan kontaktes!"
-    contact_email_invalid: "Email for site admin er ikke gyldig. Opdater det her: <a href='/admin/site_settings'>Site Settings</a>."
-    title_nag: "Skriv navnet på dit site. Opdater her: <a href='/admin/site_settings'>Site Settings</a>."
-    site_description_missing: "Skriv en kort beskrivelse af dit site, så det vil dukke op i søge resultater. Opdater her: <a href='/admin/site_settings'>Site Settings</a>."
     consumer_email_warning: "Dit site er konfigureret til at bruge Gmail (eller en anden offentlig e-mail-tjeneste) til at sende e-mail. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail har en  grænse for, hvor mange mails du kan sende</a>. Overvej at bruge en e-mail-udbyder som mandrill.com for at sikre at din mail bliver leveret."
-    site_contact_username_warning: "Enter the name of a friendly staff user account to send important automated messages from. Update site_contact_username in <a href='/admin/site_settings'>Site Settings</a>."
-    notification_email_warning: "Notifikations emails bliver ikke sendt fra en valid email adresse på dit domæne; email modtagelse vil være udfordret. Venlilgst sæt notifikations email til en valid lokal email adresse her <a href='/admin/site_settings'>Site Settings</a>."
     subfolder_ends_in_slash: "Din undermappe er ikke opsat korrekt; DISCOURSE_RELATIVE_URL_ROOT ender med en slash."
     email_polling_errored_recently:
       one: "Email afstemning har afstedkommet en fejl i de seneste 24 timer. Venligst se <a href='/logs' target='_blank'>the logs</a> for detaljer."

config/locales/server.de.yml

@@ -735,14 +735,7 @@ de:
     s3_backup_config_warning: 'Der Server ist so konfiguriert, dass Datensicherungen auf S3 geladen werden, aber mindestens eine der folgenden Einstellungen: s3_access_key_id, s3_secret_access_key oder s3_backup_bucket ist nicht festgelegt. Gehe zu <a href="/admin/site_settings">den Siteneinstellungen</a> und aktualisiere die Einstellungen. Um mehr darüber zu erfahren siehe <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"Wie konfiguriere ich das Hochladen von Bildern zu S3?" (en)</a>.'
     image_magick_warning: 'Der Server wurde konfiguriert um Vorschaubilder von grossen Bildern zu erstellen, aber ImageMagick ist nicht installiertd. Installiere ImageMagick mit deinem bevorzugten Packetmanager oder besuche <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">um das aktuelle Paket herunterzuladen</a>.'
     failing_emails_warning: "%{num_failed_jobs} E-Mails konnten nicht versendet werden. Überprüfe deine app.yml und stelle sicher, dass die E-Mail Servereinstellungen korrekt gesetzt sind. \n<a href=\"/sidekiq/retries\" target=\"_blank\">Sieh dir hier die nicht versendeten E-Mails an.</a>"
-    default_logo_warning: "Richte das Logo für deine Site ein. Konfiguriere dafür logo_url, logo_small_url und favicon_url unter <a href='/admin/site_settings'>Website-Einstellungen</a>."
-    contact_email_missing: "Gib eine Kontakt-E-Mail-Adresse an, damit du dringende Meldungen bezüglich deiner Site erhalten kannst. Trage sie in den <a href='/admin/site_settings'>Einstellungen</a> ein."
-    contact_email_invalid: "Die Site-Kontakt E-Mail-Adresse ist ungültig. Ändere sie in den <a href='/admin/site_settings'>Einstellungen</a>."
-    title_nag: "Gib einen Namen für deine Website ein. Aktualisiere dazu den „title“ in den <a href='/admin/site_settings'>Einstellungen</a>."
-    site_description_missing: "Gib eine kurze Beschreibung deiner Website ein, die in Suchergebnissen angezeigt werden soll. Aktualisiere dazu die „site_description“ in den <a href='/admin/site_settings'>Einstellungen</a>."
     consumer_email_warning: "Deine Site verwendet Gmail (oder einen anderen für Endkunden gedachten E-Mailserver) um E-Mails zu versenden. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail hat einen Grenzwert bezüglich des Sendens von E-Mails</a>. Um die E-Mail-Zustellung zu gewährleisten, solltest du die Verwendung eines anderen E-Mail-Dienstes in Erwägung ziehen."
-    site_contact_username_warning: "Gib den Namen des Benutzerkontos eines freundlichen Mitarbeiters an, der als Absender für wichtige automatische Nachrichten verwendet wird. Aktualisiere site_contact_username in den <a href='/admin/site_settings'>Website-Einstellungen</a>."
-    notification_email_warning: "Benachrichtigungs-E-Mails werden nicht von einer gültigen, zu deiner Domain gehörenden E-Mail-Adresse versandt; der E-Mail-Versand wird unberechenbar und unzuverlässig sein. Bitte trage in den <a href='/admin/site_settings'>Einstellungen</a> unter notification_email eine gültige lokale E-Mail-Adresse ein."
     subfolder_ends_in_slash: "Deine Installation in einem Pfad ist nicht korrekt, DISCOURSE_RELATIVE_URL_ROOT endet mit einem Schrägstrich."
     email_polling_errored_recently:
       one: "Beim Abrufen von E-Mails ist in den letzten 24 Stunden ein Fehler aufgetreten. Weitere Informationen findest du <a href='/logs' target='_blank'>im Fehlerprotokoll</a>."
@@ -1567,6 +1560,78 @@ de:
         Wenn der Beitrag jedoch von der Community erneut ausgeblendet wurde, wird er ausgeblendet bleiben, bis sich ein Mitarbeiter darum kümmert – und möglicherweise gibt es weitere Maßnahmen, einschließlich einer möglichen Sperrung deines Kontos.
 
         Weitre Hinweise findest du in unseren [Community-Richtlinien](%{base_url}/guidelines).
+    usage_tips:
+      text_body_template: |
+        In dieser Nachricht findest du einige Tipps um dir den Einstieg zu erleichtern.
+
+        ## Einfach weiterscrollen
+
+        Es gibt keine Knöpfe um auf die nächste Seite zu gelangen oder Seitenzahlen – um mehr zu lesen, **scrolle einfach weiter nach unten!**
+
+        Wenn neue Beiträge eingebracht werden, erscheinen diese automatisch - ohne dass die Seite neu geladen werden muss.
+
+        ## Wo bin ich?
+
+        - Um die Suche, das Menü <kbd>☰</kbd> oder deine Profilseite aufzurufen, benutze die **Schaltflächen oben rechts**.
+
+        - Das Klicken auf den Titel eines Themas bringt dich zu **deinem nächsten ungelesenen Beitrag** in diesem Thema. Um stattdessen ganz oben oder ganz unten einzusteigen, klicke die Beitragszahl oder das Datum der letzten Antwort.
+
+        <img src="%{base_url}/images/welcome/topic-list-select-areas-2x.png" width="593" height="59">
+
+        - Während des Lesens eines Themas kannst du mit Hilfe dessen Titels zum &uarr; Anfang springen. Die grüne Fortschrittsanzeige unten rechts erlaubt weitere Navigation.
+
+        <img src="%{base_url}/images/welcome/progress-bar-2x.png" width="153" height="181">
+
+        Du kannst auch <kbd>?</kbd> auf der Tastatur drücken, für eine Liste super-schneller Tastaturkürzel.
+
+        ## Wie antworte ich?
+
+        - Um auf das gesamte Thema zu antworten, benutze den Antwortknopf <img src="%{base_url}/images/welcome/reply-topic.png" width="29" height="25"> ganz unten auf der Seite.
+
+        - Um auf einen bestimmten Beitrag zu antworten kannst du die Schaltfläche <img src="%{base_url}/images/welcome/reply-post.png" width="29" height="25"> direkt unter diesem Beitrag verwenden.
+
+        Das Zitieren eines Beitrags ist mit dem Auswählen des gewünschten Texts gefolgt von einem beliebigen Antwortknopf möglich.
+
+        <img src="%{base_url}/images/welcome/quote-reply.png" width="350" height="129">
+
+        Um jemanden in auf deinen Beitrag aufmerksam zu machen, erwähne ihn durch das Eingeben von `@` gefolgt von seinem Benutzernamen.
+
+        <img src="%{base_url}/images/welcome/username-completion.png" width="230" height="131">
+
+        - Um die Diskussion in eine andere Richtung zu lenken, die beiden Themen aber zu verknüpfen, benutze bitte <img src="%{base_url}/images/welcome/reply-as-linked-topic.png" width="15" height="25"> <kbd>Mit verknüpftem Thema antworten` rechts des passenden Beitrags.
+
+
+        ## Was kann ich sonst noch machen?
+
+        Unter jedem Beitrag befinden sich Aktionsbuttons:
+
+        <img src="%{base_url}/images/welcome/like-link-flag-bookmark.png" width="169" height="46">
+
+        Um zu Zeigen, dass dir der Beitrag gefallen hat, drücke den **❤**-Knopf. Wenn du ein Problem mit einem Beitrag feststellst, mach den Autor oder die Moderatoren durch **Melden** darauf aufmerksam.
+
+        Du kannst außerdem einen Link zu einem Beitrag **teilen**, oder ihn zum Merken mit einem [**Lesezeichen**](/my/activity/bookmarks) versehen.
+
+        ## Wer schreibt mir?
+
+        Wenn jemand auf deinen Beitrag antwortet, deinen Beitrag zitiert, oder deinen `@Benutzernamen` erwähnt, zeigt sich sofort eine Zahl oben rechts auf der Seite. Dort kannst du auch deine **Benachrichtigungen** abrufen.
+
+        <img src="%{base_url}/images/welcome/notification-panel.png" width="178" height="59">
+
+        Um das Verpassen von Antworten (und Nachrichten) musst du dir keine Sorgen machen – diese werden dir 3 Minuten nach ihrer Erstellung automatisch per E-Mail zugeschickt, für den Fall dass du nicht online sein solltest wenn sie ankommen.
+
+        ## Wann sind Themen neu?
+
+        Standardmäßig gelten alle Themen die weniger als zwei Tage alt sind als neu. Alle Themen an denen du teilgenommen hast (durch Antwort, eigene Erstellung, oder längeres Lesen) werden automatisch verfolgt.
+
+        Neben diesen Themen wirst du blaue Indikatoren finden, die dich über die Aktualität informieren:
+
+        <img src="%{base_url}/images/welcome/topics-new-unread.png" width="368" height="89">
+
+        Du kannst den Informationsmodus eines Themas mit dem Menü am Ende anpassen (auch für ganze Kategorien möglich). Du kannst damit Stummstellen, Verfolgen oder Benachrichtigungen über alles Neue erhalten. Um diese Funktion zu konfigurieren, gehe in [deine Einstellungen](/my/preferences).
+
+        ## Warum kann ich manche Sachen nicht machen?
+
+        Aus Sicherheitsgründen sind neue Benutzer etwas eingeschränkt in ihren Befugnissen. Mit dem Teilnehmen hier und dem Gewinnen von Vertrauen werden diese Einschränkungen automatisch aufgehoben. Wenn du eine höhere Vertrauensstufe erlangst, kannst du außerdem ein wenig beim Moderieren helfen.
     welcome_user:
       subject_template: "Willkommen bei %{site_name}!"
       text_body_template: |

config/locales/server.en.yml

@@ -650,9 +650,16 @@ en:
     authorize: "Authorize"
     read: "read"
     read_write: "read/write"
-    description: "Would you like to grant \"%{application_name}\" %{access} access to your account?"
+    description: "\"%{application_name}\" is requesting the following access to your account:"
     no_trust_level: "Sorry, you do not have the required trust level to access the user API"
     generic_error: "Sorry, we are unable to issue user API keys, this feature may be disabled by the site admin"
+    scopes:
+      message_bus: "Live updates"
+      notifications: "Read and clear notifications"
+      push: "Push notifications to external services"
+      session_info: "Read user session info"
+      read: "Read all"
+      write: "Write all"
 
   reports:
     visits:
@@ -1387,9 +1394,8 @@ en:
 
     max_user_api_reqs_per_day: "Maximum number of user API requests per key per day"
     max_user_api_reqs_per_minute: "Maximum number of user API requests per key per minute"
-    allow_read_user_api_keys: "Allow generation of readonly user API keys"
+    allow_user_api_keys: "Allow generation of user API keys"
-    allow_write_user_api_keys: "Allow generation of write user API keys"
+    allow_user_api_key_scopes: "List of scopes allowed for user API keys"
-    allow_push_user_api_keys: "Allow generation of push user API keys"
     max_api_keys_per_user: "Maximum number of user API keys per user"
     min_trust_level_for_user_api_key: "Trust level required for generation of user API keys"
     allowed_user_api_auth_redirects: "Allowed URL for authentication redirect for user API keys"

config/locales/server.es.yml

@@ -730,14 +730,7 @@ es:
     s3_backup_config_warning: 'El servidor está configurado para permitir subir las copias de seguridad a s3, pero al menos una de las siguientes configuraciones no está realizada: s3_access_key_id, s3_secret_access_key o s3_backup_bucket. Ve a <a href="/admin/site_settings">la Configuración del Sitio</a> y actualiza la configuración. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Revisa "How to set up image uploads to S3?" para aprender más</a>.'
     image_magick_warning: 'El servidor está configurado para permitir miniaturas de imágenes grandes, pero ImageMagick no está instalado. Instala ImageMagick usando tu administrador de paquetes favorito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">descárgate la última versión</a>.'
     failing_emails_warning: 'Hay %{num_failed_jobs} jobs de email que fallaron. Revisa tu app.yml y asegúrate que la configuración del servidor de mail es correcta. <a href="/sidekiq/retries" target="_blank">Mira los jobs fallados en Sidekiq</a>.'
-    default_logo_warning: "Establece los imágenes del logo para tu sitio. Actualiza logo_url, logo_small_url, y favicon_url en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
-    contact_email_missing: "Introduce una dirección de correo electrónico de contacto para que puedan llegar mensajes urgentes sobre tu sitio. Actualízalo en <a href='/admin/site_settings'>Ajustes del sitio</a>."
-    contact_email_invalid: "La dirección email de contacto es inválida. Actualízala en la <a href='/admin/site_settings'>Configuración del Sitio</a>."
-    title_nag: "Introduce un nombre de tu sitio. Actualiza el nombre en <a href='/admin/site_settings'>Configuración del Sitio</a>."
-    site_description_missing: "Introduce una breve descripción sobre tu sitio que aparecerá en los resultados de búsqueda. Actualiza site_description en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     consumer_email_warning: "Tu sitio está configurado para Utilizar Gmail (u otro servicio de email de consumidor) para enviar email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita la cantidad de emails que puedes enviar</a>. Considera usar un proveedor de servicio email como mandrill.com para asegurarte la entrega de los emails."
-    site_contact_username_warning: "Introduce el nombre de un administrador o moderador simpático desde el cual se enviarán mensajes automáticos importantes. Actualiza site_contact_username en <a href='/admin/site_settings'>Ajustes del sitio</a>."
-    notification_email_warning: "Las notificaciones por email no están siendo enviadas desde una dirección de correo electrónico válida en tu dominio; la entrega de emails será errática y poco fiable. Por favor, establece para notification_email una dirección de correo electrónico local válida en <a href='/admin/site_settings'>Ajustes del sitio</a>."
     subfolder_ends_in_slash: "La configuación del subdirectorio no es correcta; el campo DISCOURSE_RELATIVE_URL_ROOT termina con una barra."
     email_polling_errored_recently:
       one: "El email polling ha generado un error en las pasadas 24 horas. Mira en <a href='/logs' target='_blank'>los logs</a> para más detalles."

config/locales/server.fa_IR.yml

@@ -585,14 +585,7 @@ fa_IR:
     s3_config_warning: 'سرور تنظیم شده برای بارگزاری فایل به  s3 ولی حداقل یکی از تنظیمات پیش رو تنظیم نشده است:  s3_access_key_id, s3_secret_access_key or s3_upload_bucket.  برو به <a href="/admin/site_settings"> تنظیمات سایت </a>  و بروز رسانی و تنظیمات. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> این را ببین برای بارگزاری های  عکس به  S3؟"  برای کسب اطلاعات بیشتر </a>.'
     s3_backup_config_warning: 'سرور تنظیم شده برای بارگزاری نسخه پشتیبان  به  s3 ولی حداقل یکی از تنظیمات پیش رو تنظیم نشده است:  : s3_access_key_id, s3_secret_access_key or s3_backup_bucket. برو به <a href="/admin/site_settings"> تنظیمات سایت </a> و بروز رسانی و تنظیمات  <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">  این را ببین برای تنظیم ارسال عکس ها به S3؟ "  برای کسب اطلاعات بیشتر </a>.'
     image_magick_warning: 'سرور تنظیم شده برای ساخت تامبنیل های عکس های بزرگ. ولی  ImageMagick نصب نشده است. ImageMagick را نصب کن با استفاده از بسته مدیریت یا <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank"> آخرین نسخه را دانلود کن. '
-    default_logo_warning: "یک لوگوی گرافیکی برای سایت خود انتخاب نمایید. تگ های logo_url, logo_small_url, و favicon_url را بروز رسانی کنید. <a href='/admin/site_settings'>تنظیمات سایت</a>"
-    contact_email_missing: "ایمیل  وب سایت را وارد کن که سریعا قابل دسترسی باشد  برای مواقعی که مشکلی در وب سایت وجود دارد. به روز کن در <a href='/admin/site_settings'> تنظیمات سایت</a>."
-    contact_email_invalid: "ایمیل تماس با وب سایت اشتباه است. به روز کنید در <a href='/admin/site_settings'> تنظیمات سایت </a>."
-    title_nag: "اسمت را در وب سایت وارد کن. عنوان به روز کن در <a href='/admin/site_settings'> تنظیمات سایت </a>."
-    site_description_missing: "یک جمله برای توضیحات سایتت وارد کن که در جستجو نشان داده بشود. توضیحات سایتت را به روز کن در اینجا <a href='/admin/site_settings'> تنظیمات سایت </a>."
     consumer_email_warning: "سایت شما  برای استفاده از ایمیل گوگل پیکربندی شده (یا دیگر سرویس دهندگان ایمیل) برای ارسال ایمیل. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'> جیمیل  محدود می کند که چند ایمیل می توانی بفرستی</a>. استفاده از یک ارائه دهنده خدمات ایمیل را مانند mandrill.com در نظر بگیرید برای اطمنیان از قابلیت تحوبل ایمیل. "
-    site_contact_username_warning: "برای ارسال پیام خودکار ایمیل یکی از کارکنان مهربان را وارد کن . اطلاعات تماس وب سایت را به روز کن در <a href='/admin/site_settings'> تنظیمات سایت </a>."
-    notification_email_warning: "ایمیل های آگهی دهنده از طریق ایمیل نا صحیح در دامنه شما ارسال نمی شوند; تحویل ایمیل  نامنظم و غیر قابل اعتماد خواهد بود. لطفا ایمیل آگهی دهنده را با یک ایمیل آدرس محلی وارد کنید در <a href='/admin/site_settings'> تنظیمات سایت </a>."
   site_settings:
     censored_words: "کلماتی که به صورت خودکار جایگزین می شوند با  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "پاک کردن خودکار تمام نوشته هایی که بیش از 30 روز بصورت پنهان باقی می مانند. "

config/locales/server.fi.yml

@@ -729,14 +729,7 @@ fi:
     s3_backup_config_warning: 'Palvelin on konfiguroitu lataamaan varmuuskopiot s3:een, mutta vähintään yksi arvoista s3_access_key_id, s3_secret_access_key tai s3_backup_bucket ei ole asetettu. Päivitä arvot <a href="/admin/site_settings">sivuston asetuksissa</a>.Voit lukea lisätietoja oppaasta <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?"</a>.'
     image_magick_warning: 'Palvelin on konfiguroitu luomaan esikatselukuvia suurista kuvista, mutta ImageMagickia ei ole asennettu. Asenna ImageMagick paketinhallinnasta tai <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">lataamalla uusin versio</a>.'
     failing_emails_warning: 'Epäonnistuneiden sähköpostitehtävien määrä on %{num_failed_jobs}. Tarkista app.yml ja varmista, että palvelimen asetukset ovat kunnossa. <a href="/sidekiq/retries" target="_blank">Katsele epäonnistuneita tehtäviä Sidekiqissa</a>.'
-    default_logo_warning: "Aseta sivustolle logot. Päivitä logo_url, logo_small_url, ja favicon_url <a href='/admin/site_settings'>sivuston asetuksissa</a>."
-    contact_email_missing: "Aseta yhteystietoihin sähköpostiosoite, josta sinut saa tavoitettua sivustoon liittyvissä kiireellisissä asioissa. Voit syöttää sen <a href='/admin/site_settings'>sivuston asetuksissa</a>."
-    contact_email_invalid: "Sivuston sähköpostiosoite ei kelpaa. Muokkaa sitä <a href='/admin/site_settings'>sivuston asetuksissa</a>."
-    title_nag: "Aseta keskustelupalstalle nimi. Voita muokata sitä <a href='/admin/site_settings'>sivuston asetuksissa</a>."
-    site_description_missing: "Aseta yhden lauseen mittainen kuvaus palstasta, joka näkyy hakutuloksissa. Muokkaa asetusta site_description <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     consumer_email_warning: "Sivusto on konfiguroitu käyttämään Gmailia (tai muuta yksityishenkilöille suunnattua sähköpostipalvelua) sähköpostin lähettämiseen. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail rajoittaa lähetettävien sähköpostien määrää</a>. Harkitse sähköpostipalveluntarjoajaa, kuten mandrill.com varmistaaksesi sähköpostin lähetyksen."
-    site_contact_username_warning: "Aseta käyttäjänimi, jonka nimissä palsta automaattiset viestit lähetetään. Muokkaa asetusta site_contact <a href='/admin/site_settings'>sivuston asetuksissa</a>."
-    notification_email_warning: "Palstan sähköpostien lähettäjäosoite ei ole kelvollinen, josta johtuen sähköpostit eivät mene perille luotettavasti. Aseta toimiva sähköpostiosoite kohtaan notification_email <a href='/admin/site_settings'>sivuston asetuksissa</a>."
     subfolder_ends_in_slash: "Alihakemiston asetuksesi ei kelpaa; DISCOURSE_RELATIVE_URL_ROOT päättyy vinoviivaan."
     email_polling_errored_recently:
       one: "Sähköpostin pollaus on aiheuttanut virheen edellisen 24 tunnin aikana. Tarkastele <a href='/logs' target='_blank'>lokeja</a> saadaksesi lisätietoja."

config/locales/server.fr.yml

@@ -735,14 +735,7 @@ fr:
     s3_backup_config_warning: 'Le serveur est configuré pour envoyer les sauvegardes sur S3, mais l''un des paramètres suivants n''est pas renseigné: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Allez dans les <a href="/admin/site_settings">Paramètres</a> et mettez les à jour. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Voir "Comment mettre en place une sauvegarde sur S3?" pour en savoir plus</a>.'
     image_magick_warning: 'Le serveur est configuré pour créer des aperçus des grandes images, mais ImageMagick n''est pas installé. Installez ImageMagick en utilisant votre gestionnaire de paquets favori ou bien allez ici <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pour télécharger la dernière version</a>.'
     failing_emails_warning: 'Il y a %{num_failed_jobs} tâches d''envois de courriel en erreur. Vérifiez votre fichier app.yml et assurez-vous de la conformité des paramètres du serveur de courriel. <a href="/sidekiq/retries" target="_blank">Voir aussi les processus en échec dans Sidekiq</a>.'
-    default_logo_warning: "Modifier le logo de votre site. Mettez à jour les <a href='/admin/site_settings'>paramètres du site</a> suivant : logo_url, logo_small_url et favicon_url."
-    contact_email_missing: "Saisissez l'adresse courriel de contact pour votre site web afin qu'on puisse vous contacter pour des problèmes urgents sur votre site. Mettez-le à jour dans les <a href='/admin/site_settings'>Paramètres du site</a>."
-    contact_email_invalid: "L'adresse courriel de contact du site est invalide. Mettez-le à jour dans les <a href='/admin/site_settings'>paramètre du site</a>."
-    title_nag: "Saisissez le nom de votre site. Modifier le titre sous <a href='/admin/site_settings'>Paramètres du site</a>."
-    site_description_missing: "Saisissez une phrase courte décrivant votre site et qui apparaîtra dans les moteurs de recherche. Mettez site_description à jour dans les <a href='/admin/site_settings'>Paramètres du site</a>."
     consumer_email_warning: "Votre site est configuré pour envoyer les courriels en utilisant Gmail (ou un autre site de courriels pour utilisateur standard). <a href='http://support.google.com/a/bin/answer.py?hl=fr&answer=166852' target='_blank'>Gmail limite le nombre d'emails que vous pouvez envoyer</a>. Nous vous conseillons d'utiliser un autre service d'envoi de courriels afin d'assurer une meilleure délivrabilité."
-    site_contact_username_warning: "Saisissez le pseudo d'un responsable sympathique à partir duquel sera envoyé les messages importants. Mettez à jour site_contact_username dans les <a href='/admin/site_settings'>Paramètres du site</a>."
-    notification_email_warning: "Les courriels de notification ne serot pas envoyés depuis une adresse de courriel valide sur votre domaine ; l'envoie des courriels sera aléatoire et peu fiable. Veuillez saisir une adresse de courriel locale dans notification_email  dans les <a href='/admin/site_settings'>Paramètres du site</a>."
     subfolder_ends_in_slash: "Votre configuration de sous-répertoire est erronée; DISCOURSE_RELATIVE_URL_ROOT se termine avec une barre oblique ."
     email_polling_errored_recently:
       one: "La vérification des courriels a généré une erreur au cours des 24 dernières heures. Vérifiez <a href='/logs' target='_blank'>le journal</a> pour plus de détails."
@@ -1004,6 +997,7 @@ fr:
     tl3_links_no_follow: "Ne pas retirer rel=nofollow sur les liens des messages par les utilisateurs de niveau de confiance 3."
     min_trust_to_create_topic: "Le niveau de confiance minimum pour créer un nouveau sujet."
     min_trust_to_edit_wiki_post: "Le niveau de confiance minimum requis pour modifier les messages de type wiki."
+    min_trust_to_edit_post: "Le niveau de confiance minimum requis pour modifier des messages."
     min_trust_to_allow_self_wiki: "Le niveau de confiance minimum requis pour transformer ses propres messages en type wiki."
     min_trust_to_send_messages: "Le niveau de confiance minimum pour être autorisé à créer des nouveaux messages privés."
     newuser_max_links: "Combien de liens un nouvel utilisateur peut-il ajouter à un message."

config/locales/server.he.yml

@@ -165,7 +165,7 @@ he:
   page_num: "עמוד %{num}"
   home_title: "בית"
   topics_in_category: "נושאים בקטגוריה '%{category}'"
-  rss_posts_in_topic: "תזרים RSS '%{topic}'"
+  rss_posts_in_topic: "תזרים RSS של '%{topic}'"
   rss_topics_in_category: "תזרים RSS של נושאים בקטגוריה '%{category}'"
   author_wrote: "%{author} כתב/ה:"
   num_posts: "פוסטים:"
@@ -213,10 +213,10 @@ he:
     new-topic: |
       ברוכים באים ל%{site_name} — **תודה שהתחלתם שיחה חדשה! **
       -הכותרת נשמעת מעניינת כשאתם קוראים אותה בקול רם? האם היא תקציר טוב?
-      -מי יתעניין בזה? איזה סוג של תגובות את/ה רוצה?
+      -מי יתעניין בזה? איזה סוג של תגובות אתם רוצים?
-      -השתמשו במילים נפוצות בכותרת שלך כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושאים שלכם עם נושאים קשורים בחרו קטגוריה.
+      -השתמשו במילים נפוצות בכותרת שלכם כך שאחרים יוכלו למצוא אותה. כדי לשייך את הנושאים שלכם עם נושאים קשורים בחרו קטגוריה.
       -לעוד טיפים, [ראו את כללי התנהלות בקהילה] (/guidelines).
-      הפנל הזה יופיע רק עבור %{education_posts_text} הראשונים.
+      הפנל הזה יופיע רק עבור %{education_posts_text} הפוסטים הראשונים.
     new-reply: |
       ברוכים הבאים ל %{site_name} — ** תודה על תרומתך! **
 
@@ -357,7 +357,7 @@ he:
     newuser:
       title: "משתמש חדש"
     basic:
-      title: "משתמש בסיסי"
+      title: "משתמשים בסיסיים"
     member:
       title: "חבר"
     regular:
@@ -732,14 +732,7 @@ he:
     s3_backup_config_warning: 'השרת מכוון להעלות גיבויים ל s3, אבל לפחות אחת מההגדרות הבאות לא נקבעה: s3_access_key_id, s3_secret_access_key או s3_backup_bucket. לכו ל <a href="/admin/site_settings">הגדרות האתר</a> ועדכנו את ההגדרות. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">ראו ״כיצד לקבוע העלאות קבצים ל S3?״ כדי ללמוד עוד</a>.'
     image_magick_warning: 'השרת מכוון ליצור צלמיות לתמונות גדולות, אבל ImageMagick לא מותקן. התקינו ImageMagick באמצעות מנהל החבילות האהוב עליכם או <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">הורידו את הגרסה האחרונה</a>.'
     failing_emails_warning: 'יש %{num_failed_jobs} עבודות מייל שנכשלו. בידקו את app.yml שלכם כדי לוודא ששרת המייל מוגדר כיאות. <a href="/sidekiq/retries" target="_blank">ראו את העבודות שנכשלו ב Sidekiq</a>.'
-    default_logo_warning: "כוונו את הסמלילים הגרפיים לשימוש באתר שלך. עדכנו את כתובת ה-URL של הלוגו, כתובת ה-URL ללוגו המוקטן, וכתובת ה-URL של ה-favicon. "
-    contact_email_missing: "הזינו כתובת דוא\"ל ליצירת קשר, בה ניתן יהיה ליצור עמכם קשר בנושאים דחופים בנוגע לאתר שלכם. עדכנו אותה ב<a href='/admin/site_settings'>הגדרות האתר</a>."
-    contact_email_invalid: "כתובת הדוא\"ל ליצירת קשר של האתר אינה תקינה. עדכנו אותה ב <a href='/admin/site_settings'>הגדרות האתר</a>."
-    title_nag: "הזינו את השם של האתר שלך. עדכנו את הכותרת ב<a href='/admin/site_settings'>הגדרות האתר</a>."
-    site_description_missing: "הזינו משפט אחד לתיאור האתר שלך אשר יופיע בתוצאות מנועי חיפוש. עדכנו את תיאור האתר ב<a href='/admin/site_settings'>הגדרות האתר</a>."
     consumer_email_warning: "השרת שלכם מכוון להשתמש בג׳ימייל (או שירות מייל אחר שנועד לאנשים פרטיים) כדי לשלוח מייל. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>ג׳ימייל מגביל כמה מיילים ניתן לשלוח</a>. שיקלו להשתמש בשירות מייל כמו mandrill.com כדי להבטיח שליחה של מיילים."
-    site_contact_username_warning: "הזינו שם חשבון ידידותי של אי/אשת צוות ממנו ישלחו הודעות אוטומטיות חשובות. עדכנו את site_contact_username ב<a href='/admin/site_settings'>הגדרות האתר</a>."
-    notification_email_warning: "מיילים ליידוע אינם נשלחים מכתובת תקינה בדומיין שלכם; משלוח דוא\"ל יהיה בעייתי ולא אמין. אנא כוונו את כתובת המייל למשלוח התראות לכתובת מקומית תקינה ב<a href='/admin/site_settings'>הגדרות האתר</a>."
     subfolder_ends_in_slash: "הגדרות תיקיית המשנה שלכם לא נכונות, הנתיב DISCOURSE_RELATIVE_URL_ROOT צריך להסתיים בלוכסן."
     email_polling_errored_recently:
       one: "ניסיונות שליחת מיילים יצרו תקלה ב 24 השעות האחרונות. צפו ב<a href='/logs' target='_blank'>יומנים</a> לפרטים נוספים."
@@ -898,7 +891,7 @@ he:
     sso_overrides_name: "דורס שם מלא מקומי עם שם מלא מאתר חיצוני מתוכן SSO בכל התחברות, מונע שינויים מקומיים."
     sso_overrides_avatar: "מעקף אווטאר של משתמש בעזרת אווטר אתרחיצוני מ-SSO Payload. אם אפשרות זו מופעלת, מומלץ מאוד לבטל את האפשרות להעלאת אווטר."
     sso_not_approved_url: "SSO של חשבונות שלא אושרו יופנו ל URL זה"
-    enable_local_logins: "אפשרו שם חשבונות מבוססים על שן משתמש מקומי וסיסמת התחברות. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
+    enable_local_logins: "אפשרו התחברות שמבוססת על שמות משתמשים וסיסמאות מקומיים. (שימו לב: אפשרות זו חייבת להיות מותרת כדי שהזמנות להצטרפות יפעלו)"
     allow_new_registrations: "אפשרו הרשמות משתמשים חדשים. בטלו סימון זה כדי למנוע יצירת חשבונות חדשים."
     enable_signup_cta: "הציגו מודעה למשתמשים אנונימיים חוזרים שמציעה להם להרשם כדי לקבל חשבון."
     enable_yahoo_logins: "איפשור אימות של Yahoo"
@@ -1001,6 +994,7 @@ he:
     tl3_links_no_follow: "מניעת הסרת rel=nofollow מקישורים שמפורסמים על ידי משתמשים ברמת אמון 3."
     min_trust_to_create_topic: "רמת האמון המינימלית הנדרשת כדי לייצר נושא חדש."
     min_trust_to_edit_wiki_post: "רמת האמון המינימלי הנדרשת כדי לערוך פוסט שמסומן כ-wiki."
+    min_trust_to_edit_post: "רמת האמון המינימלית הנדרשת כדי לערוך פוסטים."
     min_trust_to_allow_self_wiki: "רמת האמון המינימלית הנדרשת כדי שמשתמש יוכל להפוך פוסט של עצמו לויקי."
     min_trust_to_send_messages: "רמת האמון המינימלית המדרשת כדי ליצור הודעות פרטיות חדשות."
     newuser_max_links: "כמה קישורים יכולים משתמשים חדשים להוסיף לפוסט."
@@ -1027,7 +1021,7 @@ he:
     category_style: "סגנון ויזואלי עבור עיטורי קטגוריות."
     max_image_size_kb: "גודל קובץ מקסימלי להעלאה בקילו-בייטים (kB). ערך זה חייב להיות מוגדרת גם ב-nginx (client_max_body_size) / apache או בפרוקסי."
     max_attachment_size_kb: "הגודל המקסימלי בקילובייטים (kBs) של קבצים להעלאה. הגדרה זו חייבת להיות מוגדרת ב-nginx (client_max_body_size) / apache או בפרוקסי."
-    authorized_extensions: "רשימה של הרחבות מותרות להעלאה (השתמשו ב '*' כדי לאפשר את כל סוגי הקבצים)"
+    authorized_extensions: "רשימה של סיומות מותרות להעלאה (השתמשו ב '*' כדי לאפשר את כל סוגי הקבצים)"
     max_similar_results: "כמה נושאים דומים להציג מעל לעורך כאשר מחברים נושא חדש. ההשוואה מבוססת על הכותרת וגוף הפוסט."
     title_prettify: "מניעת טעויות נפוצות בכותרת, בכללן טעויות עם אותיות גדולות באנגלית, מספר ! ו ?, נקודה מיותרת בסוף, וכד׳"
     topic_views_heat_low: "לאחר כמות זו של צפיות,שדה הצפיות יהיה קצת יותר בהיר."
@@ -1066,9 +1060,9 @@ he:
     reply_by_email_address: "תבנית עבור כתובות מייל של מענה באמצעות אימייל, למשל: {reply_key}@reply.example.com או  replies+%{reply_key}@example.com"
     alternative_reply_by_email_addresses: "רשימה של כמה תבניות לתגובות במייל באמצעות כתובות מייל נכנסות. למשל: %{reply_key}@reply.example.com|replies+%{reply_key}@example.com"
     incoming_email_prefer_html: "השתמשו ב HTML במקום בטקסט בשביל מייל נכנס. עלול ליצור בעיות עיצוב לא-צפויות!"
-    disable_emails: "מנעו מ-Discourse ממשלו דוא\"ל כלשהו."
+    disable_emails: "מנעו מ-Discourse ממשלוח דוא\"ל כלשהו"
     strip_images_from_short_emails: "הסרת תמונות מדוא\"ל בגודל של פחות מ-2800 בייטים"
-    short_email_length: "אורכו של דוא\"ל קצר בבייטים (Bytes)"
+    short_email_length: "אורכו של דוא\"ל קצר בבתים (Bytes)"
     display_name_on_email_from: "הצגת שמות מלאים בשדה ה״מאת״ במיילים"
     unsubscribe_via_email: "אפשרו למשתמשים לבטל מנוי אימייל באמצעות שליחת מייל עם המילה ״unsubscribe״ בנושא או גוף המייל"
     unsubscribe_via_email_footer: "צירוף ״ביטול מנוי באמצעות קישור מייל mailto:״ בתחתית מיילים נשלחים"
@@ -2024,7 +2018,7 @@ he:
 
         %{respond_instructions}
     user_invited_to_topic:
-      subject_template: "הוזמנת לדיון שכותרתו  '%{topic_title}' על ידי [%{site_name}] %{username}"
+      subject_template: "הוזמנת לדיון שכותרתו '%{topic_title}' על ידי [%{site_name}] %{username}"
       text_body_template: |
         %{header_instructions}
 

config/locales/server.it.yml

@@ -706,14 +706,7 @@ it:
     s3_backup_config_warning: 'Il server è configurato per caricare i backup su S3, ma almeno una delle seguenti impostazioni non è impostata: s3_access_key_id, s3_secret_access_key, s3_backup_bucket. Vai nelle <a href="/admin/site_settings">Impostazioni Sito</a> e aggiorna le impostazioni. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Leggi anche "How to set up image uploads to S3?" per saperne di più</a>.'
     image_magick_warning: 'Il server è configurato per creare miniature di immagini grandi, ma ImageMagick non è installato. Installa ImageMagick usando il tuo package manager preferito o <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">scarica la versione più recente</a>.'
     failing_emails_warning: 'Ci sono %{num_failed_jobs} job di email falliti. Controlla il file app.yml e assicurati che le impostazioni del mail server siano corrette. <a href="/sidekiq/retries" target="_blank">Vedi i job falliti in Sidekiq</a>.'
-    default_logo_warning: "Non hai personalizzato il logo del tuo sito. Aggiorna logo_url, logo_small_url e favicon_url nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    contact_email_missing: "Inserisci un indirizzo email di contatto per il sito, in modo da essere raggiungibile per questioni urgenti riguardanti il sito. Aggiornalo nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    contact_email_invalid: "La email di contatto non è valida. Aggiornala nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    title_nag: "Inserisci il nome del tuo sito. Aggiorna il titolo nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    site_description_missing: "Scrivi una breve descrizione del sito che comparirà nei risultati di ricerca. Aggiorna site_description nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
     consumer_email_warning: "Il tuo sito è configurato per usare Gmail (o un altro servizio email consumer) per inviare le email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita il numero di email che puoi inviare</a>. Considera l'utilizzo di un fornitore di servizi come mandrill.com per assicurare l'invio delle email."
-    site_contact_username_warning: "Inserisci il nome di un membro dello staff da cui inviare messaggi importanti in maniera automatica. Aggiorna site_contact_username nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
-    notification_email_warning: "Le email di notifica non vengono inviate da un indirizzo email valido del tuo dominio; l'invio di email sarà inaffidabile. Definisci notification_email con un indirizzo email valido nelle <a href='/admin/site_settings'>Impostazioni Sito</a>."
     subfolder_ends_in_slash: "L'impostazione della sottocartella è errata; DISCOURSE_RELATIVE_URL_ROOT finisce con uno slash."
   site_settings:
     censored_words: "Parole che saranno automaticamente sostituite con &#9632;&#9632;&#9632;&#9632;"
@@ -1212,6 +1205,7 @@ it:
     email_error_notification:
       subject_template: "[%{site_name}] Problema relativo all'email -- Errore di autenticazione POP"
     too_many_spam_flags:
+      subject_template: "Nuovo account sospeso"
       text_body_template: |
         Salve,
 
@@ -1220,8 +1214,16 @@ it:
         Come misura precauzionale, il tuo nuovo account non può creare altre risposte o argomenti finché il tuo account non verrà revisionato da un membro dello staff. Ci scusiamo per il disagio.
 
         Per ulteriori informazioni, ti rimandiamo alle [linee guida della comunità](%{base_url}/guidelines).
+    too_many_tl3_flags:
+      subject_template: "Nuovo account sospeso"
+    blocked_by_staff:
+      subject_template: "Account temporaneamente sospeso"
+    user_automatically_blocked:
+      subject_template: "Nuovo utente %{username} bloccato dalle segnalazioni della comunità"
     spam_post_blocked:
       subject_template: "Il messaggi del nuovo utente %{username} sono stati bloccati a causa dell'invio di ripetuti collegamenti."
+    unblocked:
+      subject_template: "Account non più sospeso"
     pending_users_reminder:
       subject_template:
         one: "1 utente in attesa di approvazione"
@@ -1233,13 +1235,21 @@ it:
     download_remote_images_disabled:
       subject_template: "Lo scaricamento delle immagini remote è disabilitato"
       text_body_template: "L'impostazione `download_remote_images_to_local` è stata disabilitata perché è stato raggiunto il limite di spazio su disco definito in `download_remote_images_threshold`."
+    dashboard_problems:
+      subject_template: "Si sono riscontrati problemi"
   subject_re: "R:"
   subject_pm: "[MP]"
   user_notifications:
     previous_discussion: "Risposte Precedenti"
+    in_reply_to: "In Risposta A"
     unsubscribe:
       title: "Annulla iscrizione"
       description: "Non vuoi ricevere queste email? Nessun problema! Clicca qui sotto per annullare l'iscrizione:"
+    reply_by_email: "[Visita Argomento](%{base_url}%{url}) o rispondi a questa email per replicare."
+    reply_by_email_pm: "[Visita Messaggio](%{base_url}%{url}) o rispondi a questa email per replicare."
+    only_reply_by_email: "Rispondi a questa email per replicare."
+    visit_link_to_respond: "[Visita Argomento](%{base_url}%{url}) per replicare."
+    visit_link_to_respond_pm: "[Visita Messaggio](%{base_url}%{url}) per replicare."
     posted_by: "Pubblicato da %{username} il %{post_date}"
     user_invited_to_private_message_pm:
       subject_template: "[%{site_name}] %{username} ti invita al partecipare al messaggio '%{topic_title}'"
@@ -1345,6 +1355,7 @@ it:
     mailing_list:
       from: "%{site_name} riepilogo"
       new_topics: "Nuovi argomenti"
+      topic_updates: "Aggiornamenti argomento"
       view_this_topic: "Vedi questo argomento"
       back_to_top: "Torna in cima"
     forgot_password:
@@ -1498,6 +1509,9 @@ it:
       name: Autobiografo
     anniversary:
       name: Compleanno
+      description: Membro attivo per un anno, ha scritto almeno una volta
+      long_description: |
+        Questo distintivo è assegnato a chi è membro da un anno con almeno un messaggio scritto durante quell'anno. Grazie per esserci e contribuire alla nostra comunità. Non potremmo farcela senza di te.
     great_topic:
       description: Ha ricevuto 50 "Mi piace" in un argomento
     first_like:

config/locales/server.ja.yml

@@ -567,14 +567,7 @@ ja:
     s3_config_warning: 'サーバが S3 にファイルをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key or s3_upload_bucket。<a href="/admin/site_settings">サイトの設定</a> にて設定を更新してください。<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは "How to set up image uploads to S3?" を参考にしてください</a>。'
     s3_backup_config_warning: 'サーバが S3 にバックアップをアップロードするように設定されていますが、次のうち少なくとも1つが設定されていません: s3_access_key_id, s3_secret_access_key or s3_upload_bucket。<a href="/admin/site_settings">サイトの設定</a> にて設定を更新してください。<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">詳しくは "How to set up image uploads to S3?" を参考にしてください</a>'
     image_magick_warning: 'サーバが大きな画像のサムネイルを作成する設定になっていますが、ImageMagick がインストールされていません。お好きなパッケージマネージャを使って ImageMagick をインストールするか、<a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">最新のリリースをダウンロードしてください</a>。'
-    default_logo_warning: "あなたのサイトのロゴを設定しましょう。<a href='/admin/site_settings'>サイトの設定</a>で logo_url, logo_small_url, favicon_url を更新してください。"
-    contact_email_missing: "サイトに関する緊急連絡が行えるように、連絡先メールアドレスを入力してください。<a href='/admin/site_settings'>サイトの設定</a>で更新できます"
-    contact_email_invalid: "サイトの連絡先メールアドレスが正しくありません。<a href='/admin/site_settings'>サイトの設定</a>で更新してください"
-    title_nag: "サイトの名前が正しくありません。<a href='/admin/site_settings'>サイトの設定</a>で更新してください"
-    site_description_missing: "検索結果に表示される説明文を入力してください。<a href='/admin/site_settings'>サイトの設定</a>で更新してください"
     consumer_email_warning: "サイトはメール送信に Gmail (または他のカスタムメールサービス) を利用するように設定されています。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail で送信可能なメール数には制限があります</a>。メールを確実に送信するために mandrill.com などのメールサービスプロバイダーの利用を検討してください。"
-    site_contact_username_warning: "重要なメッセージを送るために、スタッフユーザの名前を入力してください。<a href='/admin/site_settings'>サイト設定</a> のsite_contact_username を更新してください。"
-    notification_email_warning: "通知用メールがあなたのドメインで有効なメールアドレスから送信されていません。メール配信が不安定になり、信頼性が低くなります。\n<a href='/admin/site_settings'>サイトの設定</a>で更新してください"
   site_settings:
     censored_words: "自動的に &#9632;&#9632;&#9632;&#9632; で置換されます"
     delete_old_hidden_posts: "30日以上非表示になっている投稿を自動で削除します"

config/locales/server.ko.yml

@@ -570,14 +570,7 @@ ko:
     s3_config_warning: '파일을 Amazon S3로 업로드 하도록 설정하였습니다. 하지만 아직 Access key id(s3_access_key_id), Secret access key(s3_secret_access_key) 혹은 S3 bucket(s3_upload_bucketat) 중 하나를 설정하지 않았습니다. <a href="/admin/site_settings">사이트 세팅</a>에서 설정해주세요. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">자세히 알아보기("How to set up image uploads to S3?")</a>.'
     s3_backup_config_warning: 's3를 이용한 서버 설정이 완료 되지 않았습니다: s3_access_key_id, s3_secret_access_key, s3_secret_access_key 또는 s3_upload_bucket. <a href="/admin/site_settings">사이트 설정</a> 에 가셔서 업데이트 하세요. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">"How to set up image uploads to S3?" 읽어 보세요.</a>'
     image_magick_warning: '큰 이미지의 섬네일 만드는 설정이 있지만, ImageMagick가 설치되지 않았습니다. <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">최신버전 받기</a>.'
-    default_logo_warning: "사이트에 로고를 설정해 주세요. logo_url, logo_small_url, 와 favicon_url 를 <a href='/admin/site_settings'>사이트 설정</a> 에서 설정하세요."
-    contact_email_missing: "사이트에 이메일을 설정해서 사이트와 관련된 긴급사항을 받아보세요. contact_email 을 <a href='/admin/site_settings'>사이트 설정</a> 에서 설정해주세요."
-    contact_email_invalid: "이 사이트의 연락가능한 이메일이 부정확 합니다.  <a href='/admin/site_settings'>사이트 설정</a> 에서 업데이트 해주세요."
-    title_nag: "사이트 이름을 설정하세요. <a href='/admin/site_settings'>사이트 설정</a> 에서 사이트 이름을 업데이트 해주세요."
-    site_description_missing: "검색 결과에 나올 한줄 설명을 적어주세요. <a href='/admin/site_settings'>사이트 설정</a>에서 site_description 업데이트하세요."
     consumer_email_warning: "이메일 전송을 위해 Gmail(또는 다른 커스텀 이메일 서비스)을 사용하고 있습니다. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail의 이메일 전송 제한</a> 을 읽어보세요. mandrill.com을 이메일 서비스로 설정하는 것을 고려해보세요."
-    site_contact_username_warning: "중요 자동 메세지를 보낼 스태프 사용자 계정의 이름을 적으세요. <a href='/admin/site_settings'>사이트 설정</a>에서 site_contact_username을 업데이트하세요."
-    notification_email_warning: "알람 메일이 올바른 이 사이트의 도메인 내 이메일 주소로 전송되지 않고 있습니다; 이메일 전송이 안정적이지 않을 것입니다. <a href='/admin/site_settings'>사이트 설정</a>에서 올바른 도메인의 이메일 주소로 정해주세요."
   site_settings:
     censored_words: "단어는 자동적으로 `&#9632;&#9632;&#9632;&#9632;` 로 대체 됩니다."
     delete_old_hidden_posts: "30일이 지난 숨겨진 글은 자동으로 삭제됩니다."

config/locales/server.nb_NO.yml

@@ -559,7 +559,6 @@ nb_NO:
     rails_env_warning: "Serveren din kjører i %{env] modus."
     host_names_warning: "Din config/database.yml fil bruker standard localhost hostnavn. Venligst legg inn ditt ønskede hostnavn"
     memory_warning: 'Serveren din kjører med mindre enn 1 GB med minne. Minst 1 GB RAM er anbefalt.'
-    title_nag: "Oppgi navnet på nettstedet. Oppdater tittelen under <a href='/admin/site_settings'>Nettstedinstillinger</a>."
   site_settings:
     censored_words: "Ord som automatisk vil bli erstattet med &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-slett skjulte innlegg som er skjult i mer enn 30 dager."

config/locales/server.nl.yml

@@ -697,14 +697,7 @@ nl:
     s3_backup_config_warning: 'De server is geconfigureerd om backups naar s3 toe te staan, maar op zijn minst een van de volgende instellingen is niet ingesteld: s3_access_key_id, s3_secret_access_key of s3_backup_bucket. Ga naar <a href="/admin/site_settings">de Site Instellingen</a> en stel deze in. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Bekijk "How to set up image uploads to S3?" voor meer informatie</a>.'
     image_magick_warning: 'De server is geconfigureerd om thumbnails te maken van grote afbeeldingen, maar ImageMagick is niet geïnstalleerd. Installeer ImageMagick met je favoriete package manager of <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download de laatste release</a>.'
     failing_emails_warning: 'Er zijn %{num_failed_jobs} e-mail jobs mislukt. Controleer in app.yml of de e-mailserver instelling correct zijn. <a href="/sidekiq/retries" target="_blank">Toon de mislukte jobs in Sidekiq</a>.'
-    default_logo_warning: "Stel de grafische logos voor je site in. Stel logo_url, logo_small_url, en favicon_url in in <a href='/admin/site_settings'>Site Instellingen</a>."
-    contact_email_missing: "Vul een site contact email adres in zodat je te bereiken bent voor dringende zaken aangaande je site. Stel deze in via <a href='/admin/site_settings'>Site Instellingen</a>."
-    contact_email_invalid: "De site contact email is ongeldig. Verander deze in <a href='/admin/site_settings'>Site Instellingen</a>."
-    title_nag: "Vul de naam van je site in. Verander titel in <a href='/admin/site_settings'>Site Instellingen</a>."
-    site_description_missing: "Vul een omschrijving in van een regel over je site welke tevoorschijn zal komen in zoekresultaten. Verander site_description in <a href='/admin/site_settings'>Site Instellingen</a>."
     consumer_email_warning: "Je site is ingesteld om Gmail te gebruiken voor het versturen van mails. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail heeft limieten voor het aantal mails dat je kan versturen</a>. Overweeg om een andere e-mailprovider te gebruiken om er zeker van te zijn dat mails aankomen."
-    site_contact_username_warning: "Vul de naam in van een vriendelijke staf gebruikersaccount om belangrijke geautomatiseerde berichten vandaan te verzenden. Verander site_contact_username in <a href='/admin/site_settings'>Site Instellingen</a>."
-    notification_email_warning: "Notificatie e-mails worden niet verzonden van een geldig email-adres op je domein; email bezorging zal onberekenbaar en onbetrouwbaar zijn. Verander a.u.b. notification_email naar een geldig lokaal email adres in <a href='/admin/site_settings'>Site Instellingen</a>."
     subfolder_ends_in_slash: "Je submap setup is onjuist; de DISCOURSE_RELATIVE_URL_ROOT eindigt in een schuine streep."
   site_settings:
     censored_words: "Woorden welke automatisch vervangen zullen worden met &#9632;&#9632;&#9632;&#9632;"

config/locales/server.pl_PL.yml

@@ -699,14 +699,7 @@ pl_PL:
     s3_config_warning: 'Serwer jest skonfigurowany by przesyłać pliki na s3, ale przynajmniej jedno z następujących ustawień nie jest ustawione: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Przejdź do <a href="/admin/site_settings">ustawień serwisu</a> i zmień ustawienia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Zobacz ten poradnik by dowiedzieć się więcej</a>.'
     s3_backup_config_warning: 'Serwer jest skonfigurowany tak, aby wysyłać kopie zapasowe do s3, ale jedno z ustawień nie jest ustawione prawidłowo: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Idź do <a href="/admin/site_settings"> ustawień strony </a> i zaktualizuj ustawienia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Zobacz Jak ustawić wysyłanie zdjęć do S3 </a>.'
     image_magick_warning: 'Serwer jest skonfigurowany by tworzyć miniaturki dużych obrazów, ale ImageMagick nie jest zainstalowany. Zainstaluj ImageMagick za pomocą ulubionego menedżera pakietów lub <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">pobierz najnowszą wersję</a>.'
-    default_logo_warning: "Ustaw logo dla swojej strony. Zaktualizuj logo_url, logo_small_url i favicon_url tutaj: <a href='/admin/site_settings'>ustawienia strony</a>."
-    contact_email_missing: "Wprowadź kontaktowy adres e-mail strony, aby otrzymywać ważne powiadomienia w sprawie strony. Zaktualizuj to w <a href='/admin/site_settings'>Ustawieniach strony</a>. "
-    contact_email_invalid: "Kontaktowy adres email jest zły. Zaktualizuj to w  <a href='/admin/site_settings'>Ustawieniach strony</a>."
-    title_nag: "Wprowadź nazwę swojej strony. Zaktualizuj tytuł w <a href='/admin/site_settings'>Ustawieniach strony</a>."
-    site_description_missing: "Wprowadź jedno zdanie opisujące Twoją stronę, które pojawi się w wynikach wyszukiwania. Zaktualizuj opis strony w <a href='/admin/site_settings'>Ustawieniach strony</a>."
     consumer_email_warning: "Twój serwis jest skonfigurowany by używać Gmaila (lub innego konsumenckiego serwisu poczty) do wysyłania emaili. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail ogranicza jak dużo wiadomości możesz wysłać</a>. Rozważ wykorzystanie dostawcy serwisu pocztowego jak mandrill.com by zagwarantować dostarczanie poczty."
-    site_contact_username_warning: "Wprowadź nazwę użytkownika zespołu, aby wysłać ważny szablon automatycznej wiadomości. Zaktualizuj site_contact_username w <a href='/admin/site_settings'> Ustawieniach Strony </a>"
-    notification_email_warning: "Emaile z powiadomieniami nie zostały wysłane z prawidłowego adresu email na twojej domenie; dostawca usługi email może być niekonsekwentny i nierzetelny. Ustaw prawidłowy email w notification_email w <a href='/admin/site_settings'>Ustawieniach Strony</a>."
   site_settings:
     censored_words: "Wskazane słowa będą automatycznie zamieniane na  &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Automatycznie kasuj wpisy ukryte dłużej niż 30 dni."

config/locales/server.pt.yml

@@ -715,14 +715,7 @@ pt:
     s3_backup_config_warning: 'O servidor está configurado para carregar cópias de segurança para s3, mas pelo menos uma das seguintes configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá <a href="/admin/site_settings">às Configurações do Sítio</a> e atualize as definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank"> Veja "How to set up image uploads to S3?" para saber mais</a>.'
     image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando o seu gestor de pacotes preferido ou aceda a <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para descarregar a última versão</a>.'
     failing_emails_warning: 'Há %{num_failed_jobs} tarefas de email que falharam. Verifique o seu app.yml e assegure-se que as configurações do servidor de email estão corretas. <a href="/sidekiq/retries" target="_blank"> Veja as tarefas que falharam no Sidekiq</a>.'
-    default_logo_warning: "Defina os logótipos gráficos do seu sítio. Atualize logo_url, logo_small_url, e favicon_url nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
-    contact_email_missing: "Introduza um endereço de email de contacto para que possa ser alcançado para assuntos urgentes relativamente ao seu sítio. Atualize-o nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
-    contact_email_invalid: "O email de contacto do sítio é inválido. Atualize-o nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
-    title_nag: "Introduza o nome do seu sítio. Atualize o título nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
-    site_description_missing: "Introduza uma descrição de uma frase do seu sítio que irá aparecer nos resultados da pesquisa. Atualize a descrição_sítio nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
     consumer_email_warning: "O seu sítio está configurado para usar Gmail (ou outro serviço de email)<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>O Gmail limita a quantidade de emails que pode enviar</a>. Considere usar um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados."
-    site_contact_username_warning: "Introduza o nome de uma conta de utilizador de um membro do pessoal de onde possam ser enviadas mensagens importantes automatizadas. Atualize sítio_contacto_nomedeutilizador nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
-    notification_email_warning: "Não estão a ser enviados emails de notificação a partir de um endereço de email válido no seu domínio; a entrega do email será errática e não fiável. Por favor configure notificaçao_email para um endereço de email local válido nas <a href='/admin/site_settings'>Configurações do Sítio</a>."
     subfolder_ends_in_slash: "A configuração da sua sub-página está incorreta; o DISCOURSE_RELATIVE_URL_ROOT termina com um traço."
     email_polling_errored_recently:
       one: "A consulta automática de emails gerou um erro nas últimas 24 horas. Consulte em <a href='/logs' target='_blank'>os registos</a> para mais detalhes."

config/locales/server.pt_BR.yml

@@ -285,6 +285,7 @@ pt_BR:
               common: "é uma das 10000 senhas mais comuns. Por favor, use uma senha mais segura."
               same_as_username: "é igual o seu nome de usuário. Por favor use uma senha mais segura."
               same_as_email: "é igual o seu email. Por favor use uma senha mais segura."
+              same_as_current: "A senha inserida é a mesma que a sua atual senha. Favor inserir uma nova e mais segura."
             ip_address:
               signup_not_allowed: "Cadastro não é permitido a partir desta conta."
         color_scheme_color:
@@ -478,6 +479,7 @@ pt_BR:
     continue_button: "Continuar no %{site_name}"
     welcome_to: "Bem-vindo a %{site_name}!"
     approval_required: "Um moderador tem que aprovar a sua conta para que você possa acessar este fórum. Você receberá um email quando sua conta for aprovada!"
+    missing_session: "Não conseguimos detectar se sua conta foi criada. Por favor, certifique-se de que você está com os cookies do navegador habilitados."
   post_action_types:
     off_topic:
       title: 'Off-Topic'
@@ -549,6 +551,7 @@ pt_BR:
   unsubscribe:
     title: "Desinscrever"
     stop_watching_topic: "Parar de observar este tópico, %{link}"
+    mute_topic: "Silenciar todas as notificações para este tópico, %{link} "
     unwatch_category: "Parar de observar todos os tópicos na categoria  %{category}"
     mailing_list_mode: "Desativar o modo lista de discussão"
     disable_digest_emails: "Pare de me enviar emails de resumo"
@@ -712,14 +715,7 @@ pt_BR:
     s3_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_upload_bucket. Vá até as <a href="/admin/site_settings">Configurações do Site</a> e atualize estas definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Veja "How to set up image uploads to S3?" para saber mais</a>.'
     s3_backup_config_warning: 'O servidor está configurado para fazer upload de arquivos para o s3, mas pelo menos uma destas configurações não está definida: s3_access_key_id, s3_secret_access_key ou s3_backup_bucket. Vá até as <a href="/admin/site_settings">Configurações</a> e atualize estas definições. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Veja "How to set up image uploads to S3?" para saber mais</a>.'
     image_magick_warning: 'O servidor está configurado para criar miniaturas de imagens grandes, mas o ImageMagick não está instalado. Instale o ImageMagick usando seu gerenciador de pacotes preferido ou acesse <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">para fazer download da última versão</a>.'
-    default_logo_warning: "Defina os logotipos gráficos para o seu site. Atualize logo_url, logo_small_url, e favicon_url nas <a href='/admin/site_settings'>Configurações do Site</a>."
-    contact_email_missing: "Digite um email de contato do site para que você possa ser encontrado para assuntos urgentes sobre o seu site. Atualize-o nas <a href='/admin/site_settings'>Configurações do Site</a>."
-    contact_email_invalid: "O email de contato do site é inválido. Atualize-o nas <a href='/admin/site_settings'>Configurações do Site</a>."
-    title_nag: "Digite o nome do seu site. Atualize o título nas <a href='/admin/site_settings'>Configurações do Site</a>."
-    site_description_missing: "Digite uma frase de descrição do seu site que aparecerá em resultados de busca. Atualize site_description nas <a href='/admin/site_settings'>Configurações do Site</a>."
     consumer_email_warning: "Seu site está configurado para usar Gmail (ou outro serviço de email para pessoas). <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limita a quantidade de emails que você pode enviar</a>. Considere o uso de um serviço de envio de emails como mandrill.com para assegurar a entregabilidade dos emails enviados."
-    site_contact_username_warning: "Digite o nome de um membro interno para enviar mensagens importantes automaticamente a partir dele. Atualize site_contact_username em <a href='/admin/site_settings'>Configurações do Site</a>."
-    notification_email_warning: "Emails de notificação não estão sendo enviados por um endereço de email válido no seu domínio; entrega de email será errática e não confiável. Por favor configure notification_email com um endereço de email local válido nas <a href='/admin/site_settings'>Configurações do Site</a>."
   site_settings:
     censored_words: "Palavras que serão substituídos automaticamente por &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-apagar todas as mensagens ocultas que ficar oculta por mais de 30 dias."
@@ -761,6 +757,7 @@ pt_BR:
     post_excerpt_maxlength: "Limite de caracteres para o resumo de um post."
     post_onebox_maxlength: "Tamanho máximo para um Post em caracteres"
     onebox_domains_whitelist: "Uma lista de domínios para os quais permitir oneboxing; estes domínios devem suportar OpenGraph ou oEmbed. Teste-os em http://iframely.com/debug"
+    logo_url: "O logotipo ao lado superior esquerdo de seu site deve ser um retângulo largo. Se for deixado em branco, o que aparecerá será o nome do site. "
     apple_touch_icon_url: "Ícone usado para dispositivos Apple. Tamanho recomendado é 144px por 144px."
     notification_email: "O endereço de email utilizado quando enviado emails do sistema. O domínio especificado deve ter registros SPF, DKIM e PTR, devidamente configurados para que os email funcionem corretamente."
     email_custom_headers: "A lista delimitada por barras verticais de cabeçalhos de e-mail personalizados"
@@ -777,6 +774,7 @@ pt_BR:
     anon_polling_interval: "Com que frequencia os clientes não registrados podem solicitar o servidor em milisegundos"
     background_polling_interval: "Com que frequência os clientes podem solicitar o servidor em milisegundos ( em segundo plano )"
     cooldown_minutes_after_hiding_posts: "Número de minutos que um usuário deve esperar antes de poder editar uma publicação que foi ocultada devido a sinalização da comunidade."
+    max_replies_in_first_day: "O número máximo de respostas que um usuário está habilitado para criar é de 24 horas após a criação de sua primeira postagem. "
     tl2_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl2 (membros) multiplicando por esse número"
     tl3_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl3 (regular) multiplicando por esse número"
     tl4_additional_likes_per_day_multiplier: "Aumentar limite de likes por dia para tl4 (lideres) multiplicando por esse número"
@@ -883,6 +881,7 @@ pt_BR:
     s3_cdn_url: "O endereço do CDN para usar para todos artefatos do s3 (por exemplo: https://cdn.algumlugar.com). AVISO: depois de mudar esta configuração você deve reconverter todas mensagens antigas."
     avatar_sizes: "Lista de tamanhos de avatar gerados automaticamente."
     external_system_avatars_enabled: "Usar serviço de avatar externo."
+    allow_all_attachments_for_group_messages: "Permitir todos os anexos de e-mail para mensagens de grupo."
     enable_flash_video_onebox: "Habilitar o embutir de links swf e flv (Adobe Flash) em oneboxes. AVISO: pode introduzir riscos de segurança."
     default_invitee_trust_level: "Nível de confiança (0-4) padrão para usuários convidados."
     default_trust_level: "Nível de confiança (0-4) para todos novos usuários. CUIDADO! Mudar irá colocar em sérios riscos de spam."
@@ -902,6 +901,7 @@ pt_BR:
     tl3_links_no_follow: "Não remover rel=nofollow de links postados por usuários do nível de confiança 3."
     min_trust_to_create_topic: "O nível de confiança mínimo necessário para criar um novo tópico."
     min_trust_to_edit_wiki_post: "O nível de confiança mínimo necessário para editar uma postagem marcada como wiki."
+    min_trust_to_edit_post: "O nível mínimo de confiança requerido para editar posts. "
     newuser_max_links: "Quandos links um usuário novo pode adicionar a um post."
     newuser_max_images: "Quantas imagens um usuário novo pode adicionar a um post."
     newuser_max_attachments: "Quantos arquivos anexos um usuário novo pode adicionar a um post."
@@ -1609,6 +1609,8 @@ pt_BR:
     images:
       too_large: "Desculpe, a imagem que você está tentando enviar é muito grande (o tamanho máximo é %{max_size_kb}KB), por favor a redimensione e tente novamente."
       size_not_found: "Desculpe, mas não conseguimos determinar o tamanho da imagem. É possível que seu arquivo de imagem esteja corrompido?"
+  avatar:
+    missing: "Desculpe! Não conseguimos achar nenhum avatar associado a esse endereço de email. Você pode tentar novamente?"
   email_log:
     no_user: "Não foi possível encontrar usuário com id %{user_id}"
     anonymous_user: "Usuário é anônimo"
@@ -1657,6 +1659,8 @@ pt_BR:
     leader:
       name: Líder
       description: <a href="https://meta.discourse.org/t/what-do-user-trust-levels-do/4924/7">Concedido</a> o acesso para editar globalmente, fixar, fechar, arquivar, desmembrar e unificar tópicos, além de mais curtidas
+      long_description: |
+        Este emblema é concedido quando você alcança o nível de confiança 4. Você é um líder desta comunidade selecionado pela equipe, e define um exemplo positivo em suas ações e palavras. Você tem habilidade de editar todos tópicos, agir como moderador nas ações como fixar, fechar, delistar, arquivar, separar, agrupar e vários curtidas a mais por dia.
     welcome:
       name: Bem-Vindo
       description: Recebeu uma curtida
@@ -1796,10 +1800,79 @@ pt_BR:
     step:
       locale:
         title: "Bem-vindo ao seu Discourse!"
+        fields:
+          default_locale:
+            description: "Qual é o idioma padrão para sua comunidade?"
+      forum_title:
+        title: "Nome"
+        fields:
+          title:
+            label: "O nome de sua comunidade"
+          site_description:
+            label: "Descreva sua comunidade numa frase curta."
+            placeholder: "Um lugar para Jane e seus amigos discutirem coisas legais."
       introduction:
+        title: "Introdução"
         fields:
           welcome:
             label: "Tópico de Boas Vindas"
+            one_paragraph: "Por favor, reduza sua mensagem de boas-vindas para um parágrafo."
+      privacy:
+        title: "Acesso"
+        fields:
+          privacy:
+            choices:
+              open:
+                label: "Público"
+                description: "Todos podem acessar essa comunidade e logar em uma conta. "
+              restricted:
+                label: "Privado"
+                description: "Apenas pessoas que eu convidei ou aprovei podem acessar essa comunidade."
+      contact:
+        title: "Contato"
+        fields:
+          contact_email:
+            label: "E-mail"
+            placeholder: "nome@exemplo.com"
+      corporate:
+        fields:
+          company_full_name:
+            label: "Nome da Companhia"
+      colors:
+        title: "Tema"
+        fields:
+          theme_id:
+            description: "Você prefere um esquema de cores claro ou escuro para começar? Você poderá, futuramente, trocar o esquema de cores do seu site através da Aba: Admin, Configurações."
+      logos:
+        title: "Logotipos"
+        fields:
+          logo_url:
+            label: "Logotipo Primário"
+            description: "O logotipo ao lado superior esquerdo de seu site. Use um formato de retângulo largo."
+          logo_small_url:
+            label: "Logotipo Compacto "
+            description: "Uma versão compacta de sua logo, mostrada na parte superior esquerda do site quando rolado para baixo. Use um formato quadrado."
+      icons:
+        title: "Ícones"
+        fields:
+          favicon_url:
+            label: "Ícone pequeno"
+          apple_touch_icon_url:
+            label: "Ícone Largo"
+      homepage:
+        title: "Página Inicial"
+        fields:
+          homepage_style:
+            choices:
+              latest:
+                label: "Últimos tópicos"
+              categories:
+                label: "Categorias"
+      emoji:
+        title: "Emoji"
+        description: "Qual estilo de Emoji se adequa melhor para sua comunidade? Você poderá sempre adicionar novas customizações de Emojis através da aba: Admin > Customizar > Emoji."
+      invites:
+        title: "Convidar um grupo"
   activemodel:
     errors:
       <<: *errors

config/locales/server.ru.yml

@@ -764,14 +764,7 @@ ru:
     s3_config_warning: 'Сервер сконфигурирован на загрузку файлов в хранилище S3, однако не указаны некоторые значения из списка: s3_access_key_id, s3_secret_access_key или s3_upload_bucket. Перейдите в <a href="/admin/site_settings">Настройки сайта</a> и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">How to set up image uploads to S3?</a>.'
     s3_backup_config_warning: 'Сервер сконфигурирован на загрузку резервных копий в хранилище S3, однако не заданы все необходимые настройки : s3_access_key_id, s3_secret_access_key, s3_backup_bucket. Перейдите в <a href="/admin/site_settings">настройки сайта</a> и установите необходимые значения. Для получения дополнительной информации перейдите по ссылке <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">How to set up image uploads to S3?</a>.'
     image_magick_warning: 'Сервер сконфигурирован на создание превью больших изображений, однако на сервере не установлен ImageMagick. Установите ImageMagick используя системный менеджер пакетов, или пройдите по ссылке <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">для загрузки последней версии</a>.'
-    default_logo_warning: "Установите графические логотипы для вашего сайта. Обновите параметры logo_url, logo_small_url и favicon_url в <a href='/admin/site_settings'>Настройках сайта</a>."
-    contact_email_missing: "Установите контактный email, чтобы мы могли оповестить вас о срочных делах, связанных с сайтом. Обновите параметры в <a href='/admin/site_settings'>Настройках сайта</a>."
-    contact_email_invalid: "Контактный адрес сайта некорректен. Обновите его в <a href='/admin/site_settings'>Настройках сайта</a>."
-    title_nag: "Введите название вашего сайта. Обновите заголовок в <a href='/admin/site_settings'>Настройках сайта</a>."
-    site_description_missing: "Добавьте короткое описание вашего сайта, которое будет отображаться в результатах поиска. Обновите параметр site_description в <a href='/admin/site_settings'>Настройках сайта</a>."
     consumer_email_warning: "Сайт настроен на использование Gmail (или другого почтового сервиса) для отправки сообщений. Gmail <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>имеет ограничения</a> на количество отправляемых сообщений. Вы можете рассмотреть возможность использования альтернативного поставщика услуг (например, mandrill.com) для обеспечения бесперебойности доставки почтовых сообщений."
-    site_contact_username_warning: "Введите псевдоним учетной записи персонала, от чьего имени будут отправляться важные автоматические сообщения. Обновите параметр site_contact_username в <a href='/admin/site_settings'>Настройках сайта</a>."
-    notification_email_warning: "Email уведомления отправляются с некорректного адреса электронной почты на вашем домене; доставка сообщений будет ненадежна. Пожалуйста, установите в параметре notification_email правильный локальный адрес электронной почты в <a href='/admin/site_settings'>Настройках сайта</a>."
   site_settings:
     censored_words: "Слова, которые будут автоматически заменены на &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Автоматически удалять сообщения, скрытые дольше чем 30 дней."

config/locales/server.sk.yml

@@ -738,14 +738,7 @@ sk:
     s3_backup_config_warning: 'Server má nakonfigurované nahrávanie záloh na S3, ale minimálne jedna z nasledujúcich hodnôt nie je nastavená: s3_access_key_id, s3_secret_access_key, alebo  s3_backup_bucket. Navštívte  <a href="/admin/site_settings">Nastavenia stránky</a> a aktualizujte nastavenia. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Chcete vedieť viac? Pozrite si návod ako nastaviť nahrávanie súborov na S3</a>.'
     image_magick_warning: 'Server je nakonfigurovaný na vytváranie náhľadov z veľkých obrázkov, ale ImageMagick  nie je nainštalovaný. Nainštalujte ImageMagick pomocou Vášho správcu balíčkov, alebo <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">Stiahnite najnovšiu verziu</a>.'
     failing_emails_warning: 'Existuje %{num_failed_jobs} neuspešných emailých pokusov. Skontrolujte Váš app.yml a uistite sa, že nastavenia email serveru máte správne. <a href="/sidekiq/retries" target="_blank">Pozrieť neúspešné pokusy v Sidekiq</a>.'
-    default_logo_warning: "Nastavte grafické logo Vašej stránky. Aktualizujte  logo_url, logo_small_url, a favicon_url na <a href='/admin/site_settings'>Ňastaveniach stránky</a>."
-    contact_email_missing: "Vložte kontaktnú email adresu aby ste mohli byť kontaktovaný v urgentných prípadov týkajúcich sa stránok. Vložte na <a href='/admin/site_settings'>Stránke nastavení</a>."
-    contact_email_invalid: "Kontaktný email na stránke je neplatný. Aktualizujte ho v <a href='/admin/site_settings'>Nastavenia stránky</a>."
-    title_nag: "Zadajte meno stránky. Aktualizujte ho v <a href='/admin/site_settings'>Nastavenia stránky</a>."
-    site_description_missing: "Vložte jednovetný popis Vašej stránky, ktorý sa zobrazí vo výsledkoch vyhľadávania. Aktualizujte ho v <a href='/admin/site_settings'>Nastavenia stránky</a>."
     consumer_email_warning: "Vaše stránky sú nastavené tak aby na posielanie emailov používali Gmail (alebo iné služby pre spotrebiteľov). <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail obmedzuje počet odoslaných emailov</a>. Na zaistenie doručiteľonosti emailov zvážte použitie emailového poskytovateľa ako napríklad mandrill.com."
-    site_contact_username_warning: "Vložte názov účtu kolegu z personálu pre zasielanie dôležitých automatických správ. Aktualizujte kontakt v <a href='/admin/site_settings'>Nastavenia stránky</a>."
-    notification_email_warning: "Notifikačné emaily sú posielané z neplatnej emailovej adresy vo Vašej doméne. Doručovanie emailov môže byť chybné a nespoľahlivé. Prosím nastavte platnú lokálnu emailovú adresu \"notification_email\" v <a href='/admin/site_settings'>Nastavenia stránky</a>."
     subfolder_ends_in_slash: "Vaše nastavenie podadresára je chybné, DISCOURSE_RELATIVE_URL_ROOT je ukončené lomítkom."
   site_settings:
     censored_words: "Slová, ktoré budu automatický nahradené znakmi &#9632;&#9632;&#9632;&#9632;"

config/locales/server.sq.yml

@@ -564,14 +564,7 @@ sq:
     s3_config_warning: 'The server is configured to upload files to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_upload_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     s3_backup_config_warning: 'The server is configured to upload backups to s3, but at least one the following setting is not set: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. Go to <a href="/admin/site_settings">the Site Settings</a> and update the settings. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">See "How to set up image uploads to S3?" to learn more</a>.'
     image_magick_warning: 'The server is configured to create thumbnails of large images, but ImageMagick is not installed. Install ImageMagick using your favorite package manager or <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">download the latest release</a>.'
-    default_logo_warning: "Set the graphic logos for your site. Update logo_url, logo_small_url, and favicon_url in <a href='/admin/site_settings'>Site Settings</a>."
-    contact_email_missing: "Enter a site contact email address so you can be reached for urgent matters regarding your site. Update it in <a href='/admin/site_settings'>Site Settings</a>."
-    contact_email_invalid: "The site contact email is invalid. Update it in <a href='/admin/site_settings'>Site Settings</a>."
-    title_nag: "Enter the name of your site. Update title in <a href='/admin/site_settings'>Site Settings</a>."
-    site_description_missing: "Enter a one sentence description of your site that will appear in search results. Update site_description in <a href='/admin/site_settings'>Site Settings</a>."
     consumer_email_warning: "Your site is configured to use Gmail (or another consumer email service) to send email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail limits how many emails you can send</a>. Consider using an email service provider like mandrill.com to ensure email deliverability."
-    site_contact_username_warning: "Enter the name of a friendly staff user account to send important automated messages from. Update site_contact_username in <a href='/admin/site_settings'>Site Settings</a>."
-    notification_email_warning: "Notification emails are not being sent from a valid email address on your domain; email delivery will be erratic and unreliable. Please set notification_email to a valid local email address in <a href='/admin/site_settings'>Site Settings</a>."
   site_settings:
     censored_words: "Fjalët do të zhvendosen automatikisht me &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "Auto-delete any hidden posts that stay hidden for more than 30 days."
@@ -1088,6 +1081,22 @@ sq:
     deferred_and_deleted: "Thanks for letting us know. We've removed the post."
   temporarily_closed_due_to_flags: "Kjo temë është përkohësisht e mbyllur për shkak të një numri të madh sinjalizimesh nga komuniteti."
   system_messages:
+    post_hidden:
+      subject_template: "Postimi u fsheh ngaqë u sinjalizua nga komuniteti"
+      text_body_template: |
+        Përshëndetje,
+
+        Ky është një mesazh automatik nga %{site_name} për t'ju njoftuar se postimi juaj u fsheh.
+
+        %{base_url}%{url}
+
+        %{flag_reason}
+
+        Disa anëtarë të faqes sinjalizuan këtë postim. **Mund t'a modifikoni postimin pas %{edit_delay} minutash, dhe do të shfaqet automatikisht.**
+
+        Sidoqoftë, nëse postimi fshihet nga komuniteti për një herë të dytë, postimi do të mbetet u fshehur derisa të ndërhyjë stafi. Stafi mund të vendosë edhe të pezullojë ose bllokojë llogarinë tuaj.
+
+        Për udhëzime të mëtejshme, shikoni [rregullat e komunitetit](%{base_url}/guidelines).
     welcome_user:
       subject_template: "Mirë se vini tek %{site_name}!"
       text_body_template: |
@@ -1154,6 +1163,8 @@ sq:
     csv_export_failed:
       subject_template: "Data export failed"
       text_body_template: "We're sorry, but your data export failed. Please check the logs or contact a staff member."
+    email_reject_insufficient_trust_level:
+      subject_template: "[%{site_name}] Problem emaili -- Niveli i Besimit nuk mjafton"
     email_reject_no_account:
       subject_template: "[%{site_name}] Email issue -- Unknown Account"
     email_reject_empty:
@@ -1188,6 +1199,12 @@ sq:
     download_remote_images_disabled:
       subject_template: "Downloading remote images disabled"
       text_body_template: "The `download_remote_images_to_local` setting was disabled because the disk space limit at `download_remote_images_threshold` was reached."
+    dashboard_problems:
+      subject_template: "Gjetëm ca probleme"
+      text_body_template: |
+        Në panelin e kontrollit keni disa probleme që duhen riparuar.
+
+        [Shikoji dhe rregulloji](%{base_url}/admin).
   unsubscribe_link: |
     Për të mos marrë më njoftime të tilla, [klikoni këtu](%{unsubscribe_url}).
   unsubscribe_link_and_mail: |

config/locales/server.sv.yml

@@ -725,14 +725,7 @@ sv:
     s3_backup_config_warning: 'Servern är konfigurerad till att ladda upp säkerhetskopior till s3, men minst en av följande inställningar är inte satta: s3_access_key_id, s3_secret_access_key eller s3_backup_bucket. Gå till <a href="/admin/site_settings">Webbplatsinställningarna</a> och uppdatera inställningarna. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Se "How to set up image uploads to S3?" för att lära dig mer</a>.'
     image_magick_warning: 'Servern är konfigurerad att skapa ikoner av stora bilder, men ImageMagick är inte installerad. Installera ImageMagick med din föredragna pakethanterare eller <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">ladda hem den senaste utgåvan</a>.'
     failing_emails_warning: 'Det finns %{num_failed_jobs} e-postutskick som har misslyckats. Kontrollera din app.yml-fil för att säkerställa att serverinställningarna för e-post är korrekta. <a href="/sidekiq/retries" target="_blank">Se alla misslyckade utskick i Sidekiq</a>.'
-    default_logo_warning: "Ange de grafiska logotyperna för din webbplats. Uppdatera logo_url, logo_small och favicon_url i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
-    contact_email_missing: "Ange en e-postadress för webbplatsen så att du kan nås vid brådskande ärenden. Uppdatera i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
-    contact_email_invalid: "Webbplatsens e-postadress för kontakt är ogiltig. Uppdatera den i  <a href='/admin/site_settings'>webbplatsinställningarna</a>."
-    title_nag: "Ange namnet på webbplatsen. Uppdatera titeln i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
-    site_description_missing: "Ange en beskrivning om din webbplats i en mening, som dyker upp i sökresultat. Uppdatera site_description i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
     consumer_email_warning: "Din sida är konfigurerad till att använda Gmail (eller någon annan konsumenttjänst) för att skicka e-post. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail begränsar antalet e-post du kan skicka</a>. Överväg att använda en tjänsteleverantör som exempelvis mandrill.com för att säkerställa att all e-post levereras."
-    site_contact_username_warning: "Ange namnet på en vänlig person ur personalen att skicka viktiga automatiserade meddelanden från. Uppdatera site_contact_username i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
-    notification_email_warning: "E-postmeddelanden med notiser skickas inte från en giltig e-postadress från din domän; e-postleverering kommer att vara erratisk och oberäknelig. Var vänlig och ställ in notification_email till en giltig lokal e-postadress i <a href='/admin/site_settings'>webbplatsinställningarna</a>."
     subfolder_ends_in_slash: "Inställningarna för dina undermappar är inte korrekt; DISCOURSE_RELATIV_URL_ROOT slutar med ett snedstreck."
     email_polling_errored_recently:
       one: "E-postpolling har genererat ett fel de senaste 24 timmarna. Se <a href='/logs' target='_blank'>loggarna</a> för mer detaljer."

config/locales/server.te.yml

@@ -458,11 +458,6 @@ te:
     rails_env_warning: "మీ సర్వరు %(env) రీతిలో నడుస్తోంది"
     host_names_warning: "మీ config/database.yml దస్త్రం అప్రమేయ లోకల్ హోస్ట్ వాడుతున్నది. దాన్ని మీ సైటు పేరుకు మార్చగలరు. "
     memory_warning: 'మీ సర్వరు ఒక జీబీ కన్నా తక్కువ మెమరీతో నడుస్తున్నది. కనీసం ఒక జీబీ అయినా ఉండుట మంచిది. '
-    contact_email_missing: "మీరు మీ సైట్ యొక్క సంప్రదింపు ఈ-మెయిల్ నమోదు చేయండి దాని ద్వారా సైట్‌కు సంబంధించిన అత్యవసర విషయాలు అందుకొంటారు. <a href='/admin/site_settings'>సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి</a>."
-    contact_email_invalid: "సైట్ సంప్రదింపు ఈ-మెయిల్ చెల్లదు.<a href='/admin/site_settings'>సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి</a>."
-    title_nag: "సైట్ పేరు నమోదు చేయండి.<a href='/admin/site_settings'>శీర్షికను సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి</a>"
-    site_description_missing: "శోధన ఫలితాల్లో కనిపించడానికి మీ సైట్ యొక్క ఏకవాక్య వివరణ నమోదు చేయండి.<a href='/admin/site_settings'>సైట్ వివరణను సైట్ సెట్టింగ్స్‌ లో అప్‌డేట్ చేయండి</a>."
-    notification_email_warning: "ఈ-మెయిల్ ప్రకటనలు  మీ డొమైన్ లో ఒక చెల్లుబాటు అయ్యే ఈ-మెయిల్ చిరునామా నుండి పంపలేదు :ఈ-మెయిల్ బట్వాడా అనిశ్చిత మరియు నమ్మలేనిదిగా ఉంటుంది.దయచేసి ప్రకటనను ఉంచండి_ఒక చెల్లుబాటు అయ్యే స్థానిక ఈమెయిల్ చిరునామాకు ఈ-మెయిల్ చేయండి<a href='/admin/site_settings'>సైట్ సెట్టింగ్స్ లో</a>."
   site_settings:
     censored_words: "వీటితో పదాలు స్వయంచాలకంగా భర్తీ చేయబడతాయి &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "30 రోజుల కంటే ఎక్కువ దాగివున్న టపాలు స్వయంసిధ్ధంగా తొలగింపబడతాయి."

config/locales/server.tr_TR.yml

@@ -7,9 +7,9 @@
 
 tr_TR:
   dates:
-    short_date_no_year: "G AAA"
+    short_date_no_year: "D MMM"
     short_date: "D MMM, YYYY"
-    long_date: "MMMM D, YYYY h:mma"
+    long_date: "D MMMM, YYYY h:mma"
   datetime_formats: &datetime_formats
     formats:
       short: "%d-%m-%Y"
@@ -37,6 +37,7 @@ tr_TR:
       default_subject: "%{email} adresinden gelen e-posta"
       show_trimmed_content: "Kısaltılmış olan içeriği göster"
       errors:
+        empty_email_error: "Bize ulaşan ham posta boş olduğunda olur."
         no_message_id_error: "E-postanın 'Message-Id' başlığı olmadığında olur"
         inactive_user_error: "Gönderici etkin olmadığında olur."
         blocked_user_error: "Gönderici engellendiğinde olur."
@@ -671,14 +672,7 @@ tr_TR:
     s3_backup_config_warning: 'Sunucu s3''e yedekleme yüklenebilmesi için yapılandırılmış, fakat şunlardan en az biri henüz ayarlanmamış: s3_access_key_id, s3_secret_access_key or s3_backup_bucket. <a href="/admin/site_settings">Site Ayarları</a> sayfasına gidin ve ayarları güncelleyin. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Daha fazla bilgi için "How to set up image uploads to S3?" konulu gönderiye bakın</a>.'
     image_magick_warning: 'Sunucu büyük resimlerin küçük boylarının oluşturulması için yapılandırılmış, fakat ImageMagick henüz kurulmamış. Favori paket yöneticinizi kullanarak ImageMagick kurun veya <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">son sürümünü indirin</a>.'
     failing_emails_warning: 'Başarısızlıkla sonuçlanmış %{num_failed_jobs} e-posta işlemi bulunuyor. app.yml dosyanızı kontrol edin ve e-posta sunucu ayarlarınızın doğru olduğundan emin olun. <a href="/sidekiq/retries" target="_blank">Sidekiq''deki başarısız işlemlere göz atın</a>.'
-    default_logo_warning: "Siteniz için logo grafikleri yükleyin.  <a href='/admin/site_settings'>Site Ayarları</a>'nda logo_url, logo_small_url, ve favicon_url güncellemelerini yapın."
-    contact_email_missing: "Sitenizle alakalı acil durumlar için size ulaşabileceğimiz bir iletişim e-postası girin. Lütfen <a href='/admin/site_settings'>Site Ayarları'nda</a> iletişim e-postanızı güncelleyin."
-    contact_email_invalid: "Site iletişim e-postası geçersiz. İletişim e-postanızı <a href='/admin/site_settings'>Site Ayarları</a> sayfasından güncelleyin."
-    title_nag: "Sitenizin ismini girin. Site ismini <a href='/admin/site_settings'>Site Ayarları</a> sayfasından güncelleyin."
-    site_description_missing: "Arama sonuçlarında gözükecek, sitenizi açıklayan tek bir cümle girin. <a href='/admin/site_settings'>Site Ayarları</a> sayfasından site açıklamasını güncelleyin."
     consumer_email_warning: "Sitenizde e-posta gönderimleri için Gmail (ya da başka bir e-posta hizmeti) kurulumu yapılmış. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail ile gönderebileceğiniz e-posta sayısı limitlidir</a>. Onun yerine, e-postalarınızın ulaştırılabildiğinden emin olmak için mandrill.com benzeri bir hizmet sağlayıcısını kullanın."
-    site_contact_username_warning: "Önemli otomatik mesajları gönderen kişi olarak gözükecek yetkili kullanıcı adını girin. <a href='/admin/site_settings'>Site Ayarları&amp;lt;/a> sayfasından site_contact_username parametresini güncelleyin."
-    notification_email_warning: "Bildiri e-postaları alan adınıza bağlı geçerli bir e-posta adresinden yollanmıyor; e-postalar düzenli ve güvenilir bir şekilde ulaşmayabilir. Lütfen <a href='/admin/site_settings'>Site Ayarları</a> sayfasından notification_email değeri için geçerli bir yerel e-posta adresi girin."
     subfolder_ends_in_slash: "Alt dizin kurulumunuz hatalı, DISCOURSE_RELATIVE_URL_ROOT sonunda yan çizgi bulunmalı."
     bad_favicon_url: "Minik simge yüklemesi başarısız oldu. <a href='/admin/site_settings'>Site Ayarları</a>ndan favicon_url alanını kontrol edin."
   site_settings:
@@ -803,7 +797,7 @@ tr_TR:
     force_hostname: "SADECE YAZILIMCILAR İÇİN! DİKKAT! URL'de bir bilgisayar adı belirleyin. Öntanımlı için boş bırakın."
     invite_expiry_days: "Kullanıcı davet anahtarlarının geçerlilik süresi, gün olarak"
     invite_passthrough_hours: "Daha önce kabul edilmiş davetiye anahtarının kullanım süresi, saat olarak"
-    invite_only: "Halka açık kayıt sistemi devre dışı bırakıldı, tüm yeni kullanıcıların bir üye ya da görevli tarafından davet edilmesi gerekir. "
+    invite_only: "Herkese açık kayıt sistemi devre dışı bırakıldı, tüm yeni kullanıcıların bir üye ya da görevli tarafından davet edilmesi gerekir. "
     login_required: "Bu sitede içerik görüntülenebilmesi için kimlik doğrulamayı zorunlu kıl, isimsiz girişe izin verme."
     min_username_length: "Karakter olarak en küçük kullanıcı adı uzunluğu."
     max_username_length: "Karakter olarak en büyük kullanıcı adı uzunluğu."
@@ -910,6 +904,7 @@ tr_TR:
     tl3_links_no_follow: "Güven seviyesi 3'teki kullanıcılar tarafından paylaşılan linklerdeki rel=nofollow'u kaldırma."
     min_trust_to_create_topic: "Yeni bir konu oluşturmak için gereken en az güven seviyesi. "
     min_trust_to_edit_wiki_post: "Wiki olarak işaretlenmiş bir gönderiyi düzenleyebilmek için gereken en az güven seviyesi."
+    min_trust_to_edit_post: "Gönderilerin düzenlenebilmesi için gereken en düşük güven seviyesi."
     min_trust_to_allow_self_wiki: "Kullanıcının kendi wiki gönderisini oluşturabilmesi için gereken güven seviyesi."
     min_trust_to_send_messages: "Özel bir mesaj oluşturabilmek için gerekli olan güven seviyesi."
     newuser_max_links: "Yeni bir kullanıcının bir gönderiye ekleyebileceği bağlantı sayısı."
@@ -1009,7 +1004,7 @@ tr_TR:
     max_daily_gravatar_crawls: "Discourse'un gün içinde özel avatarlar için Gravatar'ı en fazla kaç kere kontrol edeceği."
     public_user_custom_fields: "Kullanıcıların için, herkes tarafından görüntülenebilir özel alanların beyaz listesi."
     staff_user_custom_fields: "Kullanıcıların için, sadece görevlilere görüntülenebilir özel alanların beyaz listesi."
-    enable_user_directory: "Göz atılabilmesin için kullanıcıların olduğu bir veri dizini sağla"
+    enable_user_directory: "Göz atılabilmesi için kullanıcıların olduğu bir dizin sağla"
     allow_anonymous_posting: "Kullanıcıların anonim moda geçebilmelerine izin ver"
     anonymous_posting_min_trust_level: "Anonim gönderi oluşturabilmeyi etkinleştirebilmek için gereken en az güven seviyesi"
     anonymous_account_duration_minutes: "Anonimliği koruyabilmek için, her kulanıcı için her N dakikada bir yeni bir anonim hesap oluştur. Örnek: 600'e ayarlanırsa, son gönderi üzerinden 600 dakika geçer geçmez VE kullanıcı anonim moddaysa, yeni bir anonim hesap oluşturulur."
@@ -1071,6 +1066,10 @@ tr_TR:
     default_categories_watching: "Öntanımlı olarak gözlenen kategorilerin listesi."
     default_categories_tracking: "Öntanımlı olarak, takip edilen kategorilerin listesi."
     default_categories_muted: "Öntanımlı olarak, sesi kısılan kategorilerin listesi."
+    max_user_api_reqs_per_day: "Gün başına yapılabilecek en fazla kullanıcı API isteği"
+    max_user_api_reqs_per_minute: "Dakika başına yapılabilecek en fazla kullanıcı API isteği"
+    allow_read_user_api_keys: "Yalnızca okuma için kullanıcı API'leri oluşturulmasına izin ver"
+    allow_write_user_api_keys: "Yazma yetkili kullanıcı API'leri oluşturulmasına izin ver"
     max_api_keys_per_user: "Kullanıcı başına kullanılabilecek kullanıcı API anahtarı sayısı"
     min_trust_level_for_user_api_key: "Kullanıcı API'si oluşturmak için gereken güven seviyesi"
     tagging_enabled: "Konularda etiketleri etkinleştirin?"
@@ -1112,7 +1111,7 @@ tr_TR:
     account_not_approved: "Hesabınız onaylanma bekliyor. Onaylandığınızda e-posta ile bilgilendirileceksiniz."
     unknown_error: "Hesabınızda bir sorun var. Lütfen site yöneticisi ile iletişime geçin."
     timeout_expired: "Hesabınız zaman aşımına uğradı, lütfen tekrar giriş yapmayı deneyin."
-  original_poster: "Özgün Poster"
+  original_poster: "Özgün Gönderici"
   most_posts: "En Çok Gönderi"
   most_recent_poster: "En Son Gönderen"
   frequent_poster: "En Sık Gönderen"
@@ -1583,6 +1582,10 @@ tr_TR:
       subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz İzin"
     email_reject_invalid_post:
       subject_template: "[%{site_name}] E-posta sorunu -- Gönderme hatası"
+    email_reject_invalid_post_specified:
+      subject_template: "[%{site_name}] E-posta sorunu -- Gönderim hatası"
+    email_reject_invalid_post_action:
+      subject_template: "[%{site_name}] E-posta sorunu -- Geçersiz Gönderi Eylemi"
     email_reject_reply_key:
       subject_template: "[%{site_name}] E-posta sorunu -- Bilinmeyen Cevap Anahtarı"
     email_reject_bad_destination_address:
@@ -1620,7 +1623,7 @@ tr_TR:
 
         Bu otomatik mesaj %{site_name} forumunda, görevli incelemesinin ardından hesabınızın artık askıda olmadığını bilmeniz amacıyla gönderilmiştir.
 
-        Şimdi tekrar cevaplar ve konular oluşturabilirsiniz. Sabrınız için teşekkürler.
+        Şimdi tekrar gönderi ve konular oluşturabilirsiniz. Sabrınız için teşekkürler.
     pending_users_reminder:
       subject_template:
         other: "%{count} kullanıcı onay bekliyor"
@@ -2191,6 +2194,8 @@ tr_TR:
       name: İlk Bahsetme
       description: 'Gönderide bir kullanıcıdan bahsetme '
       long_description: Bu rozet ilk defa mesajınızda başka bir kullanıcıdan bahsettiğiniz için verilmiştir. Her bahsetme bahsi geçen kullanıcıya bildirim gitmesini sağlar, böylece bu kullanıcı sizin mesajınızdan haberdar olur. Sadece bahsi geçen kullanıcı adına @ gerekir.
+    first_onebox:
+      name: İlk Kutulama
     first_reply_by_email:
       name: Mail İle İlk Cevap
       description: 'Gönderiye mail yoluyla cevap verme '
@@ -2226,6 +2231,8 @@ tr_TR:
         fields:
           title:
             label: "Topluluğunuzun ismi"
+          site_description:
+            label: "Topluluğunuzu kısa bir cümle ile tanımlayın"
       introduction:
         title: "Tanıtım"
         fields:
@@ -2259,13 +2266,13 @@ tr_TR:
         fields:
           company_short_name:
             label: "Şirket İsmi (kısa)"
-            placeholder: "Falanteknikbilim"
+            placeholder: "Falanteknik"
           company_full_name:
             label: "Şirket İsmi (tamamı)"
-            placeholder: "Falanteknikbilim A.Ş"
+            placeholder: "Falanteknik A.Ş"
           company_domain:
             label: "Şirket Alan Adı"
-            placeholder: "falanteknikbilim.com"
+            placeholder: "falanteknik.com"
       colors:
         title: "Tema"
         fields:

config/locales/server.vi.yml

@@ -655,14 +655,7 @@ vi:
     s3_backup_config_warning: 'Máy chủ được cấu hình để upload các bản sao lưu dữ liệu lên s3, tuy nhiên ít nhất một trong các tùy chỉnh sau đây không được thiết lập: s3_access_key_id, s3_secret_access_key hoặc s3_backup_bucket. Truy cập <a href="/admin/site_settings">Thiết lập Site</a> và  bổ sung các thiết lập đó. <a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">Xem bài viết "How to set up image uploads to S3?" để biết thêm chi tiết</a>.'
     image_magick_warning: 'Máy chủ đã cấu hình để tạo hình đại diện nhỏ từ những hình lới, nhưng ImageMagick chưa được cài đặt. Cài ImageMagick sử dụng trình quản lý package yêu thích của bạn hoặc <a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">tải về phiên bản mới nhất</a>.'
     failing_emails_warning: 'Có %{num_failed_jobs} email jobs thấ bại. Kiểm tra app.yml và chắc chắn rằng cấu hình máy chủ email đúng. <a href="/sidekiq/retries" target="_blank">Xem jobs thất bại ở Sidekiq</a>.'
-    default_logo_warning: "Cập nhập logo của trang. Cập nhập logo_url, logo_small_url, và favicon_url trong <a href='/admin/site_settings'>Thiết lập trang</a>."
-    contact_email_missing: "Điền địa chỉ email liên hệ để có thể nhận được các vấn đề cấp bách liên quan đến website của bạn, cập nhật trong <a href='/admin/site_settings'>Thiết lập website</a>."
-    contact_email_invalid: "Email liên lạc của trang không hợp lệ. Cập nhật trong <a href='/admin/site_settings'>Thiết lập trang/a>."
-    title_nag: "Nhập tên trang của bạn. Cập nhập tiêu đề trong <a href='/admin/site_settings'>Thiết lập trang</a>."
-    site_description_missing: "Điền một câu mô tả về website để hiển thị trên trang kết quả tìm kiếm, cập nhật site_description trong <a href='/admin/site_settings'>Thiết lập website</a>."
     consumer_email_warning: "Trang web của bạn được cài đặt sử dụng Gmail (hoặc một dịch vụ email khác) để gửi email. <a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail có giới hạn số lượng email bạn có thể gửi</a>. Hãy xem xét sử dụng một dịch vụ email khác như mandrill.com để đảm bảo khả năng vận chuyển tất cả các email."
-    site_contact_username_warning: "Điền tên tài khoản điều hành viên để gửi tin nhắn tự động, cập nhật site_contact_username trong <a href='/admin/site_settings'>Thiết lập website</a>."
-    notification_email_warning: "Email thông báo không thể gửi từ một địa chỉ email với tên miền của bạn, gửi email sẽ thất thường và không đáng tin cậy. Hãy thiết lập notification_email tới một địa chỉ tin cậy trong <a href='/admin/site_settings'>Thiết lập website</a>."
     subfolder_ends_in_slash: "Thư mục con của bạn được thiết lập không đúng, DISCOURSE_RELATIVE_URL_ROOT phải được kết thúc bằng dấu gạch chéo."
     email_polling_errored_recently:
       other: "Email đã tạo %{count} lỗi trong 24 giờ qua, xem <a href='/logs' target='_blank'>nhật ký</a> để biết thêm chi tiết."

config/locales/server.zh_CN.yml

@@ -685,14 +685,7 @@ zh_CN:
     s3_backup_config_warning: '服务器被配置为上传备份到 s3，但是至少有一个值未被设定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到<a href="/admin/site_settings">站点设置</a>更新此设定。<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">参考如何设置图片上传至 S3</a>。'
     image_magick_warning: '服务器被设置为给大图片创建缩略图，但是 ImageMagick 没有被安装。用你最喜爱的包管理器安装 ImageMagick 或<a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">下载最新版</a>。'
     failing_emails_warning: '有 %{num_failed_jobs} 个邮件任务失败。请检查 app.yml 文件是否正确配置了邮件服务器。<a href="/sidekiq/retries" target="_blank">查看 Sidekiq 中失败的任务</a>。'
-    default_logo_warning: "设置你站点的图形logo。请在<a href='/admin/site_settings'>站点设置</a>中配置logo_url、logo_small_url和favicon_url。"
-    contact_email_missing: "输入一个站点联系人的邮件地址，这样在用户在网站出现紧急状况时能够找到你。在<a href='/admin/site_settings'>站点设置</a>中更新它。"
-    contact_email_invalid: "站点联系邮箱不正确。在<a href='/admin/site_settings'>站点设置</a>中修改。"
-    title_nag: "为站点指定一个名字。在<a href='/admin/site_settings'>站点设置</a>中更新标题。"
-    site_description_missing: "输入一句话作为你站点的简介，将出现在搜索结果中。在<a href='/admin/site_settings'>站点设置</a>中更新 site_description。"
     consumer_email_warning: "你的站点被设置为使用 Gmail 或者其他客户邮箱服务发送邮件。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail 限制每日邮件发送数量</a>。请考虑使用其他邮件服务商来保证邮件的成功发送，例如 mandrill.com。"
-    site_contact_username_warning: "输入一个友善的管理人员账户名，并以他的名义发送重要的自动消息。在<a href='/admin/site_settings'>站点设置</a>中更新 site_contact_username。"
-    notification_email_warning: "通知邮件不是从你域名的一个有效地址发出的；邮件分发将会变得危险和不可靠。请在<a href='/admin/site_settings'>站点设置</a>中将 notification_email 设置为一个有效的本地邮件地址。"
     subfolder_ends_in_slash: "你的子目录设置不正确；DISCOURSE_RELATIVE_URL_ROOT以斜杠结尾。"
     email_polling_errored_recently:
       other: "邮件轮询在过去的 24 小时内出现了 %{count} 个错误。看一看<a href='/logs' target='_blank'>日志</a>寻找详情。"

config/locales/server.zh_TW.yml

@@ -479,13 +479,7 @@ zh_TW:
     s3_config_warning: '伺服器被設定為上傳文件到 s3，但是至少有一個值未被設定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到<a href="/admin/site_settings">設定</a>更新此設定。<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">參考如何設置圖片上傳至 S3</a>。'
     s3_backup_config_warning: '伺服器被設置為上傳備份到 s3，但是至少有一個值未被設定： s3_access_key_id, s3_secret_access_key 或 s3_upload_bucket。到<a href="/admin/site_settings">設定</a>更新此設定。<a href="http://meta.discourse.org/t/how-to-set-up-image-uploads-to-s3/7229" target="_blank">參考如何設置圖片上傳至 S3</a>。'
     image_magick_warning: '伺服器被設置為給大圖片創建縮略圖，但是 ImageMagick 沒有被安裝。使用你喜愛的包裝管理器安裝 ImageMagick 或<a href="http://www.imagemagick.org/script/binary-releases.php" target="_blank">下載最新版</a>。'
-    default_logo_warning: "設置你網站的圖形logo。請在<a href='/admin/site_settings'>設定</a>中配置logo_url、logo_small_url和favicon_url。"
-    contact_email_missing: "輸入一個網站聯絡人的電郵地址，這樣在用戶在網站出現緊急狀況時能夠找到你。在<a href='/admin/site_settings'>設定</a>中更新它。"
-    contact_email_invalid: "網站聯絡電郵不正確。在<a href='/admin/site_settings'>設定</a>中修改。"
-    title_nag: "為網站給予一個名字。在<a href='/admin/site_settings'>設定</a>中更新標題。"
-    site_description_missing: "輸入一句話作為網站的簡介，將出現在搜索結果中。在<a href='/admin/site_settings'>設定</a>中更新 site_description。"
     consumer_email_warning: "您的網站正以Gmail或其他服務供應商郵件服務發送郵件。<a href='http://support.google.com/a/bin/answer.py?hl=en&answer=166852' target='_blank'>Gmail限制每日郵件發送數量</a>. 請考慮使用其他電郵服務商來保證郵件能成功發送，例如 mandrill.com。"
-    notification_email_warning: "通知郵件不是從你域名的一個有效地址發出的；電郵發送將會變得危險和不可靠。請在<a href='/admin/site_settings'>設定</a>中將 notification_email 設定一個有效的本機電郵地址。"
   site_settings:
     censored_words: "將被自動替換為 &#9632;&#9632;&#9632;&#9632;"
     delete_old_hidden_posts: "自動刪除被隱藏超過 30 天的帖子。"

config/site_settings.yml

@@ -1287,12 +1287,11 @@ user_api:
     default: 2880
   max_user_api_reqs_per_minute:
     default: 20
-  allow_read_user_api_keys:
+  allow_user_api_keys:
-    default: true
-  allow_write_user_api_keys:
-    default: true
-  allow_push_user_api_keys:
     default: true
+  allow_user_api_key_scopes:
+    default: 'read|write|message_bus|push|notifications|session_info'
+    type: list
   max_api_keys_per_user:
     default: 10
   push_api_secret_key:

db/migrate/20161013012136_add_scopes_to_user_api_keys.rb

@@ -0,0 +1,13 @@
+class AddScopesToUserApiKeys < ActiveRecord::Migration
+  def change
+    add_column :user_api_keys, :scopes, :text, array: true, null: false, default: []
+
+    execute "UPDATE user_api_keys SET scopes = scopes || ARRAY['write'] WHERE write"
+    execute "UPDATE user_api_keys SET scopes = scopes || ARRAY['read'] WHERE read"
+    execute "UPDATE user_api_keys SET scopes = scopes || ARRAY['push'] WHERE push"
+
+    remove_column :user_api_keys, :read
+    remove_column :user_api_keys, :write
+    remove_column :user_api_keys, :push
+  end
+end

docs/INSTALL-cloud.md

@@ -1,5 +1,7 @@
 **Set up Discourse in the cloud in under 30 minutes** with zero knowledge of Rails or Linux shell using our [Discourse Docker image][dd]. We recommend [DigitalOcean][do], but these steps will work on any Docker-compatible cloud provider or local server.
 
+>  🔔 Don't have 30 minutes to set this up? For a flat one-time fee of $99, the community can install Discourse in the cloud for you. [Click here to purchase a self-supported community install](http://jaypfaffman.com/product/99-install/).
+
 ### Create New Cloud Server
 
 [Sign up for DigitalOcean][do], update billing info, then create your new cloud server.

lib/auth/default_current_user_provider.rb

@@ -6,6 +6,7 @@ class Auth::DefaultCurrentUserProvider
   CURRENT_USER_KEY ||= "_DISCOURSE_CURRENT_USER".freeze
   API_KEY ||= "api_key".freeze
   USER_API_KEY ||= "HTTP_USER_API_KEY".freeze
+  USER_API_CLIENT_ID ||= "HTTP_USER_API_CLIENT_ID".freeze
   API_KEY_ENV ||= "_DISCOURSE_API".freeze
   TOKEN_COOKIE ||= "_t".freeze
   PATH_INFO ||= "PATH_INFO".freeze
@@ -90,7 +91,7 @@ class Auth::DefaultCurrentUserProvider
         limiter_min.performed!
       end
 
-      current_user = lookup_user_api_user(api_key)
+      current_user = lookup_user_api_user_and_update_key(api_key, @env[USER_API_CLIENT_ID])
       raise Discourse::InvalidAccess unless current_user
 
       limiter_min.performed!
@@ -176,16 +177,14 @@ class Auth::DefaultCurrentUserProvider
 
   protected
 
-  WHITELISTED_WRITE_PATHS ||= [/^\/message-bus\/.*\/poll/, /^\/user-api-key\/revoke$/]
+  def lookup_user_api_user_and_update_key(user_api_key, client_id)
-  def lookup_user_api_user(user_api_key)
     if api_key = UserApiKey.where(key: user_api_key, revoked_at: nil).includes(:user).first
-      unless api_key.write
+      unless api_key.allow?(@env)
-        if @env["REQUEST_METHOD"] != "GET"
+        raise Discourse::InvalidAccess
-          path = @env["PATH_INFO"]
+      end
-          unless WHITELISTED_WRITE_PATHS.any?{|whitelisted| path =~ whitelisted}
+
-            raise Discourse::InvalidAccess
+      if client_id.present? && client_id != api_key.client_id
-          end
+        api_key.update_columns(client_id: client_id)
-        end
       end
 
       api_key.user

lib/discourse_tagging.rb

@@ -1,9 +1,7 @@
-require_dependency 'slug'
-
 module DiscourseTagging
 
   TAGS_FIELD_NAME = "tags"
-  TAGS_FILTER_REGEXP = Slug::CHAR_FILTER_REGEXP
+  TAGS_FILTER_REGEXP = /[\/\?#\[\]@!\$&'\(\)\*\+,;=\.%\\`^\s|\{\}"<>]+/ # /?#[]@!$&'()*+,;=.%\`^|{}"<>
 
 
   def self.tag_topic_by_names(topic, guardian, tag_names_arg)
@@ -143,7 +141,9 @@ module DiscourseTagging
   end
 
   def self.clean_tag(tag)
-    Slug.sanitize(tag.downcase.strip)[0...SiteSetting.max_tag_length]
+    tag.downcase.strip
+       .gsub(/\s+/, '-').squeeze('-')
+       .gsub(TAGS_FILTER_REGEXP, '')[0...SiteSetting.max_tag_length]
   end
 
   def self.staff_only_tags(tags)

lib/wizard.rb

@@ -36,7 +36,7 @@ class Wizard
   end
 
   def steps_with_fields
-    @steps_with_fields ||= @steps.select {|s| s.has_fields? }
+    @steps_with_fields ||= @steps.select(&:has_fields?)
   end
 
   def start
@@ -54,7 +54,7 @@ class Wizard
   end
 
   def create_updater(step_id, fields)
-    step = @steps.find {|s| s.id == step_id.dasherize}
+    step = @steps.find { |s| s.id == step_id.dasherize }
     Wizard::StepUpdater.new(@user, step, fields)
   end
 
@@ -76,15 +76,13 @@ class Wizard
   def requires_completion?
     return false unless SiteSetting.wizard_enabled?
 
-    admins = User.where("admin = true AND id <> ? AND auth_token_updated_at IS NOT NULL", 
+    first_admin = User.where(admin: true)
-                        Discourse.system_user.id).order(:auth_token_updated_at)
+                      .where.not(id: Discourse.system_user.id)
+                      .where.not(auth_token_updated_at: nil)
+                      .order(:auth_token_updated_at)
+                      .first
 
-    # In development mode all admins are developers, so the logic is a bit screwy:
+    @user.present? && first_admin == @user && !completed? && (Topic.count < 15)
-    unless Rails.env.development?
-      admins = admins.select {|a| !Guardian.new(a).is_developer? }
-    end
-
-    admins.present? && admins.first == @user && !completed? && (Topic.count < 15)
   end
 
 end

plugins/poll/config/locales/client.ko.yml

@@ -13,6 +13,10 @@ ko:
       total_votes:
         other: "전체 투표"
       average_rating: "평균: <strong>%{average}</strong>."
+      multiple:
+        help:
+          at_least_min_options:
+            other: "최소 <strong>%{count}</strong>개의 옵션을 선택해야합니다."
       cast-votes:
         title: "표 던지기"
         label: "지금 투표!"

plugins/poll/config/locales/server.ko.yml

@@ -14,6 +14,8 @@ ko:
     multiple_polls_with_same_name: "같은 이름 <strong>%{name}</strong> 의 설문조사가 여러개 있습니다. '<code>name</code>' 속성을 사용하여 설문조사를 개별적으로 구분해 보세요."
     default_poll_must_have_at_least_2_options: "설문조사에 적어도 2개의 항목은 있어야합니다."
     named_poll_must_have_at_least_2_options: "<strong>%{name}</strong> 설문조사에 적어도 2개의 항목이 있어야 합니다."
+    default_poll_must_have_less_options:
+      other: "설문조사 항목은 %{count}개보다 적어야합니다."
     default_poll_must_have_different_options: "한 설문조사 안에 항목 내용들이 각각 달라야 합니다."
     named_poll_must_have_different_options: "<strong>%{name}</strong> 설문조사의 항목 내용들이 달라야 합니다."
     default_poll_with_multiple_choices_has_invalid_parameters: "복수응답 가능한 설문조사가 잘못된 매개변수를 가지고 있습니다."

public/500.ro.html

@@ -6,8 +6,7 @@
 <body>
     <h1>Oops</h1>
     <p>Platforma software pe care rulează acest forum a întâlnit o problemă neprevăzută. Ne cerem scuze pentru inconveniență.</p>
-    <p>Informațiile detaliate despre această eroare au fost 
+    <p>Informațiile detaliate despre această eroare au fost înregistrate și o notificare a fost generată automat. O să aruncăm o privire.</p>
-înregistrate și o notificare a fost generată automat. O să aruncăm o privire.</p>
     <p>Nu este necesară nici o altă acțiune. Dacă însă eroarea persistă, poți posta detalii suplimentare, incluzând pașii ce trebuie urmați pentru a reproduce eroarea, într-un subiect din categoria feedback la site.</p>
 </body>
 </html>

spec/components/auth/default_current_user_provider_spec.rb

@@ -163,9 +163,7 @@ describe Auth::DefaultCurrentUserProvider do
       UserApiKey.create!(
         application_name: 'my app',
         client_id: '1234',
-        read: true,
+        scopes: ['read'],
-        write: false,
-        push: false,
         key: SecureRandom.hex,
         user_id: user.id
       )

spec/components/wizard_spec.rb

@@ -114,13 +114,6 @@ describe Wizard do
       expect(build_simple(Fabricate.build(:user)).requires_completion?).to eq(false)
     end
 
-    it "is false for a developer" do
-      developer = Fabricate(:admin)
-      Developer.create!(user_id: developer.id)
-
-      expect(build_simple(developer).requires_completion?).to eq(false)
-    end
-
     it "it's false when the wizard is disabled" do
       SiteSetting.wizard_enabled = false
       admin = Fabricate(:admin)

spec/controllers/user_api_keys_controller_spec.rb

@@ -35,7 +35,7 @@ TXT
 
   let :args do
     {
-      access: 'r',
+      scopes: 'read',
       client_id: "x"*32,
       auth_redirect: 'http://over.the/rainbow',
       application_name: 'foo',
@@ -48,7 +48,7 @@ TXT
     it "supports a head request cleanly" do
       head :new
       expect(response.code).to eq("200")
-      expect(response.headers["Auth-Api-Version"]).to eq("1")
+      expect(response.headers["Auth-Api-Version"]).to eq("2")
     end
   end
 
@@ -67,7 +67,6 @@ TXT
     end
 
     it "will allow tokens for staff without TL" do
-
       SiteSetting.min_trust_level_for_user_api_key = 2
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
 
@@ -96,7 +95,7 @@ TXT
 
       SiteSetting.min_trust_level_for_user_api_key = 0
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
-      SiteSetting.allow_read_user_api_keys = false
+      SiteSetting.allow_user_api_key_scopes = "write"
 
       user = Fabricate(:user, trust_level: 0)
 
@@ -143,7 +142,7 @@ TXT
       SiteSetting.min_trust_level_for_user_api_key = 0
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
 
-      args[:access] = "pr"
+      args[:scopes] = "push,read"
       args[:push_url] = "https://push.it/here"
 
       user = Fabricate(:user, trust_level: 0)
@@ -164,22 +163,21 @@ TXT
       parsed = JSON.parse(key.private_decrypt(encrypted))
 
       expect(parsed["nonce"]).to eq(args[:nonce])
-      expect(parsed["access"].split('').sort).to eq(['r'])
+      expect(parsed["push"]).to eq(false)
+      expect(parsed["api"]).to eq(2)
 
       key = user.user_api_keys.first
-      expect(key.push).to eq(true)
+      expect(key.scopes).to include("push")
       expect(key.push_url).to eq("https://push.it/here")
 
     end
 
     it "will redirect correctly with valid token" do
-
       SiteSetting.min_trust_level_for_user_api_key = 0
       SiteSetting.allowed_user_api_auth_redirects = args[:auth_redirect]
       SiteSetting.allowed_user_api_push_urls = "https://push.it/here"
-      SiteSetting.allow_write_user_api_keys = true
 
-      args[:access] = "prw"
+      args[:scopes] = "push,notifications,message_bus,session_info"
       args[:push_url] = "https://push.it/here"
 
       user = Fabricate(:user, trust_level: 0)
@@ -200,14 +198,12 @@ TXT
       parsed = JSON.parse(key.private_decrypt(encrypted))
 
       expect(parsed["nonce"]).to eq(args[:nonce])
-      expect(parsed["access"].split('').sort).to eq(['p','r', 'w'])
+      expect(parsed["push"]).to eq(true)
 
       api_key = UserApiKey.find_by(key: parsed["key"])
 
       expect(api_key.user_id).to eq(user.id)
-      expect(api_key.read).to eq(true)
+      expect(api_key.scopes.sort).to eq(["push", "message_bus", "notifications", "session_info"].sort)
-      expect(api_key.write).to eq(true)
-      expect(api_key.push).to eq(true)
       expect(api_key.push_url).to eq("https://push.it/here")
 
 

spec/fabricators/user_api_key_fabricator.rb

@@ -1,8 +1,6 @@
 Fabricator(:readonly_user_api_key, from: :user_api_key) do
   user
-  read true
+  scopes ['read']
-  write false
-  push false
   client_id { SecureRandom.hex }
   key { SecureRandom.hex }
   application_name 'some app'

spec/models/user_api_key_spec.rb

@@ -0,0 +1,28 @@
+require 'rails_helper'
+
+describe UserApiKey do
+  context "#allow?" do
+    it "can look up permissions correctly" do
+      key = UserApiKey.new(scopes: ['message_bus', 'notifications'])
+
+      expect(key.allow?("PATH_INFO" => "/random", "REQUEST_METHOD" => "GET")).to eq(false)
+      expect(key.allow?("PATH_INFO" => "/message-bus/1234/poll", "REQUEST_METHOD" => "POST")).to eq(true)
+
+      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "notifications", :action => "mark_read"},
+                        "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "PUT")).to eq(true)
+
+
+      expect(key.allow?("action_dispatch.request.path_parameters" => {:controller => "user_api_keys", :action => "revoke"},
+                        "PATH_INFO" => "/xyz", "REQUEST_METHOD" => "POST")).to eq(true)
+
+    end
+
+    it "can allow blanket read" do
+
+      key = UserApiKey.new(scopes: ['read'])
+
+      expect(key.allow?("PATH_INFO" => "/random", "REQUEST_METHOD" => "GET")).to eq(true)
+      expect(key.allow?("PATH_INFO" => "/random", "REQUEST_METHOD" => "PUT")).to eq(false)
+    end
+  end
+end

spec/services/post_alerter_spec.rb

@@ -338,9 +338,7 @@ describe PostAlerter do
                            client_id: "xxx#{i}",
                            key: "yyy#{i}",
                            application_name: "iPhone#{i}",
-                           read: true,
+                           scopes: ['notifications'],
-                           write: true,
-                           push: true,
                            push_url: "https://site2.com/push")
       end
 

test/javascripts/acceptance/search-full-test.js.es6

@@ -71,7 +71,7 @@ test("open advanced search", assert => {
 
 test("validate population of advanced search", assert => {
   visit("/search");
-  fillIn('.search input.full-page-search', 'test user:admin #bug group:moderators badge:Reader tags:monkey in:likes status:open after:5 posts_count:10');
+  fillIn('.search input.full-page-search', 'test user:admin #bug group:moderators badge:Reader tags:monkey in:likes in:private in:wiki in:bookmarks status:open after:2016-10-05 posts_count:10');
   click('.search-advanced-btn');
 
   andThen(() => {
@@ -80,10 +80,13 @@ test("validate population of advanced search", assert => {
     //assert.ok(exists('.search-advanced-options span:contains("moderators")'), 'has "moderators" pre-populated');
     //assert.ok(exists('.search-advanced-options span:contains("Reader")'), 'has "Reader" pre-populated');
     assert.ok(exists('.search-advanced-options .tag-chooser .tag-monkey'), 'has "monkey" pre-populated');
-    assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" pre-populated');
+    assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" pre-populated');
+    assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" pre-populated');
+    assert.ok(exists('.search-advanced-options .in-wiki:checked'), 'has "are wiki" pre-populated');
+    assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("I\'ve bookmarked")'), 'has "I\'ve bookmarked" pre-populated');
     assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("are open")'), 'has "are open" pre-populated');
     assert.ok(exists('.search-advanced-options .combobox .select2-choice .select2-chosen:contains("after")'), 'has "after" pre-populated');
-    assert.equal(find('.search-advanced-options #search-post-date').val(), "5", 'has "5" pre-populated');
+    assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" pre-populated');
     assert.equal(find('.search-advanced-options #search-posts-count').val(), "10", 'has "10" pre-populated');
   });
 });
@@ -190,16 +193,52 @@ test("update category through advanced search ui", assert => {
 //   });
 // });
 
+test("update in:likes filter through advanced search ui", assert => {
+  visit("/search");
+  fillIn('.search input.full-page-search', 'none');
+  click('.search-advanced-btn');
+  click('.search-advanced-options .in-likes');
+
+  andThen(() => {
+    assert.ok(exists('.search-advanced-options .in-likes:checked'), 'has "I liked" populated');
+    assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"');
+  });
+});
+
+test("update in:private filter through advanced search ui", assert => {
+  visit("/search");
+  fillIn('.search input.full-page-search', 'none');
+  click('.search-advanced-btn');
+  click('.search-advanced-options .in-private');
+
+  andThen(() => {
+    assert.ok(exists('.search-advanced-options .in-private:checked'), 'has "are in my messages" populated');
+    assert.equal(find('.search input.full-page-search').val(), "none in:private", 'has updated search term to "none in:private"');
+  });
+});
+
+test("update in:wiki filter through advanced search ui", assert => {
+  visit("/search");
+  fillIn('.search input.full-page-search', 'none');
+  click('.search-advanced-btn');
+  click('.search-advanced-options .in-wiki');
+
+  andThen(() => {
+    assert.ok(exists('.search-advanced-options .in-wiki:checked'), 'has "are wiki" populated');
+    assert.equal(find('.search input.full-page-search').val(), "none in:wiki", 'has updated search term to "none in:wiki"');
+  });
+});
+
 test("update in filter through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  selectDropdown('.search-advanced-options #s2id_in', 'likes');
+  selectDropdown('.search-advanced-options #s2id_in', 'bookmarks');
-  fillIn('.search-advanced-options #in', 'likes');
+  fillIn('.search-advanced-options #in', 'bookmarks');
 
   andThen(() => {
-    assert.ok(exists('.search-advanced-options #s2id_in .select2-choice .select2-chosen:contains("I liked")'), 'has "I liked" populated');
+    assert.ok(exists('.search-advanced-options #s2id_in .select2-choice .select2-chosen:contains("I\'ve bookmarked")'), 'has "I\'ve bookmarked" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none in:likes", 'has updated search term to "none in:likes"');
+    assert.equal(find('.search input.full-page-search').val(), "none in:bookmarks", 'has updated search term to "none in:bookmarks"');
   });
 });
 
@@ -220,14 +259,14 @@ test("update post time through advanced search ui", assert => {
   visit("/search");
   fillIn('.search input.full-page-search', 'none');
   click('.search-advanced-btn');
-  fillIn('#search-post-date', '5');
+  fillIn('#search-post-date', '2016-10-05');
   selectDropdown('.search-advanced-options #s2id_postTime', 'after');
   fillIn('.search-advanced-options #postTime', 'after');
 
   andThen(() => {
     assert.ok(exists('.search-advanced-options #s2id_postTime .select2-choice .select2-chosen:contains("after")'), 'has "after" populated');
-    assert.equal(find('.search-advanced-options #search-post-date').val(), "5", 'has "5" populated');
+    assert.equal(find('.search-advanced-options #search-post-date').val(), "2016-10-05", 'has "2016-10-05" populated');
-    assert.equal(find('.search input.full-page-search').val(), "none after:5", 'has updated search term to "none after:5"');
+    assert.equal(find('.search input.full-page-search').val(), "none after:2016-10-05", 'has updated search term to "none after:2016-10-05"');
   });
 });